aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--h-source/Application/Controllers/BaseController.php4
-rw-r--r--h-source/Application/Controllers/FaqController.php41
-rw-r--r--h-source/Application/Controllers/HelpController.php2
-rw-r--r--h-source/Application/Views/Desktop/header.php2
-rw-r--r--h-source/Application/Views/Desktop/not_found.php (renamed from h-source/Application/Views/Desktop/Wiki/not_found.php)0
-rw-r--r--h-source/Config/Route.php1
-rw-r--r--h-source/config.xml47
7 files changed, 90 insertions, 7 deletions
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 @@
+<?php
+
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with h-source. If not, see <http://www.gnu.org/licenses/>.
+
+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/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';
<div id="top_menu_external">
<div id="top_menu">
<ul>
- <li<?php echo $tm['home']; ?>><a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li><li<?php echo $tm['hardware']; ?>><a href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>"><?php echo gtext("Hardware");?></a></li><li<?php echo $tm['issues']; ?>><a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>"><?php echo gtext("Issues");?></a></li><li<?php echo $tm['search']; ?>><a href="<?php echo $this->baseUrl."/search/form/$lang";?>"><?php echo gtext("Search");?></a></li><li<?php echo $tm['news']; ?>><a href="<?php echo $this->baseUrl."/news/index/$lang";?>"><?php echo gtext("News");?></a></li><li<?php echo $tm['download']; ?>><a href="<?php echo $this->baseUrl."/download/index/$lang";?>"><?php echo gtext("Download");?></a></li><?php echo $topMenuHelpLink;?><li<?php echo $tm['wiki']; ?>><a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a></li>
+ <li<?php echo $tm['home']; ?>><a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li><li<?php echo $tm['hardware']; ?>><a href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>"><?php echo gtext("Hardware");?></a></li><li<?php echo $tm['issues']; ?>><a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>"><?php echo gtext("Issues");?></a></li><li<?php echo $tm['search']; ?>><a href="<?php echo $this->baseUrl."/search/form/$lang";?>"><?php echo gtext("Search");?></a></li><li<?php echo $tm['news']; ?>><a href="<?php echo $this->baseUrl."/news/index/$lang";?>"><?php echo gtext("News");?></a></li><li<?php echo $tm['download']; ?>><a href="<?php echo $this->baseUrl."/download/index/$lang";?>"><?php echo gtext("Download");?></a></li><?php echo $topMenuHelpLink;?><li<?php echo $tm['wiki']; ?>><a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a></li><?php echo $topMenuFaqLink;?>
</ul>
</div>
</div>
diff --git a/h-source/Application/Views/Desktop/Wiki/not_found.php b/h-source/Application/Views/Desktop/not_found.php
index cd435de..cd435de 100644
--- a/h-source/Application/Views/Desktop/Wiki/not_found.php
+++ b/h-source/Application/Views/Desktop/not_found.php
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 @@
<mod>
<type>TopLink</type>
<text>Help</text>
- <href><![CDATA[http://h-node.org/wiki/page/en/Help]]></href>
+ <href><![CDATA[http://h-node.org/help/page/en/Help]]></href>
</mod>
</en>
<it>
<mod>
<type>TopLink</type>
<text>Aiuto</text>
- <href><![CDATA[http://h-node.org/wiki/page/it/Help]]></href>
+ <href><![CDATA[http://h-node.org/help/page/it/Help]]></href>
</mod>
</it>
<es>
<mod>
<type>TopLink</type>
<text>Ayuda</text>
- <href><![CDATA[http://h-node.org/wiki/page/es/Help]]></href>
+ <href><![CDATA[http://h-node.org/help/page/es/Help]]></href>
</mod>
</es>
<fr>
<mod>
<type>TopLink</type>
<text>Télécharger</text>
- <href><![CDATA[http://h-node.org/wiki/page/fr/Help]]></href>
+ <href><![CDATA[http://h-node.org/help/page/fr/Help]]></href>
</mod>
</fr>
<gr>
<mod>
<type>TopLink</type>
<text>Βοήθεια</text>
- <href><![CDATA[http://h-node.org/wiki/page/gr/Help]]></href>
+ <href><![CDATA[http://h-source/help/page/gr/Help]]></href>
</mod>
</gr>
</help_page_link>
+ <faq_link>
+ <en>
+ <mod>
+ <type>TopLink</type>
+ <text>FAQ</text>
+ <href><![CDATA[http://h-source/faq/page/en/FAQ]]></href>
+ </mod>
+ </en>
+ <it>
+ <mod>
+ <type>TopLink</type>
+ <text>FAQ</text>
+ <href><![CDATA[http://h-source/faq/page/it/FAQ]]></href>
+ </mod>
+ </it>
+ <es>
+ <mod>
+ <type>TopLink</type>
+ <text>FAQ</text>
+ <href><![CDATA[http://h-source/faq/page/es/FAQ]]></href>
+ </mod>
+ </es>
+ <fr>
+ <mod>
+ <type>TopLink</type>
+ <text>FAQ</text>
+ <href><![CDATA[http://h-source/faq/page/fr/FAQ]]></href>
+ </mod>
+ </fr>
+ <gr>
+ <mod>
+ <type>TopLink</type>
+ <text>FAQ</text>
+ <href><![CDATA[http://h-source/faq/page/gr/FAQ]]></href>
+ </mod>
+ </gr>
+ </faq_link>
</top_menu>
<top_news>
<en>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 06:17:34 +0000