Download as
Browse Code »

Commit 8f9af32449fee03000b3f362dfe56bcf1c10baba

Authored by Sergio Oliveira
1 parent 016dd3f6
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

Adding specific template to trac proxied

Showing 5 changed files with 53 additions and 12 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @8f9af32
@@ -32,6 +32,7 @@ INSTALLED_APPS = INSTALLED_APPS + ( @@ -32,6 +32,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
32 'colab.deprecated', 32 'colab.deprecated',
33 'planet', 33 'planet',
34 'accounts', 34 'accounts',
  35 + 'proxy',
35 36
36 # Feedzilla and deps 37 # Feedzilla and deps
37 'feedzilla', 38 'feedzilla',
src/proxy/diazo/trac.xml
  Diff comments   View file @8f9af32
@@ -2,16 +2,21 @@ @@ -2,16 +2,21 @@
2 xmlns="http://namespaces.plone.org/diazo" 2 xmlns="http://namespaces.plone.org/diazo"
3 xmlns:css="http://namespaces.plone.org/diazo/css" 3 xmlns:css="http://namespaces.plone.org/diazo/css"
4 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 4 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
5 -  
6 - <replace css:theme-children="#main-content" css:content-children="#main" />  
7 - <before theme-children="/html/head">  
8 - <link rel="stylesheet" href="/chrome/common/css/trac.css" type="text/css" /><link rel="stylesheet" href="/chrome/common/css/wiki.css" type="text/css" /><link rel="stylesheet" href="/chrome/tags/css/tractags.css" type="text/css" />  
9 - </before> 5 +
  6 + <replace css:theme="#trac-css" content="//head/link" />
  7 + <replace css:theme="#trac-js" content="//head/script" />
  8 +
  9 + <after css:theme-children="#trac-navbar" css:content-children="#mainnav ul" />
  10 + <before css:theme-children="#main-content" css:content="#main" />
  11 +
10 <after theme-children="/html/head"> 12 <after theme-children="/html/head">
11 <style> 13 <style>
12 - .nav ul { font-size: 14px; text-align: left; }  
13 - .nav li { border: 0; padding: 0; }  
14 - :link, :visited { border: 0; color: rgb(66, 139, 202); } 14 + body { padding-bottom: 70px; }
  15 + .navbar .nav ul { font-size: 14px; text-align: left; }
  16 + .navbar .nav li { border: 0; padding: 0; }
  17 + :link:not(.btn),
  18 + :visited:not(.btn) { border: 0; color: rgb(66, 139, 202); }
  19 + :link, :visited { border: 0; }
15 </style> 20 </style>
16 </after> 21 </after>
17 22
src/proxy/templates/proxy/trac.html 0 → 100644
  Diff comments   View file @8f9af32
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +{% extends "base.html" %}
  2 +
  3 +{% block head %}
  4 + <placeholder id="trac-css"/>
  5 + <placeholder id="trac-js"/>
  6 + {{ block.super }}
  7 +{% endblock %}
  8 +
  9 +{% block navbar %}
  10 + {{ block.super }}
  11 +
  12 + <nav class="navbar navbar-inverse navbar-fixed-bottom trac" role="navigation">
  13 + <div class="container">
  14 + <div class="navbar-header">
  15 + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-trac">
  16 + <span class="sr-only">Toggle navigation</span>
  17 + <span class="icon-bar"></span>
  18 + <span class="icon-bar"></span>
  19 + <span class="icon-bar"></span>
  20 + </button>
  21 + <a class="navbar-brand" href="/wiki">Trac</a>
  22 + </div>
  23 +
  24 + <div class="collapse navbar-collapse navbar-trac">
  25 + <ul id="trac-navbar" class="nav navbar-nav">
  26 + </ul>
  27 + </div>
  28 + </div>
  29 + </nav>
  30 +{% endblock %}
src/proxy/views.py
  Diff comments   View file @8f9af32
@@ -13,8 +13,9 @@ DIAZO_RULES_DIR = os.path.join(CWD, &#39;diazo&#39;) @@ -13,8 +13,9 @@ DIAZO_RULES_DIR = os.path.join(CWD, &#39;diazo&#39;)
13 class TracProxyView(ProxyView): 13 class TracProxyView(ProxyView):
14 base_url = settings.COLAB_TRAC_URL 14 base_url = settings.COLAB_TRAC_URL
15 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER 15 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
16 - diazo_theme_template = 'base.html' 16 + diazo_theme_template = 'proxy/trac.html'
17 diazo_rules = os.path.join(DIAZO_RULES_DIR, 'trac.xml') 17 diazo_rules = os.path.join(DIAZO_RULES_DIR, 'trac.xml')
  18 + html5 = True
18 19
19 20
20 class JenkinsProxyView(ProxyView): 21 class JenkinsProxyView(ProxyView):
@@ -22,3 +23,4 @@ class JenkinsProxyView(ProxyView): @@ -22,3 +23,4 @@ class JenkinsProxyView(ProxyView):
22 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER 23 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
23 diazo_theme_template = 'base.html' 24 diazo_theme_template = 'base.html'
24 diazo_rules = os.path.join(DIAZO_RULES_DIR, 'jenkins.xml') 25 diazo_rules = os.path.join(DIAZO_RULES_DIR, 'jenkins.xml')
  26 + html5 = True
src/templates/base.html
  Diff comments   View file @8f9af32
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 {% load i18n browserid conversejs gravatar %} 2 {% load i18n browserid conversejs gravatar %}
3 <html> 3 <html>
4 <head> 4 <head>
  5 + {% block head %}
5 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> 6 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
6 7
7 <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.css" type="text/css" media="screen, projection" /> 8 <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.css" type="text/css" media="screen, projection" />
@@ -41,13 +42,14 @@ @@ -41,13 +42,14 @@
41 </script> 42 </script>
42 {% endblock %} 43 {% endblock %}
43 44
  45 + {% endblock %}
44 </head> 46 </head>
45 47
46 <body class="container"> 48 <body class="container">
47 {% browserid_info %} 49 {% browserid_info %}
48 - <div class="row">  
49 - </div>  
50 50
  51 +
  52 + {% block navbar %}
51 <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> 53 <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
52 <div class="container"> 54 <div class="container">
53 <div class="navbar-header"> 55 <div class="navbar-header">
@@ -111,6 +113,7 @@ @@ -111,6 +113,7 @@
111 </div> 113 </div>
112 </div> 114 </div>
113 </nav> 115 </nav>
  116 + {% endblock %}
114 117
115 {% block messages %} 118 {% block messages %}
116 {% for message in messages %} 119 {% for message in messages %}
@@ -128,7 +131,7 @@ @@ -128,7 +131,7 @@
128 {% block header %}{% endblock %} 131 {% block header %}{% endblock %}
129 132
130 <div id="main-content"> 133 <div id="main-content">
131 - {% block main-content %} {% endblock %} 134 + {% block main-content %}{% endblock %}
132 </div> 135 </div>
133 136
134 <div class="row">&nbsp;</div> 137 <div class="row">&nbsp;</div>