X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fviews%2Fheader.php;h=c1867c2dd3da49062664837c0fac13ded1726ae1;hb=85ed80e68e49780c162e2985847aca501e70851c;hp=53d68e7c40b2dd58bf51b35ebe227b7ca9724f38;hpb=adc2c33c37c781444c4234c6fed38e95d084ed8d;p=living-lab-site.git

diff --git a/application/views/header.php b/application/views/header.php
index 53d68e7..c1867c2 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -1,16 +1,20 @@
-<?php 
+<?php
+	// Selected menu
 	if (! isset($selected_menu))
 		$selected_menu = '';
+	//  Searching
 	if (! isset($search_query))
 		$search_query = '';
 	if (! isset($search_category_name))
 		$search_category_name = 'all-categories';
-	
+	// Categories
 	$categories['all-categories'] = $this->lang->line('ui_categ_all-categories');
 	foreach ($this->config->item('categories') as $id => $name)
 	{
 		$categories[$name] = $this->lang->line("ui_categ_$name");
 	}
+	// Username
+	$username = $this->session->userdata('username');
 ?>
 
 <ul
@@ -46,15 +50,31 @@
 	<?php echo ($selected_menu == 'contact' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_contact') ?>
 	</a></li>
 
-	<?php if (isset($username) && $username): ?>
-	<li class="menu-right"><a href="<?php echo '#'//site_url('register') ?>"
-		<?php echo ($selected_menu == 'account' ? 'class="selected"' : '') ?>><?php echo $username ?></a></li>
+	<?php if ($username): ?>
+	<li class="menu-right"><a href="<?php echo site_url('user/logout/' . urlencode_segments(uri_string())) ?>"
+		<?php echo ($selected_menu == 'logout' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_logout') ?></a>
+	</li>
+	
+	<li class="menu-right"><a href="<?php echo site_url('user/account/'. urlencode_segments(uri_string(), 'user/account')) ?>"
+		<?php echo ($selected_menu == 'account' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_account') ?></a>
+	</li>
+	
+	<li class="menu-right"><a href="<?php echo site_url('video/upload') ?>"
+		<?php echo ($selected_menu == 'upload' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_upload') ?></a>
+	</li>
+	
+	<li class="menu-right"><span class="menu-greeting">
+		<?php echo $this->lang->line('ui_hello'). ', '. $username. '!&nbsp;&nbsp;&nbsp;' ?></span>
+	</li> 
+	
 	<?php else: ?>
-	<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('user/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('user/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/'. urlencode_segments(uri_string(), 'user/login')) ?>" 
+		<?php echo ($selected_menu == 'login' ? 'class="selected"' : '') ?>><?php echo $this->lang->line('ui_nav_menu_log_in') ?></a>
+	</li>
 	<?php endif; ?>
 </ul>
 
@@ -67,7 +87,7 @@
 	<?php echo form_open('catalog/search', array('id'=>'quick-search')); ?>
 		<label for="search-category"><?php echo $this->lang->line('ui_search_in') ?></label> <?php 
 			echo form_dropdown('search-category', $categories, 
-				$search_category_name, 'id=search-category') ?>:
+				$search_category_name, 'id="search-category"') ?>:
 		<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">