cis notified web server of a job completion; upload form interface and validation...

[living-lab-site.git] / application / views / header.php

diff --git a/application/views/header.php b/application/views/header.php
index 987b6c4..475239f 100644 (file)
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -1,10 +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 = NULL;
+               $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
@@ -40,11 +50,32 @@
        <?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>
+       <?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('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('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>
 
 <div id="header">
@@ -53,19 +84,11 @@
                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')); ?>
-               <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 $search_query ?>" />
+               <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') ?>:
+               <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') ?>
@@ -82,9 +105,9 @@
                var fakeSubmit = function() {
                        var searchQuery = $('#search').val();
 
-                       if (searchQuery.length < 4)
+                       if (searchQuery.length === 0)
                        {
-                               alert('<?php echo $this->lang->line('error_search_query_too_short') ?>');
+                               alert('<?php echo $this->lang->line('error_search_query_empty') ?>');
                                return;
                        }
                        
@@ -99,10 +122,12 @@
                        searchQuery = searchQuery.replace(/~/g, '_LOW_');       // ~ 
                        searchQuery = searchQuery.replace(/"/g, '_QUO_');       // " 
                        searchQuery = encodeURI(searchQuery);
-                       
+
+                       searchCategoryName = $('#search-category').val();
                        window.location = "<?php echo site_url('catalog/search') ?>/" 
                                + searchQuery + '/0'
-                               + "<?php echo ($search_category_name === NULL ? '' : '/'. $search_category_name) ?>";
+                               + (searchCategoryName == 'all-categories' ? '' : '/'
+                                       + searchCategoryName);
                };
                
                $('#button-js-quick-search')