Merge pull request #114 from opdemand/113-controller-web-ui

Aligned the Deis web UI with the deis.io/docset theme.

Author: mboersma

deis/settings.py

@@ -137,6 +137,7 @@
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
+    'django.contrib.humanize',
     'django.contrib.messages',
     'django.contrib.sessions',
     'django.contrib.sites',

web/templates/account/email.html

@@ -50,7 +50,7 @@ <h2>{% trans "Add E-mail Address" %}</h2>
 
     <form method="post" action="" class="add_email uniForm">
         {% csrf_token %}
-        {{ add_email_form.as_p}}
+        {{ form.as_p}}
         <button name="action_add" type="submit">{% trans "Add E-mail" %}</button>
     </form>
 

web/templates/account/login.html

@@ -4,18 +4,22 @@
 {% load account %}
 {% load url from future %}
 
-{% block head_title %}{% trans "Log in" %}{% endblock %}
+{% block head_title %}{% trans "Sign In" %}{% endblock %}
 
 {% block content %}
 
-<div class="span5 offset3">
-<a href="{{ signup_url }}">Sign up</a> for a {{ site.name }} account
+<h1>{% trans "Log In" %}</h1>
 
-{% if socialaccount.providers %}
+<p>{% blocktrans %}Need an account? <a href="{{ signup_url }}"><strong>Sign up</strong></a>.{% endblocktrans %}</p>
+
+{% if socialaccount.providers  %}
+<p>{% blocktrans with site.name as site_name %}Please log in with one
+of your existing third party accounts.{% endblocktrans %}</p>
 <div class="socialaccount_ballot">
   <ul class="socialaccount_providers">
     {% include "socialaccount/snippets/provider_list.html" with process="login" %}
   </ul>
+  <div class="login-or">{% trans 'or' %}</div>
 </div>
 {% include "socialaccount/snippets/login_extra.html" %}
 {% endif %}
@@ -26,10 +30,9 @@
   {% if redirect_field_value %}
   <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
   {% endif %}
-  <a class="button secondaryAction" href="{% url 'account_reset_password' %}">{% trans "Reset Password" %}</a><br>
-  <button class="primaryAction" type="submit">{% trans "Log in" %}</button>
+  <a class="button secondaryAction" href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
+  <button class="primaryAction" type="submit">{% trans "Log In" %}</button>
 </form>
 
-</div>
 {% endblock %}
 

web/templates/account/password_change.html

@@ -8,7 +8,7 @@ <h1>{% trans "Change Password" %}</h1>
 
     <form method="POST" action="" class="password_change">
         {% csrf_token %}
-        {{ password_change_form.as_p }}
+        {{ form.as_p }}
         <button type="submit" name="action">{% trans "Change Password" %}</button>
     </form>
 {% endblock %}

web/templates/account/password_reset.html

@@ -11,15 +11,15 @@ <h1>{% trans "Password Reset" %}</h1>
     {% if user.is_authenticated %}
     {% include "account/snippets/already_logged_in.html" %}
     {% endif %}
-    
-    <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
-    
+
+    <p>{% trans "Can't remember your password?<br>Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
+
     <form method="POST" action="" class="password_reset">
         {% csrf_token %}
-        {{ password_reset_form.as_p }}
+        {{ form.as_p }}
         <input type="submit" value="{% trans "Reset My Password" %}" />
     </form>
-    
+
     <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
 {% endblock %}
 

web/templates/account/password_reset_from_key_done.html

@@ -0,0 +1,10 @@
+{% extends "account/base.html" %}
+
+{% load url from future %}
+{% load i18n %}
+{% block head_title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "Change Password" %}</h1>
+    <p>{% trans 'Your password is now changed.' %}</p>
+{% endblock %}

web/templates/account/password_set.html

@@ -9,7 +9,7 @@ <h1>{% trans "Set Password" %}</h1>
 
     <form method="POST" action="" class="password_set">
         {% csrf_token %}
-        {{ password_set_form.as_p }}
+        {{ form.as_p }}
         <input type="submit" name="action" value="{% trans "Set Password" %}"/>
     </form>
 {% endblock %}

web/templates/account/signup.html

@@ -8,7 +8,7 @@
 {% block content %}
 <h1>{% trans "Sign Up" %}</h1>
 
-<p>{% blocktrans %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktrans %}</p>
+<p>{% blocktrans %}Already have an account? <a href="{{ login_url }}"><strong>Log in</strong></a>.{% endblocktrans %}</p>
 
 <form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
   {% csrf_token %}

web/templates/socialaccount/login_cancelled.html

@@ -9,7 +9,7 @@
 
 <h1>{% trans "Login Cancelled" %}</h1>
 
-{% url 'socialaccount_login' as login_url %}
+{% url 'account_login' as login_url %}
 
 <p>{% blocktrans %}You decided to cancel logging in to our site using one of your existing accounts. If this was a mistake, please proceed to <a href="{{login_url}}">sign in</a>.{% endblocktrans %}</p>
 

web/templates/web/account.html

@@ -1,5 +1,18 @@
 {% extends "web/base.html" %}
+{% load gravatar_tags %}
+{% load i18n %}
 
 {% block content %}
 <h2>{{ request.user }}'s Account</a></h2>
+<img src="{% gravatar_url request.user.email %}" class="img-circle" height="64" width="64">
+<form method="post" action="{% url 'account_logout' %}">
+  {% csrf_token %}
+  {% if redirect_field_value %}
+  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
+  {% endif %}
+  <button type="submit">{% trans 'Log Out' %}</button>
+</form>
+{% if user.is_staff %}
+<a href="{% url 'admin:index' %}">Admin</a>
+{% endif %}
 {% endblock %}