aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'h-source/Application/Controllers')
-rw-r--r--h-source/Application/Controllers/BaseController.php5
-rw-r--r--h-source/Application/Controllers/HelpController.php13
-rw-r--r--h-source/Application/Controllers/WikiController.php4
3 files changed, 13 insertions, 9 deletions
diff --git a/h-source/Application/Controllers/BaseController.php b/h-source/Application/Controllers/BaseController.php
index 4a3bb65..6427a08 100644
--- a/h-source/Application/Controllers/BaseController.php
+++ b/h-source/Application/Controllers/BaseController.php
@@ -149,6 +149,11 @@ class BaseController extends Controller
}
}
+ //elements of the top menu from the config.xml file
+ //help link
+ $mod = new BoxParser($this->getBox(array("top_menu","help_page_link")));
+ $data["topMenuHelpLink"] = $mod->modules[0]->render($this->_topMenuClasses["help"]);
+
$this->append($data);
}
diff --git a/h-source/Application/Controllers/HelpController.php b/h-source/Application/Controllers/HelpController.php
index cd202ae..78a31b9 100644
--- a/h-source/Application/Controllers/HelpController.php
+++ b/h-source/Application/Controllers/HelpController.php
@@ -20,23 +20,22 @@
if (!defined('EG')) die('Direct access not allowed!');
-class HelpController extends BaseController
+class HelpController extends WikiController
{
public function __construct($model, $controller, $queryString)
{
-
$this->_topMenuClasses['help'] = " class='currentitem'";
parent::__construct($model, $controller, $queryString);
+ $this->_topMenuClasses['wiki'] = null;
+
+ $data['tm'] = $this->_topMenuClasses;
+
$data['title'] = 'help index - '.Website::$generalName;
+
$this->append($data);
}
-
- public function index($lang = 'en')
- {
- $this->cleverLoad('index');
- }
} \ No newline at end of file
diff --git a/h-source/Application/Controllers/WikiController.php b/h-source/Application/Controllers/WikiController.php
index 7a0cd4d..698519b 100644
--- a/h-source/Application/Controllers/WikiController.php
+++ b/h-source/Application/Controllers/WikiController.php
@@ -196,7 +196,7 @@ class WikiController extends BaseController
{
$data['talk_number'] = $this->m['WikitalkModel']->select('count(*) as numb,id_wiki')->where(array('id_wiki'=>$res[0]['wiki']['id_wiki'],'deleted'=>'no'))->rowNumber();
- $viewFile = 'page';
+ $viewFile = 'wiki_page';
$data['id_wiki'] = $res[0]['wiki']['id_wiki'];
}
else
@@ -320,7 +320,7 @@ class WikiController extends BaseController
}
$this->append($data);
- $this->load('page');
+ $this->load('wiki_page');
$this->load('bottom_left');
$this->right();
}