From 822005d36ad721c2203a5bff990210fa33afee34 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Thu, 3 Feb 2011 13:22:46 +0000 Subject: improved search page --- .../Application/Controllers/SearchController.php | 1 + h-source/Application/Include/languages.php | 11 +++ .../Application/Views/Search/lspci_results.php | 91 +++++++++++---------- h-source/Public/Css/website.css | 32 +++++++- h-source/Public/Img/Crystal/agt_forward.png | Bin 0 -> 729 bytes h-source/Public/Img/search_back.png | Bin 0 -> 3404 bytes 6 files changed, 88 insertions(+), 47 deletions(-) create mode 100755 h-source/Public/Img/Crystal/agt_forward.png create mode 100644 h-source/Public/Img/search_back.png (limited to 'h-source') diff --git a/h-source/Application/Controllers/SearchController.php b/h-source/Application/Controllers/SearchController.php index a65ba62..1b35a09 100644 --- a/h-source/Application/Controllers/SearchController.php +++ b/h-source/Application/Controllers/SearchController.php @@ -221,6 +221,7 @@ class SearchController extends BaseController $data['flag'] = $flag; $data['table'] = array(); + $data['notFoundDevices'] = array(); if ($flag) { diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index f09b809..a315339 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -154,6 +154,7 @@ class Lang "The following devices has been found in the database" => "I seguenti device sono stati trovati nel database", "yes" => "sì", "The following devices has not been found in the database" => "I seguenti device non sono stati trovati nel database", + "can you please insert them?" => "puoi gentilmente inserirli?", ), 'es' => array ( @@ -348,6 +349,16 @@ class Lang } } +class Go +{ + + public static function toHardwareType($type) + { + return "http://".DOMAIN_NAME."/".Hardware::getControllerFromType($type)."/catalogue/".Lang::$current; + } + +} + class MyStrings { diff --git a/h-source/Application/Views/Search/lspci_results.php b/h-source/Application/Views/Search/lspci_results.php index 5d1dfa4..65323cf 100644 --- a/h-source/Application/Views/Search/lspci_results.php +++ b/h-source/Application/Views/Search/lspci_results.php @@ -39,56 +39,61 @@ - 0) { ?> -
- : -
- - - -
-
- ".$row['hardware']['type']." - ".$row['hardware']['model']."";?> +
+ 0) { ?> +
+ :
-
- ".gtext($row['hardware']['wifi_works']).""; - break; - case 'videocard': - echo gtext("does it work with free software?"). " ".gtext(Videocard::$videoReverse[$row['hardware']['video_card_works']]).""; - break; - case 'soundcard': - echo gtext("does it work with free software?"). " ".gtext($row['hardware']['sound_card_works']).""; - break; - } - ?> + + + +
+
+ ".$row['hardware']['type']." - ".$row['hardware']['model']."";?> +
+
+ ".gtext($row['hardware']['wifi_works']).""; + break; + case 'videocard': + echo gtext("does it work with free software?"). " ".gtext(Videocard::$videoReverse[$row['hardware']['video_card_works']]).""; + break; + case 'soundcard': + echo gtext("does it work with free software?"). " ".gtext($row['hardware']['sound_card_works']).""; + break; + } + ?> +
+
- - 0) { ?> -
- : -
- - - -
-
- ".Hardware::getTypeFromClass($device['classId'])." - ".$device['deviceName'];?> -
-
    -
  • vendor name:
    • -
  • vendorid:productid code:
    • -
+
+ 0) { ?> +
+ :
+ +
+ + + +
+
+ ".Hardware::getTypeFromClass($device['classId'])." - ".$device['deviceName'];?> +
+
    +
  • :
    • +
  • :
    • +
+ insert +
+
- -
diff --git a/h-source/Public/Css/website.css b/h-source/Public/Css/website.css index 03043ec..def10fa 100755 --- a/h-source/Public/Css/website.css +++ b/h-source/Public/Css/website.css @@ -1568,9 +1568,12 @@ td.text_item_date .lspci_item_found, .lspci_item_not_found { - margin:10px 5px; - background: #C7DAEF; - padding:8px; + margin:20px 5px; + background: url('../Img/search_back.png') no-repeat top left; +/* background: #C7DAEF; */ + padding:12px 15px; + border-bottom:3px solid #8eb5df; + border-right:1px solid #8eb5df; } .lspci_item_found_compat { @@ -1589,5 +1592,26 @@ td.text_item_date .lspci_item_not_found { - background: orange; + background: #ffe170; + border-bottom:3px solid #e8c224; + border-right:1px solid #e8c224; +} +.lspci_item_found_compat ul li +{ + list-style-type:none; +} +.lspci_item_found_compat ul +{ + margin:10px 20px; + padding:0px; +} +.found_ext +{ + margin-bottom:2em; +} + +.lspci_item_found_compat a +{ + text-decoration:none; + font:normal 16px/1 sans-serif; } \ No newline at end of file diff --git a/h-source/Public/Img/Crystal/agt_forward.png b/h-source/Public/Img/Crystal/agt_forward.png new file mode 100755 index 0000000..13a59ad Binary files /dev/null and b/h-source/Public/Img/Crystal/agt_forward.png differ diff --git a/h-source/Public/Img/search_back.png b/h-source/Public/Img/search_back.png new file mode 100644 index 0000000..6fd3b01 Binary files /dev/null and b/h-source/Public/Img/search_back.png differ -- cgit v1.2.3