[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14168] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14168] fixing forms |
|
Date: |
Tue, 13 Oct 2015 23:28:05 +0000 |
Revision: 14168
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14168
Author: psaul
Date: 2015-10-13 23:28:05 +0000 (Tue, 13 Oct 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/templates/base/account_code_dimension.xsl
branches/dev-syncromind/booking/templates/base/account_code_set.xsl
branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
branches/dev-syncromind/booking/templates/base/activities.xsl
branches/dev-syncromind/booking/templates/base/activity_edit.xsl
branches/dev-syncromind/booking/templates/base/activity_new.xsl
branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
branches/dev-syncromind/booking/templates/base/allocation_new.xsl
branches/dev-syncromind/booking/templates/base/allocation_new_preview.xsl
branches/dev-syncromind/booking/templates/base/application.xsl
branches/dev-syncromind/booking/templates/base/application_edit.xsl
branches/dev-syncromind/booking/templates/base/application_new.xsl
branches/dev-syncromind/booking/templates/base/application_settings.xsl
branches/dev-syncromind/booking/templates/base/audience_edit.xsl
branches/dev-syncromind/booking/templates/base/audience_new.xsl
branches/dev-syncromind/booking/templates/base/booking_delete_preview.xsl
branches/dev-syncromind/booking/templates/base/booking_new_preview.xsl
branches/dev-syncromind/booking/templates/base/building_schedule.xsl
branches/dev-syncromind/booking/templates/base/documentation_form.xsl
branches/dev-syncromind/booking/templates/base/email_preview.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/group.xsl
branches/dev-syncromind/booking/templates/base/group_edit.xsl
branches/dev-syncromind/booking/templates/base/mail_settings.xsl
branches/dev-syncromind/booking/templates/base/permission_form.xsl
branches/dev-syncromind/booking/templates/base/permission_root_form.xsl
branches/dev-syncromind/booking/templates/base/report_freetime.xsl
branches/dev-syncromind/booking/templates/base/report_participants.xsl
branches/dev-syncromind/booking/templates/base/resource.xsl
branches/dev-syncromind/booking/templates/base/resource_form.xsl
branches/dev-syncromind/booking/templates/base/resource_schedule.xsl
branches/dev-syncromind/booking/templates/base/season_boundaries.xsl
branches/dev-syncromind/booking/templates/base/season_edit.xsl
branches/dev-syncromind/booking/templates/base/season_generate.xsl
branches/dev-syncromind/booking/templates/base/system_message.xsl
branches/dev-syncromind/booking/templates/base/system_message_edit.xsl
Modified:
branches/dev-syncromind/booking/templates/base/account_code_dimension.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_dimension.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/account_code_dimension.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -7,226 +7,226 @@
<div id="account_code" class="booking-container">
<div class="pure-control-group">
<label>Article (pos 283 - 297)</label>
- <input id="field_article"
name="article" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="config_data/article"/></xsl:attribute>
- </input>
+ <input id="field_article" name="article" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/article"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>Dim1 (pos 862 - 869)</label>
- <input id="field_dim_1" name="dim_1"
type="text">
- <xsl:attribute
name="value"><xsl:value-of select="config_data/dim_1"/></xsl:attribute>
- </input>
+ <input id="field_dim_1" name="dim_1" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/dim_1"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>Dim2 (pos 870 - 877)</label>
- <input id="field_dim_2" name="dim_2"
type="text">
- <xsl:attribute
name="value"><xsl:value-of select="config_data/dim_2"/></xsl:attribute>
- </input>
+ <input id="field_dim_2" name="dim_2" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/dim_2"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>Dim3 (pos 878 - 885)</label>
- <input id="field_dim_3" name="dim_3"
type="text">
- <xsl:attribute
name="value"><xsl:value-of select="config_data/dim_3"/></xsl:attribute>
- </input>
+ <input id="field_dim_3" name="dim_3" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/dim_3"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>Dim4 (pos 886 - 893)</label>
- <input id="field_dim_4" name="dim_4"
type="text">
- <xsl:attribute
name="value"><xsl:value-of select="config_data/dim_4"/></xsl:attribute>
- </input>
+ <input id="field_dim_4" name="dim_4" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/dim_4"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>Dim5 (pos 894 - 905)</label>
- <input id="field_dim_5" name="dim_5"
type="text">
- <xsl:attribute
name="value"><xsl:value-of select="config_data/dim_5"/></xsl:attribute>
- </input>
+ <input id="field_dim_5" name="dim_5" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/dim_5"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>Dim_value_1 (pos 914 - 925)</label>
- <input id="field_dim_value_1"
name="dim_value_1" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="config_data/dim_value_1"/></xsl:attribute>
- </input>
+ <input id="field_dim_value_1" name="dim_value_1"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/dim_value_1"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>Dim_value_4 (pos 950 - 961)</label>
- <input id="field_dim_value_4"
name="dim_value_4" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="config_data/dim_value_4"/></xsl:attribute>
- </input>
+ <input id="field_dim_value_4" name="dim_value_4"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/dim_value_4"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label>Dim_value_5 (pos 962 - 973)</label>
- <input id="field_dim_value_5"
name="dim_value_5" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="config_data/dim_value_5"/></xsl:attribute>
- </input>
+ <input id="field_dim_value_5" name="dim_value_5"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/dim_value_5"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
- <div class="heading"><legend><h3><xsl:value-of
select="php:function('lang', 'External account')"/></h3></legend></div>
+ <div class="heading">
+ <legend><h3><xsl:value-of select="php:function('lang',
'External account')"/></h3></legend>
+ </div>
</div>
<div class="pure-control-group">
- <p><xsl:value-of select="php:function('lang',
'External_account_helptext')"/></p>
+ <p><h4><xsl:value-of select="php:function('lang',
'External_account_helptext')"/></h4></p>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang',
'External customer output format')"/></label>
- <select id="field_external_format"
name="external_format">
- <option value="AGRESSO">
- <xsl:if
test="config_data/external_format='AGRESSO'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- AGRESSO
- </option>
- <option value="CSV">
- <xsl:if
test="config_data/external_format='CSV'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- CSV
- </option>
- <option value="KOMMFAKT">
- <xsl:if
test="config_data/external_format='KOMMFAKT'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- KOMMFAKT
- </option>
- </select>
+ <select id="field_external_format" name="external_format">
+ <option value="AGRESSO">
+ <xsl:if
test="config_data/external_format='AGRESSO'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ AGRESSO
+ </option>
+ <option value="CSV">
+ <xsl:if test="config_data/external_format='CSV'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ CSV
+ </option>
+ <option value="KOMMFAKT">
+ <xsl:if
test="config_data/external_format='KOMMFAKT'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ KOMMFAKT
+ </option>
+ </select>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang',
'External file linebreak ')"/></label>
- <select id="field_external_format_linebreak"
name="external_format_linebreak">
- <option value="Windows">
- <xsl:if
test="config_data/external_format_linebreak='Windows'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- Windows
- </option>
- <option value="Linux">
- <xsl:if
test="config_data/external_format_linebreak='Linux'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- Linux
- </option>
- </select>
+ <select id="field_external_format_linebreak"
name="external_format_linebreak">
+ <option value="Windows">
+ <xsl:if
test="config_data/external_format_linebreak='Windows'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ Windows
+ </option>
+ <option value="Linux">
+ <xsl:if
test="config_data/external_format_linebreak='Linux'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ Linux
+ </option>
+ </select>
</div>
<div class="pure-control-group">
- <div class="heading"><legend><h3><xsl:value-of
select="php:function('lang', 'Internal account')"/></h3></legend></div>
+ <div class="heading"><legend><h3><xsl:value-of
select="php:function('lang', 'Internal account')"/></h3></legend></div>
</div>
<div class="pure-control-group">
- <p><xsl:value-of select="php:function('lang',
'Internal_account_helptext')"/></p>
+ <p><h4><xsl:value-of select="php:function('lang',
'Internal_account_helptext')"/></h4></p>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang',
'Organization number')"/></label>
- <input id="field_organization_value"
name="organization_value" type="text">
- <xsl:attribute
name="value"><xsl:value-of
select="config_data/organization_value"/></xsl:attribute>
- </input>
+ <input id="field_organization_value"
name="organization_value" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/organization_value"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang',
'Internal customer output format')"/></label>
- <select id="field_internal_format"
name="internal_format">
- <option value="AGRESSO">
- <xsl:if
test="config_data/internal_format='AGRESSO'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- AGRESSO
- </option>
- <option value="CSV">
- <xsl:if
test="config_data/internal_format='CSV'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- CSV
- </option>
- <option value="KOMMFAKT">
- <xsl:if
test="config_data/internal_format='KOMMFAKT'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- KOMMFAKT
- </option>
- </select>
+ <select id="field_internal_format" name="internal_format">
+ <option value="AGRESSO">
+ <xsl:if
test="config_data/internal_format='AGRESSO'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ AGRESSO
+ </option>
+ <option value="CSV">
+ <xsl:if test="config_data/internal_format='CSV'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ CSV
+ </option>
+ <option value="KOMMFAKT">
+ <xsl:if
test="config_data/internal_format='KOMMFAKT'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ KOMMFAKT
+ </option>
+ </select>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang', 'File
output')"/></label>
- <select id="field_output_files" name="output_files">
- <option value="seperated">
- <xsl:if
test="config_data/output_files='seperated'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- Records splited between two files internal and
external.
- </option>
- <option value="single">
- <xsl:if
test="config_data/output_files='single'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- All records in the external file.
- </option>
- </select>
+ <select id="field_output_files" name="output_files">
+ <option value="seperated">
+ <xsl:if
test="config_data/output_files='seperated'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ Records splited between two files internal and
external.
+ </option>
+ <option value="single">
+ <xsl:if test="config_data/output_files='single'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ All records in the external file.
+ </option>
+ </select>
</div>
-
<div class="pure-control-group">
- <div class="heading"><legend><h3><xsl:value-of
select="php:function('lang', 'Export agresso')"/></h3></legend></div>
+ <div class="heading"><legend><h3><xsl:value-of
select="php:function('lang', 'Export agresso')"/></h3></legend></div>
</div>
-
<div class="pure-control-group">
- <p><xsl:value-of select="php:function('lang',
'export_help_text')"/></p>
+ <p><h4><xsl:value-of select="php:function('lang',
'export_help_text')"/></h4></p>
</div>
-
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang', 'Export
method')"/></label>
- <select id="field_invoice_export_method"
name="invoice_export_method">
- <option value="local">
- <xsl:if
test="config_data/invoice_export_method='local'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- local
- </option>
- <option value="ftp">
- <xsl:if
test="config_data/invoice_export_method='ftp'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- ftp
- </option>
- </select>
+ <select id="field_invoice_export_method"
name="invoice_export_method">
+ <option value="local">
+ <xsl:if
test="config_data/invoice_export_method='local'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ local
+ </option>
+ <option value="ftp">
+ <xsl:if
test="config_data/invoice_export_method='ftp'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ ftp
+ </option>
+ </select>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang', 'Export
path')"/></label>
- <input id="field_invoice_export_path"
name="invoice_export_path" type="text">
- <xsl:attribute
name="value"><xsl:value-of
select="config_data/invoice_export_path"/></xsl:attribute>
- </input>
+ <input id="field_invoice_export_path"
name="invoice_export_path" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/invoice_export_path"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang', 'Ftp
host')"/></label>
- <input id="field_invoice_ftp_host"
name="invoice_ftp_host" type="text">
- <xsl:attribute
name="value"><xsl:value-of
select="config_data/invoice_ftp_host"/></xsl:attribute>
- </input>
+ <input id="field_invoice_ftp_host" name="invoice_ftp_host"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/invoice_ftp_host"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang', 'Ftp
basedir')"/></label>
- <input id="field_invoice_ftp_basedir"
name="invoice_ftp_basedir" type="text">
- <xsl:attribute
name="value"><xsl:value-of
select="config_data/invoice_ftp_basedir"/></xsl:attribute>
- </input>
+ <input id="field_invoice_ftp_basedir"
name="invoice_ftp_basedir" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/invoice_ftp_basedir"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang', 'Ftp
user')"/></label>
- <input id="field_invoice_ftp_user"
name="invoice_ftp_user" type="text">
- <xsl:attribute
name="value"><xsl:value-of
select="config_data/invoice_ftp_user"/></xsl:attribute>
- </input>
+ <input id="field_invoice_ftp_user" name="invoice_ftp_user"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/invoice_ftp_user"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang', 'Ftp
password')"/></label>
- <input id="field_invoice_ftp_password"
name="invoice_ftp_password" type="password">
- <xsl:attribute
name="value"><xsl:value-of
select="config_data/invoice_ftp_password"/></xsl:attribute>
- </input>
+ <input id="field_invoice_ftp_password"
name="invoice_ftp_password" type="password">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/invoice_ftp_password"/></xsl:attribute>
+ </input>
</div>
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang', 'last
id')"/>
- <p><xsl:value-of select="php:function('lang', 'Do not
edit!')"/></p></label>
- <input id="field_invoice_last_id"
name="invoice_last_id" type="text">
- <xsl:attribute
name="value"><xsl:value-of
select="config_data/invoice_last_id"/></xsl:attribute>
- </input>
+ <label>
+ <xsl:value-of select="php:function('lang', 'last
id')"/>
+ <span
style="display:block;font-size:10px;font-weight:normal;margin-top:-8px;"><xsl:value-of
select="php:function('lang', 'Do not edit!')"/></span>
+ </label>
+ <input id="field_invoice_last_id" name="invoice_last_id"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="config_data/invoice_last_id"/></xsl:attribute>
+ </input>
</div>
</div>
</div>
<div class="form-buttons">
- <input type="submit" class="button pure-button
pure-button-primary">
+ <input type="submit" class="button pure-button
pure-button-primary">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
- </input>
+ </input>
</div>
</form>
- <!--/div-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/account_code_set.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_set.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/account_code_set.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -3,102 +3,78 @@
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="account_code_set/tabs"/>
- <div id="account">
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Name')" /></h4>
- </label>
+ <div id="account" class="booking-container">
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang', 'Name')"
/></label>
<xsl:value-of select="account_code_set/name"/>
</div>
- <div class="pure-control-group">
+ <div class="pure-control-group">
<xsl:if test="config_data/dim_3">
- <label>
- <h4><xsl:value-of select="config_data/dim_3"
/></h4>
- </label>
+ <label><xsl:value-of select="config_data/dim_3"
/></label>
<xsl:value-of select="account_code_set/object_number"/>
</xsl:if>
</div>
- <div class="pure-control-group">
+ <div class="pure-control-group">
<xsl:if test="config_data/article">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Article')" /></h4>
- </label>
+ <label><xsl:value-of select="php:function('lang',
'Article')" /></label>
<xsl:value-of select="account_code_set/article"/>
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_value_1">
- <label>
- <h4><xsl:value-of select="config_data/dim_value_1"
/></h4>
- </label>
+ <label><xsl:value-of select="config_data/dim_value_1"
/></label>
<xsl:value-of select="account_code_set/unit_number"/>
</xsl:if>
</div>
- <div class="pure-control-group">
+ <div class="pure-control-group">
<xsl:if test="config_data/dim_value_4">
- <label>
- <h4><xsl:value-of select="config_data/dim_value_4"
/></h4>
- </label>
+ <label><xsl:value-of select="config_data/dim_value_4"
/></label>
<xsl:value-of select="account_code_set/dim_value_4"/>
</xsl:if>
</div>
- <div class="pure-control-group">
+ <div class="pure-control-group">
<xsl:if test="config_data/dim_value_5">
- <label>
- <h4><xsl:value-of select="config_data/dim_value_5"
/></h4>
- </label>
+ <label><xsl:value-of select="config_data/dim_value_5"
/></label>
<xsl:value-of select="account_code_set/dim_value_5"/>
</xsl:if>
</div>
- <div class="pure-control-group">
+ <div class="pure-control-group">
<!--xsl:if test="config_data/external_format !=
'KOMMFAKT'"-->
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Unit Prefix')" /></h4>
- </label>
+ <label><xsl:value-of select="php:function('lang',
'Unit Prefix')" /></label>
<xsl:value-of select="account_code_set/unit_prefix"/>
<!--/xsl:if-->
- </div>
- <div class="pure-control-group">
+ </div>
+ <div class="pure-control-group">
<xsl:if test="config_data/dim_1">
- <label>
- <h4><xsl:value-of select="config_data/dim_1"
/></h4>
- </label>
+ <label><xsl:value-of select="config_data/dim_1"
/></label>
<xsl:value-of
select="account_code_set/responsible_code"/>
</xsl:if>
</div>
- <div class="pure-control-group">
+ <div class="pure-control-group">
<xsl:if test="config_data/dim_2">
- <label>
- <h4><xsl:value-of select="config_data/dim_2"
/></h4>
- </label>
+ <label><xsl:value-of select="config_data/dim_2"
/></label>
<xsl:value-of select="account_code_set/service"/>
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_4">
- <label>
- <h4><xsl:value-of select="config_data/dim_4"
/></h4>
- </label>
+ <label><xsl:value-of select="config_data/dim_4"
/></label>
<xsl:value-of select="account_code_set/dim_4"/>
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_5">
- <label>
- <h4><xsl:value-of select="config_data/dim_5"
/></h4>
- </label>
+ <label><xsl:value-of select="config_data/dim_5"
/></label>
<xsl:value-of
select="account_code_set/project_number"/>
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/external_format != 'KOMMFAKT'">
- <xsl:value-of select="php:function('lang',
'Reference')" />
+ <label><xsl:value-of select="php:function('lang',
'Reference')" /></label>
</xsl:if>
</div>
<div class="pure-control-group">
- <label>
- <h4><xsl:value-of select="php:function('lang',
'Invoice instruction')" /> </h4>
- </label>
+ <label><xsl:value-of select="php:function('lang', 'Invoice
instruction')" /></label>
<div class="description"
style="display:inline-block;max-width:80%;"><xsl:value-of
select="account_code_set/invoice_instruction"/></div>
</div>
</div>
Modified:
branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -2,7 +2,6 @@
<xsl:param name="test"/>
<xsl:param name="true"/>
<xsl:param name="false"/>
-
<func:result>
<xsl:choose>
<xsl:when test="$test">
@@ -14,22 +13,18 @@
</xsl:choose>
</func:result>
</func:function>
-
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:call-template name="msgbox"/>
-
<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="account_code_set/tabs"/>
- <div id="account">
+ <div id="account" class="booking-container">
<fieldset>
<div class="pure-g">
<div class="pure-u-1 pure-u-sm-1 pure-u-md-2-3
pure-u-lg-1-2">
<div class="pure-control-group">
- <label for="field_name">
- <h4><xsl:value-of
select="php:function('lang', 'Name')" /></h4>
- </label>
+ <label for="field_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label>
<input name="name" type="text" id="field_name"
value="{account_code_set/name}" class="pure-u-1" />
</div>
</div>
@@ -38,58 +33,44 @@
<div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-3
pure-u-lg-1-4">
<div class="pure-control-group">
<xsl:if test="config_data/dim_3">
- <label for="field_object_number">
- <h4><xsl:value-of
select="config_data/dim_3" /></h4>
- </label>
+ <label
for="field_object_number"><xsl:value-of select="config_data/dim_3" /></label>
<input name="object_number" type="text"
id="field_object_number" value="{account_code_set/object_number}" maxlength='8'
class="pure-u-1" />
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/article">
- <label for="field_article">
- <h4><xsl:value-of
select="config_data/article" /></h4>
- </label>
+ <label for="field_article"><xsl:value-of
select="config_data/article" /></label>
<input name="article" type="text"
id="field_article" value="{account_code_set/article}" maxlength='15'
class="pure-u-1" />
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_value_1">
- <label for="field_unit_number">
- <h4><xsl:value-of
select="config_data/dim_value_1" /></h4>
- </label>
+ <label
for="field_unit_number"><xsl:value-of select="config_data/dim_value_1"
/></label>
<input name="unit_number" type="text"
id="field_unit_number" value="{account_code_set/unit_number}" maxlength='12'
class="pure-u-1" />
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_value_4">
- <label for="field_dim_value_4">
- <h4><xsl:value-of
select="config_data/dim_value_4" /></h4>
- </label>
+ <label
for="field_dim_value_4"><xsl:value-of select="config_data/dim_value_4"
/></label>
<input name="dim_value_4" type="text"
id="field_dim_value_4" value="{account_code_set/dim_value_4}" maxlength='12'
class="pure-u-1" />
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_value_5">
- <label for="field_dim_value_5">
- <h4><xsl:value-of
select="config_data/dim_value_5" /></h4>
- </label>
+ <label
for="field_dim_value_5"><xsl:value-of select="config_data/dim_value_5"
/></label>
<input name="dim_value_5" type="text"
id="field_dim_value_5" value="{account_code_set/dim_value_5}" maxlength='12'
class="pure-u-1" />
</xsl:if>
</div>
<div class="pure-control-group">
<!--xsl:if test="config_data/external_format =
'KOMMFAKT'"-->
- <label for="field_unit_prefix">
- <h4><xsl:value-of
select="php:function('lang', 'Unit Prefix')" /></h4>
- </label>
+ <label
for="field_unit_prefix"><xsl:value-of select="php:function('lang', 'Unit
Prefix')" /></label>
<input name="unit_prefix" type="text"
id="field_unit_prefix" value="{account_code_set/unit_prefix}" maxlength='1'
class="pure-u-1" />
<!--/xsl:if-->
</div>
</div>
<div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-3
pure-u-lg-1-4">
<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"
class="pure-u-1">
<xsl:if test="new_form">
<xsl:attribute
name="disabled">disabled</xsl:attribute>
@@ -110,33 +91,25 @@
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_1">
- <label for="field_responsible_code">
- <h4><xsl:value-of
select="config_data/dim_1" /></h4>
- </label>
+ <label
for="field_responsible_code"><xsl:value-of select="config_data/dim_1" /></label>
<input name="responsible_code" type="text"
id="field_responsible_code" value="{account_code_set/responsible_code}"
maxlength='6' class="pure-u-1" />
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_2">
- <label for="field_service">
- <h4><xsl:value-of
select="config_data/dim_2" /></h4>
- </label>
+ <label for="field_service"><xsl:value-of
select="config_data/dim_2" /></label>
<input name="service" type="text"
id="field_service" value="{account_code_set/service}" maxlength='8'
class="pure-u-1" />
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_4">
- <label for="field_dim_4">
- <h4><xsl:value-of
select="config_data/dim_4" /></h4>
- </label>
+ <label for="field_dim_4"><xsl:value-of
select="config_data/dim_4" /></label>
<input name="dim_4" type="text"
id="field_dim_4" value="{account_code_set/dim_4}" maxlength='8'
class="pure-u-1" />
</xsl:if>
</div>
<div class="pure-control-group">
<xsl:if test="config_data/dim_5">
- <label for="field_project_number">
- <h4><xsl:value-of
select="config_data/dim_5" /></h4>
- </label>
+ <label
for="field_project_number"><xsl:value-of select="config_data/dim_5" /></label>
<input name="project_number" type="text"
id="field_project_number" value="{account_code_set/project_number}"
maxlength='12' class="pure-u-1" />
</xsl:if>
</div>
@@ -145,9 +118,7 @@
<div class="pure-g">
<div class="pure-u-1 pure-u-sm-1 pure-u-md-2-3
pure-u-lg-1-2">
<div class="pure-control-group">
- <label for="field_invoice_instruction">
- <h4><xsl:value-of
select="php:function('lang', 'Invoice instruction')" /></h4>
- </label>
+ <label
for="field_invoice_instruction"><xsl:value-of select="php:function('lang',
'Invoice instruction')" /></label>
<input id="field_invoice_instruction"
name="invoice_instruction" value="{account_code_set/invoice_instruction}"
class="pure-u-1" />
</div>
<!--div class="pure-control-group">
@@ -168,7 +139,4 @@
</a>
</div>
</form>
- <!--/div-->
</xsl:template>
-
-
Modified: branches/dev-syncromind/booking/templates/base/activities.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activities.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/activities.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -1,64 +1,64 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<style id='toggle-box-css' type='text/css' scoped='scoped'>
- .toggle-box {
- display: none;
- }
+ <style id='toggle-box-css' type='text/css' scoped='scoped'>
+ .toggle-box {
+ display: none;
+ }
- .toggle-box + label {
- cursor: pointer;
- display: block;
- font-weight: bold;
- line-height: 21px;
- margin-bottom: 5px;
- }
+ .toggle-box + label {
+ cursor: pointer;
+ display: block;
+ font-weight: bold;
+ line-height: 21px;
+ margin-bottom: 5px;
+ }
- .toggle-box + label + div {
- display: none;
- margin-bottom: 10px;
- }
+ .toggle-box + label + div {
+ display: none;
+ margin-bottom: 10px;
+ }
- .toggle-box:checked + label + div {
- display: block;
- }
+ .toggle-box:checked + label + div {
+ display: block;
+ }
- .toggle-box + label:before {
- background-color: #4F5150;
- -webkit-border-radius: 10px;
- -moz-border-radius: 10px;
- border-radius: 10px;
- color: #FFFFFF;
- content: "+";
- display: block;
- float: left;
- font-weight: bold;
- height: 20px;
- line-height: 20px;
- margin-right: 5px;
- text-align: center;
- width: 20px;
- }
+ .toggle-box + label:before {
+ background-color: #4F5150;
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
+ color: #FFFFFF;
+ content: "+";
+ display: block;
+ float: left;
+ font-weight: bold;
+ height: 20px;
+ line-height: 20px;
+ margin-right: 5px;
+ text-align: center;
+ width: 20px;
+ }
- .toggle-box:checked + label:before {
- content: "\2212";
- }
+ .toggle-box:checked + label:before {
+ content: "\2212";
+ }
- #expandcontractdiv {border:1px dotted #dedede; margin:0 0 .5em 0;
padding:0.4em;}
- #treeDiv { background: #fff; padding:1em; margin-top:1em; }
-</style>
-<xsl:call-template name="msgbox"/>
-<div>
- <input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes" select="tabs"/>
- <div id="activities">
- <input type="hidden" name="application_id"
value="{booking/application_id}"/>
- <form id="queryForm" method="GET" action="">
- <input class="toggle-box" id="header1" type="checkbox" />
- <label for="header1">
- <xsl:value-of select="php:function('lang', 'toolbar')"/>
- </label>
- <div id="toolbar">
- <!--xsl:if test="item/text and
normalize-space(item/text)"-->
+ #expandcontractdiv {border:1px dotted #dedede; margin:0 0 .5em 0;
padding:0.4em;}
+ #treeDiv { background: #fff; padding:1em; margin-top:1em; }
+ </style>
+ <xsl:call-template name="msgbox"/>
+ <div>
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes" select="tabs"/>
+ <div id="activities">
+ <input type="hidden" name="application_id"
value="{booking/application_id}"/>
+ <form id="queryForm" method="GET" action="">
+ <input class="toggle-box" id="header1" type="checkbox" />
+ <label for="header1">
+ <xsl:value-of select="php:function('lang',
'toolbar')"/>
+ </label>
+ <div id="toolbar">
+ <!--xsl:if test="item/text and
normalize-space(item/text)"-->
<table id="toolbar_table" class="pure-table">
<thead>
<tr>
@@ -106,44 +106,36 @@
</tr>
</tbody>
</table>
-
- </div>
-
- </form>
-
- <div id="tree_container">
- <legend>
- <h3><xsl:value-of select="php:function('lang', 'Current
Activities')" /></h3>
- </legend>
-
-
- <script type="text/javascript">
- var activities = null;
- <xsl:if test="treedata != ''">
- activities = <xsl:value-of select="treedata"/>;
- </xsl:if>
- </script>
-
- <!-- markup for expand/contract links -->
- <div id="treecontrol">
+ </div>
+ </form>
+ <div id="tree_container">
+ <legend>
+ <h3><xsl:value-of select="php:function('lang',
'Current Activities')" /></h3>
+ </legend>
+ <script type="text/javascript">
+ var activities = null;
+ <xsl:if test="treedata != ''">
+ activities = <xsl:value-of select="treedata"/>;
+ </xsl:if>
+ </script>
+ <!-- markup for expand/contract links -->
+ <div id="treecontrol">
<a id="collapse" title="Collapse the entire tree
below" href="#"><xsl:value-of select="php:function('lang', 'collapse
all')"/></a>
<xsl:text> | </xsl:text>
<a id="expand" title="Expand the entire tree below"
href="#"><xsl:value-of select="php:function('lang', 'expand all')"/></a>
+ </div>
+ <div id="treeDiv"></div>
</div>
-
- <div id="treeDiv"></div>
</div>
</div>
</div>
- </div>
-
<script type="text/javascript">
$("#treeDiv").jstree({
"core" : {
"multiple" : false,
"themes" : { "stripes" : true },
"data" : activities,
- },
+ },
"plugins" : [ "themes","html_data","ui","state" ]
});
Modified: branches/dev-syncromind/booking/templates/base/activity_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_edit.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/activity_edit.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -4,46 +4,38 @@
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="activity/tabs"/>
- <div id="activity_edit">
+ <div id="activity_edit" class="booking-container">
<div class="pure-control-group">
- <label for="field_name">
- <h4><xsl:value-of select="php:function('lang',
'Activity')"/></h4>
- </label>
+ <label for="field_name"><xsl:value-of
select="php:function('lang', 'Activity')"/></label>
<input id="field_name" name="name" type="text">
<xsl:attribute name="value"><xsl:value-of
select="activity/name"/></xsl:attribute>
</input>
</div>
<div class="pure-control-group">
- <label for="field_active">
- <xsl:value-of select="php:function('lang', 'Active')"
/>
- </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="activity/active=1">
- <xsl:attribute
name="selected">checked</xsl:attribute>
+ <xsl:attribute
name="selected">checked</xsl:attribute>
</xsl:if>
<xsl:value-of select="php:function('lang',
'Active')" />
</option>
<option value="0">
<xsl:if test="activity/active=0">
- <xsl:attribute
name="selected">checked</xsl:attribute>
+ <xsl:attribute
name="selected">checked</xsl:attribute>
</xsl:if>
<xsl:value-of select="php:function('lang',
'Inactive')" />
</option>
</select>
</div>
<div class="pure-control-group">
- <label for="field_description">
- <xsl:value-of select="php:function('lang',
'Description')"/>
- </label>
+ <label for="field_description"><xsl:value-of
select="php:function('lang', 'Description')"/></label>
<textarea rows="5" id="field_description"
name="description">
<xsl:value-of select="activity/description"/>
</textarea>
</div>
<div class="pure-control-group">
- <label for="field_parent_id">
- <h4><xsl:value-of select="php:function('lang', 'Parent
activity')"/></h4>
- </label>
+ <label for="field_parent_id"><xsl:value-of
select="php:function('lang', 'Parent activity')"/></label>
<select name="parent_id" id="field_parent_id">
<option value="0"><xsl:value-of
select="php:function('lang', 'No parent')"/></option>
<xsl:for-each select="activities">
Modified: branches/dev-syncromind/booking/templates/base/activity_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_new.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/activity_new.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -4,31 +4,25 @@
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes" select="activity/tabs"/>
- <div id="activity_add">
+ <div id="activity_add" class="booking-container">
<div class="pure-control-group">
- <label for="field_name">
- <h4><xsl:value-of select="php:function('lang',
'Activity')" /></h4>
- </label>
+ <label for="field_name"><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
<input id="field_name" name="name" type="text">
<xsl:attribute name="value"><xsl:value-of
select="activity/name"/></xsl:attribute>
</input>
</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 rows="5" id="field_description"
name="description"><xsl:value-of select="activity/description"/></textarea>
</div>
<div class="pure-control-group">
- <label for="field_parent_id">
- <h4><xsl:value-of select="php:function('lang', 'Parent
activity')" /></h4>
- </label>
+ <label for="field_parent_id">ww<xsl:value-of
select="php:function('lang', 'Parent activity')" /></label>
<select name="parent_id" id="field_parent_id">
<option value="0"><xsl:value-of
select="php:function('lang', 'No Parent')" /></option>
<xsl:for-each select="activities">
<option>
<xsl:if test="../activity/parent_id = id">
- <xsl:attribute
name="selected">selected</xsl:attribute>
+ <xsl:attribute
name="selected">selected</xsl:attribute>
</xsl:if>
<xsl:attribute name="value"><xsl:value-of
select="id"/></xsl:attribute>
<xsl:value-of select="name"/>
Modified: branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -4,19 +4,15 @@
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="resource/tabs"/>
- <div id="agegroup_edit">
+ <div id="agegroup_edit" class="booking-container">
<div class="pure-control-group">
- <label for="field_name">
- <h4><xsl:value-of select="php:function('lang',
'Name')" /></h4>
- </label>
+ <label for="field_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label>
<input id="field_name" name="name" type="text">
<xsl:attribute name="value"><xsl:value-of
select="resource/name"/></xsl:attribute>
</input>
</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="resource/active=1">
@@ -33,15 +29,11 @@
</select>
</div>
<div class="pure-control-group">
- <label for="field_sort">
- <h4><xsl:value-of select="php:function('lang', 'Sort
order')" /></h4>
- </label>
+ <label for="field_sort"><xsl:value-of
select="php:function('lang', 'Sort order')" /></label>
<input id="field_sort" name="sort" type="text"
value="{resource/sort}"/>
</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 rows="5" id="field_description"
name="description">
<xsl:value-of select="resource/description"/>
</textarea>
@@ -55,10 +47,10 @@
<a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href"><xsl:value-of
select="resource/cancel_link"></xsl:value-of></xsl:attribute>
<xsl:value-of select="php:function('lang', 'Cancel')" />
- </a>
- </div>
+ </a>
+ </div>
</form>
- <!--script type="text/javascript">
+ <script type="text/javascript">
var initialSelection = <xsl:value-of select="booking/resources_json"/>;
- </script-->
+ </script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -4,26 +4,20 @@
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="agegroup/tabs"/>
- <div id="agegroup_add">
+ <div id="agegroup_add" class="booking-container">
<div class="pure-control-group">
- <label for="field_name">
- <h4><xsl:value-of select="php:function('lang',
'Name')" /></h4>
- </label>
+ <label for="field_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label>
<input id="field_name" name="name" type="text">
<xsl:attribute name="value"><xsl:value-of
select="agegroup/name"/></xsl:attribute>
</input>
</div>
<div class="pure-control-group">
- <label for="field_sort">
- <h4><xsl:value-of select="php:function('lang', 'Sort
order')" /></h4>
- </label>
- <input id="field_sort" name="sort" type="text"
value="{agegroup/sort}"/>
+ <label for="field_sort"><xsl:value-of
select="php:function('lang', 'Sort order')" /></label>
+ <input id="field_sort" name="sort" type="text"
value="{agegroup/sort}"/>
</div>
<div class="pure-control-group">
- <label for="field_description">
- <h4><xsl:value-of select="php:function('lang',
'Description')" /></h4>
- </label>
- <textarea rows="5" id="field_description"
name="description"><xsl:value-of select="agegroup/description"/></textarea>
+ <label for="field_description"><xsl:value-of
select="php:function('lang', 'Description')" /></label>
+ <textarea rows="5" id="field_description"
name="description"><xsl:value-of select="agegroup/description"/></textarea>
</div>
</div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -8,7 +8,7 @@
<div id="allocation_delete" class="booking-container">
<div class="heading">
<legend><h3><xsl:value-of select="php:function('lang',
'Delete allocation')"/></h3></legend>
- </div>
+ </div>
<div class="pure-control-group">
<h4><xsl:value-of select="php:function('lang', 'Delete
Information')"/></h4>
<h4><xsl:value-of select="php:function('lang', 'Delete
Information2')"/></h4>
@@ -44,7 +44,7 @@
<xsl:value-of select="allocation/to_"/>
</div>
</div>
- <div class="pure-control-group">
+ <div class="pure-control-group">
<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>
Modified: branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -5,8 +5,8 @@
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="allocation/tabs"/>
<div id="allocations_edit" class="booking-container">
- <fieldset>
- <h1>#<xsl:value-of select="allocation/id"/></h1>
+ <fieldset>
+ <h1>#<xsl:value-of select="allocation/id"/></h1>
<div class="pure-control-group">
<label><xsl:value-of select="php:function('lang',
'Application')"/></label>
<xsl:if test="allocation/application_id!=''">
@@ -14,7 +14,7 @@
</xsl:if>
</div>
<div class="pure-control-group">
- <label for="field_building_name"><xsl:value-of
select="php:function('lang', 'Building')" /></label>
+ <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="allocation/building_id"/></xsl:attribute>
</input>
@@ -44,7 +44,7 @@
<label style="vertical-align:top;"><xsl:value-of
select="php:function('lang', 'Season')" /></label>
<div id="season_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
</div>
- <div class="pure-control-group">
+ <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;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/allocation_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -2,15 +2,13 @@
<style type="text/css">
.pure-control-group h4 {margin: 0px;}
</style>
-
<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="allocation/tabs"/>
<div id="allocation_new" class="booking-container">
- <input type="hidden" name="application_id"
value="{allocation/application_id}"/>
+ <input type="hidden" name="application_id"
value="{allocation/application_id}"/>
<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">
@@ -36,7 +34,7 @@
<xsl:if test="../allocation/weekday = 'monday'">
<xsl:attribute
name="selected">selected</xsl:attribute>
</xsl:if>
- <xsl:value-of select="php:function('lang',
'Monday')" />
+ <xsl:value-of select="php:function('lang',
'Monday')" />
</option>
<option value="tuesday">
<xsl:if test="weekday = 'tuesday'">
@@ -89,13 +87,13 @@
</input>
</div>
<div class="pure-control-group">
- <label for="outseason"><xsl:value-of
select="php:function('lang', 'Recurring allocation')" /></label>
+ <label><xsl:value-of select="php:function('lang',
'Recurring allocation')" /></label>
<input type="checkbox" name="outseason" id="outseason">
<xsl:if test="outseason='on'">
<xsl:attribute
name="checked">checked</xsl:attribute>
</xsl:if>
</input>
- <label style="text-align:left;margin-left:5px;"
for="outseason"><xsl:value-of select="php:function('lang', 'Out season')"
/></label>
+ <label style="text-align:left;margin-left:5px;font-weight:
normal;" for="outseason"><xsl:value-of select="php:function('lang', 'Out
season')" /></label>
</div>
<div class="pure-control-group">
<label for="field_interval"><xsl:value-of
select="php:function('lang', 'Interval')" /></label>
@@ -153,7 +151,6 @@
</a>
</div>
</form>
-
<script type="text/javascript">
var season_id = '<xsl:value-of select="allocation/season_id"/>';
var initialSelection = <xsl:value-of
select="allocation/resources_json"/>;
Modified:
branches/dev-syncromind/booking/templates/base/allocation_new_preview.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_new_preview.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/allocation_new_preview.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -1,13 +1,6 @@
<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', 'New
Allocation')"/></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="tab" value=""/>
<div id="tab-content">
@@ -29,16 +22,14 @@
<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="{.}" />
+ <input type="hidden" name="resources[]" value="{.}" />
</xsl:for-each>
-
- <h4><xsl:value-of select="php:function('lang', 'Allocations
that can be created')" /></h4>
+ <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">
@@ -57,8 +48,6 @@
</div>
</div>
</form>
-
- <!--/div-->
<script type="text/javascript">
var initialSelection = <xsl:value-of
select="allocation/resources_json"/>;
</script>
Modified: branches/dev-syncromind/booking/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/application.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -2,8 +2,6 @@
<xsl:param name="test"/>
<xsl:param name="true"/>
<xsl:param name="false"/>
-
-
<func:result>
<xsl:choose>
<xsl:when test="$test">
@@ -17,643 +15,435 @@
</func:function>
<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="application/applications_link"/></xsl:attribute>
- <xsl:value-of
select="php:function('lang', 'Applications')" />
- </a>
- </li>
- <li>#<xsl:value-of select="application/id"/></li>
- <li>
- <xsl:if test="frontend and application/status='ACCEPTED'">
- <form method="POST">
+ <style type="text/css">
+ .pure-form-contentTable {display: inline-block;}
+ </style>
+
+ <xsl:call-template name="msgbox"/>
+ <form class= "pure-form pure-form-aligned" action="" method="post"
id="form" name="form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="application/tabs"/>
+ <div id="application" class="booking-container">
+ <fieldset>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <h1><xsl:value-of select="application/id"/></h1>
+ <div class="pure-control-group">
+ <xsl:if test="frontend and
application/status='ACCEPTED'">
+ <form method="POST">
<input type="hidden" name="print"
value="ACCEPTED"/>
<input type="submit"
value="{php:function('lang', 'Print as PDF')}" />
- </form>
- </xsl:if>
- </li>
- </ul-->
-
- <style type="text/css">
- .pure-form-contentTable {display: inline-block;}
- </style>
-
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
- <form class= "pure-form pure-form-aligned" action="" method="post"
id="form" name="form">
- <input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="application/tabs"/>
- <div id="application" class="booking-container">
- <fieldset>
- <div class="pure-g">
- <div class="pure-u-1">
- <h1>
- <xsl:value-of select="application/id"/>
- </h1>
-
- <div class="pure-control-group">
- <xsl:if test="frontend and
application/status='ACCEPTED'">
- <form method="POST">
- <input type="hidden"
name="print" value="ACCEPTED"/>
- <input type="submit"
value="{php:function('lang', 'Print as PDF')}" />
- </form>
- </xsl:if>
- </div>
-
- <div class="pure-control-group">
- <xsl:if test="not(frontend)">
- <div style="border: 3px solid red;
padding: 3px 4px 3px 4px">
- <xsl:choose>
- <xsl:when
test="not(application/case_officer)">
- <xsl:value-of
select="php:function('lang', 'In order to work with this application, you must
first')"/>
- <xsl:text>
</xsl:text><a href="#assign"><xsl:value-of select="php:function('lang', 'assign
yourself')"/></a><xsl:text> </xsl:text>
- <xsl:value-of
select="php:function('lang', 'as the case officer responsible for this
application.')"/>
- </xsl:when>
- <xsl:when
test="application/case_officer and
not(application/case_officer/is_current_user)">
- <xsl:value-of
select="php:function('lang', 'The user currently assigned as the responsible
case officer for this application is')"/><xsl:text> </xsl:text>'<xsl:value-of
select="application/case_officer/name"/>'.
- <br/>
- <xsl:value-of
select="php:function('lang', 'In order to work with this application, you must
therefore first')"/>
- <xsl:text>
</xsl:text><a href="#assign"><xsl:value-of select="php:function('lang', 'assign
yourself')"/></a><xsl:text> </xsl:text>
- <xsl:value-of
select="php:function('lang', 'as the case officer responsible for this
application.')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute
name="style">display:none</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:if>
- </div>
- <xsl:if test="not(frontend)">
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Status')" /></h4>
- </label>
- <span><xsl:value-of
select="php:function('lang', string(application/status))"/></span>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Created')" /></h4>
- </label>
- <span><xsl:value-of
select="php:function('pretty_timestamp', application/created)"/></span>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Modified')" /></h4>
- </label>
- <span><xsl:value-of
select="php:function('pretty_timestamp', application/modified)"/></span>
- </div>
- </xsl:if>
- <xsl:if test="frontend">
- <dl class="proplist">
- <span style="font-size: 110%;
font-weight: bold;">Din søknad har status <xsl:value-of
select="php:function('lang', string(application/status))"/></span><span
class="text">, opprettet <xsl:value-of select="php:function('pretty_timestamp',
application/created)"/>, sist endret <xsl:value-of
select="php:function('pretty_timestamp', application/modified)"/></span>
- <span class="text"><br />Melding
fra saksbehandler ligger under historikk, deretter vises kopi av din søknad.<br
/> Skal du gi en melding til saksbehandler skriver du denne inn i feltet under
"Legg til en kommentar"</span>
- </dl>
- </xsl:if>
-
- <form method="POST">
- <div class="pure-control-group">
- <label for="comment">
- <h4><xsl:value-of
select="php:function('lang', 'Add a comment')" /></h4>
- </label>
- <textarea name="comment"
id="comment" style="width: 60%; height: 7em"></textarea><br/>
- </div>
- <div class="pure-control-group">
- <label> </label>
- <input type="submit"
value="{php:function('lang', 'Add comment')}" />
- </div>
- </form>
+ </form>
+ </xsl:if>
+ </div>
+ <div class="pure-control-group">
+ <xsl:if test="not(frontend)">
+ <div style="border: 3px solid red; padding:
3px 4px 3px 4px">
+ <xsl:choose>
+ <xsl:when
test="not(application/case_officer)">
+ <xsl:value-of
select="php:function('lang', 'In order to work with this application, you must
first')"/>
+ <xsl:text> </xsl:text><a
href="#assign"><xsl:value-of select="php:function('lang', 'assign
yourself')"/></a><xsl:text> </xsl:text>
+ <xsl:value-of
select="php:function('lang', 'as the case officer responsible for this
application.')"/>
+ </xsl:when>
+ <xsl:when
test="application/case_officer and
not(application/case_officer/is_current_user)">
+ <xsl:value-of
select="php:function('lang', 'The user currently assigned as the responsible
case officer for this application is')"/><xsl:text> </xsl:text>'<xsl:value-of
select="application/case_officer/name"/>'.
+ <br/>
+ <xsl:value-of
select="php:function('lang', 'In order to work with this application, you must
therefore first')"/>
+ <xsl:text> </xsl:text><a
href="#assign"><xsl:value-of select="php:function('lang', 'assign
yourself')"/></a><xsl:text> </xsl:text>
+ <xsl:value-of
select="php:function('lang', 'as the case officer responsible for this
application.')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="style">display:none</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
+ </xsl:if>
+ </div>
+ <xsl:if test="not(frontend)">
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'Status')" /></label>
+ <span><xsl:value-of
select="php:function('lang', string(application/status))"/></span>
</div>
-
- <div class="pure-g">
- <div class="pure-u-1">
- <div class="heading">
- <legend><h3>1. <xsl:value-of
select="php:function('lang', 'History and comments (%1)',
count(application/comments/author))" /></h3></legend>
- </div>
- <xsl:for-each
select="application/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>
- <xsl:choose>
- <xsl:when
test='contains(comment,"bookingfrontend.uidocument_building.download")'>
- <span><xsl:value-of
select="comment" disable-output-escaping="yes"/></span>
- </xsl:when>
- <xsl:otherwise>
- <span><xsl:value-of
select="comment"/></span>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:for-each>
- </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'Created')" /></label>
+ <span><xsl:value-of
select="php:function('pretty_timestamp', application/created)"/></span>
</div>
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'Modified')" /></label>
+ <span><xsl:value-of
select="php:function('pretty_timestamp', application/modified)"/></span>
+ </div>
+ </xsl:if>
+ <xsl:if test="frontend">
+ <div class="proplist">
+ <span style="font-size: 110%; font-weight:
bold;">Din søknad har status <xsl:value-of select="php:function('lang',
string(application/status))"/></span><span class="text">, opprettet
<xsl:value-of select="php:function('pretty_timestamp', application/created)"/>,
sist endret <xsl:value-of select="php:function('pretty_timestamp',
application/modified)"/></span>
+ <span class="text"><br />Melding fra
saksbehandler ligger under historikk, deretter vises kopi av din søknad.<br />
Skal du gi en melding til saksbehandler skriver du denne inn i feltet under
"Legg til en kommentar"</span>
+ </div>
+ </xsl:if>
+ <form method="POST">
+ <div class="pure-control-group">
+ <label for="comment"><xsl:value-of
select="php:function('lang', 'Add a comment')" /></label>
+ <textarea name="comment" id="comment"
style="width: 60%; height: 7em"></textarea><br/>
+ </div>
+ <div class="pure-control-group">
+ <label> </label>
+ <input type="submit"
value="{php:function('lang', 'Add comment')}" />
+ </div>
+ </form>
+ </div>
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3>1. <xsl:value-of
select="php:function('lang', 'History and comments (%1)',
count(application/comments/author))" /></h3></legend>
+ </div>
+ <xsl:for-each select="application/comments[author]">
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('pretty_timestamp', time)"/>: <xsl:value-of
select="author"/></label>
+ <xsl:choose>
+ <xsl:when
test='contains(comment,"bookingfrontend.uidocument_building.download")'>
+ <span><xsl:value-of select="comment"
disable-output-escaping="yes"/></span>
+ </xsl:when>
+ <xsl:otherwise>
+ <span><xsl:value-of
select="comment"/></span>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </xsl:for-each>
+ </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>2. <xsl:value-of
select="php:function('lang', 'Why?')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Activity')" /></label>
+ <span><xsl:value-of
select="application/activity_name"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Description')" /></label>
+ <span><xsl:value-of
select="application/description"/></span>
+ </div>
+ <!--<div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="config/application_equipment"/></h4>
+ </label>
+ <xsl:value-of select="application/equipment"/>
+ </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>2. <xsl:value-of
select="php:function('lang', 'Why?')" /></h3></legend>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Activity')" /></h4>
- </label>
- <span><xsl:value-of
select="application/activity_name"/></span>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
- </label>
- <span><xsl:value-of
select="application/description"/></span>
- </div>
- <!--<div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="config/application_equipment"/></h4>
- </label>
- <xsl:value-of
select="application/equipment"/>
- </div>-->
- </div>
-
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
- <div class="heading">
- <legend><h3>3. <xsl:value-of
select="php:function('lang', 'Where?')" /></h3></legend>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Building')" /></h4>
- </label>
- <span>
- <xsl:value-of
select="application/building_name"/>
- (<a href="javascript: void(0)"
onclick="window.open('{application/schedule_link}', '', 'width=1048,
height=600, scrollbars=yes');return false;">
- <xsl:value-of
select="php:function('lang', 'Building schedule')" />
- </a>)
- </span>
- </div>
- <!--Revizar esta linea luego-->
- <div class="pure-control-group">
- <label> </label>
- <div id="resources_container"
class="pure-form-contentTable"></div>
- </div>
- </div>
-
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
- <div class="heading">
- <legend><h3>4. <xsl:value-of
select="php:function('lang', 'When?')" /></h3></legend>
- </div>
- <script type="text/javascript">
- var allocationParams = {};
- var bookingParams = {};
- var eventParams = {};
- var applicationDate = {};
- </script>
- <xsl:variable name='assocdata'>
- <xsl:value-of select="assoc/data"
/>
- </xsl:variable>
- <xsl:variable name='collisiondata'>
- <xsl:value-of select="collision/data"
/>
- </xsl:variable>
-
- <script type="text/javascript">
- building_id = <xsl:value-of
select="application/building_id"/>;
- </script>
-
- <xsl:for-each select="application/dates">
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'From')" />:</h4>
- </label>
- <span><xsl:value-of
select="php:function('pretty_timestamp', from_)"/></span>
- <xsl:if
test="../case_officer/is_current_user">
- <xsl:if
test="contains($collisiondata, from_)">
- <xsl:if
test="not(contains($assocdata, from_))">
- <script
type="text/javascript">
-
applicationDate[<xsl:value-of select="id"/>] = '<xsl:value-of
select="substring(from_,0,11)"/>';
- </script>
- <a href="javascript:
void(0)"
-
onclick="window.open('/bookingfrontend/index.php?menuaction=bookingfrontend.uibuilding.schedule&id='+building_id+'&backend=true&date='+applicationDate[{id}],
'', 'width=1048, height=600, scrollbars=yes');return false;">
- <i class="fa
fa-exclamation-circle"></i>
- </a>
- </xsl:if>
- </xsl:if>
- </xsl:if>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'To')" />:</h4>
- </label>
- <span><xsl:value-of
select="php:function('pretty_timestamp', to_)"/></span>
- </div>
- <xsl:if test="../edit_link">
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3>3. <xsl:value-of
select="php:function('lang', 'Where?')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Building')" /></label>
+ <span>
+ <xsl:value-of
select="application/building_name"/>
+ (<a href="javascript: void(0)"
onclick="window.open('{application/schedule_link}', '', 'width=1048,
height=600, scrollbars=yes');return false;">
+ <xsl:value-of select="php:function('lang',
'Building schedule')" />
+ </a>)
+ </span>
+ </div>
+ <!--Revizar esta linea luego-->
+ <div class="pure-control-group">
+ <label> </label>
+ <div id="resources_container"
class="pure-form-contentTable"></div>
+ </div>
+ </div>
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3>4. <xsl:value-of
select="php:function('lang', 'When?')" /></h3></legend>
+ </div>
+ <script type="text/javascript">
+ var allocationParams = {};
+ var bookingParams = {};
+ var eventParams = {};
+ var applicationDate = {};
+ </script>
+ <xsl:variable name='assocdata'>
+ <xsl:value-of select="assoc/data" />
+ </xsl:variable>
+ <xsl:variable name='collisiondata'>
+ <xsl:value-of select="collision/data" />
+ </xsl:variable>
+ <script type="text/javascript">
+ building_id = <xsl:value-of
select="application/building_id"/>;
+ </script>
+ <xsl:for-each select="application/dates">
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'From')" />:</label>
+ <span><xsl:value-of
select="php:function('pretty_timestamp', from_)"/></span>
+ <xsl:if test="../case_officer/is_current_user">
+ <xsl:if test="contains($collisiondata,
from_)">
+ <xsl:if test="not(contains($assocdata,
from_))">
<script type="text/javascript">
-
allocationParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="allocation_params"/>;
-
bookingParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="booking_params"/>;
- eventParams[<xsl:value-of
select="id"/>] = <xsl:value-of select="event_params"/>;
+ applicationDate[<xsl:value-of
select="id"/>] = '<xsl:value-of select="substring(from_,0,11)"/>';
</script>
- <div class="pure-control-group">
- <label> </label>
- <select name="create"
onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
- <xsl:if
test="not(../case_officer/is_current_user)">
- <xsl:attribute
name="disabled">disabled</xsl:attribute>
- </xsl:if>
- <xsl:if
test="not(contains($assocdata, from_))">
-
<option><xsl:value-of select="php:function('lang', '- Actions -')" /></option>
-
<option><xsl:value-of select="php:function('lang', 'Create allocation')"
/></option>
-
<option><xsl:value-of select="php:function('lang', 'Create booking')"
/></option>
-
<option><xsl:value-of select="php:function('lang', 'Create event')" /></option>
- </xsl:if>
- <xsl:if
test="contains($assocdata, from_)">
- <xsl:attribute
name="disabled">disabled</xsl:attribute>
-
<option><xsl:value-of select="php:function('lang', '- Created -')" /></option>
- </xsl:if>
- </select>
- </div>
+ <a href="javascript: void(0)"
+
onclick="window.open('/bookingfrontend/index.php?menuaction=bookingfrontend.uibuilding.schedule&id='+building_id+'&backend=true&date='+applicationDate[{id}],
'', 'width=1048, height=600, scrollbars=yes');return false;">
+ <i class="fa
fa-exclamation-circle"></i>
+ </a>
</xsl:if>
- </xsl:for-each>
- </div>
-
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
- <div class="heading">
- <legend><h3>5. <xsl:value-of
select="php:function('lang', 'Who?')" /></h3></legend>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Target audience')" />
- </label>
- <div class="custom-container">
- <ul class="list-left">
- <xsl:for-each
select="audience">
- <xsl:if
test="../application/audience=id">
- <li><xsl:value-of
select="name"/></li>
- </xsl:if>
- </xsl:for-each>
- </ul>
- </div>
- </div>
- <div class="pure-control-group">
- <label style="vertical-align:
top;width: auto;">
- <h4><xsl:value-of
select="php:function('lang', 'Number of participants')" /></h4>
- </label>
- <div
class="pure-form-contentTable">
- <table id="agegroup"
class="pure-table pure-table-striped">
- <thead>
- <tr>
- <th><xsl:value-of
select="php:function('lang', 'Name')" /></th>
- <th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
- <th><xsl:value-of
select="php:function('lang', 'Female')" /></th>
- </tr>
- </thead>
- <tbody>
- <xsl:for-each
select="agegroups">
- <xsl:variable
name="id"><xsl:value-of select="id"/></xsl:variable>
- <tr>
-
<td><xsl:value-of select="name"/></td>
-
<td><xsl:value-of select="../application/agegroups/male[../agegroup_id =
$id]"/></td>
-
<td><xsl:value-of select="../application/agegroups/female[../agegroup_id =
$id]"/></td>
- </tr>
- </xsl:for-each>
- </tbody>
- </table>
- </div>
- </div>
- </div>
-
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
- <div class="heading">
- <legend><h3>6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></h3></legend>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Name')" /></h4>
- </label>
- <span><xsl:value-of
select="application/contact_name"/></span>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Email')" /></h4>
- </label>
- <span><xsl:value-of
select="application/contact_email"/></span>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Phone')" /></h4>
- </label>
- <span><xsl:value-of
select="application/contact_phone"/></span>
- </div>
- </div>
-
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
- <div class="heading">
- <legend><h3>7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></h3></legend>
- </div>
- <div class="pure-control-group">
- <xsl:if
test="application/customer_identifier_type = 'organization_number'">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'organization number')" /></h4>
- </label>
- <span><xsl:value-of
select="application/customer_organization_number"/></span>
+ </xsl:if>
+ </xsl:if>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'To')" />:</label>
+ <span><xsl:value-of
select="php:function('pretty_timestamp', to_)"/></span>
+ </div>
+ <xsl:if test="../edit_link">
+ <script type="text/javascript">
+ allocationParams[<xsl:value-of
select="id"/>] = <xsl:value-of select="allocation_params"/>;
+ bookingParams[<xsl:value-of select="id"/>]
= <xsl:value-of select="booking_params"/>;
+ eventParams[<xsl:value-of select="id"/>] =
<xsl:value-of select="event_params"/>;
+ </script>
+ <div class="pure-control-group">
+ <label> </label>
+ <select name="create"
onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
+ <xsl:if
test="not(../case_officer/is_current_user)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
</xsl:if>
- </div>
- <div class="pure-control-group">
- <xsl:if
test="application/customer_identifier_type = 'ssn'">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Date of birth or SSN')" /></h4>
- </label>
- <xsl:value-of
select="application/customer_ssn"/>
+ <xsl:if test="not(contains($assocdata,
from_))">
+ <option><xsl:value-of
select="php:function('lang', '- Actions -')" /></option>
+ <option><xsl:value-of
select="php:function('lang', 'Create allocation')" /></option>
+ <option><xsl:value-of
select="php:function('lang', 'Create booking')" /></option>
+ <option><xsl:value-of
select="php:function('lang', 'Create event')" /></option>
</xsl:if>
- </div>
+ <xsl:if test="contains($assocdata,
from_)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ <option><xsl:value-of
select="php:function('lang', '- Created -')" /></option>
+ </xsl:if>
+ </select>
</div>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3>5. <xsl:value-of
select="php:function('lang', 'Who?')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Target audience')" /></label>
+ <div class="custom-container">
+ <ul class="list-left">
+ <xsl:for-each select="audience">
+ <xsl:if
test="../application/audience=id">
+ <li><xsl:value-of
select="name"/></li>
+ </xsl:if>
+ </xsl:for-each>
+ </ul>
</div>
-
-
- <div class="pure-g">
- <div class="pure-u-1">
- <div class="heading">
- <legend><h3>8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></h3></legend>
- </div>
- <div class="pure-control-group">
- <p><xsl:value-of
select="php:function('lang', 'All that borrow premises from Stavanger Kommune
must verify that they have read the terms and conditions, this is usually fire
regulations and house rules.')" /></p>
- <br />
- <div
id='regulation_documents'> </div>
- <br />
- <p><xsl:value-of
select="php:function('lang', 'To borrow premises you must verify that you have
read terms and conditions')" /></p>
- </div>
- </div>
+ </div>
+ <div class="pure-control-group">
+ <label style="vertical-align: top;width:
auto;"><xsl:value-of select="php:function('lang', 'Number of participants')"
/></label>
+ <div class="pure-form-contentTable">
+ <table id="agegroup" class="pure-table
pure-table-striped">
+ <thead>
+ <tr>
+ <th><xsl:value-of
select="php:function('lang', 'Name')" /></th>
+ <th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
+ <th><xsl:value-of
select="php:function('lang', 'Female')" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="agegroups">
+ <xsl:variable
name="id"><xsl:value-of select="id"/></xsl:variable>
+ <tr>
+ <td><xsl:value-of
select="name"/></td>
+ <td><xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/></td>
+ <td><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
</div>
-
- <xsl:if test="not(frontend)">
- <div class="pure-g">
- <div class="pure-u-1">
- <div class="heading">
- <legend><h3><xsl:value-of
select="php:function('lang', 'Associated items')" /></h3></legend>
- </div>
- <div class="pure-control-group"><div
id="associated_container"/></div>
- </div>
- </div>
+ </div>
+ </div>
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3>6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Name')" /></label>
+ <span><xsl:value-of
select="application/contact_name"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Email')" /></label>
+ <span><xsl:value-of
select="application/contact_email"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of select="php:function('lang',
'Phone')" /></label>
+ <span><xsl:value-of
select="application/contact_phone"/></span>
+ </div>
+ </div>
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3>7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <xsl:if test="application/customer_identifier_type
= 'organization_number'">
+ <label><xsl:value-of
select="php:function('lang', 'organization number')" /></label>
+ <span><xsl:value-of
select="application/customer_organization_number"/></span>
</xsl:if>
-
- <xsl:if test="application/edit_link">
- <div class="pure-g">
- <div class="pure-u-1">
- <div class="heading">
- <legend><h3><xsl:value-of
select="php:function('lang', 'Actions')" /></h3></legend>
- </div>
- <div class="pure-control-group">
- <xsl:if
test="application/case_officer/is_current_user">
- <form method="POST"
style="display:inline">
- <input type="hidden"
name="unassign_user"/>
- <input type="submit"
value="{php:function('lang', 'Unassign me')}"/>
- </form>
- <form method="POST"
style="display:inline">
- <input type="hidden"
name="display_in_dashboard"
value="{phpgw:conditional(application/display_in_dashboard='1', '0', '1')}"/>
- <input type="submit"
value="{php:function('lang',
phpgw:conditional(application/display_in_dashboard='1', 'Hide from my Dashboard
until new activity occurs', 'Display in my Dashboard'))}"/>
- </form>
- </xsl:if>
- <xsl:if
test="not(application/case_officer/is_current_user)">
- <a name="assign"/>
- <form method="POST">
- <input type="hidden"
name="assign_to_user"/>
- <input type="hidden"
name="status" value="PENDING"/>
- <input type="submit"
value="{php:function('lang', phpgw:conditional(application/case_officer,
'Re-assign to me', 'Assign to me'))}"/>
-
- <xsl:if
test="application/case_officer">
- <xsl:value-of
select="php:function('lang', 'Currently assigned to user:')"/>
- <xsl:text> </xsl:text>
- <xsl:value-of
select="application/case_officer/name"/>
- </xsl:if>
- </form>
- </xsl:if>
- </div>
-
- <xsl:if
test="application/status!='REJECTED'">
- <dt>
- <form method="POST">
- <input
type="hidden" name="status" value="REJECTED"/>
- <input
onclick="return confirm('{php:function('lang', 'Are you sure you want to
delete?')}')" type="submit" value="{php:function('lang', 'Reject
application')}">
-
<xsl:if test="not(application/case_officer)">
-
<xsl:attribute name="disabled">disabled</xsl:attribute>
-
</xsl:if>
- </input>
- </form>
- </dt>
+ </div>
+ <div class="pure-control-group">
+ <xsl:if test="application/customer_identifier_type
= 'ssn'">
+ <label><xsl:value-of
select="php:function('lang', 'Date of birth or SSN')" /></label>
+ <xsl:value-of
select="application/customer_ssn"/>
+ </xsl:if>
+ </div>
+ </div>
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3>8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <p><xsl:value-of select="php:function('lang', 'All
that borrow premises from Stavanger Kommune must verify that they have read the
terms and conditions, this is usually fire regulations and house rules.')"
/></p>
+ <br />
+ <div id='regulation_documents'> </div>
+ <br />
+ <p><xsl:value-of select="php:function('lang', 'To
borrow premises you must verify that you have read terms and conditions')"
/></p>
+ </div>
+ </div>
+ </div>
+ <xsl:if test="not(frontend)">
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'Associated items')" /></h3></legend>
+ </div>
+ <div class="pure-control-group"><div
id="associated_container"/></div>
+ </div>
+ </div>
+ </xsl:if>
+ <xsl:if test="application/edit_link">
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'Actions')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <xsl:if
test="application/case_officer/is_current_user">
+ <form method="POST" style="display:inline">
+ <input type="hidden"
name="unassign_user"/>
+ <input type="submit"
value="{php:function('lang', 'Unassign me')}" class="pure-button
pure-button-primary" />
+ </form>
+ <form method="POST" style="display:inline">
+ <input type="hidden"
name="display_in_dashboard"
value="{phpgw:conditional(application/display_in_dashboard='1', '0', '1')}"/>
+ <input type="submit"
value="{php:function('lang',
phpgw:conditional(application/display_in_dashboard='1', 'Hide from my Dashboard
until new activity occurs', 'Display in my Dashboard'))}" class="pure-button
pure-button-primary" />
+ </form>
+ </xsl:if>
+ <xsl:if
test="not(application/case_officer/is_current_user)">
+ <a name="assign"/>
+ <form method="POST">
+ <input type="hidden"
name="assign_to_user"/>
+ <input type="hidden" name="status"
value="PENDING"/>
+ <input type="submit"
value="{php:function('lang', phpgw:conditional(application/case_officer,
'Re-assign to me', 'Assign to me'))}" class="pure-button pure-button-primary" />
+ <xsl:if
test="application/case_officer">
+ <xsl:value-of
select="php:function('lang', 'Currently assigned to user:')"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of
select="application/case_officer/name"/>
</xsl:if>
- <xsl:if
test="application/status='PENDING'">
- <xsl:if
test="num_associations='0'">
- <input type="submit"
disabled="" value="{php:function('lang', 'Accept application')}"/>
- <xsl:value-of
select="php:function('lang', 'One or more bookings, allocations or events needs
to be created before an application can be Accepted')"/>
+ </form>
+ </xsl:if>
+ </div>
+ <xsl:if test="application/status!='REJECTED'">
+ <div>
+ <form method="POST">
+ <input type="hidden" name="status"
value="REJECTED"/>
+ <input onclick="return
confirm('{php:function('lang', 'Are you sure you want to delete?')}')"
type="submit" value="{php:function('lang', 'Reject application')}"
class="pure-button pure-button-primary">
+ <xsl:if
test="not(application/case_officer)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ </xsl:if>
+ </input>
+ </form>
+ </div>
+ </xsl:if>
+ <xsl:if test="application/status='PENDING'">
+ <xsl:if test="num_associations='0'">
+ <input type="submit" disabled=""
value="{php:function('lang', 'Accept application')}" class="pure-button
pure-button-primary" />
+ <xsl:value-of select="php:function('lang',
'One or more bookings, allocations or events needs to be created before an
application can be Accepted')"/>
+ </xsl:if>
+ <xsl:if test="num_associations!='0'">
+ <div>
+ <form method="POST">
+ <input type="hidden" name="status"
value="ACCEPTED"/>
+ <input type="submit"
value="{php:function('lang', 'Accept application')}" class="pure-button
pure-button-primary" >
+ <xsl:if
test="not(application/case_officer)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
</xsl:if>
- <xsl:if
test="num_associations!='0'">
- <dt>
- <form
method="POST">
- <input
type="hidden" name="status" value="ACCEPTED"/>
- <input
type="submit" value="{php:function('lang', 'Accept application')}">
-
<xsl:if test="not(application/case_officer)">
-
<xsl:attribute name="disabled">disabled</xsl:attribute>
-
</xsl:if>
-
</input>
- </form>
- </dt>
- </xsl:if>
- </xsl:if>
- <!--dd><br/><a
href="{application/dashboard_link}"><xsl:value-of select="php:function('lang',
'Back to Dashboard')" /></a></dd-->
+ </input>
+ </form>
</div>
- </div>
+ </xsl:if>
</xsl:if>
- </fieldset>
+ <!--dd><br/><a
href="{application/dashboard_link}"><xsl:value-of select="php:function('lang',
'Back to Dashboard')" /></a></dd-->
</div>
</div>
- <dl class="proplist-col">
- <xsl:if test="application/edit_link">
- <button class="pure-button pure-button-primary">
- <xsl:if
test="application/case_officer/is_current_user">
- <xsl:attribute
name="onclick">window.location.href='<xsl:value-of
select="application/edit_link"/>'</xsl:attribute>
- </xsl:if>
- <xsl:if
test="not(application/case_officer/is_current_user)">
- <xsl:attribute
name="disabled">disabled</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'Edit')" />
- </button>
+ </xsl:if>
+ </fieldset>
+ </div>
+ </div>
+ <div class="proplist-col">
+ <xsl:if test="application/edit_link">
+ <button class="pure-button pure-button-primary">
+ <xsl:if
test="application/case_officer/is_current_user">
+ <xsl:attribute
name="onclick">window.location.href='<xsl:value-of
select="application/edit_link"/>'</xsl:attribute>
</xsl:if>
+ <xsl:if
test="not(application/case_officer/is_current_user)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', 'Edit')" />
+ </button>
+ </xsl:if>
+ <a class="pure-button pure-button-primary"
href="{application/dashboard_link}"><xsl:value-of select="php:function('lang',
'Back to Dashboard')" /></a>
+ </div>
+ </form>
+ <script type="text/javascript">
+ var resourceIds = '<xsl:value-of select="application/resource_ids"/>';
+ var currentuser = '<xsl:value-of select="application/currentuser"/>';
+ if (!resourceIds || resourceIds == "") {
+ resourceIds = false;
+ }
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resources',
'Resource Type', 'No records found', 'ID', 'Type', 'From', 'To', 'Document',
'Active' ,'Delete', 'del')"/>;
+ var app_id = <xsl:value-of select="application/id"/>;
+ var building_id = <xsl:value-of select="application/building_id"/>;
+ var resources = <xsl:value-of select="application/resources"/>;
- <a class="pure-button pure-button-primary"
href="{application/dashboard_link}"><xsl:value-of select="php:function('lang',
'Back to Dashboard')" /></a>
- </dl>
- </form>
- <!--/div-->
-
-<script type="text/javascript">
- var resourceIds = '<xsl:value-of select="application/resource_ids"/>';
- var currentuser = '<xsl:value-of select="application/currentuser"/>';
- if (!resourceIds || resourceIds == "") {
- resourceIds = false;
- }
- var lang = <xsl:value-of select="php:function('js_lang', 'Resources',
'Resource Type', 'No records found', 'ID', 'Type', 'From', 'To', 'Document',
'Active' ,'Delete', 'del')"/>;
- var app_id = <xsl:value-of select="application/id"/>;
- var building_id = <xsl:value-of select="application/building_id"/>;
- var resources = <xsl:value-of select="application/resources"/>;
-
<![CDATA[
var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
var associatedURL =
'index.php?menuaction=booking.uiapplication.associated&sort=from_&dir=asc&phpgw_return_as=json&filter_application_id='+app_id;
- var documentsURL =
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'
+ building_id;
- documentsURL +=
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=resource::'+
resources;
+ var documentsURL =
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'
+ building_id;
+ documentsURL +=
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=resource::'+
resources;
]]>
-
-
+
var colDefsResources = [{key: 'name', label: lang['Resources'],
formatter: genericLink}, {key: 'type', label: lang['Resource Type']}];
-
+
if (currentuser == 1) {
- var colDefsAssociated = [
- {key: 'id', label: lang['ID'], formatter: genericLink},
- {key: 'type', label: lang['Type']},
- {key: 'from_', label: lang['From']},
- {key: 'to_', label: lang['To']},
- {key: 'active', label: lang['Active']},
- {key: 'dellink', label: lang['Delete'], formatter:
genericLink2}];
+ var colDefsAssociated = [
+ {key: 'id', label: lang['ID'], formatter: genericLink},
+ {key: 'type', label: lang['Type']},
+ {key: 'from_', label: lang['From']},
+ {key: 'to_', label: lang['To']},
+ {key: 'active', label: lang['Active']},
+ {key: 'dellink', label: lang['Delete'], formatter:
genericLink2}];
} else {
- var colDefsAssociated = [
- {key: 'id', label: lang['ID'], formatter: genericLink},
- {key: 'type', label: lang['Type']},
- {key: 'from_', label: lang['From']},
- {key: 'to_', label: lang['To']},
- {key: 'active', label: lang['Active']}];
+ var colDefsAssociated = [
+ {key: 'id', label: lang['ID'], formatter: genericLink},
+ {key: 'type', label: lang['Type']},
+ {key: 'from_', label: lang['From']},
+ {key: 'to_', label: lang['To']},
+ {key: 'active', label: lang['Active']}];
}
-
+
var colDefsDocuments = [{key: 'name', label: lang['Document'],
formatter: genericLink}];
-
+
createTable('resources_container',resourcesURL,colDefsResources);
createTable('associated_container',associatedURL,colDefsAssociated,'results');
createTable('regulation_documents',documentsURL,colDefsDocuments);
-
-
-/*
-
-
- $.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>';
- ]]>
- });
- }
- <![CDATA[
- var resourcesTable = '<table
class="'+resourcesTableClass+'"><thead><tr><th>'+lang['Resources']+'</th><th>'+lang['Resource
Type']+'</th></tr></thead><tbody>'+resourcesBody+'</tbody></table>';
- ]]>
- $('#resources_container').html(resourcesTable);
- });
-
- $.get(associatedURL, function(associatedData){
- var associatedBody = '';
- var associatedTableClass = "pure-table";
- <![CDATA[
- var associatedHead =
'<th>'+lang['ID']+'</th><th>'+lang['Type']+'</th><th>'+lang['From']+'</th><th>'+lang['To']+'</th><th>'+lang['Active']+'</th>';
- ]]>
- if (currentuser == 1) {
- associatedColspan = 6;
- associatedHead += '<th>'+lang['Delete']+'</th>'
- } else {
- associatedColspan = 5;
- }
- if (associatedData.results.length === 0){
- associatedBody += '<tr><td
colspan="'+associatedColspan+'">'+lang['No records found']+'</td></tr>';
- }else{
- associatedTableClass = "pure-table pure-table-striped";
- $.each(associatedData.results, function(index, value){
- <![CDATA[
- associatedBody += '<tr>';
- associatedBody += '<td><a
href="'+value.link+'">'+value.id+'</a></td><td>'+value.type+'</td><td>'+value.from_+'</td><td>'+value.to_+'</td><td>'+value.active+'</td>';
- ]]>
- if (currentuser == 1){
- <![CDATA[
- associatedBody += '<td><a onclick="return confirm(\'Er
du sikker på at du vil slette denne?\';"
href="'+value.dellink+'">slett</a></td>';
- ]]>
- }
- <![CDATA[
- associatedBody += '</tr>';
- ]]>
- });
- }
- <![CDATA[
- var associatedTable = '<table
class="'+associatedTableClass+'"><thead><tr>'+associatedHead+'</tr></thead><tbody>'+associatedBody+'</tbody></table>';
- ]]>
- $('#associated_container').html(associatedTable);
- });
-
- $.get(documentsURL, function(documentsData) {
- var documentsBody = '';
- var documentsTableClass = "pure-table";
- <![CDATA[
- var documentsHead = '<tr><th>'+lang['Document']+'</th><tr>';
- ]]>
- if (documentsData.data.length === 0){
- documentsBody += '<tr><td>'+lang['No records
found']+'</td></tr>';
- }else{
- documentsTableClass = "pure-table pure-table-striped";
- $.each(documentsData.data, function(index, value) {
- <![CDATA[
- documentsBody += '<tr><td><a
href='+value.link+'>'+value.name+'</a></td><tr>';
- ]]>
- });
- };
- <![CDATA[
- var documentsTable = '<table
class="'+documentsTableClass+'"><thead>'+documentsHead+'</thead><tbody>'+documentsBody+'</tbody></table>';
- ]]>
- $('#regulation_documents').html(documentsTable);
- });
-
-
-
-
-
-
-
-
-
-
-
-YAHOO.util.Event.addListener(window, "load", function() {
- <![CDATA[
- var url3 =
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'
+ building_id;
- url3 +=
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=resource::'+
resources;
-
- ]]>
- var colDefs = [{key: 'name', label: lang['Document'], formatter:
YAHOO.booking.formatLink}];
- YAHOO.booking.inlineTableHelper('regulation_documents', url3, colDefs);
- if (resourceIds) {
- <![CDATA[
- var url =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
- var url2 =
'index.php?menuaction=booking.uiapplication.associated&sort=from_&dir=asc&phpgw_return_as=json&filter_application_id='+app_id;
- ]]>
- var colDefs = [{key: 'name', label: lang['Resources'], formatter:
YAHOO.booking.formatLink}, {key: 'type', label: lang['Resource Type']}];
- YAHOO.booking.inlineTableHelper('resources_container', url,
colDefs);
- if (currentuser == 1) {
- var colDefs = [
- {key: 'id', label: lang['ID'], formatter:
YAHOO.booking.formatLink},
- {key: 'type', label: lang['Type']},
- {key: 'from_', label: lang['From']},
- {key: 'to_', label: lang['To']},
- {key: 'active', label: lang['Active']},
- {key: 'dellink', label: lang['Delete'],
formatter: YAHOO.booking.formatLink2}];
- } else {
- var colDefs = [
- {key: 'id', label: lang['ID'], formatter:
YAHOO.booking.formatLink},
- {key: 'type', label: lang['Type']},
- {key: 'from_', label: lang['From']},
- {key: 'to_', label: lang['To']},
- {key: 'active', label: lang['Active']}];
- }
- YAHOO.booking.inlineTableHelper('associated_container', url2,
colDefs);
- }
-
-});
-*/
-</script>
+ </script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/application_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_edit.xsl
2015-10-13 23:26:22 UTC (rev 14167)
+++ branches/dev-syncromind/booking/templates/base/application_edit.xsl
2015-10-13 23:28:05 UTC (rev 14168)
@@ -2,324 +2,279 @@
<style type="text/css">
#agegroup td {padding: 0 0.3em;}
</style>
- <!--div id="content"-->
- <h3></h3>
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST" id='application_form' class= "pure-form
pure-form-stacked" name="application_form">
- <input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="application/tabs"/>
- <div id="application_edit">
- <fieldset>
- <h1>
- <xsl:value-of select="php:function('lang',
'Application')"/> (<xsl:value-of select="application/id"/>)
- </h1>
-
- <div class="pure-g pure-form pure-form-aligned">
- <div class="pure-u-1">
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Active')"/></h4>
- </label>
- <select id="field_active" name="active">
- <option value="1">
- <xsl:if
test="application/active=1">
- <xsl:attribute
name="selected">checked</xsl:attribute>
+ <h3></h3>
+ <xsl:call-template name="msgbox"/>
+ <form action="" method="POST" id='application_form' class= "pure-form
pure-form-stacked" name="application_form">
+ <input type="hidden" name="tab" value=""/>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="application/tabs"/>
+ <div id="application_edit" class="booking-container">
+ <fieldset>
+ <h1><xsl:value-of select="php:function('lang',
'Application')"/> (<xsl:value-of select="application/id"/>)</h1>
+ <div class="pure-g pure-form pure-form-aligned">
+ <div class="pure-u-1">
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'Active')"/></label>
+ <select id="field_active" name="active">
+ <option value="1">
+ <xsl:if test="application/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="application/active=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Inactive')"/>
+ </option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3>1. <xsl:value-of
select="php:function('lang', 'Why?')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <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">
+ <option>
+ <xsl:if
test="../application/activity_id = id">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
</xsl:if>
- <xsl:value-of
select="php:function('lang', 'Active')"/>
+ <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
+ <xsl:value-of select="name"/>
</option>
- <option value="0">
- <xsl:if
test="application/active=0">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Inactive')"/>
- </option>
- </select>
- </div>
+ </xsl:for-each>
+ </select>
</div>
+ <div class="pure-control-group">
+ <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="application/description"/></textarea>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_equipment"><xsl:value-of
select="php:function('lang', 'Equipment')" /></label>
+ <textarea id="field_equipment"
class="full-width pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3"
name="equipment"><xsl:value-of select="application/equipment"/></textarea>
+ </div>
</div>
-
- <div class="pure-g">
- <div class="pure-u-1">
- <div class="heading">
- <legend><h3>1. <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>
- <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">
- <option>
- <xsl:if
test="../application/activity_id = id">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
- <xsl:value-of select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </div>
- <div class="pure-control-group">
- <label for="field_description">
- <h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
- </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="application/description"/></textarea>
- </div>
- <div class="pure-control-group">
- <label for="field_equipment">
- <h4><xsl:value-of
select="php:function('lang', 'Equipment')" /></h4>
- </label>
- <textarea id="field_equipment"
class="full-width pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3"
name="equipment"><xsl:value-of select="application/equipment"/></textarea>
- </div>
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14168] fixing forms,
Saul <=