[phpwiki-checkins] SF.net SVN: phpwiki:[9465] trunk/themes

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

Revision: 9465
          http://sourceforge.net/p/phpwiki/code/9465
Author:   vargenau
Date:     2015-01-12 10:13:52 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------
SUBPAGE_SEPARATOR --> /

Modified Paths:
--------------
    trunk/themes/Crao/templates/navbar.tmpl
    trunk/themes/default/templates/navbar.tmpl
    trunk/themes/wikilens/templates/navbar.tmpl

Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl	2015-01-12 10:09:13 UTC (rev 9464)
+++ trunk/themes/Crao/templates/navbar.tmpl	2015-01-12 10:13:52 UTC (rev 9465)
@@ -26,7 +26,7 @@
       $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
       $dbi = $request->getDbh();
       if ($dbi->isWikiPage($UserCalPageTitle)) {
-        $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
+        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
         //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
 ?>
 <?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?><?php echo $SEP?>

Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl	2015-01-12 10:09:13 UTC (rev 9464)
+++ trunk/themes/default/templates/navbar.tmpl	2015-01-12 10:13:52 UTC (rev 9465)
@@ -25,11 +25,11 @@
 <?php } ?>
 <?php if (!empty($user)) { ?>
 <?php
-      /* Today's calendar page for the user, if the Calender subpage is defined. */
-      $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR . _("Calendar");
-      $dbi = $request->getDbh();
-      if ($dbi->isWikiPage($UserCalPageTitle)) {
-        $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
+    /* Today's calendar page for the user, if the Calender subpage is defined. */
+    $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
+    $dbi = $request->getDbh();
+    if ($dbi->isWikiPage($UserCalPageTitle)) {
+        $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
         //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
         ?>
 <?php echo $SEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>

Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl	2015-01-12 10:09:13 UTC (rev 9464)
+++ trunk/themes/wikilens/templates/navbar.tmpl	2015-01-12 10:13:52 UTC (rev 9465)
@@ -15,7 +15,7 @@
 <?php } ?>
 <?php echo WikiLink(_("RecentChanges"), "button") ?>
 <?php echo $NSEP?><?php echo Template('search',
-             array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
+           array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
 ?><?php if (!empty($revision)) { ?>
 <?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages"))
 ?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks"))

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