X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Fauth%2Flogin.html;h=93cd82d925ce21f9110f721a6c68ce73318d1ba7;hb=f66e4282d481fbc97e9c38eb805232a0a2d21960;hp=8b1e2296160737d04878373950bc91c53da8d75b;hpb=03be33ab292f8696dad7d7929e8e1fc2cedc069b;p=mediagoblin.git

diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 8b1e2296..93cd82d9 100644
--- 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,27 +19,37 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block mediagoblin_head %}
+  {{ super() }}
+  {% template_hook("fp_head") %}
+{% endblock %}
+
+{% block title -%}
+  {% trans %}Log in{% endtrans %} — {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
-  <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
+  <form action="{{ post_url }}"
         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 %}</div> {% endif %} {{
-      wtforms_util.render_divs(login_form) }}
+        <div class="form_field_error">
+          {% trans %}Logging in failed!{% endtrans %}
+        </div>
+      {% endif %}
+      {% template_hook("create_account") %}
+      {% template_hook("login_link") %} 
+      {{ wtforms_util.render_divs(login_form, True) }}
+      {% template_hook("fp_link") %}
       <div class="form_submit_buttons">
-        <input type="submit" value="{% trans %}Submit{% 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>
 {% endblock %}