Designing login page

diff --git a/app/static/src/sass/global/_forms.scss b/app/static/src/sass/global/_forms.scss
index 8a2c510d72e64483e9b80c272a175550c7281fc3..17bc378935b3a620007ac4922d9cee10a516329b 100644 (file)
--- a/app/static/src/sass/global/_forms.scss
+++ b/app/static/src/sass/global/_forms.scss
@@ -44,7 +44,7 @@ $module: ".form";
         }
     }
 
-    input[type="text"], input[type="email"], textarea {
+    input[type="text"], input[type="email"], input[type="password"], textarea {
 
         @include font-size(m);
         @include line-height(1);

diff --git a/app/templates/accounts/account_form.html b/app/templates/accounts/account_form.html
index 1f4d44f86d3a3ac8eb5763082af24e8712c46c23..a2d8b05a6c55edf272c0d8b8ad8be65a7e20dfd3 100644 (file)
--- a/app/templates/accounts/account_form.html
+++ b/app/templates/accounts/account_form.html
@@ -1,20 +1,7 @@
-{% extends "base.html" %}
 {% load i18n mezzanine_tags %}
-
-{% block meta_title %}{{ title }}{% endblock %}
-{% block title %}{{ title }}{% endblock %}
-{% block body_id %}account{% endblock %}
-
-{% block breadcrumb_menu %}
-{{ block.super }}
-<li>{{ title }}</li>
-{% endblock %}
-
-{% block main %}
-
 {% errors_for form %}
 
-<form method="post"{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
+<form class="form" method="post"{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
     <fieldset>
     <legend>{{ title }}</legend>
     {% fields_for form %}
@@ -25,4 +12,3 @@
     </div>
     </fieldset>
 </form>
-{% endblock %}

diff --git a/app/templates/accounts/account_login.html b/app/templates/accounts/account_login.html
index 5b10cb7b0767ff9df0430b17ac679c209c3a6f9d..9bd1a40264db74d6c6d265e086e7453757f8e474 100644 (file)
--- a/app/templates/accounts/account_login.html
+++ b/app/templates/accounts/account_login.html
@@ -1,17 +1,28 @@
-{% extends "accounts/account_form.html" %}
+{% extends "pages/page.html" %}
+
 {% load i18n %}
 
-{% block main %}
+{% block meta_title %}
+       {% trans "Page not found" %}
+{% endblock %}
+
+{% block page_class %}
+       custompage
+{% endblock %}
 
+{% block page_title %}
+       <h1 class="dotted">{% trans "Login" %}</h1>
+{% endblock %}
+
+{% block page_content %}
 {% if request.user.is_authenticated %}
     <p>{% trans "You're already logged in. If you'd like to log in as a different user, you'll need to log out first." %}</p>
 {% else %}
-    {{ block.super }}
+    {% include 'accounts/account_form.html'%}
     {% url "signup" as signup_url %}
     <p>{% blocktrans with request.GET.next as next %}If you don't have an account you can <a href="{{ signup_url }}?next={{ next }}">sign up</a> for one now.{% endblocktrans %}</p>
     {% url "mezzanine_password_reset" as password_reset_url %}
     {% url "profile_update" as profile_update_url %}
     {% blocktrans %}<p>You can also <a href="{{ password_reset_url }}?next={{ profile_update_url }}">reset your password</a> if you've forgotten it.</p>{% endblocktrans %}</p>
 {% endif %}
-
 {% endblock %}

diff --git a/app/templates/includes/form_fields.html b/app/templates/includes/form_fields.html
index f3d8697beaaa601d8c62cedf9168ea5f32881061..da26ee4c5e3efac1352a0d209aa9e0be7a6829c1 100644 (file)
--- a/app/templates/includes/form_fields.html
+++ b/app/templates/includes/form_fields.html
@@ -11,8 +11,10 @@
 {% else %}
 <div class="form-group input_{{ field.id_for_label }} {{ field.field.type }}
     {% if field.errors %} has-error{% endif %}">
+    <p>
     {% if field.label %}<label class="control-label" for="{{ field.auto_id }}">{{ field.label }}</label>{% endif %}
     {{ field }}
+    </p>
     {% if field.errors %}
     <p class="help-block">
         {% for e in field.errors %}