From ea0f13c140f6444d4b0da9e38e1c27c9004b6184 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Thu, 2 Aug 2012 00:44:36 +0000 Subject: dropped pcmcia controller, added generic host controller with subtype --- .../Application/Views/Desktop/Download/index.php | 4 ++-- .../Application/Views/Desktop/Hardware/left.php | 2 +- .../Views/Desktop/Search/lspci_results.php | 23 ++-------------------- h-source/Application/Views/Desktop/catalogue.php | 8 ++++++-- h-source/Application/Views/Desktop/form.php | 3 +++ .../Application/Views/Desktop/if_page_deleted.php | 1 + h-source/Application/Views/Desktop/page.php | 6 +++--- .../Application/Views/Mobile/Hardware/left.php | 4 ++-- h-source/Application/Views/Mobile/catalogue.php | 9 +++++++-- .../Application/Views/Mobile/if_page_deleted.php | 1 + h-source/Application/Views/Mobile/page.php | 6 +++--- 11 files changed, 31 insertions(+), 36 deletions(-) (limited to 'h-source/Application/Views') diff --git a/h-source/Application/Views/Desktop/Download/index.php b/h-source/Application/Views/Desktop/Download/index.php index 31aa3b0..2f37f81 100644 --- a/h-source/Application/Views/Desktop/Download/index.php +++ b/h-source/Application/Views/Desktop/Download/index.php @@ -102,8 +102,8 @@ "> - PCMCIA Controllers in the database");?> - "> + Host Controllers in the database");?> + "> diff --git a/h-source/Application/Views/Desktop/Hardware/left.php b/h-source/Application/Views/Desktop/Hardware/left.php index ffbb50e..738be2f 100644 --- a/h-source/Application/Views/Desktop/Hardware/left.php +++ b/h-source/Application/Views/Desktop/Hardware/left.php @@ -87,6 +87,6 @@
- +
\ No newline at end of file diff --git a/h-source/Application/Views/Desktop/Search/lspci_results.php b/h-source/Application/Views/Desktop/Search/lspci_results.php index b74867b..970789b 100644 --- a/h-source/Application/Views/Desktop/Search/lspci_results.php +++ b/h-source/Application/Views/Desktop/Search/lspci_results.php @@ -53,27 +53,7 @@
".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; - case 'ethernet-card': - echo gtext("does it work with free software?"). " ".gtext($row['hardware']['ethernet_card_works']).""; - break; - case 'acquisition-card': - echo gtext("does it work with free software?"). " ".gtext($row['hardware']['compatibility']).""; - break; - case 'sd-card-reader': - echo gtext("does it work with free software?"). " ".gtext($row['hardware']['sd_card_works']).""; - break; - } + echo gtext("does it work with free software?"). " ".gtext($row['hardware'][Hardware::getWorksFieldFromType($row['hardware']['type'])]).""; ?>
@@ -94,6 +74,7 @@ ".Hardware::getTypeFromClass($device['classId'])." - ".$device['deviceName'];?>
diff --git a/h-source/Application/Views/Desktop/catalogue.php b/h-source/Application/Views/Desktop/catalogue.php index 4ab18f0..b89eed6 100644 --- a/h-source/Application/Views/Desktop/catalogue.php +++ b/h-source/Application/Views/Desktop/catalogue.php @@ -71,10 +71,14 @@
- controller,'notebooks') === 0 ) { ?> + controller,'notebooks') === 0 or strcmp($this->controller,'hostcontrollers') === 0) { ?>
+ controller,'notebooks') === 0) { ?>
(, , , ):
-
+ +
():
+ +
diff --git a/h-source/Application/Views/Desktop/form.php b/h-source/Application/Views/Desktop/form.php index 8213756..dd66614 100644 --- a/h-source/Application/Views/Desktop/form.php +++ b/h-source/Application/Views/Desktop/form.php @@ -54,6 +54,9 @@
(laser, inkjet, ..):
+ controller,'hostcontrollers') === 0 ) { ?> +
():
+
diff --git a/h-source/Application/Views/Desktop/if_page_deleted.php b/h-source/Application/Views/Desktop/if_page_deleted.php index 3610716..932d0dd 100644 --- a/h-source/Application/Views/Desktop/if_page_deleted.php +++ b/h-source/Application/Views/Desktop/if_page_deleted.php @@ -52,6 +52,7 @@
+
diff --git a/h-source/Application/Views/Desktop/page.php b/h-source/Application/Views/Desktop/page.php index 8e90923..231975c 100644 --- a/h-source/Application/Views/Desktop/page.php +++ b/h-source/Application/Views/Desktop/page.php @@ -60,10 +60,10 @@
- controller,'printers') === 0 ) { ?> + controller,'printers') === 0 or strcmp($this->controller,'hostcontrollers') === 0) { ?>
-
(laser, inkjet, ..):
-
+
():
+
diff --git a/h-source/Application/Views/Mobile/Hardware/left.php b/h-source/Application/Views/Mobile/Hardware/left.php index 4fbb0e4..d93f72d 100644 --- a/h-source/Application/Views/Mobile/Hardware/left.php +++ b/h-source/Application/Views/Mobile/Hardware/left.php @@ -118,8 +118,8 @@
  • - - + +
  • diff --git a/h-source/Application/Views/Mobile/catalogue.php b/h-source/Application/Views/Mobile/catalogue.php index 6091c05..199d661 100644 --- a/h-source/Application/Views/Mobile/catalogue.php +++ b/h-source/Application/Views/Mobile/catalogue.php @@ -54,9 +54,14 @@

    :

    - controller,'notebooks') === 0 ) { ?> + controller,'notebooks') === 0 or strcmp($this->controller,'hostcontrollers') === 0) { ?>

    - (, , , ): + controller,'notebooks') === 0) { ?> + (, , , ) + + () + + :

    diff --git a/h-source/Application/Views/Mobile/if_page_deleted.php b/h-source/Application/Views/Mobile/if_page_deleted.php index 3610716..932d0dd 100644 --- a/h-source/Application/Views/Mobile/if_page_deleted.php +++ b/h-source/Application/Views/Mobile/if_page_deleted.php @@ -52,6 +52,7 @@
    +
    diff --git a/h-source/Application/Views/Mobile/page.php b/h-source/Application/Views/Mobile/page.php index c692477..9d994b4 100644 --- a/h-source/Application/Views/Mobile/page.php +++ b/h-source/Application/Views/Mobile/page.php @@ -59,10 +59,10 @@
    controller);?>
    - controller,'printers') === 0 ) { ?> + controller,'printers') === 0 or strcmp($this->controller,'hostcontrollers') === 0) { ?>
    -
    (laser, inkjet, ..):
    -
    +
    ():
    +
    -- cgit v1.2.3