[Fmsystem-commits] [14062] modify how transport the image into the xsl

[Saul]

Revision: 14062
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14062
Author:   psaul
Date:     2015-09-29 23:45:42 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------
modify how transport the image into the xsl

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
    branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
    branches/dev-syncromind/booking/inc/class.uiresource.inc.php
    branches/dev-syncromind/booking/templates/base/building_schedule.xsl
    branches/dev-syncromind/booking/templates/base/resource_schedule.xsl

Modified: branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibuilding.inc.php        
2015-09-29 22:47:34 UTC (rev 14061)
+++ branches/dev-syncromind/booking/inc/class.uibuilding.inc.php        
2015-09-29 23:45:42 UTC (rev 14062)
@@ -277,7 +277,9 @@
                        ));
                        self::add_javascript('booking', 'booking', 
'schedule.js');
                         phpgwapi_jquery::load_widget("datepicker");
-            
+                        
+                        $building['picker_img'] = 
$GLOBALS['phpgw']->common->image('phpgwapi','cal');
+                        
                         $tabs = array();
                        $tabs['generic']        = array('label' => 
lang('Building Schedule'), 'link' => '#building_schedule');
                        $active_tab = 'generic';

Modified: branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php     
2015-09-29 22:47:34 UTC (rev 14061)
+++ branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php     
2015-09-29 23:45:42 UTC (rev 14062)
@@ -135,6 +135,8 @@
                                $building['date'] = phpgw::get_var('date', 
'GET');
                        }
                         
+                        $building['picker_img'] = 
$GLOBALS['phpgw']->common->image('phpgwapi','cal');
+                        
                         $tabs = array();
                        $tabs['generic'] = array('label' => lang('Massbooking 
Schedule'), 'link' => '#massbooking_schedule');
                        $active_tab = 'generic';

Modified: branches/dev-syncromind/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiresource.inc.php        
2015-09-29 22:47:34 UTC (rev 14061)
+++ branches/dev-syncromind/booking/inc/class.uiresource.inc.php        
2015-09-29 23:45:42 UTC (rev 14062)
@@ -258,6 +258,8 @@
                                'phpgw_return_as' => 'json',
                        ));
                         
+                        $resource['picker_img'] = 
$GLOBALS['phpgw']->common->image('phpgwapi','cal');
+                        
                         $tabs = array();
                        $tabs['generic'] = array('label' => lang('Resource 
Schedule'), 'link' => '#resource_schedule');
                        $active_tab = 'generic';

Modified: branches/dev-syncromind/booking/templates/base/building_schedule.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/building_schedule.xsl        
2015-09-29 22:47:34 UTC (rev 14061)
+++ branches/dev-syncromind/booking/templates/base/building_schedule.xsl        
2015-09-29 23:45:42 UTC (rev 14062)
@@ -40,7 +40,7 @@
                             <span><xsl:value-of select="php:function('lang', 
'Week')" />: </span>
                             <label id="numberWeek"></label>
                             <input type="text" id="datepicker" />
-                            <img id="pickerImg" 
src="/portico/phpgwapi/templates/base/images/cal.png" />
+                            <img id="pickerImg" src="{building/picker_img}" />
                         </div>
                     </li>
                     <li><span class="pure-button pure-button-primary" 
onclick="schedule.nextWeek(); return false"><xsl:value-of 
select="php:function('lang', 'Next week')"/></span></li>
@@ -56,9 +56,10 @@
             schedule.setupWeekPicker('cal_container');
             schedule.datasourceUrl = '<xsl:value-of 
select="building/datasource_url"/>';
             schedule.includeResource = true;
+            schedule.colFormatter = 'backendScheduleDateColumn';
             var handleHistoryNavigation = function (state) {
                 schedule.date = parseISO8601(state);
-                schedule.renderSchedule('schedule_container', 
schedule.datasourceUrl, schedule.date, 'backendScheduleDateColumn', true);
+                schedule.renderSchedule('schedule_container', 
schedule.datasourceUrl, schedule.date, schedule.colFormatter, true);
             };
 
             var initialRequest = getUrlData("date") || '<xsl:value-of 
select="building/date"/>';

Modified: branches/dev-syncromind/booking/templates/base/resource_schedule.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/resource_schedule.xsl        
2015-09-29 22:47:34 UTC (rev 14061)
+++ branches/dev-syncromind/booking/templates/base/resource_schedule.xsl        
2015-09-29 23:45:42 UTC (rev 14062)
@@ -45,7 +45,8 @@
                             <span><xsl:value-of select="php:function('lang', 
'Week')" />: </span>
                             <label id="numberWeek"></label>
                             <input type="text" id="datepicker" />
-                            <img id="pickerImg" 
src="/portico/phpgwapi/templates/base/images/cal.png" />
+                            <!--img id="pickerImg" 
src="/portico/phpgwapi/templates/base/images/cal.png" /-->
+                            <img id="pickerImg" src="{resource/picker_img}" />
                         </div>
                     </li>
                     <li><span class="pure-button pure-button-primary" 
onclick="schedule.nextWeek(); return false"><xsl:value-of 
select="php:function('lang', 'Next week')"/></span></li>
@@ -62,9 +63,10 @@
             schedule.setupWeekPicker('cal_container');
             schedule.datasourceUrl = '<xsl:value-of 
select="resource/datasource_url"/>';
             schedule.includeResource = false;
+            schedule.colFormatter = 'backendScheduleDateColumn';
             var handleHistoryNavigation = function (state) {
                 schedule.date = parseISO8601(state);
-                schedule.renderSchedule('schedule_container', 
schedule.datasourceUrl, schedule.date, 'backendScheduleDateColumn', 
schedule.includeResource);
+                schedule.renderSchedule('schedule_container', 
schedule.datasourceUrl, schedule.date, schedule.colFormatter, 
schedule.includeResource);
             };
 
             var initialRequest = getUrlData("date") || '<xsl:value-of 
select="resource/date"/>';