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 8161ea9dfa16771dd6d6001adb3bf5ebc0a48ed3..2adbe5470717a225f7da857a353317a840465606 100644 (file)
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -24,6 +24,10 @@
           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">
@@ -42,10 +46,12 @@
         </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_form"/>
       </div>
@@ -55,4 +61,6 @@
       {% endif %}
     </div>
   </form>
+<!-- Focus the field passed in with the focus arg-->
+<script>$(document).ready(function(){$({{ focus }}).focus();});</script>
 {% endblock %}