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"> - - - - - + + + + + + + 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 %} + + + {{ block.super }} +{% endblock %} + +{% block navbar %} + {{ block.super }} + + +{% 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 %} + {% block head %} @@ -41,13 +42,14 @@ {% endblock %} + {% endblock %} {% browserid_info %} -
-
+ + {% block navbar %} + {% endblock %} {% block messages %} {% for message in messages %} @@ -128,7 +131,7 @@ {% block header %}{% endblock %}
- {% block main-content %} {% endblock %} + {% block main-content %}{% endblock %}
 
-- libgit2 0.21.2