From 8f9af32449fee03000b3f362dfe56bcf1c10baba Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Tue, 1 Oct 2013 20:09:47 -0300
Subject: [PATCH] Adding specific template to trac proxied

---
 src/colab/custom_settings.py        |  1 +
 src/proxy/diazo/trac.xml            | 21 +++++++++++++--------
 src/proxy/templates/proxy/trac.html | 30 ++++++++++++++++++++++++++++++
 src/proxy/views.py                  |  4 +++-
 src/templates/base.html             |  9 ++++++---
 5 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 src/proxy/templates/proxy/trac.html

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index e7672e1..5f3b829 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -32,6 +32,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
     'colab.deprecated',
     'planet',
     'accounts',
+    'proxy',
 
     # Feedzilla and deps
     'feedzilla',
diff --git a/src/proxy/diazo/trac.xml b/src/proxy/diazo/trac.xml
index 605859e..3952028 100644
--- a/src/proxy/diazo/trac.xml
+++ b/src/proxy/diazo/trac.xml
@@ -2,16 +2,21 @@
     xmlns="http://namespaces.plone.org/diazo"
     xmlns:css="http://namespaces.plone.org/diazo/css"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    
-    <replace css:theme-children="#main-content" css:content-children="#main" />
-    <before theme-children="/html/head">
-	<link rel="stylesheet" href="/chrome/common/css/trac.css" type="text/css" /><link rel="stylesheet" href="/chrome/common/css/wiki.css" type="text/css" /><link rel="stylesheet" href="/chrome/tags/css/tractags.css" type="text/css" />
-    </before>
+
+    <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>
-          .nav ul { font-size: 14px; text-align: left; }	
-          .nav li { border: 0; padding: 0; }
-  	      :link, :visited { border: 0; color: rgb(66, 139, 202); }
+          body { padding-bottom: 70px; }
+          .navbar .nav ul { font-size: 14px; text-align: left; }
+          .navbar .nav li { border: 0; padding: 0; }
+          :link:not(.btn),
+          :visited:not(.btn) { border: 0; color: rgb(66, 139, 202); }
+          :link, :visited { border: 0; }
         </style>
     </after>
 
diff --git a/src/proxy/templates/proxy/trac.html b/src/proxy/templates/proxy/trac.html
new file mode 100644
index 0000000..9ed8a1a
--- /dev/null
+++ b/src/proxy/templates/proxy/trac.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+
+{% block head %}
+    <placeholder id="trac-css"/>
+    <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/views.py b/src/proxy/views.py
index 63a38dd..e14729a 100644
--- a/src/proxy/views.py
+++ b/src/proxy/views.py
@@ -13,8 +13,9 @@ DIAZO_RULES_DIR = os.path.join(CWD, 'diazo')
 class TracProxyView(ProxyView):
     base_url = settings.COLAB_TRAC_URL
     add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
-    diazo_theme_template = 'base.html'
+    diazo_theme_template = 'proxy/trac.html'
     diazo_rules = os.path.join(DIAZO_RULES_DIR, 'trac.xml')
+    html5 = True
 
 
 class JenkinsProxyView(ProxyView):
@@ -22,3 +23,4 @@ class JenkinsProxyView(ProxyView):
     add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
     diazo_theme_template = 'base.html'
     diazo_rules = os.path.join(DIAZO_RULES_DIR, 'jenkins.xml')
+    html5 = True
diff --git a/src/templates/base.html b/src/templates/base.html
index 2df5a5f..5f05a8a 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -2,6 +2,7 @@
 {% load i18n browserid conversejs gravatar %}
 <html>
   <head>
+    {% block head %}
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
     <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.css" type="text/css" media="screen, projection" />
@@ -41,13 +42,14 @@
     </script>
     {% endblock %}
 
+  {% endblock %}
   </head>
 
   <body class="container">
     {% browserid_info %}
-    <div class="row">
-    </div>
 
+
+    {% block navbar %}
     <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
@@ -111,6 +113,7 @@
         </div>
       </div>
     </nav>
+    {% endblock %}
 
       {% block messages %}
         {% for message in messages %}
@@ -128,7 +131,7 @@
     {% block header %}{% endblock %}
 
     <div id="main-content">
-      {% block main-content %} {% endblock %}
+      {% block main-content %}{% endblock %}
     </div>
 
     <div class="row">&nbsp;</div>
--
libgit2 0.21.2