changeset 110:713df2332b89

serve docs from sphinx _build dir, make them available from menu
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 12 Mar 2011 16:31:43 +0100
parents e4c332436733
children d7eb7bf188ed
files MoinMoin/apps/admin/templates/index.html MoinMoin/themes/__init__.py wikiconfig.py
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/admin/templates/index.html	Sat Mar 12 15:28:21 2011 +0100
+++ b/MoinMoin/apps/admin/templates/index.html	Sat Mar 12 16:31:43 2011 +0100
@@ -1,5 +1,9 @@
 {% extends theme("layout.html") %}
 {% block content %}
+<h1>{{ _("Documentation") }}</h1>
+<ul>
+    <li><a href="{{ url_for('serve.files', name='docs', filename='index.html') }}">{{ _("Documentation (local)") }}</a></li>
+</ul>
 <h1>{{ _("Admin Menu") }}</h1>
 <ul>
     <li><a href="{{ url_for('admin.userbrowser') }}">{{ _("User Browser") }}</a></li>
--- a/MoinMoin/themes/__init__.py	Sat Mar 12 15:28:21 2011 +0100
+++ b/MoinMoin/themes/__init__.py	Sat Mar 12 16:31:43 2011 +0100
@@ -313,7 +313,7 @@
             (_('Delete Item'), 'delete', 'frontend.delete_item', not_exists, ),
             (_('Destroy Item'), 'destroy', 'frontend.destroy_item', not_exists, ),
             (_('-----------------------------------'), 'show', 'frontend.show_item', True),
-            (_('Administration'), 'admin', 'admin.index', False, ),
+            (_('Administration & Docs'), 'admin', 'admin.index', False, ),
         ]
         return [(title, disabled, endpoint)
                 for title, action, endpoint, disabled in menu
--- a/wikiconfig.py	Sat Mar 12 15:28:21 2011 +0100
+++ b/wikiconfig.py	Sat Mar 12 16:31:43 2011 +0100
@@ -60,6 +60,7 @@
         anywikidraw = os.path.join(wikiconfig_dir, 'env', 'AnyWikiDraw', 'anywikidraw', 'moinmoin'),
         twikidraw = os.path.join(wikiconfig_dir, 'env', 'TWikiDrawPlugin'),
         svgedit = os.path.join(wikiconfig_dir, 'env', 'svg-edit'),
+        docs = os.path.join(wikiconfig_dir, 'docs', '_build', 'html'),
     )
 
     # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^