[Fmsystem-commits] [7296] bkbooking: minor updates

[Kjell Arne Espedal]

Revision: 7296
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7296
Author:   kjell
Date:     2011-05-24 06:51:05 +0000 (Tue, 24 May 2011)
Log Message:
-----------
bkbooking: minor updates

Modified Paths:
--------------
    trunk/booking/inc/class.uiaccount_code_dimension.inc.php
    trunk/booking/inc/class.uireports.inc.php
    trunk/phpgwapi/setup/phpgw_no.lang
    trunk/phpgwapi/templates/bkbooking/css/frontend.css
    trunk/phpgwapi/templates/bkbooking/head.inc.php

Removed Paths:
-------------
    trunk/phpgwapi/templates/bkbooking/images/newlayout/Thumbs.db

Modified: trunk/booking/inc/class.uiaccount_code_dimension.inc.php
===================================================================
--- trunk/booking/inc/class.uiaccount_code_dimension.inc.php    2011-05-23 
13:56:02 UTC (rev 7295)
+++ trunk/booking/inc/class.uiaccount_code_dimension.inc.php    2011-05-24 
06:51:05 UTC (rev 7296)
@@ -34,7 +34,6 @@
                                }
                                $config->save_repository();
                        }
-                       //echo '<pre>'; print_r($config->config_data); exit;
                        
                        self::render_template('account_code_dimension', 
array('config_data' =>$config->config_data));
                }

Modified: trunk/booking/inc/class.uireports.inc.php
===================================================================
--- trunk/booking/inc/class.uireports.inc.php   2011-05-23 13:56:02 UTC (rev 
7295)
+++ trunk/booking/inc/class.uireports.inc.php   2011-05-24 06:51:05 UTC (rev 
7296)
@@ -146,13 +146,13 @@
                $sql = "select distinct al.id, al.from_, al.to_, EXTRACT(DOW 
FROM al.to_) as day_of_week, bu.id as building_id, bu.name as building_name, 
br.id as resource_id, br.name as resource_name
                                from bb_allocation al
                                inner join bb_allocation_resource ar on 
ar.allocation_id = al.id
-                               inner join bb_resource br on br.id = 
ar.resource_id
+                               inner join bb_resource br on br.id = 
ar.resource_id and br.active = 1
                                inner join bb_building bu on bu.id = 
br.building_id
                                left join bb_booking bb on bb.allocation_id = 
al.id
                                where bb.id is null 
                                and al.from_ >= '".$from." 00:00:00'
                                and al.to_ <= '".$to." 23:59:59' ";
-               
+
                if ($buildings)
                        $sql .= "and building_id in (".$buildings.") ";
 

Modified: trunk/phpgwapi/setup/phpgw_no.lang
===================================================================
--- trunk/phpgwapi/setup/phpgw_no.lang  2011-05-23 13:56:02 UTC (rev 7295)
+++ trunk/phpgwapi/setup/phpgw_no.lang  2011-05-24 06:51:05 UTC (rev 7296)
@@ -50,6 +50,7 @@
 group public   common  no      Gruppe Public
 groups common  no      Grupper
 help   common  no      Hjelp
+manual common  no      Veiledning lag og organisasjoner
 high   common  no      Høy
 home   common  no      Hjemme
 it has been more then %1 days since you changed your password  common  no      
Det er mer enn %1 dager siden du har endet ditt passord

Modified: trunk/phpgwapi/templates/bkbooking/css/frontend.css
===================================================================
--- trunk/phpgwapi/templates/bkbooking/css/frontend.css 2011-05-23 13:56:02 UTC 
(rev 7295)
+++ trunk/phpgwapi/templates/bkbooking/css/frontend.css 2011-05-24 06:51:05 UTC 
(rev 7296)
@@ -276,6 +276,7 @@
        border: none !important;
 }
 
+/* CSS for newlayout */
 body{
 color: #575757;
 margin:0;
@@ -327,7 +328,7 @@
 height: 108px !important;
 background: url(../images/newlayout/aktivby_logo.jpg) no-repeat !important;
 background-position: bottom center !important;
-padding: 22px 0px 0px 150px !important;
+padding: 22px 0px 0px 400px !important;
 }
 
 #header-search{

Modified: trunk/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.inc.php     2011-05-23 13:56:02 UTC 
(rev 7295)
+++ trunk/phpgwapi/templates/bkbooking/head.inc.php     2011-05-24 06:51:05 UTC 
(rev 7296)
@@ -117,10 +117,10 @@
        $app = lang($app);
        $tpl_vars = array
        (
-               'manual_text'   => lang('manual'),
-               'manual_url'    => 'logout.php',
-               'help_text'     => lang('help'),
-               'help_url'              => 'logout.php',
+#              'manual_text'   => lang('manual'),
+#              'manual_url'    => '#',
+#              'help_text'     => lang('help'),
+#              'help_url'              => '#',
                'css'                   => $GLOBALS['phpgw']->common->get_css(),
                'javascript'    => $GLOBALS['phpgw']->common->get_javascript(),
                'img_icon'      => 
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),

Deleted: trunk/phpgwapi/templates/bkbooking/images/newlayout/Thumbs.db
===================================================================
(Binary files differ)