From 087325750901c06259fa67113736dcb06c8fea43 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 10 Jun 2010 06:35:40 +0000
Subject: [PATCH] new default theme = Sidebar

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7515 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 config/config-default.ini |  2 +-
 config/config-dist.ini    |  7 ++++---
 configurator.php          | 11 +++--------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/config/config-default.ini b/config/config-default.ini
index f74b8b9b7..cc53aed6b 100644
--- a/config/config-default.ini
+++ b/config/config-default.ini
@@ -126,7 +126,7 @@ ALLOW_HTTP_AUTH_LOGIN = false
 ALLOW_LDAP_LOGIN = false
 ALLOW_IMAP_LOGIN = false
 
-THEME = default
+THEME = Sidebar
 ; DEFAULT_LANGUAGE = 
 CHARSET = utf-8
 WIKI_PGSRC = pgsrc
diff --git a/config/config-dist.ini b/config/config-dist.ini
index d20c9aa03..583e9a4c3 100644
--- a/config/config-dist.ini
+++ b/config/config-dist.ini
@@ -870,8 +870,11 @@ DBAUTH_AUTH_CRYPT_METHOD = plain
 ;
 ; The complete list of installed themes can be found by doing 'ls themes/'
 ; from the root of your PHPWiki installation.
+;
 ; white on yellow with fat blue links:
-THEME = default
+;THEME = default
+; a MonoBook extension, the new default
+THEME = Sidebar
 ; almost fully iconized classic grey MacOSX design:
 ;THEME = MacOSX
 ; as default, just some tricks to make the buttons smaller:
@@ -882,8 +885,6 @@ THEME = default
 ;THEME = Wordpress
 ; pure old-style c2wiki layout:
 ;THEME = Portland
-; example with some sidebar boxes:
-;THEME = Sidebar
 ; mozilla friendly, with lots of icons instead of buttons (i18n friendly):
 ;THEME = Crao
 ; default + rateit navbar:
diff --git a/configurator.php b/configurator.php
index 5e64077e1..6abd97fe0 100644
--- a/configurator.php
+++ b/configurator.php
@@ -1267,26 +1267,21 @@ Most of the page appearance is controlled by files in the theme
 subdirectory.
 
 There are a number of pre-defined themes shipped with PhpWiki.
-Or you may create your own, e.g. by copying and then modifying one of
-stock themes.
+Or you may create your own, deriving from existing ones.
 <pre>
+  THEME = Sidebar (default)
   THEME = default
   THEME = MacOSX
   THEME = MonoBook (WikiPedia)
   THEME = smaller
   THEME = Wordpress
   THEME = Portland
-  THEME = Sidebar
   THEME = Crao
   THEME = wikilens (with Ratings)
   THEME = Hawaiian
   THEME = SpaceWiki
   THEME = Hawaiian
-</pre>
-  
-Problems:
-<pre>
-  THEME = blog     (Kubrick)   [experimental. Several links missing]
+  THEME = blog     (Kubrick)   [experimental]
 </pre>");
 
 $properties["Character Set"] =
-- 
2.45.0