From 93f681d5bd99d28acdb1e4c6eb3e5bbc4a6842bf Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Sun, 9 Sep 2012 14:08:19 +0000 Subject: added the entry: 'does the device prevent the installation of wifi cards not-approved by the vendor?' - part 1 --- h-source/Application/Controllers/DownloadController.php | 1 + h-source/Application/Controllers/NotebooksController.php | 3 ++- h-source/Application/Include/hardware.php | 11 +++++++++++ h-source/Application/Include/languages.php | 2 ++ h-source/Application/Models/NotebooksModel.php | 1 + h-source/Application/Views/Desktop/Notebooks/form.php | 5 +++++ h-source/Application/Views/Desktop/Notebooks/page.php | 5 +++++ h-source/Application/Views/Mobile/Notebooks/page.php | 5 +++++ h-source/Public/Css/main.css | 5 +++++ h-source/tables.sql | 2 ++ 10 files changed, 39 insertions(+), 1 deletion(-) (limited to 'h-source') diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php index 98f362e..c8e79c9 100644 --- a/h-source/Application/Controllers/DownloadController.php +++ b/h-source/Application/Controllers/DownloadController.php @@ -72,6 +72,7 @@ class DownloadController extends BaseController $xml .= "\t\t".translate($row['hardware']['architecture'])."\n"; $xml .= "\t\t".$row['hardware']['bios']."\n"; $xml .= "\t\t".$row['hardware']['can_free_systems_be_installed']."\n"; + $xml .= "\t\t".$row['hardware']['prevent_wifi']."\n"; } $xml .= "\t\t".$row['hardware']['model']."\n"; diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php index f84be07..9222743 100644 --- a/h-source/Application/Controllers/NotebooksController.php +++ b/h-source/Application/Controllers/NotebooksController.php @@ -55,6 +55,7 @@ class NotebooksController extends GenericController "+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works", "++++++++checkIsStrings|".Notebooks::architectureList() => "architecture", "+++++++++checkIsStrings|".Notebooks::$installableSelect => "can_free_systems_be_installed", + "++++++++++checkIsStrings|".Notebooks::preventWifiList() => "prevent_wifi", ); $this->m['HardwareModel']->strongConditions['insert'] = $this->m['HardwareModel']->strongConditions['update']; @@ -71,7 +72,7 @@ class NotebooksController extends GenericController $this->m['HardwareModel']->softConditions['insert'] = $this->m['HardwareModel']->softConditions['update']; - $this->m['HardwareModel']->setFields('vendor,model,compatibility,kernel,description,distribution,video_card_type,video_card_works,wifi_type,wifi_works,comm_year,subtype,bios,can_free_systems_be_installed,webcam_type,webcam_works,architecture','sanitizeAll'); + $this->m['HardwareModel']->setFields('vendor,model,compatibility,kernel,description,distribution,video_card_type,video_card_works,wifi_type,wifi_works,comm_year,subtype,bios,can_free_systems_be_installed,webcam_type,webcam_works,architecture,prevent_wifi','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php index ce2ad01..2d0d26f 100644 --- a/h-source/Application/Include/hardware.php +++ b/h-source/Application/Include/hardware.php @@ -361,6 +361,12 @@ class Notebooks extends Hardware "can be installed" => 'can-be-installed', ); + public static $preventWifiSelect = array( + "not specified" => 'not-specified', + "no" => 'no', + "yes (please specify in the description entry)" => 'yes', + ); + public static $installableSelect = 'not-specified,no,yes'; public static $videoSelect = array( @@ -441,6 +447,11 @@ class Notebooks extends Hardware { return implode(',',array_values(self::$biosSelect)); } + + public static function preventWifiList() + { + return implode(',',array_values(self::$preventWifiSelect)); + } } class ThreeGcards extends Wifi diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index 69bc08d..2adadf6 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -413,6 +413,8 @@ class Lang /*0352*/"HECI Controller" => "Controller HECI", /*0353*/"device type" => "tipo di dispositivo", /*0354*/"Thanks for your contribution!" => "Grazie per il tuo contributo!", + /*0355*/"does the device prevent the installation of wifi cards not-approved by the vendor?" => "il dispositivo impedisce l'installazione di schede wifi non approvate dal rivenditore/distributore?", + /*0356*/"see the details inside the description entry" => "guarda i dettagli all'interno del campo descrizione", ), 'es' => array ( diff --git a/h-source/Application/Models/NotebooksModel.php b/h-source/Application/Models/NotebooksModel.php index 11a5e96..d9b9008 100644 --- a/h-source/Application/Models/NotebooksModel.php +++ b/h-source/Application/Models/NotebooksModel.php @@ -52,6 +52,7 @@ class NotebooksModel extends GenericModel { 'architecture' => gtext('architecture'), 'bios' => gtext('does it have a free bios?'), 'can_free_systems_be_installed' => gtext('can free operating systems be installed?'), + 'prevent_wifi' => gtext('does the device prevent the installation of wifi cards not-approved by the vendor?'), 'comm_year' => gtext('year of commercialization'), 'distribution' => gtext('GNU/Linux distribution used for the test'), 'compatibility' => gtext('compatibility with free software'), diff --git a/h-source/Application/Views/Desktop/Notebooks/form.php b/h-source/Application/Views/Desktop/Notebooks/form.php index cc74eb1..aeeff26 100644 --- a/h-source/Application/Views/Desktop/Notebooks/form.php +++ b/h-source/Application/Views/Desktop/Notebooks/form.php @@ -70,6 +70,11 @@ +
+
+ +
+
:
diff --git a/h-source/Application/Views/Desktop/Notebooks/page.php b/h-source/Application/Views/Desktop/Notebooks/page.php index 5ba76fa..ae3ec0e 100644 --- a/h-source/Application/Views/Desktop/Notebooks/page.php +++ b/h-source/Application/Views/Desktop/Notebooks/page.php @@ -69,6 +69,11 @@
+
+
+
(".gtext("see the details inside the description entry").")";?>
+
+
:
diff --git a/h-source/Application/Views/Mobile/Notebooks/page.php b/h-source/Application/Views/Mobile/Notebooks/page.php index ddcba36..f174a54 100644 --- a/h-source/Application/Views/Mobile/Notebooks/page.php +++ b/h-source/Application/Views/Mobile/Notebooks/page.php @@ -68,6 +68,11 @@
+
+
+
(".gtext("see the details inside the description entry").")";?>
+
+
:
diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css index 9361efc..080e613 100644 --- a/h-source/Public/Css/main.css +++ b/h-source/Public/Css/main.css @@ -2118,6 +2118,11 @@ div#description_tabs_content width:130px; } +.no_bold +{ + font-weight:normal; +} + /*.version_div a { display:block; diff --git a/h-source/tables.sql b/h-source/tables.sql index 31d7643..2cdcdad 100644 --- a/h-source/tables.sql +++ b/h-source/tables.sql @@ -169,6 +169,7 @@ CREATE TABLE IF NOT EXISTS `hardware` ( `sd_card_works` varchar(30) NOT NULL DEFAULT 'not-specified', `can_free_systems_be_installed` varchar(30) NOT NULL DEFAULT 'not-specified', `it_tracks_users` varchar(30) NOT NULL DEFAULT 'not-specified', + `prevent_wifi` char(20) NOT NULL DEFAULT 'not-specified', PRIMARY KEY (`id_hard`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=503 ; @@ -418,6 +419,7 @@ CREATE TABLE IF NOT EXISTS `revisions` ( `sd_card_works` varchar(30) NOT NULL DEFAULT 'not-specified', `can_free_systems_be_installed` varchar(30) NOT NULL DEFAULT 'not-specified', `it_tracks_users` varchar(30) NOT NULL DEFAULT 'not-specified', + `prevent_wifi` char(20) NOT NULL DEFAULT 'not-specified', PRIMARY KEY (`id_rev`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=627 ; -- cgit v1.2.3