- improve intro comment.

- correct the admin-mode-never-enabled-bug. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5013 c91229c3-7414-0410-bfa2-8a42b809f60b

- improve intro comment.
- correct the admin-mode-never-enabled-bug. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5013 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent ed0430b1
Showing 7 changed files with 89 additions and 15 deletions
kthelp/ktcore/EN/welcome.html
plugins/ktcore/KTCorePlugin.php
plugins/ktcore/KTDashlets.php
plugins/ktcore/admin/manageHelp.php
templates/kt3/portlets/admin_mode_portlet.smarty
templates/ktcore/dashlets/beta1info.smarty
templates/ktcore/dashlets/kt3release.smarty
+<html>
+<head>
+<title>Welcome to the KnowledgeTree 3.0</title>
+</head>
+<body>
+<p class="descriptiveText">We believe that KnowledgeTree 3.0 Release Candidate 
+is now stable enough for production evaluation. If you are intending on installing 
+KnowledgeTree over the next few months we strongly urge you to evaluate the 
+3.0 Release Candidate and consider it for production use. 
+There will be an upgrade path for 3.0 Release Candidate to 3.0 Final.</p>
+</body>
+</html>
 \ No newline at end of file
@@ -33,7 +33,7 @@ class KTCorePlugin extends KTPlugin {
         $this->registerAction('documentaction', 'KTDocumentPermissionsAction', 'ktcore.actions.document.permissions', 'KTPermissions.php');
         $this->registerAction('folderaction', 'KTRoleAllocationPlugin', 'ktcore.actions.folder.roles', 'KTPermissions.php');
-        $this->registerDashlet('KTBeta1InfoDashlet', 'ktcore.dashlet.beta1info', 'KTDashlets.php');
+        $this->registerDashlet('KTInfoDashlet', 'ktcore.dashlet.info', 'KTDashlets.php');
         $this->registerDashlet('KTNotificationDashlet', 'ktcore.dashlet.notifications', 'KTDashlets.php');
         $this->registerDashlet('KTCheckoutDashlet', 'ktcore.dashlet.checkout', 'KTDashlets.php');
         $this->registerDashlet('KTIndexerStatusDashlet', 'ktcore.dashlet.indexer_status', 'KTDashlets.php');
@@ -5,16 +5,73 @@ require_once(KT_LIB_DIR . &quot;/templating/templating.inc.php&quot;);
 require_once(KT_LIB_DIR . "/dashboard/Notification.inc.php");
 require_once(KT_LIB_DIR . "/security/Permission.inc");
+require_once(KT_LIB_DIR . '/help/help.inc.php');
+require_once(KT_LIB_DIR . '/help/helpreplacement.inc.php');
+
 // ultra simple skeleton for the admin tutorial
-class KTBeta1InfoDashlet extends KTBaseDashlet {
+class KTInfoDashlet extends KTBaseDashlet {
+    var $aHelpInfo;
+    var $canEdit = false;
+    var $helpLocation = 'ktcore/welcome.html';
+    var $help_id;
+
     function is_active($oUser) {
+        // FIXME help is a little too mixed.
+        $aHelpInfo = array();
+        $can_edit = Permission::userIsSystemAdministrator($_SESSION['userID']);
+               
+        $help_path = KTHelp::getHelpSubPath($this->helpLocation);
+        if ($help_path == false) {
+            return false;
+        }
+        
+        // We now check for substitute help files.  try to generate an error.
+        $oReplacementHelp = KTHelpReplacement::getByName($help_path);
+        
+        $aHelpInfo = KTHelp::getHelpFromFile($this->helpLocation);      
+        
+        // NORMAL users never see edit-option.
+        if (!$can_edit) {
+            if (!PEAR::isError($oReplacementHelp)) {
+                ;
+            } elseif ($aHelpInfo != false) {
+                ;
+            } else {
+                return false;
+            }
+        } 
+        
+        
+        
+        if (!PEAR::isError($oReplacementHelp)) {
+            $aHelpInfo['title'] = $oReplacementHelp->getTitle();
+            $aHelpInfo['body'] = $oReplacementHelp->getDescription();
+            $this->help_id = $oReplacementHelp->getId();
+            
+        } else {
+            $this->help_id = null;
+        }
+        
+        if (empty($aHelpInfo)) { return false; }
+        
+        $this->aHelpInfo = $aHelpInfo;
+        $this->canEdit = $can_edit;
+        
         return true;
     }
     function render() {
         $oTemplating =& KTTemplating::getSingleton();
-        $oTemplate = $oTemplating->loadTemplate("ktcore/dashlets/beta1info");
+        $oTemplate = $oTemplating->loadTemplate("ktcore/dashlets/kt3release");
+        
+        
+        
         $aTemplateData = array(
+            'title' => $this->aHelpInfo['title'],
+            'body' => $this->aHelpInfo['body'],
+            'can_edit' => $this->canEdit,
+            'target_name' => $this->helpLocation,
+            'help_id' => $this->help_id,
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -97,9 +97,12 @@ class ManageHelpDispatcher extends KTAdminDispatcher {
     function do_customise() {
         $name = KTUtil::arrayGet($_REQUEST, 'name');
-        $name = KTHelp::getHelpSubPath($name);
-        $oHelpReplacement = KTHelpReplacement::getByName($name);
+        $subname = KTHelp::getHelpSubPath($name);
+        $oHelpReplacement = KTHelpReplacement::getByName($subname);
         // XXX: Check against "already exists"
+        
+        //var_dump($name);
+        
         if (!PEAR::isError($oHelpReplacement)) {
             // Already exists...
             return $this->errorRedirectTo('editReplacement', _('Replacement already exists.'),'id=' .  $oHelpReplacement->getId());
 <ul class="actionlist"><li>
 {if $enabled}
 <p><a href="{ktLink base="help.php" subpath="ktcore/admin/admin-mode.html"}" class="ktInline ktHelp" style="float: left; margin: 0 0.5em 0.5em 5px;" >{i18n}What is admin mode?{/i18n}</a>
-{i18n}Administrator mode is not currently enabled.  {/i18n}</p>
+{i18n}Administrator mode is enabled.  {/i18n}</p>
 <a class="ktInline ktAction ktDenied" href="{$toggleurl}">{i18n}Disable Admin Mode{/i18n}</a>
 <a href="{$toggleurl}">{i18n}Disable Admin Mode{/i18n}</a>
 {else}
-<h2>{i18n}Welcome to the KnowledgeTree 3 Release Candidate{/i18n}</h2>
-<p class="descriptiveText">{i18n}We believe that KnowledgeTree 3.0 Release Candidate 
-is now stable enough for production evaluation. If you are intending on installing 
-KnowledgeTree over the next few months we strongly urge you to evaluate the 
-3.0 Release Candidate and consider it for production use. 
-There will be an upgrade path for 3.0 Release Candidate to 3.0 Final.{/i18n}</p>
-
-<a
-href="{$rootUrl}/plugin.php/ktcore.userassistance/kt-bug-reporting-guide">{i18n}Help! Something went wrong!{/i18n}</a>
+<h2>{$title}</h2>
+
+{$body}
+
+{if $can_edit}
+<p><a class="ktAction ktEdit ktInline" 
+      href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}" >{i18n}Edit this introduction.{/i18n}</a>
+<a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}">{i18n}Edit this introduction.{/i18n}</a>
+{if $help_id}| <a class="ktActionLink ktDelete" href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=deleteReplacement&id=`$help_id`"}">{i18n}Use the standard introduction.{/i18n}</a></p>
+{/if}
+{/if}
 \ No newline at end of file