From 9609ddc0a6a071a2876cb1e2eff695f12f8fe39c Mon Sep 17 00:00:00 2001
From: Rodney Ewing <ewing.rj@gmail.com>
Date: Thu, 11 Jul 2013 12:34:43 -0700
Subject: should use media.slug_or_id incase a MediaEntry doesn't have a slug

---
 mediagoblin/templates/mediagoblin/utils/comment-subscription.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/comment-subscription.html b/mediagoblin/templates/mediagoblin/utils/comment-subscription.html
index 8ee8c883..bd367e80 100644
--- a/mediagoblin/templates/mediagoblin/utils/comment-subscription.html
+++ b/mediagoblin/templates/mediagoblin/utils/comment-subscription.html
@@ -21,13 +21,13 @@
     {% if not subscription or not subscription.notify %}
         <a type="submit" href="{{ request.urlgen('mediagoblin.notifications.subscribe_comments',
             user=media.get_uploader.username,
-            media=media.slug)}}"
+            media=media.slug_or_id)}}"
             class="button_action">Subscribe to comments
         </a>
     {% else %}
         <a type="submit" href="{{ request.urlgen('mediagoblin.notifications.silence_comments',
             user=media.get_uploader.username,
-            media=media.slug)}}"
+            media=media.slug_or_id)}}"
             class="button_action">Silence comments
         </a>
     {% endif %}
-- 
cgit v1.2.3


From f7998c3326d7c2ed06a978f721cf6533fbde1c15 Mon Sep 17 00:00:00 2001
From: Rodney Ewing <ewing.rj@gmail.com>
Date: Wed, 26 Jun 2013 08:29:03 -0700
Subject: fix for boolean fields

---
 .../templates/mediagoblin/utils/wtforms.html       | 47 +++++++++++++---------
 1 file changed, 29 insertions(+), 18 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index a4c33f1a..2b2cc30a 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -34,26 +34,26 @@
 
 {# Generically render a field #}
 {% macro render_field_div(field, autofocus_first=False) %}
-  {{- render_label_p(field) }}
-  <div class="form_field_input">
-    {% if autofocus_first %}
-      {{ field(autofocus=True) }}
-    {% else %}
-      {{ field }}
-    {% endif %}
-    {%- if field.errors -%}
-      {% for error in field.errors %}
-        <p class="form_field_error">{{ error }}</p>
-      {% endfor %}
-    {%- endif %}
-    {%- if field.description %}
-      {% if field.type == 'BooleanField' %}
-        <label for="{{ field.label.field_id }}">{{ field.description|safe }}</label>
+  {% if field.type == 'BooleanField' %}
+    {{ render_bool(field) }}
+  {% else %}
+    {{- render_label_p(field) }}
+    <div class="form_field_input">
+      {% if autofocus_first %}
+        {{ field(autofocus=True) }}
       {% else %}
-        <p class="form_field_description">{{ field.description|safe }}</p>
+        {{ field }}
       {% endif %}
-    {%- endif %}
-  </div>
+      {%- if field.errors -%}
+        {% for error in field.errors %}
+          <p class="form_field_error">{{ error }}</p>
+        {% endfor %}
+      {%- endif %}
+      {%- if field.description %}
+        <p class="form_field_description">{{ field.description|safe }}</p>
+      {%- endif %}
+    </div>
+  {% endif %}
 {%- endmacro %}
 
 {# Auto-render a form as a series of divs #}
@@ -86,3 +86,14 @@
     </tr>
   {% endfor %}
 {%- endmacro %}
+
+{# Render a boolean field #}
+{% macro render_bool(field) %}
+  <div id="boolean">
+  <label for="{{ field.label.field_id }}">
+    {{ field }}</input>
+    {{ field.description|safe }}
+  </label>
+</div>
+{% endmacro %}
+
-- 
cgit v1.2.3


From a937ea9efdfb537be70a152609144c1aac6d3b61 Mon Sep 17 00:00:00 2001
From: Rodney Ewing <ewing.rj@gmail.com>
Date: Wed, 26 Jun 2013 08:45:59 -0700
Subject: change to class instead of id to work with firefox

---
 mediagoblin/templates/mediagoblin/utils/wtforms.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 2b2cc30a..fe5883a0 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -89,7 +89,7 @@
 
 {# Render a boolean field #}
 {% macro render_bool(field) %}
-  <div id="boolean">
+  <div class="boolean">
   <label for="{{ field.label.field_id }}">
     {{ field }}</input>
     {{ field.description|safe }}
-- 
cgit v1.2.3


From 643f07af064bb886f788f2a94385069b93ad7c83 Mon Sep 17 00:00:00 2001
From: Rodney Ewing <ewing.rj@gmail.com>
Date: Thu, 11 Jul 2013 16:21:35 -0700
Subject: forgot to render errors

---
 mediagoblin/templates/mediagoblin/utils/wtforms.html | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index fe5883a0..e079274e 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -90,10 +90,15 @@
 {# Render a boolean field #}
 {% macro render_bool(field) %}
   <div class="boolean">
-  <label for="{{ field.label.field_id }}">
-    {{ field }}</input>
-    {{ field.description|safe }}
-  </label>
-</div>
+    <label for="{{ field.label.field_id }}">
+      {{ field }}</input>
+      {{ field.description|safe }}
+    </label>
+    {%- if field.errors -%}
+      {% for error in field.errors %}
+        <p class="form_field_error">{{ error }}</p>
+      {% endfor %}
+    {% endif %}
+  </div>
 {% endmacro %}
 
-- 
cgit v1.2.3


From 0f231966b34c95b41ca43550011302e5341e5eb2 Mon Sep 17 00:00:00 2001
From: Rodney Ewing <ewing.rj@gmail.com>
Date: Thu, 11 Jul 2013 16:33:33 -0700
Subject: make change_pass page autofocus

---
 mediagoblin/templates/mediagoblin/edit/change_pass.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/edit/change_pass.html b/mediagoblin/templates/mediagoblin/edit/change_pass.html
index ff909b07..2a1ffee0 100644
--- a/mediagoblin/templates/mediagoblin/edit/change_pass.html
+++ b/mediagoblin/templates/mediagoblin/edit/change_pass.html
@@ -39,7 +39,7 @@
           Changing {{ username }}'s password
         {%- endtrans -%}
       </h1>
-      {{ wtforms_util.render_divs(form) }}
+      {{ wtforms_util.render_divs(form, True) }}
       {{ csrf_token }}
       <div class="form_submit_buttons">
         <input type="submit" value="{% trans %}Save{% endtrans %}"
-- 
cgit v1.2.3


From ac08a9acaffbafdcb99506495a192b1eaa508544 Mon Sep 17 00:00:00 2001
From: Rodney Ewing <ewing.rj@gmail.com>
Date: Fri, 12 Jul 2013 09:51:42 -0700
Subject: Patch by Strum. Remove redundent tool-tips from Stl media_type

---
 .../templates/mediagoblin/media_displays/stl.html        | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/media_displays/stl.html b/mediagoblin/templates/mediagoblin/media_displays/stl.html
index a89e0b4f..bc12ce4e 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/stl.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/stl.html
@@ -108,32 +108,26 @@ window.show_things = function () {
 
 
 <div style="padding: 4px;">
-  <a class="button_action" onclick="show('perspective');"
-     title="{%- trans %}Toggle Rotate{% endtrans -%}">
+  <a class="button_action" onclick="show('perspective');">
     {%- trans %}Perspective{% endtrans -%}
   </a>
-  <a class="button_action" onclick="show('front_view');"
-     title="{%- trans %}Front{% endtrans -%}">
+  <a class="button_action" onclick="show('front_view');">
     {%- trans %}Front{% endtrans -%}
   </a>
-  <a class="button_action" onclick="show('top_view');"
-     title="{%- trans %}Top{% endtrans -%}">
+  <a class="button_action" onclick="show('top_view');">
     {%- trans %}Top{% endtrans -%}
   </a>
-  <a class="button_action" onclick="show('side_view');"
-     title="{%- trans %}Side{% endtrans -%}">
+  <a class="button_action" onclick="show('side_view');">
     {%- trans %}Side{% endtrans -%}
   </a>
 {% if media.media_data.file_type == "stl" %}
   <a id="webgl_button" class="button_action"
-     onclick="show_things();"
-     title="{%- trans %}WebGL{% endtrans -%}">
+     onclick="show_things();">
     {%- trans %}WebGL{% endtrans -%}
   </a>
 {% endif %}
 
   <a class="button_action" href="{{ model_download }}"
-     title="{%- trans %}Download{% endtrans -%}"
      style="float:right;">
     {%- trans %}Download model{% endtrans -%}
   </a>
-- 
cgit v1.2.3