From fad53c421cae174bcdfd6d6d4ffdaa5da40a2c5c Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Wed, 13 Jun 2012 13:29:47 +0000 Subject: adding motherboards - part 1 --- h-source/Application/Controllers/NotebooksController.php | 2 +- h-source/Application/Include/hardware.php | 13 +++++++++++-- h-source/Application/Include/languages.php | 8 ++++++++ h-source/Application/Views/Desktop/Hardware/left.php | 2 +- h-source/Application/Views/Desktop/Notebooks/page.php | 8 ++++---- h-source/Application/Views/Desktop/catalogue.php | 12 ++++++------ h-source/Application/Views/Mobile/Hardware/left.php | 2 +- h-source/Application/Views/Mobile/Notebooks/page.php | 11 +++-------- h-source/Application/Views/Mobile/catalogue.php | 6 +++--- 9 files changed, 38 insertions(+), 26 deletions(-) (limited to 'h-source') diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php index 20d3156..f84be07 100644 --- a/h-source/Application/Controllers/NotebooksController.php +++ b/h-source/Application/Controllers/NotebooksController.php @@ -51,7 +51,7 @@ class NotebooksController extends GenericController "+++checkIsStrings|".Notebooks::$subtypeSelect => "subtype", "++++checkIsStrings|".Notebooks::wifiList() => "wifi_works", "+++++checkIsStrings|".Notebooks::videoList() => "video_card_works", - "++++++checkIsStrings|".Notebooks::$biosSelect => "bios", + "++++++checkIsStrings|".Notebooks::biosList() => "bios", "+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works", "++++++++checkIsStrings|".Notebooks::architectureList() => "architecture", "+++++++++checkIsStrings|".Notebooks::$installableSelect => "can_free_systems_be_installed", diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php index 61a01dd..bcfd635 100644 --- a/h-source/Application/Include/hardware.php +++ b/h-source/Application/Include/hardware.php @@ -301,7 +301,7 @@ class Notebooks extends Hardware "E Garbage" => "E-garbage" ); - public static $subtypeSelect = 'notebook,netbook,tablet,not-specified'; + public static $subtypeSelect = 'notebook,netbook,motherboard,tablet,not-specified'; public static $architectureSelect = array( "not specified" => 'not-specified', @@ -311,7 +311,11 @@ class Notebooks extends Hardware "ARM" => 'ARM', ); - public static $biosSelect = 'not-specified,no,yes'; + public static $biosSelect = array( + "not specified" => 'not-specified', + "no" => 'no', + "yes" => 'yes' + ); public static $installableSelect = 'not-specified,no,yes'; @@ -388,6 +392,11 @@ class Notebooks extends Hardware { return implode(',',array_values(self::$architectureSelect)); } + + public static function biosList() + { + return implode(',',array_values(self::$biosSelect)); + } } class ThreeGcards extends Wifi diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index fa87142..c3a88b5 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -385,6 +385,14 @@ class Lang /*0325*/"No PCMCIA Controller found" => "Nessun controller PCMCIA รจ stato trovato", /*0326*/"PCMCIA Controllers" => "Controller PCMCIA", /*0327*/"Download the xml file of all the PCMCIA Controllers in the database" => "Scarica il file xml di tutti i Controller PCMCIA presenti nel database", + /*0328*/"notebook" => "notebook", + /*0329*/"netbook" => "netbook", + /*0330*/"motherboard" => "scheda madre", + /*0331*/"tablet" => "tablet", + /*0332*/"netbooks" => "netbook", + /*0333*/"Notebooks" => "Notebook", + /*0334*/"tablet PC" => "PC tablet", + /*0335*/"motherboards" => "schede madri", ), 'es' => array ( diff --git a/h-source/Application/Views/Desktop/Hardware/left.php b/h-source/Application/Views/Desktop/Hardware/left.php index cc92aa8..ffbb50e 100644 --- a/h-source/Application/Views/Desktop/Hardware/left.php +++ b/h-source/Application/Views/Desktop/Hardware/left.php @@ -27,7 +27,7 @@
- + , , ,
diff --git a/h-source/Application/Views/Desktop/Notebooks/page.php b/h-source/Application/Views/Desktop/Notebooks/page.php index 98b13cd..174bad3 100644 --- a/h-source/Application/Views/Desktop/Notebooks/page.php +++ b/h-source/Application/Views/Desktop/Notebooks/page.php @@ -45,13 +45,13 @@
-
:
-
+
(, , , ):
+
-
:
-
+
:
+
diff --git a/h-source/Application/Views/Desktop/catalogue.php b/h-source/Application/Views/Desktop/catalogue.php index ad00222..9b441a2 100644 --- a/h-source/Application/Views/Desktop/catalogue.php +++ b/h-source/Application/Views/Desktop/catalogue.php @@ -71,18 +71,18 @@
-
-
:
-
-
- controller,'notebooks') === 0 ) { ?>
-
:
+
(, , , ):
+
+
:
+
+
+
:
diff --git a/h-source/Application/Views/Mobile/Hardware/left.php b/h-source/Application/Views/Mobile/Hardware/left.php index 4806d4d..4fbb0e4 100644 --- a/h-source/Application/Views/Mobile/Hardware/left.php +++ b/h-source/Application/Views/Mobile/Hardware/left.php @@ -29,7 +29,7 @@