From 9ba61c9423648725af546dad7f8b207fd41317e5 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Sat, 22 Sep 2012 20:52:50 +0000 Subject: added the FAQ page to the top menu - lammi87 issue --- .../Application/Controllers/BaseController.php | 4 ++ h-source/Application/Controllers/FaqController.php | 41 +++++++++++++++++++ .../Application/Controllers/HelpController.php | 2 +- .../Application/Views/Desktop/Wiki/not_found.php | 34 ---------------- h-source/Application/Views/Desktop/header.php | 2 +- h-source/Application/Views/Desktop/not_found.php | 34 ++++++++++++++++ h-source/Config/Route.php | 1 + h-source/config.xml | 47 +++++++++++++++++++--- 8 files changed, 124 insertions(+), 41 deletions(-) create mode 100644 h-source/Application/Controllers/FaqController.php delete mode 100644 h-source/Application/Views/Desktop/Wiki/not_found.php create mode 100644 h-source/Application/Views/Desktop/not_found.php (limited to 'h-source') diff --git a/h-source/Application/Controllers/BaseController.php b/h-source/Application/Controllers/BaseController.php index 6427a08..b07d443 100644 --- a/h-source/Application/Controllers/BaseController.php +++ b/h-source/Application/Controllers/BaseController.php @@ -44,6 +44,7 @@ class BaseController extends Controller "download" => null, "help" => null, "wiki" => null, + "faq" => null, "project" => null, ); @@ -153,6 +154,9 @@ class BaseController extends Controller //help link $mod = new BoxParser($this->getBox(array("top_menu","help_page_link"))); $data["topMenuHelpLink"] = $mod->modules[0]->render($this->_topMenuClasses["help"]); + //faq link + $mod = new BoxParser($this->getBox(array("top_menu","faq_link"))); + $data["topMenuFaqLink"] = $mod->modules[0]->render($this->_topMenuClasses["faq"]); $this->append($data); } diff --git a/h-source/Application/Controllers/FaqController.php b/h-source/Application/Controllers/FaqController.php new file mode 100644 index 0000000..45ebab2 --- /dev/null +++ b/h-source/Application/Controllers/FaqController.php @@ -0,0 +1,41 @@ +. + +if (!defined('EG')) die('Direct access not allowed!'); + +class FaqController extends WikiController +{ + + public function __construct($model, $controller, $queryString) + { + $this->_topMenuClasses['faq'] = " class='currentitem'"; + + parent::__construct($model, $controller, $queryString); + + $this->_topMenuClasses['wiki'] = null; + + $data['tm'] = $this->_topMenuClasses; + + $data['title'] = 'FAQ page - '.Website::$generalName; + + $this->append($data); + } + +} \ No newline at end of file diff --git a/h-source/Application/Controllers/HelpController.php b/h-source/Application/Controllers/HelpController.php index 78a31b9..658b547 100644 --- a/h-source/Application/Controllers/HelpController.php +++ b/h-source/Application/Controllers/HelpController.php @@ -33,7 +33,7 @@ class HelpController extends WikiController $data['tm'] = $this->_topMenuClasses; - $data['title'] = 'help index - '.Website::$generalName; + $data['title'] = 'help page - '.Website::$generalName; $this->append($data); } diff --git a/h-source/Application/Views/Desktop/Wiki/not_found.php b/h-source/Application/Views/Desktop/Wiki/not_found.php deleted file mode 100644 index cd435de..0000000 --- a/h-source/Application/Views/Desktop/Wiki/not_found.php +++ /dev/null @@ -1,34 +0,0 @@ - - -. -?> - -
- -
- ">Home » ">Wiki » -
- -
-
- . "> -
-
- diff --git a/h-source/Application/Views/Desktop/header.php b/h-source/Application/Views/Desktop/header.php index b4e371d..efa225b 100644 --- a/h-source/Application/Views/Desktop/header.php +++ b/h-source/Application/Views/Desktop/header.php @@ -111,7 +111,7 @@ $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index'; diff --git a/h-source/Application/Views/Desktop/not_found.php b/h-source/Application/Views/Desktop/not_found.php new file mode 100644 index 0000000..cd435de --- /dev/null +++ b/h-source/Application/Views/Desktop/not_found.php @@ -0,0 +1,34 @@ + + +. +?> + +
+ +
+ ">Home » ">Wiki » +
+ +
+
+ . "> +
+
+ diff --git a/h-source/Config/Route.php b/h-source/Config/Route.php index 7c3687f..9086b08 100644 --- a/h-source/Config/Route.php +++ b/h-source/Config/Route.php @@ -32,6 +32,7 @@ class Route 'credits,index', 'hardware,catalogue', 'help,page', + 'faq,page', 'home,index', 'image,captcha', 'issues,viewall', diff --git a/h-source/config.xml b/h-source/config.xml index 64690e4..1b0dfb6 100644 --- a/h-source/config.xml +++ b/h-source/config.xml @@ -5,38 +5,75 @@ TopLink Help - + TopLink Aiuto - + TopLink Ayuda - + TopLink Télécharger - + TopLink Βοήθεια - + + + + + TopLink + FAQ + + + + + + TopLink + FAQ + + + + + + TopLink + FAQ + + + + + + TopLink + FAQ + + + + + + TopLink + FAQ + + + + -- cgit v1.2.3