Merge remote-tracking branch 'upstream/master' into basic_auth

[mediagoblin.git] / mediagoblin / templates / mediagoblin / auth / login.html

diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 8fe45f2d4db65263601ee9b9e10305b1356d3aed..2adbe5470717a225f7da857a353317a840465606 100644 (file)
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -1,6 +1,6 @@
 {#
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# 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
@@ -19,32 +19,48 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block mediagoblin_head %}
+  <script type="text/javascript"
+          src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script>
+{% endblock %}
+
+{% block title -%}
+  {% trans %}Log in{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
         method="POST" enctype="multipart/form-data">
-    <div class="grid_6 prefix_1 suffix_1 form_box">
+    {{ csrf_token }}
+    <div class="form_box">
       <h1>{% trans %}Log in{% endtrans %}</h1>
       {% if login_failed %}
         <div class="form_field_error">
-          {% trans %}Login failed!{% endtrans %}
+          {% trans %}Logging in failed!{% endtrans %}
         </div>
       {% endif %}
+      {% if allow_registration %}
+        <p>
+          {% trans %}Don't have an account yet?{% endtrans %} <a href="{{ request.urlgen('mediagoblin.auth.register') }}">
+            {%- trans %}Create one here!{% endtrans %}</a>
+        </p>
+      {% endif %}
       {{ wtforms_util.render_divs(login_form) }}
+      {% if pass_auth %}
+        <p>
+          <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" id="forgot_password">
+          {% trans %}Forgot your password?{% endtrans %}</a>
+        </p>
+      {% endif %}
       <div class="form_submit_buttons">
-        <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/>
+        <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button_form"/>
       </div>
       {% if next %}
-        <input type="hidden" name="next" value="{{ next }}" class="button"
+        <input type="hidden" name="next" value="{{ next }}" class="button_form"
                style="display: none;"/>
       {% endif %}
-      {% if allow_registration %}
-        <p>
-          {% trans %}Don't have an account yet?{% endtrans %}
-          <br />
-          <a href="{{ request.urlgen('mediagoblin.auth.register') }}">
-            {%- trans %}Create one here!{% endtrans %}</a>
-        </p>
-      {% endif %}
     </div>
   </form>
+<!-- Focus the field passed in with the focus arg-->
+<script>$(document).ready(function(){$({{ focus }}).focus();});</script>
 {% endblock %}