aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2014-05-13 15:24:59 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2014-05-13 15:24:59 -0400
commit1d09e8b4f1be938a3415329f4fd93e4f6936b16a (patch)
treeb14feac978e2bbd2eb9f79a81ce220cf51356f76 /mediagoblin/plugins
parentb5dd2459893fd1e7ae1376a7573a36bf15c983f7 (diff)
parentcc7c9091acf4103d5a0e9a910eeb07bfb01b2916 (diff)
downloadmediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.lz
mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.xz
mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata
Conflicts: mediagoblin/gmg_commands/__init__.py
Diffstat (limited to 'mediagoblin/plugins')
-rw-r--r--mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html2
-rw-r--r--mediagoblin/plugins/trim_whitespace/README.rst15
2 files changed, 11 insertions, 6 deletions
diff --git a/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html b/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html
index 84eedf18..4a380299 100644
--- a/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html
+++ b/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/bits/metadata_extra_head.html
@@ -1,3 +1,3 @@
<link rel="stylesheet" type="text/css"
- href="{{ request.staticdirect('css/metadata_display.css',
+ href="{{ request.staticdirect('css/metadata_display.css',
'metadata_display') }}"/>
diff --git a/mediagoblin/plugins/trim_whitespace/README.rst b/mediagoblin/plugins/trim_whitespace/README.rst
index b55ce35e..db9a0c53 100644
--- a/mediagoblin/plugins/trim_whitespace/README.rst
+++ b/mediagoblin/plugins/trim_whitespace/README.rst
@@ -3,17 +3,22 @@
=======================
Mediagoblin templates are written with 80 char limit for better
-readability. However that means that the html output is very verbose
-containing LOTS of whitespace. This plugin inserts a Middleware that
-filters out whitespace from the returned HTML in the Response() objects.
+readability. However that means that the HTML output is very verbose
+containing *lots* of whitespace. This plugin inserts a middleware that
+filters out whitespace from the returned HTML in the ``Response()``
+objects.
-Simply enable this plugin by putting it somewhere where python can reach it and put it's path into the [plugins] section of your mediagoblin.ini or mediagoblin_local.ini like for example this:
+Simply enable this plugin by putting it somewhere where Python can reach
+it and put it's path into the ``[plugins]`` section of your
+``mediagoblin.ini`` or ``mediagoblin_local.ini`` like for example this:
+
+.. code-block:: ini
[plugins]
[[mediagoblin.plugins.trim_whitespace]]
There is no further configuration required. If this plugin is enabled,
-all text/html documents should not have lots of whitespace in between
+all *text/html* documents should not have lots of whitespace in between
elements, although it does a very naive filtering right now (just keep
the first whitespace and delete all subsequent ones).