Merge remote branch 'remotes/osamak/master'

[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 c056398ac98ba197916b26f288b6178455f6997b..8b1e2296160737d04878373950bc91c53da8d75b 100644 (file)
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -20,25 +20,26 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-
   <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
         method="POST" enctype="multipart/form-data">
-    <div class="grid_3 alpha">&nbsp;</div>
-    <div class="grid_4 prefix_1 suffix_1 form_box">
-      <h1>Log in</h1>
+    <div class="grid_6 prefix_1 suffix_1 form_box">
+      <h1>{% trans %}Log in{% endtrans %}</h1>
       {% if login_failed %}
-        <div class="form_field_error">Login failed!</div>
-      {% endif %}
-      {{ wtforms_util.render_divs(login_form) }}
+        <div class="form_field_error">{% trans %}Login failed!{%
+      endtrans %}</div> {% endif %} {{
+      wtforms_util.render_divs(login_form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="submit" class="button"/>
+        <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button"/>
       </div>
       {% if next %}
         <input type="hidden" name="next" value="{{ next }}" class="button"
                style="display: none;"/>
       {% endif %}
-      <p>Don't have an account yet? <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Create one here!</a></p>
+      {% 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>
-    <div class="grid_3 omega">&nbsp;</div>
   </form>
 {% endblock %}