Getting all head content from jenkins

Sergio Oliveira
1 parent e1781dc5
Showing 3 changed files with 3 additions and 12 deletions Show diff stats
src/proxy/diazo/jenkins.xml
src/proxy/templates/proxy/jenkins.html
src/proxy/views.py
@@ -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" />
  
@@ -1,7 +0,0 @@
-{% extends "base.html" %}
-
-{% block head %}
-    <placeholder id="jenkins-css"/>
-    <placeholder id="jenkins-js"/>
-    {{ block.super }}
-{% endblock %}
@@ -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
...	...	@@ -4,11 +4,9 @@
4	4	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
5	5
6	6	<rules css:if-content="#main-table">
7		- <replace theme="//head/title" content="//head/title" />
8		- <replace css:theme="#jenkins-css" content="//head/link" />
9		- <replace css:theme="#jenkins-js" content="//head/script" />
10		-
	7	+ <before theme-children="/html/head" content-children="/html/head" />
11	8	<before css:theme-children="#main-content" css:content-children="body" />
	9	+
12	10	<merge attributes="class" css:theme="body" css:content="body" />
13	11	<drop css:content="#top-panel" />
14	12
...	...
...	...	@@ -1,7 +0,0 @@
1		-{% extends "base.html" %}
2		-
3		-{% block head %}
4		- <placeholder id="jenkins-css"/>
5		- <placeholder id="jenkins-js"/>
6		- {{ block.super }}
7		-{% endblock %}
...	...	@@ -52,6 +52,6 @@ class TracProxyView(HitCounterViewMixin, ProxyView):
52	52	class JenkinsProxyView(ProxyView):
53	53	base_url = settings.COLAB_CI_URL
54	54	add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
55		- diazo_theme_template = 'proxy/jenkins.html'
	55	+ diazo_theme_template = 'base.html'
56	56	diazo_rules = os.path.join(DIAZO_RULES_DIR, 'jenkins.xml')
57	57	html5 = True
...	...