Download as
Browse Code »

Commit a13ebb2387df9ed1281dde5e6890c6a950605a74

Authored by Sergio Oliveira
1 parent e1781dc5
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Getting all head content from jenkins

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