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 f2e7b6646f5aeba6992d5c6e6d459ef68459d535..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 %}
-  <h2>Login:</h2>
-
   <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
         method="POST" enctype="multipart/form-data">
-
-    {% if login_failed %}
-      <p><i>Login failed!</i></p>
-    {% endif %}
-
-    <table>
-      {{ wtforms_util.render_table(login_form) }}
-      <tr>
-        <td></td>
-        <td><input type="submit" value="submit" /></td>
-      </tr>
-    </table>
-
-    {% if next %}
-      <input type="hidden" name="next" value="{{ next }}" />
-    {% endif %}
+    <div class="grid_6 prefix_1 suffix_1 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_submit_buttons">
+        <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 %}
+      {% 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 %}