[phpwiki-checkins] SF.net SVN: phpwiki:[7168] trunk

[<var...@us...>]

Revision: 7168
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7168&view=rev
Author:   vargenau
Date:     2009-10-01 17:30:21 +0000 (Thu, 01 Oct 2009)

Log Message:
-----------
Better handle categories: distinguish pages and subcategories

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/pgsrc/CategoryCategory
    trunk/pgsrc/Template%2FCategory

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2009-10-01 13:32:35 UTC (rev 7167)
+++ trunk/lib/loadsave.php	2009-10-01 17:30:21 UTC (rev 7168)
@@ -1523,11 +1523,11 @@
     $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'],

Modified: trunk/pgsrc/CategoryCategory
===================================================================
--- trunk/pgsrc/CategoryCategory	2009-10-01 13:32:35 UTC (rev 7167)
+++ trunk/pgsrc/CategoryCategory	2009-10-01 17:30:21 UTC (rev 7168)
@@ -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 @@
 
 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 ?>

Modified: trunk/pgsrc/Template%2FCategory
===================================================================
--- trunk/pgsrc/Template%2FCategory	2009-10-01 13:32:35 UTC (rev 7167)
+++ trunk/pgsrc/Template%2FCategory	2009-10-01 17:30:21 UTC (rev 7168)
@@ -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-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]]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.