changeset 211:f374d87dd925

change show_interwiki default to 0 imported from: moin--main--1.5--patch-213
author Thomas Waldmann <tw@waldmann-edv.de>
date Sun, 13 Nov 2005 12:33:43 +0000
parents 54d91760eaba
children 8af4c008e5b9
files MoinMoin/multiconfig.py docs/CHANGES docs/CHANGES.config wiki/config/wikiconfig.py
diffstat 4 files changed, 16 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/multiconfig.py	Sun Nov 13 12:21:36 2005 +0000
+++ b/MoinMoin/multiconfig.py	Sun Nov 13 12:33:43 2005 +0000
@@ -288,7 +288,7 @@
     rss_cache = 60 # suggested caching time for RecentChanges RSS, in seconds
     shared_intermap = None # can be string or list of strings (filenames)
     show_hosts = 1
-    show_interwiki = 1
+    show_interwiki = 0
     show_section_numbers = 0
     show_timings = 0
     show_version = 0
--- a/docs/CHANGES	Sun Nov 13 12:21:36 2005 +0000
+++ b/docs/CHANGES	Sun Nov 13 12:33:43 2005 +0000
@@ -12,6 +12,7 @@
     * attachment methods for the text_xml and xml_docbook formatters
     * new favicon
     * updated i18n (fixed nl, did nobody notice this?) and underlay
+    * changed show_interwiki default to 0
 
 Version 1.5.0beta2:
   Fixes:
@@ -19,7 +20,7 @@
     * fix gui editor (converter) crash on save
     * MoinMoinBugs/PageHitsFails
     * MoinMoinBugs/PackagePagesFailsBecauseAllowedActionsMissing
-    * Avoid destroying existing page content when editor is called with
+    * Avoid destroying existing page content if editor is called with
       template parameter for an existing page.
     * fix countdown javascript for browser status line in editor
     * added page title display for editor
@@ -152,7 +153,7 @@
        2 edit links in that case).
      * a user can add/remove the current page to/from his quicklinks with an
        appropriate action now
-     * when cfg.user_email_unique = False, we don't require user's email
+     * if cfg.user_email_unique = False, we don't require user's email
        addresses to be unique
      * removed show_fancy_links user preferences setting to simplify code and
        caching. Displaying those icons is now done by CSS styles (see
@@ -230,11 +231,12 @@
   Theme changes:
     * logo_string is now should be really only the logo (img).
       If you included your wiki's name in logo_string you maybe want to remove
-      it now as it is shown as part of the location display now anyway (when
-      show_interwiki = 1).
+      it now as it is shown as part of the location display now anyway (if
+      you set show_interwiki = 1).
     * You maybe want to remove page_front_page from your navi_bar - we link to
-      that page now from the logo and (new) from the interwiki name displayed
-      in location display, so you maybe don't need it in navi_bar, too.
+      that page now from the logo and (new, if you set show_interwiki = 1) from
+      the interwiki name displayed in location display, so you maybe don't need
+      it in navi_bar, too.
     * If you have a custom theme, you should / may:
      * sync modern/css/screen.css #pagelocation #pagetrail stuff to your
        screen.css or pagelocation display (title()) will look strange (like a
@@ -245,7 +247,7 @@
        == heading == as <h2> (was <h3>), etc.
      * maybe move both title() and trail() to header area, like the builtin
        themes do it.
-     * there is a new interwiki() base theme method that optionally (when
+     * there is a new interwiki() base theme method that optionally (if
        show_interwiki = 1) shows the interwiki name of this wiki and links to
        page_front_page. The css for it is #interwiki.
 
--- a/docs/CHANGES.config	Sun Nov 13 12:21:36 2005 +0000
+++ b/docs/CHANGES.config	Sun Nov 13 12:33:43 2005 +0000
@@ -19,7 +19,7 @@
                                     # or user prefs
     lupy_search = False # disabled until lupy is finished
     mail_sendmail = None # "/usr/sbin/sendmail -t -i" to not use SMTP, but sendmail
-    show_interwiki = True # show interwiki name (and link it to page_front_page)
+    show_interwiki = 0 # show interwiki name (and link it to page_front_page)
     superuser = [] # list of unicode user names that have super powers :)
     user_email_unique = True # do we check whether a user's email is unique?
 
--- a/wiki/config/wikiconfig.py	Sun Nov 13 12:21:36 2005 +0000
+++ b/wiki/config/wikiconfig.py	Sun Nov 13 12:33:43 2005 +0000
@@ -49,7 +49,11 @@
     #page_front_page = u"FrontPage"
 
     # The interwiki name used in interwiki links
-    interwikiname = None
+    #interwikiname = 'UntitledWiki'
+    # Show the interwiki name (and link it to page_front_page) in the Theme,
+    # nice for farm setups or when your logo does not show the wiki's name.
+    #show_interwiki = 1
+    
     
 
     # Critical setup  ---------------------------------------------------
@@ -147,10 +151,6 @@
     # Show users hostnames in RecentChanges
     show_hosts = 1                  
 
-    # Show the interwiki name (and link it to page_front_page) in the Theme,
-    # nice for farm setups or when your logo does not show the wiki's name.
-    #show_interwiki = 1
-    
     # Enable graphical charts, requires gdchart.
     #chart_options = {'width': 600, 'height': 300}