[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14243] YAHOO to jQuery
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14243] YAHOO to jQuery |
|
Date: |
Thu, 29 Oct 2015 00:30:34 +0000 |
Revision: 14243
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14243
Author: psaul
Date: 2015-10-29 00:30:34 +0000 (Thu, 29 Oct 2015)
Log Message:
-----------
YAHOO to jQuery
Modified Paths:
--------------
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking_massupdate.js
branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
branches/dev-syncromind/bookingfrontend/templates/base/event_info.xsl
branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl
Modified: branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
===================================================================
--- branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
2015-10-29 00:27:05 UTC (rev 14242)
+++ branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
2015-10-29 00:30:34 UTC (rev 14243)
@@ -1,3 +1,37 @@
+//var building_id_selection;
+//
+//$(document).ready(function(){
+//
JqueryPortico.autocompleteHelper('index.php?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
'field_building_name', 'field_building_id', 'building_container');
+//
JqueryPortico.autocompleteHelper('index.php?menuaction=bookingfrontend.uigroup.index&phpgw_return_as=json&',
'field_group_name', 'field_group_id', 'group_container');
+//});
+//
+//$(window).load(function(){
+// var building_id = $('#field_building_id').val();
+// if (building_id) {
+// populateTableChkResources(building_id, initialSelection);
+// building_id_selection = building_id
+// }
+// $('#field_building_name').on("autocompleteselect", function(event, ui) {
+// var building_id = ui.item.value;
+// if (building_id != building_id_selection) {
+// populateTableChkResources(building_id, []);
+// building_id_selection = building_id;
+// }
+// });
+//});
+//
+//function populateTableChk (url, container, colDefs) {
+// createTable(container, url, colDefs);
+//}
+//
+//function populateTableChkResources (building_id, selection) {
+// var url =
"index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id="
+ building_id + "&phpgw_return_as=json&";
+// var container = "resources_container";
+// var colDefsResources = [{label: '', object: [{type: 'input', attrs:
[{name: 'type', value: 'checkbox'},{name: 'name', value: 'resource[]'},{name:
'data-validation', value: 'checkbox_group'},{name: 'data-validation-qty',
value: 'min1'},{name: 'data-validation-error-msg', value: 'Please choose at
least 1 resource'}]}], value: 'id', checked: selection},{key: 'name', label:
lang['Name']},{key: 'type', label: lang['Resources Type']}];
+// populateTableChk(url, container, colDefsResources);
+//}
+//
+
populateResourceTable = function(building_id, selection) {
YAHOO.booking.checkboxTableHelper('resources_container',
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id='
+ building_id + '&phpgw_return_as=json&',
'resources[]', selection);
Modified:
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking_massupdate.js
===================================================================
---
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking_massupdate.js
2015-10-29 00:27:05 UTC (rev 14242)
+++
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking_massupdate.js
2015-10-29 00:30:34 UTC (rev 14243)
@@ -1,3 +1,7 @@
+//$(windows).load(function(){
+// $('header').hide();
+//})
+
YAHOO.util.Event.addListener(window, "load", function() {
YAHOO.util.Dom.setStyle(('header'), 'display', 'none');
});
Modified: branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
2015-10-29 00:27:05 UTC (rev 14242)
+++ branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
2015-10-29 00:30:34 UTC (rev 14243)
@@ -1,6 +1,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<!--xsl:call-template name="yui_booking_i18n"/-->
-
+
<div id="content">
<ul class="pathway">
<li><a
href="index.php?menuaction=bookingfrontend.uisearch.index"><xsl:value-of
select="php:function('lang', 'Home')" /></a></li>
@@ -82,7 +82,26 @@
<script type="text/javascript">
var building_id = <xsl:value-of select="id"/>;
- var lang = <xsl:value-of
select="php:function('js_lang', 'Name', 'category', 'Activity', 'Resource
Type')"/>;
+ var lang = <xsl:value-of
select="php:function('js_lang', 'Name', 'Category', 'Activity', 'Resource
Type')"/>;
+ <![CDATA[
+ var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
+ var documentURL =
'index.php?menuaction=bookingfrontend.uidocument_building.index&sort=name&no_images=1&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
+ var building_usersURL =
'index.php?menuaction=bookingfrontend.uiorganization.building_users&sort=name&building_id='
+ building_id + '&phpgw_return_as=json&';
+ var document_buildingURL =
'index.php?menuaction=bookingfrontend.uidocument_building.index_images&sort=name&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
+ ]]>
+
+ var rBuilding_users = [{n: 'ResultSet'},{n:
'Result'}];
+
+ var colDefsResources = [{key: 'name', label:
lang['Name'], formatter: genericLink}, {key: 'type', label: lang['Resource
Type']}, {key: 'activity_name', label: lang['Activity']}];
+ var colDefsDocument = [{key: 'description',
label: lang['Name'], formatter: genericLink}];
+ var colDefsBuilding_users = [{key: 'name',
label: lang['Name'], formatter: genericLink}, {key: 'activity_name', label:
lang['Activity']}];
+
+ createTable('resources_container',
resourcesURL, colDefsResources, 'data', 'bookingfrontend-table
bookingfrontend-table-striped');
+ createTable('documents_container',
documentURL, colDefsDocument, 'data', 'bookingfrontend-table
bookingfrontend-table-striped');
+ createTable('building_users_container',
building_usersURL, colDefsBuilding_users, rBuilding_users,
'bookingfrontend-table bookingfrontend-table-striped');
+ //createnInlineImages('images_container',
'document_buildingURL');
+
+/*
<![CDATA[
YAHOO.util.Event.addListener(window, "load",
function() {
@@ -102,6 +121,7 @@
var colDefs = [{key: 'name', label:
lang['Name'], formatter: YAHOO.booking.formatLink}, {key: 'activity_name',
label: lang['Activity']}];
YAHOO.booking.inlineTableHelper('building_users_container', url, colDefs);
]]>
+*/
</script>
</xsl:for-each>
</div>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
2015-10-29 00:27:05 UTC (rev 14242)
+++
branches/dev-syncromind/bookingfrontend/templates/base/building_schedule.xsl
2015-10-29 00:30:34 UTC (rev 14243)
@@ -19,21 +19,60 @@
<xsl:call-template name="msgbox"/>
<xsl:if test="building/deactivate_application=0">
- <button
onclick="YAHOO.booking.newApplicationForm();"><xsl:value-of
select="php:function('lang', 'New booking application')" /></button>
+ <button
onclick="schedule.newApplicationForm();"><xsl:value-of
select="php:function('lang', 'New booking application')" /></button>
- Søk ledig tid
</xsl:if>
</xsl:if>
- <ul id="week-selector">
+ <!--ul id="week-selector">
<li><a href="#" onclick="YAHOO.booking.prevWeek();
return false"><xsl:value-of select="php:function('lang', 'Previous
week')"/></a></li>
<li id="cal_container"/>
<li><a href="#" onclick="YAHOO.booking.nextWeek();
return false"><xsl:value-of select="php:function('lang', 'Next
week')"/></a></li>
- </ul>
+ </ul-->
+ <ul id="week-selector">
+ <li><a id="btnPrevWeek" class="moveWeek"
onclick="schedule.prevWeek(); return false"><xsl:value-of
select="php:function('lang', 'Previous week')"/></a></li>
+ <li id="cal_container">
+ <div>
+ <span><xsl:value-of select="php:function('lang',
'Week')" />: </span>
+ <label id="numberWeek"></label>
+ <input type="text" id="datepicker" />
+ <img id="pickerImg" src="{building/picker_img}" />
+ </div>
+ </li>
+ <li><a id="btnPrevWeek" class="moveWeek"
onclick="schedule.nextWeek(); return false"><xsl:value-of
select="php:function('lang', 'Next week')"/></a></li>
+ </ul>
<div id="schedule_container"/>
</div>
+ <div id="dialog_schedule"></div>
<script type="text/javascript">
+ schedule.createDialogSchedule(300);
+ $(window).load(function() {
+ schedule.setupWeekPicker('cal_container');
+ schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
+ schedule.newApplicationUrl = '<xsl:value-of
select="building/application_link"/>';
+ schedule.includeResource = true;
+ schedule.colFormatter = 'frontendScheduleDateColumn';
+ schedule.classTable = 'bookingfrontend-table';
+ var handleHistoryNavigation = function (state) {
+ schedule.date = parseISO8601(state);
+ schedule.renderSchedule('schedule_container',
schedule.datasourceUrl, schedule.date, schedule.colFormatter,
schedule.includeResource, schedule.classTable);
+ };
+
+ var initialRequest = getUrlData("date") || '<xsl:value-of
select="building/date"/>';
+
+ var state = getUrlData("date") || initialRequest;
+ schedule.state = state;
+ if (state){
+ handleHistoryNavigation(state);
+ schedule.week = $.datepicker.iso8601Week(schedule.date);
+ $('#cal_container #numberWeek').text(schedule.week);
+ $("#cal_container #datepicker").datepicker("setDate",
parseISO8601(state));
+ }
+ });
+
+/*
YAHOO.util.Event.addListener(window, "load", function() {
YAHOO.booking.setupWeekPicker('cal_container');
YAHOO.booking.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
@@ -52,8 +91,10 @@
});
YAHOO.util.History.initialize("yui-history-field",
"yui-history-iframe");
});
+*/
<xsl:if test="backend = 'true'">
- YAHOO.util.Dom.setStyle(('header'), 'display', 'none');
+ // YAHOO.util.Dom.setStyle(('header'), 'display', 'none');
+ $('header').hide();
</xsl:if>
</script>
</xsl:template>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/event_info.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/event_info.xsl
2015-10-29 00:27:05 UTC (rev 14242)
+++ branches/dev-syncromind/bookingfrontend/templates/base/event_info.xsl
2015-10-29 00:30:34 UTC (rev 14243)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div style="float: right"><a onclick="YAHOO.booking.closeOverlay();
return false" href=""><xsl:value-of select="php:function('lang',
'Close')"/></a></div>
+ <!--div style="float: right"><a onclick="YAHOO.booking.closeOverlay();
return false" href=""><xsl:value-of select="php:function('lang',
'Close')"/></a></div-->
<h3><xsl:value-of select="php:function('lang', 'Event')"/>
#<xsl:value-of select="event/id"/></h3>
<xsl:if test="event/is_public=1">
<div>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
2015-10-29 00:27:05 UTC (rev 14242)
+++ branches/dev-syncromind/bookingfrontend/templates/base/organization.xsl
2015-10-29 00:30:34 UTC (rev 14243)
@@ -69,7 +69,27 @@
<script type="text/javascript">
var organization_id = <xsl:value-of select="organization/id"/>;
var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Activity', 'Contact 1', 'Contact 2')"/>;
-
+
+ <![CDATA[
+ var groupURL =
'index.php?menuaction=bookingfrontend.uigroup.index&sort=name&filter_organization_id='
+ organization_id + '&phpgw_return_as=json&';
+ var buildingURL =
'index.php?menuaction=bookingfrontend.uibuilding.find_buildings_used_by&sort=name&organization_id='
+ organization_id + '&phpgw_return_as=json&';
+ ]]>
+
+ var rBuilding = [{n: 'ResultSet'},{n: 'Result'}];
+
+ var colDefsGroup = [
+ {key: 'name', label: lang['Name'],
formatter: genericLink},
+ {key: 'link', attrs: [{name: 'hidden'}]},
+ {key: 'activity_name', label:
lang['Activity']},
+ {key: 'primary_contact_name', label:
lang['Contact 1']},
+ {key: 'secondary_contact_name', label:
lang['Contact 2']}
+ ];
+ var colDefsBuilding = [{key: 'name', label: lang['Name'],
formatter: genericLink}];
+
+ createTable('groups_container', groupURL, colDefsGroup, '',
'bookingfrontend-table bookingfrontend-table-striped');
+ createTable('buildings_used_by_container', buildingURL,
colDefsBuilding, rBuilding, 'bookingfrontend-table
bookingfrontend-table-striped');
+
+/*
<![CDATA[
YAHOO.util.Event.addListener(window, "load", function() {
var url =
'index.php?menuaction=bookingfrontend.uigroup.index&sort=name&filter_organization_id='
+ organization_id + '&phpgw_return_as=json&';
@@ -87,6 +107,7 @@
YAHOO.booking.inlineTableHelper('buildings_used_by_container', url, colDefs);
});
]]>
+*/
</script>
</xsl:template>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
2015-10-29 00:27:05 UTC (rev 14242)
+++ branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
2015-10-29 00:30:34 UTC (rev 14243)
@@ -46,6 +46,16 @@
<script type="text/javascript">
var resource_id = <xsl:value-of select="resource/id"/>;
var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'category', 'Activity')"/>;
+
+ var documentResourceURL =
'index.php?menuaction=bookingfrontend.uidocument_resource.index&sort=name&no_images=1&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
+ var documentResourceImagesURL =
'index.php?menuaction=bookingfrontend.uidocument_resource.index_images&sort=name&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
+
+ var colDefsDocumentResource = [{key: 'name', label:
lang['Name'], formatter: genericLink}];
+
+ createTable = ('documents_container', documentsResourceURL,
colDefsDocumentResource);
+ createnInlineImages('images_container',
'documentResourceImagesURL');
+
+/*
<![CDATA[
YAHOO.util.Event.addListener(window, "load", function() {
@@ -57,6 +67,7 @@
YAHOO.booking.inlineImages('images_container', url);
});
]]>
+*/
</script>
</xsl:template>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl
2015-10-29 00:27:05 UTC (rev 14242)
+++
branches/dev-syncromind/bookingfrontend/templates/base/resource_schedule.xsl
2015-10-29 00:30:34 UTC (rev 14243)
@@ -34,6 +34,30 @@
</div>
<script type="text/javascript">
+ $(window).load(function(){
+ schedule.setupWeekPicker('cal_container');
+ schedule.datasourceUrl = '<xsl:value-of
select="resource/datasource_url" />';
+ schedule.newApplicationUrl = '<xsl:value-of
select="resource/application_link" />';
+ schedule.includeResource = false;
+ schedule.colFormatter = 'frontendScheduleColorFormatter';
+ var handleHistoryNavigation = function (state) {
+ schedule.date = parseISO8601(state);
+ schedule.renderSchedule('schedule_container',
schedule.datasourceUrl, schedule.date, schedule.colFormatter,
schedule.includeResource);
+ }
+
+ var initialRequest = getUrlData("date") || '<xsl:value-of
select="resource/date" />';
+
+ var state = getUrlData("date") || initialRequest;
+ if (state) {
+ handleHistoryNavigation(state);
+ schedule.week = $.datepicker.iso8601Week(schedule.date);
+ $('#cal_container #numberWeek').text(schedule.week);
+ $('#cal_container #datepicker').datepicker("setDate",
parseISO8601(state));
+ }
+ });
+
+
+/*
YAHOO.util.Event.addListener(window, "load", function() {
YAHOO.booking.setupWeekPicker('cal_container');
YAHOO.booking.datasourceUrl = '<xsl:value-of
select="resource/datasource_url"/>';
@@ -52,6 +76,7 @@
});
YAHOO.util.History.initialize("yui-history-field",
"yui-history-iframe");
});
+*/
</script>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14243] YAHOO to jQuery,
Saul <=