[pLog-svn] r643 - in plog/trunk: class/net templates/grey

[oscar at devel.plogworld.net]

Author: oscar
Date: 2004-12-31 15:55:46 +0000 (Fri, 31 Dec 2004)
New Revision: 643

Modified:
   plog/trunk/class/net/baserequestgenerator.class.php
   plog/trunk/class/net/modrewriterequestgenerator.class.php
   plog/trunk/class/net/prettyrequestgenerator.class.php
   plog/trunk/class/net/rawrequestgenerator.class.php
   plog/trunk/templates/grey/header.template
Log:
replaced adminLink() with getAdminUrl() and moved it to BaseRequestGenerator, because all other request generator classes are going to use the same (it just generates a basic link to admin.php, nothign else)
Also update the 'grey' template so that it uses the right method.

Modified: plog/trunk/class/net/baserequestgenerator.class.php
===================================================================
--- plog/trunk/class/net/baserequestgenerator.class.php	2004-12-31 15:45:01 UTC (rev 642)
+++ plog/trunk/class/net/baserequestgenerator.class.php	2004-12-31 15:55:46 UTC (rev 643)
@@ -96,7 +96,6 @@
 
         function getAdminUrl( $useSubdomains = true )
         {
-			
             $url = $this->getBaseUrl( $useSubdomains )."/admin.php";
 
             return $url;

Modified: plog/trunk/class/net/modrewriterequestgenerator.class.php
===================================================================
--- plog/trunk/class/net/modrewriterequestgenerator.class.php	2004-12-31 15:45:01 UTC (rev 642)
+++ plog/trunk/class/net/modrewriterequestgenerator.class.php	2004-12-31 15:55:46 UTC (rev 643)
@@ -1,10 +1,10 @@
 <?php
-
-    /**
-     * @package net
-     */
-
 
+    /**
+     * @package net
+     */
+
+
 	include_once( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
 	include_once( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
 
@@ -178,20 +178,6 @@
             return $link;
         }
 
-        /**
-         * Returns the url of admin interface
-         *
-         */
-        /*
-        function adminLink()
-        {
-			
-			$link = $this->getAdminUrl().$this->getRequest();			
-
-            return $link;
-        }
-        */
-
         /**
          * Returns the url where the rss feed is running
          *

Modified: plog/trunk/class/net/prettyrequestgenerator.class.php
===================================================================
--- plog/trunk/class/net/prettyrequestgenerator.class.php	2004-12-31 15:45:01 UTC (rev 642)
+++ plog/trunk/class/net/prettyrequestgenerator.class.php	2004-12-31 15:55:46 UTC (rev 643)
@@ -177,23 +177,7 @@
             return $link;
         }
 
-        
         /**
-         * Returns the url of admin interface
-         *
-         */
-        /*
-        function adminLink()
-        {
-			
-			$link = $this->getAdminUrl().$this->getRequest();			
-
-            return $link;
-        }
-        */
-
-
-        /**
          * Returns the url where the rss feed is running
          *
          * @param blogInfo A BlogInfo object containing information about the blog.

Modified: plog/trunk/class/net/rawrequestgenerator.class.php
===================================================================
--- plog/trunk/class/net/rawrequestgenerator.class.php	2004-12-31 15:45:01 UTC (rev 642)
+++ plog/trunk/class/net/rawrequestgenerator.class.php	2004-12-31 15:55:46 UTC (rev 643)
@@ -216,21 +216,6 @@
         }
 
         /**
-         * Returns the url of admin interface
-         *
-         */
-        /*
-        function adminLink()
-        {
-			
-			$link = $this->getAdminUrl().$this->getRequest();			
-
-            return $link;
-        }
-        */
-
-
-        /**
          * Returns the url where the rss feed is running
          *
          * @param blogInfo A BlogInfo object containing information about the blog.

Modified: plog/trunk/templates/grey/header.template
===================================================================
--- plog/trunk/templates/grey/header.template	2004-12-31 15:45:01 UTC (rev 642)
+++ plog/trunk/templates/grey/header.template	2004-12-31 15:55:46 UTC (rev 643)
@@ -18,7 +18,8 @@
   <div id="Top"><h1>{$blog->getBlog()}</h1></div>
   <div id="Topmenu">
     <a href="{$url->blogLink()}">{$locale->tr("main")}</a> |
-    <a href="{$url->albumLink()}">{$locale->tr("albums")}</a> 
+    <a href="{$url->albumLink()}">{$locale->tr("albums")}</a> |
+    <a href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a> 
   </div>
   <div id="Main">
   <div id="Sidebar-l">