X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fviews%2Fheader.php;h=829bbb741ded53552dd2187fb6aeefe83f71abc3;hb=f8bfacb65b055af85f639e65aff66a680d0d3231;hp=14047e1a0d5a0da0b2d283da740b7c5fc0266217;hpb=aaa8b077bac73addd05114fd2b2ef0829412fac7;p=living-lab-site.git

diff --git a/application/views/header.php b/application/views/header.php
index 14047e1..829bbb7 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -1,6 +1,11 @@
-<?php if (! isset($selected_menu)):
-$selected_menu = '';
-endif ?>
+<?php 
+	if (! isset($selected_menu))
+		$selected_menu = '';
+	if (! isset($search_query))
+		$search_query = '';
+	if (! isset($search_category_name))
+		$search_category_name = NULL;
+?>
 
 <ul
 	id="nav-menu">
@@ -35,11 +40,11 @@ endif ?>
 	<?php echo ($selected_menu == 'contact' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_contact') ?>
 	</a></li>
 
-	<!--<li class="menu-right"><a href="#<?php //echo site_url('register') ?>"
+	<li class="menu-right"><a href="<?php echo '#'//site_url('register') ?>"
 		<?php echo ($selected_menu == 'register' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_register') ?></a></li>
 		
-	<li class="menu-right"><a href="#<?php //echo site_url('login') ?>" 
-		<?php echo ($selected_menu == 'login' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_log_in') ?></a></li>-->
+	<li class="menu-right"><a href="<?php echo site_url('user/login') ?>" 
+		<?php echo ($selected_menu == 'login' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_log_in') ?></a></li>
 </ul>
 
 <div id="header">
@@ -52,7 +57,15 @@ endif ?>
 	
 	
 	<?php echo form_open('catalog/search', array('id'=>'quick-search')); ?>
-		<input type="text" id="search" name="search" value="" />
+		<label for="search"><?php 
+			if ($search_category_name === NULL)
+				echo $this->lang->line('ui_search') . ':';
+			else
+				echo $this->lang->line('ui_search_in') . ' <em>'
+				. $search_category_title . '</em>:';
+		?>
+		</label>
+		<input type="text" id="search" name="search" value="<?php echo htmlentities($search_query) ?>" />
 		<input type="submit" id="button-quick-search" value="<?php echo $this->lang->line('ui_search') ?>" />
 		<a href="#" id="button-js-quick-search" style="display:none">
 			<?php echo $this->lang->line('ui_search') ?>
@@ -68,22 +81,28 @@ endif ?>
 		// Fake JS submit via CI URI segments
 		var fakeSubmit = function() {
 			var searchQuery = $('#search').val();
-			searchQuery = searchQuery.replace(/\*/g, '*2A');  // *
-			searchQuery = searchQuery.replace(/\+/g, '*2B');	// +
+
+			if (searchQuery.length === 0)
+			{
+				alert('<?php echo $this->lang->line('error_search_query_empty') ?>');
+				return;
+			}
+			
+			searchQuery = searchQuery.replace(/\*/g, '_AST_');  // *
+			searchQuery = searchQuery.replace(/\+/g, '_AND_');	// +
+			//searchQuery = searchQuery.replace(/\-/g, '_');	// -
 			searchQuery = searchQuery.replace(/\s/g, '+');	// <white spaces>
-			searchQuery = searchQuery.replace(/>/g, '*3E');	// >
-			searchQuery = searchQuery.replace(/\</g, '*3C');	// <
-			searchQuery = searchQuery.replace(/\(/g, '*28');	// (
-			searchQuery = searchQuery.replace(/\)/g, '*29');	// )
-			searchQuery = searchQuery.replace(/~/g, '*7E');	// ~ 
-			searchQuery = searchQuery.replace(/"/g, '*22');	// " 
+			searchQuery = searchQuery.replace(/>/g, '_GT_');	// >
+			searchQuery = searchQuery.replace(/\</g, '_LT_');	// <
+			searchQuery = searchQuery.replace(/\(/g, '_PO_');	// (
+			searchQuery = searchQuery.replace(/\)/g, '_PC_');	// )
+			searchQuery = searchQuery.replace(/~/g, '_LOW_');	// ~ 
+			searchQuery = searchQuery.replace(/"/g, '_QUO_');	// " 
 			searchQuery = encodeURI(searchQuery);
-			searchQuery = searchQuery.replace(/\*/g, '%');  // *
-
-			alert(searchQuery);
 			
 			window.location = "<?php echo site_url('catalog/search') ?>/" 
-				+ searchQuery;
+				+ searchQuery + '/0'
+				+ "<?php echo ($search_category_name === NULL ? '' : '/'. $search_category_name) ?>";
 		};
 		
 		$('#button-js-quick-search')