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

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

Revision: 7633
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7633&view=rev
Author:   vargenau
Date:     2010-08-09 14:00:30 +0000 (Mon, 09 Aug 2010)

Log Message:
-----------
Consistent naming for templates: TemplateTalk --> Template/Talk

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/themes/MonoBook/templates/actionbar.tmpl
    trunk/themes/gforge/templates/actionbar.tmpl

Added Paths:
-----------
    trunk/pgsrc/Template%2FTalk

Removed Paths:
-------------
    trunk/pgsrc/TemplateTalk

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2010-08-09 12:06:15 UTC (rev 7632)
+++ trunk/lib/loadsave.php	2010-08-09 14:00:30 UTC (rev 7633)
@@ -1528,11 +1528,11 @@
     $finder = new FileFinder;
 
     if (!GFORGE) {
-        $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
+        $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
     } else if (WIKI_NAME == "help") {
-        $mandatory = explode(':','SandBox:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
+        $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
     } else {
-        $mandatory = explode(':','SandBox:Template/UserPage:Template/Category:TemplateTalk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
+        $mandatory = explode(':','SandBox:Template/UserPage:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
     }
     foreach (array_merge($mandatory,
                          $GLOBALS['AllActionPages'],

Copied: trunk/pgsrc/Template%2FTalk (from rev 7632, trunk/pgsrc/TemplateTalk)
===================================================================
--- trunk/pgsrc/Template%2FTalk	                        (rev 0)
+++ trunk/pgsrc/Template%2FTalk	2010-08-09 14:00:30 UTC (rev 7633)
@@ -0,0 +1,14 @@
+Date: Mon, 9 Apr 2010 15:32:58 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+  pagename=Template%2FTalk;
+  flags=EXTERNAL_PAGE;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+You can discuss here the content of the page.
+
+Do not forget to sign your contribution (you can use the
+Signature button in the edit Toolbar).

Deleted: trunk/pgsrc/TemplateTalk
===================================================================
--- trunk/pgsrc/TemplateTalk	2010-08-09 12:06:15 UTC (rev 7632)
+++ trunk/pgsrc/TemplateTalk	2010-08-09 14:00:30 UTC (rev 7633)
@@ -1,14 +0,0 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id$
-Content-Type: application/x-phpwiki;
-  pagename=TemplateTalk;
-  flags=EXTERNAL_PAGE;
-  markup=2;
-  charset=UTF-8
-Content-Transfer-Encoding: binary
-
-You can discuss here the content of the page.
-
-Do not forget to sign your contribution (you can use the
-Signature button in the edit Toolbar).

Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl	2010-08-09 12:06:15 UTC (rev 7632)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl	2010-08-09 14:00:30 UTC (rev 7633)
@@ -22,7 +22,7 @@
 	  <?php echo ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?>
         <?php } else { ?>
 	  <?php echo ActionButton(array('action'=>'create',
-				 'template'=>_("TemplateTalk")),
+				 'template'=>_("Template/Talk")),
 			   _("Discussion"), $talk->getName()) ?>
         <?php } ?>
       <?php } ?>

Modified: trunk/themes/gforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/gforge/templates/actionbar.tmpl	2010-08-09 12:06:15 UTC (rev 7632)
+++ trunk/themes/gforge/templates/actionbar.tmpl	2010-08-09 14:00:30 UTC (rev 7633)
@@ -31,7 +31,7 @@
         <?php } else { ?>
           <td>
           <?php echo Button(array('action'=>'create',
-                                 'template'=>_("TemplateTalk")),
+                                 'template'=>_("Template/Talk")),
                            _("Discussion"), $talk->getName()) ?>
           </td>
         <?php } ?>


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