[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14332]
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14332] |
|
Date: |
Thu, 12 Nov 2015 00:00:12 +0000 |
Revision: 14332
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14332
Author: psaul
Date: 2015-11-12 00:00:11 +0000 (Thu, 12 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/dev-syncromind/bookingfrontend/css/bookingfrontend.css
branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
branches/dev-syncromind/bookingfrontend/templates/base/allocation_info.xsl
branches/dev-syncromind/bookingfrontend/templates/base/application.xsl
branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete_preview.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_info.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_new_preview.xsl
branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
branches/dev-syncromind/bookingfrontend/templates/base/report_numbers.xsl
branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
Added Paths:
-----------
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
Modified: branches/dev-syncromind/bookingfrontend/css/bookingfrontend.css
===================================================================
--- branches/dev-syncromind/bookingfrontend/css/bookingfrontend.css
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/css/bookingfrontend.css
2015-11-12 00:00:11 UTC (rev 14332)
@@ -704,9 +704,19 @@
dd {margin-left: 0;}
#dates-container {width: 18em;}
+.ui-widget-overlay {background-image: none;}
+
+#field_customer_ssn {display: block;}
+#field_customer_organization_number {display: block;}
+
.pure-g [class*="pure-u"] {padding: 0;}
.pure-g [class*="pure-u"] button,
.pure-g [class*="pure-u"] input,
.pure-g [class*="pure-u"] select,
.pure-g [class*="pure-u"] textarea {max-width: 90%;}
-.pure-table {font-size: 12px;font-family: Arial,Helvetica,Verdana,sans-serif;}
\ No newline at end of file
+.pure-table {font-size: 12px;font-family: Arial,Helvetica,Verdana,sans-serif;}
+
+#frontend .pure-g dl.proplist-col main {width: 100%;}
+#frontend .pure-g dl.proplist-col.main {width: 100%;}
+#frontend .pure-g dl.proplist-col.images {margin: 0 auto;max-width:
300px;width: 90%;clear: none;float: none;}
+#frontend .pure-g dl.proplist.images dd img {width: 100%;}
\ No newline at end of file
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-12 00:00:11 UTC (rev 14332)
@@ -118,8 +118,12 @@
$booking['building_id'] = $building['id'];
$booking['building_name'] = $building['name'];
array_set_default($booking, 'resources',
array(get_var('resource', int, 'GET')));
+ $booking['organization_id'] = $allocation['organization_id'];
+ $booking['organization_name'] =
$allocation['organization_name'];
} else {
$season =
$this->season_bo->read_single($_POST['season_id']);
+ $booking['organization_id'] = $_POST['organization_id'];
+ $booking['organization_name'] =
$_POST['organization_name'];
}
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -138,8 +142,8 @@
$booking['to_'] = join(" ",$date_to);
$_POST['to_'] = join(" ",$date_to);
}
- $booking['building_name'] = $building['name'];
- $booking['building_id'] = $building['id'];
+// $booking['building_name'] = $building['name'];
+// $booking['building_id'] = $building['id'];
$booking['active'] = '1';
$booking['cost'] = 0;
$booking['completed'] = '0';
@@ -259,7 +263,7 @@
$activities = $activities['results'];
$groups =
$this->group_bo->so->read(array('filters'=>array('organization_id'=>$allocation['organization_id'],
'active'=>1)));
$groups = $groups['results'];
- $booking['organization_name'] =
$allocation['organization_name'];
+// $booking['organization_name'] = $allocation['organization_name'];
$resources_full =
$this->resource_bo->so->read(array('filters'=>array('id'=>$booking['resources']),
'sort'=>'name'));
$res_names = array();
foreach($resources_full['results'] as $res)
@@ -298,9 +302,9 @@
'recurring' => $_POST['recurring'],
'outseason' => $_POST['outseason'],
'interval' => $_POST['field_interval'],
- 'repeat_until' =>
$_POST['repeat_until'],
- 'from_date' => $_POST['from_'],
- 'to_date' => $_POST['to_'],
+ 'repeat_until' =>
pretty_timestamp($_POST['repeat_until']),
+ 'from_date' =>
pretty_timestamp($_POST['from_']),
+ 'to_date' =>
pretty_timestamp($_POST['to_']),
'valid_dates' => $valid_dates,
'invalid_dates' => $invalid_dates,
'groups' => $groups)
@@ -313,7 +317,11 @@
$step = 1;
$id = intval(phpgw::get_var('id', 'GET'));
$booking = $this->bo->read_single($id);
- $agegroups = $this->agegroup_bo->fetch_age_groups();
+
+ $activity_path =
$this->activity_bo->get_path($booking['activity_id']);
+ $top_level_activity = $activity_path ? $activity_path[0]['id'] :
-1;
+
+ $agegroups =
$this->agegroup_bo->fetch_age_groups($top_level_activity);
$agegroups = $agegroups['results'];
$building =
$this->building_bo->read_single($booking['building_id']);
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
2015-11-12 00:00:11 UTC (rev 14332)
@@ -314,10 +314,7 @@
if (trim($building['homepage']) != '' &&
!preg_match("/^http|https:\/\//", trim($building['homepage']))) {
$building['homepage'] = 'http://' . $building['homepage'];
}
-
- self::add_stylesheet("bookingfrontend/css/bookingfrontend.css");
- phpgwapi_jquery::load_widget("autocomplete");
- phpgwapi_jquery::load_widget("datepicker");
+
self::render_template_xsl('building', array("building" => $building));
}
Added: branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
===================================================================
--- branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
(rev 0)
+++ branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
2015-11-12 00:00:11 UTC (rev 14332)
@@ -0,0 +1,407 @@
+var building_id_selection = "";
+var regulations_select_all = "";
+
+$(document).ready(function() {
+ JqueryPortico.autocompleteHelper( phpGWLink('bookingfrontend/',
{menuaction: 'bookingfrontend.uibuilding.index'}, true), 'field_building_name',
'field_building_id', 'building_container');
+//
JqueryPortico.autocompleteHelper('bookingfrontend/?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
+// 'field_building_name',
'field_building_id', 'building_container');
+
+ $("#field_activity").change(function(){
+ var building_id = $('#field_building_id').val();
+ if(building_id)
+ {
+ populateTableChkResources(building_id,
initialSelection);
+ }
+
+ var oArgs =
{menuaction:'bookingfrontend.uiapplication.get_activity_data',
activity_id:$(this).val()};
+ var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function(data) {
+ var html_agegroups = '';
+ var html_audience = '';
+
+ if( data != null)
+ {
+ var agegroups = data.agegroups;
+ for ( var i = 0; i < agegroups.length; ++i )
+ {
+ html_agegroups += "<tr>";
+ html_agegroups += "<th>" + agegroups[i]['name'] +
"</th>";
+ html_agegroups += "<td>";
+ html_agegroups += "<input class=\"input50\"
type=\"text\" name='male[" +agegroups[i]['id'] + "]' value='0'></input>";
+ html_agegroups += "</td>";
+ html_agegroups += "<td>";
+ html_agegroups += "<input class=\"input50\"
type=\"text\" name='female[" +agegroups[i]['id'] + "]' value='0'></input>";
+ html_agegroups += "</td>";
+ html_agegroups += "</tr>";
+ }
+ $("#agegroup_tbody").html( html_agegroups );
+
+ var audience = data.audience;
+ var checked = '';
+ for ( var i = 0; i < audience.length; ++i )
+ {
+ checked = '';
+ if (initialAudience) {
+ for ( var j = 0; j < initialAudience.length; ++j )
+ {
+ if(audience[i]['id'] == initialAudience[j])
+ {
+ checked = " checked='checked'";
+ }
+ }
+ }
+ html_audience += "<li>";
+ html_audience += "<label>";
+ html_audience += "<input type=\"radio\"
name=\"audience[]\" value='" +audience[i]['id'] + "'" + checked+ "></input>";
+ html_audience += audience[i]['name'];
+ html_audience += "</label>";
+ html_audience += "</li>";
+ }
+ $("#audience").html( html_audience );
+ }
+ }
+ });
+ });
+
+});
+
+$(window).load(function(){
+ building_id = $('#field_building_id').val();
+ regulations_select_all = initialAcceptAllTerms;
+ resources = initialSelection;
+ if (building_id) {
+ populateTableChkResources(building_id, initialSelection);
+ populateTableChkRegulations(building_id, initialDocumentSelection,
resources);
+ building_id_selection = building_id;
+ }
+ $("#field_building_name").on("autocompleteselect", function(event, ui){
+ var building_id = ui.item.value;
+ var selection = [];
+ var resources = [];
+ if (building_id != building_id_selection){
+ populateTableChkResources(building_id, initialSelection);
+ populateTableChkRegulations(building_id, selection, resources);
+ building_id_selection = building_id;
+ }
+ });
+ $('#resources_container').on('change', '.chkRegulations', function(){
+ var resources = new Array();
+ $('#resources_container
input.chkRegulations[name="resources[]"]:checked').each(function() {
+ resources.push($(this).val());
+ });
+ var selection = [];
+ populateTableChkRegulations(building_id_selection, selection,
resources);
+ });
+
+ if (!$.formUtils) {
+ $('#application_form').submit(function(e){
+ if(!validate_documents()){
+ e.preventDefault();
+ alert(lang['You must accept to follow all terms and conditions
of lease first.']);
+ }
+ });
+ }
+});
+
+if ($.formUtils) {
+ $.formUtils.addValidator({
+ name: 'regulations_documents',
+ validatorFunction: function(value, $el, config, languaje, $form) {
+ var n = 0;
+ $('#regulation_documents
input[name="accepted_documents[]"]').each(function(){
+ if(!$(this).is(':checked')) {
+ n++;
+ }
+ });
+ var v = (n == 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'You must accept to follow all terms and conditions of
lease first.',
+ errorMessageKey: ''
+ })
+
+ $.formUtils.addValidator({
+ name: 'target_audience',
+ validatorFunction: function(value, $el, config, languaje, $form) {
+ var n = 0;
+ $('#audience input[name="audience[]"]').each(function(){
+ if ($(this).is(':checked')) {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Please choose at least 1 target audience',
+ errorMessageKey: ''
+ })
+
+ $.formUtils.addValidator({
+ name: 'number_participants',
+ validatorFunction: function(value, $el, config, languaje, $form) {
+ var n = 0;
+ $('#agegroup_tbody input').each(function() {
+ if ($(this).val() != "" && $(this).val() > 0) {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Number of participants is required',
+ errorMessageKey: ''
+ });
+
+ $.formUtils.addValidator({
+ name: 'customer_identifier',
+ validatorFunction: function(value, $el, config, languaje, $form) {
+ var v = false;
+ var customer_ssn = $('#field_customer_ssn').val();
+ var customer_organization_number =
$('#field_customer_organization_number').val();
+ if (customer_ssn != "" || customer_organization_number != "") {
+ v = true;
+ }
+ return v;
+ },
+ errorMessage: 'Customer identifier type is required',
+ errorMessageKey: ''
+ });
+
+ $.formUtils.addValidator({
+ name: 'application_dates',
+ validatorFunction: function(value, $el, config, languaje, $form) {
+ var n = 0;
+ if ($('input[name="from_[]"]').length == 0 ||
$('input[name="from_[]"]').length == 0) {
+ return false;
+ }
+ $('input[name="from_[]"]').each(function(){
+ if ($(this).val() == "") {
+ $($(this).addClass("error").css("border-color","red"));
+ n++;
+ } else {
+ $($(this).removeClass("error").css("border-color",""));
+ }
+ });
+ $('input[name="to_[]"]').each(function(){
+ if ($(this).val() == "") {
+ $($(this).addClass("error").css("border-color","red"));
+ n++;
+ } else {
+ $($(this).removeClass("error").css("border-color",""));
+ }
+ });
+ var v = (n == 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Invalida date',
+ errorMessageKey: ''
+ });
+} else {
+ function validate_documents() {
+ var n = 0;
+ $('#regulation_documents
input[name="accepted_documents[]"]').each(function(){
+ if(!$(this).is(':checked')) {
+ n++;
+ }
+ });
+ var v = (n == 0) ? true : false;
+ return v;
+ }
+}
+
+function populateTableChkResources (building_id, selection) {
+ var oArgs = {menuaction: 'bookingfrontend.uiresource.index_json',
sort:'name', filter_building_id: building_id, sub_activity_id:
$("#field_activity").val()};
+ var url = phpGWLink('bookingfrontend/', oArgs, true);
+ var container = 'resources_container';
+ var colDefsResources = [{label: '', object: [{type: 'input', attrs:
[{name: 'type', value: 'checkbox'},{name: 'name', value: 'resources[]'},{name:
'class', value: 'chkRegulations'},{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['Resource Type']}];
+ populateTableResources(url, container, colDefsResources);
+}
+
+function populateTableChkRegulations (building_id, selection, resources) {
+ var url =
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'+building_id;
+// var url = phpGWLink('bookingfrontend/', {menuaction:
'booking.uidocument_view.regulations', sort: 'name', 'owner[]':
'building::'+building_id}, true);
+ for(var r in resources) {
+ url += '&owner[]=resource::'+resources[r];
+ }
+ var container = 'regulation_documents';
+ var colDefsRegulations = [{label: lang['Accepted'], object: [{type:
'input', attrs: [{name: 'type', value: 'checkbox'},{name: 'name', value:
'accepted_documents[]'}]}], value: 'id', checked: selection},{key:
'name',label: lang['Document'],formatter: genericLink}];
+ if (regulations_select_all){
+
colDefsRegulations[0]['object'][0]['attrs'].push({name:'checked',value:
'checked'});
+ }
+ regulations_select_all = false;
+ populateTableRegulations(url, container, colDefsRegulations);
+}
+
+function populateTableResources (url, container, colDefs) {
+ if (typeof tableClass !== 'undefined') {
+ createTable(container,url,colDefs,'results', tableClass);
+ } else {
+ createTable(container,url,colDefs,'results');
+ }
+}
+
+function populateTableRegulations (url, container, colDefs) {
+ if (typeof tableClass !== 'undefined') {
+ createTable(container,url,colDefs,'', tableClass);
+ } else {
+ createTable(container,url,colDefs);
+ }
+
+}
+
+
+/*
+YAHOO.booking.RegulationsTable = function() {
+ this.building_id = null;
+ this.resources = [];
+ this.container = 'regulation_documents';
+ this.selection = [];
+ this.doAcceptAll = false;
+ this.audience = [];
+};
+
+YAHOO.booking.RegulationsTable.prototype.update = function() {
+ var url =
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'+this.building_id;
+
+ for(var r in this.resources) {
+ url += '&owner[]=resource::'+this.resources[r];
+ }
+
+ var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.booking.formatLink}];
+ var options = {
+ defaultChecked: this.doAcceptAll,
+ selectionFieldOptions: {label: lang['Accepted']},
+ nameFieldOptions: {formatter: YAHOO.booking.formatLink, label:
lang['Document']},
+ additional_fields: [{key: 'link', hidden: true}]
+ };
+ this.doAcceptAll = false;
+ YAHOO.booking.checkboxTableHelper(this.container, url,
'accepted_documents[]', this.selection, options);
+};
+
+YAHOO.booking.RegulationsTable.prototype.setBuildingId = function(building_id)
{
+ this.building_id = building_id;
+};
+
+YAHOO.booking.RegulationsTable.prototype.setResources = function(resources) {
+ this.resources = resources || [];
+};
+
+YAHOO.booking.RegulationsTable.prototype.setAudience = function(audience) {
+ this.audience = audience || [];
+};
+
+YAHOO.booking.RegulationsTable.prototype.setSelection = function(selection) {
+ this.selection = selection || [];
+};
+
+YAHOO.booking.RegulationsTable.prototype.allAccepted = function() {
+ return YAHOO.util.Dom.getElementsBy(function(e){return !e.checked;},
'input', this.container).length == 0;
+}
+
+YAHOO.booking.RegulationsTable.prototype.checkAll = function() {
+ this.doAcceptAll = true;
+}
+
+var regulationsTable = new YAHOO.booking.RegulationsTable();
+
+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, {
+ additional_fields: [{key: 'type', label: lang['Resource
Type']}],
+ onSelectionChanged: function(selectedItems) {
regulationsTable.setResources(selectedItems); regulationsTable.update(); }
+ });
+}
+
+populateAudienceTable = function(building_id, selection) {
+ //YAHOO.booking.checkboxTableHelper('audience_container',
'index.php?menuaction=booking.uiaudience.index_json&sort=name&phpgw_return_as=json&',
+ YAHOO.booking.checkboxTableHelper('audience_container',
'index.php?menuaction=booking.uiaudience.index&phpgw_return_as=json',
+ 'audience[]', selection);
+}
+
+removeDateRow = function(e) {
+ this.parentNode.parentNode.removeChild(this.parentNode);
+ YAHOO.util.Event.stopEvent(e);
+}
+
+var createFromToDatePickerSection = function(containerEl) {
+ if (!this.counter) { this.counter = 0; }
+ containerEl.className = 'date-container';
+ containerEl.innerHTML = '
' +
+' <a href="#" class="close-btn">-</a> ' +
+' <div><label>'+lang['From']+'</label></div>
' +
+' <div class="datetime-picker"> ' +
+' <input id="js_date_'+this.counter+'_from"
type="text" name="from_[]"> ' +
+' </div>
' +
+' <div><label>'+lang['To']+'</label></div>
' +
+' <div class="datetime-picker"> ' +
+' <input id="js_date_'+this.counter+'_to"
type="text" name="to_[]"> ' +
+' </div>';
+ this.counter++;
+}
+
+YAHOO.util.Event.addListener(window, "load", function() {
+ var Dom = YAHOO.util.Dom;
+ var building_id = Dom.get('field_building_id').value;
+
+ if(building_id) {
+ populateResourceTable(building_id,
YAHOO.booking.initialSelection);
+ regulationsTable.setBuildingId(building_id);
+ regulationsTable.setResources(YAHOO.booking.initialSelection);
+
regulationsTable.setSelection(YAHOO.booking.initialDocumentSelection);
+ regulationsTable.setAudience(YAHOO.booking.initialAudience);
+
+ if (YAHOO.booking.initialAcceptAllTerms) {
+ regulationsTable.checkAll();
+ }
+
+ regulationsTable.update();
+ }
+ populateAudienceTable(building_id, YAHOO.booking.initialAudience);
+
+ var ac =
YAHOO.booking.autocompleteHelper('index.php?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
+ 'field_building_name',
'field_building_id', 'building_container');
+ // Update the resource table as soon a new building is selected
+ ac.itemSelectEvent.subscribe(function(sType, aArgs) {
+ populateResourceTable(aArgs[2].id, []);
+ regulationsTable.setBuildingId(aArgs[2].id);
+ regulationsTable.setResources([]);
+ regulationsTable.update();
+ });
+ Dom.getElementsByClassName('close-btn', 'a', null, function(a) {
+ a.onclick = removeDateRow;
+ });
+ // Add more From-To datepicker pairs when the user clicks on the add
link/button
+ YAHOO.util.Event.addListener("add-date-link", "click", function(e) {
+ var container = Dom.get('dates-container');
+ var div = document.createElement('div');
+
+ createFromToDatePickerSection(div);
+
+ container.appendChild(div);
+ var a = div.getElementsByTagName('a')[0];
+ a.onclick = removeDateRow;
+ YAHOO.booking.setupDatePickers();
+ YAHOO.util.Event.stopEvent(e);
+ });
+
+
+ YAHOO.util.Event.addListener('application_form', "submit", function(e) {
+ if (!regulationsTable.allAccepted()) {
+ YAHOO.util.Event.stopEvent(e);
+ alert(lang['You must accept to follow all terms and
conditions of lease first.']);
+ }
+ });
+
+
+ YAHOO.util.Event.addListener("field_customer_identifier_type", "change",
function(e) {
+
+ });
+
+});
+
+*/
\ No newline at end of file
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/allocation_info.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/allocation_info.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/allocation_info.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div class="close"><a onclick="YAHOO.booking.closeOverlay(); return
false" href=""><xsl:value-of select="php:function('lang', 'Close')"/></a></div>
+ <!--div class="close"><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', 'Allocation')"/>
#<xsl:value-of select="allocation/id"/></h3>
<dl>
<dt><xsl:value-of select="php:function('lang', 'Where')"/></dt>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -134,15 +134,15 @@
var eventParams = {};
</script>
<xsl:for-each select="application/dates">
- <dd><xsl:value-of select="php:function('lang',
'From')" />: <xsl:value-of select="php:function('pretty_timestamp',
from_)"/></dd>
- <dd><xsl:value-of select="php:function('lang',
'To')" />: <xsl:value-of select="php:function('pretty_timestamp', to_)"/></dd>
+ <dd><span
style="font-weight:bold;"><xsl:value-of select="php:function('lang', 'From')"
/>: </span><span><xsl:value-of select="php:function('pretty_timestamp',
from_)"/></span></dd>
+ <dd><span
style="font-weight:bold;"><xsl:value-of select="php:function('lang', 'To')" />:
</span><span><xsl:value-of select="php:function('pretty_timestamp',
to_)"/></span></dd>
<xsl:if test="../edit_link">
<script type="text/javascript">
allocationParams[<xsl:value-of
select="id"/>] = <xsl:value-of select="allocation_params"/>;
bookingParams[<xsl:value-of
select="id"/>] = <xsl:value-of select="booking_params"/>;
eventParams[<xsl:value-of
select="id"/>] = <xsl:value-of select="event_params"/>;
</script>
- <select name="create"
onchange="if(this.selectedIndex==1)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
+ <select name="create"
onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
<xsl:if
test="not(../case_officer/is_current_user)">
<xsl:attribute
name="disabled">disabled</xsl:attribute>
</xsl:if>
@@ -169,17 +169,21 @@
</dd>
<dt><xsl:value-of select="php:function('lang', 'Number of
participants')" /></dt>
<dd>
- <table id="agegroup">
- <tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
- <th><xsl:value-of
select="php:function('lang', 'Female')" /></th></tr>
- <xsl:for-each select="agegroups">
- <xsl:variable
name="id"><xsl:value-of select="id"/></xsl:variable>
- <tr>
- <th><xsl:value-of
select="name"/></th>
- <td><xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/></td>
- <td><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></td>
- </tr>
- </xsl:for-each>
+ <table id="agegroup" class="pure-table
pure-table-bordered">
+ <thead>
+ <tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
+ <th><xsl:value-of select="php:function('lang',
'Female')" /></th></tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="agegroups">
+ <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
+ <tr>
+ <th><xsl:value-of select="name"/></th>
+ <td><xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/></td>
+ <td><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
</table>
</dd>
</dl>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -71,7 +71,7 @@
</xsl:if-->
<dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Estimated number of participants')"
/></label></dt>
<dd>
- <table id="agegroup" class="pure-table">
+ <table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
<th><xsl:value-of select="php:function('lang',
'Female')" /></th></tr>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete_preview.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete_preview.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete_preview.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -89,9 +89,9 @@
</div>
<script type="text/javascript">
- YAHOO.booking.season_id = '<xsl:value-of select="booking/season_id"/>';
- YAHOO.booking.group_id = '<xsl:value-of select="booking/group_id"/>';
- YAHOO.booking.initialSelection = <xsl:value-of
select="booking/resources_json"/>;
+ var season_id = '<xsl:value-of select="booking/season_id"/>';
+ var group_id = '<xsl:value-of select="booking/group_id"/>';
+ var initialSelection = <xsl:value-of select="booking/resources_json"/>;
var lang = <xsl:value-of select="php:function('js_lang',
'Resource Type')"/>;
</script>
</xsl:template>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -175,7 +175,7 @@
<dl class="form-col">
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label></dt>
<dd>
- <table id="agegroup" class="pure-table">
+ <table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
<th><xsl:value-of select="php:function('lang',
'Female')" /></th></tr>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_info.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_info.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_info.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div class="close"><a onclick="YAHOO.booking.closeOverlay(); return
false" href=""><xsl:value-of select="php:function('lang', 'Close')"/></a></div>
+ <!--div class="close"><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', 'Booking')"/>
#<xsl:value-of select="booking/id"/></h3>
<dl>
<dt><xsl:value-of select="php:function('lang',
'Activity')"/></dt>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -100,7 +100,7 @@
<dl class="form-col">
<dt><label
for="field_from"><xsl:value-of select="php:function('lang', 'Number of
participants')" /></label></dt>
<dd>
- <table id="agegroup"
class="pure-table">
+ <table id="agegroup"
class="pure-table pure-table-bordered">
<thead>
<tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
<th><xsl:value-of
select="php:function('lang', 'Female')" /></th></tr>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -244,6 +244,8 @@
</form>
</div>
<script type="text/javascript">
+ var season_id = '<xsl:value-of select="booking/season_id"/>';
+ var group_id = '<xsl:value-of select="booking/group_id"/>';
var initialSelection = <xsl:value-of select="booking/resources_json"
/>;
var initialAudience = <xsl:value-of select="booking/audience_json" />;
var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_new_preview.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/booking_new_preview.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++
branches/dev-syncromind/bookingfrontend/templates/base/booking_new_preview.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -71,7 +71,7 @@
</div>
<script type="text/javascript">
- YAHOO.booking.initialSelection = <xsl:value-of
select="booking/resources_json"/>;
+ var initialSelection = <xsl:value-of select="booking/resources_json"/>;
</script>
</xsl:template>
<xsl:template name="xmlsource">
Modified: branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/building.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -1,88 +1,89 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--xsl:call-template name="yui_booking_i18n"/-->
+ <!--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>
- <li>
- <a href="{resource/building_link}">
- <xsl:value-of select="building/name"/>
- </a>
- </li>
- </ul>
+ <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>
+ <li>
+ <a href="{resource/building_link}">
+ <xsl:value-of select="building/name"/>
+ </a>
+ </li>
+ </ul>
- <xsl:for-each select="building">
+ <xsl:for-each select="building">
+ <xsl:if test="deactivate_calendar=0">
+ <div>
+ <button
onclick="window.location.href='{schedule_link}'"><xsl:value-of
select="php:function('lang', 'Building schedule')" /></button>
+ - Søk ledig tid/informasjon om hva som skjer
+ </div>
+ </xsl:if>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2">
+ <dl class="proplist-col main">
+ <xsl:if test="normalize-space(description)">
+ <dl class="proplist description">
+ <dt><xsl:value-of select="php:function('lang',
'Description')" /></dt>
+ <dd><xsl:value-of select="description"
disable-output-escaping="yes"/></dd>
+ </dl>
+ </xsl:if>
- <xsl:if test="deactivate_calendar=0">
- <div>
- <button
onclick="window.location.href='{schedule_link}'"><xsl:value-of
select="php:function('lang', 'Building schedule')" /></button>
-- Søk ledig tid/informasjon om hva som skjer
- </div>
- </xsl:if>
+ <xsl:if test="normalize-space(homepage) or
normalize-space(email) or normalize-space(phone) or normalize-space(street)">
+ <h3><xsl:value-of select="php:function('lang',
'Contact information')" /></h3>
+ <xsl:if test="deactivate_sendmessage=0">
+ <div>
+ <button
onclick="window.location.href='{message_link}'"><xsl:value-of
select="php:function('lang', 'Send message')" /></button>
+ - Meldig til saksbehandler for bygg
+ </div>
+ </xsl:if>
- <dl class="proplist-col main">
- <xsl:if test="normalize-space(description)">
- <dl class="proplist description">
- <dt><xsl:value-of
select="php:function('lang', 'Description')" /></dt>
- <dd><xsl:value-of
select="description" disable-output-escaping="yes"/></dd>
- </dl>
- </xsl:if>
-
- <xsl:if test="normalize-space(homepage) or
normalize-space(email) or normalize-space(phone) or normalize-space(street)">
- <h3><xsl:value-of
select="php:function('lang', 'Contact information')" /></h3>
- <xsl:if test="deactivate_sendmessage=0">
+ <dl class="contactinfo">
+ <xsl:if test="homepage and
normalize-space(homepage)">
+ <dt><xsl:value-of
select="php:function('lang', 'Homepage')" /></dt>
+ <dd><a href="{homepage}"><xsl:value-of
select="homepage"/></a></dd>
+ </xsl:if>
- <div>
- <button
onclick="window.location.href='{message_link}'"><xsl:value-of
select="php:function('lang', 'Send message')" /></button>
-- Meldig til saksbehandler for bygg
- </div>
- </xsl:if>
+ <xsl:if test="email and
normalize-space(email)">
+ <dt><xsl:value-of
select="php:function('lang', 'Email')" /></dt>
+ <dd><a href='mailto:{email}'><xsl:value-of
select="email"/></a></dd>
+ </xsl:if>
+ <xsl:if test="phone and
normalize-space(phone)">
+ <dt><xsl:value-of
select="php:function('lang', 'Telephone')" /></dt>
+ <dd><xsl:value-of select="phone"/></dd>
+ </xsl:if>
- <dl class="contactinfo">
- <xsl:if test="homepage and
normalize-space(homepage)">
- <dt><xsl:value-of
select="php:function('lang', 'Homepage')" /></dt>
- <dd><a
href="{homepage}"><xsl:value-of select="homepage"/></a></dd>
- </xsl:if>
-
- <xsl:if test="email and
normalize-space(email)">
- <dt><xsl:value-of
select="php:function('lang', 'Email')" /></dt>
- <dd><a
href='mailto:{email}'><xsl:value-of select="email"/></a></dd>
- </xsl:if>
-
- <xsl:if test="phone and
normalize-space(phone)">
- <dt><xsl:value-of
select="php:function('lang', 'Telephone')" /></dt>
- <dd><xsl:value-of
select="phone"/></dd>
- </xsl:if>
-
- <xsl:if test="street and
normalize-space(street)">
- <dt><xsl:value-of
select="php:function('lang', 'Address')" /></dt>
- <dd>
- <xsl:value-of
select="street"/><br/>
- <xsl:value-of
select="zip_code"/><span> </span>
- <xsl:value-of
select="city"/><br/>
- <xsl:value-of
select="district"/>
- </dd>
- </xsl:if>
- </dl>
- </xsl:if>
-
- <h3><xsl:value-of select="php:function('lang',
'Bookable resources')" /></h3>
- <div id="resources_container"/>
+ <xsl:if test="street and
normalize-space(street)">
+ <dt><xsl:value-of
select="php:function('lang', 'Address')" /></dt>
+ <dd>
+ <xsl:value-of select="street"/><br/>
+ <xsl:value-of
select="zip_code"/><span> </span>
+ <xsl:value-of select="city"/><br/>
+ <xsl:value-of select="district"/>
+ </dd>
+ </xsl:if>
+ </dl>
+ </xsl:if>
- <h3><xsl:value-of select="php:function('lang',
'Building users')" /></h3>
- <div id="building_users_container"/>
+ <h3><xsl:value-of select="php:function('lang',
'Bookable resources')" /></h3>
+ <div id="resources_container"/>
- <h3><xsl:value-of select="php:function('lang',
'Documents')" /></h3>
- <div id="documents_container"/>
- </dl>
- <dl class="proplist-col images">
- <div id="images_container"></div>
- </dl>
-
- <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')"/>;
+ <h3><xsl:value-of select="php:function('lang',
'Building users')" /></h3>
+ <div id="building_users_container"/>
+
+ <h3><xsl:value-of select="php:function('lang',
'Documents')" /></h3>
+ <div id="documents_container"/>
+ </dl>
+ </div>
+ <div class="pure-u-1 pure-u-md-1-2">
+ <dl class="proplist-col images">
+ <div id="images_container"></div>
+ </dl>
+ </div>
+ </div>
+ <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')"/>;
<![CDATA[
var resourcesURL =
'index.php?menuaction=bookingfrontend.uiresource.index_json&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&';
@@ -104,35 +105,28 @@
createTable('resources_container', resourcesURL,
colDefsResources, rResources);
createTable('documents_container', documentURL,
colDefsDocument);
createTable('building_users_container', building_usersURL,
colDefsBuilding_users, rBuilding_users, '', paginatorTableBuilding_users);
- //createnInlineImages('images_container',
'document_buildingURL');
-
- $.get(document_buildingURL, function(data){
- console.log(data);
+/*
+ <![CDATA[
+
+ YAHOO.util.Event.addListener(window, "load", function() {
+ var url =
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id='
+ building_id + '&phpgw_return_as=json&';
+ var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.booking.formatLink}, {key: 'type', label: lang['Resource Type']}, {key:
'activity_name', label: lang['Activity']}];
+ YAHOO.booking.inlineTableHelper('resources_container', url,
colDefs);
});
-/*
- <![CDATA[
-
- YAHOO.util.Event.addListener(window, "load",
function() {
- var url =
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id='
+ building_id + '&phpgw_return_as=json&';
- var colDefs = [{key: 'name', label:
lang['Name'], formatter: YAHOO.booking.formatLink}, {key: 'type', label:
lang['Resource Type']}, {key: 'activity_name', label: lang['Activity']}];
-
YAHOO.booking.inlineTableHelper('resources_container', url, colDefs);
- });
-
- var url =
'index.php?menuaction=bookingfrontend.uidocument_building.index&sort=name&no_images=1&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
- var colDefs = [{key: 'description', label:
lang['Name'], formatter: YAHOO.booking.formatLink}];
-
YAHOO.booking.inlineTableHelper('documents_container', url, colDefs);
-
- var url =
'index.php?menuaction=bookingfrontend.uidocument_building.index_images&sort=name&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
- YAHOO.booking.inlineImages('images_container',
url);
-
- var url =
'index.php?menuaction=bookingfrontend.uiorganization.building_users&sort=name&building_id='
+ building_id + '&phpgw_return_as=json&';
- 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);
- ]]>
+ var url =
'index.php?menuaction=bookingfrontend.uidocument_building.index&sort=name&no_images=1&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
+ var colDefs = [{key: 'description', label: lang['Name'],
formatter: YAHOO.booking.formatLink}];
+ YAHOO.booking.inlineTableHelper('documents_container', url,
colDefs);
+
+ var url =
'index.php?menuaction=bookingfrontend.uidocument_building.index_images&sort=name&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
+ YAHOO.booking.inlineImages('images_container', url);
+
+ var url =
'index.php?menuaction=bookingfrontend.uiorganization.building_users&sort=name&building_id='
+ building_id + '&phpgw_return_as=json&';
+ 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>
+ </script>
+ </xsl:for-each>
+ </div>
</xsl:template>
-
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/report_numbers.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/report_numbers.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/report_numbers.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -9,7 +9,8 @@
</dl>
<p><strong><xsl:value-of select="php:function('lang', 'Please
enter correct numbers for the event')"/>:</strong></p>
- <table id="agegroup">
+ <!--table id="agegroup" class="pure-table
pure-table-bordered"-->
+ <table class="pure-table pure-table-bordered">
<tr>
<th><xsl:value-of select="php:function('lang',
'Where')" />:</th>
<td><xsl:value-of select="building/name" /></td>
@@ -30,27 +31,31 @@
<dl class="form-col">
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label></dt>
<dd>
- <table id="agegroup">
- <tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
- <th><xsl:value-of
select="php:function('lang', 'Female')" /></th></tr>
- <xsl:for-each
select="agegroups">
- <xsl:variable
name="id"><xsl:value-of select="id"/></xsl:variable>
- <tr>
-
<th><xsl:value-of select="name"/></th>
- <td>
- <input
type="text">
-
<xsl:attribute name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
-
<xsl:attribute name="value"><xsl:value-of
select="../event_object/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
- </input>
- </td>
- <td>
- <input
type="text">
-
<xsl:attribute name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
-
<xsl:attribute name="value"><xsl:value-of
select="../event_object/agegroups/female[../agegroup_id =
$id]"/></xsl:attribute>
- </input>
- </td>
- </tr>
- </xsl:for-each>
+ <table id="agegroup" class="pure-table
pure-table-bordered">
+ <thead>
+ <tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
+ <th><xsl:value-of select="php:function('lang',
'Female')" /></th></tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="agegroups">
+ <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
+ <tr>
+ <th><xsl:value-of select="name"/></th>
+ <td>
+ <input type="text">
+ <xsl:attribute
name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of
select="../event_object/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
+ </input>
+ </td>
+ <td>
+ <input type="text">
+ <xsl:attribute
name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of
select="../event_object/agegroups/female[../agegroup_id =
$id]"/></xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
</table>
</dd>
</dl>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/resource.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -1,6 +1,5 @@
<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>
@@ -13,36 +12,39 @@
<xsl:value-of select="resource/name"/>
</li>
</ul>
-
<div>
<button
onclick="window.location.href='{resource/schedule_link}'"><xsl:value-of
select="php:function('lang', 'Resource schedule')" /></button>
-- Søk ledig tid/informasjon om hva som skjer
+ - Søk ledig tid/informasjon om hva som skjer
</div>
-
- <dl class="proplist-col main">
-
- <xsl:if test="resource/description and
normalize-space(resource/description)">
- <dt><xsl:value-of select="php:function('lang',
'Description')" /></dt>
- <dd><xsl:value-of disable-output-escaping="yes"
select="resource/description"/></dd>
- </xsl:if>
-
- <xsl:if test="resource/activity_name and
normalize-space(resource/activity_name)">
- <dt><xsl:value-of select="php:function('lang',
'Activity')" /></dt>
- <dd><xsl:value-of
select="resource/activity_name"/></dd>
- </xsl:if>
-
- <dt><xsl:value-of select="php:function('lang',
'Resource Type')" /></dt>
- <dd><xsl:value-of select="php:function('lang',
string(resource/type))"/></dd>
-
- <h3><xsl:value-of select="php:function('lang',
'Documents')" /></h3>
- <div id="documents_container"/>
- </dl>
- <dl class="proplist-col images">
- <div id="images_container">
- </div>
- </dl>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2">
+ <dl class="proplist-col main">
+ <xsl:if test="resource/description and
normalize-space(resource/description)">
+ <dt><xsl:value-of select="php:function('lang',
'Description')" /></dt>
+ <dd><xsl:value-of disable-output-escaping="yes"
select="resource/description"/></dd>
+ </xsl:if>
+ <xsl:if test="resource/activity_name and
normalize-space(resource/activity_name)">
+ <dt><xsl:value-of select="php:function('lang',
'Activity')" /></dt>
+ <dd><xsl:value-of
select="resource/activity_name"/></dd>
+ </xsl:if>
+ <dt>
+ <xsl:value-of select="php:function('lang', 'Resource
Type')" />
+ </dt>
+ <dd>
+ <xsl:value-of select="php:function('lang',
string(resource/type))"/>
+ </dd>
+ <h3><xsl:value-of select="php:function('lang',
'Documents')" /></h3>
+ <div id="documents_container"/>
+ </dl>
+ </div>
+ <div class="pure-u-1 pure-u-md-1-2">
+ <dl class="proplist-col images">
+ <div id="images_container">
+ </div>
+ </dl>
+ </div>
+ </div>
</div>
-
<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')"/>;
@@ -54,21 +56,20 @@
var colDefsDocumentsResource = [{key: 'name', label: lang['Name'],
formatter: genericLink}];
createTable('documents_container', documentsResourceURL,
colDefsDocumentsResource);
- //createnInlineImages('images_container', 'documentResourceImagesURL');
+ JqueryPortico.booking.inlineImages('images_container',
documentsResourceImagesURL);
-/*
-<![CDATA[
- YAHOO.util.Event.addListener(window, "load", function() {
+ /*
+ <![CDATA[
+ YAHOO.util.Event.addListener(window, "load", function() {
- var url =
'index.php?menuaction=bookingfrontend.uidocument_resource.index&sort=name&no_images=1&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
- var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.booking.formatLink}];
- YAHOO.booking.inlineTableHelper('documents_container', url, colDefs);
-
- var url =
'index.php?menuaction=bookingfrontend.uidocument_resource.index_images&sort=name&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
- YAHOO.booking.inlineImages('images_container', url);
-});
-]]>
-*/
+ var url =
'index.php?menuaction=bookingfrontend.uidocument_resource.index&sort=name&no_images=1&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
+ var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.booking.formatLink}];
+ YAHOO.booking.inlineTableHelper('documents_container', url, colDefs);
+
+ var url =
'index.php?menuaction=bookingfrontend.uidocument_resource.index_images&sort=name&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
+ YAHOO.booking.inlineImages('images_container', url);
+ });
+ ]]>
+ */
</script>
-
</xsl:template>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
2015-11-11 23:54:54 UTC (rev 14331)
+++ branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
2015-11-12 00:00:11 UTC (rev 14332)
@@ -15,134 +15,127 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<!--xsl:call-template name="yui_booking_i18n"/-->
-<div id="content">
- <form action="" method="GET" id="search">
- <input type="hidden" id="menuaction" name="menuaction"
value="bookingfrontend.uisearch.index" />
- <input type="hidden" id="activity_top_level" name="activity_top_level"
value="{activity_top_level}" />
- <xsl:choose>
- <xsl:when test="search and string-length(search/searchterm) > 0">
- <input id="search" type="text" name="searchterm"
value="{search/searchterm}"/>
- </xsl:when>
- <xsl:otherwise>
- <input id="search" type="text" name="searchterm" value="Søk hall,
klubb eller aktivitet" onclick="value=''" />
- </xsl:otherwise>
- </xsl:choose>
- <div id="building_container">
- <input id="field_building_id" name="building_id"
type="hidden">
- <xsl:attribute name="value">
- <xsl:value-of select="building_id"/>
- </xsl:attribute>
- </input>
- <input id="field_building_name" name="building_name"
type="text">
- <xsl:attribute name="value">
- <xsl:value-of select="building_name"/>
- </xsl:attribute>
- </input>
- </div>
- <!--xsl:text> </xsl:text><input type="submit"
value="{php:function('lang', 'Search')}"/-->
- <div class="hint">
- F.eks. "<i>Haukelandshallen</i>", "<i>Nordnes bydelshus</i>",
"<i>idrett</i>" eller "<i>kor</i>".
- </div>
- </form>
- <ul>
- <xsl:for-each select="activities">
- <li>
- <a href="{search_url}">
- <xsl:choose>
- <xsl:when
test="../activity_top_level = id">
- <xsl:text>[</xsl:text>
- <xsl:value-of
select="name"/>
- <xsl:text>]</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="name"/>
- </xsl:otherwise>
- </xsl:choose>
- </a>
- </li>
- </xsl:for-each>
- </ul>
-
- <xsl:if test="not(search)">
- <div id="cloud">
- <div class="frontpagetext"><xsl:value-of
select="frontpagetext"/></div>
-
- </div>
- <div style="text-align:center;">
- <img alt="" >
- <xsl:attribute name="src">
- <xsl:value-of select="frontimage"/>
- </xsl:attribute>
- </img>
- </div>
-
- </xsl:if>
-
- <xsl:if test="search">
- <div id="result">
- <h5>
- <u><strong><xsl:value-of select="php:function('lang', 'Found %1
results', search/results/total_records_sum)" /></strong></u>
- </h5>
- <br />
- <br />
- <xsl:if test="search/results/total_records_sum > 0">
- <ol id="result">
- <xsl:for-each select="search/results/results">
- <li>
- <div class="header">
- <a class="bui_single_view_link"><xsl:attribute
name="href"><xsl:value-of select="link"/></xsl:attribute><xsl:value-of
select="name"/></a>
- (<xsl:value-of select="php:function('lang',
string(type))"/>)
- </div>
- <div class="details">
- <div>
- <dl>
- <dt><h4><xsl:value-of select="php:function('lang',
'Description')" /></h4></dt>
- <dd class="description">
- <xsl:variable
name="tag_stripped_description">
-
<xsl:call-template name="strip-tags">
-
<xsl:with-param name="text" select="description"/>
-
</xsl:call-template>
- </xsl:variable>
-
- <xsl:choose>
- <xsl:when
test="string-length($tag_stripped_description) > 1">
- <xsl:choose>
- <xsl:when
test="string-length($tag_stripped_description) > 100">
- <xsl:value-of
select="substring($tag_stripped_description, 0, 97)"/>...
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="$tag_stripped_description"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="php:function('lang',
'No description yet')" />
- </xsl:otherwise>
- </xsl:choose>
- <div id="{img_container}"/>
- <!--script
type="text/javascript">
-
YAHOO.util.Event.addListener(window, "load", function() {
-
YAHOO.booking.inlineImages('<xsl:value-of select="img_container"/>',
'<xsl:value-of select="img_url"/>');
- });
- </script-->
-
- </dd>
- <xsl:if test="string-length(homepage) > 1">
- <dt><h4><xsl:value-of
select="php:function('lang', 'Homepage')" /></h4></dt>
- <dd class="description">
- <a><xsl:attribute name="href"><xsl:value-of
select="homepage"/></xsl:attribute><xsl:value-of select="homepage"/></a>
- </dd>
- </xsl:if>
- </dl>
- </div>
- <div class="clr"></div>
- </div>
- </li>
-
- </xsl:for-each>
- </ol>
- </xsl:if>
- </div>
- </xsl:if>
- </div>
+ <div id="content">
+ <form action="" method="GET" id="search">
+ <input type="hidden" id="menuaction" name="menuaction"
value="bookingfrontend.uisearch.index" />
+ <input type="hidden" id="activity_top_level"
name="activity_top_level" value="{activity_top_level}" />
+ <xsl:choose>
+ <xsl:when test="search and string-length(search/searchterm)
> 0">
+ <input id="search" type="text" name="searchterm"
value="{search/searchterm}"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input id="search" type="text" name="searchterm"
value="Søk hall, klubb eller aktivitet" onclick="value=''" />
+ </xsl:otherwise>
+ </xsl:choose>
+ <div id="building_container">
+ <input id="field_building_id" name="building_id" type="hidden">
+ <xsl:attribute name="value">
+ <xsl:value-of select="building_id"/>
+ </xsl:attribute>
+ </input>
+ <input id="field_building_name" name="building_name"
type="text">
+ <xsl:attribute name="value">
+ <xsl:value-of select="building_name"/>
+ </xsl:attribute>
+ </input>
+ </div>
+ <!--xsl:text> </xsl:text><input type="submit"
value="{php:function('lang', 'Search')}"/-->
+ <div class="hint">
+ F.eks. "<i>Haukelandshallen</i>", "<i>Nordnes bydelshus</i>",
"<i>idrett</i>" eller "<i>kor</i>".
+ </div>
+ </form>
+ <ul>
+ <xsl:for-each select="activities">
+ <li>
+ <a href="{search_url}">
+ <xsl:choose>
+ <xsl:when test="../activity_top_level = id">
+ <xsl:text>[</xsl:text>
+ <xsl:value-of select="name"/>
+ <xsl:text>]</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </a>
+ </li>
+ </xsl:for-each>
+ </ul>
+ <xsl:if test="not(search)">
+ <div id="cloud">
+ <div class="frontpagetext"><xsl:value-of
select="frontpagetext"/></div>
+ </div>
+ <div style="text-align:center;">
+ <img alt="" >
+ <xsl:attribute name="src">
+ <xsl:value-of select="frontimage"/>
+ </xsl:attribute>
+ </img>
+ </div>
+ </xsl:if>
+ <xsl:if test="search">
+ <div id="result">
+ <h5>
+ <u><strong><xsl:value-of select="php:function('lang',
'Found %1 results', search/results/total_records_sum)" /></strong></u>
+ </h5>
+ <br />
+ <br />
+ <xsl:if test="search/results/total_records_sum > 0">
+ <ol id="result">
+ <xsl:for-each select="search/results/results">
+ <li>
+ <div class="header">
+ <a
class="bui_single_view_link"><xsl:attribute name="href"><xsl:value-of
select="link"/></xsl:attribute><xsl:value-of select="name"/></a>
+ (<xsl:value-of
select="php:function('lang', string(type))"/>)
+ </div>
+ <div class="details">
+ <div>
+ <dl>
+ <dt><h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4></dt>
+ <dd class="description">
+ <xsl:variable
name="tag_stripped_description">
+ <xsl:call-template
name="strip-tags">
+ <xsl:with-param
name="text" select="description"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="string-length($tag_stripped_description) > 1">
+ <xsl:choose>
+ <xsl:when
test="string-length($tag_stripped_description) > 100">
+ <xsl:value-of
select="substring($tag_stripped_description, 0, 97)"/>...
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="$tag_stripped_description"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="php:function('lang', 'No description yet')" />
+ </xsl:otherwise>
+ </xsl:choose>
+ <div id="{img_container}"/>
+ <!--script
type="text/javascript">
+
YAHOO.util.Event.addListener(window, "load", function() {
+
JqueryPortico.booking.inlineImages('<xsl:value-of select="img_container"/>',
'<xsl:value-of select="img_url"/>');
+ });
+ </script-->
+ </dd>
+ <xsl:if
test="string-length(homepage) > 1">
+ <dt><h4><xsl:value-of
select="php:function('lang', 'Homepage')" /></h4></dt>
+ <dd class="description">
+ <a><xsl:attribute
name="href"><xsl:value-of select="homepage"/></xsl:attribute><xsl:value-of
select="homepage"/></a>
+ </dd>
+ </xsl:if>
+ </dl>
+ </div>
+ <div class="clr"></div>
+ </div>
+ </li>
+ </xsl:for-each>
+ </ol>
+ </xsl:if>
+ </div>
+ </xsl:if>
+ </div>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14332],
Saul <=