[Phpgroupware-cvs] [20931] Fix: various fixes - related to booking system

[Sigurd Nes]

Revision: 20931
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20931
Author:   sigurdne
Date:     2010-01-05 21:27:07 +0000 (Tue, 05 Jan 2010)
Log Message:
-----------
Fix: various fixes - related to booking system

Modified Paths:
--------------
    people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/css/frontend.css
    people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.inc.php
    
people/sigurdne/modules/phpgwapi/trunk/templates/idsociety/portal_linkbox.tpl
    
people/sigurdne/modules/phpgwapi/trunk/templates/idsociety/portal_linkbox_footer.tpl
    
people/sigurdne/modules/phpgwapi/trunk/templates/idsociety/portal_linkbox_header.tpl

Modified: 
people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/css/frontend.css
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/css/frontend.css 
2010-01-05 21:24:58 UTC (rev 20930)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/css/frontend.css 
2010-01-05 21:27:07 UTC (rev 20931)
@@ -42,8 +42,8 @@
        background-position: bottom center;
        margin: 0 auto;
        padding-top: 4px;
-       width: 876px;
        height: 109px;
+       overflow: hidden;
 }
 div#footer {
     border-top: 1px solid #aaa;

Modified: 
people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.inc.php     
2010-01-05 21:24:58 UTC (rev 20930)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/bkbooking/head.inc.php     
2010-01-05 21:27:07 UTC (rev 20931)
@@ -96,7 +96,7 @@
                'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
                'navbar_config' => $_navbar_config,
                'lbl_search'    => lang('Search'),
-               'header_search_class'   => ($_GET['menuaction'] == 
'bookingfrontend.uisearch.index' ? 'hidden' : '')
+               'header_search_class'   => (isset($_GET['menuaction']) && 
$_GET['menuaction'] == 'bookingfrontend.uisearch.index' ? 'hidden' : '')
        );
        $bouser = CreateObject('bookingfrontend.bouser');
        if($bouser->is_logged_in())
@@ -108,6 +108,14 @@
        {
                $tpl_vars['login_text'] = lang('Login');
                $tpl_vars['login_url'] = 
'login.php?after='.urlencode($_SERVER['QUERY_STRING']);
+               $config         = 
CreateObject('phpgwapi.config','bookingfrontend');
+               $config->read();
+               $login_parameter = 
isset($config->config_data['login_parameter']) && 
$config->config_data['login_parameter'] ? 
$config->config_data['login_parameter'] : '';
+               if($login_parameter)
+               {
+                       $login_parameter = ltrim($login_parameter, '&');
+                       $tpl_vars['login_url'] .= "&{$login_parameter}";
+               }
        }
 
        $GLOBALS['phpgw']->template->set_var($tpl_vars);

Modified: 
people/sigurdne/modules/phpgwapi/trunk/templates/idsociety/portal_linkbox.tpl
===================================================================
(Binary files differ)

Modified: 
people/sigurdne/modules/phpgwapi/trunk/templates/idsociety/portal_linkbox_footer.tpl
===================================================================
(Binary files differ)

Modified: 
people/sigurdne/modules/phpgwapi/trunk/templates/idsociety/portal_linkbox_header.tpl
===================================================================
(Binary files differ)