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 /templates | |
| parent | 6042fe9aa99d6ebde6e4bae25dfc9e5f90289ed5 (diff) | |
| download | hyperkitty-89ecc99dd7e8875807c6fae142ea55fb03bf82d2.tar.gz hyperkitty-89ecc99dd7e8875807c6fae142ea55fb03bf82d2.tar.xz hyperkitty-89ecc99dd7e8875807c6fae142ea55fb03bf82d2.zip | |
CSS Styling continued
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 56 | ||||
| -rw-r--r-- | templates/lists/list_nav.html | 40 |
2 files changed, 34 insertions, 62 deletions
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> |