Text edits and rearrangements to login.html

diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 61c5a20334ab7418cc8b3d9fbcc190bee54604a1..756f67c08cce4e93c6c2a5df8312b5fa00b3fb23 100644 (file)
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -30,27 +30,23 @@
           {% trans %}Logging in failed!{% endtrans %}
         </div>
       {% endif %}
-      {{ wtforms_util.render_divs(login_form) }}
-      <div class="form_submit_buttons">
-        <input type="submit" value="{% trans %}Log in{% 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 %}Don't have an account yet?{% endtrans %} <a href="{{ request.urlgen('mediagoblin.auth.register') }}">
             {%- trans %}Create one here!{% endtrans %}</a>
         </p>
+      {% endif %}
+      {{ wtforms_util.render_divs(login_form) }}
         <p>
-          {% trans %}Forgot your password?{% endtrans %}
-          <br />
           <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}">
-            {%- trans %}Change it!{% endtrans %}</a>
+          {% trans %}Forgot your password?{% endtrans %}</a>
         </p>
+      <div class="form_submit_buttons">
+        <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/>
+      </div>
+      {% if next %}
+        <input type="hidden" name="next" value="{{ next }}" class="button"
+               style="display: none;"/>
       {% endif %}
     </div>
   </form>