[PATCH 2 of 5] (help) Share _template directory with client and admin help
Wald Commits
scm-commit at wald.intevation.org
Wed Sep 24 17:50:36 CEST 2014
# HG changeset patch
# User Emanuel Schuetze <emanuel at intevation.de>
# Date 1411566728 -7200
# Node ID 4a329513ee862b1fc8f7f25fb58beb2fd492c5f0
# Parent f6c59dc378e200a69ccdbf25869fc8bba5489852
(help) Share _template directory with client and admin help.
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/_templates/layout.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/help/_templates/layout.html Wed Sep 24 15:52:08 2014 +0200
@@ -0,0 +1,17 @@
+{% extends '!layout.html' %}
+
+{%- block header %}
+ {%- if theme_showheader|tobool %}
+ <header id="pageheader">
+ <a href="{{ pathto(master_doc) }} "><img src="_static/trustbridge-logo.png"><h1>{{ docstitle }}</h1></a>
+ </header>
+ {%- endif %}
+{%- endblock %}
+
+
+{% block footer %}
+ <footer id="pagefooter">
+ © 2014, BSI | TrustBridge {{version}}<br>
+ <img src="_static/bsi-logo.png">
+ </footer>
+{% endblock %}
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/_templates/searchbox.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/help/_templates/searchbox.html Wed Sep 24 15:52:08 2014 +0200
@@ -0,0 +1,22 @@
+{#
+ basic/searchbox.html
+ ~~~~~~~~~~~~~~~~~~~~
+
+ Sphinx sidebar template: quick search box.
+
+ :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ :license: BSD, see LICENSE for details.
+#}
+{%- if pagename != "search" and builder != "singlehtml" %}
+<div id="searchbox" style="display: none">
+ <h3>Suche</h3>
+ <form class="search" action="{{ pathto('search') }}" method="get">
+ <input type="text" name="q" />
+ <input type="submit" value="{{ _('Go') }}" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+<p></p>
+<script type="text/javascript">$('#searchbox').show(0);</script>
+{%- endif %}
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/admin/_static/bsi-logo.png
Binary file doc/help/admin/_static/bsi-logo.png has changed
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/admin/_static/extra-style.css
--- a/doc/help/admin/_static/extra-style.css Wed Sep 24 15:47:45 2014 +0200
+++ b/doc/help/admin/_static/extra-style.css Wed Sep 24 15:52:08 2014 +0200
@@ -3,7 +3,31 @@
margin-bottom: 10px;
padding: 4px;
}
+img {
+ vertical-align: top;
+}
.figure .caption {
margin-top: 0px;
margin-bottom: 20px;
}
+tt {
+ font-size: 1.1em;
+ background-color: transparent;
+}
+#pageheader img {
+ float: left;
+ margin-right: 10px;
+}
+#pageheader h1 {
+ margin: 5px;
+ padding: 15px;
+}
+#breadcrumbs {
+ display: none;
+}
+.related.top #rellinks {
+ margin-top: -25px;
+}
+#pagefooter {
+ padding-bottom: 0 !important;
+}
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/admin/_static/trustbridge-logo.png
Binary file doc/help/admin/_static/trustbridge-logo.png has changed
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/admin/_templates/searchbox.html
--- a/doc/help/admin/_templates/searchbox.html Wed Sep 24 15:47:45 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-{#
- basic/searchbox.html
- ~~~~~~~~~~~~~~~~~~~~
-
- Sphinx sidebar template: quick search box.
-
- :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
- :license: BSD, see LICENSE for details.
-#}
-{%- if pagename != "search" and builder != "singlehtml" %}
-<div id="searchbox" style="display: none">
- <h3>Suche</h3>
- <form class="search" action="{{ pathto('search') }}" method="get">
- <input type="text" name="q" />
- <input type="submit" value="{{ _('Go') }}" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
-</div>
-<p></p>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-{%- endif %}
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/admin/conf.py
--- a/doc/help/admin/conf.py Wed Sep 24 15:47:45 2014 +0200
+++ b/doc/help/admin/conf.py Wed Sep 24 15:52:08 2014 +0200
@@ -28,7 +28,7 @@
#extensions = ['']
# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['../_templates']
# The suffix of source filenames.
source_suffix = '.rst'
@@ -41,7 +41,7 @@
# General information about the project.
project = u'TrustBridge-Hilfe'
-copyright = u'2014, BSI'
+#copyright = u''
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/admin/conf.py.in
--- a/doc/help/admin/conf.py.in Wed Sep 24 15:47:45 2014 +0200
+++ b/doc/help/admin/conf.py.in Wed Sep 24 15:52:08 2014 +0200
@@ -28,7 +28,7 @@
#extensions = ['']
# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['../_templates']
# The suffix of source filenames.
source_suffix = '.rst'
@@ -41,7 +41,7 @@
# General information about the project.
project = u'TrustBridge-Hilfe'
-copyright = u'2014, BSI'
+#copyright = u''
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/client/_templates/layout.html
--- a/doc/help/client/_templates/layout.html Wed Sep 24 15:47:45 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-{% extends '!layout.html' %}
-
-{%- block header %}
- {%- if theme_showheader|tobool %}
- <header id="pageheader">
- <a href="{{ pathto(master_doc) }} "><img src="_static/trustbridge-logo.png"><h1>{{ docstitle }}</h1></a>
- </header>
- {%- endif %}
-{%- endblock %}
-
-
-{% block footer %}
- <footer id="pagefooter">
- © 2014, BSI | TrustBridge {{version}}<br>
- <img src="_static/bsi-logo.png">
- </footer>
-{% endblock %}
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/client/_templates/searchbox.html
--- a/doc/help/client/_templates/searchbox.html Wed Sep 24 15:47:45 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-{#
- basic/searchbox.html
- ~~~~~~~~~~~~~~~~~~~~
-
- Sphinx sidebar template: quick search box.
-
- :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
- :license: BSD, see LICENSE for details.
-#}
-{%- if pagename != "search" and builder != "singlehtml" %}
-<div id="searchbox" style="display: none">
- <h3>Suche</h3>
- <form class="search" action="{{ pathto('search') }}" method="get">
- <input type="text" name="q" />
- <input type="submit" value="{{ _('Go') }}" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
-</div>
-<p></p>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-{%- endif %}
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/client/conf.py
--- a/doc/help/client/conf.py Wed Sep 24 15:47:45 2014 +0200
+++ b/doc/help/client/conf.py Wed Sep 24 15:52:08 2014 +0200
@@ -28,7 +28,7 @@
#extensions = ['']
# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['../_templates']
# The suffix of source filenames.
source_suffix = '.rst'
diff -r f6c59dc378e2 -r 4a329513ee86 doc/help/client/conf.py.in
--- a/doc/help/client/conf.py.in Wed Sep 24 15:47:45 2014 +0200
+++ b/doc/help/client/conf.py.in Wed Sep 24 15:52:08 2014 +0200
@@ -28,7 +28,7 @@
#extensions = ['']
# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['../_templates']
# The suffix of source filenames.
source_suffix = '.rst'
@@ -41,7 +41,7 @@
# General information about the project.
project = u'TrustBridge-Hilfe'
-copyright = u'2014, BSI'
+#copyright = u''
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
More information about the Trustbridge-commits
mailing list