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/AcquisitioncardsController.php2
-rw-r--r--h-source/Application/Controllers/BluetoothController.php2
-rw-r--r--h-source/Application/Controllers/EthernetcardsController.php2
-rw-r--r--h-source/Application/Controllers/FingerprintreadersController.php2
-rw-r--r--h-source/Application/Controllers/GenericController.php8
-rw-r--r--h-source/Application/Controllers/ModemsController.php2
-rw-r--r--h-source/Application/Controllers/NotebooksController.php8
-rw-r--r--h-source/Application/Controllers/PrintersController.php4
-rw-r--r--h-source/Application/Controllers/ScannersController.php2
-rw-r--r--h-source/Application/Controllers/SdcardreadersController.php2
-rw-r--r--h-source/Application/Controllers/SoundcardsController.php4
-rw-r--r--h-source/Application/Controllers/ThreegcardsController.php4
-rw-r--r--h-source/Application/Controllers/VideocardsController.php4
-rw-r--r--h-source/Application/Controllers/WebcamsController.php4
-rw-r--r--h-source/Application/Controllers/WifiController.php4
15 files changed, 17 insertions, 37 deletions
diff --git a/h-source/Application/Controllers/AcquisitioncardsController.php b/h-source/Application/Controllers/AcquisitioncardsController.php
index f908d8e..b248969 100644
--- a/h-source/Application/Controllers/AcquisitioncardsController.php
+++ b/h-source/Application/Controllers/AcquisitioncardsController.php
@@ -25,8 +25,6 @@ class AcquisitioncardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Acquisitioncards::$select;
$worksField = 'compatibility';
diff --git a/h-source/Application/Controllers/BluetoothController.php b/h-source/Application/Controllers/BluetoothController.php
index 36751e8..f46a3f9 100644
--- a/h-source/Application/Controllers/BluetoothController.php
+++ b/h-source/Application/Controllers/BluetoothController.php
@@ -25,8 +25,6 @@ class BluetoothController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Bluetooth::$select;
$worksField = 'bluetooth_works';
diff --git a/h-source/Application/Controllers/EthernetcardsController.php b/h-source/Application/Controllers/EthernetcardsController.php
index 6df8c4f..baa8d1f 100644
--- a/h-source/Application/Controllers/EthernetcardsController.php
+++ b/h-source/Application/Controllers/EthernetcardsController.php
@@ -25,8 +25,6 @@ class EthernetcardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Ethernetcards::$select;
$worksField = 'ethernet_card_works';
diff --git a/h-source/Application/Controllers/FingerprintreadersController.php b/h-source/Application/Controllers/FingerprintreadersController.php
index deba3f4..8d13b74 100644
--- a/h-source/Application/Controllers/FingerprintreadersController.php
+++ b/h-source/Application/Controllers/FingerprintreadersController.php
@@ -25,8 +25,6 @@ class FingerprintreadersController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Fingerprintreaders::$select;
$worksField = 'fingerprint_works';
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index 3a8c1f0..adf2555 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -28,8 +28,11 @@ class GenericController extends BaseController
public $orderPopup;
public function __construct($model, $controller, $queryString) {
- parent::__construct($model, $controller, $queryString);
+
+ $this->_topMenuClasses['hardware'] = " class='currentitem ui-btn-active'";
+ parent::__construct($model, $controller, $queryString);
+
$this->model('UsersModel');
$popup = new Popup();
@@ -64,7 +67,7 @@ class GenericController extends BaseController
$data['howToCompileLabel'] = null;
$data['isApproved'] = true;
-
+
$this->append($data);
}
@@ -481,6 +484,7 @@ class GenericController extends BaseController
// echo $this->mod->getQuery();
$data['pageList'] = $this->h['Pages']->render($page-3,7);
+ $data['numberOfPages'] = $this->h['Pages']->getNumbOfPages();
$data['topNotice'] = $this->getModule(array('devices',$this->controller,'catalogue'));
diff --git a/h-source/Application/Controllers/ModemsController.php b/h-source/Application/Controllers/ModemsController.php
index 6917555..c306496 100644
--- a/h-source/Application/Controllers/ModemsController.php
+++ b/h-source/Application/Controllers/ModemsController.php
@@ -25,8 +25,6 @@ class ModemsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Modems::$select;
$worksField = 'compatibility';
diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php
index 45f8b17..6cac56e 100644
--- a/h-source/Application/Controllers/NotebooksController.php
+++ b/h-source/Application/Controllers/NotebooksController.php
@@ -25,9 +25,7 @@ class NotebooksController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
@@ -88,6 +86,10 @@ class NotebooksController extends GenericController
);
$this->setArgKeys($argKeys);
+
+ $data['worksField'] = 'compatibility';
+
+ $data['notFoundString'] = "No notebooks found";
$data['title'] = 'Notebooks';
$this->append($data);
diff --git a/h-source/Application/Controllers/PrintersController.php b/h-source/Application/Controllers/PrintersController.php
index 3ff195b..71ce9fb 100644
--- a/h-source/Application/Controllers/PrintersController.php
+++ b/h-source/Application/Controllers/PrintersController.php
@@ -25,9 +25,7 @@ class PrintersController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/ScannersController.php b/h-source/Application/Controllers/ScannersController.php
index 1cbfd09..4355f37 100644
--- a/h-source/Application/Controllers/ScannersController.php
+++ b/h-source/Application/Controllers/ScannersController.php
@@ -25,8 +25,6 @@ class ScannersController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
parent::__construct($model, $controller, $queryString);
diff --git a/h-source/Application/Controllers/SdcardreadersController.php b/h-source/Application/Controllers/SdcardreadersController.php
index d619b26..7b26375 100644
--- a/h-source/Application/Controllers/SdcardreadersController.php
+++ b/h-source/Application/Controllers/SdcardreadersController.php
@@ -25,8 +25,6 @@ class SdcardreadersController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
$worksOptions = Sdcardreaders::$select;
$worksField = 'sd_card_works';
diff --git a/h-source/Application/Controllers/SoundcardsController.php b/h-source/Application/Controllers/SoundcardsController.php
index dcbce1a..60dffed 100644
--- a/h-source/Application/Controllers/SoundcardsController.php
+++ b/h-source/Application/Controllers/SoundcardsController.php
@@ -25,9 +25,7 @@ class SoundcardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/ThreegcardsController.php b/h-source/Application/Controllers/ThreegcardsController.php
index 1681158..c9ecfcb 100644
--- a/h-source/Application/Controllers/ThreegcardsController.php
+++ b/h-source/Application/Controllers/ThreegcardsController.php
@@ -25,9 +25,7 @@ class ThreegcardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/VideocardsController.php b/h-source/Application/Controllers/VideocardsController.php
index 0d2272a..ad6c0ef 100644
--- a/h-source/Application/Controllers/VideocardsController.php
+++ b/h-source/Application/Controllers/VideocardsController.php
@@ -25,9 +25,7 @@ class VideocardsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/WebcamsController.php b/h-source/Application/Controllers/WebcamsController.php
index 6d51d3d..98bc2a7 100644
--- a/h-source/Application/Controllers/WebcamsController.php
+++ b/h-source/Application/Controllers/WebcamsController.php
@@ -25,9 +25,7 @@ class WebcamsController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model
diff --git a/h-source/Application/Controllers/WifiController.php b/h-source/Application/Controllers/WifiController.php
index b2bcd73..960d2c1 100644
--- a/h-source/Application/Controllers/WifiController.php
+++ b/h-source/Application/Controllers/WifiController.php
@@ -25,9 +25,7 @@ class WifiController extends GenericController
public function __construct($model, $controller, $queryString)
{
-
- $this->_topMenuClasses['hardware'] = " class='currentitem'";
-
+
parent::__construct($model, $controller, $queryString);
//load the model