From 8cd4f542161c2bca405e68edb5305600c175a535 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Thu, 26 Apr 2012 06:38:22 +0000
Subject: added RAID adapters - part 2

---
 h-source/Application/Include/hardware.php             | 4 ++--
 h-source/Application/Views/Desktop/Hardware/left.php  | 2 +-
 h-source/Application/Views/Desktop/Meet/hardware.php  | 2 +-
 h-source/Application/Views/Desktop/Search/results.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 9fa218b..8da5186 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -80,7 +80,7 @@ class Hardware
 		'ethernet-card'			=>	'H2O/network-wired_22.png',
 		'sd-card-reader'		=>	'H2O/media-flash-sd-mmc_22.png',
 		'modem'					=>	'Crystal/modem_22.png',
-		'RAID-adapter'			=>	'Crystal/modem_22.png',
+		'RAID-adapter'			=>	'Crystal/1282042976_hardware.png',
 	);
 
 	public static $typeToController = array(
@@ -437,7 +437,7 @@ class Fingerprintreaders extends Acquisitioncards
 
 }
 
-class Ethernetcards extends Hardware
+class Ethernetcards extends Acquisitioncards
 {
 
 }
diff --git a/h-source/Application/Views/Desktop/Hardware/left.php b/h-source/Application/Views/Desktop/Hardware/left.php
index 73e9b4a..579f2d4 100644
--- a/h-source/Application/Views/Desktop/Hardware/left.php
+++ b/h-source/Application/Views/Desktop/Hardware/left.php
@@ -83,6 +83,6 @@
 		</div>
 		
 		<div class="hardware_element">
-			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/modem.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/raidadapters/catalogue/<?php echo $lang;?>"><?php echo gtext("RAID adapters");?></a>
+			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/1282042718_hardware.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/raidadapters/catalogue/<?php echo $lang;?>"><?php echo gtext("RAID adapters");?></a>
 		</div>
 	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Meet/hardware.php b/h-source/Application/Views/Desktop/Meet/hardware.php
index c8f5a7a..b0fdfa1 100644
--- a/h-source/Application/Views/Desktop/Meet/hardware.php
+++ b/h-source/Application/Views/Desktop/Meet/hardware.php
@@ -27,4 +27,4 @@
 	$id_hard = $item['hardware']['id_hard'];
 
 	?>
-	<?php echo $type;?>	<a href="<?php echo $this->baseUrl."/".MyStrings::$reverse[$type]."/view/$lang/$id_hard/".encodeUrl($name);?>"><?php echo $name;?></a>
\ No newline at end of file
+	<?php echo $type;?>	<a href="<?php echo $this->baseUrl."/".Hardware::getControllerFromType($type)."/view/$lang/$id_hard/".encodeUrl($name);?>"><?php echo $name;?></a>
\ No newline at end of file
diff --git a/h-source/Application/Views/Desktop/Search/results.php b/h-source/Application/Views/Desktop/Search/results.php
index b8f3ce3..2fb128b 100644
--- a/h-source/Application/Views/Desktop/Search/results.php
+++ b/h-source/Application/Views/Desktop/Search/results.php
@@ -39,7 +39,7 @@
 			
 			<div class="search_result_item">
 				<div class="first_level">
-					<div class="search_result_item_left"><?php echo gtext("model name");?>:</div> <div class="search_result_item_right"><b><a href="<?php echo $this->baseUrl."/".MyStrings::$reverse[$row['hardware']['type']]."/view/$lang/".$row['hardware']['id_hard']."/".encodeUrl($row['hardware']['model']);?>"><?php echo $row['hardware']['model'];?></a></b></div>
+					<div class="search_result_item_left"><?php echo gtext("model name");?>:</div> <div class="search_result_item_right"><b><a href="<?php echo $this->baseUrl."/".Hardware::getControllerFromType($row['hardware']['type'])."/view/$lang/".$row['hardware']['id_hard']."/".encodeUrl($row['hardware']['model']);?>"><?php echo $row['hardware']['model'];?></a></b></div>
 				</div>
 				<?php if ( strcmp($row['hardware']['other_names'],'') !== 0 ) { ?>
 				<div class="first_level">
-- 
cgit v1.2.3