fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [14560] booking: formatting code


From: Sigurd Nes
Subject: [Fmsystem-commits] [14560] booking: formatting code
Date: Thu, 10 Dec 2015 13:24:03 +0000

Revision: 14560
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14560
Author:   sigurdne
Date:     2015-12-10 13:24:02 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
booking: formatting code

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.xsl
    branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
    branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
    branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
    branches/dev-syncromind/booking/templates/base/allocation_info.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/async_settings_form.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.xsl
    branches/dev-syncromind/booking/templates/base/booking_delete.xsl
    branches/dev-syncromind/booking/templates/base/booking_delete_preview.xsl
    branches/dev-syncromind/booking/templates/base/booking_edit.xsl
    branches/dev-syncromind/booking/templates/base/booking_info.xsl
    branches/dev-syncromind/booking/templates/base/booking_new.xsl
    branches/dev-syncromind/booking/templates/base/booking_new_preview.xsl
    branches/dev-syncromind/booking/templates/base/building.xsl
    branches/dev-syncromind/booking/templates/base/building_form.xsl
    branches/dev-syncromind/booking/templates/base/building_schedule.xsl
    branches/dev-syncromind/booking/templates/base/completed_reservation.xsl
    
branches/dev-syncromind/booking/templates/base/completed_reservation_edit.xsl
    
branches/dev-syncromind/booking/templates/base/completed_reservation_export.xsl
    
branches/dev-syncromind/booking/templates/base/completed_reservation_export_file.xsl
    
branches/dev-syncromind/booking/templates/base/completed_reservation_export_form.xsl
    branches/dev-syncromind/booking/templates/base/config.tpl
    branches/dev-syncromind/booking/templates/base/contactperson.xsl
    branches/dev-syncromind/booking/templates/base/contactperson_edit.xsl
    branches/dev-syncromind/booking/templates/base/contactperson_fields.xsl
    branches/dev-syncromind/booking/templates/base/contactperson_magic.xsl
    branches/dev-syncromind/booking/templates/base/customer_identifier.xsl
    branches/dev-syncromind/booking/templates/base/dashboard.xsl
    branches/dev-syncromind/booking/templates/base/datatable.xsl
    branches/dev-syncromind/booking/templates/base/document_form.xsl
    branches/dev-syncromind/booking/templates/base/documentation_form.xsl
    branches/dev-syncromind/booking/templates/base/email_index.xsl
    branches/dev-syncromind/booking/templates/base/email_preview.xsl
    branches/dev-syncromind/booking/templates/base/email_receipt.xsl
    branches/dev-syncromind/booking/templates/base/equipment.xsl
    branches/dev-syncromind/booking/templates/base/equipment_edit.xsl
    branches/dev-syncromind/booking/templates/base/equipment_new.xsl
    branches/dev-syncromind/booking/templates/base/event_edit.xsl
    branches/dev-syncromind/booking/templates/base/event_info.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/helpers.xsl
    branches/dev-syncromind/booking/templates/base/mail_settings.xsl
    branches/dev-syncromind/booking/templates/base/massbooking_schedule.xsl
    branches/dev-syncromind/booking/templates/base/metasettings.xsl
    branches/dev-syncromind/booking/templates/base/organization.xsl
    branches/dev-syncromind/booking/templates/base/organization_edit.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_index.xsl
    branches/dev-syncromind/booking/templates/base/report_new.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.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/season_new.xsl
    branches/dev-syncromind/booking/templates/base/season_wtemplate.xsl
    
branches/dev-syncromind/booking/templates/base/season_wtemplate_allocation.xsl
    branches/dev-syncromind/booking/templates/base/settings.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-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/account_code_dimension.xsl   
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,232 +1,318 @@
 <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-aligned" name="form">
-        <input type="hidden" name="tab" value=""/>
-        <div id="tab-content">
-            <xsl:value-of disable-output-escaping="yes" select="data/tabs"/>
-            <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>
-                </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>
-                </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>
-                </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>
-                </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>
-                </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>
-                </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>
-                </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>
-                </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>
-                </div>
-                <div class="pure-control-group">
-                    <div class="heading">
-                        <legend><h3><xsl:value-of select="php:function('lang', 
'External account')"/></h3></legend>
-                    </div>
-                </div>
-                <div class="pure-control-group">
-                    <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>
-                </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>
-                </div>
-                <div class="pure-control-group">
-                    <div class="heading"><legend><h3><xsl:value-of 
select="php:function('lang', 'Internal account')"/></h3></legend></div>
-                </div>
-                <div class="pure-control-group">
-                    <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>
-                </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>
-                </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>
-                </div>
-                <div class="pure-control-group">
-                    <div class="heading"><legend><h3><xsl:value-of 
select="php:function('lang', 'Export agresso')"/></h3></legend></div>
-                </div>
-                <div class="pure-control-group">
-                    <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>
-                </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>
-                </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>
-                </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>
-                </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>
-                </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>
-                </div>
-                <div class="pure-control-group">
-                    <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">
-                <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Save')"/></xsl:attribute>
-            </input>
-        </div>
-    </form>
+       <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="data/tabs"/>
+                       <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>
+                               </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>
+                               </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>
+                               </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>
+                               </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>
+                               </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>
+                               </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>
+                               </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>
+                               </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>
+                               </div>
+                               <div class="pure-control-group">
+                                       <div class="heading">
+                                               <legend>
+                                                       <h3>
+                                                               <xsl:value-of 
select="php:function('lang', 'External account')"/>
+                                                       </h3>
+                                               </legend>
+                                       </div>
+                               </div>
+                               <div class="pure-control-group">
+                                       <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>
+                               </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>
+                               </div>
+                               <div class="pure-control-group">
+                                       <div class="heading">
+                                               <legend>
+                                                       <h3>
+                                                               <xsl:value-of 
select="php:function('lang', 'Internal account')"/>
+                                                       </h3>
+                                               </legend>
+                                       </div>
+                               </div>
+                               <div class="pure-control-group">
+                                       <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>
+                               </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>
+                               </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>
+                               </div>
+                               <div class="pure-control-group">
+                                       <div class="heading">
+                                               <legend>
+                                                       <h3>
+                                                               <xsl:value-of 
select="php:function('lang', 'Export agresso')"/>
+                                                       </h3>
+                                               </legend>
+                                       </div>
+                               </div>
+                               <div class="pure-control-group">
+                                       <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>
+                               </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>
+                               </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>
+                               </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>
+                               </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>
+                               </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>
+                               </div>
+                               <div class="pure-control-group">
+                                       <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">
+                               <xsl:attribute name="value">
+                                       <xsl:value-of 
select="php:function('lang', 'Save')"/>
+                               </xsl:attribute>
+                       </input>
+               </div>
+       </form>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/account_code_set.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_set.xsl 
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/account_code_set.xsl 
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,95 +1,127 @@
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-    <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="account_code_set/tabs"/>
-            <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">
-                    <xsl:if test="config_data/dim_3">
-                        <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">
-                    <xsl:if test="config_data/article">
-                        <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><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">
-                    <xsl:if test="config_data/dim_value_4">
-                        <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">
-                    <xsl:if test="config_data/dim_value_5">
-                        <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">
-                    <!--xsl:if test="config_data/external_format != 
'KOMMFAKT'"-->
-                        <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">
-                    <xsl:if test="config_data/dim_1">
-                        <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">
-                    <xsl:if test="config_data/dim_2">
-                        <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><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><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'">
-                        <label><xsl:value-of select="php:function('lang', 
'Reference')" /></label>
-                    </xsl:if>
-                </div>
-                <div class="pure-control-group">
-                    <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>
-        </div>
+       <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="account_code_set/tabs"/>
+                       <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">
+                                       <xsl:if test="config_data/dim_3">
+                                               <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">
+                                       <xsl:if test="config_data/article">
+                                               <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>
+                                                       <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">
+                                       <xsl:if test="config_data/dim_value_4">
+                                               <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">
+                                       <xsl:if test="config_data/dim_value_5">
+                                               <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">
+                                       <!--xsl:if 
test="config_data/external_format != 'KOMMFAKT'"-->
+                                       <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">
+                                       <xsl:if test="config_data/dim_1">
+                                               <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">
+                                       <xsl:if test="config_data/dim_2">
+                                               <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>
+                                                       <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>
+                                                       <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'">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'Reference')" />
+                                               </label>
+                                       </xsl:if>
+                               </div>
+                               <div class="pure-control-group">
+                                       <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>
+               </div>
                <div class="form-buttons">
                        <xsl:if test="account_code_set/permission/write">
                                <input type="button" class="pure-button 
pure-button-primary" name="cancel">
                                        <xsl:attribute 
name="onclick">window.location="<xsl:value-of 
select="account_code_set/edit_link"/>"</xsl:attribute>
-                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('lang', 'Edit')" 
/></xsl:attribute>
+                                       <xsl:attribute name="value">
+                                               <xsl:value-of 
select="php:function('lang', 'Edit')" />
+                                       </xsl:attribute>
                                </input>
                        </xsl:if>
                        <input type="button" class="pure-button 
pure-button-primary" name="cancel">
                                <xsl:attribute 
name="onclick">window.location="<xsl:value-of 
select="account_code_set/cancel_link"/>"</xsl:attribute>
-                               <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Cancel')" /></xsl:attribute>
+                               <xsl:attribute name="value">
+                                       <xsl:value-of 
select="php:function('lang', 'Cancel')" />
+                               </xsl:attribute>
                        </input>                
                </div>
-    </form>
+       </form>
 </xsl:template>

Modified: 
branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl    
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/account_code_set_form.xsl    
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,204 +1,230 @@
 <func:function name="phpgw:conditional">
-    <xsl:param name="test"/>
-    <xsl:param name="true"/>
-    <xsl:param name="false"/>
-    <func:result>
-        <xsl:choose>
-            <xsl:when test="$test">
-                <xsl:value-of select="$true"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$false"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </func:result>
+       <xsl:param name="test"/>
+       <xsl:param name="true"/>
+       <xsl:param name="false"/>
+       <func:result>
+               <xsl:choose>
+                       <xsl:when test="$test">
+                               <xsl:value-of select="$true"/>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:value-of select="$false"/>
+                       </xsl:otherwise>
+               </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" 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"><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">
-                                    <xsl:attribute name="data-validation">
-                                        <xsl:text>required</xsl:text>
-                                    </xsl:attribute>
-                                    <xsl:attribute 
name="data-validation-error-msg">
-                                        <xsl:value-of 
select="php:function('lang', 'Please enter a name')" />
-                                    </xsl:attribute>
-                                </input>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="pure-g">
-                        <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"><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:attribute name="data-validation">
-                                            <xsl:text>required</xsl:text>
-                                        </xsl:attribute>
-                                        <xsl:attribute 
name="data-validation-error-msg">
-                                            <xsl:value-of 
select="php:function('lang', 'Please enter an object number')" />
-                                        </xsl:attribute>
-                                    </input>
-                                </xsl:if>
-                            </div>
-                            <div class="pure-control-group">
-                                <xsl:if test="config_data/article">
-                                    <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:attribute name="data-validation">
-                                            <xsl:text>required</xsl:text>
-                                        </xsl:attribute>
-                                        <xsl:attribute 
name="data-validation-error-msg">
-                                            <xsl:value-of 
select="php:function('lang', 'Please enter an article')" />
-                                        </xsl:attribute>
-                                    </input>
-                                </xsl:if>
-                            </div>
-                            <div class="pure-control-group">
-                                <xsl:if test="config_data/dim_value_1">
-                                    <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:attribute name="data-validation">
-                                            <xsl:text>required</xsl:text>
-                                        </xsl:attribute>
-                                        <xsl:attribute 
name="data-validation-error-msg">
-                                            <xsl:value-of 
select="php:function('lang', 'Please enter an unit number')" />
-                                        </xsl:attribute>
-                                    </input>
-                                </xsl:if>
-                            </div>
-                            <div class="pure-control-group">
-                                <xsl:if test="config_data/dim_value_4">
-                                    <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"><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"><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:attribute name="data-validation">
-                                            <xsl:text>required</xsl:text>
-                                        </xsl:attribute>
-                                        <xsl:attribute 
name="data-validation-error-msg">
-                                            <xsl:value-of 
select="php:function('lang', 'Please enter an unit prefix')" />
-                                        </xsl:attribute>
-                                    </input>
-                                <!--/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"><xsl:value-of 
select="php:function('lang', 'Active')"/></label>
-                                <select id="field_active" name="active" 
class="pure-u-1">
-                                    <xsl:attribute name="data-validation">
-                                        <xsl:text>required</xsl:text>
-                                    </xsl:attribute>
-                                    <xsl:attribute 
name="data-validation-error-msg">
-                                        <xsl:value-of 
select="php:function('lang', 'Please select an status')" />
-                                    </xsl:attribute>
-                                    <xsl:if test="new_form">
-                                        <xsl:attribute 
name="disabled">disabled</xsl:attribute>
-                                    </xsl:if>
-                                    <option value="1">
-                                        <xsl:if 
test="account_code_set/active=1">
-                                            <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                        </xsl:if>
-                                        <xsl:value-of 
select="php:function('lang', 'Active')"/>
-                                    </option>
-                                    <option value="0">
-                                        <xsl:if 
test="account_code_set/active=0">
-                                            <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                        </xsl:if>
-                                        <xsl:value-of 
select="php:function('lang', 'Inactive')"/>
-                                    </option>
-                                </select>
-                            </div>
-                            <div class="pure-control-group">
-                                <xsl:if test="config_data/dim_1">
-                                    <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:attribute name="data-validation">
-                                            <xsl:text>required</xsl:text>
-                                        </xsl:attribute>
-                                        <xsl:attribute 
name="data-validation-error-msg">
-                                            <xsl:value-of 
select="php:function('lang', 'Please enter a responsible code')" />
-                                        </xsl:attribute>
-                                    </input>
-                                </xsl:if>
-                            </div>
-                            <div class="pure-control-group">
-                                <xsl:if test="config_data/dim_2">
-                                    <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:attribute name="data-validation">
-                                            <xsl:text>required</xsl:text>
-                                        </xsl:attribute>
-                                        <xsl:attribute 
name="data-validation-error-msg">
-                                            <xsl:value-of 
select="php:function('lang', 'Please enter a service')" />
-                                        </xsl:attribute>
-                                    </input>
-                                </xsl:if>
-                            </div>
-                            <div class="pure-control-group">
-                                <xsl:if test="config_data/dim_4">
-                                    <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"><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:attribute name="data-validation">
-                                            <xsl:text>required</xsl:text>
-                                        </xsl:attribute>
-                                        <xsl:attribute 
name="data-validation-error-msg">
-                                            <xsl:value-of 
select="php:function('lang', 'Please enter a project number')" />
-                                        </xsl:attribute>
-                                    </input>
-                                </xsl:if>
-                            </div>
-                        </div>
-                    </div>
-                    <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"><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">
-                                <xsl:if test="config_data/external_format = 
'KOMMFAKT'">
-                                    <label><xsl:value-of 
select="php:function('lang', 'Reference')" /></label>
-                                </xsl:if>
-                                <input size="120" 
id="field_invoice_instruction" name="invoice_instruction" 
value="{account_code_set/invoice_instruction}" />
-                            </div-->
-                        </div>
-                    </div>
-                </fieldset>
-            </div>
-        </div>
-        <div class="form-buttons">
-            <input type="submit" value="{php:function('lang', 
phpgw:conditional(new_form, 'Create', 'Save'))}" class="button pure-button 
pure-button-primary"/>
-            <a class="cancel pure-button pure-button-primary" 
href="{account_code_set/cancel_link}">
-                <xsl:value-of select="php:function('lang', 'Cancel')" />
-            </a>
-        </div>
-    </form>
+       <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" 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">
+                                                                       
<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">
+                                                                       
<xsl:attribute name="data-validation">
+                                                                               
<xsl:text>required</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:attribute name="data-validation-error-msg">
+                                                                               
<xsl:value-of select="php:function('lang', 'Please enter a name')" />
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                       </div>
+                                               </div>
+                                       </div>
+                                       <div class="pure-g">
+                                               <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">
+                                                                               
<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:attribute name="data-validation">
+                                                                               
        <xsl:text>required</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                               
<xsl:attribute name="data-validation-error-msg">
+                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter an object 
number')" />
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </xsl:if>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <xsl:if 
test="config_data/article">
+                                                                       <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:attribute name="data-validation">
+                                                                               
        <xsl:text>required</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                               
<xsl:attribute name="data-validation-error-msg">
+                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter an article')" 
/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </xsl:if>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <xsl:if 
test="config_data/dim_value_1">
+                                                                       <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:attribute name="data-validation">
+                                                                               
        <xsl:text>required</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                               
<xsl:attribute name="data-validation-error-msg">
+                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter an unit 
number')" />
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </xsl:if>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <xsl:if 
test="config_data/dim_value_4">
+                                                                       <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">
+                                                                               
<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">
+                                                                       
<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:attribute name="data-validation">
+                                                                               
<xsl:text>required</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:attribute name="data-validation-error-msg">
+                                                                               
<xsl:value-of select="php:function('lang', 'Please enter an unit prefix')" />
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                               <!--/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">
+                                                                       
<xsl:value-of select="php:function('lang', 'Active')"/>
+                                                               </label>
+                                                               <select 
id="field_active" name="active" class="pure-u-1">
+                                                                       
<xsl:attribute name="data-validation">
+                                                                               
<xsl:text>required</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:attribute name="data-validation-error-msg">
+                                                                               
<xsl:value-of select="php:function('lang', 'Please select an status')" />
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="new_form">
+                                                                               
<xsl:attribute name="disabled">disabled</xsl:attribute>
+                                                                       
</xsl:if>
+                                                                       <option 
value="1">
+                                                                               
<xsl:if test="account_code_set/active=1">
+                                                                               
        <xsl:attribute name="selected">selected</xsl:attribute>
+                                                                               
</xsl:if>
+                                                                               
<xsl:value-of select="php:function('lang', 'Active')"/>
+                                                                       
</option>
+                                                                       <option 
value="0">
+                                                                               
<xsl:if test="account_code_set/active=0">
+                                                                               
        <xsl:attribute name="selected">selected</xsl:attribute>
+                                                                               
</xsl:if>
+                                                                               
<xsl:value-of select="php:function('lang', 'Inactive')"/>
+                                                                       
</option>
+                                                               </select>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <xsl:if 
test="config_data/dim_1">
+                                                                       <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:attribute name="data-validation">
+                                                                               
        <xsl:text>required</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                               
<xsl:attribute name="data-validation-error-msg">
+                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a responsible 
code')" />
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </xsl:if>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <xsl:if 
test="config_data/dim_2">
+                                                                       <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:attribute name="data-validation">
+                                                                               
        <xsl:text>required</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                               
<xsl:attribute name="data-validation-error-msg">
+                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a service')" />
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </xsl:if>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <xsl:if 
test="config_data/dim_4">
+                                                                       <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">
+                                                                               
<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:attribute name="data-validation">
+                                                                               
        <xsl:text>required</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                               
<xsl:attribute name="data-validation-error-msg">
+                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a project 
number')" />
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </xsl:if>
+                                                       </div>
+                                               </div>
+                                       </div>
+                                       <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">
+                                                                       
<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">
+                                                               <xsl:if 
test="config_data/external_format = 'KOMMFAKT'">
+                                                                       
<label><xsl:value-of select="php:function('lang', 'Reference')" /></label>
+                                                               </xsl:if>
+                                                               <input 
size="120" id="field_invoice_instruction" name="invoice_instruction" 
value="{account_code_set/invoice_instruction}" />
+                                                       </div-->
+                                               </div>
+                                       </div>
+                               </fieldset>
+                       </div>
+               </div>
+               <div class="form-buttons">
+                       <input type="submit" value="{php:function('lang', 
phpgw:conditional(new_form, 'Create', 'Save'))}" class="button pure-button 
pure-button-primary"/>
+                       <a class="cancel pure-button pure-button-primary" 
href="{account_code_set/cancel_link}">
+                               <xsl:value-of select="php:function('lang', 
'Cancel')" />
+                       </a>
+               </div>
+       </form>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/activities.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activities.xsl       
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/activities.xsl       
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,161 +1,173 @@
 <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)"-->
-                        <table id="toolbar_table" class="pure-table">
-                            <thead>
-                                <tr>
-                                    <th>
-                                        <xsl:value-of 
select="php:function('lang', 'name')"/>
-                                    </th>
-                                    <th>
-                                        <xsl:value-of 
select="php:function('lang', 'item')"/>
-                                    </th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>
-                                    </td>
-                                    <td>
-                                        <xsl:if test="links/add">
-                                            <input type="button" 
class="pure-button pure-button-primary">
-                                                <xsl:attribute 
name="onclick">javascript:window.open('<xsl:value-of select="links/add"/>', 
"_self");</xsl:attribute>
-                                                <xsl:attribute 
name="value"><xsl:value-of select="php:function('lang', 'Add Activity')" 
/></xsl:attribute>
-                                                <xsl:attribute 
name="id">new-button</xsl:attribute>
-                                            </input>
-                                        </xsl:if>
-                                    </td>
+               #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>
+                                                                       <th>
+                                                                               
<xsl:value-of select="php:function('lang', 'name')"/>
+                                                                       </th>
+                                                                       <th>
+                                                                               
<xsl:value-of select="php:function('lang', 'item')"/>
+                                                                       </th>
+                                                               </tr>
+                                                       </thead>
+                                                       <tbody>
+                                                               <tr>
+                                                                       <td>
+                                                                       </td>
+                                                                       <td>
+                                                                               
<xsl:if test="links/add">
+                                                                               
        <input type="button" class="pure-button pure-button-primary">
+                                                                               
                <xsl:attribute 
name="onclick">javascript:window.open('<xsl:value-of select="links/add"/>', 
"_self");</xsl:attribute>
+                                                                               
                <xsl:attribute name="value">
+                                                                               
                        <xsl:value-of select="php:function('lang', 'Add 
Activity')" />
+                                                                               
                </xsl:attribute>
+                                                                               
                <xsl:attribute name="id">new-button</xsl:attribute>
+                                                                               
        </input>
+                                                                               
</xsl:if>
+                                                                       </td>
 
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td>
-                                        <xsl:if test="not(show_all='1')">
-                                            <input type="button" 
class="pure-button pure-button-primary">
-                                                <xsl:attribute 
name="onclick">javascript:window.open('<xsl:value-of 
select="links/show_inactive"/>', "_self");</xsl:attribute>
-                                                <xsl:attribute 
name="value"><xsl:value-of select="php:function('lang', 'show all')" 
/></xsl:attribute>
-                                                <xsl:attribute 
name="id">new-button</xsl:attribute>
-                                            </input>
-                                        </xsl:if>
-                                        <xsl:if test="show_all='1'">
-                                            <input type="button" 
class="pure-button pure-button-primary">
-                                                <xsl:attribute 
name="onclick">javascript:window.open('<xsl:value-of 
select="links/hide_inactive"/>', "_self");</xsl:attribute>
-                                                <xsl:attribute 
name="value"><xsl:value-of select="php:function('lang', 'Show only active')" 
/></xsl:attribute>
-                                                <xsl:attribute 
name="id">new-button</xsl:attribute>
-                                            </input>
-                                        </xsl:if>
-                                    </td>
-                                </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">
-                        <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>
-        </div>
-    </div>
-    <script type="text/javascript">
-        $("#treeDiv").jstree({
-            "core" : {
-                "multiple" : false,
-                "themes" : { "stripes" : true },
-                "data" : activities,
-            },
-            "plugins" : [ "themes","html_data","ui","state" ]
-        });
+                                                               </tr>
+                                                               <tr>
+                                                                       
<td></td>
+                                                                       <td>
+                                                                               
<xsl:if test="not(show_all='1')">
+                                                                               
        <input type="button" class="pure-button pure-button-primary">
+                                                                               
                <xsl:attribute 
name="onclick">javascript:window.open('<xsl:value-of 
select="links/show_inactive"/>', "_self");</xsl:attribute>
+                                                                               
                <xsl:attribute name="value">
+                                                                               
                        <xsl:value-of select="php:function('lang', 'show all')" 
/>
+                                                                               
                </xsl:attribute>
+                                                                               
                <xsl:attribute name="id">new-button</xsl:attribute>
+                                                                               
        </input>
+                                                                               
</xsl:if>
+                                                                               
<xsl:if test="show_all='1'">
+                                                                               
        <input type="button" class="pure-button pure-button-primary">
+                                                                               
                <xsl:attribute 
name="onclick">javascript:window.open('<xsl:value-of 
select="links/hide_inactive"/>', "_self");</xsl:attribute>
+                                                                               
                <xsl:attribute name="value">
+                                                                               
                        <xsl:value-of select="php:function('lang', 'Show only 
active')" />
+                                                                               
                </xsl:attribute>
+                                                                               
                <xsl:attribute name="id">new-button</xsl:attribute>
+                                                                               
        </input>
+                                                                               
</xsl:if>
+                                                                       </td>
+                                                               </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">
+                                               <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>
+               </div>
+       </div>
+       <script type="text/javascript">
+               $("#treeDiv").jstree({
+               "core" : {
+               "multiple" : false,
+               "themes" : { "stripes" : true },
+               "data" : activities,
+               },
+               "plugins" : [ "themes","html_data","ui","state" ]
+               });
 
-        var count1 = 0;
-        $("#treeDiv").bind("select_node.jstree", function (event, data) {
-            count1 += 1;
-            var divd = 
data.instance.get_node(data.selected[0]).original['href']; 
-            if(count1 > 1)
-            {
-                window.location.href = divd; 
-            }
-        });
+               var count1 = 0;
+               $("#treeDiv").bind("select_node.jstree", function (event, data) 
{
+               count1 += 1;
+               var divd = 
data.instance.get_node(data.selected[0]).original['href'];
+               if(count1 > 1)
+               {
+               window.location.href = divd;
+               }
+               });
 
-        $('#collapse').on('click',function(){
-            $(this).attr('href','javascript:;');
-            $('#treeDiv').jstree('close_all');
-        })
-        $('#expand').on('click',function(){
-            $(this).attr('href','javascript:;');
-            $('#treeDiv').jstree('open_all');
-        });
-    </script>
+               $('#collapse').on('click',function(){
+               $(this).attr('href','javascript:;');
+               $('#treeDiv').jstree('close_all');
+               })
+               $('#expand').on('click',function(){
+               $(this).attr('href','javascript:;');
+               $('#treeDiv').jstree('open_all');
+               });
+       </script>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/activity_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_edit.xsl    
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/activity_edit.xsl    
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,72 +1,88 @@
 <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-aligned" name="form">
-        <input type="hidden" name="tab" value=""/>
-        <div id="tab-content">
-            <xsl:value-of disable-output-escaping="yes" 
select="activity/tabs"/>
-            <div id="activity_edit" class="booking-container">
-                <div class="pure-control-group">
-                    <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>
-                        <xsl:attribute name="data-validation">
-                            <xsl:text>required</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="data-validation-error-msg">
-                            <xsl:value-of select="php:function('lang', 'Please 
enter an name')" />
-                        </xsl:attribute>
-                    </input>
-                </div>
-                <div class="pure-control-group">
-                    <label for="field_active"><xsl:value-of 
select="php:function('lang', 'Active')" /></label>
-                    <select id="field_active" name="active">
-                        <option value="1">
-                            <xsl:if test="activity/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="activity/active=0">
-                                <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>
-                    <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"><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:if>
-                                <xsl:attribute name="value">
-                                    <xsl:value-of select="id"/>
-                                </xsl:attribute>
-                                <xsl:value-of select="name"/>
-                            </option>
-                        </xsl:for-each>
-                    </select>
-                </div>
-            </div>
-        </div>
-        <div class="form-buttons">
-            <input type="submit" class="button pure-button 
pure-button-primary">
-                <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Save')"/></xsl:attribute>
-            </input>
-            <a class="cancel pure-button pure-button-primary">
-                <xsl:attribute name="href"><xsl:value-of 
select="activity/cancel_link"></xsl:value-of></xsl:attribute>
-                <xsl:value-of select="php:function('lang', 'Cancel')"/>
-            </a>
-        </div>
-    </form>
+       <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="activity/tabs"/>
+                       <div id="activity_edit" class="booking-container">
+                               <div class="pure-control-group">
+                                       <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>
+                                               <xsl:attribute 
name="data-validation">
+                                                       
<xsl:text>required</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute 
name="data-validation-error-msg">
+                                                       <xsl:value-of 
select="php:function('lang', 'Please enter an name')" />
+                                               </xsl:attribute>
+                                       </input>
+                               </div>
+                               <div class="pure-control-group">
+                                       <label for="field_active">
+                                               <xsl:value-of 
select="php:function('lang', 'Active')" />
+                                       </label>
+                                       <select id="field_active" name="active">
+                                               <option value="1">
+                                                       <xsl:if 
test="activity/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="activity/active=0">
+                                                               <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>
+                                       <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">
+                                               <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:if>
+                                                               <xsl:attribute 
name="value">
+                                                                       
<xsl:value-of select="id"/>
+                                                               </xsl:attribute>
+                                                               <xsl:value-of 
select="name"/>
+                                                       </option>
+                                               </xsl:for-each>
+                                       </select>
+                               </div>
+                       </div>
+               </div>
+               <div class="form-buttons">
+                       <input type="submit" class="button pure-button 
pure-button-primary">
+                               <xsl:attribute name="value">
+                                       <xsl:value-of 
select="php:function('lang', 'Save')"/>
+                               </xsl:attribute>
+                       </input>
+                       <a class="cancel pure-button pure-button-primary">
+                               <xsl:attribute name="href">
+                                       <xsl:value-of 
select="activity/cancel_link"></xsl:value-of>
+                               </xsl:attribute>
+                               <xsl:value-of select="php:function('lang', 
'Cancel')"/>
+                       </a>
+               </div>
+       </form>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/activity_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_new.xsl     
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/activity_new.xsl     
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,51 +1,69 @@
 <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-aligned" name="form">
-        <input type="hidden" name="tab" value=""/>
-        <div id="tab-content">
-        <xsl:value-of disable-output-escaping="yes" select="activity/tabs"/>
-            <div id="activity_add" class="booking-container">
-                <div class="pure-control-group">
-                    <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>
-                        <xsl:attribute name="data-validation">
-                            <xsl:text>required</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="data-validation-error-msg">
-                            <xsl:value-of select="php:function('lang', 'Please 
enter a name')" />
-                        </xsl:attribute>
-                    </input>
-                </div>
-                <div class="pure-control-group">
-                    <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"><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:if>
-                                    <xsl:attribute name="value"><xsl:value-of 
select="id"/></xsl:attribute>
-                                    <xsl:value-of select="name"/>
-                                </option>
-                        </xsl:for-each>
-                    </select>
-                </div>
-            </div>
-        </div>
-        <div class="form-buttons">
-            <input type="submit" class="button pure-button 
pure-button-primary">
-                <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Add')" /></xsl:attribute>
-            </input>
-            <a class="cancel pure-button pure-button-primary">
-                <xsl:attribute name="href"><xsl:value-of 
select="activity/cancel_link"/></xsl:attribute>
-                <xsl:value-of select="php:function('lang', 'Cancel')" />
-            </a>
-        </div>
-    </form>
+       <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="activity/tabs"/>
+                       <div id="activity_add" class="booking-container">
+                               <div class="pure-control-group">
+                                       <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>
+                                               <xsl:attribute 
name="data-validation">
+                                                       
<xsl:text>required</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute 
name="data-validation-error-msg">
+                                                       <xsl:value-of 
select="php:function('lang', 'Please enter a name')" />
+                                               </xsl:attribute>
+                                       </input>
+                               </div>
+                               <div class="pure-control-group">
+                                       <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">
+                                               <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:if>
+                                                               <xsl:attribute 
name="value">
+                                                                       
<xsl:value-of select="id"/>
+                                                               </xsl:attribute>
+                                                               <xsl:value-of 
select="name"/>
+                                                       </option>
+                                               </xsl:for-each>
+                                       </select>
+                               </div>
+                       </div>
+               </div>
+               <div class="form-buttons">
+                       <input type="submit" class="button pure-button 
pure-button-primary">
+                               <xsl:attribute name="value">
+                                       <xsl:value-of 
select="php:function('lang', 'Add')" />
+                               </xsl:attribute>
+                       </input>
+                       <a class="cancel pure-button pure-button-primary">
+                               <xsl:attribute name="href">
+                                       <xsl:value-of 
select="activity/cancel_link"/>
+                               </xsl:attribute>
+                               <xsl:value-of select="php:function('lang', 
'Cancel')" />
+                       </a>
+               </div>
+       </form>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl    
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/agegroup_edit.xsl    
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,94 +1,108 @@
 <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-aligned" name="form">
-        <input type="hidden" name="tab" value=""/>
-        <div id="tab-content">
-            <xsl:value-of disable-output-escaping="yes" 
select="resource/tabs"/>
-            <div id="agegroup_edit" class="booking-container">
-                <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">
-                        <xsl:attribute name="data-validation">
-                            <xsl:text>required</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="data-validation-error-msg">
-                            <xsl:value-of select="php:function('lang', 'Please 
select an activity')" />
-                        </xsl:attribute>
-                        <xsl:attribute name="disabled">disabled</xsl:attribute>
-                        <xsl:for-each select="activities">
-                            <option>
-                                <xsl:if test="selected = 1">
-                                    <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_name"><xsl:value-of 
select="php:function('lang', 'Name')" /></label>
-                    <input id="field_name" name="name" type="text">
-                        <xsl:attribute name="data-validation">
-                            <xsl:text>required</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="data-validation-error-msg">
-                            <xsl:value-of select="php:function('lang', 'Please 
enter a name')" />
-                        </xsl:attribute>
-                        <xsl:attribute name="value"><xsl:value-of 
select="resource/name"/></xsl:attribute>
-                    </input>
-                </div>
-                <div class="pure-control-group">
-                    <label for="field_active"><xsl:value-of 
select="php:function('lang', 'Active')" /></label>
-                    <select id="field_active" name="active">
-                        <option value="1">
-                            <xsl:if test="resource/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="resource/active=0">
-                                <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_sort"><xsl:value-of 
select="php:function('lang', 'Sort order')" /></label>
-                    <input id="field_sort" name="sort" type="text" 
value="{resource/sort}">
-                        <xsl:attribute name="data-validation">
-                            <xsl:text>required</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="data-validation-error-msg">
-                            <xsl:value-of select="php:function('lang', 'Please 
enter a sort order')" />
-                        </xsl:attribute>
-                    </input>
-                </div>
-                <div class="pure-control-group">
-                    <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>
-                </div>
-            </div>
-        </div>
-        <div class="form-buttons">
-            <input type="submit" class="button pure-button 
pure-button-primary">
-                <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Update')" /></xsl:attribute>
-            </input>
-            <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>
-    </form>
-    <script type="text/javascript">
-       var initialSelection = <xsl:value-of select="booking/resources_json"/>;
-    </script>
+       <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="resource/tabs"/>
+                       <div id="agegroup_edit" class="booking-container">
+                               <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">
+                                               <xsl:attribute 
name="data-validation">
+                                                       
<xsl:text>required</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute 
name="data-validation-error-msg">
+                                                       <xsl:value-of 
select="php:function('lang', 'Please select an activity')" />
+                                               </xsl:attribute>
+                                               <xsl:attribute 
name="disabled">disabled</xsl:attribute>
+                                               <xsl:for-each 
select="activities">
+                                                       <option>
+                                                               <xsl:if 
test="selected = 1">
+                                                                       
<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_name">
+                                               <xsl:value-of 
select="php:function('lang', 'Name')" />
+                                       </label>
+                                       <input id="field_name" name="name" 
type="text">
+                                               <xsl:attribute 
name="data-validation">
+                                                       
<xsl:text>required</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute 
name="data-validation-error-msg">
+                                                       <xsl:value-of 
select="php:function('lang', 'Please enter a name')" />
+                                               </xsl:attribute>
+                                               <xsl:attribute name="value">
+                                                       <xsl:value-of 
select="resource/name"/>
+                                               </xsl:attribute>
+                                       </input>
+                               </div>
+                               <div class="pure-control-group">
+                                       <label for="field_active">
+                                               <xsl:value-of 
select="php:function('lang', 'Active')" />
+                                       </label>
+                                       <select id="field_active" name="active">
+                                               <option value="1">
+                                                       <xsl:if 
test="resource/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="resource/active=0">
+                                                               <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_sort">
+                                               <xsl:value-of 
select="php:function('lang', 'Sort order')" />
+                                       </label>
+                                       <input id="field_sort" name="sort" 
type="text" value="{resource/sort}">
+                                               <xsl:attribute 
name="data-validation">
+                                                       
<xsl:text>required</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute 
name="data-validation-error-msg">
+                                                       <xsl:value-of 
select="php:function('lang', 'Please enter a sort order')" />
+                                               </xsl:attribute>
+                                       </input>
+                               </div>
+                               <div class="pure-control-group">
+                                       <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>
+                               </div>
+                       </div>
+               </div>
+               <div class="form-buttons">
+                       <input type="submit" class="button pure-button 
pure-button-primary">
+                               <xsl:attribute name="value">
+                                       <xsl:value-of 
select="php:function('lang', 'Update')" />
+                               </xsl:attribute>
+                       </input>
+                       <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>
+       </form>
+       <script type="text/javascript">
+               var initialSelection = <xsl:value-of 
select="booking/resources_json"/>;
+       </script>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/agegroup_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/agegroup_new.xsl     
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/agegroup_new.xsl     
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,77 +1,91 @@
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-    <xsl:call-template name="msgbox"/>
-    <form action="" method="POST" class="pure-form pure-form-aligned" 
id="form" name="form">
-        <input type="hidden" name="tab" value=""/>
-        <div id="tab-content">
-            <xsl:variable name="lang_select_activity">
-                <xsl:value-of select="php:function('lang', '-- select an 
activity --')" />
-            </xsl:variable>
-            <xsl:value-of disable-output-escaping="yes" 
select="agegroup/tabs"/>
-            <div id="agegroup_add" class="booking-container">
-                <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">
-                        <xsl:attribute name="data-validation">
-                            <xsl:text>required</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="data-validation-error-msg">
-                            <xsl:value-of select="php:function('lang', 'Please 
select an activity')" />
-                        </xsl:attribute>
-                        <option value="">
-                            <xsl:value-of select="$lang_select_activity" />
-                        </option>
-                        <xsl:for-each select="activities">
-                            <option>
-                                <xsl:if test="selected = 1">
-                                    <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_name"><xsl:value-of 
select="php:function('lang', 'Name')" /></label>
-                    <input id="field_name" name="name" type="text">
-                        <xsl:attribute name="data-validation">
-                            <xsl:text>required</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="data-validation-error-msg">
-                            <xsl:value-of select="php:function('lang', 'Please 
enter a name')" />
-                        </xsl:attribute>
-                        <xsl:attribute name="value"><xsl:value-of 
select="agegroup/name"/></xsl:attribute>
-                    </input>
-                </div>
-                <div class="pure-control-group">
-                    <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}">
-                        <xsl:attribute name="data-validation">
-                            <xsl:text>required</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="data-validation-error-msg">
-                            <xsl:value-of select="php:function('lang', 'Please 
enter a sort order')" />
-                        </xsl:attribute>
-                    </input>
-                </div>
-                <div class="pure-control-group">
-                    <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>
-        <div class="form-buttons">
-            <input type="submit" class="pure-button pure-button-primary">
-                <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Create')" /></xsl:attribute>
-            </input>
-            <a class="cancel pure-button pure-button-primary">
-                <xsl:attribute name="href"><xsl:value-of 
select="agegroup/cancel_link"/></xsl:attribute>
-                <xsl:value-of select="php:function('lang', 'Cancel')" />
-            </a>
-        </div>
-    </form>
+       <xsl:call-template name="msgbox"/>
+       <form action="" method="POST" class="pure-form pure-form-aligned" 
id="form" name="form">
+               <input type="hidden" name="tab" value=""/>
+               <div id="tab-content">
+                       <xsl:variable name="lang_select_activity">
+                               <xsl:value-of select="php:function('lang', '-- 
select an activity --')" />
+                       </xsl:variable>
+                       <xsl:value-of disable-output-escaping="yes" 
select="agegroup/tabs"/>
+                       <div id="agegroup_add" class="booking-container">
+                               <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">
+                                               <xsl:attribute 
name="data-validation">
+                                                       
<xsl:text>required</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute 
name="data-validation-error-msg">
+                                                       <xsl:value-of 
select="php:function('lang', 'Please select an activity')" />
+                                               </xsl:attribute>
+                                               <option value="">
+                                                       <xsl:value-of 
select="$lang_select_activity" />
+                                               </option>
+                                               <xsl:for-each 
select="activities">
+                                                       <option>
+                                                               <xsl:if 
test="selected = 1">
+                                                                       
<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_name">
+                                               <xsl:value-of 
select="php:function('lang', 'Name')" />
+                                       </label>
+                                       <input id="field_name" name="name" 
type="text">
+                                               <xsl:attribute 
name="data-validation">
+                                                       
<xsl:text>required</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute 
name="data-validation-error-msg">
+                                                       <xsl:value-of 
select="php:function('lang', 'Please enter a name')" />
+                                               </xsl:attribute>
+                                               <xsl:attribute name="value">
+                                                       <xsl:value-of 
select="agegroup/name"/>
+                                               </xsl:attribute>
+                                       </input>
+                               </div>
+                               <div class="pure-control-group">
+                                       <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}">
+                                               <xsl:attribute 
name="data-validation">
+                                                       
<xsl:text>required</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:attribute 
name="data-validation-error-msg">
+                                                       <xsl:value-of 
select="php:function('lang', 'Please enter a sort order')" />
+                                               </xsl:attribute>
+                                       </input>
+                               </div>
+                               <div class="pure-control-group">
+                                       <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>
+               <div class="form-buttons">
+                       <input type="submit" class="pure-button 
pure-button-primary">
+                               <xsl:attribute name="value">
+                                       <xsl:value-of 
select="php:function('lang', 'Create')" />
+                               </xsl:attribute>
+                       </input>
+                       <a class="cancel pure-button pure-button-primary">
+                               <xsl:attribute name="href">
+                                       <xsl:value-of 
select="agegroup/cancel_link"/>
+                               </xsl:attribute>
+                               <xsl:value-of select="php:function('lang', 
'Cancel')" />
+                       </a>
+               </div>
+       </form>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/allocation.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation.xsl       
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/allocation.xsl       
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,55 +1,65 @@
 <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-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="allocations" class="booking-container">
-                <h1>
-                    <xsl:value-of select="allocation/organization_name"/>
-                </h1>
-                <div class="pure-control-group">
-                    <label><xsl:value-of select="php:function('lang', 'From')" 
/></label>
-                    <xsl:value-of select="php:function('pretty_timestamp', 
allocation/from_)"/>
-                </div>
-                <div class="pure-control-group">
-                    <label><xsl:value-of select="php:function('lang', 'To')" 
/></label>
-                    <xsl:value-of select="php:function('pretty_timestamp', 
allocation/to_)"/>
-                </div>
-                <div class="pure-control-group">
-                    <label><xsl:value-of select="php:function('lang', 
'Season')" /></label>
-                    <xsl:value-of select="allocation/season_name"/>
-                </div>
-                <div class="pure-control-group">
-                    <label><xsl:value-of select="php:function('lang', 
'Organization')" /></label>
-                    <xsl:value-of select="allocation/organization_name"/>
-                </div>
-                <div class="pure-control-group">
-                    <label style="vertical-align:top;"><xsl:value-of 
select="php:function('lang', 'Resources')" /></label>
-                    <div id="resources_container" 
style="display:inline-block;"></div>
-                </div>
-            </div>
-        </div>
-    </form>
-    <div class="pure-control-group">
-        <xsl:if test="allocation/permission/write">
-        <button class="pure-button pure-button-primary">
-            <xsl:attribute name="onclick">window.location.href="<xsl:value-of 
select="allocation/edit_link"/>"</xsl:attribute>
-            <xsl:value-of select="php:function('lang', 'Edit')" />
-        </button>
-        <button class="pure-button pure-button-primary">
-            <xsl:attribute name="onclick">window.location.href="<xsl:value-of 
select="allocation/delete_link"/>"</xsl:attribute>
-            <xsl:value-of select="php:function('lang', 'Delete')" />
-        </button>
-        </xsl:if>
-    </div>
-<script type="text/javascript">
-    var resourceIds = '<xsl:value-of select="allocation/resource_ids"/>';
-    var lang = <xsl:value-of select="php:function('js_lang', 'Name', 'Resource 
Type')"/>;
+       <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="allocations" class="booking-container">
+                               <h1>
+                                       <xsl:value-of 
select="allocation/organization_name"/>
+                               </h1>
+                               <div class="pure-control-group">
+                                       <label>
+                                               <xsl:value-of 
select="php:function('lang', 'From')" />
+                                       </label>
+                                       <xsl:value-of 
select="php:function('pretty_timestamp', allocation/from_)"/>
+                               </div>
+                               <div class="pure-control-group">
+                                       <label>
+                                               <xsl:value-of 
select="php:function('lang', 'To')" />
+                                       </label>
+                                       <xsl:value-of 
select="php:function('pretty_timestamp', allocation/to_)"/>
+                               </div>
+                               <div class="pure-control-group">
+                                       <label>
+                                               <xsl:value-of 
select="php:function('lang', 'Season')" />
+                                       </label>
+                                       <xsl:value-of 
select="allocation/season_name"/>
+                               </div>
+                               <div class="pure-control-group">
+                                       <label>
+                                               <xsl:value-of 
select="php:function('lang', 'Organization')" />
+                                       </label>
+                                       <xsl:value-of 
select="allocation/organization_name"/>
+                               </div>
+                               <div class="pure-control-group">
+                                       <label style="vertical-align:top;">
+                                               <xsl:value-of 
select="php:function('lang', 'Resources')" />
+                                       </label>
+                                       <div id="resources_container" 
style="display:inline-block;"></div>
+                               </div>
+                       </div>
+               </div>
+       </form>
+       <div class="pure-control-group">
+               <xsl:if test="allocation/permission/write">
+                       <button class="pure-button pure-button-primary">
+                               <xsl:attribute 
name="onclick">window.location.href="<xsl:value-of 
select="allocation/edit_link"/>"</xsl:attribute>
+                               <xsl:value-of select="php:function('lang', 
'Edit')" />
+                       </button>
+                       <button class="pure-button pure-button-primary">
+                               <xsl:attribute 
name="onclick">window.location.href="<xsl:value-of 
select="allocation/delete_link"/>"</xsl:attribute>
+                               <xsl:value-of select="php:function('lang', 
'Delete')" />
+                       </button>
+               </xsl:if>
+       </div>
+       <script type="text/javascript">
+               var resourceIds = '<xsl:value-of 
select="allocation/resource_ids"/>';
+               var lang = <xsl:value-of select="php:function('js_lang', 
'Name', 'Resource Type')"/>;
     <![CDATA[
         var resourcesURL = 
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&' 
+ resourceIds;
     ]]>
-    var colDefs = [{key: 'name', label: lang['Name'], formatter: 
genericLink()}, {key: 'type', label: lang['Resource Type']}];
-    createTable('resources_container',resourcesURL,colDefs);
-</script>
+               var colDefs = [{key: 'name', label: lang['Name'], formatter: 
genericLink()}, {key: 'type', label: lang['Resource Type']}];
+               createTable('resources_container',resourcesURL,colDefs);
+       </script>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/allocation_delete.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_delete.xsl        
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/allocation_delete.xsl        
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,123 +1,149 @@
 <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-aligned" name="form">
-        <fieldset>
-            <input type="hidden" name="tab" value=""/>
-            <div id="tab-content">
-                <xsl:value-of disable-output-escaping="yes" 
select="allocation/tabs"/>
-                <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 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>
-                    </div>
-                    <div class="pure-control-group">
-                        <input type="hidden" name="application_id" 
value="{allocation/application_id}"/>
-                        <input id="field_org_id" name="organization_id" 
type="hidden" value="{allocation/organization_id}" />
-                        <input id="field_building_id" name="building_id" 
type="hidden" value="{allocation/building_id}" />
-                        <input id="field_from" name="from_" type="hidden" 
value="{allocation/from_}" />
-                        <input id="field_to" name="to_" type="hidden" 
value="{allocation/to_}" />
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_building" 
style="vertical-align:top;"><xsl:value-of select="php:function('lang', 
'Building')" /></label>
-                        <div class="autocomplete" 
style="display:inline-block;">
-                            <xsl:value-of select="allocation/building_name"/>
-                        </div>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_org" 
style="vertical-align:top;"><xsl:value-of select="php:function('lang', 
'Organization')" /></label>
-                        <div class="autocomplete" 
style="display:inline-block;">
-                            <xsl:value-of 
select="allocation/organization_name"/>
-                        </div>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_from" 
style="vertical-align:top;"><xsl:value-of select="php:function('lang', 'From')" 
/></label>
-                        <div style="display:inline-block;">
-                            <xsl:value-of select="allocation/from_"/>
-                        </div>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_to" 
style="vertical-align:top;"><xsl:value-of select="php:function('lang', 'To')" 
/></label>
-                        <div style="display:inline-block;">
-                            <xsl:value-of select="allocation/to_"/>
-                        </div>
-                    </div>
-                    <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>
-                                <label style="display: block 
!important;text-align: left !important;">
-                                    <input type="checkbox" name="outseason" 
id="outseason">
-                                        <xsl:if test="outseason='on'">
-                                            <xsl:attribute 
name="checked">checked</xsl:attribute>
-                                        </xsl:if>
-                                    </input>
-                                    <xsl:value-of select="php:function('lang', 
'Out season')" />
-                                </label>
-                                <label style="display: block 
!important;text-align: left !important;">
-                                    <input type="checkbox" name="recurring" 
id="recurring">
-                                        <xsl:if test="recurring='on'">
-                                            <xsl:attribute 
name="checked">checked</xsl:attribute>
-                                        </xsl:if>
-                                    </input>
-                                    <xsl:value-of select="php:function('lang', 
'Delete until')" />
-                                </label>
-                            </div>
-                            <div>
-                                <input class="datetime" 
id="field_repeat_until" name="repeat_until" type="text">
-                                    <xsl:attribute name="value"><xsl:value-of 
select="repeat_until"/></xsl:attribute>
-                                </input>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="pure-control-group">
-                        <label><xsl:value-of select="php:function('lang', 
'Interval')" /></label>
-                        <xsl:value-of select="../field_interval" />
-                        <select id="field_interval" name="field_interval">
-                            <option value="1">
-                                <xsl:if test="interval=1">
-                                    <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                </xsl:if>
-                                <xsl:value-of select="php:function('lang', '1 
week')" />
-                            </option>
-                            <option value="2">
-                                <xsl:if test="interval=2">
-                                    <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                </xsl:if>
-                                <xsl:value-of select="php:function('lang', '2 
weeks')" />
-                            </option>
-                            <option value="3">
-                                <xsl:if test="interval=3">
-                                    <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                </xsl:if>
-                                <xsl:value-of select="php:function('lang', '3 
weeks')" />
-                            </option>
-                            <option value="4">
-                                <xsl:if test="interval=4">
-                                    <xsl:attribute 
name="selected">selected</xsl:attribute>
-                                </xsl:if>
-                                <xsl:value-of select="php:function('lang', '4 
weeks')" />
-                            </option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-        </fieldset>
-        <div class="form-buttons">
-            <input type="submit" class="pure-button pure-button-primary">
-                <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Delete')"/></xsl:attribute>
-            </input>
-            <a class="cancel pure-button pure-button-primary">
-                <xsl:attribute name="href"><xsl:value-of 
select="allocation/cancel_link"/></xsl:attribute>
-                <xsl:value-of select="php:function('lang', 'Cancel')" />
-            </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"/>;
-        var lang = <xsl:value-of select="php:function('js_lang', 'Resource 
Type')"/>;
-    </script>
+       <xsl:call-template name="msgbox"/>
+       <form action="" method="POST" id='form' class="pure-form 
pure-form-aligned" name="form">
+               <fieldset>
+                       <input type="hidden" name="tab" value=""/>
+                       <div id="tab-content">
+                               <xsl:value-of disable-output-escaping="yes" 
select="allocation/tabs"/>
+                               <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 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>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <input type="hidden" 
name="application_id" value="{allocation/application_id}"/>
+                                               <input id="field_org_id" 
name="organization_id" type="hidden" value="{allocation/organization_id}" />
+                                               <input id="field_building_id" 
name="building_id" type="hidden" value="{allocation/building_id}" />
+                                               <input id="field_from" 
name="from_" type="hidden" value="{allocation/from_}" />
+                                               <input id="field_to" name="to_" 
type="hidden" value="{allocation/to_}" />
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_building" 
style="vertical-align:top;">
+                                                       <xsl:value-of 
select="php:function('lang', 'Building')" />
+                                               </label>
+                                               <div class="autocomplete" 
style="display:inline-block;">
+                                                       <xsl:value-of 
select="allocation/building_name"/>
+                                               </div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_org" 
style="vertical-align:top;">
+                                                       <xsl:value-of 
select="php:function('lang', 'Organization')" />
+                                               </label>
+                                               <div class="autocomplete" 
style="display:inline-block;">
+                                                       <xsl:value-of 
select="allocation/organization_name"/>
+                                               </div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_from" 
style="vertical-align:top;">
+                                                       <xsl:value-of 
select="php:function('lang', 'From')" />
+                                               </label>
+                                               <div 
style="display:inline-block;">
+                                                       <xsl:value-of 
select="allocation/from_"/>
+                                               </div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_to" 
style="vertical-align:top;">
+                                                       <xsl:value-of 
select="php:function('lang', 'To')" />
+                                               </label>
+                                               <div 
style="display:inline-block;">
+                                                       <xsl:value-of 
select="allocation/to_"/>
+                                               </div>
+                                       </div>
+                                       <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>
+                                                               <label 
style="display: block !important;text-align: left !important;">
+                                                                       <input 
type="checkbox" name="outseason" id="outseason">
+                                                                               
<xsl:if test="outseason='on'">
+                                                                               
        <xsl:attribute name="checked">checked</xsl:attribute>
+                                                                               
</xsl:if>
+                                                                       </input>
+                                                                       
<xsl:value-of select="php:function('lang', 'Out season')" />
+                                                               </label>
+                                                               <label 
style="display: block !important;text-align: left !important;">
+                                                                       <input 
type="checkbox" name="recurring" id="recurring">
+                                                                               
<xsl:if test="recurring='on'">
+                                                                               
        <xsl:attribute name="checked">checked</xsl:attribute>
+                                                                               
</xsl:if>
+                                                                       </input>
+                                                                       
<xsl:value-of select="php:function('lang', 'Delete until')" />
+                                                               </label>
+                                                       </div>
+                                                       <div>
+                                                               <input 
class="datetime" id="field_repeat_until" name="repeat_until" type="text">
+                                                                       
<xsl:attribute name="value">
+                                                                               
<xsl:value-of select="repeat_until"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                       </div>
+                                               </div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'Interval')" />
+                                               </label>
+                                               <xsl:value-of 
select="../field_interval" />
+                                               <select id="field_interval" 
name="field_interval">
+                                                       <option value="1">
+                                                               <xsl:if 
test="interval=1">
+                                                                       
<xsl:attribute name="selected">selected</xsl:attribute>
+                                                               </xsl:if>
+                                                               <xsl:value-of 
select="php:function('lang', '1 week')" />
+                                                       </option>
+                                                       <option value="2">
+                                                               <xsl:if 
test="interval=2">
+                                                                       
<xsl:attribute name="selected">selected</xsl:attribute>
+                                                               </xsl:if>
+                                                               <xsl:value-of 
select="php:function('lang', '2 weeks')" />
+                                                       </option>
+                                                       <option value="3">
+                                                               <xsl:if 
test="interval=3">
+                                                                       
<xsl:attribute name="selected">selected</xsl:attribute>
+                                                               </xsl:if>
+                                                               <xsl:value-of 
select="php:function('lang', '3 weeks')" />
+                                                       </option>
+                                                       <option value="4">
+                                                               <xsl:if 
test="interval=4">
+                                                                       
<xsl:attribute name="selected">selected</xsl:attribute>
+                                                               </xsl:if>
+                                                               <xsl:value-of 
select="php:function('lang', '4 weeks')" />
+                                                       </option>
+                                               </select>
+                                       </div>
+                               </div>
+                       </div>
+               </fieldset>
+               <div class="form-buttons">
+                       <input type="submit" class="pure-button 
pure-button-primary">
+                               <xsl:attribute name="value">
+                                       <xsl:value-of 
select="php:function('lang', 'Delete')"/>
+                               </xsl:attribute>
+                       </input>
+                       <a class="cancel pure-button pure-button-primary">
+                               <xsl:attribute name="href">
+                                       <xsl:value-of 
select="allocation/cancel_link"/>
+                               </xsl:attribute>
+                               <xsl:value-of select="php:function('lang', 
'Cancel')" />
+                       </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"/>;
+               var lang = <xsl:value-of select="php:function('js_lang', 
'Resource Type')"/>;
+       </script>
 </xsl:template>

Modified: 
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl
===================================================================
--- 
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl    
    2015-12-10 12:57:44 UTC (rev 14559)
+++ 
branches/dev-syncromind/booking/templates/base/allocation_delete_preview.xsl    
    2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,76 +1,92 @@
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-    <div id="content">
-        <xsl:call-template name="msgbox"/>
-        <form action="" method="POST" class="pure-form pure-form-aligned" 
name="form">
-            <input type="hidden" name="tab" value=""/>
-            <div id="tab-content">
-                <xsl:value-of disable-output-escaping="yes" 
select="allocation/tabs"/>
-                <div id="allocation_delete" class="booking-container">
-                    <fieldset>
-                        <div class="heading">
-                            <legend><h3><xsl:value-of 
select="php:function('lang', 'Delete Allocations')"/></h3></legend>
-                        </div>
-                    </fieldset>
-                    <input type="hidden" name="organization_name" 
value="{allocation/organization_name}"/>
-                    <input type="hidden" name="organization_id" 
value="{allocation/organization_id}"/>
-                    <input type="hidden" name="building_name" 
value="{allocation/building_name}"/>
-                    <input type="hidden" name="building_id" 
value="{allocation/building_id}"/>
-                    <input type="hidden" name="from_" value="{from_date}"/>
-                    <input type="hidden" name="to_" value="{to_date}"/>
-                    <input type="hidden" name="building_id" 
value="{allocation/building_id}"/>
-                    <input type="hidden" name="cost" 
value="{allocation/cost}"/>
-                    <input type="hidden" name="season_id" 
value="{allocation/season_id}"/>
-                    <input type="hidden" name="field_building_id" 
value="{allocation/building_id}"/>
-                    <input type="hidden" name="step" value="{step}" />
-                    <input type="hidden" name="recurring" value="{recurring}" 
/>
-                    <input type="hidden" name="repeat_until" 
value="{repeat_until}" />
-                    <input type="hidden" name="field_interval" 
value="{interval}" />
-                    <input type="hidden" name="outseason" value="{outseason}" 
/>
-                    <xsl:for-each select="allocation/resources">
-                        <input type="hidden" name="resources[]" value="{.}" />
-                    </xsl:for-each>
+       <div id="content">
+               <xsl:call-template name="msgbox"/>
+               <form action="" method="POST" class="pure-form 
pure-form-aligned" name="form">
+                       <input type="hidden" name="tab" value=""/>
+                       <div id="tab-content">
+                               <xsl:value-of disable-output-escaping="yes" 
select="allocation/tabs"/>
+                               <div id="allocation_delete" 
class="booking-container">
+                                       <fieldset>
+                                               <div class="heading">
+                                                       <legend>
+                                                               <h3>
+                                                                       
<xsl:value-of select="php:function('lang', 'Delete Allocations')"/>
+                                                               </h3>
+                                                       </legend>
+                                               </div>
+                                       </fieldset>
+                                       <input type="hidden" 
name="organization_name" value="{allocation/organization_name}"/>
+                                       <input type="hidden" 
name="organization_id" value="{allocation/organization_id}"/>
+                                       <input type="hidden" 
name="building_name" value="{allocation/building_name}"/>
+                                       <input type="hidden" name="building_id" 
value="{allocation/building_id}"/>
+                                       <input type="hidden" name="from_" 
value="{from_date}"/>
+                                       <input type="hidden" name="to_" 
value="{to_date}"/>
+                                       <input type="hidden" name="building_id" 
value="{allocation/building_id}"/>
+                                       <input type="hidden" name="cost" 
value="{allocation/cost}"/>
+                                       <input type="hidden" name="season_id" 
value="{allocation/season_id}"/>
+                                       <input type="hidden" 
name="field_building_id" value="{allocation/building_id}"/>
+                                       <input type="hidden" name="step" 
value="{step}" />
+                                       <input type="hidden" name="recurring" 
value="{recurring}" />
+                                       <input type="hidden" 
name="repeat_until" value="{repeat_until}" />
+                                       <input type="hidden" 
name="field_interval" value="{interval}" />
+                                       <input type="hidden" name="outseason" 
value="{outseason}" />
+                                       <xsl:for-each 
select="allocation/resources">
+                                               <input type="hidden" 
name="resources[]" value="{.}" />
+                                       </xsl:for-each>
 
-                    <div class="pure-control-group">
-                        <h4><xsl:value-of select="php:function('lang', 
'Allocations that will be deleted')" /></h4>
-                        <div class="allocation-list">
-                            <xsl:for-each select="valid_dates">
-                                <li>
-                                    <xsl:value-of select="from_"/> - 
<xsl:value-of select="to_"/>
-                                </li>
-                            </xsl:for-each>
-                        </div>
-                    </div>
-                    <div class="pure-control-group">
-                        <h4><xsl:value-of select="php:function('lang', 
'Allocations  with existing bookings (%1)', count(result/invalid[from_]))" 
/></h4>
-                        <div class="allocation-list">
-                            <xsl:for-each select="invalid_dates">
-                                <li>
-                                    <xsl:value-of select="from_"/> - 
<xsl:value-of select="to_"/>
-                                </li>
-                            </xsl:for-each>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-buttons">
-                <input type="submit" name="create" class="pure-button 
pure-button-primary">
-                    <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Delete')" /></xsl:attribute>
-                </input>
-                <a class="cancel pure-button pure-button-primary">
-                    <xsl:attribute name="href"><xsl:value-of 
select="allocation/cancel_link"/></xsl:attribute>
-                    <xsl:value-of select="php:function('lang', 'Cancel')" />
-                </a>
-            </div>
-        </form>
-    </div>
-    <script type="text/javascript">
-        var initialSelection = <xsl:value-of 
select="allocation/resources_json"/>;
-    </script>
+                                       <div class="pure-control-group">
+                                               <h4>
+                                                       <xsl:value-of 
select="php:function('lang', 'Allocations that will be deleted')" />
+                                               </h4>
+                                               <div class="allocation-list">
+                                                       <xsl:for-each 
select="valid_dates">
+                                                               <li>
+                                                                       
<xsl:value-of select="from_"/> - <xsl:value-of select="to_"/>
+                                                               </li>
+                                                       </xsl:for-each>
+                                               </div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <h4>
+                                                       <xsl:value-of 
select="php:function('lang', 'Allocations  with existing bookings (%1)', 
count(result/invalid[from_]))" />
+                                               </h4>
+                                               <div class="allocation-list">
+                                                       <xsl:for-each 
select="invalid_dates">
+                                                               <li>
+                                                                       
<xsl:value-of select="from_"/> - <xsl:value-of select="to_"/>
+                                                               </li>
+                                                       </xsl:for-each>
+                                               </div>
+                                       </div>
+                               </div>
+                       </div>
+                       <div class="form-buttons">
+                               <input type="submit" name="create" 
class="pure-button pure-button-primary">
+                                       <xsl:attribute name="value">
+                                               <xsl:value-of 
select="php:function('lang', 'Delete')" />
+                                       </xsl:attribute>
+                               </input>
+                               <a class="cancel pure-button 
pure-button-primary">
+                                       <xsl:attribute name="href">
+                                               <xsl:value-of 
select="allocation/cancel_link"/>
+                                       </xsl:attribute>
+                                       <xsl:value-of 
select="php:function('lang', 'Cancel')" />
+                               </a>
+                       </div>
+               </form>
+       </div>
+       <script type="text/javascript">
+               var initialSelection = <xsl:value-of 
select="allocation/resources_json"/>;
+       </script>
 </xsl:template>
 <xsl:template name="xmlsource">
-  NODE <xsl:value-of select="name()"/>
-  ATTR { <xsl:for-each select="attribute::*"><xsl:value-of 
select="name()"/>=<xsl:value-of select="."/> </xsl:for-each> }
-  CHILDREN: { <xsl:for-each select="*"><xsl:call-template 
name="xmlsource"/></xsl:for-each> }
-  TEXT <xsl:value-of select="text()"/>
-  <br/>
+       NODE <xsl:value-of select="name()"/>
+       ATTR { <xsl:for-each select="attribute::*">
+               <xsl:value-of select="name()"/>=<xsl:value-of select="."/>
+       </xsl:for-each> }
+       CHILDREN: { <xsl:for-each select="*">
+               <xsl:call-template name="xmlsource"/>
+       </xsl:for-each> }
+       TEXT <xsl:value-of select="text()"/>
+       <br/>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/allocation_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_edit.xsl  
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/allocation_edit.xsl  
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,134 +1,184 @@
 <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-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="allocations_edit" class="booking-container">
-                <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!=''">
-                            <a 
href="{allocation/application_link}">#<xsl:value-of 
select="allocation/application_id"/></a>
-                        </xsl:if>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_building_name"><xsl:value-of 
select="php:function('lang', 'Building')" /></label>
-                        <input id="field_building_id" name="building_id" 
type="hidden">
-                            <xsl:attribute name="value"><xsl:value-of 
select="allocation/building_id"/></xsl:attribute>
-                        </input>
-                        <input id="field_building_name" name="building_name" 
type="text">
-                            <xsl:attribute name="data-validation">
-                                <xsl:text>required</xsl:text>
-                            </xsl:attribute>
-                            <xsl:attribute name="data-validation-error-msg">
-                                <xsl:value-of select="php:function('lang', 
'Please enter a building name')" />
-                            </xsl:attribute>
-                            <xsl:attribute name="value"><xsl:value-of 
select="allocation/building_name"/></xsl:attribute>
-                        </input>
-                        <div id="building_container"></div>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_active"><xsl:value-of 
select="php:function('lang', 'Active')"/></label>
-                        <select id="field_active" name="active">
-                            <option value="1">
-                                <xsl:if test="allocation/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="allocation/active=0">
-                                    <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 style="vertical-align:top;"><xsl:value-of 
select="php:function('lang', 'Season')" /></label>
-                        <div id="season_container" 
style="display:inline-block;"><span class="select_first_text"><span 
class="select_first_text"><xsl:value-of select="php:function('lang', 'Select a 
building first')" /></span></span></div>
-                    </div>
-                    <div class="pure-control-group">
-                        <label style="vertical-align:top;"><xsl:value-of 
select="php:function('lang', 'Resources')" /></label>
-                        <div id="resources_container" 
style="display:inline-block;"><span class="select_first_text"><xsl:value-of 
select="php:function('lang', 'Select a building first')" /></span></div>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_org_name"><xsl:value-of 
select="php:function('lang', 'Organization')" /></label>
-                        <input id="field_org_id" name="organization_id" 
type="hidden">
-                            <xsl:attribute name="value"><xsl:value-of 
select="allocation/organization_id"/></xsl:attribute>
-                        </input>
-                        <input id="field_org_name" name="organization_name" 
type="text">
-                            <xsl:attribute name="data-validation">
-                                <xsl:text>required</xsl:text>
-                            </xsl:attribute>
-                            <xsl:attribute name="data-validation-error-msg">
-                                <xsl:value-of select="php:function('lang', 
'Please enter an organization name')" />
-                            </xsl:attribute>
-                            <xsl:attribute name="value"><xsl:value-of 
select="allocation/organization_name"/></xsl:attribute>
-                        </input>
-                        <div id="org_container"></div>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_from"><xsl:value-of 
select="php:function('lang', 'From')" /></label>
-                        <input class="datetime" id="field_from" name="from_" 
type="text">
-                            <xsl:attribute name="data-validation">
-                                <xsl:text>required</xsl:text>
-                            </xsl:attribute>
-                            <xsl:attribute name="data-validation-error-msg">
-                                <xsl:value-of select="php:function('lang', 
'Please enter a from date')" />
-                            </xsl:attribute>
-                            <xsl:attribute name="value"><xsl:value-of 
select="allocation/from_"/></xsl:attribute>
-                        </input>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_to"><xsl:value-of 
select="php:function('lang', 'To')" /></label>
-                        <input class="datetime" id="field_to" name="to_" 
type="text">
-                            <xsl:attribute name="data-validation">
-                                <xsl:text>required</xsl:text>
-                            </xsl:attribute>
-                            <xsl:attribute name="data-validation-error-msg">
-                                <xsl:value-of select="php:function('lang', 
'Please enter an end date')" />
-                            </xsl:attribute>
-                            <xsl:attribute name="value"><xsl:value-of 
select="allocation/to_"/></xsl:attribute>
-                        </input>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_cost"><xsl:value-of 
select="php:function('lang', 'Cost')" /></label>
-                        <input id="field_cost" name="cost" type="text">
-                            <xsl:attribute name="data-validation">
-                                <xsl:text>required</xsl:text>
-                            </xsl:attribute>
-                            <xsl:attribute name="data-validation-error-msg">
-                                <xsl:value-of select="php:function('lang', 
'Please enter a cost')" />
-                            </xsl:attribute>
-                            <xsl:attribute name="value"><xsl:value-of 
select="allocation/cost"/></xsl:attribute>
-                        </input>
-                    </div>
-                    <div class="pure-control-group">
-                        <label for="field_mail"><xsl:value-of 
select="php:function('lang', 'Inform contact persons')" /></label>
-                        <p style="display: inline-block;max-width:80%;">
-                            <span><xsl:value-of select="php:function('lang', 
'Text written in the text area below will be sent as an email to all registered 
contact persons.')" /></span>
-                            <textarea id="field_mail" name="mail" 
class="full-width" style="display: block;"></textarea>
-                        </p>
-                    </div>
-                </fieldset>
-            </div>
-        </div>
-        <div class="pure-control-group form-buttons">
-            <input type="submit" class="pure-button pure-button-primary">
-                <xsl:attribute name="value"><xsl:value-of 
select="php:function('lang', 'Save')"/></xsl:attribute>
-            </input>
-            <a class="cancel pure-button pure-button-primary">
-                <xsl:attribute name="href"><xsl:value-of 
select="allocation/cancel_link"/></xsl:attribute>
-                <xsl:value-of select="php:function('lang', 'Cancel')" />
-            </a>
-        </div>
-    </form>
-    <script type="text/javascript">
-        var season_id = '<xsl:value-of select="allocation/season_id"/>';
-        var initialSelection = <xsl:value-of 
select="allocation/resources_json"/>;
-        var lang = <xsl:value-of select="php:function('js_lang', 'Name', 
'Resource Type')"/>;
-    </script>
+       <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="allocations_edit" class="booking-container">
+                               <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!=''">
+                                                       <a 
href="{allocation/application_link}">#<xsl:value-of 
select="allocation/application_id"/></a>
+                                               </xsl:if>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label 
for="field_building_name">
+                                                       <xsl:value-of 
select="php:function('lang', 'Building')" />
+                                               </label>
+                                               <input id="field_building_id" 
name="building_id" type="hidden">
+                                                       <xsl:attribute 
name="value">
+                                                               <xsl:value-of 
select="allocation/building_id"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                               <input id="field_building_name" 
name="building_name" type="text">
+                                                       <xsl:attribute 
name="data-validation">
+                                                               
<xsl:text>required</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="data-validation-error-msg">
+                                                               <xsl:value-of 
select="php:function('lang', 'Please enter a building name')" />
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="value">
+                                                               <xsl:value-of 
select="allocation/building_name"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                               <div 
id="building_container"></div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_active">
+                                                       <xsl:value-of 
select="php:function('lang', 'Active')"/>
+                                               </label>
+                                               <select id="field_active" 
name="active">
+                                                       <option value="1">
+                                                               <xsl:if 
test="allocation/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="allocation/active=0">
+                                                                       
<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 
style="vertical-align:top;">
+                                                       <xsl:value-of 
select="php:function('lang', 'Season')" />
+                                               </label>
+                                               <div id="season_container" 
style="display:inline-block;">
+                                                       <span 
class="select_first_text">
+                                                               <span 
class="select_first_text">
+                                                                       
<xsl:value-of select="php:function('lang', 'Select a building first')" />
+                                                               </span>
+                                                       </span>
+                                               </div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label 
style="vertical-align:top;">
+                                                       <xsl:value-of 
select="php:function('lang', 'Resources')" />
+                                               </label>
+                                               <div id="resources_container" 
style="display:inline-block;">
+                                                       <span 
class="select_first_text">
+                                                               <xsl:value-of 
select="php:function('lang', 'Select a building first')" />
+                                                       </span>
+                                               </div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_org_name">
+                                                       <xsl:value-of 
select="php:function('lang', 'Organization')" />
+                                               </label>
+                                               <input id="field_org_id" 
name="organization_id" type="hidden">
+                                                       <xsl:attribute 
name="value">
+                                                               <xsl:value-of 
select="allocation/organization_id"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                               <input id="field_org_name" 
name="organization_name" type="text">
+                                                       <xsl:attribute 
name="data-validation">
+                                                               
<xsl:text>required</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="data-validation-error-msg">
+                                                               <xsl:value-of 
select="php:function('lang', 'Please enter an organization name')" />
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="value">
+                                                               <xsl:value-of 
select="allocation/organization_name"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                               <div id="org_container"></div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_from">
+                                                       <xsl:value-of 
select="php:function('lang', 'From')" />
+                                               </label>
+                                               <input class="datetime" 
id="field_from" name="from_" type="text">
+                                                       <xsl:attribute 
name="data-validation">
+                                                               
<xsl:text>required</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="data-validation-error-msg">
+                                                               <xsl:value-of 
select="php:function('lang', 'Please enter a from date')" />
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="value">
+                                                               <xsl:value-of 
select="allocation/from_"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_to">
+                                                       <xsl:value-of 
select="php:function('lang', 'To')" />
+                                               </label>
+                                               <input class="datetime" 
id="field_to" name="to_" type="text">
+                                                       <xsl:attribute 
name="data-validation">
+                                                               
<xsl:text>required</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="data-validation-error-msg">
+                                                               <xsl:value-of 
select="php:function('lang', 'Please enter an end date')" />
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="value">
+                                                               <xsl:value-of 
select="allocation/to_"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_cost">
+                                                       <xsl:value-of 
select="php:function('lang', 'Cost')" />
+                                               </label>
+                                               <input id="field_cost" 
name="cost" type="text">
+                                                       <xsl:attribute 
name="data-validation">
+                                                               
<xsl:text>required</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="data-validation-error-msg">
+                                                               <xsl:value-of 
select="php:function('lang', 'Please enter a cost')" />
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="value">
+                                                               <xsl:value-of 
select="allocation/cost"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="field_mail">
+                                                       <xsl:value-of 
select="php:function('lang', 'Inform contact persons')" />
+                                               </label>
+                                               <p style="display: 
inline-block;max-width:80%;">
+                                                       <span>
+                                                               <xsl:value-of 
select="php:function('lang', 'Text written in the text area below will be sent 
as an email to all registered contact persons.')" />
+                                                       </span>
+                                                       <textarea 
id="field_mail" name="mail" class="full-width" style="display: 
block;"></textarea>
+                                               </p>
+                                       </div>
+                               </fieldset>
+                       </div>
+               </div>
+               <div class="pure-control-group form-buttons">
+                       <input type="submit" class="pure-button 
pure-button-primary">
+                               <xsl:attribute name="value">
+                                       <xsl:value-of 
select="php:function('lang', 'Save')"/>
+                               </xsl:attribute>
+                       </input>
+                       <a class="cancel pure-button pure-button-primary">
+                               <xsl:attribute name="href">
+                                       <xsl:value-of 
select="allocation/cancel_link"/>
+                               </xsl:attribute>
+                               <xsl:value-of select="php:function('lang', 
'Cancel')" />
+                       </a>
+               </div>
+       </form>
+       <script type="text/javascript">
+               var season_id = '<xsl:value-of select="allocation/season_id"/>';
+               var initialSelection = <xsl:value-of 
select="allocation/resources_json"/>;
+               var lang = <xsl:value-of select="php:function('js_lang', 
'Name', 'Resource Type')"/>;
+       </script>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/allocation_info.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_info.xsl  
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/allocation_info.xsl  
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,27 +1,49 @@
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-    <!--div class="close" style="float: right"><a 
onclick="schedule.closeOverlay(); return false" 
style="cursor:pointer;"><xsl:value-of select="php:function('lang', 
'Close')"/></a></div-->
-    <h3><xsl:value-of select="php:function('lang', 'Allocation')"/> 
#<xsl:value-of select="allocation/id"/></h3>
-    <div class="pure-form pure-form-aligned">
-        <div class="pure-control-group">
-            <label><h4><xsl:value-of select="php:function('lang', 
'Where')"/></h4></label>
-            <a href="{allocation/building_link}"><xsl:value-of 
select="allocation/resources[position()=1]/building_name"/></a>
-                    (<xsl:value-of select="allocation/resource_info"/>)
-        </div>
-        <div class="pure-control-group">
-            <label><h4><xsl:value-of select="php:function('lang', 
'When')"/></h4></label>
-            <xsl:value-of select="allocation/when"/>
-        </div>
-        <div class="pure-control-group">
-            <label><h4><xsl:value-of select="php:function('lang', 
'Who')"/></h4></label>
-            <a href="{allocation/org_link}"><xsl:value-of 
select="allocation/organization_name"/></a>
-        </div>
-    </div>
-    <xsl:if test="allocation/add_link">
-        <div class="actions">
-            <button onclick="location.href='{allocation/add_link}'" 
class="pure-button pure-button-primary"><xsl:value-of 
select="php:function('lang', 'Create new booking')"/></button>
-            <xsl:if test="allocation/delete_link">
-                <button onclick="location.href='{allocation/delete_link}'" 
class="pure-button pure-button-primary"><xsl:value-of 
select="php:function('lang', 'Delete allocation')"/></button>
-            </xsl:if>
-        </div>
-    </xsl:if>
+       <!--div class="close" style="float: right"><a 
onclick="schedule.closeOverlay(); return false" 
style="cursor:pointer;"><xsl:value-of select="php:function('lang', 
'Close')"/></a></div-->
+       <h3>
+               <xsl:value-of select="php:function('lang', 'Allocation')"/> 
#<xsl:value-of select="allocation/id"/>
+       </h3>
+       <div class="pure-form pure-form-aligned">
+               <div class="pure-control-group">
+                       <label>
+                               <h4>
+                                       <xsl:value-of 
select="php:function('lang', 'Where')"/>
+                               </h4>
+                       </label>
+                       <a href="{allocation/building_link}">
+                               <xsl:value-of 
select="allocation/resources[position()=1]/building_name"/>
+                       </a>
+                       (<xsl:value-of select="allocation/resource_info"/>)
+               </div>
+               <div class="pure-control-group">
+                       <label>
+                               <h4>
+                                       <xsl:value-of 
select="php:function('lang', 'When')"/>
+                               </h4>
+                       </label>
+                       <xsl:value-of select="allocation/when"/>
+               </div>
+               <div class="pure-control-group">
+                       <label>
+                               <h4>
+                                       <xsl:value-of 
select="php:function('lang', 'Who')"/>
+                               </h4>
+                       </label>
+                       <a href="{allocation/org_link}">
+                               <xsl:value-of 
select="allocation/organization_name"/>
+                       </a>
+               </div>
+       </div>
+       <xsl:if test="allocation/add_link">
+               <div class="actions">
+                       <button onclick="location.href='{allocation/add_link}'" 
class="pure-button pure-button-primary">
+                               <xsl:value-of select="php:function('lang', 
'Create new booking')"/>
+                       </button>
+                       <xsl:if test="allocation/delete_link">
+                               <button 
onclick="location.href='{allocation/delete_link}'" class="pure-button 
pure-button-primary">
+                                       <xsl:value-of 
select="php:function('lang', 'Delete allocation')"/>
+                               </button>
+                       </xsl:if>
+               </div>
+       </xsl:if>
 </xsl:template>

Modified: branches/dev-syncromind/booking/templates/base/allocation_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_new.xsl   
2015-12-10 12:57:44 UTC (rev 14559)
+++ branches/dev-syncromind/booking/templates/base/allocation_new.xsl   
2015-12-10 13:24:02 UTC (rev 14560)
@@ -1,189 +1,237 @@
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-    <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}"/>
-                <div class="pure-control-group">
-                    <label for="field_building_name"><xsl:value-of 
select="php:function('lang', 'Building')" /></label>
-                    <input id="field_building_id" name="building_id" 
type="hidden">
-                        <xsl:attribute name="value"><xsl:value-of 
select="allocation/building_id"/></xsl:attribute>
-                    </input>
-                    <input id="field_building_name" name="building_name" 
type="text">
-                        <xsl:attribute name="data-validation">
-                            <xsl:text>required</xsl:text>
-                        </xsl:attribute>
-                        <xsl:attribute name="data-validation-error-msg">
-                            <xsl:value-of select="php:function('lang', 'Please 
enter a building name')" />
-                        </xsl:attribute>
-                        <xsl:attribute name="value"><xsl:value-of 
select="allocation/building_name"/></xsl:attribute>
-                    </input>
-                </div>
-                <div class="pure-control-group">
-                    <label for="field_org_name"><xsl:value-of 
select="php:function('lang', 'Organization')" /></label>
-                    <input id="field_org_id" name="organization_id" 
type="hidden">

@@ Diff output truncated at 153600 characters. @@



reply via email to

[Prev in Thread] Current Thread [Next in Thread]