[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13852] fixing datatable and forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [13852] fixing datatable and forms |
|
Date: |
Sat, 05 Sep 2015 00:00:25 +0000 |
Revision: 13852
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13852
Author: psaul
Date: 2015-09-05 00:00:24 +0000 (Sat, 05 Sep 2015)
Log Message:
-----------
fixing datatable and forms
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
branches/dev-syncromind/booking/inc/class.uibooking.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
branches/dev-syncromind/booking/inc/class.uievent.inc.php
branches/dev-syncromind/booking/inc/class.uigroup.inc.php
branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
branches/dev-syncromind/booking/inc/class.uiseason.inc.php
branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
branches/dev-syncromind/booking/templates/base/allocation_new.xsl
branches/dev-syncromind/booking/templates/base/application_new.xsl
Modified: branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-09-04 16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-09-05 00:00:24 UTC (rev 13852)
@@ -85,11 +85,6 @@
#
'requestGenerator' => 'requestWithBuildingFilter',
# ),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-09-04 16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-09-05 00:00:24 UTC (rev 13852)
@@ -284,11 +284,6 @@
'list' =>
$this->bo->so->get_activities_main_level(),
),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-04
16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-05
00:00:24 UTC (rev 13852)
@@ -78,11 +78,6 @@
'list' =>
$this->bo->so->get_organizations(),
),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-09-04 16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uicompleted_reservation.inc.php
2015-09-05 00:00:24 UTC (rev 13852)
@@ -141,11 +141,6 @@
'text' =>
lang('To').':',
),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search'),
- ),
- array(
'type' =>
'link',
'value' =>
$_SESSION['show_all_completed_reservations'] ? lang('Show only unexported') :
lang('Show all'),
'href' =>
$this->link_to('toggle_show_all_completed_reservations'),
Modified:
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-09-04 16:52:20 UTC (rev 13851)
+++
branches/dev-syncromind/booking/inc/class.uicompleted_reservation_export.inc.php
2015-09-05 00:00:24 UTC (rev 13852)
@@ -107,11 +107,6 @@
'value' => '',
'text' =>
lang('To').':'
),
- array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
),
),
# 'list_actions' => array(
Modified: branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2015-09-04 16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uidashboard.inc.php
2015-09-05 00:00:24 UTC (rev 13852)
@@ -110,11 +110,6 @@
'text' =>
lang('Building').':',
),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
$this->show_all_dashboard_applications() ? lang('Show only applications
assigned to me') : lang('Show all applications'),
'href' =>
self::link(array('menuaction' =>
$this->url_prefix.'.toggle_show_all_dashboard_applications'))
Modified: branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-09-04 16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uidocumentation.inc.php
2015-09-05 00:00:24 UTC (rev 13852)
@@ -29,6 +29,7 @@
$this->bo = CreateObject('booking.bodocumentation');
$this->fields = array('category', 'description');
$this->module = 'booking';
+
self::set_active_menu('booking::settings::documentation');
}
public function index()
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-04
16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-05
00:00:24 UTC (rev 13852)
@@ -69,11 +69,6 @@
'list' =>
$this->bo->so->get_activities_main_level(),
),
array(
- 'type' => 'submit',
- 'name' => 'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' => 'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
Modified: branches/dev-syncromind/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-04
16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uigroup.inc.php 2015-09-05
00:00:24 UTC (rev 13852)
@@ -23,7 +23,7 @@
parent::__construct();
$this->bo = CreateObject('booking.bogroup');
$this->activity_bo = CreateObject('booking.boactivity');
- self::set_active_menu('booking::groups');
+ self::set_active_menu('booking::organizations::groups');
$this->module = "booking";
}
Modified: branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-09-04 16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uimassbooking.inc.php
2015-09-05 00:00:24 UTC (rev 13852)
@@ -27,7 +27,7 @@
$this->bo = CreateObject('booking.bomassbooking');
-
self::set_active_menu('booking::applications::massboooking');
+
self::set_active_menu('booking::applications::massbookings');
}
public function index()
Modified: branches/dev-syncromind/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-04
16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uiseason.inc.php 2015-09-05
00:00:24 UTC (rev 13852)
@@ -53,15 +53,7 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array('type' => 'text',
- 'name' =>
'query'
- ),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
Modified: branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-09-04 16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
2015-09-05 00:00:24 UTC (rev 13852)
@@ -89,11 +89,6 @@
'text' =>
lang('Building').':',
),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
$_SESSION['showall'] ? lang('Show only messages assigned to me') : lang('Show
all messages'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
Modified: branches/dev-syncromind/booking/templates/base/allocation_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-09-04 16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-09-05 00:00:24 UTC (rev 13852)
@@ -17,7 +17,7 @@
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Building')" /></label>
+ <label for="field_building_name"><xsl:value-of
select="php:function('lang', 'Building')" /></label>
<!--div class="autocomplete"-->
<input id="field_building_id"
name="building_id" type="hidden">
<xsl:attribute name="value"><xsl:value-of
select="allocation/building_id"/></xsl:attribute>
@@ -30,7 +30,7 @@
</div>
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Organization')" /></label>
+ <label for="field_org_name"><xsl:value-of
select="php:function('lang', 'Organization')" /></label>
<!--div class="autocomplete"-->
<input id="field_org_id"
name="organization_id" type="hidden">
<xsl:attribute name="value"><xsl:value-of
select="allocation/organization_id"/></xsl:attribute>
@@ -92,7 +92,7 @@
</div>
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'From')" /></label>
+ <label for="field_from"><xsl:value-of
select="php:function('lang', 'From')" /></label>
<!--div class="time-picker"-->
<input id="field_from" name="from_" type="text">
<xsl:attribute name="value"><xsl:value-of
select="allocation/from_"/></xsl:attribute>
@@ -102,7 +102,7 @@
</div>
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'To')" /></label>
+ <label for="field_to"><xsl:value-of
select="php:function('lang', 'To')" /></label>
<!--div class="time-picker"-->
<input id="field_to" name="to_" type="text">
<xsl:attribute name="value"><xsl:value-of
select="allocation/to_"/></xsl:attribute>
@@ -112,18 +112,18 @@
</div>
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Recurring allocation')" /></label>
+ <label for="outseason"><xsl:value-of
select="php:function('lang', 'Recurring allocation')" /></label>
<input type="checkbox"
name="outseason" id="outseason">
<xsl:if test="outseason='on'">
<xsl:attribute
name="checked">checked</xsl:attribute>
</xsl:if>
</input>
- <xsl:value-of
select="php:function('lang', 'Out season')" />
+ <label
style="text-align:left;margin-left:5px;" for="outseason"><xsl:value-of
select="php:function('lang', 'Out season')" /></label>
</div>
<div class="pure-control-group">
- <label>
+ <label for="field_interval">
<xsl:value-of select="php:function('lang',
'Interval')" />
</label>
<xsl:value-of
select="../field_interval" />
@@ -161,7 +161,7 @@
</div>
<div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Cost')" /></label>
+ <label for="field_cost"><xsl:value-of
select="php:function('lang', 'Cost')" /></label>
<input id="field_cost" name="cost" type="text">
<xsl:attribute name="value"><xsl:value-of
select="allocation/cost"/></xsl:attribute>
</input>
Modified: branches/dev-syncromind/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-09-04 16:52:20 UTC (rev 13851)
+++ branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-09-05 00:00:24 UTC (rev 13852)
@@ -1,10 +1,8 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<style type="text/css">
-
.date-container {
width: 31%;
}
-
.date-container .close-btn {
background: transparent
url("phpgwapi/js/yahoo/assets/skins/sam/sprite.png") no-repeat scroll 0 -300px;
border: medium none;
@@ -18,297 +16,290 @@
margin: 4px 0 0 296px;
}
</style>
- <!--div id="content">
-
- <h3><xsl:value-of select="php:function('lang', 'New
application')"/></h3-->
- <xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
-
- <form action="" method="POST" id='application_form' class="pure-form
pure-form-stacked" name="form">
+ <!--div id="content">
+ <h3><xsl:value-of select="php:function('lang', 'New
application')"/></h3-->
+ <xsl:call-template name="msgbox"/>
+ <!--xsl:call-template name="yui_booking_i18n"/-->
+ <form action="" method="POST" id='application_form' class="pure-form
pure-form-stacked" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="application/tabs"/>
+ <xsl:value-of disable-output-escaping="yes"
select="application/tabs"/>
<div id="application_add">
<xsl:if test="config/application_new_application">
- <p style="width: 750px;">
+ <p style="width: 750px;">
<xsl:value-of
select="config/application_new_application"/>
- </p>
+ </p>
</xsl:if>
-
- <div class="pure-g">
- <div class="pure-u-1-2">
- <div class="heading">1.
<xsl:value-of select="php:function('lang', 'Why?')" /></div>
- <div
class="pure-control-group">
-
<label><xsl:value-of select="php:function('lang', 'Activity')" /></label>
- <xsl:if
test="config/application_activities">
- <p>
-
<xsl:value-of select="config/application_activities"/>
- </p>
- </xsl:if>
- <select
name="activity_id" id="field_activity">
-
<option value=""><xsl:value-of select="php:function('lang', '-- select an
activity --')" /></option>
-
<xsl:for-each select="activities">
-
<option>
-
<xsl:if test="../application/activity_id = id">
-
<xsl:attribute
name="selected">selected</xsl:attribute>
-
</xsl:if>
-
<xsl:attribute name="value"><xsl:value-of
select="id"/></xsl:attribute>
-
<xsl:value-of select="name"/>
-
</option>
-
</xsl:for-each>
- </select>
- </div>
- <div
class="pure-control-group">
-
<label><xsl:value-of select="php:function('lang', 'Information about the
event')" /></label>
- <xsl:if
test="config/application_description">
- <p>
-
<xsl:value-of select="config/application_description"/>
- </p>
- </xsl:if>
- <textarea
id="field_description" class="full-width" name="description"><xsl:value-of
select="application/description"/></textarea>
- </div>
- </div>
- <div class="pure-u-1-2">
- <div class="heading">2.
<xsl:value-of select="php:function('lang', 'How many?')" /></div>
- <xsl:if
test="config/application_howmany">
- <p>
-
<xsl:value-of select="config/application_howmany"/>
- </p>
- </xsl:if>
- <label><xsl:value-of
select="php:function('lang', 'Estimated number of participants')" /></label>
- <table id="agegroup"
class="pure-table pure-table-bordered">
- <thead>
- <tr>
-
<th></th>
-
<th>
-
<xsl:value-of select="php:function('lang', 'Male')" />
-
</th>
-
<th>
-
<xsl:value-of select="php:function('lang', 'Female')" />
-
</th>
- </tr>
- </thead>
- <tbody>
-
<xsl:for-each select="agegroups">
-
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
-
<tr>
-
<th><xsl:value-of select="name"/></th>
-
<td>
-
<input type="text">
-
<xsl:attribute name="name">male[<xsl:value-of
select="id"/>]</xsl:attribute>
-
<xsl:attribute name="value"><xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
-
</input>
-
</td>
-
<td>
-
<input type="text">
-
<xsl:attribute name="name">female[<xsl:value-of
select="id"/>]</xsl:attribute>
-
<xsl:attribute name="value"><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
-
</input>
-
</td>
-
</tr>
-
</xsl:for-each>
- </tbody>
- </table>
- </div>
- </div>
-
- <div class="pure-g">
- <div class="pure-u-1-3">
- <div class="heading">3.
<xsl:value-of select="php:function('lang', 'Where?')" /></div>
- <xsl:if
test="config/application_where">
- <p>
-
<xsl:value-of select="config/application_where"/>
- </p>
- </xsl:if>
- <label><xsl:value-of
select="php:function('lang', 'Building')" /></label>
- <!--div
class="autocomplete"-->
- <input
id="field_building_id" name="building_id" type="hidden">
-
<xsl:attribute name="value"><xsl:value-of
select="application/building_id"/></xsl:attribute>
- </input>
- <input
id="field_building_name" name="building_name" type="text">
-
<xsl:attribute name="value"><xsl:value-of
select="application/building_name"/></xsl:attribute>
- </input>
- <div
id="building_container"/>
- <!--/div-->
- <label><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
- <xsl:value-of
select="php:function('lang', 'Select a building first')" />
- </div>
- <div class="pure-u-1-3">
- <div class="heading">4.
<xsl:value-of select="php:function('lang', 'When?')" /></div>
- <xsl:if
test="config/application_when">
- <p>
-
<xsl:value-of select="config/application_when"/>
- </p>
+ <div class="pure-g">
+ <div class="pure-u-1-2">
+ <div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
+ <xsl:if test="config/application_activities">
+ <p>
+ <xsl:value-of
select="config/application_activities"/>
+ </p>
</xsl:if>
- <div id="dates-container">
-
<xsl:for-each select="application/dates">
-
<div class="date-container">
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="php:function('lang', 'From')" />
-
</label>
-
<input class="datetime" id="start_date" name="start_date"
type="text">
-
<xsl:if test="activity/start_date != ''">
-
<xsl:attribute name="value">
-
<xsl:value-of
select="php:function('date', $datetime_format, number(activity/start_date))"/>
-
</xsl:attribute>
-
</xsl:if>
+ <select name="activity_id" id="field_activity">
+ <option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
+ <xsl:for-each select="activities">
+ <option>
+ <xsl:if
test="../application/activity_id = id">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
+ <xsl:value-of select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'Information about the event')" /></label>
+ <xsl:if test="config/application_description">
+ <p>
+ <xsl:value-of
select="config/application_description"/>
+ </p>
+ </xsl:if>
+ <textarea id="field_description"
class="full-width" name="description"><xsl:value-of
select="application/description"/></textarea>
+ </div>
+ </div>
+ <div class="pure-u-1-2">
+ <div class="heading">2. <xsl:value-of
select="php:function('lang', 'How many?')" /></div>
+ <xsl:if test="config/application_howmany">
+ <p>
+ <xsl:value-of
select="config/application_howmany"/>
+ </p>
+ </xsl:if>
+ <label><xsl:value-of select="php:function('lang',
'Estimated number of participants')" /></label>
+ <table id="agegroup" class="pure-table
pure-table-bordered">
+ <thead>
+ <tr>
+ <th></th>
+ <th>
+ <xsl:value-of
select="php:function('lang', 'Male')" />
+ </th>
+ <th>
+ <xsl:value-of
select="php:function('lang', 'Female')" />
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <xsl:for-each select="agegroups">
+ <xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
+ <tr>
+ <th><xsl:value-of
select="name"/></th>
+ <td>
+ <input type="text">
+ <xsl:attribute
name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="../application/agegroups/male[../agegroup_id
= $id]"/></xsl:attribute>
+ </input>
+ </td>
+ <td>
+ <input type="text">
+ <xsl:attribute
name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </div>
-
<xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
-
</input>
-
<a href="javascript:void(0);" class="close-btn btnclose">-</a>
-
-
</div>
-
<div class="pure-control-group">
-
<label>
-
<xsl:value-of select="php:function('lang', 'To')" />
-
</label>
-
<xsl:if test="activity/error_msg_array/end_date != ''">
-
<xsl:variable name="error_msg">
-
<xsl:value-of
select="activity/error_msg_array/end_date" />
-
</xsl:variable>
-
<div class='input_error_msg'>
-
<xsl:value-of
select="php:function('lang', $error_msg)" />
-
</div>
-
</xsl:if>
+ <div class="pure-g">
+ <div class="pure-u-1-3">
+ <div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
+ <xsl:if test="config/application_where">
+ <p>
+ <xsl:value-of
select="config/application_where"/>
+ </p>
+ </xsl:if>
+ <label><xsl:value-of select="php:function('lang',
'Building')" /></label>
+ <!--div class="autocomplete"-->
+ <input id="field_building_id"
name="building_id" type="hidden">
+ <xsl:attribute name="value"><xsl:value-of
select="application/building_id"/></xsl:attribute>
+ </input>
+ <input id="field_building_name"
name="building_name" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="application/building_name"/></xsl:attribute>
+ </input>
+ <div id="building_container"></div>
+ <!--/div-->
+ <label><xsl:value-of select="php:function('lang',
'Resources')" /></label>
+ <xsl:value-of select="php:function('lang', 'Select
a building first')" />
+ </div>
+ <div class="pure-u-1-3">
+ <div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
+ <xsl:if test="config/application_when">
+ <p>
+ <xsl:value-of
select="config/application_when"/>
+ </p>
+ </xsl:if>
+ <div id="dates-container">
+ <xsl:for-each select="application/dates">
+ <div class="date-container">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'From')" />
+ </label>
+ <input class="datetime"
id="start_date" name="start_date" type="text">
+ <xsl:if
test="activity/start_date != ''">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="php:function('date', $datetime_format, number(activity/start_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
+ <a href="javascript:void(0);"
class="close-btn btnclose">-</a>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'To')" />
+ </label>
+ <xsl:if
test="activity/error_msg_array/end_date != ''">
+ <xsl:variable name="error_msg">
+ <xsl:value-of
select="activity/error_msg_array/end_date" />
+ </xsl:variable>
+ <div class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <input class="datetime"
id="end_date" name="end_date" type="text">
+ <xsl:if
test="activity/end_date != ''">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="php:function('date', $datetime_format, number(activity/end_date))"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <!--div class="help_text">
+ <xsl:value-of
select="php:function('lang','Give end date to activity')" />
+ </div-->
+ </div>
+ </xsl:for-each>
+ </div>
+ <dt><a href="javascript:;"
id="add-date-link"><xsl:value-of select="php:function('lang', 'Add another
date')" /></a></dt>
+ </div>
+ <div class="pure-u-1-3">
+ <div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
+ <xsl:if test="config/application_who">
+ <p>
+ <xsl:value-of
select="config/application_who"/>
+ </p>
+ </xsl:if>
+ <label><xsl:value-of select="php:function('lang',
'Target audience')" /></label>
+ <div id="audience_container"> </div>
+ </div>
+ </div>
-
<input class="datetime" id="end_date" name="end_date"
type="text">
-
<xsl:if test="activity/end_date != ''">
-
<xsl:attribute name="value">
-
<xsl:value-of
select="php:function('date', $datetime_format, number(activity/end_date))"/>
-
</xsl:attribute>
-
</xsl:if>
-
</input>
-
</div>
-
<!--div class="help_text">
-
<xsl:value-of select="php:function('lang','Give end
date to activity')" />
-
</div-->
-
</div>
-
</xsl:for-each>
- </div>
- <dt><a href="javascript:;"
id="add-date-link"><xsl:value-of select="php:function('lang', 'Add another
date')" /></a></dt>
- </div>
- <div class="pure-u-1-3">
- <div class="heading">5.
<xsl:value-of select="php:function('lang', 'Who?')" /></div>
- <xsl:if
test="config/application_who">
- <p>
-
<xsl:value-of select="config/application_who"/>
- </p>
- </xsl:if>
- <label><xsl:value-of
select="php:function('lang', 'Target audience')" /></label>
- <div
id="audience_container"> </div>
- </div>
- </div>
-
- <div class="pure-g">
- <div class="pure-u-1-3">
- <div
class="heading"><br />6. <xsl:value-of select="php:function('lang', 'Contact
information')" /></div>
- <div
class="pure-control-group">
+ <div class="pure-g">
+ <div class="pure-u-1-3">
+ <div class="heading"><br />6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
+ <div class="pure-control-group">
<xsl:if
test="config/application_contact_information">
- <p>
- <xsl:value-of
select="config/application_contact_information"/>
- </p>
+ <p>
+ <xsl:value-of
select="config/application_contact_information"/>
+ </p>
</xsl:if>
<label><xsl:value-of
select="php:function('lang', 'Name')" /></label>
- <input id="field_contact_name"
name="contact_name" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="application/contact_name"/></xsl:attribute>
- </input>
- </div>
- <div
class="pure-control-group">
-
<label><xsl:value-of select="php:function('lang', 'E-mail address')" /></label>
-
<input id="field_contact_email" name="contact_email"
type="text">
-
<xsl:attribute name="value"><xsl:value-of
select="application/contact_email"/></xsl:attribute>
-
</input>
- </div>
- <div
class="pure-control-group">
-
<label><xsl:value-of select="php:function('lang', 'Confirm e-mail address')"
/></label>
-
<input id="field_contact_email2" name="contact_email2"
type="text">
-
<xsl:attribute name="value"><xsl:value-of
select="application/contact_email2"/></xsl:attribute>
-
</input>
- </div>
- <div
class="pure-control-group">
-
<label><xsl:value-of select="php:function('lang', 'Phone')" /></label>
-
<input id="field_contact_phone" name="contact_phone"
type="text">
-
<xsl:attribute name="value"><xsl:value-of
select="application/contact_phone"/></xsl:attribute>
-
</input>
- </div>
- </div>
- <div class="pure-u-1-3">
- <div
class="heading">7.x <xsl:value-of select="php:function('lang', 'responsible
applicant')" /> / <xsl:value-of select="php:function('lang', 'invoice
information')" /></div>
- <p>Ut fra reglementet i
pkt. 8 finner du kriterier for fakturering. Når du som privatperson skal låne
noe som det ikke skal faktureres for oppgir du kun fødselsdato, men skal du
leie noe som koster noe, da må vi ha hele personnummeret. Alle lag og
organisasjoner skal oppgi organisasjonsnr.</p>
- <xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
- <p>
- <xsl:value-of
select="php:function('lang', 'In order to send the invoice we need information
about either customer organization number or norwegian social security
number')" />
- </p>
- <div
class="pure-control-group">
- <xsl:if
test="config/application_responsible_applicant">
-
<p>
-
<xsl:value-of
select="config/application_responsible_applicant"/>
-
</p>
- </xsl:if>
- <!--xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/-->
- <br />
- <xsl:if
test="config/application_invoice_information">
-
<p>
-
<xsl:value-of select="config/application_invoice_information"/>
-
</p>
- </xsl:if>
- </div>
- </div>
- <div class="pure-u-1-3">
- <div
class="heading"><br />8. <xsl:value-of select="php:function('lang', 'Terms and
conditions')" /></div>
- <p>Alle som leier
lokaler hos Bergen kommune må bekrefte at de har lest betingelsene, dette
gjelder som regel brannforskrifter og husreglement.</p>
- <div
class="pure-control-group">
- <xsl:if
test="config/application_terms">
- <p>
-
<xsl:value-of select="config/application_terms"/>
- </p>
- </xsl:if>
- <br />
- <div
id='regulation_documents'> </div>
- <br />
- <xsl:if
test="config/application_terms2">
- <p>
-
<xsl:value-of select="config/application_terms2"/>
- </p>
- </xsl:if>
-
<p><xsl:value-of select="php:function('lang', 'To borrow premises you must
verify that you have read terms and conditions')" /></p>
- </div>
- </div>
- </div>
-
+ <input id="field_contact_name"
name="contact_name" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="application/contact_name"/></xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'E-mail address')" /></label>
+ <input id="field_contact_email"
name="contact_email" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="application/contact_email"/></xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'Confirm e-mail address')" /></label>
+ <input id="field_contact_email2"
name="contact_email2" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="application/contact_email2"/></xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="php:function('lang', 'Phone')" /></label>
+ <input id="field_contact_phone"
name="contact_phone" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="application/contact_phone"/></xsl:attribute>
+ </input>
+ </div>
+ </div>
+ <div class="pure-u-1-3">
+ <div class="heading">7.x <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
+ <p>Ut fra reglementet i pkt. 8 finner du kriterier
for fakturering. Når du som privatperson skal låne noe som det ikke skal
faktureres for oppgir du kun fødselsdato, men skal du leie noe som koster noe,
da må vi ha hele personnummeret. Alle lag og organisasjoner skal oppgi
organisasjonsnr.</p>
+ <xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
+ <p>
+ <xsl:value-of select="php:function('lang', 'In
order to send the invoice we need information about either customer
organization number or norwegian social security number')" />
+ </p>
+ <div class="pure-control-group">
+ <xsl:if
test="config/application_responsible_applicant">
+ <p>
+ <xsl:value-of
select="config/application_responsible_applicant"/>
+ </p>
+ </xsl:if>
+ <!--xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/-->
+ <br />
+ <xsl:if
test="config/application_invoice_information">
+ <p>
+ <xsl:value-of
select="config/application_invoice_information"/>
+ </p>
+ </xsl:if>
+ </div>
+ </div>
+ <div class="pure-u-1-3">
+ <div class="heading"><br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
+ <p>Alle som leier lokaler hos Bergen kommune må
bekrefte at de har lest betingelsene, dette gjelder som regel brannforskrifter
og husreglement.</p>
+ <div class="pure-control-group">
+ <xsl:if test="config/application_terms">
+ <p>
+ <xsl:value-of
select="config/application_terms"/>
+ </p>
+ </xsl:if>
+ <br />
+ <div id='regulation_documents'> </div>
+ <br />
+ <xsl:if test="config/application_terms2">
+ <p>
+ <xsl:value-of
select="config/application_terms2"/>
+ </p>
+ </xsl:if>
+ <p><xsl:value-of select="php:function('lang',
'To borrow premises you must verify that you have read terms and conditions')"
/></p>
+ </div>
+ </div>
+ </div>
+
<!--div class="pure-control-group">
- <label></label>
- <xsl:if test="config/application_equipment">
- <p>
- <xsl:value-of
select="config/application_equipment"/>
- </p>
- </xsl:if>
- <textarea id="field_equipment" class="full-width"
name="equipment"><xsl:value-of select="application/equipment"/></textarea>
+ <label></label>
+ <xsl:if test="config/application_equipment">
+ <p>
+ <xsl:value-of
select="config/application_equipment"/>
+ </p>
+ </xsl:if>
+ <textarea id="field_equipment" class="full-width"
name="equipment"><xsl:value-of select="application/equipment"/></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', 'Send')"/></xsl:attribute>
- </input>
- <a class="cancel">
- <xsl:attribute name="href"><xsl:value-of
select="application/cancel_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang',
'Cancel')" />
- </a>
- <p style="width: 750px; margin-top: 10px;">Trykker du
<strong>SEND</strong>-knappen får du opp en rød melding øverst om noen
opplysninger mangler, er alt OK kommer det opp en grønn melding. Det blir sendt
en bekreftelse til din e-post, og en lenke hvor du kan gå inn og se status og
legge til ekstra opplysninger i saken.<br /><br />
- Trykker du <strong>Avbryt</strong> blir søknaden
ikke sendt eller lagret, og du går tilbake til kalenderen.</p>
+ <input type="submit" class="pure-button pure-button-primary">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Send')"/></xsl:attribute>
+ </input>
+ <a class="cancel">
+ <xsl:attribute name="href"><xsl:value-of
select="application/cancel_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Cancel')" />
+ </a>
+ <p style="width: 750px; margin-top: 10px;">Trykker du
<strong>SEND</strong>-knappen får du opp en rød melding øverst om noen
opplysninger mangler, er alt OK kommer det opp en grønn melding. Det blir sendt
en bekreftelse til din e-post, og en lenke hvor du kan gå inn og se status og
legge til ekstra opplysninger i saken.<br /><br />
+ Trykker du <strong>Avbryt</strong> blir søknaden ikke
sendt eller lagret, og du går tilbake til kalenderen.</p>
</div>
- </form>
- <!--/div-->
- <script type="text/javascript">
- YAHOO.booking.initialDocumentSelection = <xsl:value-of
select="application/accepted_documents_json"/>;
- YAHOO.booking.initialAcceptAllTerms = false;
- YAHOO.booking.initialSelection = <xsl:value-of
select="application/resources_json"/>;
- YAHOO.booking.initialAudience = <xsl:value-of
select="application/audience_json"/>;
- var lang = <xsl:value-of select="php:function('js_lang',
'From', 'To', 'Resource Type', 'Name', 'Accepted', 'Document', 'You must accept
to follow all terms and conditions of lease first.')"/>;
- </script>
+ </form>
+ <!--/div-->
+ <script type="text/javascript">
+ YAHOO.booking.initialDocumentSelection = <xsl:value-of
select="application/accepted_documents_json"/>;
+ YAHOO.booking.initialAcceptAllTerms = false;
+ YAHOO.booking.initialSelection = <xsl:value-of
select="application/resources_json"/>;
+ YAHOO.booking.initialAudience = <xsl:value-of
select="application/audience_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'From', 'To',
'Resource Type', 'Name', 'Accepted', 'Document', 'You must accept to follow all
terms and conditions of lease first.')"/>;
+ </script>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13852] fixing datatable and forms,
Saul <=