Mercurial > moin > 1.9
changeset 35:f0af060fb82b
making people choose the right approach to page_front_page
imported from: moin--main--1.5--patch-36
| author | Thomas Waldmann <tw@waldmann-edv.de> |
|---|---|
| date | Sun, 25 Sep 2005 14:45:38 +0000 |
| parents | 3ffdb52c6969 |
| children | eb3b18ffb28b |
| files | MoinMoin/multiconfig.py MoinMoin/scripts/moin_dump.py MoinMoin/wikiutil.py docs/CHANGES wiki/config/moinmaster.py wiki/config/wikiconfig.py |
| diffstat | 6 files changed, 22 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/MoinMoin/multiconfig.py Sun Sep 25 12:22:44 2005 +0000 +++ b/MoinMoin/multiconfig.py Sun Sep 25 14:45:38 2005 +0000 @@ -230,7 +230,7 @@ page_header1 = '' page_header2 = '' - page_front_page = u'FrontPage' + page_front_page = u'HelpOnLanguages' # this will make people choose a sane config page_local_spelling_words = u'LocalSpellingWords' page_category_regex = u'^Category[A-Z]' page_dict_regex = u'[a-z]Dict$'
--- a/MoinMoin/scripts/moin_dump.py Sun Sep 25 12:22:44 2005 +0000 +++ b/MoinMoin/scripts/moin_dump.py Sun Sep 25 14:45:38 2005 +0000 @@ -121,7 +121,7 @@ errlog = open(errfile, 'w') errcnt = 0 - page_front_page = wikiutil.getSysPage(request, 'FrontPage').page_name + page_front_page = wikiutil.getSysPage(request, request.cfg.page_front_page).page_name page_title_index = wikiutil.getSysPage(request, 'TitleIndex').page_name page_word_index = wikiutil.getSysPage(request, 'WordIndex').page_name
--- a/MoinMoin/wikiutil.py Sun Sep 25 12:22:44 2005 +0000 +++ b/MoinMoin/wikiutil.py Sun Sep 25 14:45:38 2005 +0000 @@ -478,7 +478,7 @@ @param request: current request @rtype: Page object - @return localized FrontPage + @return localized page_front_page, if there is a translation """ return getSysPage(request, request.cfg.page_front_page)
--- a/docs/CHANGES Sun Sep 25 12:22:44 2005 +0000 +++ b/docs/CHANGES Sun Sep 25 14:45:38 2005 +0000 @@ -16,6 +16,8 @@ * there is a file CHANGES.config with just the recently changed stuff from multiconfig.py * new defaults: + * page_front_page old: u"FrontPage" new: u"HelpOnLanguages" + please just read the help page in case you see it :) * bang_meta old: 0 new: 1 * show_section_numbers old: 1 new: 0 * removed settings and code [new behaviour]:
--- a/wiki/config/moinmaster.py Sun Sep 25 12:22:44 2005 +0000 +++ b/wiki/config/moinmaster.py Sun Sep 25 14:45:38 2005 +0000 @@ -23,5 +23,14 @@ # basic options (you normally need to change these) sitename = u'MoinMaster' # [Unicode] interwikiname = 'MoinMaster' + + # name of entry page / front page [Unicode], choose one of those: + + # a) if most wiki content is in a single language + #page_front_page = u"MyStartingPage" + + # b) if wiki content is maintained in many languages + page_front_page = u"FrontPage" + data_dir = '/org/de.wikiwikiweb.moinmaster/data/'
--- a/wiki/config/wikiconfig.py Sun Sep 25 12:22:44 2005 +0000 +++ b/wiki/config/wikiconfig.py Sun Sep 25 14:45:38 2005 +0000 @@ -35,6 +35,14 @@ # Site name, used by default for wiki name-logo [Unicode] sitename = u'Untitled Wiki' + # name of entry page / front page [Unicode], choose one of those: + + # a) if most wiki content is in a single language + #page_front_page = u"MyStartingPage" + + # b) if wiki content is maintained in many languages + #page_front_page = u"FrontPage" + # Wiki logo. You can use an image, text or both. [Unicode] # Example: u'<img src="/wiki/mywiki.png" alt="My Wiki">My Wiki' # For no logo or text, use ''