From 39aa1db4d69eb2fb49da463f973484b501b3ee52 Mon Sep 17 00:00:00 2001
From: Rodney Ewing <ewing.rj@gmail.com>
Date: Mon, 20 May 2013 14:04:02 -0700
Subject: moved change pass to a seperate view and fixed issues 709

---
 .../templates/mediagoblin/edit/change_pass.html    | 52 ++++++++++++++++++++++
 .../templates/mediagoblin/edit/edit_account.html   |  9 ++--
 2 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 mediagoblin/templates/mediagoblin/edit/change_pass.html

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/edit/change_pass.html b/mediagoblin/templates/mediagoblin/edit/change_pass.html
new file mode 100644
index 00000000..a621751f
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/edit/change_pass.html
@@ -0,0 +1,52 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# 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_head %}
+  <script type="text/javascript"
+          src="{{ request.staticdirect('/js/show_password.js') }}"></script>
+{% endblock mediagoblin_head %}
+
+{% block title -%}
+  {% trans username=user.username -%}
+    Changing {{ username }}'s password
+  {%- endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
+{% block mediagoblin_content %}
+  <form action="{{ request.urlgen('mediagoblin.edit.pass') }}"
+        method="POST" enctype="multipart/form-data">
+    <div class="form_box edit_box">
+      <h1>
+        {%- trans username=user.username -%}
+          Changing {{ username }}'s password
+        {%- endtrans -%}
+      </h1>
+      {{ wtforms_util.render_divs(form) }}
+			{{ csrf_token }}
+      <div class="form_submit_buttons">
+        <input type="submit" value="{% trans %}Save{% endtrans %}"
+				class="button_form" />
+			</div>
+		</div>
+	</form>
+{% endblock %}
+
+
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index 7fe2c031..dfb216e5 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -40,9 +40,12 @@
         {%- trans username=user.username -%}
           Changing {{ username }}'s account settings
         {%- endtrans -%}
-      </h1>
-      {{ wtforms_util.render_field_div(form.old_password) }}
-      {{ wtforms_util.render_field_div(form.new_password) }}
+			</h1>
+			<p>{% trans %}Change your{% endtrans %}
+				<a href="{{ request.urlgen('mediagoblin.edit.pass') }}">
+					{% trans %}password.{% endtrans %}
+				</a>
+			</p>
       <div class="form_field_input">
         <p>{{ form.wants_comment_notification }}
            {{ wtforms_util.render_label(form.wants_comment_notification) }}</p>
-- 
cgit v1.2.3


From 2ba7603469a80ccfc1c07ddebc53ad6c6f0a6f79 Mon Sep 17 00:00:00 2001
From: Rodney Ewing <ewing.rj@gmail.com>
Date: Tue, 21 May 2013 08:51:21 -0700
Subject: fixed translation, and changed tabs to spaces, and change it so the
 user can view their password as they're typing.

---
 mediagoblin/templates/mediagoblin/edit/change_pass.html  | 10 +++++-----
 mediagoblin/templates/mediagoblin/edit/edit_account.html | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/edit/change_pass.html b/mediagoblin/templates/mediagoblin/edit/change_pass.html
index a621751f..ff909b07 100644
--- a/mediagoblin/templates/mediagoblin/edit/change_pass.html
+++ b/mediagoblin/templates/mediagoblin/edit/change_pass.html
@@ -40,13 +40,13 @@
         {%- endtrans -%}
       </h1>
       {{ wtforms_util.render_divs(form) }}
-			{{ csrf_token }}
+      {{ csrf_token }}
       <div class="form_submit_buttons">
         <input type="submit" value="{% trans %}Save{% endtrans %}"
-				class="button_form" />
-			</div>
-		</div>
-	</form>
+        class="button_form" />
+      </div>
+    </div>
+  </form>
 {% endblock %}
 
 
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index dfb216e5..4c4aaf95 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -40,12 +40,12 @@
         {%- trans username=user.username -%}
           Changing {{ username }}'s account settings
         {%- endtrans -%}
-			</h1>
-			<p>{% trans %}Change your{% endtrans %}
-				<a href="{{ request.urlgen('mediagoblin.edit.pass') }}">
-					{% trans %}password.{% endtrans %}
-				</a>
-			</p>
+      </h1>
+      <p>
+        <a href="{{ request.urlgen('mediagoblin.edit.pass') }}">
+          {% trans %}Change your password.{% endtrans %}
+        </a>
+      </p>
       <div class="form_field_input">
         <p>{{ form.wants_comment_notification }}
            {{ wtforms_util.render_label(form.wants_comment_notification) }}</p>
@@ -53,7 +53,7 @@
       {{- wtforms_util.render_field_div(form.license_preference) }}
       <div class="form_submit_buttons">
         <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
-	{{ csrf_token }}
+  {{ csrf_token }}
       </div>
     </div>
   </form>
-- 
cgit v1.2.3