From f3162a3bf43bb7aa49196e72ecac27385c103c57 Mon Sep 17 00:00:00 2001
From: Charles Connell <charles@connells.org>
Date: Wed, 9 Apr 2014 21:19:20 -0400
Subject: [PATCH] Messages on page headers, link colors, some nicer account
 pages

---
 karmaworld/assets/css/global.css              |  56 ++++++++-
 karmaworld/templates/404.html                 |   0
 karmaworld/templates/500.html                 |   0
 karmaworld/templates/account/base.html        |   4 +
 karmaworld/templates/account/email.html       | 110 +++++++++---------
 karmaworld/templates/account/login.html       |  46 ++++----
 karmaworld/templates/base.html                |   2 +-
 karmaworld/templates/footer.html              |   2 +-
 karmaworld/templates/header.html              |  17 ++-
 karmaworld/templates/notes/note_detail.html   |   2 +-
 .../templates/notes/search_results.html       |   2 +-
 .../templates/socialaccount/connections.html  |  65 +++++------
 karmaworld/templates/user_profile.html        |  12 +-
 13 files changed, 186 insertions(+), 132 deletions(-)
 delete mode 100644 karmaworld/templates/404.html
 delete mode 100644 karmaworld/templates/500.html

diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css
index bbe8c05..65468d2 100644
--- a/karmaworld/assets/css/global.css
+++ b/karmaworld/assets/css/global.css
@@ -37,6 +37,7 @@ p {
 
 #header-login-nav {
   text-align: right;
+  color: #ffffff;
   background: #000000;
   padding: 3px 0 3px 0;
 }
@@ -77,7 +78,8 @@ label.inline-label
   display: inline;
 }
 
-button {
+button,
+.button {
   color: white;
   border: none;
   padding: 10px;
@@ -92,13 +94,17 @@ button.important {
 }
 
 button:hover,
-button:focus {
+button:focus,
+.button:hover,
+.button:focus {
   background: #f1592a;
 }
 
 button.disabled,
 button.disabled:hover,
-button.disabled:focus {
+button.disabled:focus
+.button.disable:hover,
+.button.disabled:focus, {
   background: #333333;
   color: #bcbdc0;
   cursor: default;
@@ -108,16 +114,37 @@ button.inline-button {
   display: inline;
 }
 
+.joyride-content-wrapper .button {
+  background-color: #008CBA;
+}
+
+a,
+a:hover,
+a:focus,
+a:visited {
+  color: #802e16;
+}
+
 a {
-  color: inherit;
   text-decoration: none;
 }
 
-a:hover {
-  color: #802e16;
+a:hover,
+a:focus {
   text-decoration: underline;
 }
 
+a.inherit-color {
+  color: inherit;
+}
+
+.inherit-color a {
+  color: inherit;
+}
+
+.underline a {
+  text-decoration: underline;
+}
 
 span.table-school {
   font-weight: bold;
@@ -154,6 +181,10 @@ table.dataTable div.data-table-entry {
   margin: 20px 0 20px 0;
 }
 
+table.dataTable a {
+  color: inherit;
+}
+
 .even {
   background: #fafafa;
   border-top: 1px solid #f0f0f0;
@@ -202,4 +233,17 @@ dl.tabs dd a {
 div.tabs-content {
   margin-top: -1px;
   border-top: 1px solid #dfdfdf;
+}
+
+div.message-container {
+  margin: 20px 0 0 0;
+}
+
+ul.socialaccount_providers {
+  list-style-type: none;
+}
+
+ul.socialaccount_providers li{
+  display: inline;
+  margin: 0 5px 0 5px;
 }
\ No newline at end of file
diff --git a/karmaworld/templates/404.html b/karmaworld/templates/404.html
deleted file mode 100644
index e69de29..0000000
diff --git a/karmaworld/templates/500.html b/karmaworld/templates/500.html
deleted file mode 100644
index e69de29..0000000
diff --git a/karmaworld/templates/account/base.html b/karmaworld/templates/account/base.html
index fee6871..fa9f975 100644
--- a/karmaworld/templates/account/base.html
+++ b/karmaworld/templates/account/base.html
@@ -9,4 +9,8 @@
       </div>
     </div>
   </section>
+  {% block extra_body %}
+  {% endblock %}
 {% endblock %}
+
+
diff --git a/karmaworld/templates/account/email.html b/karmaworld/templates/account/email.html
index d25882e..d37dd3d 100644
--- a/karmaworld/templates/account/email.html
+++ b/karmaworld/templates/account/email.html
@@ -6,69 +6,65 @@
 {% block head_title %}{% trans "Account" %}{% endblock %}
 
 {% block content %}
-    <h1>{% trans "E-mail Addresses" %}</h1>
-{% if user.emailaddress_set.all %}
-<p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
-
-<form action="{% url 'account_email' %}" class="email_list" method="post">
-{% csrf_token %}
-<fieldset class="blockLabels">
-
-  {% for emailaddress in user.emailaddress_set.all %}
-<div class="ctrlHolder">
-      <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
-
-      <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
-
-{{ emailaddress.email }}
-    {% if emailaddress.verified %}
-    <span class="verified">{% trans "Verified" %}</span>
-    {% else %}
-    <span class="unverified">{% trans "Unverified" %}</span>
-    {% endif %}
-      {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
-</label>
-</div>
-  {% endfor %}
-
-<div class="buttonHolder">
-      <button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
-      <button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
-      <button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
-</div>
-
-</fieldset>
-</form>
+  <h1>{% trans "E-mail Addresses" %}</h1>
+  {% if user.emailaddress_set.all %}
+    <p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
+
+    <form action="{% url 'account_email' %}" class="email_list" method="post">
+      {% csrf_token %}
+      <fieldset class="blockLabels">
+
+      {% for emailaddress in user.emailaddress_set.all %}
+        <div class="ctrlHolder">
+          <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
+          <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
+          {{ emailaddress.email }}
+          {% if emailaddress.verified %}
+            &mdash; <span class="verified">{% trans "Verified" %}</span>
+          {% else %}
+            &mdash; <span class="unverified">{% trans "Unverified" %}</span>
+          {% endif %}
+          {% if emailaddress.primary %}&mdash; <span class="primary">{% trans "Primary" %}</span>{% endif %}
+          </label>
+        </div>
+      {% endfor %}
+
+      <div class="buttonHolder">
+        <button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
+        <button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
+        <button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
+      </div>
+
+      </fieldset>
+    </form>
 
-{% else %}
-<p><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}</p>
+  {% else %}
+    <p><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}</p>
+  {% endif %}
 
-{% endif %}
 
+  <h2>{% trans "Add E-mail Address" %}</h2>
 
-    <h2>{% trans "Add E-mail Address" %}</h2>
-
-    <form method="post" action="{% url 'account_email' %}" class="add_email">
-        {% csrf_token %}
-        {{ form.as_p}}
-        <button name="action_add" type="submit">{% trans "Add E-mail" %}</button>
-    </form>
+  <form method="post" action="{% url 'account_email' %}" class="add_email">
+    {% csrf_token %}
+    {{ form.as_p}}
+    <button name="action_add" type="submit">{% trans "Add E-mail" %}</button>
+  </form>
 
 {% endblock %}
 
-
 {% block extra_body %}
-<script type="text/javascript">
-(function() {
-  var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
-  var actions = document.getElementsByName('action_remove');
-  if (actions.length) {
-    actions[0].addEventListener("click", function(e) {
-      if (! confirm(message)) {
-        e.preventDefault();
-      }
-    });
-  }
-})();
-</script>
+  <script type="text/javascript">
+  (function() {
+    var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
+    var actions = document.getElementsByName('action_remove');
+    if (actions.length) {
+      actions[0].addEventListener("click", function(e) {
+        if (! confirm(message)) {
+          e.preventDefault();
+        }
+      });
+    }
+  })();
+  </script>
 {% endblock %}
diff --git a/karmaworld/templates/account/login.html b/karmaworld/templates/account/login.html
index 6857607..4897ff4 100644
--- a/karmaworld/templates/account/login.html
+++ b/karmaworld/templates/account/login.html
@@ -8,35 +8,33 @@
 
 {% block content %}
 
-<h1>{% trans "Sign In" %}</h1>
+  <h1>{% trans "Sign In" %}</h1>
 
-{% if socialaccount.providers  %}
-<p>You can sign in to KarmaNotes with any of the existing accounts you might have below.
-Or, <a href="{{ signup_url }}">sign up</a> for a KarmaNotes account and sign in below.</p>
+  {% if socialaccount.providers  %}
+    <p>You can sign in to KarmaNotes with any of the existing accounts you might have below.
+    Or, <a href="{{ signup_url }}">sign up</a> for a KarmaNotes account and sign in below.</p>
 
-<div class="socialaccount_ballot">
+    <div class="socialaccount_ballot">
 
-  <ul class="socialaccount_providers">
-    {% include "socialaccount/snippets/provider_list.html" with process="login" %}
-  </ul>
+      <ul class="socialaccount_providers">
+        {% include "socialaccount/snippets/provider_list.html" with process="login" %}
+      </ul>
 
-  <div class="login-or">{% trans 'or' %}</div>
+    </div>
 
-</div>
-
-{% else %}
-<p>{% blocktrans %}If you have not created an account yet, then please
-<a href="{{ signup_url }}">sign up</a> first.{% endblocktrans %}</p>
-{% endif %}
-
-<form class="login" method="POST" action="{% url 'account_login' %}">
-  {% csrf_token %}
-  {{ form.as_p }}
-  {% if redirect_field_value %}
-  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+  {% else %}
+    <p>{% blocktrans %}If you have not created an account yet, then please
+      <a href="{{ signup_url }}">sign up</a> first.{% endblocktrans %}</p>
   {% endif %}
-  <a class="button secondaryAction" href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
-  <button class="primaryAction" type="submit">{% trans "Sign In" %}</button>
-</form>
+
+  <form class="login" method="POST" action="{% url 'account_login' %}">
+    {% csrf_token %}
+    {{ form.as_p }}
+    {% 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 "Forgot Password?" %}</a>
+    <button class="primaryAction" type="submit">{% trans "Sign In" %}</button>
+  </form>
 
 {% endblock %}
diff --git a/karmaworld/templates/base.html b/karmaworld/templates/base.html
index 52b25b9..109c495 100644
--- a/karmaworld/templates/base.html
+++ b/karmaworld/templates/base.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width" />
-  <title>KarmaNotes -- {% block title %}{% endblock %}</title>
+  <title>KarmaNotes -- {% block title %}{% endblock %}{% block head_title %}{% endblock %}</title>
 	
   <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico">
   <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/fontface/fontface.css">
diff --git a/karmaworld/templates/footer.html b/karmaworld/templates/footer.html
index 331cbf3..f07d114 100644
--- a/karmaworld/templates/footer.html
+++ b/karmaworld/templates/footer.html
@@ -1,6 +1,6 @@
 {% load url from future %}
 
-<footer id="global_footer">
+<footer id="global_footer" class="underline inherit-color">
   <div class="row">
     <div id="footer-links-container" class="small-12 columns">
       <a href="{% url 'about' %}">About</a>&nbsp;|&nbsp;<a href="{% url 'terms' %}">Terms</a>&nbsp;|&nbsp;<a href="https://github.com/FinalsClub/karmaworld">Code</a>&nbsp;|&nbsp;<a href="http://www.reddit.com/r/KarmaNotes/">Discussion</a>&nbsp;<!--|&nbsp;<a href="#">Donate</a>-->
diff --git a/karmaworld/templates/header.html b/karmaworld/templates/header.html
index 7631739..d59f094 100644
--- a/karmaworld/templates/header.html
+++ b/karmaworld/templates/header.html
@@ -8,8 +8,8 @@
       <div class="row nav-list">
         <div class="large-12 columns">
           <ul>
-            <li><a href="{% url 'accounts_profile' %}">{{ request.user.get_profile.get_points }} Karma Points</a></li>
-            <li><a href="{% url 'account_logout' %}">Log Out</a></li>
+            <li><a href="{% url 'accounts_profile' %}" class="inherit-color">{{ request.user.get_profile.get_points }} Karma Points</a></li>
+            <li><a href="{% url 'account_logout' %}" class="inherit-color">Log Out</a></li>
           </ul>
         </div>
       </div>
@@ -45,3 +45,16 @@
 
 </header><!--/global header-->
 
+{% if messages %}
+  {% for message in messages %}
+    <div class="row">
+      <div class="small-12 columns message-container">
+        <div data-alert class="alert-box radius {{ message.tags }}
+          {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}warning{% endif %}
+          {% if message.level == DEFAULT_MESSAGE_LEVELS.DEBUG %}info{% endif %}">
+          {{ message }}
+        </div>
+      </div>
+    </div>
+  {% endfor %}
+{% endif %}
diff --git a/karmaworld/templates/notes/note_detail.html b/karmaworld/templates/notes/note_detail.html
index e30c27b..a0c7757 100644
--- a/karmaworld/templates/notes/note_detail.html
+++ b/karmaworld/templates/notes/note_detail.html
@@ -47,7 +47,7 @@
     <div class="return-to-course show-for-large-up">
       <div class="row">
         <div class="small-12 columns">
-          <a href="{{ note.course.get_absolute_url }}">
+          <a href="{{ note.course.get_absolute_url }}" class="inherit-color">
             <i class="fa fa-angle-double-left"></i> See all notes for {{ note.course.name }}
           </a>
         </div>
diff --git a/karmaworld/templates/notes/search_results.html b/karmaworld/templates/notes/search_results.html
index ff51b1a..6c59cac 100644
--- a/karmaworld/templates/notes/search_results.html
+++ b/karmaworld/templates/notes/search_results.html
@@ -24,7 +24,7 @@
     <div class="return-to-course show-for-large-up">
       <div class="row">
         <div class="small-12 columns">
-          <a href="{{ course.get_absolute_url }}">
+          <a href="{{ course.get_absolute_url }}" class="inherit-color">
             <i class="fa fa-angle-double-left"></i> See all notes for {{ course.name }}
           </a>
         </div>
diff --git a/karmaworld/templates/socialaccount/connections.html b/karmaworld/templates/socialaccount/connections.html
index d24cf00..204a37a 100644
--- a/karmaworld/templates/socialaccount/connections.html
+++ b/karmaworld/templates/socialaccount/connections.html
@@ -6,48 +6,47 @@
 {% block head_title %}{% trans "Account Connections" %}{% endblock %}
 
 {% block content %}
-<h1>{% trans "Account Connections" %}</h1>
+  <h1>{% trans "Account Connections" %}</h1>
 
-{% if form.accounts %}
-<p>{% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}</p>
+  {% if form.accounts %}
+    <p>{% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}</p>
 
 
-<form method="post" action="{% url 'socialaccount_connections' %}">
-{% csrf_token %}
+    <form method="post" action="{% url 'socialaccount_connections' %}">
+      {% csrf_token %}
 
-<fieldset>
-{% if form.non_field_errors %}
-<div id="errorMsg">{{form.non_field_errors}}</div>
-{% endif %}
+      <fieldset>
+        {% if form.non_field_errors %}
+          <div id="errorMsg">{{form.non_field_errors}}</div>
+        {% endif %}
 
-{% for base_account in form.accounts %}
-{% with base_account.get_provider_account as account %}
-<div>
-<label for="id_account_{{base_account.id}}">
-<input id="id_account_{{base_account.id}}" type="radio" name="account" value="{{base_account.id}}"/>
-<span class="socialaccount_provider {{base_account.provider}} {{account.get_brand.id}}">{{account.get_brand.name}}</span>
-{{account}}
-</label>
-</div>
-{% endwith %}
-{% endfor %}
+        {% for base_account in form.accounts %}
+          {% with base_account.get_provider_account as account %}
+            <div>
+              <label for="id_account_{{base_account.id}}">
+                <input id="id_account_{{base_account.id}}" type="radio" name="account" value="{{base_account.id}}"/>
+                <span class="socialaccount_provider {{base_account.provider}} {{account.get_brand.id}}">{{account.get_brand.name}}</span>
+                &mdash; {{account}}
+              </label>
+            </div>
+          {% endwith %}
+        {% endfor %}
 
-<div>
-<button type="submit">{% trans 'Remove' %}</button>
-</div>
+        <div>
+          <button type="submit">{% trans 'Remove' %}</button>
+        </div>
 
-</fieldset>
+      </fieldset>
+    </form>
 
-</form>
+  {% else %}
+    <p>{% trans 'You currently have no social network accounts connected to this account.' %}</p>
+  {% endif %}
 
-{% else %}
-<p>{% trans 'You currently have no social network accounts connected to this account.' %}</p>
-{% endif %}
+  <h2>{% trans 'Add a 3rd Party Account' %}</h2>
 
-<h2>{% trans 'Add a 3rd Party Account' %}</h2>
-
-<ul class="socialaccount_providers">
-{% include "socialaccount/snippets/provider_list.html" with process="connect" %}
-</ul>
+  <ul class="socialaccount_providers">
+    {% include "socialaccount/snippets/provider_list.html" with process="connect" %}
+  </ul>
 
 {% endblock %}
diff --git a/karmaworld/templates/user_profile.html b/karmaworld/templates/user_profile.html
index 914d984..5dd52ff 100644
--- a/karmaworld/templates/user_profile.html
+++ b/karmaworld/templates/user_profile.html
@@ -61,10 +61,10 @@
                           </div>
                           {% if item.0 == 'NoteKarmaEvent' %}
                             <div class="small-12 columns activity_details_object">
-                              <a href="{{ event.note.get_absolute_url }}" class="activity_target">{{ event.note.name }}</a>
+                              <a href="{{ event.note.get_absolute_url }}" class="activity_target inherit-color">{{ event.note.name }}</a>
                             </div>
                             <div class="small-12 columns activity_details_context">
-                              <a href="{{ event.note.course.get_absolute_url }}" class="course_link">{{ event.note.course.name }} &bull;
+                              <a href="{{ event.note.course.get_absolute_url }}" class="course_link inherit-color">{{ event.note.course.name }} &bull;
                                 {% if event.note.course.school %}
                                   {{ event.note.course.school.name }}
                                 {% else %}
@@ -75,7 +75,7 @@
                           {% endif %}
                           {% if item.0 == 'CourseKarmaEvent' %}
                             <div class="small-12 columns activity_details_object">
-                              <a href="{{ event.course.get_absolute_url }}" class="activity_target">{{ event.course.name }}</a>
+                              <a href="{{ event.course.get_absolute_url }}" class="activity_target inherit-color">{{ event.course.name }}</a>
                             </div>
                             <div class="small-12 columns activity_details_context">
                               {{ event.course.school.name }}
@@ -122,7 +122,7 @@
                     {{ user.email }}
                   </div>
                   <div class="small-12 large-2 columns account_settings_edit">
-                    <a href="{% url 'account_email' %}"><i class="fa fa-pencil"></i> Edit</a>
+                    <a href="{% url 'account_email' %}" class="inherit-color"><i class="fa fa-pencil"></i> Edit</a>
                   </div>
                 </div>
               </div>
@@ -135,7 +135,7 @@
                     ********
                   </div>
                   <div class="small-12 large-2 columns account_settings_edit">
-                    <a href="{% url 'account_change_password' %}"><i class="fa fa-pencil"></i> Edit</a>
+                    <a href="{% url 'account_change_password' %}" class="inherit-color"><i class="fa fa-pencil"></i> Edit</a>
                   </div>
                 </div>
               </div>
@@ -148,7 +148,7 @@
                     {% social_account_list request.user %}
                   </div>
                   <div class="small-12 large-2 columns account_settings_edit">
-                    <a href="{% url 'socialaccount_connections' %}"><i class="fa fa-pencil"></i> Edit</a>
+                    <a href="{% url 'socialaccount_connections' %}" class="inherit-color"><i class="fa fa-pencil"></i> Edit</a>
                   </div>
                 </div>
               </div>
-- 
2.25.1