You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/08/09 17:40:50 UTC
[2/2] allura git commit: Adds a jinja block for specifying css
classes on body element
Adds a jinja block for specifying css classes on body element
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e0714221
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e0714221
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e0714221
Branch: refs/heads/master
Commit: e0714221691dd1eea39ccd7b439a5198c8a6ee9f
Parents: 1750de2
Author: Kenton Taylor <kt...@slashdotmedia.com>
Authored: Mon Aug 8 21:48:06 2016 +0000
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Aug 9 13:40:23 2016 -0400
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/master.html | 1 +
ForgeWiki/forgewiki/templates/wiki/page_view.html | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e0714221/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index 938680a..f887794 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -79,6 +79,7 @@
</head>
<body{% block body_attrs %}{% endblock %} id="forge">
+<body{% block body_attrs %}{% endblock %} class="{% block body_css_class %}{% endblock %}" id="forge">
{% block body_top_js %}
{% for blob in g.resource_manager.emit('body_top_js') %}
{{ blob }}
http://git-wip-us.apache.org/repos/asf/allura/blob/e0714221/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 51e8d95..f770ccc 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -37,7 +37,7 @@
<link rel="alternate" type="application/rss+xml" title="Wiki RSS" href="../feed.rss"/>
<link rel="alternate" type="application/atom+xml" title="Wiki Atom" href="../feed.atom"/>
{% endblock %}
-{% block body_attrs %} class="wiki-{{(page.title).replace(' ','_')}}"{% endblock %}
+{% block body_css_class %} {{super()}} wiki-{{(page.title).replace(' ','_')}}{% endblock %}
{% block actions %}
{% if not page['deleted'] %}