diff options
| author | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-07-01 09:13:12 -0400 |
|---|---|---|
| committer | Aamir Khan <syst3m.w0rm@gmail.com> | 2012-07-01 09:13:12 -0400 |
| commit | 6042fe9aa99d6ebde6e4bae25dfc9e5f90289ed5 (patch) | |
| tree | 3243f7c6b55cfbe8f6d0b402a4ee155a5d759735 /templates/base.html | |
| parent | de58d3d6fedd1ce788b03844c6ffeab54a8caa4c (diff) | |
UI Enhancements using bootstrap CSS library
Diffstat (limited to 'templates/base.html')
| -rw-r--r-- | templates/base.html | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/templates/base.html b/templates/base.html index b6d2251..363f253 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,50 +6,43 @@ <title>{% block title %}{{ app_name }}{% endblock %}</title> <meta name="author" content="" /> <meta name="dc.language" content="en" /> + <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/normalize.css" /> + <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/bootstrap.css" /> <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/style.css" /> {% block additional_stylesheets %} {% endblock %} </head> {% load i18n %} <body> - <!-- Header --> + <header> <div class="header"> + <div class="main_canvas"> + {% block header %} <div id="headline"> - <ul class="inline-block"> - {% if list_address %} - <li id="list_name"> - <a href="/list/{{list_address}}">{{list_name}}</a> - </li> - {% else %} - <li id="list_name"> - <a href="/list/">{{list_name}}</a> - </li> - {% endif %} - <li id="page_date"> - {{month}} - </li> - <li> - {% if user.is_authenticated %}<a class="mm_logout" href="{% url user_logout %}">Logout</a>{% else %}<a class="mm_user" href="{% url user_login %}">Login</a> or <a href="{% url user_registration %}"> Sign Up </a> {% endif %} - </li> - </ul> - + <ul class="user_nav"> {% if user.is_authenticated %} - <div class="mm_loginName"> - Logged in as: <a href="{% url user_profile %}">{{ user.username }}</a> - </div> + <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> {% if list_address %} - {% include 'lists/list_nav.html' %} + {% include 'lists/list_nav.html' %} {% endif %} + </div> {% endblock %} + </div> </div> - <!-- End of Header --> - <div id="content"> + </header> + + <div class="content main_canvas"> {% block content %} {% endblock %} </div> {% block footer %} {% endblock %} |