Commit 9248e117b207c42d1ea34a3393a2671f92b27567
1 parent
8f9af324
Exists in
master
and in
39 other branches
Replacing trac navbar by dropdown in mainmenu
Showing
5 changed files
with
15 additions
and
34 deletions
Show diff stats
src/proxy/diazo/trac.xml
| ... | ... | @@ -6,12 +6,10 @@ |
| 6 | 6 | <replace css:theme="#trac-css" content="//head/link" /> |
| 7 | 7 | <replace css:theme="#trac-js" content="//head/script" /> |
| 8 | 8 | |
| 9 | - <after css:theme-children="#trac-navbar" css:content-children="#mainnav ul" /> | |
| 10 | 9 | <before css:theme-children="#main-content" css:content="#main" /> |
| 11 | 10 | |
| 12 | 11 | <after theme-children="/html/head"> |
| 13 | 12 | <style> |
| 14 | - body { padding-bottom: 70px; } | |
| 15 | 13 | .navbar .nav ul { font-size: 14px; text-align: left; } |
| 16 | 14 | .navbar .nav li { border: 0; padding: 0; } |
| 17 | 15 | :link:not(.btn), | ... | ... |
src/proxy/templates/proxy/trac.html
| ... | ... | @@ -5,26 +5,3 @@ |
| 5 | 5 | <placeholder id="trac-js"/> |
| 6 | 6 | {{ block.super }} |
| 7 | 7 | {% endblock %} |
| 8 | - | |
| 9 | -{% block navbar %} | |
| 10 | - {{ block.super }} | |
| 11 | - | |
| 12 | - <nav class="navbar navbar-inverse navbar-fixed-bottom trac" role="navigation"> | |
| 13 | - <div class="container"> | |
| 14 | - <div class="navbar-header"> | |
| 15 | - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-trac"> | |
| 16 | - <span class="sr-only">Toggle navigation</span> | |
| 17 | - <span class="icon-bar"></span> | |
| 18 | - <span class="icon-bar"></span> | |
| 19 | - <span class="icon-bar"></span> | |
| 20 | - </button> | |
| 21 | - <a class="navbar-brand" href="/wiki">Trac</a> | |
| 22 | - </div> | |
| 23 | - | |
| 24 | - <div class="collapse navbar-collapse navbar-trac"> | |
| 25 | - <ul id="trac-navbar" class="nav navbar-nav"> | |
| 26 | - </ul> | |
| 27 | - </div> | |
| 28 | - </div> | |
| 29 | - </nav> | |
| 30 | -{% endblock %} | ... | ... |
src/proxy/urls.py
| ... | ... | @@ -6,8 +6,8 @@ from .views import TracProxyView, JenkinsProxyView |
| 6 | 6 | |
| 7 | 7 | urlpatterns = patterns('', |
| 8 | 8 | # Trac URLs |
| 9 | - url(r'^(?P<path>(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment).*)$', | |
| 10 | - TracProxyView.as_view()), | |
| 9 | + url(r'^(?P<path>(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment|diff).*)$', | |
| 10 | + TracProxyView.as_view()), | |
| 11 | 11 | |
| 12 | 12 | # Jenkins URLs |
| 13 | 13 | url(r'^ci/(?P<path>.*)$', JenkinsProxyView.as_view()), | ... | ... |
src/static/css/screen.css
| 1 | 1 | |
| 2 | - | |
| 3 | 2 | body { |
| 4 | - padding-top: 70px; | |
| 3 | + padding-top: 57px; | |
| 5 | 4 | } |
| 6 | 5 | |
| 7 | - | |
| 8 | 6 | /* Header */ |
| 9 | 7 | |
| 10 | 8 | #header-searchbox { |
| ... | ... | @@ -16,7 +14,7 @@ body { |
| 16 | 14 | } |
| 17 | 15 | |
| 18 | 16 | .navbar-default .navbar-brand, |
| 19 | -.navbar a.dropdown-toggle { | |
| 17 | +.navbar a.dropdown-toggle.user { | |
| 20 | 18 | padding: 0; |
| 21 | 19 | margin-top: 5px; |
| 22 | 20 | margin-left: 10px; | ... | ... |
src/templates/base.html
| ... | ... | @@ -70,8 +70,16 @@ |
| 70 | 70 | <li> |
| 71 | 71 | <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a> |
| 72 | 72 | </li> |
| 73 | - <li> | |
| 74 | - <a href="/wiki">{% trans "Contribute" %}</a> | |
| 73 | + <li class="dropdown"> | |
| 74 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Contribute" %} <b class="caret"></b></a> | |
| 75 | + <ul class="dropdown-menu"> | |
| 76 | + <li><a href="/wiki">Wiki</a></li> | |
| 77 | + <li><a href="/timeline">Timeline</a></li> | |
| 78 | + <li><a href="/roadmap">Roadmap</a></li> | |
| 79 | + <li><a href="/browser">Browse Source</a></li> | |
| 80 | + <li><a href="/report">View Tickets</a></li> | |
| 81 | + <li><a href="/tags">Tags</a></li> | |
| 82 | + </ul> | |
| 75 | 83 | </li> |
| 76 | 84 | </ul> |
| 77 | 85 | |
| ... | ... | @@ -81,7 +89,7 @@ |
| 81 | 89 | <li>{% browserid_login text='Login' next=request.path %}</li> |
| 82 | 90 | {% else %} |
| 83 | 91 | <li id="user-menu" class="dropdown"> |
| 84 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b> </a> | |
| 92 | + <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b> </a> | |
| 85 | 93 | <ul class="dropdown-menu" role="menu"> |
| 86 | 94 | <li> |
| 87 | 95 | <div class="wrapper"> | ... | ... |