From 9248e117b207c42d1ea34a3393a2671f92b27567 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Wed, 2 Oct 2013 11:13:32 -0300
Subject: [PATCH] Replacing trac navbar by dropdown in mainmenu

---
 src/proxy/diazo/trac.xml            |  2 --
 src/proxy/templates/proxy/trac.html | 23 -----------------------
 src/proxy/urls.py                   |  4 ++--
 src/static/css/screen.css           |  6 ++----
 src/templates/base.html             | 14 +++++++++++---
 5 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/src/proxy/diazo/trac.xml b/src/proxy/diazo/trac.xml
index 3952028..f24ac84 100644
--- a/src/proxy/diazo/trac.xml
+++ b/src/proxy/diazo/trac.xml
@@ -6,12 +6,10 @@
     <replace css:theme="#trac-css" content="//head/link" />
     <replace css:theme="#trac-js" content="//head/script" />
 
-    <after css:theme-children="#trac-navbar" css:content-children="#mainnav ul" />
     <before css:theme-children="#main-content" css:content="#main" />
 
     <after theme-children="/html/head">
         <style>
-          body { padding-bottom: 70px; }
           .navbar .nav ul { font-size: 14px; text-align: left; }
           .navbar .nav li { border: 0; padding: 0; }
           :link:not(.btn),
diff --git a/src/proxy/templates/proxy/trac.html b/src/proxy/templates/proxy/trac.html
index 9ed8a1a..bae56e4 100644
--- a/src/proxy/templates/proxy/trac.html
+++ b/src/proxy/templates/proxy/trac.html
@@ -5,26 +5,3 @@
     <placeholder id="trac-js"/>
     {{ block.super }}
 {% endblock %}
-
-{% block navbar %}
-    {{ block.super }}
-
-    <nav class="navbar navbar-inverse navbar-fixed-bottom trac" role="navigation">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-trac">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="/wiki">Trac</a>
-        </div>
-
-        <div class="collapse navbar-collapse navbar-trac">
-          <ul id="trac-navbar" class="nav navbar-nav">
-          </ul>
-        </div>
-      </div>
-    </nav>
-{% endblock %}
diff --git a/src/proxy/urls.py b/src/proxy/urls.py
index 042af1c..d0f275a 100644
--- a/src/proxy/urls.py
+++ b/src/proxy/urls.py
@@ -6,8 +6,8 @@ from .views import TracProxyView, JenkinsProxyView
 
 urlpatterns = patterns('',
     # Trac URLs
-    url(r'^(?P<path>(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment).*)$',
-	TracProxyView.as_view()),
+    url(r'^(?P<path>(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment|diff).*)$',
+        TracProxyView.as_view()),
 
     # Jenkins URLs
     url(r'^ci/(?P<path>.*)$', JenkinsProxyView.as_view()),
diff --git a/src/static/css/screen.css b/src/static/css/screen.css
index b7a7111..9f8a3ac 100644
--- a/src/static/css/screen.css
+++ b/src/static/css/screen.css
@@ -1,10 +1,8 @@
 
-
 body {
-    padding-top: 70px;
+    padding-top: 57px;
 }
 
-
 /* Header */
 
 #header-searchbox {
@@ -16,7 +14,7 @@ body {
 }
 
 .navbar-default .navbar-brand,
-.navbar a.dropdown-toggle {
+.navbar a.dropdown-toggle.user {
     padding: 0;
     margin-top: 5px;
     margin-left: 10px;
diff --git a/src/templates/base.html b/src/templates/base.html
index 5f05a8a..49e13af 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -70,8 +70,16 @@
             <li>
               <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a>
             </li>
-            <li>
-              <a href="/wiki">{% trans "Contribute" %}</a>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Contribute" %} <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="/wiki">Wiki</a></li>
+                <li><a href="/timeline">Timeline</a></li>
+                <li><a href="/roadmap">Roadmap</a></li>
+                <li><a href="/browser">Browse Source</a></li>
+                <li><a href="/report">View Tickets</a></li>
+                <li><a href="/tags">Tags</a></li>
+              </ul>
             </li>
           </ul>
 
@@ -81,7 +89,7 @@
               <li>{% browserid_login text='Login' next=request.path %}</li>
             {% else %}
               <li id="user-menu" class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
+                <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
                 <ul class="dropdown-menu" role="menu">
                   <li>
                     <div class="wrapper">
--
libgit2 0.21.2