From c7c3e14d0b007659666745552999fcab8817b625 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Mon, 24 Oct 2011 14:10:40 +0000
Subject: added vendor

---
 h-source/Application/Include/hardware.php           | 1 +
 h-source/Application/Include/vendorTranslations.php | 1 +
 h-source/Application/Models/NotebooksModel.php      | 4 ++++
 h-source/Application/Views/Notebooks/catalogue.php  | 4 ++--
 h-source/Application/Views/Notebooks/page.php       | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'h-source/Application')

diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 8caff1a..e5dccea 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -259,6 +259,7 @@ class Notebooks extends Hardware
 		"Lenovo"				=>	"Lenovo",
 		"LG"					=>	"LG",
 		"msi"					=>	"msi",
+		"One Laptop per Child (Non-Profit)"	=>	"One-Laptop-per-Child-Non-Profit",
 		"Philco"				=>	"Philco",
 		"Philips"				=>	"Philips",
 		"Panasonic"				=>	"Panasonic",
diff --git a/h-source/Application/Include/vendorTranslations.php b/h-source/Application/Include/vendorTranslations.php
index b6c2093..4c6cca7 100644
--- a/h-source/Application/Include/vendorTranslations.php
+++ b/h-source/Application/Include/vendorTranslations.php
@@ -24,6 +24,7 @@ if (!defined('EG')) die('Direct access not allowed!');
 function betterVendor($string)
 {
 	$names = array(
+		"One-Laptop-per-Child-Non-Profit"	=>	"One Laptop per Child (Non-Profit)",
 		"AT-T"	=>	"AT&T",
 		"Franklin-Wireless-Corporation"	=>	"Franklin Wireless Corporation",
 		"Novatel-Wireless"	=>	"Novatel Wireless",
diff --git a/h-source/Application/Models/NotebooksModel.php b/h-source/Application/Models/NotebooksModel.php
index b9f4b80..cc1b9eb 100644
--- a/h-source/Application/Models/NotebooksModel.php
+++ b/h-source/Application/Models/NotebooksModel.php
@@ -41,6 +41,10 @@ class NotebooksModel extends GenericModel {
 			'subtype'		=>	gtext("subtype"),
 		);
 
+		$this->_popupFunctions = array(
+			'vendor'		=>	'betterVendor',
+		);
+		
 		$this->createPopupWhere('vendor,compatibility,comm_year,subtype');
 		
 		$this->diffFields = array(
diff --git a/h-source/Application/Views/Notebooks/catalogue.php b/h-source/Application/Views/Notebooks/catalogue.php
index 7538e6f..d2d1125 100644
--- a/h-source/Application/Views/Notebooks/catalogue.php
+++ b/h-source/Application/Views/Notebooks/catalogue.php
@@ -25,7 +25,7 @@
 				<?php echo $popup;?>
 			</div>
 			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['vendor']?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility']?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
 				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['subtype']?></div>
@@ -60,7 +60,7 @@
 
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-				<div class="inner_value"><?php echo $item['hardware']['vendor'];?></div>
+				<div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
 			</div>
 			
 			<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Notebooks/page.php b/h-source/Application/Views/Notebooks/page.php
index 6c7a97f..6e3db82 100644
--- a/h-source/Application/Views/Notebooks/page.php
+++ b/h-source/Application/Views/Notebooks/page.php
@@ -46,7 +46,7 @@
 
 				<div class="notebook_vendor">
 					<div class="inner_label"><?php echo gtext("vendor");?>:</div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['vendor'];?></b></div>
+					<div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
 				</div>
 				
 				<div class="notebook_vendor">
-- 
cgit v1.2.3