- admin breadcrumbs

- workflow portlet - help urls git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4776 c91229c3-7414-0410-bfa2-8a42b809f60b

- admin breadcrumbs
- workflow portlet - help urls git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4776 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent b4335ccd
Showing 6 changed files with 13 additions and 10 deletions
admin.php
lib/templating/kt3template.inc.php
lib/util/ktutil.inc
plugins/ktcore/admin/workflows.php
templates/kt3/standard_page.smarty
templates/ktcore/workflow/workflow_notification.smarty
@@ -13,7 +13,7 @@ class AdminSplashDispatcher extends KTAdminDispatcher {
     function AdminSplashDispatcher() {
         $this->aBreadcrumbs = array(
-            array('url' => $_SERVER['PHP_SELF'], 'name' => 'Administration'),
+            array('url' => KTUtil::getRequestScriptName($_SERVER), 'name' => 'Administration'),
         );
         parent::KTAdminDispatcher();
@@ -85,7 +85,7 @@ if (empty($sub_url)) {
        $aCategory = $oRegistry->getCategory($aParts[0]);			   
        $oDispatcher->aBreadcrumbs = array();
-       $oDispatcher->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => 'Administration');
+       $oDispatcher->aBreadcrumbs[] = array('url' => KTUtil::getRequestScriptName($_SERVER), 'name' => 'Administration');
        $oDispatcher->aBreadcrumbs[] = array("name" => $aCategory['title'], "url" => KTUtil::ktLink('admin.php',$aParts[0]));
     } else {
        // FIXME (minor) redirect to no-suburl?
@@ -298,7 +298,7 @@ class KTPage {
 		    return null;
 		}
-		return '/help.php/' . $this->helpPage; // FIXME handle auto-url
+		return KTUtil::ktLink('help.php',$this->helpPage); 
 	}
 }
@@ -442,6 +442,7 @@ class KTUtil {
     function addQueryString($url, $qs) {
         require_once(KT_DIR . '/thirdparty/pear/Net/URL.php');
         $oUrl = new Net_URL($url);
+        
         $aQs = $oUrl->_parseRawQuerystring($qs);
         foreach ($aQs as $k => $v) {
             $oUrl->addQueryString($k, $v);
@@ -455,6 +456,7 @@ class KTUtil {
         $KTConfig =& KTConfig::getSingleton();
         $root = $KTConfig->get("KnowledgeTree/rootUrl");
         $url = $root . '/' . $base;
+        $url = $base;
         $query = '';
         $hasPathInfo = $KTConfig->get("KnowledgeTree/pathInfoSupport");
@@ -467,6 +469,7 @@ class KTUtil {
             }
         }
         $query .= $qs;
+        
         return KTUtil::addQueryString($url, $query);
     }
     // }}}
@@ -36,10 +36,10 @@ class WorkflowNavigationPortlet extends KTPortlet {
         if (is_null($this->oWorkflow)) { return _('No Workflow Selected.'); }
         $aAdminPages = array();
-        $aAdminPages[] = array('name' => _('Overview'), 'url' => KTUtil::addQueryString($_SERVER['PHP_SELF'], '?action=editWorkflow&fWorkflowId=' . $this->oWorkflow->getId()));
-        $aAdminPages[] = array('name' => _('States'), 'url' => $_SERVER['PHP_SELF'] . '?action=manageStates&fWorkflowId=' . $this->oWorkflow->getId());
-        $aAdminPages[] = array('name' => _('Transitions'), 'url' => $_SERVER['PHP_SELF'] . '?action=manageTransitions&fWorkflowId=' . $this->oWorkflow->getId());
-        $aAdminPages[] = array('name' => _('Actions'), 'url' => $_SERVER['PHP_SELF'] . '?action=manageActions&fWorkflowId=' . $this->oWorkflow->getId());
+        $aAdminPages[] = array('name' => _('Overview'), 'url' => KTUtil::addQueryStringSelf('action=editWorkflow&fWorkflowId=' . $this->oWorkflow->getId()));
+        $aAdminPages[] = array('name' => _('States'), 'url' => KTUtil::addQueryStringSelf('action=manageStates&fWorkflowId=' . $this->oWorkflow->getId()));
+        $aAdminPages[] = array('name' => _('Transitions'), 'url' => KTUtil::addQueryStringSelf('action=manageTransitions&fWorkflowId=' . $this->oWorkflow->getId()));
+        $aAdminPages[] = array('name' => _('Actions'), 'url' => KTUtil::addQueryStringSelf('action=manageActions&fWorkflowId=' . $this->oWorkflow->getId()));
         $oTemplating = new KTTemplating;        
@@ -130,7 +130,7 @@
 <div id="content">
 <h1 class="{$page->componentClass}"><span class="fahrner">{$page->componentLabel}</span>
-{if ($page->getHelpURL() != null)} <a class="ktHelp" href="{$rootUrl}{$page->getHelpURL()}">Help</a> {/if}
+{if ($page->getHelpURL() != null)} <a class="ktHelp" href="{$page->getHelpURL()}">Help</a> {/if}
 </h1>
 <!-- any status / error messages get added here. -->
@@ -4,7 +4,7 @@
     state <strong>#state#</strong>, and you are specified as one of the users to inform
     about documents in this state.{/i18n}
     <div class="actionoptions">
-    <a href="{$absoluteRootUrl}/notify.php?id={$notify_id}">{i18n}View Document{/i18n}</a>
-    | <a href="{$absoluteRootUrl}/notify.php?id={$notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+    <a href="{ktLink base="notify.php" query="id=`$notify_id`"}">{i18n}View Document{/i18n}</a>
+    | <a href="{ktLink base="notify.php" query="id=`$notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>