[Fmsystem-commits] [14330]

[Saul]

Revision: 14330
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14330
Author:   psaul
Date:     2015-11-11 23:54:29 +0000 (Wed, 11 Nov 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
    branches/dev-syncromind/booking/inc/class.uibooking.inc.php

Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php     
2015-11-11 23:51:35 UTC (rev 14329)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php     
2015-11-11 23:54:29 UTC (rev 14330)
@@ -801,21 +801,22 @@
 
                        $GLOBALS['phpgw']->jqcal->add_listener('start_date', 
'datetime');
                        $GLOBALS['phpgw']->jqcal->add_listener('end_date', 
'datetime');
-                        
-                       self::add_javascript('booking', 'booking', 
'application.js');
-                       self::adddatetimepicker();
-            
-            if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 
'bookingfrontend') {
-                self::add_stylesheet('phpgwapi/templates/portico/base.css');   
             
-            } else {
+
+            if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 
'bookingfrontend') {
                 $tabs = array();
                 $tabs['generic'] = array('label' => lang('Application Add'), 
'link' => '#application_add');
                 $active_tab = 'generic';
-
                 $application['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+                
+                self::add_javascript('booking', 'booking', 'application.js');
+                
                 phpgwapi_jquery::formvalidator_generate(array('location', 
'date', 'security', 'file'), 'application_form');
+            } else {
+                self::add_javascript('bookingfrontend', 'bookingfrontend', 
'application.js');
             }
 
+                       self::adddatetimepicker();
+
                        self::render_template_xsl('application_new', 
array('application' => $application, 'activities' => $activities, 'agegroups' 
=> $agegroups, 'audience' => $audience,'config' => $application_text));
                }
 
@@ -831,11 +832,7 @@
                        $building_info = $this->bo->so->get_building_info($id);
                        $application['building_id'] = $building_info['id'];
                        $application['building_name'] = $building_info['name'];
-            
-                        $tabs = array();
-                       $tabs['generic']        = array('label' => 
lang('Application Edit'), 'link' => '#application_edit');
-                       $active_tab = 'generic';
-            
+
                        $errors = array();
                        if($_SERVER['REQUEST_METHOD'] == 'POST')
                        {       
@@ -899,9 +896,15 @@
                        $GLOBALS['phpgw']->jqcal->add_listener('start_date', 
'datetime');
                        $GLOBALS['phpgw']->jqcal->add_listener('end_date', 
'datetime');
             //                 self::render_template('application_edit', 
array('application' => $application, 'activities' => $activities, 'agegroups' 
=> $agegroups, 'audience' => $audience));
-                       $application['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-                       $application['validator'] = 
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security', 
'file'), 'application_form');
 
+            if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 
'bookingfrontend') {
+                $tabs = array();
+                $tabs['generic'] = array('label' => lang('Application Edit'), 
'link' => '#application_edit');
+                $active_tab = 'generic';
+                $application['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+                $application['validator'] = 
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security', 
'file'), 'application_form');
+            }
+
                        self::render_template_xsl('application_edit', 
array('application' => $application, 'activities' => $activities, 'agegroups' 
=> $agegroups, 'audience' => $audience));
                }
 

Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-11-11 
23:51:35 UTC (rev 14329)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-11-11 
23:54:29 UTC (rev 14330)
@@ -894,17 +894,20 @@
                        $booking['edit_link'] = self::link(array('menuaction' 
=> 'booking.uibooking.edit', 'id' => $booking['id']));
                        $booking['delete_link'] = self::link(array('menuaction' 
=> 'booking.uibooking.delete', 'id' => $booking['id']));
                        $resource_ids = '';
-            
-                        $tabs = array();
-                       $tabs['generic']        = array('label' => 
lang('Booking'), 'link' => '#booking');
-                       $active_tab = 'generic';
-            
+
                        foreach($booking['resources'] as $res)
                        {
                                $resource_ids = $resource_ids . '&filter_id[]=' 
. $res;
                        }
                        $booking['resource_ids'] = $resource_ids;
-                        $booking['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+
+            if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 
'bookingfrontend') {
+                $tabs = array();
+                $tabs['generic']       = array('label' => lang('Booking'), 
'link' => '#booking');
+                $active_tab = 'generic';
+                $booking['tabs'] = phpgwapi_jquery::tabview_generate($tabs, 
$active_tab);
+            }
+
                        self::render_template_xsl('booking', array('booking' => 
$booking));
                }