diff options
| author | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-07-01 19:54:42 -0400 |
|---|---|---|
| committer | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-07-01 19:54:42 -0400 |
| commit | 89ecc99dd7e8875807c6fae142ea55fb03bf82d2 (patch) | |
| tree | 2e61a7e2a3436212f8f0d5b5041fb2b826263670 | |
| parent | 6042fe9aa99d6ebde6e4bae25dfc9e5f90289ed5 (diff) | |
| download | hyperkitty-89ecc99dd7e8875807c6fae142ea55fb03bf82d2.tar.gz hyperkitty-89ecc99dd7e8875807c6fae142ea55fb03bf82d2.tar.xz hyperkitty-89ecc99dd7e8875807c6fae142ea55fb03bf82d2.zip | |
CSS Styling continued
| -rw-r--r-- | static/css/style.css | 39 | ||||
| -rw-r--r-- | templates/base.html | 56 | ||||
| -rw-r--r-- | templates/lists/list_nav.html | 40 | ||||
| -rw-r--r-- | views/accounts.py | 2 |
4 files changed, 46 insertions, 91 deletions
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 %} <body> - <header> - <div class="header"> - <div class="main_canvas"> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <div class="nav-collapse collapse"> + + {% if user.is_authenticated %} + <li class="user_nav"> + <a class="mm_logout" style="float:right;" href="{% url user_logout %}">Logout</a> + </li> + <li class="user_nav" style="float:right;"> + <a style="float:right;" href="{% url user_profile %}">{{ user.username }}</a> + </li> + {% else %} + <li class="user_nav" style="float:right;"> + <a class="mm_user" style="float:right;" href="{% url user_login %}">Login</a> + </li> + <li class="user_nav" style="float:right;"> + <a style="float:right;" href="{% url user_registration %}"> Sign Up </a> + </li> + {% endif %} - {% block header %} - <div id="headline"> - <ul class="user_nav"> - {% if user.is_authenticated %} - <li><a class="mm_logout" href="{% url user_logout %}">Logout</a></li> - <li><a href="{% url user_profile %}">{{ user.username }}</a></li> - {% else %} - <li><a class="mm_user" href="{% url user_login %}">Login</a></li> - <li><a href="{% url user_registration %}"> Sign Up </a></li> - {% endif %} - </ul> + <ul class="nav"> {% if list_address %} - {% include 'lists/list_nav.html' %} + <li id="list_name"> + <a href="/list/{{list_address}}">{{list_address}}</a> + </li> {% endif %} - - </div> - {% endblock %} - </div> - </div> - </header> - <div class="content main_canvas"> + </ul> + </div> + </div> + </div> + </div> + + + + + <div class="container"> {% block content %} {% endblock %} </div> {% 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 @@ -<ul class="list_nav"> - {% if list_address %} - <li id="list_name"> - <a href="/list/{{list_address}}">{{list_name}}</a> - </li> - <li id="page_date"> - {{month}} - </li> - {% endif %} - -{% if month_participants and month_discussions %} - <li class="participant"> - {{month_participants}} participants - </li> - <li class="discussion"> - {{month_discussions}} discussions - </li> - <li class="saved"> - 1 saved - </li> -{% endif %} - -{% if list_address %} -<li><a href="mailto:{{list_address}}">{{list_address}}</a></li> - -<li><a href="/"> All lists </a></li> - -{% endif %} - -{% if search_form %} -<li> -<div id="searchbox"> - <form action="/search/{{list_address}}" method="get"> - {{ search_form }} - </form> -</div> -</li> -{% endif %} - -</ul> 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: |