From 89ecc99dd7e8875807c6fae142ea55fb03bf82d2 Mon Sep 17 00:00:00 2001 From: Aamir Khan Date: Sun, 1 Jul 2012 19:54:42 -0400 Subject: CSS Styling continued --- static/css/style.css | 39 +++++++++--------------------- templates/base.html | 56 ++++++++++++++++++++++++++----------------- templates/lists/list_nav.html | 40 ------------------------------- views/accounts.py | 2 +- 4 files changed, 46 insertions(+), 91 deletions(-) delete mode 100644 templates/lists/list_nav.html diff --git a/static/css/style.css b/static/css/style.css index a89d6e5..1fe0b14 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -2,12 +2,6 @@ /* Generic classes */ -.main_canvas { - position: relative; - width: 960px; - margin: 0 auto; -} - .right { text-align: right; } @@ -115,19 +109,7 @@ /* Top of the page -- header */ .header { background-color: rgb(236, 236, 236); - padding: 0; -} - -.header ul { - padding: 0; - margin: 0; -} - -.header hr{ - color: rgb(204, 204, 204); - background-color: rgb(204, 204, 204); - border: 0 none; - margin-top: 0px; + min-height : 100px; } #white { @@ -159,6 +141,16 @@ padding: 5px 0 0 0; } +.user_nav a { + float: none; + padding: 10px 10px 11px; + line-height: 19px; + color: #999; + text-decoration: none; + text-shadow: 0 -1px 0 + rgba(0, 0, 0, 0.25); +} + .user_nav li { float: left; margin-left: 20px; @@ -184,14 +176,9 @@ } #list_name { - font-size: 200%; font-weight: bold; } -#list_name a { - color: rgb(77, 77, 77); -} - #page_date { font-size: 150%; } @@ -214,10 +201,6 @@ font-style: italic; } -.content { - margin: 0 auto 0 auto; -} - #recent_activities{ width: 88%; margin-top: 20px; diff --git a/templates/base.html b/templates/base.html index 363f253..ee1f66e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,35 +14,47 @@ {% load i18n %} -
-
-
+
+
+
+
+ + {% if user.is_authenticated %} +
  • + Logout +
    • +
  • + {{ user.username }} +
    • + {% else %} +
  • + Login +
    • +
  • + Sign Up +
    • + {% endif %} - {% block header %} -
    - +
      {% if list_address %} - {% include 'lists/list_nav.html' %} +
    • + {{list_address}} +
      • {% endif %} - -
    - {% endblock %} -
    -
    -
    -
    + +
    + + + + + + + +
    {% block content %} {% endblock %}
    {% block footer %} {% endblock %} diff --git a/templates/lists/list_nav.html b/templates/lists/list_nav.html deleted file mode 100644 index 0eaa411..0000000 --- a/templates/lists/list_nav.html +++ /dev/null @@ -1,40 +0,0 @@ - diff --git a/views/accounts.py b/views/accounts.py index b79943d..f586c04 100644 --- a/views/accounts.py +++ b/views/accounts.py @@ -70,7 +70,7 @@ def user_profile(request, user_email = None): def user_registration(request): if request.user.is_authenticated(): - # Already registed, redirect back to home page + # Already registered, redirect back to index page return redirect('index') if request.POST: -- cgit