From 4e4b0e82b62d9a5bdce92b3caa2ab18e16122ba0 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Wed, 26 Jan 2011 06:05:12 +0000
Subject: modified the search view files

---
 h-source/Application/Include/languages.php    | 10 ++++
 h-source/Application/Views/Search/form.php    | 33 +++++++++---
 h-source/Application/Views/Search/form_es.php | 74 ---------------------------
 h-source/Application/Views/Search/form_it.php | 74 ---------------------------
 h-source/Public/Css/website.css               | 21 ++++++++
 5 files changed, 56 insertions(+), 156 deletions(-)
 delete mode 100644 h-source/Application/Views/Search/form_es.php
 delete mode 100644 h-source/Application/Views/Search/form_it.php

(limited to 'h-source')

diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 0e2b7a7..2dbc5fa 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -35,6 +35,9 @@ class Lang
 	public static $i18n = array(
 		'it'	=>	array
 			(
+				"Search one device in the archive"	=>	"Cerca un dispositivo nell'archivio",
+				"hardware type"		=>	"tipo di hardware",
+				"the model name contains"	=>	"il nome del modello contiene",
 				"List of issues"	=>	"Lista di questioni",
 				"TITLE"				=>	"TITOLO",
 				"TOPIC"				=>	"ARGOMENTO",
@@ -141,9 +144,13 @@ class Lang
 				"contributions of"	=>	"contributi di",
 				"No sound cards found"	=>	"Non è stata trovata alcuna scheda audio",
 				"LAST UPDATE"	=>	"ULTIMA MODIFICA",
+				"search by"	=>	"cerca per",
 			),
 		'es'	=>	array
 			(
+				"Search one device in the archive"	=>	"Busque un dispositivo en el archivo",
+				"hardware type"		=>	"tipo de hardware",
+				"the model name contains"	=>	"el nombre del modelo contiene",
 				"List of issues"	=>	"Lista de incidencias",
 				"TITLE"				=>	"TITULO",
 				"TOPIC"				=>	"ARGUMENTO",
@@ -253,6 +260,9 @@ class Lang
 			),
 		'fr'	=>	array
 			(
+				"Search one device in the archive"	=>	"Shercher un appareil dans les archives",
+				"hardware type"		=>	"type de matériel",
+				"the model name contains"	=>	"le nom du modèle contient",
 				"List of issues"	=>	"Liste de problème",
 				"TITLE"				=>	"TITRE",
 				"TOPIC"				=>	"SUJET",
diff --git a/h-source/Application/Views/Search/form.php b/h-source/Application/Views/Search/form.php
index 1615edb..9303b81 100644
--- a/h-source/Application/Views/Search/form.php
+++ b/h-source/Application/Views/Search/form.php
@@ -49,26 +49,43 @@
 		</div>
 		
 		<div class="notebook_view_title">
-			Search one device in the archive:
+			<?php echo gtext("Search one device in the archive");?>:
 		</div>
 			
 		<div class="search_form">
-			
-			
+			<div class="search_form_label">
+				<?php echo gtext("search by");?> <b><?php echo gtext("model name");?></b>
+			</div>
+			<noscript>
+				<div class="noscript_notice">
+					you need javascript enabled in order to use the form below
+				</div>
+			</noscript>
 			<form method="GET">
 				<table>
 					<tr>
-						<td>hardware type:</td>
+						<td><?php echo gtext("hardware type");?>:</td>
 						<td><?php echo Html_Form::select('type','',MyStrings::getTypes(),"select_entry","search_type_input");?></td>
 					</tr>
 					<tr>
-						<td>the model name contains:</td>
+						<td><?php echo gtext("the model name contains");?>:</td>
 						<td><?php echo Html_Form::input('model','','input_entry_search',"search_model_input");?></td>
 					</tr>
 				</table>
 			</form>
-			
-			
 		</div>
-	
+
+		<div class="search_form_2">
+			<div class="search_form_label">
+				<?php echo gtext("search by");?> <b>vendorid:productid</b>
+			</div>
+			<form method="GET">
+				<table>
+					<tr>
+						<td><?php echo gtext("VendorID:ProductID code of the device");?>:</td>
+						<td><?php echo Html_Form::input('vendorid','','input_entry_search',"search_model_input");?></td>
+					</tr>
+				</table>
+			</form>
+		</div>
 	</div>
diff --git a/h-source/Application/Views/Search/form_es.php b/h-source/Application/Views/Search/form_es.php
deleted file mode 100644
index e1a5dc4..0000000
--- a/h-source/Application/Views/Search/form_es.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-	<script>
-	
-		$(document).ready(function() {
-			
-			$(".search_form table").append("<tr><td><input id=\"search_action_input\" type=\"submit\" name=\"action\" value=\"search\"></td></tr>");
-			
-			$("#search_action_input").click(function(){
-
-				var s_type = $("#search_type_input").attr("value");
-				var s_model = $("#search_model_input").attr("value");
-				var s_action = $("#search_action_input").attr("value");
-			
-				var s_url = "1/" + s_action + "/" + s_type + "/" + s_model;
-
-				location.href="<?php echo $this->baseUrl."/search/results/$lang/";?>"+s_url;
-				return false;
-			});
-			
-		});
-		
-	</script>
-
-	<div id="left">
-		
-		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; search form
-		</div>
-		
-		<div class="notebook_view_title">
-			Busque un dispositivo en el archivo::
-		</div>
-			
-		<div class="search_form">
-			
-			
-			<form method="GET">
-				<table>
-					<tr>
-						<td>tipo de hardware:</td>
-						<td><?php echo Html_Form::select('type','',MyStrings::getTypes(),"select_entry","search_type_input");?></td>
-					</tr>
-					<tr>
-						<td>el nombre del modelo contiene:</td>
-						<td><?php echo Html_Form::input('model','','input_entry_search',"search_model_input");?></td>
-					</tr>
-				</table>
-			</form>
-			
-			
-		</div>
-	
-	</div>
diff --git a/h-source/Application/Views/Search/form_it.php b/h-source/Application/Views/Search/form_it.php
deleted file mode 100644
index 7833c31..0000000
--- a/h-source/Application/Views/Search/form_it.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
-
-<?php
-// h-source, a web software to build a community of people that want to share their hardware information.
-// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
-//
-// This file is part of h-source
-//
-// h-source is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// h-source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
-?>
-
-	<script>
-	
-		$(document).ready(function() {
-			
-			$(".search_form table").append("<tr><td><input id=\"search_action_input\" type=\"submit\" name=\"action\" value=\"search\"></td></tr>");
-			
-			$("#search_action_input").click(function(){
-
-				var s_type = $("#search_type_input").attr("value");
-				var s_model = $("#search_model_input").attr("value");
-				var s_action = $("#search_action_input").attr("value");
-			
-				var s_url = "1/" + s_action + "/" + s_type + "/" + s_model;
-
-				location.href="<?php echo $this->baseUrl."/search/results/$lang/";?>"+s_url;
-				return false;
-			});
-			
-		});
-		
-	</script>
-
-	<div id="left">
-		
-		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; search form
-		</div>
-		
-		<div class="notebook_view_title">
-			Cerca un dispositivo nell'archivio:
-		</div>
-			
-		<div class="search_form">
-			
-			
-			<form method="GET">
-				<table>
-					<tr>
-						<td>tipo di hardware:</td>
-						<td><?php echo Html_Form::select('type','',MyStrings::getTypes(),"select_entry","search_type_input");?></td>
-					</tr>
-					<tr>
-						<td>il nome del modello contiene:</td>
-						<td><?php echo Html_Form::input('model','','input_entry_search',"search_model_input");?></td>
-					</tr>
-				</table>
-			</form>
-			
-			
-		</div>
-	
-	</div>
diff --git a/h-source/Public/Css/website.css b/h-source/Public/Css/website.css
index 1d94fdb..45b0dc9 100755
--- a/h-source/Public/Css/website.css
+++ b/h-source/Public/Css/website.css
@@ -1100,6 +1100,18 @@ ins
 	clear:both;
 	margin:5px 5px 35px 5px;
 }
+.search_form_2
+{
+	clear:both;
+	margin:5px 5px 35px 5px;
+}
+.search_form_label
+{
+	padding:3px 10px;
+	background:#B7F18C;
+	color:#000;
+	margin-bottom:1em;
+}
 .search_form .input_entry_search
 {
 	width:250px;
@@ -1514,4 +1526,13 @@ td.text_item_date
 	padding:10px;
 	border:1px solid #ED9F4A;
 	background:#F6EA99;
+}
+
+.noscript_notice
+{
+	margin:10px 0px;
+	padding:5px 10px;
+	background:#B0E0E6;
+	border:1px solid #4169E1;
+	color:#4169E1;
 }
\ No newline at end of file
-- 
cgit v1.2.3