Commit 54cc93a8 by Alec Perkins

Rework nav to use Bootstrap's Navbar.

parent 5043b9f6
...@@ -20,26 +20,36 @@ ...@@ -20,26 +20,36 @@
</head> </head>
<body class="{% block bodyclass %}{% endblock %}"> <body class="{% block bodyclass %}{% endblock %} container">
<div id="container">
<div id="header"> <div class="navbar">
<div id="branding"> <div class="navbar-inner">
<h1 id="site-name">{% block branding %}<a href='http://django-rest-framework.org'>Django REST framework</a> <span class="version"> v {{ version }}</span>{% endblock %}</h1> <span class="brand" href="/">
</div> {% block branding %}<a href='http://django-rest-framework.org'>Django REST framework</a> <span class="version"> v {{ version }}</span>{% endblock %}
<div id="user-tools"> </span>
{% block userlinks %} {% block userlinks %}
<ul class="nav pull-right">
{% if user.is_active %} {% if user.is_active %}
Welcome, {{ user }}. <li class="dropdown">
{% optional_login %} <a href="#" class="dropdown-toggle" data-toggle="dropdown">
Welcome, {{ user }}
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li>{% optional_logout %}</li>
</ul>
</li>
{% else %} {% else %}
{% optional_logout %} <li>{% optional_login %}</li>
{% endif %} {% endif %}
</ul>
{% endblock %} {% endblock %}
</div> </div>
{% block nav-global %}{% endblock %}
</div> </div>
{% block nav-global %}{% endblock %}
<div class="breadcrumbs"> <div class="breadcrumbs">
{% block breadcrumbs %} {% block breadcrumbs %}
{% for breadcrumb_name, breadcrumb_url in breadcrumblist %} {% for breadcrumb_name, breadcrumb_url in breadcrumblist %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment