added some vendors -rsandu issue

4 files changed, 6 insertions, 2 deletions

diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 23cfad5..244515f 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -322,6 +322,7 @@ class Notebooks extends Hardware
 		"FUJITSU"				=>	"FUJITSU",
 		"Garlach44"				=>	"Garlach44",
 		"Gateway"				=>	"Gateway",
+		"Google"				=>	"Google",
 		"Hewlett Packard" 		=>	"Hewlett-Packard",
 		"IBM" 					=>	"IBM",
 		"Lanix"					=>	"Lanix",
@@ -332,6 +333,8 @@ class Notebooks extends Hardware
 		"Olimex"				=>	"Olimex",
 		"One Laptop per Child (Non-Profit)"	=>	"One-Laptop-per-Child-Non-Profit",
 		"Openpandora Ltd."		=>	"Openpandora-Ltd",
+		"Oracle"				=>	"Oracle",
+		"Packard Bell"			=>	"Packard-Bell",
 		"Philco"				=>	"Philco",
 		"Philips"				=>	"Philips",
 		"Panasonic"				=>	"Panasonic",
diff --git a/h-source/Application/Include/vendorTranslations.php b/h-source/Application/Include/vendorTranslations.php
index 45df63b..bb86b76 100644
--- a/h-source/Application/Include/vendorTranslations.php
+++ b/h-source/Application/Include/vendorTranslations.php
@@ -35,6 +35,7 @@ function betterVendor($string)
 		"ZaReason-Inc"	=>	"ZaReason, Inc",
 		"Blue-Light"	=>	"Blue Light",
 		"Openpandora-Ltd"	=>	"Openpandora Ltd.",
+		"Packard-Bell"		=>	"Packard Bell",
 	);
 	
 	return (array_key_exists($string,$exceptions)) ? $exceptions[$string] : $vendors->getFullName($string);
diff --git a/h-source/Application/Include/wikiFormatting.php b/h-source/Application/Include/wikiFormatting.php
index 2a8ba21..e868674 100644
--- a/h-source/Application/Include/wikiFormatting.php
+++ b/h-source/Application/Include/wikiFormatting.php
@@ -99,7 +99,7 @@ function createTabs($match)
 	return null;
 }
 
-//create the HTM Lof the tabs in the description entry
+//create the HTML of the tabs in the description entry
 class Tabs
 {
 	public static $tabList = array();
diff --git a/h-source/Application/Views/Desktop/header.php b/h-source/Application/Views/Desktop/header.php
index efa225b..5532691 100644
--- a/h-source/Application/Views/Desktop/header.php
+++ b/h-source/Application/Views/Desktop/header.php
@@ -111,7 +111,7 @@ $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index';
 <div id="top_menu_external">
 	<div id="top_menu">
 		<ul>
-			<li<?php echo $tm['home']; ?>><a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li><li<?php echo $tm['hardware']; ?>><a href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>"><?php echo gtext("Hardware");?></a></li><li<?php echo $tm['issues']; ?>><a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>"><?php echo gtext("Issues");?></a></li><li<?php echo $tm['search']; ?>><a href="<?php echo $this->baseUrl."/search/form/$lang";?>"><?php echo gtext("Search");?></a></li><li<?php echo $tm['news']; ?>><a href="<?php echo $this->baseUrl."/news/index/$lang";?>"><?php echo gtext("News");?></a></li><li<?php echo $tm['download']; ?>><a href="<?php echo $this->baseUrl."/download/index/$lang";?>"><?php echo gtext("Download");?></a></li><?php echo $topMenuHelpLink;?><li<?php echo $tm['wiki']; ?>><a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a></li><?php echo $topMenuFaqLink;?>
+			<li<?php echo $tm['home']; ?>><a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a></li><li<?php echo $tm['hardware']; ?>><a href="<?php echo $this->baseUrl."/hardware/catalogue/$lang";?>"><?php echo gtext("Hardware");?></a></li><li<?php echo $tm['issues']; ?>><a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>"><?php echo gtext("Issues");?></a></li><li<?php echo $tm['search']; ?>><a href="<?php echo $this->baseUrl."/search/form/$lang";?>"><?php echo gtext("Search");?></a></li><li<?php echo $tm['download']; ?>><a href="<?php echo $this->baseUrl."/download/index/$lang";?>"><?php echo gtext("Download");?></a></li><?php echo $topMenuHelpLink;?><li<?php echo $tm['wiki']; ?>><a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a></li><?php echo $topMenuFaqLink;?>
 		</ul>
 	</div>
 </div>