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 2015/10/23 17:25:19 UTC
allura git commit: [#8004] move tool_icon_css usage to a docstring
Repository: allura
Updated Branches:
refs/heads/db/8004 7147ad9e2 -> ddcee91ca
[#8004] move tool_icon_css usage to a docstring
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ddcee91c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ddcee91c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ddcee91c
Branch: refs/heads/db/8004
Commit: ddcee91ca82c96574f94cc58cb610f49158b4e02
Parents: 7147ad9
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Oct 23 11:25:15 2015 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Oct 23 11:25:15 2015 -0400
----------------------------------------------------------------------
Allura/allura/controllers/static.py | 6 +++++-
Allura/allura/templates/jinja_master/master.html | 1 -
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/ddcee91c/Allura/allura/controllers/static.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/static.py b/Allura/allura/controllers/static.py
index 313a877..89a94ab 100644
--- a/Allura/allura/controllers/static.py
+++ b/Allura/allura/controllers/static.py
@@ -44,7 +44,11 @@ class NewForgeController(object):
@expose()
def tool_icon_css(self, *args, **kw):
- """Serve stylesheet containing icon urls for every installed tool.
+ """
+ Serve stylesheet containing icon urls for every installed tool.
+
+ If you want to use this, include it in your theme like:
+ g.register_css('/nf/tool_icon_css?' + g.build_key, compress=False)
"""
css, md5 = g.tool_icon_css
http://git-wip-us.apache.org/repos/asf/allura/blob/ddcee91c/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 6f2487d..fd5a83e 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -33,7 +33,6 @@
{% do g.register_forge_css('css/forge/hilite.css') %}
{% do g.register_forge_css('css/forge/tooltipster.css') %}
{% do g.register_forge_css('css/font-awesome.min.css', compress=False) %}
-{# {% do g.register_css('/nf/tool_icon_css?' + g.build_key, compress=False) %} If you need tool icons, use this #}
{% do g.theme.require() %}
{% do g.resource_manager.register_widgets(c) %}
{# paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ #}