From a13ebb2387df9ed1281dde5e6890c6a950605a74 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Fri, 22 Nov 2013 14:45:36 -0200
Subject: [PATCH] Getting all head content from jenkins

---
 src/proxy/diazo/jenkins.xml            | 6 ++----
 src/proxy/templates/proxy/jenkins.html | 7 -------
 src/proxy/views.py                     | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 src/proxy/templates/proxy/jenkins.html

diff --git a/src/proxy/diazo/jenkins.xml b/src/proxy/diazo/jenkins.xml
index b76408c..9e0548b 100644
--- a/src/proxy/diazo/jenkins.xml
+++ b/src/proxy/diazo/jenkins.xml
@@ -4,11 +4,9 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
     <rules css:if-content="#main-table">
-      <replace theme="//head/title" content="//head/title" />
-      <replace css:theme="#jenkins-css" content="//head/link" />
-      <replace css:theme="#jenkins-js" content="//head/script" />
-
+      <before theme-children="/html/head" content-children="/html/head" />
       <before css:theme-children="#main-content" css:content-children="body" />
+
       <merge attributes="class" css:theme="body" css:content="body" />
       <drop css:content="#top-panel" />
 
diff --git a/src/proxy/templates/proxy/jenkins.html b/src/proxy/templates/proxy/jenkins.html
deleted file mode 100644
index 776721b..0000000
--- a/src/proxy/templates/proxy/jenkins.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "base.html" %}
-
-{% block head %}
-    <placeholder id="jenkins-css"/>
-    <placeholder id="jenkins-js"/>
-    {{ block.super }}
-{% endblock %}
diff --git a/src/proxy/views.py b/src/proxy/views.py
index a628ac1..eb5efcb 100644
--- a/src/proxy/views.py
+++ b/src/proxy/views.py
@@ -52,6 +52,6 @@ class TracProxyView(HitCounterViewMixin, ProxyView):
 class JenkinsProxyView(ProxyView):
     base_url = settings.COLAB_CI_URL
     add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
-    diazo_theme_template = 'proxy/jenkins.html'
+    diazo_theme_template = 'base.html'
     diazo_rules = os.path.join(DIAZO_RULES_DIR, 'jenkins.xml')
     html5 = True
--
libgit2 0.21.2