Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware

Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html

10 files changed, 180 insertions, 27 deletions

diff --git a/mediagoblin/templates/mediagoblin/auth/change_fp.html b/mediagoblin/templates/mediagoblin/auth/change_fp.html
new file mode 100644
index 00000000..4be7e065
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/auth/change_fp.html
@@ -0,0 +1,37 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "mediagoblin/base.html" %}
+
+{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block mediagoblin_content %}
+
+  <form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}"
+        method="POST" enctype="multipart/form-data">
+    <div class="grid_6 prefix_1 suffix_1 form_box">
+      <h1>{% trans %}Enter your new password{% endtrans %}</h1>
+
+      {{ wtforms_util.render_divs(cp_form) }}
+      <div class="form_submit_buttons">
+        <input type="submit" value="submit" class="button"/>
+      </div>
+
+    </div>
+  </form>
+{% endblock %}
+
diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
new file mode 100644
index 00000000..23fa9eb5
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
@@ -0,0 +1,37 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "mediagoblin/base.html" %}
+
+{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block mediagoblin_content %}
+
+  <form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}"
+        method="POST" enctype="multipart/form-data">
+    <div class="grid_6 prefix_1 suffix_1 form_box">
+      <h1>{% trans %}Enter your username or email{% endtrans %}</h1>
+
+      {{ wtforms_util.render_divs(fp_form) }}
+      <div class="form_submit_buttons">
+        <input type="submit" value="submit" class="button"/>
+      </div>
+
+    </div>
+  </form>
+{% endblock %}
+
diff --git a/mediagoblin/templates/mediagoblin/auth/resent_verification_email.html b/mediagoblin/templates/mediagoblin/auth/fp_changed_success.html
index 37cd6b03..7cea312d 100644
--- a/mediagoblin/templates/mediagoblin/auth/resent_verification_email.html
+++ b/mediagoblin/templates/mediagoblin/auth/fp_changed_success.html
@@ -1,6 +1,6 @@
 {#
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011 Free Software Foundation, Inc
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -19,6 +19,9 @@
 
 {% block mediagoblin_content %}
   <p>
-    {% trans %}Resent your verification email.{% endtrans %}
+    {% trans -%}
+      Your password has been changed. Try to log in now.
+    {%- endtrans %}
   </p>
 {% endblock %}
+
diff --git a/mediagoblin/templates/mediagoblin/auth/fp_email_sent.html b/mediagoblin/templates/mediagoblin/auth/fp_email_sent.html
new file mode 100644
index 00000000..69aac6b3
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/auth/fp_email_sent.html
@@ -0,0 +1,28 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "mediagoblin/base.html" %}
+
+{% block mediagoblin_content %}
+  <p>
+    {% trans -%}
+      Check your inbox. We sent an email with a URL for changing your password.
+    {%- endtrans %}
+  </p>
+
+{% endblock %}
+
diff --git a/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt b/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt
new file mode 100644
index 00000000..fb5e1674
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt
@@ -0,0 +1,30 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% trans username=username, verification_url=verification_url|safe -%}
+Hi {{ username }},
+
+to change your GNU MediaGoblin password, open the following URL in 
+your web browser:
+
+{{ verification_url }}
+
+If you think this is an error, just ignore this email and continue being
+a happy goblin!
+{%- endtrans %}
+
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 1be58560..61c5a203 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -45,6 +45,12 @@
           <a href="{{ request.urlgen('mediagoblin.auth.register') }}">
             {%- trans %}Create one here!{% endtrans %}</a>
         </p>
+        <p>
+          {% trans %}Forgot your password?{% endtrans %}
+          <br />
+          <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}">
+            {%- trans %}Change it!{% endtrans %}</a>
+        </p>
       {% endif %}
     </div>
   </form>
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 8fc62f32..e3ca9726 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -21,7 +21,7 @@
 
 {% block mediagoblin_content %}
   {% if request.user %}
-    <h1>Explore</h1>
+    <h1>{% trans %}Explore{% endtrans %}</h1>
   {% else %}
    <div class="grid_11 alpha">
       <h1>{% trans %}Hi there, media lover! MediaGoblin is...{% endtrans %}</h1>
@@ -35,9 +35,12 @@
       </ul>
 
       {% if allow_registration %}
-        <p>Excited to join us? To add your own media, make collections and save favorites...<p>
-        <a class="header_submit_highlight" href="{{ request.urlgen('mediagoblin.auth.register') }}">Create a free account</a> or
-        <a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
+        <p>{% trans %}Excited to join us?{% endtrans %}<p>
+        {% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
+          <a class="header_submit_highlight" href="{{ register_url }}">Create a free account</a>
+          or
+          <a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
+        {%- endtrans %}
       {% endif %}
     </div>
 
@@ -47,6 +50,6 @@
 
     <div class="clear"></div>
   {% endif %}
-  <h2>Most recent media</h2>
+  <h2>{% trans %}Most recent media{% endtrans %}</h2>
   {{ object_gallery(request, media_entries, pagination) }}
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index 3acf802b..dd6923a9 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -31,17 +31,23 @@
           Really delete {{ title }}?
         {%- endtrans %}
       </h1>
-      <p>
-	<em>
-	  {%- trans -%}
-	    If you choose yes, the media entry will be deleted <strong>permanently.</strong>
-	  {%- endtrans %}
-	</em>
-      </p>
 	  
-      {{ wtforms_util.render_divs(form) }}
+      <div style="text-align: center;" >
+        <img src="{{ request.app.public_store.file_url(
+                         media['media_files']['thumb']) }}" />
+      </div>
+	  
+      <br />
+	  
+      <p class="delete_checkbox_box">
+	{{ form.confirm }}
+	{{ _(form.confirm.label.text) }}
+      </p>
+
       <div class="form_submit_buttons">
-        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" />
+        {# TODO: This isn't a button really... might do unexpected things :) #}
+	<a class="cancel_link" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
+        <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button" />
 	{{ csrf_token }}
       </div>
     </div>
diff --git a/mediagoblin/templates/mediagoblin/utils/pagination.html b/mediagoblin/templates/mediagoblin/utils/pagination.html
index cdac01c8..0df3bfea 100644
--- a/mediagoblin/templates/mediagoblin/utils/pagination.html
+++ b/mediagoblin/templates/mediagoblin/utils/pagination.html
@@ -33,15 +33,18 @@
     <div class="pagination">
       <p>
         {% if pagination.has_prev %}
-          <a href="{{ pagination.get_page_url_explicit(
-                          base_url, get_params,
-                          pagination.page - 1) }}"><img class="pagination_arrow" src="/mgoblin_static/images/pagination_left.png" alt="Previous page" />Newer</a>
+          {% set prev_url = pagination.get_page_url_explicit(
+                   base_url, get_params,
+                   pagination.page - 1) %}
+          <a href="{{ prev_url }}"><img class="pagination_arrow" src="{{ request.staticdirect('/images/pagination_left.png') }}" alt="Previous page" /></a>
+          <a href="{{ prev_url }}">{% trans %}Newer{% endtrans %}</a>
         {% endif %}
         {% if pagination.has_next %}
-          <a href="{{ pagination.get_page_url_explicit(
-                          base_url, get_params,
-                          pagination.page + 1) }}">Older<img class="pagination_arrow" src="/mgoblin_static/images/pagination_right.png" alt="Next page" />
-          </a>
+          {% set next_url = pagination.get_page_url_explicit(
+                   base_url, get_params,
+                   pagination.page + 1) %}
+          <a href="{{ next_url }}">{% trans %}Older{% endtrans %}</a>
+          <a href="{{ next_url }}"><img class="pagination_arrow" src="{{ request.staticdirect('/images/pagination_right.png') }}" alt="Next page" /></a>
         {% endif %}
         <br />
         Go to page: 
diff --git a/mediagoblin/templates/mediagoblin/utils/prev_next.html b/mediagoblin/templates/mediagoblin/utils/prev_next.html
index 74f855ed..75903076 100644
--- a/mediagoblin/templates/mediagoblin/utils/prev_next.html
+++ b/mediagoblin/templates/mediagoblin/utils/prev_next.html
@@ -25,23 +25,23 @@
     {# There are no previous entries for the very first media entry #}
     {% if prev_entry_url %}
       <a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
-        <img src="/mgoblin_static/images/navigation_left.png" alt="Previous image" />
+        <img src="{{ request.staticdirect('/images/navigation_left.png') }}" alt="Previous image" />
       </a>
     {% else %}
       {# This is the first entry. display greyed-out 'previous' image #}
       <p class="navigation_button navigation_left">
-        <img src="/mgoblin_static/images/navigation_end.png" alt="No previous images" />
+        <img src="{{ request.staticdirect('/images/navigation_end.png') }}" alt="No previous images" />
       </p>
     {% endif %}
     {# Likewise, this could be the very last media entry #}
     {% if next_entry_url %}
       <a class="navigation_button" href="{{ next_entry_url }}">
-        <img src="/mgoblin_static/images/navigation_right.png" alt="Next image" />
+        <img src="{{ request.staticdirect('/images/navigation_right.png') }}" alt="Next image" />
       </a>
     {% else %}
       {# This is the last entry. display greyed-out 'next' image #}
       <p class="navigation_button">
-        <img src="/mgoblin_static/images/navigation_end.png" alt="No following images" />
+        <img src="{{ request.staticdirect('/images/navigation_end.png') }}" alt="No following images" />
       </p>
     {% endif %}
   </div>