search improved based on user feedback: it now includes results that contain word...

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

diff --git a/application/views/header.php b/application/views/header.php
index 987b6c4..829bbb7 100644 (file)
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -40,11 +40,11 @@
        <?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">
@@ -65,7 +65,7 @@
                                . $search_category_title . '</em>:';
                ?>
                </label>
-               <input type="text" id="search" name="search" value="<?php echo $search_query ?>" />
+               <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 +82,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;
                        }