From 672044016f0f2a28388d4af37d2b49afc7ff23be Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Mon, 9 Jul 2012 13:22:00 +0000
Subject: improved the free bios entry - Michał Masłowski and lammi87
suggestions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
h-source/Application/Include/hardware.php | 11 +++++++++--
h-source/Application/Include/languages.php | 3 +++
h-source/Application/Models/NotebooksModel.php | 4 ++--
h-source/Application/Views/Desktop/Notebooks/form.php | 2 +-
h-source/Application/Views/Desktop/Notebooks/page.php | 4 ++--
h-source/Application/Views/Desktop/catalogue.php | 4 ++--
h-source/Application/Views/Mobile/Notebooks/page.php | 4 ++--
h-source/Public/Css/main.css | 3 ++-
h-source/tables.sql | 4 ++--
9 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 67c77d4..eebdbd5 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -26,6 +26,11 @@ function translate($string)
return Hardware::translate($string);
}
+function translate_and_gtext($string)
+{
+ return gtext(translate($string));
+}
+
class Hardware
{
@@ -35,6 +40,7 @@ class Hardware
"works_with_3D" => "works with 3D acceleration",
"works_without_3D" => "works, but without 3D acceleration",
"does_not_work" => "it does not work",
+ "can-be-installed" => "can be installed",
);
public static $regExpressions = array(
@@ -318,7 +324,8 @@ class Notebooks extends Hardware
public static $biosSelect = array(
"not specified" => 'not-specified',
"no" => 'no',
- "yes" => 'yes'
+ "yes" => 'yes',
+ "can be installed" => 'can-be-installed',
);
public static $installableSelect = 'not-specified,no,yes';
@@ -332,7 +339,7 @@ class Notebooks extends Hardware
public static $videoReverse = array(
"yes_with_3D" => "works with 3D acceleration",
- "yes_without_3D" => "works but without 3D acceleration",
+ "yes_without_3D" => "works, but without 3D acceleration",
"no" => "it does not work",
'not-specified' => "not specified how it works",
"" => ""
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index d8fafbf..8652b55 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -395,6 +395,9 @@ class Lang
/*0335*/"motherboards" => "schede madri",
/*0336*/"Write a comma-separated list of kernel versions" => "Scrivi una lista di kernel separati da virgole",
/*0337*/"Example" => "Esempio",
+ /*0338*/"free boot firmware?" => "firmware per boot libero?",
+ /*0339*/"can be installed" => "può essere installato",
+ /*0340*/"does it have free boot firmware (BIOS,UEFI,...) ?" => "ha un firmware per il boot (BIOS, UEFI,..) libero?"
),
'es' => array
(
diff --git a/h-source/Application/Models/NotebooksModel.php b/h-source/Application/Models/NotebooksModel.php
index bb4f403..c4ecf74 100644
--- a/h-source/Application/Models/NotebooksModel.php
+++ b/h-source/Application/Models/NotebooksModel.php
@@ -78,13 +78,13 @@ class NotebooksModel extends GenericModel {
);
$this->_popupLabels = array(
- 'bios' => gtext("free bios"),
+ 'bios' => gtext("free boot firmware?"),
'architecture' => gtext("architecture"),
);
$this->_popupFunctions = array(
'architecture' => 'translate',
- 'bios' => 'gtext',
+ 'bios' => 'translate_and_gtext',
);
$this->createPopupWhere('bios,architecture');
diff --git a/h-source/Application/Views/Desktop/Notebooks/form.php b/h-source/Application/Views/Desktop/Notebooks/form.php
index 2c6ce5a..1ebfc86 100644
--- a/h-source/Application/Views/Desktop/Notebooks/form.php
+++ b/h-source/Application/Views/Desktop/Notebooks/form.php
@@ -61,7 +61,7 @@
</div>
<div class="form_entry">
- <div class="entry_label"><?php echo gtext("does it have a free BIOS?");?></div>
+ <div class="entry_label"><?php echo gtext("does it have free boot firmware (BIOS,UEFI,...) ?");?></div>
<?php echo Html_Form::select('bios',$values['bios'],Notebooks::$biosSelect,"select_entry");?>
</div>
diff --git a/h-source/Application/Views/Desktop/Notebooks/page.php b/h-source/Application/Views/Desktop/Notebooks/page.php
index b3a8b6d..91591f8 100644
--- a/h-source/Application/Views/Desktop/Notebooks/page.php
+++ b/h-source/Application/Views/Desktop/Notebooks/page.php
@@ -60,8 +60,8 @@
</div>
<div class="notebook_vendor">
- <div class="inner_label"><?php echo gtext("does it have a free BIOS?");?></div>
- <div class="inner_value"><b><?php echo gtext($item[$tableName]['bios']);?></b></div>
+ <div class="inner_label"><?php echo gtext("does it have free boot firmware (BIOS,UEFI,...) ?");?></div>
+ <div class="inner_value"><b><?php echo translate_and_gtext($item[$tableName]['bios']);?></b></div>
</div>
<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Desktop/catalogue.php b/h-source/Application/Views/Desktop/catalogue.php
index f4040d8..4ab18f0 100644
--- a/h-source/Application/Views/Desktop/catalogue.php
+++ b/h-source/Application/Views/Desktop/catalogue.php
@@ -35,8 +35,8 @@
<?php echo $popupMore;?>
</div>
<div class="viewall_popup_menu_status">
- <div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['bios'])?></div>
- <div class="viewall_popup_menu_status_item"><?php echo gtext(translate($this->viewArgs['architecture']));?></div>
+ <div class="viewall_popup_menu_status_item"><?php echo translate_and_gtext($this->viewArgs['bios'])?></div>
+ <div class="viewall_popup_menu_status_item"><?php echo translate_and_gtext($this->viewArgs['architecture']);?></div>
</div>
</div>
<?php } ?>
diff --git a/h-source/Application/Views/Mobile/Notebooks/page.php b/h-source/Application/Views/Mobile/Notebooks/page.php
index 370a053..bb3352b 100644
--- a/h-source/Application/Views/Mobile/Notebooks/page.php
+++ b/h-source/Application/Views/Mobile/Notebooks/page.php
@@ -59,8 +59,8 @@
</div>
<div class="ui-grid-a main_content_element">
- <div class="ui-block-a"><?php echo gtext("does it have a free BIOS?");?></div>
- <div class="ui-block-b"><b><?php echo gtext($item[$tableName]['bios']);?></b></div>
+ <div class="ui-block-a"><?php echo gtext("does it have free boot firmware (BIOS,UEFI,...) ?");?></div>
+ <div class="ui-block-b"><b><?php echo translate_and_gtext($item[$tableName]['bios']);?></b></div>
</div>
<div class="ui-grid-a main_content_element">
diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css
index 344b063..9361efc 100644
--- a/h-source/Public/Css/main.css
+++ b/h-source/Public/Css/main.css
@@ -591,7 +591,8 @@ ul#menuBlock {
ul#menuBlock li.innerItem
{
height:22px;
- padding-top:3px;
+ padding-top:5px;
+ font-size:12px;
}
ul#menuBlock li {
position:relative;
diff --git a/h-source/tables.sql b/h-source/tables.sql
index 937b913..c757655 100644
--- a/h-source/tables.sql
+++ b/h-source/tables.sql
@@ -155,7 +155,7 @@ CREATE TABLE IF NOT EXISTS `hardware` (
`subtype` char(15) NOT NULL,
`driver` varchar(50) NOT NULL,
`interface` char(15) NOT NULL DEFAULT 'not-specified',
- `bios` char(15) NOT NULL DEFAULT 'not-specified',
+ `bios` char(20) NOT NULL DEFAULT 'not-specified',
`webcam_type` varchar(100) NOT NULL,
`webcam_works` varchar(30) NOT NULL DEFAULT 'not-specified',
`sound_card_works` varchar(30) NOT NULL DEFAULT 'not-specified',
@@ -404,7 +404,7 @@ CREATE TABLE IF NOT EXISTS `revisions` (
`subtype` char(15) NOT NULL,
`driver` varchar(50) NOT NULL,
`interface` char(15) NOT NULL DEFAULT 'not-specified',
- `bios` char(15) NOT NULL DEFAULT 'not-specified',
+ `bios` char(20) NOT NULL DEFAULT 'not-specified',
`webcam_type` varchar(100) NOT NULL,
`webcam_works` varchar(30) NOT NULL DEFAULT 'not-specified',
`sound_card_works` varchar(30) NOT NULL DEFAULT 'not-specified',
--
cgit v1.2.3