Merge branch 'development' into h-node

3 files changed, 0 insertions, 287 deletions

diff --git a/h-source/Application/Views/Desktop/Search/form.php b/h-source/Application/Views/Desktop/Search/form.php
deleted file mode 100644
index 136c544..0000000
--- a/h-source/Application/Views/Desktop/Search/form.php
+++ /dev/null
@@ -1,111 +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=\"<?php echo gtext('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/search/" + 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; <?php echo gtext('Search form');?>
-		</div>
-		
-		<div class="notebook_view_title">
-			<?php echo gtext("Search one device in the archive");?>:
-		</div>
-			
-		<div class="search_form">
-			<div class="search_form_label">
-				<img class="search_img" src="<?php echo $this->baseUrl;?>/Public/Img/Glaze/viewmag.png"> <span class="span_search_desc"><?php echo gtext("search by");?> <b><?php echo gtext("model name");?></b></span>
-			</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><?php echo gtext("hardware type");?>:</td>
-						<td><?php echo Html_Form::select('type','',Hardware::getTypes(),"select_entry","search_type_input");?></td>
-					</tr>
-					<tr>
-						<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_pciid">
-			<div class="search_form_label">
-				<img class="search_img" src="<?php echo $this->baseUrl;?>/Public/Img/Glaze/viewmag.png"> <span class="span_search_desc"><?php echo gtext("search by");?> <b>vendorid:productid</b></span>
-			</div>
-			<form action="<?php echo $this->baseUrl."/search/pciid/".Lang::$current;?>" method="POST">
-				<table>
-					<tr>
-						<td><?php echo gtext("VendorID:ProductID code of the device");?>:</td>
-						<td><?php echo Html_Form::input('pciid','','input_entry_search');?></td>
-					</tr>
-					<tr>
-						<td><input type="submit" name="search_pci" value="<?php echo gtext('Search');?>"></td>
-					</tr>
-				</table>
-			</form>
-		</div>
-
-		<div class="search_form_lspci">
-			<div class="search_form_label">
-				<img class="search_img" src="<?php echo $this->baseUrl;?>/Public/Img/Glaze/viewmag.png"> <span class="span_search_desc"><?php echo gtext("analyze the output of the lspci command");?></span>
-			</div>
-			<form action="<?php echo $this->baseUrl."/search/lspci/".Lang::$current;?>" method="POST">
-				<table>
-					<tr>
-						<td valign="top"><?php echo gtext("paste the output of the lspci command");?>:<div class="lspci_notice">lspci -vmmnn</div></td>
-						<td><?php echo Html_Form::textarea('lspci',gtext('write here the output of lspci -vmmnn'),'textarea_entry_search');?></td>
-					</tr>
-					<tr>
-						<td><input type="submit" name="search_pci" value="<?php echo gtext('Search');?>"></td>
-					</tr>
-				</table>
-			</form>
-		</div>
-	</div>
diff --git a/h-source/Application/Views/Desktop/Search/lspci_results.php b/h-source/Application/Views/Desktop/Search/lspci_results.php
deleted file mode 100644
index 970789b..0000000
--- a/h-source/Application/Views/Desktop/Search/lspci_results.php
+++ /dev/null
@@ -1,89 +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/>.
-?>
-
-	<div id="left">
-		
-		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/search/form/$lang";?>"><?php echo gtext('Search form');?></a> &raquo; <?php echo gtext('Results of the search');?>
-		</div>
-		
-		<div class="notebook_view_title">
-			<?php echo gtext("Results of the search");?>:
-		</div>
-			
-		<div class="search_form">
-
-			<?php if (!$flag) { ?>
-				<?php echo $notice;?>
-				<div>
-					<a href="<?php echo $this->baseUrl."/search/form/$lang";?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
-				</div>
-			<?php } ?>
-
-			<div class="found_ext">
-				<?php if (count($table)>0) { ?>
-				<div class="search_item_found">
-					<?php echo gtext("The following devices has been found in the database");?>:
-				</div>
-				<?php }?>
-
-				<?php foreach ($table as $row) { ?>
-				<div class="lspci_item_found">
-					<div class="lspci_item_found_model">
-						<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($row['hardware']['type']);?>"> <span class="search_result_model_name"><?php echo "<b>".$row['hardware']['type']."</b> - <a href='".$this->baseUrl."/".Hardware::getControllerFromType($row['hardware']['type'])."/view/$lang/".$row['hardware']['id_hard']."/".encodeUrl($row['hardware']['model'])."'>".$row['hardware']['model']."</a>";?></span>
-					</div>
-					<div class="lspci_item_found_compat">
-					<?php
-					echo gtext("does it work with free software?"). " <b>".gtext($row['hardware'][Hardware::getWorksFieldFromType($row['hardware']['type'])])."</b>";
-					?>
-					</div>
-				</div>
-				<?php } ?>
-			</div>
-
-			<div class="found_ext">
-				<?php if (count($notFoundDevices)>0) { ?>
-				<div class="search_item_found">
-					<?php echo gtext("The following devices has not been found in the database");?>:<br />
-					<?php echo gtext("can you please insert them?");?>
-				</div>
-				<?php }?>
-
-				<?php foreach ($notFoundDevices as $device) { ?>
-				<div class="lspci_item_not_found">
-					<div class="lspci_item_found_model">
-						<img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromClass($device['classId']);?>"> <span class="search_result_model_name"><?php echo "<b>".Hardware::getTypeFromClass($device['classId'])."</b> - ".$device['deviceName'];?></span>
-						<div class="lspci_item_found_compat">
-							<ul>
-								<li><b><?php echo gtext("device type");?>:</b><?php echo $device['className'];?></li>
-								<li><b><?php echo gtext("vendor");?>:</b><?php echo $device['vendorName'];?></li>
-								<li><b><?php echo gtext("VendorID:ProductID code of the device");?></b>: <?php echo $device['vendorId'].":".$device['deviceId'];?></li>
-							</ul>
-							<a href="<?php echo Go::toHardwareType(Hardware::getTypeFromClass($device['classId']));?>"><img align="top" src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/agt_forward.png"> insert</a>
-						</div>
-					</div>
-				</div>
-				<?php } ?>
-			</div>
-		</div>
-
-	</div>
diff --git a/h-source/Application/Views/Desktop/Search/results.php b/h-source/Application/Views/Desktop/Search/results.php
deleted file mode 100644
index 2fb128b..0000000
--- a/h-source/Application/Views/Desktop/Search/results.php
+++ /dev/null
@@ -1,87 +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/>.
-?>
-
-	<div id="left">
-		
-		<div class="position_tree_box">
-			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/search/form/$lang";?>"><?php echo gtext('Search form');?></a> &raquo; <?php echo gtext('Results of the search');?>
-		</div>
-		
-		<div class="notebook_view_title">
-			<?php echo gtext("Results of the search");?>:
-		</div>
-			
-		<div class="search_form">
-			<?php
-			$count = 0;
-			foreach ($table as $row) {
-			$count++;
-			?>
-			
-			<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."/".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">
-					<div class="search_result_item_left"><?php echo gtext("possible other names of the device");?>:</div> <div class="search_result_item_right"><b><?php echo nl2br($row['hardware']['other_names']);?></b></div>
-				</div>
-				<?php } ?>
-				<div class="first_level">
-					<div class="search_result_item_left"><?php echo gtext("model type");?>: </div> <div class="search_result_item_right"><b><?php echo $row['hardware']['type'];?></b></div>
-				</div>
-				<div class="first_level">
-					<div class="search_result_item_left"><?php echo gtext("year of commercialization");?>: </div> <div class="search_result_item_right"><b><?php echo $row['hardware']['comm_year'];?></b></div>
-				</div>
-			</div>
-			
-			<?php } ?>
-			
-			<?php if ($count === 0) { ?>
-				<?php if (strcmp($this->action,'pciid') === 0) { ?>
-				
-					<div class="lspci_item_not_found">
-					<?php echo gtext("There are no devices in the database with the vendorid:productid code specified by you.");?>
-						<div class="lspci_item_not_found_inner"><?php echo gtext("Would you like to add it to the database?");?></div>
-						<ul class="insert_suggestion_list">
-							<?php foreach ($stat as $type => $number) { ?>
-								<li><img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($type);?>"> <a href="<?php echo $this->baseUrl."/".Hardware::getControllerFromType($type)."/insert/$lang/$token";?>"><?php echo plural(Hardware::getControllerFromType($type));?></a></li>
-							<?php } ?>
-						</ul>
-					</div>
-
-				<?php } else { ?>
-				<div class="search_result_item">
-					<?php echo gtext("No devices found");?>.
-					</div>
-				<?php } ?>
-			<?php } ?>
-			
-		</div>
-		
-		<?php if (strcmp($recordNumber,0) !== 0) { ?>
-		<div class="history_page_list">
-			<?php echo gtext("page list");?>: <?php echo $pageList;?>
-		</div>
-		<?php } ?>
-		
-	</div>