Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-mediagoblin

4 files changed, 22 insertions, 28 deletions

diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 02bfb91f..22a57b70 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -20,25 +20,22 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-  <h1>Login:</h1>
 
   <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" class="button"/></td>
-      </tr>
-    </table>
-
-    {% if next %}
-      <input type="hidden" name="next" value="{{ next }}" class="button" />
-    {% endif %}
+    <div class="login_box form_box">
+      <h1>Log in</h1>
+      {% if login_failed %}
+        <div class="form_field_error">Login failed!</div>
+      {% endif %}
+      {{ wtforms_util.render_divs(login_form) }}
+      <div class="form_submit_buttons">
+        <input type="submit" value="submit" class="button"/>
+      </div>
+      {% if next %}
+        <input type="hidden" name="next" value="{{ next }}" class="button" />
+      {% endif %}
+      <p>Don't have an account yet? <a href="{{ request.urlgen('mediagoblin.auth.register') }}">Create one here!</a></p>
+    </div>
   </form>
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html
index 31c3d23e..730d684d 100644
--- a/mediagoblin/templates/mediagoblin/auth/register.html
+++ b/mediagoblin/templates/mediagoblin/auth/register.html
@@ -20,11 +20,11 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-  <h2>Create an account!</h2>
 
   <form action="{{ request.urlgen('mediagoblin.auth.register') }}"
         method="POST" enctype="multipart/form-data">
     <div class="register_box form_box">
+      <h1>Create an account!</h1>
       {{ wtforms_util.render_divs(register_form) }}
       <div class="form_submit_buttons">
         <input type="submit" value="submit" class="button" />
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 3306448d..0ba09646 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -34,9 +34,8 @@
               {% endblock %}{% block mediagoblin_header_title %}GNU MediaGoblin Home{% endblock %}
         <div class="mediagoblin_header_right">
           {% if request.user %}
-                Welcome {{ request.user['username'] }}! --
-                <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">
-                  Logout</a>
+                {{ request.user['username'] }}'s account 
+                (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
           {% else %}
                 <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
                   Login</a>
diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 4a37ab33..9adf8e53 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -26,13 +26,11 @@
       {%- endif %}
       <div class="form_field_input">{{ field }}</div>
       {%- if field.errors -%}
-        <div class="form_field_errors">
-          <ul>
-            {% for error in field.errors %}
-              <li>{{ error }}</li>
-            {% endfor %}
-          </ul>
-        </div>
+        {% for error in field.errors %}
+          <div class="form_field_error">
+            {{ error }}
+          </div>
+        {% endfor %}
       {%- endif %}
     </div>
   {% endfor %}