Commit 90385c1eb1d10123fb03c822effacbd73c8a8dfa
1 parent
21ecc46e
Re-added settings to run gitlab
Showing
2 changed files
with
26 additions
and
1 deletions
Show diff stats
| @@ -0,0 +1,25 @@ | @@ -0,0 +1,25 @@ | ||
| 1 | +<rules | ||
| 2 | + xmlns="http://namespaces.plone.org/diazo" | ||
| 3 | + xmlns:css="http://namespaces.plone.org/diazo/css" | ||
| 4 | + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> | ||
| 5 | + | ||
| 6 | + <before theme-children="/html/head" content-children="/html/head" /> | ||
| 7 | + <before css:theme-children="#main-content" css:content-children="body" /> | ||
| 8 | + | ||
| 9 | + <merge attributes="class" css:theme="body" css:content="body" /> | ||
| 10 | + | ||
| 11 | + <drop css:content="#top-panel" /> | ||
| 12 | + <drop css:content=".navbar-gitlab" /> | ||
| 13 | + <after theme-children="/html/head"> | ||
| 14 | + <script>jQuery.noConflict();</script> | ||
| 15 | + <style> | ||
| 16 | + #breadcrumbs { | ||
| 17 | + border: 0 !important; | ||
| 18 | + } | ||
| 19 | + | ||
| 20 | + #right-top-nav { | ||
| 21 | + margin-right: 5em !important; | ||
| 22 | + } | ||
| 23 | + </style> | ||
| 24 | + </after> | ||
| 25 | +</rules> |
src/proxy/views.py
| @@ -59,7 +59,7 @@ class JenkinsProxyView(ProxyView): | @@ -59,7 +59,7 @@ class JenkinsProxyView(ProxyView): | ||
| 59 | class GitlabProxyView(ProxyView): | 59 | class GitlabProxyView(ProxyView): |
| 60 | base_url = settings.COLAB_GITLAB_URL | 60 | base_url = settings.COLAB_GITLAB_URL |
| 61 | add_remote_user = settings.REVPROXY_ADD_REMOTE_USER | 61 | add_remote_user = settings.REVPROXY_ADD_REMOTE_USER |
| 62 | - diazo_theme_template = 'proxy/gitlab.html' | 62 | + diazo_theme_template = 'base.html' |
| 63 | diazo_rules = os.path.join(DIAZO_RULES_DIR, 'gitlab.xml') | 63 | diazo_rules = os.path.join(DIAZO_RULES_DIR, 'gitlab.xml') |
| 64 | html5 = True | 64 | html5 = True |
| 65 | 65 |