X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fviews%2Fheader.php;h=d7b616e755a1cf4da89341e26082537d897341fc;hb=e788f88e8475e9c87eef355c71abed3c329c4c0b;hp=7659482c00b97cf3d8fc1f6dc688b018bca84c79;hpb=17f4b407bb41c5b15f5089d83712a6b5dfaed00b;p=living-lab-site.git

diff --git a/application/views/header.php b/application/views/header.php
index 7659482..d7b616e 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -1,23 +1,40 @@
-<?php if (! isset($selected_menu)): 
-	$selected_menu = ''; 
+<?php if (! isset($selected_menu)):
+$selected_menu = '';
 endif ?>
 
-<ul id="nav-menu">
+<ul
+	id="nav-menu">
 	<li class="menu-left"><a href="<?php echo site_url() ?>"
-		<?php echo ($selected_menu == 'home' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_home') ?></a></li>
-	
-	<li class="menu-left"><a href="<?php echo site_url('install-plugins') ?>"
-		<?php echo ($selected_menu == 'install-plugins' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_install_plugins') ?></a></li>
-	
-	<li class="menu-left"><a href="<?php echo site_url('about') ?>" 
-		<?php echo ($selected_menu == 'about' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_about') ?></a></li>
-	
-	<li class="menu-left"><a href="<?php echo site_url('help') ?>" 
-		<?php echo ($selected_menu == 'help' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_help') ?></a></li>
-		
-	<li class="menu-left"><a href="<?php echo site_url('contact') ?>" 
-		<?php echo ($selected_menu == 'contact' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_contact') ?></a></li>
-	
+
+
+	<?php echo ($selected_menu == 'home' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_home') ?>
+	</a></li>
+
+	<li class="menu-left"><a
+		href="<?php echo site_url('install-plugins') ?>"
+
+
+		<?php echo ($selected_menu == 'install-plugins' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_install_plugins') ?>
+	</a></li>
+
+	<li class="menu-left"><a href="<?php echo site_url('about') ?>"
+
+
+	<?php echo ($selected_menu == 'about' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_about') ?>
+	</a></li>
+
+	<li class="menu-left"><a href="<?php echo site_url('help') ?>"
+
+
+	<?php echo ($selected_menu == 'help' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_help') ?>
+	</a></li>
+
+	<li class="menu-left"><a href="<?php echo site_url('contact') ?>"
+
+
+	<?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') ?>"
 		<?php echo ($selected_menu == 'register' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_register') ?></a></li>
 		
@@ -27,9 +44,69 @@ endif ?>
 
 <div id="header">
 	<!-- TODO: resize logo image-->
-	<a href="<?php echo site_url() ?>" id="logo"><img src="<?php echo site_url('img/p2p-next--big.png') ?>" alt="P2P-Next" width="119" height="48" /></a>
-	<form id="quick-search" action="<?php echo site_url('catalog/search') ?>" method="POST">
-		<label for="quick-search-box"><?php echo $this->lang->line('ui_search') . ': ' ?></label>
+	<a href="<?php echo site_url() ?>" id="logo"><img
+		src="<?php echo site_url('img/p2p-next--big.png') ?>" alt="P2P-Next"
+		width="119" height="48" /> </a>
+	
+	
+	
+	
+	<?php echo form_open('catalog/search', array('id'=>'quick-search')); ?>
 		<input type="text" id="search" name="search" value="" />
+		<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') ?>
+		</a>
 	</form>
 </div>
+
+<script type="text/javascript">
+	$(function() {
+		$('#button-quick-search')
+			.hide();
+
+		// Fake JS submit via CI URI segments
+		var fakeSubmit = function() {
+			var searchQuery = $('#search').val();
+			searchQuery = searchQuery.replace(/\+/g, '%2B');	// +
+			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, '%2A');  // *
+			searchQuery = searchQuery.replace(/"/g, '%22');	// " 
+			searchQuery = encodeURI(searchQuery);
+
+			alert(searchQuery);
+			
+			//window.location = "<?php echo site_url('catalog/search') ?>" 
+			//	+ searchQuery;
+		};
+		
+		$('#button-js-quick-search')
+			.show()
+			.button({
+				icons: {
+	                primary: "ui-icon-search"
+	            },
+	            text: false
+			})
+			.click(function(event) {
+				fakeSubmit();
+			});
+
+		$('#search')
+			.keypress(function(event) {
+				if (event.which == 13)
+				{
+					fakeSubmit();
+
+					event.preventDefault();
+					return false;
+				}
+			});
+	});
+
+</script>