diff options
Diffstat (limited to 'h-source')
6 files changed, 18 insertions, 7 deletions
diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php index 9222743..252803c 100644 --- a/h-source/Application/Controllers/NotebooksController.php +++ b/h-source/Application/Controllers/NotebooksController.php @@ -54,7 +54,7 @@ class NotebooksController extends GenericController "++++++checkIsStrings|".Notebooks::biosList() => "bios", "+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works", "++++++++checkIsStrings|".Notebooks::architectureList() => "architecture", - "+++++++++checkIsStrings|".Notebooks::$installableSelect => "can_free_systems_be_installed", + "+++++++++checkIsStrings|".Notebooks::installableList() => "can_free_systems_be_installed", "++++++++++checkIsStrings|".Notebooks::preventWifiList() => "prevent_wifi", ); diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php index 2d0d26f..f2026a9 100644 --- a/h-source/Application/Include/hardware.php +++ b/h-source/Application/Include/hardware.php @@ -344,7 +344,7 @@ class Notebooks extends Hardware "E Garbage" => "E-garbage" ); - public static $subtypeSelect = 'notebook,netbook,motherboard,tablet,not-specified'; + public static $subtypeSelect = 'notebook,netbook,tablet,not-specified'; public static $architectureSelect = array( "not specified" => 'not-specified', @@ -367,7 +367,13 @@ class Notebooks extends Hardware "yes (please specify in the description entry)" => 'yes', ); - public static $installableSelect = 'not-specified,no,yes'; + public static $installableSelect = array( + "not specified" => 'not-specified', + "no (please specify in the description entry)" => 'no', + "yes" => 'yes', + ); + +// public static $installableSelect = 'not-specified,no,yes'; public static $videoSelect = array( "not specified" => 'not-specified', @@ -452,6 +458,11 @@ class Notebooks extends Hardware { return implode(',',array_values(self::$preventWifiSelect)); } + + public static function installableList() + { + return implode(',',array_values(self::$installableSelect)); + } } class ThreeGcards extends Wifi diff --git a/h-source/Application/Views/Desktop/Hardware/left.php b/h-source/Application/Views/Desktop/Hardware/left.php index 738be2f..03068f5 100644 --- a/h-source/Application/Views/Desktop/Hardware/left.php +++ b/h-source/Application/Views/Desktop/Hardware/left.php @@ -27,7 +27,7 @@ </div> <div class="hardware_element"> - <img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>"><?php echo gtext("Notebooks");?>, <?php echo gtext("netbooks");?>, <?php echo gtext("motherboards");?>, <?php echo gtext("tablet PC");?></a> + <img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>"><?php echo gtext("Notebooks");?>, <?php echo gtext("netbooks");?>, <?php echo gtext("tablet PC");?></a> </div> <div class="hardware_element"> diff --git a/h-source/Application/Views/Desktop/Notebooks/page.php b/h-source/Application/Views/Desktop/Notebooks/page.php index ae3ec0e..0981a3a 100644 --- a/h-source/Application/Views/Desktop/Notebooks/page.php +++ b/h-source/Application/Views/Desktop/Notebooks/page.php @@ -66,7 +66,7 @@ <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("can free operating systems be installed?");?></div> - <div class="inner_value"><b><?php echo gtext($item[$tableName]['can_free_systems_be_installed']);?></b></div> + <div class="inner_value"><b><?php echo gtext($item[$tableName]['can_free_systems_be_installed']);?></b> <?php if (strcmp($item[$tableName]['can_free_systems_be_installed'],'no') === 0) echo "<span class='no_bold'>(".gtext("see the details inside the description entry").")</span>";?></div> </div> <div class="notebook_vendor"> diff --git a/h-source/Application/Views/Mobile/Hardware/left.php b/h-source/Application/Views/Mobile/Hardware/left.php index d93f72d..d0c17b9 100644 --- a/h-source/Application/Views/Mobile/Hardware/left.php +++ b/h-source/Application/Views/Mobile/Hardware/left.php @@ -29,7 +29,7 @@ <ul id="hardware_list" data-role="listview" data-theme="c" style="overflow:hidden;"> <li> <a href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>"> - <?php echo gtext("Notebooks");?>, <?php echo gtext("netbooks");?>, <?php echo gtext("motherboards");?>, <?php echo gtext("tablet PC");?> + <?php echo gtext("Notebooks");?>, <?php echo gtext("netbooks");?>, <?php echo gtext("tablet PC");?> <img class="image_thumb_list" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png" /> </a> </li> diff --git a/h-source/Application/Views/Mobile/Notebooks/page.php b/h-source/Application/Views/Mobile/Notebooks/page.php index f174a54..124d5b4 100644 --- a/h-source/Application/Views/Mobile/Notebooks/page.php +++ b/h-source/Application/Views/Mobile/Notebooks/page.php @@ -65,7 +65,7 @@ <div class="ui-grid-a main_content_element"> <div class="ui-block-a"><?php echo gtext("can free operating systems be installed?");?></div> - <div class="ui-block-b"><b><?php echo gtext($item[$tableName]['can_free_systems_be_installed']);?></b></div> + <div class="ui-block-b"><b><?php echo gtext($item[$tableName]['can_free_systems_be_installed']);?></b> <?php if (strcmp($item[$tableName]['can_free_systems_be_installed'],'no') === 0) echo "<span class='no_bold'>(".gtext("see the details inside the description entry").")</span>";?></div> </div> <div class="ui-grid-a main_content_element"> |