From 87a4ee463215fe5c1712c534687a29759126526a Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 1 Oct 2009 17:30:21 +0000
Subject: [PATCH] Better handle categories: distinguish pages and subcategories

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7168 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/loadsave.php          |  6 +++---
 pgsrc/CategoryCategory    | 17 +++++++++++------
 pgsrc/Template%2FCategory |  8 ++++++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/lib/loadsave.php b/lib/loadsave.php
index 4acaa926a..8ad2c999f 100644
--- a/lib/loadsave.php
+++ b/lib/loadsave.php
@@ -1523,11 +1523,11 @@ function SetupWiki (&$request)
     $finder = new FileFinder;
 
     if (! defined('GFORGE') or !GFORGE) {
-        $mandatory = explode(':','SandBox:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
+        $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
     } else if (WIKI_NAME == "help") {
-        $mandatory = explode(':','SandBox:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
+        $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
     } else {
-        $mandatory = explode(':','SandBox:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
+        $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
     }
     foreach (array_merge($mandatory,
                          $GLOBALS['AllActionPages'],
diff --git a/pgsrc/CategoryCategory b/pgsrc/CategoryCategory
index a0eab4a1e..34167072c 100644
--- a/pgsrc/CategoryCategory
+++ b/pgsrc/CategoryCategory
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Thu,  1 Oct 2009 19:27:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -10,15 +10,20 @@ Content-Transfer-Encoding: binary
 
 This is the base Category.
 
-<<BackLinks info||=pagename,mtime,hits,author sortby||=pagename>>
+The following pages are part of this category:
+<<BackLinks sortby||=pagename noheader||=1 exclude="Category*" limit=1000 >>
+
+This category has the following subcategories:
+<<BackLinks sortby||=pagename noheader||=1 exclude="-Category*" limit=1000 >>
 
------
 == Category
 
-//This is a Category. Adding a link to this page puts the page under this Category. 
-When [[Help:EditText|editing]] a page, point your cursor to the end and use the ~[C~] Button 
-to insert a Category into your page.//
+This is a Category. Adding a link to this page puts the page under this Category.
+When [[Help:EditText|editing]] a page, use the {{/themes/default/images/ed_category.png|[C]}}
+button of the edit toolbar to insert a category into your page.
 
 == Create a new Category
 
+To create a new category, enter its name (starting with "Category") and hit button.
+
 <?plugin-form CreatePage s=CategoryBla template=Template/Category ?>
diff --git a/pgsrc/Template%2FCategory b/pgsrc/Template%2FCategory
index c898579b2..c80afe2c2 100644
--- a/pgsrc/Template%2FCategory
+++ b/pgsrc/Template%2FCategory
@@ -1,4 +1,4 @@
-Date: Mon,  1 Jun 2009 15:05:05 +0000
+Date: Thu,  1 Oct 2009 19:27:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -9,8 +9,12 @@ Content-Type: application/x-phpwiki;
 Content-Transfer-Encoding: binary
 
 <<IncludePage page=CategoryCategory section=Category quiet=1 >>
+----
+The following pages are part of this category:
+<<BackLinks sortby||=pagename noheader||=1 exclude="Category*" limit=1000 >>
 
-<<BackLinks>>
+This category has the following subcategories:
+<<BackLinks sortby||=pagename noheader||=1 exclude="-Category*" limit=1000 >>
 
 ----
 [[CategoryCategory]]
-- 
2.45.0