Peter M. Groen / knowledgetree

Commit 383af8109531a351f54715c9f2e540fcc5a0d5d3

Authored by Brad Shuttleworth
1 parent 1ad2852b

fix for KTS-517 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5023 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 6 additions and 5 deletions
help.php
  View file @383af81
... ... @@ -82,10 +82,10 @@ class HelpDispatcher extends KTStandardDispatcher {
82 82 if (!$can_edit) {
83 83 if (!PEAR::isError($oReplacementHelp)) {
84 84 $this->oPage->setTitle($oReplacementHelp->getTitle());
85   - return $oReplacementHelp->getDescription();
  85 + //return $oReplacementHelp->getDescription();
86 86 } elseif ($aHelpInfo != false) {
87 87 $this->oPage->setTitle($aHelpInfo['title']);
88   - return $aHelpInfo['body'];
  88 + //return $aHelpInfo['body'];
89 89 } else {
90 90 $this->oPage->setTitle(_('Invalid help location specified.'));
91 91 $this->oPage->addError(_('Invalid help location specified.'));
... ... @@ -109,6 +109,7 @@ class HelpDispatcher extends KTStandardDispatcher {
109 109 "help_body" => $aHelpInfo['body'],
110 110 "target_name" => $_SERVER['PATH_INFO'],
111 111 "back_key" => $sBackKey,
  112 + 'can_edit' => $can_edit,
112 113 );
113 114 return $oTemplate->render($aTemplateData);
114 115 }
... ...
templates/ktcore/help_with_edit.smarty
  View file @383af81
... ... @@ -11,9 +11,9 @@
11 11 {/if}
12 12  
13 13 <hr />
14   -<p><a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}" class="ktAction ktEdit" style="float:
15   -left; padding-right: 0.5em;">{i18n}Edit this help page.{/i18n}</a><a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}">{i18n}Edit this help page.{/i18n}</a><br/>
  14 +<p>{if $can_edit}<a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}" class="ktAction ktEdit" style="float:
  15 +left; padding-right: 0.5em;">{i18n}Edit this help page.{/i18n}</a><a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}">{i18n}Edit this help page.{/i18n}</a><br/>{/if}
16 16  
17 17 <a href="{ktLink base="help.php" query="action=go_back&back_key=`$back_key`"}" class="ktAction ktBack" style="float:
18   -left; padding-right: 0.5em;">{i18n}Return to where you came from.{/i18n}</a><a href="{ktLink base="help.php" query="action=go_back&back_key=`$back_key`"}">{i18n}Return to where you came from.{/i18n}</a></p>
  18 +left; padding-right: 0.5em; clear: left; ">{i18n}Return to where you came from.{/i18n}</a><a href="{ktLink base="help.php" query="action=go_back&back_key=`$back_key`"}">{i18n}Return to where you came from.{/i18n}</a></p>
19 19  
20 20 \ No newline at end of file
... ...