[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14126] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14126] fixing forms |
|
Date: |
Tue, 06 Oct 2015 23:51:29 +0000 |
Revision: 14126
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14126
Author: psaul
Date: 2015-10-06 23:51:28 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
branches/dev-syncromind/booking/templates/base/allocation_new_preview.xsl
branches/dev-syncromind/booking/templates/base/booking.xsl
branches/dev-syncromind/booking/templates/base/booking_delete.xsl
branches/dev-syncromind/booking/templates/base/booking_delete_preview.xsl
branches/dev-syncromind/booking/templates/base/booking_edit.xsl
branches/dev-syncromind/booking/templates/base/booking_new.xsl
branches/dev-syncromind/booking/templates/base/booking_new_preview.xsl
branches/dev-syncromind/booking/templates/base/building.xsl
branches/dev-syncromind/booking/templates/base/building_form.xsl
branches/dev-syncromind/booking/templates/base/document_form.xsl
branches/dev-syncromind/booking/templates/base/event_edit.xsl
branches/dev-syncromind/booking/templates/base/event_mail_settings.xsl
branches/dev-syncromind/booking/templates/base/event_new.xsl
branches/dev-syncromind/booking/templates/base/permission_form.xsl
branches/dev-syncromind/booking/templates/base/season.xsl
branches/dev-syncromind/booking/templates/base/season_boundaries.xsl
branches/dev-syncromind/booking/templates/base/season_new.xsl
Modified:
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
===================================================================
---
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -1,7 +1,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div id="content">
-
- <xsl:call-template name="msgbox"/>
+ <xsl:call-template name="msgbox"/>
<form action="" method="POST" class="pure-form pure-form-aligned"
name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
Modified:
branches/dev-syncromind/booking/templates/base/allocation_new_preview.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_new_preview.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/allocation_new_preview.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -1,65 +1,66 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <!--div id="content"-->
- <dl class="form">
+ <!--dl class="form">
<dt class="heading"><xsl:value-of select="php:function('lang', 'New
Allocation')"/></dt>
- </dl>
+ </dl-->
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
+ <!-- <xsl:call-template name="xmlsource"/> -->
- <!-- <xsl:call-template name="xmlsource"/> -->
+ <form action="" method="POST">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="allocation/tabs"/>
+ <div id="allocation_new" class="booking-container">
+ <input type="hidden" name="organization_name"
value="{allocation/organization_name}"/>
+ <input type="hidden" name="organization_id"
value="{allocation/organization_id}"/>
+ <input type="hidden" name="building_name"
value="{allocation/building_name}"/>
+ <input type="hidden" name="building_id"
value="{allocation/building_id}"/>
+ <input type="hidden" name="from_" value="{from_date}"/>
+ <input type="hidden" name="to_" value="{to_date}"/>
+ <input type="hidden" name="weekday" value="{weekday}"/>
+ <input type="hidden" name="building_id"
value="{allocation/building_id}"/>
+ <input type="hidden" name="cost" value="{allocation/cost}"/>
+ <input type="hidden" name="season_id"
value="{allocation/season_id}"/>
+ <input type="hidden" name="field_building_id"
value="{allocation/building_id}"/>
+ <input type="hidden" name="step" value="{step}" />
+ <input type="hidden" name="repeat_until"
value="{repeat_until}" />
+ <input type="hidden" name="field_interval" value="{interval}"
/>
+ <input type="hidden" name="outseason" value="{outseason}" />
+ <xsl:for-each select="allocation/resources">
+ <input type="hidden" name="resources[]" value="{.}" />
+ </xsl:for-each>
- <form action="" method="POST">
- <input type="hidden" name="organization_name"
value="{allocation/organization_name}"/>
- <input type="hidden" name="organization_id"
value="{allocation/organization_id}"/>
- <input type="hidden" name="building_name"
value="{allocation/building_name}"/>
- <input type="hidden" name="building_id"
value="{allocation/building_id}"/>
- <input type="hidden" name="from_" value="{from_date}"/>
- <input type="hidden" name="to_" value="{to_date}"/>
- <input type="hidden" name="weekday" value="{weekday}"/>
- <input type="hidden" name="building_id"
value="{allocation/building_id}"/>
- <input type="hidden" name="cost"
value="{allocation/cost}"/>
- <input type="hidden" name="season_id"
value="{allocation/season_id}"/>
- <input type="hidden" name="field_building_id"
value="{allocation/building_id}"/>
- <input type="hidden" name="step" value="{step}" />
- <input type="hidden" name="repeat_until"
value="{repeat_until}" />
- <input type="hidden" name="field_interval"
value="{interval}" />
- <input type="hidden" name="outseason"
value="{outseason}" />
- <xsl:for-each select="allocation/resources">
- <input type="hidden" name="resources[]"
value="{.}" />
- </xsl:for-each>
+ <h4><xsl:value-of select="php:function('lang', 'Allocations
that can be created')" /></h4>
+ <div class="allocation-list">
+ <xsl:for-each select="valid_dates">
+ <li><xsl:value-of select="from_"/> - <xsl:value-of
select="to_"/></li>
+ </xsl:for-each>
+ </div>
- <h4><xsl:value-of select="php:function('lang',
'Allocations that can be created')" /></h4>
- <div class="allocation-list">
- <xsl:for-each select="valid_dates">
- <li>
- <xsl:value-of select="from_"/>
- <xsl:value-of select="to_"/>
- </li>
- </xsl:for-each>
- </div>
+ <h4><xsl:value-of select="php:function('lang', 'Allocations
with existing allocations or bookings (%1)', count(result/invalid[from_]))"
/></h4>
+ <div class="allocation-list">
+ <xsl:for-each select="invalid_dates">
+ <li><xsl:value-of select="from_"/> - <xsl:value-of
select="to_"/></li>
+ </xsl:for-each>
+ </div>
+ <div class="form-buttons">
+ <input type="submit" name="create" class="pure-button
pure-button-primary">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')" /></xsl:attribute>
+ </input>
+ <a class="cancel pure-button pure-button-primary">
+ <xsl:attribute name="href"><xsl:value-of
select="allocation/cancel_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Cancel')"
/>
+ </a>
+ </div>
+ </div>
+ </div>
+ </form>
- <h4><xsl:value-of select="php:function('lang',
'Allocations with existing allocations or bookings (%1)',
count(result/invalid[from_]))" /></h4>
- <div class="allocation-list">
- <xsl:for-each select="invalid_dates">
- <li>
- <xsl:value-of select="from_"/>
- <xsl:value-of select="to_"/>
- </li>
- </xsl:for-each>
- </div>
- <div class="form-buttons">
- <input type="submit" name="create">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')" /></xsl:attribute>
- </input>
- <a class="cancel">
- <xsl:attribute name="href"><xsl:value-of
select="allocation/cancel_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Cancel')" />
- </a>
- </div>
- </form>
-
- </div>
+ <!--/div-->
<script type="text/javascript">
- YAHOO.booking.initialSelection = <xsl:value-of
select="allocation/resources_json"/>;
+ var initialSelection = <xsl:value-of
select="allocation/resources_json"/>;
</script>
</xsl:template>
<xsl:template name="xmlsource">
Modified: branches/dev-syncromind/booking/templates/base/booking.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking.xsl 2015-10-06
00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/booking.xsl 2015-10-06
23:51:28 UTC (rev 14126)
@@ -1,116 +1,59 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content"-->
- <!--ul class="pathway">
- <li><a href="{booking/bookings_link}"><xsl:value-of
select="php:function('lang', 'Bookings')" /></a></li>
- <li>#<xsl:value-of select="booking/id"/> (<xsl:value-of
select="booking/activity_name"/>)</li>
- </ul-->
-
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
- <input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="booking/tabs"/>
- <div id="booking">
- <fieldset>
-
- <h1>
- #<xsl:value-of select="booking/id"/>
(<xsl:value-of select="booking/activity_name"/>)
- </h1>
-
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
- </label>
- <xsl:value-of
select="php:function('pretty_timestamp', booking/from_)"/>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'To')" /></h4>
- </label>
- <xsl:value-of
select="php:function('pretty_timestamp', booking/to_)"/>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Cost')" /></h4>
- </label>
- <xsl:value-of select="booking/cost"/>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
- </label>
- <xsl:value-of select="booking/season_name"/>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Group')" /></h4>
- </label>
- <xsl:value-of select="booking/group_name"/>
- </div>
- <div class="pure-control-group">
- <label style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Resources')" /></h4>
- </label>
- <div id="resources_container"
style="display:inline-block;"></div>
- </div>
- </fieldset>
- </div>
+ <xsl:call-template name="msgbox"/>
+ <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes" select="booking/tabs"/>
+ <div id="booking" class="booking-container">
+ <fieldset>
+ <h1>#<xsl:value-of select="booking/id"/> (<xsl:value-of
select="booking/activity_name"/>)</h1>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'From')" /></label>
+ <xsl:value-of select="php:function('pretty_timestamp',
booking/from_)"/>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'To')" /></label>
+ <xsl:value-of select="php:function('pretty_timestamp',
booking/to_)"/>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Cost')" /></label>
+ <xsl:value-of select="booking/cost"/>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Season')" /></label>
+ <xsl:value-of select="booking/season_name"/>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Group')" /></label>
+ <xsl:value-of select="booking/group_name"/>
+ </div>
+ <div class="pure-control-group">
+ <label style="vertical-align:top;"><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
+ <div id="resources_container"
style="display:inline-block;"></div>
+ </div>
+ </fieldset>
</div>
- </form>
- <div class="form-buttons">
- <xsl:if test="booking/permission/write">
- <button>
- <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="booking/edit_link"/>"</xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Edit')" />
- </button>
- <button>
- <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="booking/delete_link"/>"</xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Delete
booking')" />
- </button>
- </xsl:if>
</div>
- <!--/div-->
-<script type="text/javascript">
- var resourceIds = '<xsl:value-of select="booking/resource_ids"/>';
- var lang = <xsl:value-of select="php:function('js_lang', 'Name', 'Resource
Type')"/>;
- <![CDATA[
- var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
- ]]>
- var colDefsResources = [{key: 'name', label: lang['Name'], formatter:
genericLink}, {key: 'type', label: lang['Resource Type']}];
- createTable('resources_container',resourcesURL,colDefsResources);
-
- /*
- $.get(resourcesURL, function(resourcesData){
- var resourcesBody = '';
- var resourcesTableClass = "pure-table";
- if (resourcesData.data.length === 0){
- resourcesBody = '<tr><td colspan="2">'+lang['No records
found']+'</td></tr>';
- }else{
- resourcesTableClass = "pure-table pure-table-striped";
- $.each(resourcesData.data , function(index,value){
- <![CDATA[
- resourcesBody += '<tr><td><a
href='+value.link+'>'+value.name+'</a></td><td>'+value.type+'</td></tr>';
- ]]>
- });
- }
+ </form>
+ <div class="form-buttons">
+ <xsl:if test="booking/permission/write">
+ <button class="pure-button pure-button-primary">
+ <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="booking/edit_link"/>"</xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Edit')" />
+ </button>
+ <button class="pure-button pure-button-primary">
+ <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="booking/delete_link"/>"</xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Delete booking')"
/>
+ </button>
+ </xsl:if>
+ </div>
+ <script type="text/javascript">
+ var resourceIds = '<xsl:value-of select="booking/resource_ids"/>';
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
<![CDATA[
- var resourcesTable = '<table
class="'+resourcesTableClass+'"><thead><tr><th>'+lang['Name']+'</th><th>'+lang['Resource
Type']+'</th></tr></thead><tbody>'+resourcesBody+'</tbody></table>';
+ var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
]]>
- $('#resources_container').html(resourcesTable);
- });
- */
-</script>
-<!--script type="text/javascript">
- var resourceIds = '<xsl:value-of select="booking/resource_ids"/>';
- var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
- <![CDATA[
-YAHOO.util.Event.addListener(window, "load", function() {
- var url =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
- var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.booking.formatLink}, {key: 'type', label: lang['Resource Type']}];
- YAHOO.booking.inlineTableHelper('resources_container', url, colDefs);
-});
-]]>
-</script-->
-
+ var colDefsResources = [{key: 'name', label: lang['Name'], formatter:
genericLink}, {key: 'type', label: lang['Resource Type']}];
+ createTable('resources_container',resourcesURL,colDefsResources);
+ </script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/booking_delete.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_delete.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/booking_delete.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -1,12 +1,11 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
<fieldset>
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="booking/tabs"/>
- <div id="booking_delete">
+ <div id="booking_delete" class="booking-container">
<div class="heading">
<legend><h3><xsl:value-of select="php:function('lang',
'Delete Booking')"/></h3></legend>
</div>
@@ -24,34 +23,25 @@
<input type="hidden" name="to_" value="{booking/to_}"
/>
</div>
<div class="pure-control-group">
- <label for="field_building">
- <h4><xsl:value-of select="php:function('lang',
'Building')" /></h4>
- </label>
+ <label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')" /></label>
<div style="display:inline-block;">
<xsl:value-of select="booking/building_name"/>
</div>
</div>
-
<div class="pure-control-group">
- <label for="field_group">
- <h4><xsl:value-of select="php:function('lang',
'Group')"/></h4>
- </label>
+ <label for="field_group"><xsl:value-of
select="php:function('lang', 'Group')"/></label>
<div style="display:inline-block;">
<xsl:value-of select="booking/group_name"/>
</div>
</div>
<div class="pure-control-group">
- <label for="field_season">
- <h4><xsl:value-of select="php:function('lang',
'Season')"/></h4>
- </label>
+ <label for="field_season"><xsl:value-of
select="php:function('lang', 'Season')"/></label>
<div style="display:inline-block;">
<xsl:value-of select="booking/season_name"/>
</div>
</div>
<div class="pure-control-group">
- <label for="field_repeat_until">
- <h4><xsl:value-of select="php:function('lang',
'Delete allocation also')" /></h4>
- </label>
+ <label for="field_repeat_until"><xsl:value-of
select="php:function('lang', 'Delete allocation also')" /></label>
<div style="display:inline-block;">
<label>
<input type="checkbox"
name="delete_allocation" id="delete_allocation">
@@ -62,27 +52,21 @@
<xsl:value-of select="php:function('lang',
'Delete allocations')" />
</label>
</div>
- </div>
+ </div>
<div class="pure-control-group">
- <label for="field_from">
- <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
- </label>
+ <label for="field_from"><xsl:value-of
select="php:function('lang', 'From')" /></label>
<div style="display:inline-block;">
<xsl:value-of select="booking/from_"/>
</div>
</div>
<div class="pure-control-group">
- <label for="field_to">
- <h4><xsl:value-of select="php:function('lang',
'To')"/></h4>
- </label>
+ <label for="field_to"><xsl:value-of
select="php:function('lang', 'To')"/></label>
<div style="display:inline-block;">
<xsl:value-of select="booking/to_"/>
</div>
</div>
<div class="pure-control-group">
- <label for="field_repeat_until"
style="vertical-align:top;">
- <h4><xsl:value-of select="php:function('lang',
'Recurring allocation deletion')" /></h4>
- </label>
+ <label for="field_repeat_until"
style="vertical-align:top;"><xsl:value-of select="php:function('lang',
'Recurring allocation deletion')" /></label>
<div style="display:inline-block;">
<div style="display:inline-block;">
<label style="display: block
!important;text-align: left !important;">
@@ -110,10 +94,8 @@
</div>
</div>
<div class="pure-control-group">
- <label for="field_interval">
- <h4><xsl:value-of select="php:function('lang',
'Interval')" /></h4>
- </label>
- <div style="display: inline-block;">
+ <label for="field_interval"><xsl:value-of
select="php:function('lang', 'Interval')" /></label>
+ <div style="display: inline-block;">
<xsl:value-of select="../field_interval" />
<select id="field_interval" name="field_interval">
<option value="1">
@@ -141,7 +123,7 @@
<xsl:value-of select="php:function('lang',
'4 weeks')" />
</option>
</select>
- </div>
+ </div>
</div>
</div>
</div>
@@ -150,7 +132,7 @@
<input class="pure-button pure-button-primary" type="submit">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Delete')"/></xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="booking/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')"/>
</a>
@@ -160,6 +142,6 @@
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')"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
</script>
</xsl:template>
Modified:
branches/dev-syncromind/booking/templates/base/booking_delete_preview.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_delete_preview.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/booking_delete_preview.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -1,96 +1,88 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
-
- <dl class="form">
- <dt class="heading"><xsl:value-of select="php:function('lang', 'Delete
Booking')"/></dt>
- </dl>
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
-
- <!-- <xsl:call-template name="xmlsource"/> -->
-
- <form action="" method="POST">
- <input type="hidden" name="season_id"
value="{booking/season_id}"/>
- <input type="hidden" name="building_id"
value="{booking/building_id}"/>
- <input type="hidden" name="building_name"
value="{booking/building_name}"/>
- <input type="hidden" name="organization_id"
value="{booking/organization_id}"/>
- <input type="hidden" name="organization_name"
value="{booking/organization_name}"/>
- <input type="hidden" name="allocation_id"
value="{booking/allocation_id}"/>
- <input type="hidden" name="noallocation"
value="{noallocation}" />
- <input type="hidden" name="delete_allocation"
value="{delete_allocation}" />
- <input type="hidden" name="step" value="{step}" />
- <input type="hidden" name="from_" value="{from_date}" />
- <input type="hidden" name="to_" value="{to_date}" />
- <input type="hidden" name="cost" value="{booking/cost}"
/>
- <input type="hidden" name="repeat_until"
value="{repeat_until}" />
- <input type="hidden" name="field_interval"
value="{interval}" />
- <input type="hidden" name="recurring"
value="{recurring}" />
- <input type="hidden" name="outseason"
value="{outseason}" />
- <input type="hidden" name="activity_id"
value="{booking/activity_id}" />
- <input type="hidden" name="group_id"
value="{booking/group_id}" />
- <xsl:for-each select="booking/audience">
- <input type="hidden" name="audience[]"
value="{.}" />
- </xsl:for-each>
- <xsl:for-each select="booking/resources">
- <input type="hidden" name="resources[]"
value="{.}" />
- </xsl:for-each>
- <xsl:for-each select="booking/agegroups">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <input type="hidden">
- <xsl:attribute
name="name">male[<xsl:value-of select="agegroup_id"/>]</xsl:attribute>
- <xsl:attribute
name="value"><xsl:value-of select="male"/></xsl:attribute>
- </input>
- <input type="hidden">
- <xsl:attribute
name="name">female[<xsl:value-of select="agegroup_id"/>]</xsl:attribute>
- <xsl:attribute
name="value"><xsl:value-of select="female"/></xsl:attribute>
- </input>
- </xsl:for-each>
-
-
- <h4><xsl:value-of select="php:function('lang',
'Bookings to be deleted')" /></h4>
- <div class="allocation-list">
- <xsl:for-each select="valid_dates">
- <li>
- <xsl:value-of select="from_"/>
- <xsl:value-of select="to_"/>
- </li>
- </xsl:for-each>
- </div>
- <xsl:if test="delete_allocation='on'">
- <h4><xsl:value-of select="php:function('lang',
'Allocations that is going to be deleted')" /></h4>
- <div class="allocation-list">
- <xsl:for-each select="allocation_delete">
- <li>
- <xsl:value-of select="from_"/>
- <xsl:value-of select="to_"/>
- </li>
- </xsl:for-each>
- </div>
-
- <h4><xsl:value-of select="php:function('lang',
'Allocations with still existing bookings (%1)',
count(allocation_keep[from_]))" /></h4>
- <div class="allocation-list">
- <xsl:for-each select="allocation_keep">
- <li>
- <xsl:value-of select="from_"/>
- <xsl:value-of select="to_"/>
- </li>
- </xsl:for-each>
- </div>
- </xsl:if>
- <div class="form-buttons">
- <input type="submit" name="delete">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Delete')" /></xsl:attribute>
- </input>
- <a class="cancel">
- <xsl:attribute name="href"><xsl:value-of
select="season/wtemplate_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Cancel')" />
- </a>
- </div>
- </form>
-
- </div>
+ <form action="" method="POST" class="pure-form pure-form-aligned"
name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes" select="booking/tabs"/>
+ <div id="booking_delete" class="booking-container">
+ <input type="hidden" name="season_id"
value="{booking/season_id}"/>
+ <input type="hidden" name="building_id"
value="{booking/building_id}"/>
+ <input type="hidden" name="building_name"
value="{booking/building_name}"/>
+ <input type="hidden" name="organization_id"
value="{booking/organization_id}"/>
+ <input type="hidden" name="organization_name"
value="{booking/organization_name}"/>
+ <input type="hidden" name="allocation_id"
value="{booking/allocation_id}"/>
+ <input type="hidden" name="noallocation"
value="{noallocation}" />
+ <input type="hidden" name="delete_allocation"
value="{delete_allocation}" />
+ <input type="hidden" name="step" value="{step}" />
+ <input type="hidden" name="from_" value="{from_date}" />
+ <input type="hidden" name="to_" value="{to_date}" />
+ <input type="hidden" name="cost" value="{booking/cost}" />
+ <input type="hidden" name="repeat_until"
value="{repeat_until}" />
+ <input type="hidden" name="field_interval" value="{interval}"
/>
+ <input type="hidden" name="recurring" value="{recurring}" />
+ <input type="hidden" name="outseason" value="{outseason}" />
+ <input type="hidden" name="activity_id"
value="{booking/activity_id}" />
+ <input type="hidden" name="group_id"
value="{booking/group_id}" />
+ <xsl:for-each select="booking/audience">
+ <input type="hidden" name="audience[]" value="{.}" />
+ </xsl:for-each>
+ <xsl:for-each select="booking/resources">
+ <input type="hidden" name="resources[]" value="{.}" />
+ </xsl:for-each>
+ <xsl:for-each select="booking/agegroups">
+ <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
+ <input type="hidden">
+ <xsl:attribute name="name">male[<xsl:value-of
select="agegroup_id"/>]</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="male"/></xsl:attribute>
+ </input>
+ <input type="hidden">
+ <xsl:attribute name="name">female[<xsl:value-of
select="agegroup_id"/>]</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="female"/></xsl:attribute>
+ </input>
+ </xsl:for-each>
+ <h4><xsl:value-of select="php:function('lang', 'Bookings to be
deleted')" /></h4>
+ <div class="allocation-list">
+ <xsl:for-each select="valid_dates">
+ <li>
+ <xsl:value-of select="from_"/> - <xsl:value-of
select="to_"/>
+ </li>
+ </xsl:for-each>
+ </div>
+ <xsl:if test="delete_allocation='on'">
+ <h4><xsl:value-of select="php:function('lang',
'Allocations that is going to be deleted')" /></h4>
+ <div class="allocation-list">
+ <xsl:for-each select="allocation_delete">
+ <li>
+ <xsl:value-of select="from_"/> - <xsl:value-of
select="to_"/>
+ </li>
+ </xsl:for-each>
+ </div>
+ <h4><xsl:value-of select="php:function('lang',
'Allocations with still existing bookings (%1)',
count(allocation_keep[from_]))" /></h4>
+ <div class="allocation-list">
+ <xsl:for-each select="allocation_keep">
+ <li>
+ <xsl:value-of select="from_"/> - <xsl:value-of
select="to_"/>
+ </li>
+ </xsl:for-each>
+ </div>
+ </xsl:if>
+ <div class="form-buttons">
+ <input type="submit" name="delete" class="pure-button
pure-button-primary">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Delete')" /></xsl:attribute>
+ </input>
+ <a class="cancel pure-button pure-button-primary">
+ <xsl:attribute name="href"><xsl:value-of
select="season/wtemplate_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Cancel')"
/>
+ </a>
+ </div>
+ </div>
+ </div>
+ </form>
<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 lang = <xsl:value-of select="php:function('js_lang',
'Resource Type')"/>;
+ 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', 'Name',
'Resource Type')"/>;
</script>
</xsl:template>
<xsl:template name="xmlsource">
Modified: branches/dev-syncromind/booking/templates/base/booking_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_edit.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/booking_edit.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -2,40 +2,25 @@
<style type="text/css">
#agegroup td {padding: 0 0.3em;}
</style>
- <!--div id="content"-->
-
- <!--ul class="pathway">
- <li><xsl:value-of select="php:function('lang', 'Bookings')" /></li>
- <li>#<xsl:value-of select="booking/id"/></li>
- </ul-->
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
-
<form action="" method="POST" id='form' class="pure-form
pure-form-stacked" name="form">
<input type="hidden" name="allocation_id"
value="{booking/allocation_id}"/>
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes" select="booking/tabs"/>
- <div id="booking_edit">
- <fieldset>
- <h1>
- #<xsl:value-of select="booking/id"/>
- </h1>
-
+ <div id="booking_edit" class="booking-container">
+ <fieldset>
+ <h1>#<xsl:value-of select="booking/id"/></h1>
<div class="pure-g">
<div class="pure-u-1">
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Application')"/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Application')"/></label>
<xsl:if test="booking/application_id != ''">
<a
href="{booking/application_link}">#<xsl:value-of
select="booking/application_id"/></a>
</xsl:if>
</div>
<div class="pure-control-group">
- <label for="field_active">
- <h4><xsl:value-of
select="php:function('lang', 'Active')"/></h4>
- </label>
+ <label for="field_active"><xsl:value-of
select="php:function('lang', 'Active')"/></label>
<select id="field_active" name="active">
<option value="1">
<xsl:if test="booking/active=1">
@@ -52,9 +37,7 @@
</select>
</div>
<div class="pure-control-group">
- <label for="field_activity">
- <h4><xsl:value-of
select="php:function('lang', 'Activity')" /></h4>
- </label>
+ <label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
<select name="activity_id" id="field_activity">
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
@@ -70,45 +53,32 @@
</div>
</div>
</div>
-
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
<div class="heading">
<legend> </legend>
</div>
<div class="pure-control-group">
- <label for="field_building_name">
- <h4><xsl:value-of
select="php:function('lang', 'Building')"/></h4>
- </label>
- <!--div class="autocomplete"-->
+ <label for="field_building_name"><xsl:value-of
select="php:function('lang', 'Building')"/></label>
<input id="field_building_id"
name="building_id" type="hidden" value="{booking/building_id}"/>
<input id="field_building_name"
name="building_name" type="text" value="{booking/building_name}"/>
<div id="building_container"></div>
- <!--/div-->
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Season')"/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Season')"/></label>
<div id="season_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Resources')"/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Resources')"/></label>
<div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
- </div>
-
+ </div>
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
<div class="heading">
<legend> </legend>
</div>
<div class="pure-control-group">
- <label for="field_org_name">
- <h4><xsl:value-of
select="php:function('lang', 'Organization')"/></h4>
- </label>
- <!--div class="autocomplete"-->
+ <label for="field_org_name"><xsl:value-of
select="php:function('lang', 'Organization')"/></label>
<input id="field_org_id"
name="organization_id" type="hidden">
<xsl:attribute name="value"><xsl:value-of
select="booking/organization_id"/></xsl:attribute>
</input>
@@ -116,66 +86,44 @@
<xsl:attribute name="value"><xsl:value-of
select="booking/organization_name"/></xsl:attribute>
</input>
<div id="org_container"></div>
- <!--/div-->
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Group')"/></h4>
- </label>
- <div id="group_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
+ <label><xsl:value-of
select="php:function('lang', 'Group')"/></label>
+ <div id="group_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
<div class="pure-control-group">
- <label for="field_from">
- <h4><xsl:value-of
select="php:function('lang', 'From')"/></h4>
- </label>
+ <label for="field_from"><xsl:value-of
select="php:function('lang', 'From')"/></label>
<input class="datetime" id="field_from"
name="from_" type="text" style="display:inline-block;">
<xsl:attribute name="value"><xsl:value-of
select="booking/from_"/></xsl:attribute>
</input>
- <!--div class="datetime-picker">
- <input id="field_from" name="from_"
type="text">
- <xsl:attribute name="value"><xsl:value-of
select="booking/from_"/></xsl:attribute>
- </input>
- </div-->
</div>
<div class="pure-control-group">
- <label for="field_to">
- <h4><xsl:value-of
select="php:function('lang', 'To')"/></h4>
- </label>
+ <label for="field_to"><xsl:value-of
select="php:function('lang', 'To')"/></label>
<input class="datetime" id="field_to"
name="to_" type="text" style="display:inline-block;">
- <xsl:attribute
name="value"><xsl:value-of select="booking/to_"/></xsl:attribute>
- </input>
- <!--div class="datetime-picker">
- <input id="field_to" name="to_" type="text">
<xsl:attribute name="value"><xsl:value-of
select="booking/to_"/></xsl:attribute>
</input>
- </div-->
</div>
<div class="pure-control-group">
- <label for="field_cost">
- <h4><xsl:value-of
select="php:function('lang', 'Cost')" /></h4>
- </label>
+ <label for="field_cost"><xsl:value-of
select="php:function('lang', 'Cost')" /></label>
<input id="field_cost" name="cost" type="text"
value="{booking/cost}"/>
</div>
</div>
-
<div class="pure-u-1 pure-u-md-1 pure-u-lg-1-3">
<div class="heading">
<legend></legend>
</div>
<div class="pure-g">
<div class="pure-control-group pure-u-1
pure-u-md-1-2 pure-u-lg-1">
- <label for="field_from">
- <h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4>
- </label>
+ <label for="field_from"><xsl:value-of
select="php:function('lang', 'Target audience')" /></label>
<ul
style="list-style:none;padding-left:10px;">
<xsl:for-each select="audience">
<li>
<label>
<input type="checkbox"
name="audience[]">
- <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
- <xsl:if
test="../booking/audience=id">
-
<xsl:attribute name="checked">checked</xsl:attribute>
- </xsl:if>
+ <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
+ <xsl:if
test="../booking/audience=id">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
</input>
<xsl:value-of
select="name"/>
</label>
@@ -185,9 +133,7 @@
</div>
<div class="pure-control-group pure-u-1
pure-u-md-1-2 pure-u-lg-1">
<div class="pure-control-group">
- <label for="field_from">
- <h4><xsl:value-of
select="php:function('lang', 'Number of participants')" /></h4>
- </label>
+ <label for="field_from"><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label>
<table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr>
@@ -217,19 +163,15 @@
</xsl:for-each>
</tbody>
</table>
- </div>
+ </div>
<div class="pure-control-group">
- <label for="sms_total">
- <h4><xsl:value-of
select="php:function('lang', 'SMS total')" /></h4>
- </label>
+ <label for="sms_total"><xsl:value-of
select="php:function('lang', 'SMS total')" /></label>
<input type="text" name="sms_total"
id="sms_total">
<xsl:attribute
name="value"><xsl:value-of select="booking/sms_total"/></xsl:attribute>
</input>
- </div>
+ </div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'send reminder for participants statistics')"
/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'send reminder for participants statistics')"
/></label>
<select name="reminder"
id="field_reminder">
<xsl:choose>
<xsl:when
test="booking/reminder = 1">
@@ -257,37 +199,12 @@
<option value="3"
selected="selected"><xsl:value-of select="php:function('lang', 'Reminder sent.
Not responded to')" /></option>
</xsl:when>
</xsl:choose>
- <!--xsl:if test="booking/reminder
= 1">
- <option value="1"
selected="selected"><xsl:value-of select="php:function('lang', 'Send
reminder')" /></option>
- <option
value="0"><xsl:value-of select="php:function('lang', 'Do not send reminder')"
/></option>
- <option
value="2"><xsl:value-of select="php:function('lang', 'User has responded to the
reminder')" /></option>
- <option
value="3"><xsl:value-of select="php:function('lang', 'Reminder sent. Not
responded to')" /></option>
- </xsl:if>
- <xsl:if test="booking/reminder =
0">
- <option
value="1"><xsl:value-of select="php:function('lang', 'Send reminder')"
/></option>
- <option value="0"
selected="selected"><xsl:value-of select="php:function('lang', 'Do not send
reminder')" /></option>
- <option
value="2"><xsl:value-of select="php:function('lang', 'User has responded to the
reminder')" /></option>
- <option
value="3"><xsl:value-of select="php:function('lang', 'Reminder sent. Not
responded to')" /></option>
- </xsl:if>
- <xsl:if test="booking/reminder =
2">
- <option
value="1"><xsl:value-of select="php:function('lang', 'Send reminder')"
/></option>
- <option
value="0"><xsl:value-of select="php:function('lang', 'Do not send reminder')"
/></option>
- <option value="2"
selected="selected"><xsl:value-of select="php:function('lang', 'User has
responded to the reminder')" /></option>
- <option
value="3"><xsl:value-of select="php:function('lang', 'Reminder sent. Not
responded to')" /></option>
- </xsl:if>
- <xsl:if test="booking/reminder =
3">
- <option
value="1"><xsl:value-of select="php:function('lang', 'Send reminder')"
/></option>
- <option
value="0"><xsl:value-of select="php:function('lang', 'Do not send reminder')"
/></option>
- <option
value="2"><xsl:value-of select="php:function('lang', 'User has responded to the
reminder')" /></option>
- <option value="3"
selected="selected"><xsl:value-of select="php:function('lang', 'Reminder sent.
Not responded to')" /></option>
- </xsl:if-->
</select>
- </div>
+ </div>
</div>
</div>
</div>
</div>
-
<div class="pure-g">
<div class="pure-u-1">
<div class="heading">
@@ -295,38 +212,30 @@
</div>
<div class="pure-control-group">
<label for="field_mail">
- <h4><xsl:value-of
select="php:function('lang', 'Inform contact persons')" /></h4>
+ <xsl:value-of select="php:function('lang',
'Inform contact persons')" />
</label>
<xsl:value-of select="php:function('lang',
'Text written in the text area below will be sent as an email to all registered
contact persons.')" />
<textarea id="field_mail" name="mail"
class="full-width"></textarea>
</div>
</div>
</div>
-
</fieldset>
</div>
</div>
<div class="form-buttons">
<input type="submit" class="pure-button pure-button-primary">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
- </input>
- <a class="cancel">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
+ </input>
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="booking/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')"/>
</a>
</div>
</form>
- <!--/div-->
<script>
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','Name',
'Resource Type')"/>;
</script>
- <!--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 lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
- </script-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/booking_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_new.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/booking_new.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -2,25 +2,19 @@
<style type="text/css">
#agegroup td {padding: 0 0.3em;}
</style>
- <!--div id="content"-->
-
- <!--dl class="form">
- <dt class="heading"><xsl:value-of select="php:function('lang', 'New
Booking')"/></dt>
- </dl-->
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST" id='form' class="pure-form
pure-form-stacked" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes" select="booking/tabs"/>
- <div id="booking_new">
+ <div id="booking_new" class="booking-container">
<fieldset>
<input type="hidden" name="application_id"
value="{booking/application_id}"/>
<div class="pure-g pure-form pure-form-aligned">
<div class="pure-u-1">
<div class="pure-control-group">
- <label style="width:auto;"
for="field_activity"><h4><xsl:value-of select="php:function('lang',
'Activity')" /></h4></label>
+ <label style="width:auto;"
for="field_activity"><xsl:value-of select="php:function('lang', 'Activity')"
/></label>
<select name="activity_id" id="field_activity">
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
@@ -39,40 +33,28 @@
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
<legend></legend>
- <div class="pure-control-group">
- <label for="field_building_name">
- <h4><xsl:value-of
select="php:function('lang', 'Building')"/></h4>
- </label>
- <!--div class="autocomplete"-->
+ <div class="pure-control-group">
+ <label for="field_building_name"><xsl:value-of
select="php:function('lang', 'Building')"/></label>
<input id="field_building_id"
name="building_id" type="hidden">
<xsl:attribute name="value"><xsl:value-of
select="booking/building_id"/></xsl:attribute>
</input>
<input id="field_building_name"
name="building_name" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
<xsl:attribute name="value"><xsl:value-of
select="booking/building_name"/></xsl:attribute>
</input>
- <!--div id="building_container"/>
- </div-->
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Season')"/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Season')"/></label>
<div id="season_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Resources')"/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Resources')"/></label>
<div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')"/></div>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
<legend></legend>
<div class="pure-control-group">
- <label for="field_org_name">
- <h4><xsl:value-of
select="php:function('lang', 'Organization')"/></h4>
- </label>
- <!--div class="autocomplete"-->
+ <label for="field_org_name"><xsl:value-of
select="php:function('lang', 'Organization')"/></label>
<input id="field_org_id"
name="organization_id" type="hidden">
<xsl:attribute name="value"><xsl:value-of
select="booking/organization_id"/></xsl:attribute>
</input>
@@ -80,22 +62,15 @@
<xsl:attribute name="value"><xsl:value-of
select="booking/organization_name"/></xsl:attribute>
</input>
<div id="org_container"></div>
- <!--/div-->
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Group')"/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Group')"/></label>
<div id="group_container"><xsl:value-of
select="php:function('lang', 'Select an organization first')"/></div>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'From')"/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'From')"/></label>
<input class="datetime pure-input-2-3"
id="start_date" name="from_" type="text" style="display:inline-block;">
- <xsl:attribute name="data-validation">
- <xsl:text>required</xsl:text>
- </xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="booking/from_"/></xsl:attribute>
</input>
<!--div class="datetime-picker"-->
<!--input id="field_from" name="from_"
type="text">
@@ -104,10 +79,10 @@
<!--/div-->
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'To')"/></h4>
- </label>
- <input class="datetime pure-input-2-3"
id="end_date" name="to_" type="text" style="display:inline-block;"></input>
+ <label><xsl:value-of
select="php:function('lang', 'To')"/></label>
+ <input class="datetime pure-input-2-3"
id="end_date" name="to_" type="text" style="display:inline-block;">
+ <xsl:attribute name="value"><xsl:value-of
select="booking/to_"/></xsl:attribute>
+ </input>
<!--div class="datetime-picker"-->
<!--input id="field_to" name="to_" type="text">
<xsl:attribute name="value"><xsl:value-of
select="booking/to_"/></xsl:attribute>
@@ -115,15 +90,11 @@
<!--/div-->
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Cost')" /></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Cost')" /></label>
<input id="field_cost" name="cost" type="text"
value="{booking/cost}"/>
</div>
<div class="pure-control-group">
- <label for="field_repeat_until">
- <h4><xsl:value-of
select="php:function('lang', 'Recurring booking')" /></h4>
- </label>
+ <label for="field_repeat_until"><xsl:value-of
select="php:function('lang', 'Recurring booking')" /></label>
</div>
<div class="pure-control-group">
<label>
@@ -153,12 +124,10 @@
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
- </input>
+ </input>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Interval')" /></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Interval')" /></label>
<xsl:value-of select="../field_interval" />
<select id="field_interval"
name="field_interval">
<option value="1">
@@ -192,9 +161,7 @@
<legend></legend>
<div class="pure-g">
<div class="pure-control-group pure-u-1
pure-u-md-1-2 pure-u-lg-1">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Target audience')" /></label>
<ul
style="list-style:none;padding-left:10px;">
<xsl:for-each select="audience">
<li>
@@ -212,9 +179,7 @@
</ul>
</div>
<div class="pure-control-group pure-u-1
pure-u-md-1-2 pure-u-lg-1">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Number of participants')" /></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label>
<table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr>
@@ -241,11 +206,9 @@
</td>
</tr>
</xsl:for-each>
- </tbody>
+ </tbody>
</table>
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'send reminder for participants statistics')"
/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'send reminder for participants statistics')"
/></label>
<select name="reminder"
id="field_reminder">
<xsl:choose>
<xsl:when test="booking/reminder =
1">
@@ -261,31 +224,24 @@
</div>
</div>
</div>
- </div>
- </fieldset>
+ </div>
+ </fieldset>
</div>
</div>
<div class="form-buttons">
<input type="submit" class="button pure-button
pure-button-primary">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')"/></xsl:attribute>
</input>
- <a class="cancel">
+ <a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="booking/cancel_link"/></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')"/>
</a>
</div>
</form>
- <!--/div-->
<script type="text/javascript">
season_id = '<xsl:value-of select="booking/season_id"/>';
group_id = '<xsl:value-of select="booking/group_id"/>';
initialSelection = <xsl:value-of select="booking/resources_json"/>;
- var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
</script>
- <!--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 lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
- </script-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/booking_new_preview.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_new_preview.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/booking_new_preview.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -1,86 +1,93 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <!--div id="content"-->
- <dl class="form">
+ <!--dl class="form">
<dt class="heading"><xsl:value-of select="php:function('lang', 'New
Booking')"/></dt>
- </dl>
+ </dl-->
<xsl:call-template name="msgbox"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
- <!-- <xsl:call-template name="xmlsource"/> -->
+ <!-- <xsl:call-template name="xmlsource"/> -->
- <form action="" method="POST">
- <input type="hidden" name="season_id"
value="{booking/season_id}"/>
- <input type="hidden" name="building_id"
value="{booking/building_id}"/>
- <input type="hidden" name="building_name"
value="{booking/building_name}"/>
- <input type="hidden" name="organization_id"
value="{booking/organization_id}"/>
- <input type="hidden" name="organization_name"
value="{booking/organization_name}"/>
- <input type="hidden" name="allocation_id"
value="{booking/allocation_id}"/>
- <input type="hidden" name="application_id"
value="{booking/application_id}"/>
- <input type="hidden" name="noallocation"
value="{noallocation}" />
- <input type="hidden" name="step" value="{step}" />
- <input type="hidden" name="from_" value="{from_date}" />
- <input type="hidden" name="to_" value="{to_date}" />
- <input type="hidden" name="cost" value="{booking/cost}"
/>
- <input type="hidden" name="repeat_until"
value="{repeat_until}" />
- <input type="hidden" name="field_interval"
value="{interval}" />
- <input type="hidden" name="recurring"
value="{recurring}" />
- <input type="hidden" name="outseason"
value="{outseason}" />
- <input type="hidden" name="activity_id"
value="{booking/activity_id}" />
- <input type="hidden" name="group_id"
value="{booking/group_id}" />
- <xsl:for-each select="booking/audience">
- <input type="hidden" name="audience[]"
value="{.}" />
- </xsl:for-each>
- <xsl:for-each select="booking/resources">
- <input type="hidden" name="resources[]"
value="{.}" />
- </xsl:for-each>
- <xsl:for-each select="booking/agegroups">
- <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <input type="hidden">
- <xsl:attribute
name="name">male[<xsl:value-of select="agegroup_id"/>]</xsl:attribute>
- <xsl:attribute
name="value"><xsl:value-of select="male"/></xsl:attribute>
- </input>
- <input type="hidden">
- <xsl:attribute
name="name">female[<xsl:value-of select="agegroup_id"/>]</xsl:attribute>
- <xsl:attribute
name="value"><xsl:value-of select="female"/></xsl:attribute>
- </input>
- </xsl:for-each>
+ <form action="" method="POST" id='form' class="pure-form
pure-form-stacked" name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes" select="booking/tabs"/>
+ <div id="booking_new" class="booking-container">
+ <input type="hidden" name="season_id"
value="{booking/season_id}"/>
+ <input type="hidden" name="building_id"
value="{booking/building_id}"/>
+ <input type="hidden" name="building_name"
value="{booking/building_name}"/>
+ <input type="hidden" name="organization_id"
value="{booking/organization_id}"/>
+ <input type="hidden" name="organization_name"
value="{booking/organization_name}"/>
+ <input type="hidden" name="allocation_id"
value="{booking/allocation_id}"/>
+ <input type="hidden" name="application_id"
value="{booking/application_id}"/>
+ <input type="hidden" name="noallocation"
value="{noallocation}" />
+ <input type="hidden" name="step" value="{step}" />
+ <input type="hidden" name="from_" value="{from_date}" />
+ <input type="hidden" name="to_" value="{to_date}" />
+ <input type="hidden" name="cost" value="{booking/cost}" />
+ <input type="hidden" name="repeat_until"
value="{repeat_until}" />
+ <input type="hidden" name="field_interval" value="{interval}"
/>
+ <input type="hidden" name="recurring" value="{recurring}" />
+ <input type="hidden" name="outseason" value="{outseason}" />
+ <input type="hidden" name="activity_id"
value="{booking/activity_id}" />
+ <input type="hidden" name="group_id"
value="{booking/group_id}" />
+ <xsl:for-each select="booking/audience">
+ <input type="hidden" name="audience[]" value="{.}" />
+ </xsl:for-each>
+ <xsl:for-each select="booking/resources">
+ <input type="hidden" name="resources[]" value="{.}" />
+ </xsl:for-each>
+ <xsl:for-each select="booking/agegroups">
+ <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
+ <input type="hidden">
+ <xsl:attribute name="name">male[<xsl:value-of
select="agegroup_id"/>]</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="male"/></xsl:attribute>
+ </input>
+ <input type="hidden">
+ <xsl:attribute name="name">female[<xsl:value-of
select="agegroup_id"/>]</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="female"/></xsl:attribute>
+ </input>
+ </xsl:for-each>
+ <h4>
+ <xsl:value-of select="php:function('lang', 'Bookings that
can be created')" />
+ </h4>
+ <div class="allocation-list">
+ <xsl:for-each select="valid_dates">
+ <li>
+ <xsl:value-of select="from_"/> - <xsl:value-of
select="to_"/>
+ </li>
+ </xsl:for-each>
+ </div>
- <h4><xsl:value-of select="php:function('lang',
'Bookings that can be created')" /></h4>
- <div class="allocation-list">
- <xsl:for-each select="valid_dates">
- <li>
- <xsl:value-of select="from_"/>
- <xsl:value-of select="to_"/>
- </li>
- </xsl:for-each>
- </div>
+ <h4><xsl:value-of select="php:function('lang', 'Allocations
colliding with existing bookings or allocations (%1)',
count(result/invalid[from_]))" /></h4>
+ <div class="allocation-list">
+ <xsl:for-each select="invalid_dates">
+ <li>
+ <xsl:value-of select="from_"/> - <xsl:value-of
select="to_"/>
+ </li>
+ </xsl:for-each>
+ </div>
+ <div class="form-buttons">
+ <input type="submit" name="create" class="pure-button
pure-button-primary">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')" /></xsl:attribute>
+ </input>
+ <a class="cancel pure-button pure-button-primary">
+ <xsl:attribute name="href"><xsl:value-of
select="season/wtemplate_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Cancel')"
/>
+ </a>
+ </div>
+ </div>
+ </div>
+ </form>
- <h4><xsl:value-of select="php:function('lang',
'Allocations colliding with existing bookings or allocations (%1)',
count(result/invalid[from_]))" /></h4>
- <div class="allocation-list">
- <xsl:for-each select="invalid_dates">
- <li>
- <xsl:value-of select="from_"/>
- <xsl:value-of select="to_"/>
- </li>
- </xsl:for-each>
- </div>
- <div class="form-buttons">
- <input type="submit" name="create">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')" /></xsl:attribute>
- </input>
- <a class="cancel">
- <xsl:attribute name="href"><xsl:value-of
select="season/wtemplate_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Cancel')" />
- </a>
- </div>
- </form>
-
- </div>
+ <!--/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 lang = <xsl:value-of select="php:function('js_lang',
'Resource Type')"/>;
+ season_id = '<xsl:value-of select="booking/season_id"/>';
+ group_id = '<xsl:value-of select="booking/group_id"/>';
+ initialSelection = <xsl:value-of select="booking/resources_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
</script>
</xsl:template>
<xsl:template name="xmlsource">
Modified: branches/dev-syncromind/booking/templates/base/building.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/building.xsl 2015-10-06
00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/building.xsl 2015-10-06
23:51:28 UTC (rev 14126)
@@ -1,36 +1,18 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content">
- <ul class="pathway">
- <li>
- <a>
- <xsl:attribute name="href"><xsl:value-of
select="building/buildings_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Buildings')" />
- </a>
- </li>
- <li>
-
- <xsl:value-of select="building/name"/>
- </li>
- </ul-->
-
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
-
-
<form id="form" name="form" method="post" action="" class="pure-form
pure-form-aligned">
- <input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes" select="building/tabs"/>
- <div id="building_show" class="booking-container">
- <div class="pure-control-group">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="building/tabs"/>
+ <div id="building_show" class="booking-container">
+ <div class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang',
'Description')" />
</label>
- <!--div class="description"--><!--/div-->
<div class="custom-container">
<xsl:value-of select="building/description"
disable-output-escaping="yes"/>
</div>
- </div>
+ </div>
<div class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang', 'Street')"
/>
@@ -87,51 +69,51 @@
</label>
<xsl:value-of select="building/phone"/>
</div>
- <xsl:if test="building/tilsyn_name != ''">
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Tilsynsvakt name')" />
- </label>
- <xsl:value-of
select="building/tilsyn_name"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Tilsynsvakt email')" />
- </label>
- <a>
- <xsl:attribute
name="href">mailto:<xsl:value-of
select="building/tilsyn_email"/></xsl:attribute>
- <xsl:value-of
select="building/tilsyn_email"/>
- </a>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Tilsynsvakt telephone')" />
- </label>
- <xsl:value-of
select="building/tilsyn_phone"/>
- </div>
- </xsl:if>
- <xsl:if test="building/tilsyn_name2 != ''">
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Tilsynsvakt name')" />
- </label>
- <xsl:value-of
select="building/tilsyn_name2"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Tilsynsvakt email')" />
- </label>
- <a>
- <xsl:attribute
name="href">mailto:<xsl:value-of
select="building/tilsyn_email2"/></xsl:attribute>
- <xsl:value-of
select="building/tilsyn_email2"/></a>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Tilsynsvakt telephone')" />
- </label>
- <xsl:value-of
select="building/tilsyn_phone2"/>
- </div>
- </xsl:if>
+ <xsl:if test="building/tilsyn_name != ''">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt name')" />
+ </label>
+ <xsl:value-of select="building/tilsyn_name"/>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt email')" />
+ </label>
+ <a>
+ <xsl:attribute name="href">mailto:<xsl:value-of
select="building/tilsyn_email"/></xsl:attribute>
+ <xsl:value-of select="building/tilsyn_email"/>
+ </a>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt telephone')" />
+ </label>
+ <xsl:value-of select="building/tilsyn_phone"/>
+ </div>
+ </xsl:if>
+ <xsl:if test="building/tilsyn_name2 != ''">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt name')" />
+ </label>
+ <xsl:value-of select="building/tilsyn_name2"/>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt email')" />
+ </label>
+ <a>
+ <xsl:attribute name="href">mailto:<xsl:value-of
select="building/tilsyn_email2"/></xsl:attribute>
+ <xsl:value-of select="building/tilsyn_email2"/></a>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt telephone')" />
+ </label>
+ <xsl:value-of select="building/tilsyn_phone2"/>
+ </div>
+ </xsl:if>
<div class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang', 'Bookable
resources')" />
@@ -144,15 +126,15 @@
</label>
<div class="pure-custom">
<div id="documents_container"
class="custom-container"></div>
- <div>
- <a class='button'>
- <xsl:attribute
name="href"><xsl:value-of select="building/add_document_link"/></xsl:attribute>
- <xsl:if
test="building/permission/write">
-
<xsl:value-of select="php:function('lang', 'Add Document')" />
- </xsl:if>
- </a>
- </div>
- </div>
+ <div>
+ <a class='button'>
+ <xsl:attribute name="href"><xsl:value-of
select="building/add_document_link"/></xsl:attribute>
+ <xsl:if test="building/permission/write">
+ <xsl:value-of select="php:function('lang',
'Add Document')" />
+ </xsl:if>
+ </a>
+ </div>
+ </div>
</div>
<div class="pure-control-group">
<label>
@@ -160,142 +142,40 @@
</label>
<div id="permissions_container"
class="custom-container"></div>
</div>
- </div>
- </div>
- <div class="form-buttons">
- <xsl:if
test="building/permission/write">
- <input type="button"
class="pure-button pure-button-primary" name="edit">
- <xsl:attribute
name="onclick">window.location="<xsl:value-of
select="building/edit_link"/>"</xsl:attribute>
- <xsl:attribute
name="value"><xsl:value-of select="php:function('lang', 'Edit')"
/></xsl:attribute>
- </input>
- </xsl:if>
- <input type="button" class="pure-button
pure-button-primary" name="schedule">
- <xsl:attribute
name="onclick">window.location="<xsl:value-of
select="building/schedule_link"/>"</xsl:attribute>
- <xsl:attribute
name="value"><xsl:value-of select="php:function('lang', 'Building schedule')"
/></xsl:attribute>
- </input>
- <input type="button" class="pure-button
pure-button-primary" name="cancel">
- <xsl:attribute
name="onclick">window.location="<xsl:value-of
select="building/cancel_link"/>"</xsl:attribute>
- <xsl:attribute
name="value"><xsl:value-of select="php:function('lang', 'Cancel')"
/></xsl:attribute>
- </input>
- </div>
- </form>
+ </div>
+ </div>
+ <div class="form-buttons">
+ <xsl:if test="building/permission/write">
+ <input type="button" class="pure-button pure-button-primary"
name="edit">
+ <xsl:attribute
name="onclick">window.location="<xsl:value-of
select="building/edit_link"/>"</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Edit')" /></xsl:attribute>
+ </input>
+ </xsl:if>
+ <input type="button" class="pure-button pure-button-primary"
name="schedule">
+ <xsl:attribute name="onclick">window.location="<xsl:value-of
select="building/schedule_link"/>"</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Building schedule')" /></xsl:attribute>
+ </input>
+ <input type="button" class="pure-button pure-button-primary"
name="cancel">
+ <xsl:attribute name="onclick">window.location="<xsl:value-of
select="building/cancel_link"/>"</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Cancel')" /></xsl:attribute>
+ </input>
+ </div>
+ </form>
+ <script type="text/javascript">
+ var building_id = <xsl:value-of select="building/id"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Category', 'Actions', 'Account', 'Role', 'Edit', 'Delete', 'Resource Type',
'Sort order')"/>;
-
- <!--/div-->
-
-<script type="text/javascript">
- var building_id = <xsl:value-of select="building/id"/>;
- var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Category', 'Actions', 'Account', 'Role', 'Edit', 'Delete', 'Resource Type',
'Sort order')"/>;
-
- <![CDATA[
- var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
- var documentsURL =
'index.php?menuaction=booking.uidocument_building.index&sort=name&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
- var permissionsURL =
'index.php?menuaction=booking.uipermission_building.index&sort=name&filter_object_id='
+ building_id + '&phpgw_return_as=json&';
- ]]>
- var colDefsResources = [{key: 'sort', label: lang['Sort order']},{key:
'name', label: lang['Name'], formatter: genericLink}, {key: 'type', label:
lang['Resource Type']}];
- var colDefsDocuments = [{key: 'name', label: lang['Name'], formatter:
genericLink}, {key: 'category', label: lang['Category']}, {key: 'actions',
label: lang['Actions'], formatter: genericLink(lang['Edit'], lang['Delete'])}];
- var colDefsPermissions = [{key: 'subject_name', label: lang['Account']},
{key: 'role', label: lang['Role']}, {key: 'actions', label: lang['Actions'],
formatter: genericLink({name: 'edit', label: 'Edit'}, lang['Delete'])}];
-
- createTable('resources_container',resourcesURL,colDefsResources);
- createTable('documents_container',documentsURL,colDefsDocuments);
- createTable('permissions_container',permissionsURL,colDefsPermissions);
-
-
- /*
- $.get(resourceURL, function(resourceData){
- var resourceBody = '';
- var resourceTableClass = "pure-table";
<![CDATA[
- var resourceHead = '<tr><th>'+lang['Sort
order']+'</th><th>'+lang['Name']+'</th><th>'+lang['Resource Type']+'</th></tr>';
- ]]>;
- if (resourceData.data.length === 0) {
- resourceBody = '<tr><td colspan="3">'+lang['No records
found']+'</td></tr>';
- }else {
- resourceTableClass = "pure-table pure-table-striped";
- $.each(resourceData.data, function(index, value) {
- <![CDATA[
- resourceBody += '<tr><td>'+value.sort+'</td><td><a
href="'+value.link+'">'+value.name+'</a></td><td>'+value.type+'</td></tr>';
- ]]>
- });
- };
- <![CDATA[
- var resourceTable = '<table
class="'+resourceTableClass+'"><thead>'+resourceHead+'</thead><tbody>'+resourceBody+'</tbody></table>'
+ var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
+ var documentsURL =
'index.php?menuaction=booking.uidocument_building.index&sort=name&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
+ var permissionsURL =
'index.php?menuaction=booking.uipermission_building.index&sort=name&filter_object_id='
+ building_id + '&phpgw_return_as=json&';
]]>
- $('#resources_container').html(resourceTable);
- });
-
-
-
-
- $.get(documentURL, function(documentData){
- var documentBody = '';
- var documentTableClass = "pure-table";
- <![CDATA[
- var documentHead =
'<tr><th>'+lang['Name']+'</th><th>'+lang['Category']+'</th><th>'+lang['Actions']+'</th></tr>';
- ]]>;
- if (documentData.data.length === 0) {
- documentBody = '<tr><td colspan="3">'+lang['No records
found']+'</td></tr>';
- }else {
- documentTableClass = "pure-table pure-table-striped";
- $.each(documentData.data, function(index, value) {
- <![CDATA[
- documentBody +=
'<tr><td>'+value.name+'</td><td>'+value.category+'</td><td><a
href="'+value.opcion_edit+'">'+lang['Edit']+'</a> <a
href="'+value.opcion_delete+'">'+lang['Delete']+'</a></td></tr>';
- ]]>
- });
- };
- <![CDATA[
- var documentTable = '<table
class="'+documentTableClass+'"><thead>'+documentHead+'</thead><tbody>'+documentBody+'</tbody></table>'
- ]]>
- $('#documents_container').html(documentTable);
- });
-
-
-
- $.get(permissionURL, function(permissionData){
- var permissionBody = '';
- var permissionTableClass = "pure-table";
- <![CDATA[
- var permissionHead =
'<tr><th>'+lang['Account']+'</th><th>'+lang['Role']+'</th><th>'+lang['Actions']+'</th></tr>';
- ]]>;
- if (permissionData.data.length === 0) {
- permissionBody = '<tr><td colspan="3">'+lang['No records
found']+'</td></tr>';
- }else {
- permissionTableClass = "pure-table pure-table-striped";
- $.each(permissionData.data, function(index, value) {
- <![CDATA[
- permissionBody +=
'<tr><td>'+value.subject_name+'</td><td>'+value.role+'</td><td><a
href="'+value.opcion_edit+'">'+lang['Edit']+'</a> <a
href="'+value.opcion_delete+'">'+lang['Delete']+'</a></td></tr>';
- ]]>
- });
- };
- <![CDATA[
- var permissionTable = '<table
class="'+permissionTableClass+'"><thead>'+permissionHead+'</thead><tbody>'+permissionBody+'</tbody></table>'
- ]]>
- $('#permissions_container').html(permissionTable);
- });
- */
- </script>
- <!--script>
-
-
-
- <![CDATA[
-YAHOO.util.Event.addListener(window, "load", function() {
- var url =
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
- var colDefs = [{key: 'sort', label: lang['Sort order']},{key: 'name',
label: lang['Name'], formatter: YAHOO.booking.formatLink}, {key: 'type', label:
lang['Resource Type']}];
- YAHOO.booking.inlineTableHelper('resources_container', url, colDefs);
+ var colDefsResources = [{key: 'sort', label: lang['Sort order']},{key:
'name', label: lang['Name'], formatter: genericLink}, {key: 'type', label:
lang['Resource Type']}];
+ var colDefsDocuments = [{key: 'name', label: lang['Name'], formatter:
genericLink}, {key: 'category', label: lang['Category']}, {key: 'actions',
label: lang['Actions'], formatter: genericLink(lang['Edit'], lang['Delete'])}];
+ var colDefsPermissions = [{key: 'subject_name', label:
lang['Account']}, {key: 'role', label: lang['Role']}, {key: 'actions', label:
lang['Actions'], formatter: genericLink({name: 'edit', label: 'Edit'},
lang['Delete'])}];
- var url =
'index.php?menuaction=booking.uidocument_building.index&sort=name&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
- var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.booking.formatLink}, {key: 'category', label: lang['Category']}, {key:
'actions', label: lang['Actions'], formatter:
YAHOO.booking.formatGenericLink(lang['Edit'], lang['Delete'])}];
- YAHOO.booking.inlineTableHelper('documents_container', url, colDefs);
-
- var url =
'index.php?menuaction=booking.uipermission_building.index&sort=name&filter_object_id='
+ building_id + '&phpgw_return_as=json&';
-]]>
- var colDefs = [{key: 'subject_name', label: lang['Account']}, {key:
'role', label: lang['Role']}, {key: 'actions', label: lang['Actions'],
formatter: YAHOO.booking.formatGenericLink(lang['Edit'], lang['Delete'])}];
- <![CDATA[
- YAHOO.booking.inlineTableHelper('permissions_container', url, colDefs);
-});
-
-]]>
-</script-->
-
+ createTable('resources_container',resourcesURL,colDefsResources);
+ createTable('documents_container',documentsURL,colDefsDocuments);
+ createTable('permissions_container',permissionsURL,colDefsPermissions);
+ </script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/building_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/building_form.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/building_form.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -1,280 +1,249 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <!--div id="content">
- <ul class="pathway">
- <li>
- <a href="{building/buildings_link}">
- <xsl:value-of
select="php:function('lang', 'Buildings')" />
- </a>
- </li>
- <xsl:if test="not(new_form)">
- <li>
- <xsl:value-of
select="building/name"/>
- </li>
- </xsl:if>
- </ul-->
-
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
-
- <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
- <input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="building/tabs"/>
- <div id="building_form" class="booking-container">
- <div class="pure-control-group">
- <label for="field_building_name">
- <xsl:value-of select="php:function('lang',
'Building Name')" />
- </label>
- <input id="field_building_name" name="name"
type="text" value="{building/name}">
-
<xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label for="field_phone">
- <xsl:value-of select="php:function('lang',
'Telephone')" />
- </label>
- <input id="field_phone" name="phone"
type="text" value="{building/phone}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_email">
- <xsl:value-of select="php:function('lang',
'Email')" />
- </label>
- <input id="field_email" name="email"
type="text" value="{building/email}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_homepage">
- <xsl:value-of select="php:function('lang',
'Homepage')" />
- </label>
- <input id="field_homepage" name="homepage"
type="text" value="{building/homepage}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_location_code_name">
- <xsl:value-of select="php:function('lang',
'Location Code')" />
- </label>
- <!--div class="autocomplete"-->
- <input id="field_location_code"
name="location_code" type="hidden" value="{building/location_code}"/>
- <input id="field_location_code_name"
name="location_code_name" type="text" value="{building/location_code}"/>
- <div id="location_code_container"></div>
- </div>
- <div class="pure-control-group">
- <label for="field_street">
- <xsl:value-of select="php:function('lang',
'Street')"/>
- </label>
- <input id="field_street" name="street"
type="text" value="{building/street}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_zip_code">
- <xsl:value-of select="php:function('lang',
'Zip code')"/>
- </label>
- <input type="text" name="zip_code"
id="field_zip_code" value="{building/zip_code}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_city">
- <xsl:value-of select="php:function('lang',
'Postal City')"/>
- </label>
- <input type="text" name="city" id="field_city"
value="{building/city}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_district">
- <xsl:value-of select="php:function('lang',
'District')"/>
- </label>
- <input type="text" name="district"
id="field_district" value="{building/district}"/>
- </div>
- <xsl:if
test="not(new_form)">
- <div
class="pure-control-group">
- <label
for="field_active">
-
<xsl:value-of select="php:function('lang', 'Active')"/>
- </label>
- <select
id="field_active" name="active">
-
<option value="1">
-
<xsl:if test="building/active=1">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'Active')"/>
-
</option>
-
<option value="0">
-
<xsl:if test="building/active=0">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'Inactive')"/>
-
</option>
-
</select>
- </div>
- </xsl:if>
- <div class="pure-control-group">
- <label for="field_tilsyn_name">
- <xsl:value-of select="php:function('lang',
'Tilsynsvakt name')" />
- </label>
- <input id="field_tilsyn_name"
name="tilsyn_name" type="text" value="{building/tilsyn_name}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_tilsyn_phone">
- <xsl:value-of select="php:function('lang',
'Tilsynsvakt telephone')" />
- </label>
- <input id="field_tilsyn_phone"
name="tilsyn_phone" type="text" value="{building/tilsyn_phone}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_tilsyn_email">
- <xsl:value-of select="php:function('lang',
'Tilsynsvakt email')" />
- </label>
- <input id="field_tilsyn_email"
name="tilsyn_email" type="text" value="{building/tilsyn_email}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_tilsyn_name2">
- <xsl:value-of select="php:function('lang',
'Tilsynsvakt name')" />
- </label>
- <input id="field_tilsyn_name2"
name="tilsyn_name2" type="text" value="{building/tilsyn_name2}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_tilsyn_phone2">
- <xsl:value-of select="php:function('lang',
'Tilsynsvakt telephone')" />
- </label>
- <input id="field_tilsyn_phone2"
name="tilsyn_phone2" type="text" value="{building/tilsyn_phone2}"/>
- </div>
- <div class="pure-control-group">
- <label for="field_tilsyn_email2">
- <xsl:value-of select="php:function('lang',
'Tilsynsvakt email')" />
- </label>
- <input id="field_tilsyn_email2"
name="tilsyn_email2" type="text" value="{building/tilsyn_email2}"/>
- </div>
- <xsl:if
test="not(new_form)">
- <div
class="pure-control-group">
- <label
for="for_field_deactivate_application">
-
<xsl:value-of select="php:function('lang', 'Deactivate application')"/>
- </label>
- <select
id="for_field_deactivate_application" name="deactivate_application">
-
<option value="1">
-
<xsl:if test="building/deactivate_application=1">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'Yes')"/>
-
</option>
-
<option value="0">
-
<xsl:if test="building/deactivate_application=0">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'No')"/>
-
</option>
-
</select>
- </div>
- </xsl:if>
- <xsl:if
test="not(new_form)">
- <div
class="pure-control-group">
- <label
for="for_deactivate_calendar">
-
<xsl:value-of select="php:function('lang', 'Deactivate calendar')"/>
- </label>
- <select
id="for_deactivate_calendar" name="deactivate_calendar">
-
<option value="1">
-
<xsl:if test="building/deactivate_calendar=1">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'Yes')"/>
-
</option>
-
<option value="0">
-
<xsl:if test="building/deactivate_calendar=0">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'No')"/>
-
</option>
-
</select>
- </div>
- </xsl:if>
- <xsl:if
test="not(new_form)">
- <div
class="pure-control-group">
- <label
for="for_deactivate_sendmessage">
-
<xsl:value-of select="php:function('lang', 'Deactivate send message')"/>
- </label>
- <select
id="for_deactivate_sendmessage" name="deactivate_sendmessage">
-
<option value="1">
-
<xsl:if test="building/deactivate_sendmessage=1">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'Yes')"/>
-
</option>
-
<option value="0">
-
<xsl:if test="building/deactivate_sendmessage=0">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'No')"/>
-
</option>
-
</select>
- </div>
- </xsl:if>
- <xsl:if
test="not(new_form) and building/extra=1">
- <div
class="pure-control-group">
- <label
for="for_extra_kalendar">
-
<xsl:value-of select="php:function('lang', 'Extra kalendar for public opening
times')"/>
- </label>
- <select
id="for_extra_kalendar" name="extra_kalendar">
-
<option value="1">
-
<xsl:if test="building/extra_kalendar=1">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'Yes')"/>
-
</option>
-
<option value="0">
-
<xsl:if test="building/extra_kalendar=0">
-
<xsl:attribute name="selected">checked</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of select="php:function('lang', 'No')"/>
-
</option>
-
</select>
- </div>
- </xsl:if>
- <div class="pure-control-group">
- <label for="field_calendar_text">
- <xsl:value-of select="php:function('lang',
'Calendar text')" />
- </label>
- <textarea id="field_calendar_text"
name="calendar_text" type="text"><xsl:value-of
select="building/calendar_text"/></textarea>
- </div>
- <div class="pure-control-group">
- <label for="field_description">
- <xsl:value-of select="php:function('lang',
'Description')" />
- </label>
- <div class="custom-container">
- <textarea id="field_description"
name="description" type="text"><xsl:value-of
select="building/description"/></textarea>
- </div>
- </div>
- </div>
+ <xsl:call-template name="msgbox"/>
+ <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes" select="building/tabs"/>
+ <div id="building_form" class="booking-container">
+ <div class="pure-control-group">
+ <label for="field_building_name">
+ <xsl:value-of select="php:function('lang', 'Building
Name')" />
+ </label>
+ <input id="field_building_name" name="name" type="text"
value="{building/name}">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_phone">
+ <xsl:value-of select="php:function('lang',
'Telephone')" />
+ </label>
+ <input id="field_phone" name="phone" type="text"
value="{building/phone}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_email">
+ <xsl:value-of select="php:function('lang', 'Email')" />
+ </label>
+ <input id="field_email" name="email" type="text"
value="{building/email}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_homepage">
+ <xsl:value-of select="php:function('lang',
'Homepage')" />
+ </label>
+ <input id="field_homepage" name="homepage" type="text"
value="{building/homepage}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_location_code_name">
+ <xsl:value-of select="php:function('lang', 'Location
Code')" />
+ </label>
+ <input id="field_location_code" name="location_code"
type="hidden" value="{building/location_code}"/>
+ <input id="field_location_code_name"
name="location_code_name" type="text" value="{building/location_code}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_street">
+ <xsl:value-of select="php:function('lang', 'Street')"/>
+ </label>
+ <input id="field_street" name="street" type="text"
value="{building/street}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_zip_code">
+ <xsl:value-of select="php:function('lang', 'Zip
code')"/>
+ </label>
+ <input type="text" name="zip_code" id="field_zip_code"
value="{building/zip_code}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_city">
+ <xsl:value-of select="php:function('lang', 'Postal
City')"/>
+ </label>
+ <input type="text" name="city" id="field_city"
value="{building/city}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_district">
+ <xsl:value-of select="php:function('lang',
'District')"/>
+ </label>
+ <input type="text" name="district" id="field_district"
value="{building/district}"/>
+ </div>
+ <xsl:if test="not(new_form)">
+ <div class="pure-control-group">
+ <label for="field_active">
+ <xsl:value-of select="php:function('lang',
'Active')"/>
+ </label>
+ <select id="field_active" name="active">
+ <option value="1">
+ <xsl:if test="building/active=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Active')"/>
+ </option>
+ <option value="0">
+ <xsl:if test="building/active=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Inactive')"/>
+ </option>
+ </select>
</div>
- <div class="form-buttons">
- <input type="submit" class="button pure-button
pure-button-primary">
- <xsl:attribute name="value">
- <xsl:choose>
- <xsl:when test="new_form">
- <xsl:value-of
select="php:function('lang', 'Create')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="php:function('lang', 'Save')"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- </input>
- <input type="button"
class="pure-button pure-button-primary" name="cancel">
- <xsl:attribute
name="onclick">window.location="<xsl:value-of
select="building/cancel_link"/>"</xsl:attribute>
- <xsl:attribute
name="value"><xsl:value-of select="php:function('lang', 'Cancel')"
/></xsl:attribute>
- </input>
+ </xsl:if>
+ <div class="pure-control-group">
+ <label for="field_tilsyn_name">
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt name')" />
+ </label>
+ <input id="field_tilsyn_name" name="tilsyn_name"
type="text" value="{building/tilsyn_name}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_tilsyn_phone">
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt telephone')" />
+ </label>
+ <input id="field_tilsyn_phone" name="tilsyn_phone"
type="text" value="{building/tilsyn_phone}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_tilsyn_email">
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt email')" />
+ </label>
+ <input id="field_tilsyn_email" name="tilsyn_email"
type="text" value="{building/tilsyn_email}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_tilsyn_name2">
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt name')" />
+ </label>
+ <input id="field_tilsyn_name2" name="tilsyn_name2"
type="text" value="{building/tilsyn_name2}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_tilsyn_phone2">
+ <xsl:value-of select="php:function('lang', 'Tilsynsvakt
telephone')" />
+ </label>
+ <input id="field_tilsyn_phone2" name="tilsyn_phone2"
type="text" value="{building/tilsyn_phone2}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_tilsyn_email2">
+ <xsl:value-of select="php:function('lang',
'Tilsynsvakt email')" />
+ </label>
+ <input id="field_tilsyn_email2" name="tilsyn_email2"
type="text" value="{building/tilsyn_email2}"/>
+ </div>
+ <xsl:if test="not(new_form)">
+ <div class="pure-control-group">
+ <label for="for_field_deactivate_application">
+ <xsl:value-of select="php:function('lang',
'Deactivate application')"/>
+ </label>
+ <select id="for_field_deactivate_application"
name="deactivate_application">
+ <option value="1">
+ <xsl:if
test="building/deactivate_application=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ <option value="0">
+ <xsl:if
test="building/deactivate_application=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ </select>
</div>
- </form>
- <!--/div-->
-
- <script type="text/javascript">
- <![CDATA[
-
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.properties&phpgw_return_as=json&',
- 'field_location_code_name',
'field_location_code', 'location_code_container');
- ]]>
- </script>
-
- <!--script type="text/javascript">
- <![CDATA[
- YAHOO.util.Event.addListener(window, "load", function() {
- YAHOO.booking.rtfEditorHelper('field_description');
-
-
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.properties&phpgw_return_as=json&',
- 'field_location_code_name',
'field_location_code', 'location_code_container');
- });
- ]]>
- </script-->
+ </xsl:if>
+ <xsl:if test="not(new_form)">
+ <div class="pure-control-group">
+ <label for="for_deactivate_calendar">
+ <xsl:value-of select="php:function('lang',
'Deactivate calendar')"/>
+ </label>
+ <select id="for_deactivate_calendar"
name="deactivate_calendar">
+ <option value="1">
+ <xsl:if test="building/deactivate_calendar=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ <option value="0">
+ <xsl:if test="building/deactivate_calendar=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ </select>
+ </div>
+ </xsl:if>
+ <xsl:if test="not(new_form)">
+ <div class="pure-control-group">
+ <label for="for_deactivate_sendmessage">
+ <xsl:value-of select="php:function('lang',
'Deactivate send message')"/>
+ </label>
+ <select id="for_deactivate_sendmessage"
name="deactivate_sendmessage">
+ <option value="1">
+ <xsl:if
test="building/deactivate_sendmessage=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ <option value="0">
+ <xsl:if
test="building/deactivate_sendmessage=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ </select>
+ </div>
+ </xsl:if>
+ <xsl:if test="not(new_form) and building/extra=1">
+ <div class="pure-control-group">
+ <label for="for_extra_kalendar">
+ <xsl:value-of select="php:function('lang', 'Extra
kalendar for public opening times')"/>
+ </label>
+ <select id="for_extra_kalendar" name="extra_kalendar">
+ <option value="1">
+ <xsl:if test="building/extra_kalendar=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ <option value="0">
+ <xsl:if test="building/extra_kalendar=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ </select>
+ </div>
+ </xsl:if>
+ <div class="pure-control-group">
+ <label for="field_calendar_text">
+ <xsl:value-of select="php:function('lang', 'Calendar
text')" />
+ </label>
+ <textarea id="field_calendar_text" name="calendar_text"
type="text"><xsl:value-of select="building/calendar_text"/></textarea>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_description">
+ <xsl:value-of select="php:function('lang',
'Description')" />
+ </label>
+ <div class="custom-container">
+ <textarea id="field_description" name="description"
type="text"><xsl:value-of select="building/description"/></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-buttons">
+ <input type="submit" class="button pure-button
pure-button-primary">
+ <xsl:attribute name="value">
+ <xsl:choose>
+ <xsl:when test="new_form">
+ <xsl:value-of select="php:function('lang',
'Create')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="php:function('lang',
'Save')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ </input>
+ <input type="button" class="pure-button pure-button-primary"
name="cancel">
+ <xsl:attribute name="onclick">window.location="<xsl:value-of
select="building/cancel_link"/>"</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Cancel')" /></xsl:attribute>
+ </input>
+ </div>
+ </form>
+ <script type="text/javascript">
+ <![CDATA[
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.properties&phpgw_return_as=json&',
+ 'field_location_code_name',
'field_location_code', 'location_code_container');
+ ]]>
+ </script>
</xsl:template>
\ No newline at end of file
Modified: branches/dev-syncromind/booking/templates/base/document_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/document_form.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/document_form.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -1,129 +1,108 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <script type="text/javascript">
- var documentOwnerType = "<xsl:value-of
select="document/owner_type"/>";
- var documentOwnerAutocomplete = <xsl:value-of
select="document/inline"/> == 0;
- </script>
-
- <!--div id="content"-->
-
- <!-- Add pathway later -->
- <!--ul class="pathway">
- <li>
- <a>
- <xsl:attribute name="href"><xsl:value-of
select="document/buildings_link"/></xsl:attribute>
- <xsl:value-of select="document/top-nav-bar-buildings" />
- </a>
- </li>
- <li><xsl:value-of select="php:function('lang', 'Buildings')"/></li>
- </ul-->
-
+ <script type="text/javascript">
+ var documentOwnerType = "<xsl:value-of select="document/owner_type"/>";
+ var documentOwnerAutocomplete = <xsl:value-of
select="document/inline"/> == 0;
+ </script>
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
-
- <form action="" method="POST" enctype='multipart/form-data' id='form'
class="pure-form pure-form-aligned" name="form">
- <input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="document/tabs"/>
- <div id="document" class="booking-container">
- <fieldset>
-
- <xsl:if test="document/id">
- <div class="heading">
-
<legend><h3><xsl:value-of select="php:function('lang', 'Edit document')"
/></h3></legend>
- </div>
- </xsl:if>
- <xsl:if test="not(document/id)">
- <div class="heading">
-
<legend><h3><xsl:value-of select="php:function('lang', 'Upload document')"
/></h3></legend>
- </div>
- </xsl:if>
- <xsl:if test="document/id">
- <!-- An update, add id column
-->
- <input name='field_id'
type='hidden'>
- <xsl:attribute
name="value"><xsl:value-of select="document/id"/></xsl:attribute>
- </input>
- </xsl:if>
-
- <div class="pure-control-group">
- <label for="field_name">
- <xsl:value-of
select="php:function('lang', 'Document')" />
- </label>
- <input name="name"
id='field_name'>
- <xsl:attribute
name="value"><xsl:value-of select="document/name"/></xsl:attribute>
- <xsl:attribute
name="type">
- <xsl:choose>
-
<xsl:when test="document/id">text</xsl:when>
-
<xsl:otherwise>file</xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:if
test="document/id">
- <xsl:attribute
name="disabled" value="disabled"/>
- </xsl:if>
- <xsl:attribute
name='title'><xsl:value-of select="document/name"/></xsl:attribute>
- <xsl:attribute
name="data-validation">
-
<xsl:text>required</xsl:text>
- </xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label for="field_description">
- <xsl:value-of
select="php:function('lang', 'Description')" />
- </label>
- <textarea name="description"
id='field_description'><xsl:value-of select="document/description"/></textarea>
- </div>
- <div class="pure-control-group">
- <label for="field_category">
- <xsl:value-of
select="php:function('lang', 'Category')" />
- </label>
- <select name='category'
id='field_category' data-validation="required">
- <option
value=''><xsl:value-of select="php:function('lang', 'Select Category...')"
/></option>
- <xsl:for-each
select="document/document_types/*">
- <option>
- <xsl:if
test="../../category = local-name()">
-
<xsl:attribute name="selected">selected</xsl:attribute>
-
</xsl:if>
-
<xsl:attribute name="value"><xsl:value-of
select="local-name()"/></xsl:attribute>
-
<xsl:value-of select="php:function('lang', string(node()))"/>
- </option>
- </xsl:for-each>
- </select>
- </div>
- <div class="pure-control-group">
- <label for="field_owner_name">
- <xsl:value-of
select="php:function('lang', string(document/owner_type_label))" />
- </label>
- <!--div class="autocomplete"-->
- <input id="field_owner_name"
name="owner_name" type="text" data-validation="required" >
- <xsl:attribute
name="value"><xsl:value-of select="document/owner_name"/></xsl:attribute>
- <xsl:if
test="document/inline = '1'">
-
<xsl:attribute name="disabled">disabled</xsl:attribute>
- </xsl:if>
- </input>
- <input id="field_owner_id"
name="owner_id" type="hidden">
- <xsl:attribute
name="value"><xsl:value-of select="document/owner_id"/></xsl:attribute>
- </input>
- </div>
- </fieldset>
- </div>
+ <form action="" method="POST" enctype='multipart/form-data' id='form'
class="pure-form pure-form-aligned" name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="document/tabs"/>
+ <div id="document" class="booking-container">
+ <fieldset>
+ <xsl:if test="document/id">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'Edit document')" /></h3></legend>
+ </div>
+ </xsl:if>
+ <xsl:if test="not(document/id)">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'Upload document')" /></h3></legend>
+ </div>
+ </xsl:if>
+ <xsl:if test="document/id">
+ <input name='field_id' type='hidden'>
+ <xsl:attribute name="value"><xsl:value-of
select="document/id"/></xsl:attribute>
+ </input>
+ </xsl:if>
+ <div class="pure-control-group">
+ <label for="field_name">
+ <xsl:value-of select="php:function('lang',
'Document')" />
+ </label>
+ <input name="name" id='field_name'>
+ <xsl:attribute name="value"><xsl:value-of
select="document/name"/></xsl:attribute>
+ <xsl:attribute name="type">
+ <xsl:choose>
+ <xsl:when
test="document/id">text</xsl:when>
+ <xsl:otherwise>file</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:if test="document/id">
+ <xsl:attribute name="disabled"
value="disabled"/>
+ </xsl:if>
+ <xsl:attribute name='title'><xsl:value-of
select="document/name"/></xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_description">
+ <xsl:value-of select="php:function('lang',
'Description')" />
+ </label>
+ <textarea name="description"
id='field_description'><xsl:value-of select="document/description"/></textarea>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_category">
+ <xsl:value-of select="php:function('lang',
'Category')" />
+ </label>
+ <select name='category' id='field_category'
data-validation="required">
+ <option value=''><xsl:value-of
select="php:function('lang', 'Select Category...')" /></option>
+ <xsl:for-each select="document/document_types/*">
+ <option>
+ <xsl:if test="../../category =
local-name()">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value"><xsl:value-of
select="local-name()"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang',
string(node()))"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_owner_name">
+ <xsl:value-of select="php:function('lang',
string(document/owner_type_label))" />
+ </label>
+ <input id="field_owner_name" name="owner_name"
type="text" data-validation="required" >
+ <xsl:attribute name="value"><xsl:value-of
select="document/owner_name"/></xsl:attribute>
+ <xsl:if test="document/inline = '1'">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ </xsl:if>
+ </input>
+ <input id="field_owner_id" name="owner_id"
type="hidden">
+ <xsl:attribute name="value"><xsl:value-of
select="document/owner_id"/></xsl:attribute>
+ </input>
+ </div>
+ </fieldset>
</div>
- <div class="form-buttons">
- <input type="submit" class="pure-button pure-button-primary">
- <xsl:attribute name="value">
- <xsl:choose>
- <xsl:when test="document/id">
- <xsl:value-of select="php:function('lang',
'Update')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="php:function('lang',
'Create')"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- </input>
- <input type="button" class="pure-button
pure-button-primary" name="cancel">
- <xsl:attribute
name="onclick">window.location="<xsl:value-of
select="document/cancel_link"/>"</xsl:attribute>
- <xsl:attribute
name="value"><xsl:value-of select="php:function('lang', 'Cancel')"
/></xsl:attribute>
- </input>
- </div>
- </form>
- <!--/div-->
+ </div>
+ <div class="form-buttons">
+ <input type="submit" class="pure-button pure-button-primary">
+ <xsl:attribute name="value">
+ <xsl:choose>
+ <xsl:when test="document/id">
+ <xsl:value-of select="php:function('lang',
'Update')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="php:function('lang',
'Create')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ </input>
+ <input type="button" class="pure-button pure-button-primary"
name="cancel">
+ <xsl:attribute name="onclick">window.location="<xsl:value-of
select="document/cancel_link"/>"</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Cancel')" /></xsl:attribute>
+ </input>
+ </div>
+ </form>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/event_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/event_edit.xsl
2015-10-06 00:11:35 UTC (rev 14125)
+++ branches/dev-syncromind/booking/templates/base/event_edit.xsl
2015-10-06 23:51:28 UTC (rev 14126)
@@ -4,29 +4,18 @@
input.datetime,
input.time {display: inline-block !important;}
</style>
- <!--div id="content"-->
- <!--ul class="pathway">
- <li><xsl:value-of select="php:function('lang', 'Events')" /></li>
- <li>#<xsl:value-of select="event/id"/></li>
- </ul-->
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
-
<form action="" method="POST" id='form' class="pure-form
pure-form-stacked" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes" select="event/tabs"/>
- <div id="event_edit">
+ <div id="event_edit" class="booking-container">
<fieldset>
<div class="pure-g pure-form pure-form-aligned">
<div class="pure-u-1">
- <h1>
- #<xsl:value-of select="event/id"/>
- </h1>
+ <h1>#<xsl:value-of select="event/id"/></h1>
<div class="pure-control-group">
- <label for="field_active">
- <h4><xsl:value-of
select="php:function('lang', 'Active')"/></h4>
- </label>
+ <label for="field_active"><xsl:value-of
select="php:function('lang', 'Active')"/></label>
<select id="field_active" name="active">
<option value="1">
<xsl:if test="event/active=1">
@@ -43,16 +32,13 @@
</select>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Application')"/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Application')"/></label>
<xsl:if test="event/application_id != ''">
<a
href="{event/application_link}">#<xsl:value-of
select="event/application_id"/></a>
</xsl:if>
</div>
</div>
</div>
-
<div class="pure-g">
<div class="pure-u-1">
<div class="heading">
@@ -60,24 +46,19 @@
</div>
<xsl:for-each select="comments[author]">
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('pretty_timestamp', time)"/>: <xsl:value-of
select="author"/></h4>
- </label>
+ <label><xsl:value-of
select="php:function('pretty_timestamp', time)"/>: <xsl:value-of
select="author"/></label>
<span><xsl:value-of select="comment"
disable-output-escaping="yes"/></span>
</div>
</xsl:for-each>
</div>
</div>
-
<div class="pure-g">
<div class="pure-u-1">
<div class="heading">
<legend><h3><xsl:value-of
select="php:function('lang', 'Why')" /></h3></legend>
</div>
<div class="pure-control-group">
- <label for="field_activity">
- <h4><xsl:value-of
select="php:function('lang', 'Activity')" /></h4>
- </label>
+ <label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
<select name="activity_id" id="field_activity"
class="pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3">
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
@@ -92,15 +73,11 @@
</select>
</div>
<div class="pure-control-group">
- <label for="field_description">
- <h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
- </label>
+ <label for="field_description"><xsl:value-of
select="php:function('lang', 'Description')" /></label>
<textarea id="field_description"
class="full-width pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3"
name="description"><xsl:value-of select="event/description"/></textarea>
</div>
<div class="pure-control-group">
- <label for="field_public">
- <h4><xsl:value-of
select="php:function('lang', 'Event type')"/></h4>
- </label>
+ <label for="field_public"><xsl:value-of
select="php:function('lang', 'Event type')"/></label>
<select id="field_public" name="is_public"
class="pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3">
<option value="1">
<xsl:if test="event/is_public=1">
@@ -118,46 +95,34 @@
</div>
</div>
</div>
-
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
<div class="heading">
<legend><h3><xsl:value-of
select="php:function('lang', 'Where')" /></h3></legend>
- </div>
+ </div>
<div class="pure-control-group">
- <label for="field_building_name">
- <h4><xsl:value-of
select="php:function('lang', 'Building')" /></h4>
- </label>
- <!--div class="autocomplete"-->
+ <label for="field_building_name"><xsl:value-of
select="php:function('lang', 'Building')" /></label>
<input id="field_building_id"
name="building_id" type="hidden">
<xsl:attribute name="value"><xsl:value-of
select="event/building_id"/></xsl:attribute>
</input>
<input id="field_building_name"
name="building_name" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
<xsl:attribute name="value"><xsl:value-of
select="event/building_name"/></xsl:attribute>
</input>
- <div id="building_container"></div>
- <!--/div-->
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Resources')" /></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
<div id="resources_container"><xsl:value-of
select="php:function('lang', 'Select a building first')" /></div>
</div>
</div>
-
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
<div class="heading">
<legend><h3><xsl:value-of
select="php:function('lang', 'When')" /></h3></legend>
</div>
<div class="pure-control-group">
- <label for="from_">
- <h4><xsl:value-of
select="php:function('lang','Start date')" /></h4>
- </label>
+ <label for="from_"><xsl:value-of
select="php:function('lang','Start date')" /></label>
<input class="datetime pure-input-2-3"
id="from_" name="from_" type="text">
<xsl:if test="event/from_ != ''">
<xsl:attribute name="value">
- <!--xsl:value-of
select="php:function('date', $datetime_format, number(event/from_))"/-->
<xsl:value-of
select="event/from_"/>
</xsl:attribute>
</xsl:if>
@@ -167,13 +132,10 @@
</input>
</div>
<div class="pure-control-group">
- <label for="to_">
- <h4><xsl:value-of
select="php:function('lang', 'End date')" /></h4>
- </label>
+ <label for="to_"><xsl:value-of
select="php:function('lang', 'End date')" /></label>
<input class="datetime pure-input-2-3"
id="to_" name="to_" type="text">
<xsl:if test="event/to_ != ''">
<xsl:attribute name="value">
- <!--xsl:value-of
select="php:function('date', $datetime_format, number(event/from_))"/-->
<xsl:value-of select="event/to_"/>
</xsl:attribute>
</xsl:if>
@@ -183,16 +145,13 @@
</input>
</div>
</div>
-
<div class="pure-u-1 pure-u-md-1 pure-u-lg-1-3">
<div class="heading">
<legend><h3><xsl:value-of
select="php:function('lang', 'Who')" /></h3></legend>
</div>
<div class="pure-g">
<div class="pure-control-group pure-u-1
pure-u-md-1-2 pure-u-lg-1">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4>
- </label>
+ <label><xsl:value-of
select="php:function('lang', 'Target audience')" /></label>
<ul style="list-style:none;padding: 0 0 0
10px;">
<xsl:for-each select="audience">
<li>
@@ -210,9 +169,7 @@
</ul>
</div>
<div class="pure-control-group pure-u-1
pure-u-md-1-2 pure-u-lg-1">
- <label for="field_from">
- <h4><xsl:value-of
select="php:function('lang', 'Number of participants')" /></h4>
- </label>
+ <label for="field_from"><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label>
<table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr>
@@ -251,45 +208,35 @@
</div>
</div>
</div>
-
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
<div class="heading">
<legend><h3><xsl:value-of
select="php:function('lang', 'Contact information')" /></h3></legend>
</div>
- <div class="pure-control-group">
- <label for="field_contact_name">
- <h4><xsl:value-of
select="php:function('lang', 'Name')" /></h4>
- </label>
+ <div class="pure-control-group">
+ <label for="field_contact_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label>
<input id="field_contact_name"
name="contact_name" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
<xsl:attribute name="value"><xsl:value-of
select="event/contact_name"/></xsl:attribute>
</input>
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14126] fixing forms,
Saul <=