# HG changeset patch # User ReimarBauer # Date 1165053720 -3600 # Node ID 7c291197f69538524c568a1c30dff4334cf59f77 # Parent a938bd2d6166d419dc01dafabcd7c9f0b1a73724 supplementation page for discussion of a page added. controlled from wikiconfig with supplementation_page = True or a new pragma var from within a page '#pragma supplementation-page on'. No supplementation page on default. diff -r a938bd2d6166 -r 7c291197f695 MoinMoin/config/multiconfig.py --- a/MoinMoin/config/multiconfig.py Fri Dec 01 19:53:43 2006 +0100 +++ b/MoinMoin/config/multiconfig.py Sat Dec 02 11:02:00 2006 +0100 @@ -383,7 +383,9 @@ reStructuredText Quick Reference stylesheets = [] # list of tuples (media, csshref) to insert after theme css, before user css subscribed_pages_default = [] # preload user subscribed pages with this page list superuser = [] # list of unicode user names that have super powers :) - + supplementation_page = False + supplementation_page_name = u'Discussion' + supplementation_page_template = u'DiscussionTemplate' surge_action_limits = {# allow max. requests per
secs # action: (count, dt) 'all': (30, 30), diff -r a938bd2d6166 -r 7c291197f695 MoinMoin/theme/__init__.py --- a/MoinMoin/theme/__init__.py Fri Dec 01 19:53:43 2006 +0100 +++ b/MoinMoin/theme/__init__.py Sat Dec 02 11:02:00 2006 +0100 @@ -1051,13 +1051,40 @@ actionsMenuInit('%(label)s'); This is separate method to make it easy to customize the edtibar in sub classes. """ - return [self.editorLink(page), - self.infoLink(page), - self.subscribeLink(page), - self.quicklinkLink(page), - self.attachmentsLink(page), - self.actionsMenu(page), - ] + + editbar_items = {'Edit': self.editorLink(page), + self.request.cfg.supplementation_page_name: + self.supplementation_page_nameLink(page), + 'Info': self.infoLink(page), + 'Subscribe': self.subscribeLink(page), + 'Quicklink': self.quicklinkLink(page), + 'Attachments': self.attachmentsLink(page), + 'ActionsMenu': self.actionsMenu(page) + } + edit_bar = [u'Edit', u'Info', u'Subscribe', u'Quicklink', u'Attachments', u'ActionsMenu', ] + if self.request.cfg.supplementation_page == True: + if self.request.getPragma('supplementation-page', 1) == 'off': + edit_bar = edit_bar + else: + edit_bar.insert(1, self.request.cfg.supplementation_page_name) + else: + if self.request.getPragma('supplementation-page', 1) == 'on': + edit_bar.insert(1, self.request.cfg.supplementation_page_name) + else: + edit_bar = edit_bar + + + allowed_action = [] + for action in edit_bar: + allowed_action.append(editbar_items[action]) + return allowed_action + + def supplementation_page_nameLink(self, page): + """ discussion for page """ + _ = self.request.getText + return page.link_to(self.request, + text=_(self.request.cfg.supplementation_page_name, formatted=False), + querystr={'action': 'supplementation'}, id='supplementation', rel='nofollow') def guiworks(self, page): """ Return whether the gui editor / converter can work for that page. diff -r a938bd2d6166 -r 7c291197f695 MoinMoin/action/supplementation.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MoinMoin/action/supplementation.py Sat Dec 02 11:02:00 2006 +0100 @@ -0,0 +1,42 @@ +""" + MoinMoin - Action for supplementation pages + + This Action is used to create a supplementation subpage e.g. a Discussion below a comon page + + Install: + put it into the 'action' directory and do create a supplementation Template e.g. DiscussionTemplate + + Note: + derived from the newpage macro by Vito Miliano (vito_moinnewpagewithtemplate@perilith.com) et al + + Modification History: + 2006-08-30 ReimarBauer initial version + + License: + @license: GNU GPL, see COPYING for details. + +""" +from MoinMoin.Page import Page +from MoinMoin.wikiutil import quoteWikinameURL + +def execute(pagename, request): + _ = request.getText + sub_page_name = request.cfg.supplementation_page_name + sub_page_template = request.cfg.supplementation_page_template + newpagename = "%s/%s" % (pagename, sub_page_name) + + if pagename.endswith(sub_page_name): # sub_sub_page redirects to sub_page + query = {} + url = Page(request, pagename).url(request, query, escape=0, relative=False) + request.http_redirect(url) + elif request.user.may.read(newpagename) and request.user.may.write(newpagename): + query = {} + url = Page(request, newpagename).url(request, query, escape=0, relative=False) + test = Page(request, newpagename) + if test.exists(): # page is defined -> redirect + request.http_redirect(url) + else: # page will be created from template + query = {'action': 'edit', 'backto': newpagename} + query['template'] = quoteWikinameURL(sub_page_template) + url = Page(request, newpagename).url(request, query, escape=0, relative=False) + request.http_redirect(url)