added bios and architecture filters for notebooks

5 files changed, 41 insertions, 2 deletions

diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index f955820..829fe05 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -441,6 +441,15 @@ class GenericController extends BaseController
 		$this->helper('Popup',$this->controller.'/catalogue/'.$this->lang,$popup,'inclusive','page');
 		//create the HTML of the popup
 		$data['popup'] = $this->h['Popup']->render();
+
+		if (strcmp($this->controller,'notebooks') === 0)
+		{
+			$this->mod->popupArray = array();
+			$this->mod->morePopups();
+			$this->mod->popupBuild();
+			$this->h['Popup']->popupArray = $this->mod->popupArray;
+			$data['popupMore'] = $this->h['Popup']->render();
+		}
 		
 		$this->mod->orderBy = getOrderByClause($this->viewArgs['sort-by']);
 		$recordNumber = $this->mod->rowNumber();
diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php
index b533a4e..470edc2 100644
--- a/h-source/Application/Controllers/NotebooksController.php
+++ b/h-source/Application/Controllers/NotebooksController.php
@@ -103,7 +103,9 @@ class NotebooksController extends GenericController
 			'compatibility:sanitizeString'	=>	'undef',
 			'comm_year:sanitizeString'		=>	'undef',
 			'subtype:sanitizeString'		=>	'undef',
-			'sort-by:sanitizeString'		=>	'undef'
+			'sort-by:sanitizeString'		=>	'undef',
+			'bios:sanitizeString'			=>	'undef',
+			'architecture:sanitizeString'	=>	'undef',
 		);
 
 		$this->setArgKeys($argKeys);
@@ -121,7 +123,9 @@ class NotebooksController extends GenericController
 			'vendor'		=>	$this->viewArgs['vendor'],
 			'comm_year'		=>	$this->viewArgs['comm_year'],
 			'subtype'		=>	$this->viewArgs['subtype'],
-			'compatibility'	=>	$this->viewArgs['compatibility']
+			'compatibility'	=>	$this->viewArgs['compatibility'],
+			'bios'			=>	$this->viewArgs['bios'],
+			'architecture'	=>	$this->viewArgs['architecture'],
 		);
 		
 		$this->mod->setWhereQueryClause($whereArray);
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 986f42a..c5bf78c 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -245,6 +245,7 @@ class Lang
 				/*0207*/"permanently delete the device page"	=>	"cancella definitivamente la pagina",
 				/*0208*/"This page has been permanently deleted by an administrator of the website"	=>	"Questa pagina è stata definitivamente cancellata da un amministratore del sito",
 				/*0209*/"No ethernet devices found"	=>	"Non è stata trovata alcuna scheda ethernet",
+				/*0210*/"free bios"	=>	"bios libero?",
 			),
 		'es'	=>	array
 			(
diff --git a/h-source/Application/Models/NotebooksModel.php b/h-source/Application/Models/NotebooksModel.php
index 2172f52..d235f74 100644
--- a/h-source/Application/Models/NotebooksModel.php
+++ b/h-source/Application/Models/NotebooksModel.php
@@ -67,4 +67,19 @@ class NotebooksModel extends GenericModel {
 		parent::__construct();
 	}
 
+	public function morePopups()
+	{
+		$this->_popupItemNames = array(
+			'bios'			=>	'bios',
+			'architecture'	=>	'architecture',
+		);
+
+		$this->_popupLabels = array(
+			'bios'			=>	gtext("free bios"),
+			'architecture'	=>	gtext("architecture"),
+		);
+
+		$this->createPopupWhere('bios,architecture');
+	}
+
 }
\ No newline at end of file
diff --git a/h-source/Application/Views/Notebooks/catalogue.php b/h-source/Application/Views/Notebooks/catalogue.php
index d16b8de..9eab6f0 100644
--- a/h-source/Application/Views/Notebooks/catalogue.php
+++ b/h-source/Application/Views/Notebooks/catalogue.php
@@ -32,6 +32,16 @@
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
 			</div>
 		</div>
+
+		<div class="viewall_popup_menu_box_external more_filters">
+			<div class="viewall_popup_menu_box">
+				<?php echo $popupMore;?>
+			</div>
+			<div class="viewall_popup_menu_status">
+				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['bios']?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['architecture']?></div>
+			</div>
+		</div>
 		
 		<!--if no notebooks found-->
 		<?php if (strcmp($recordNumber,0) === 0) { ?>