[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14395] added validation
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14395] added validation |
|
Date: |
Tue, 17 Nov 2015 23:00:34 +0000 |
Revision: 14395
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14395
Author: psaul
Date: 2015-11-17 23:00:33 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
added validation
Modified Paths:
--------------
branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking_massupdate.js
branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
branches/dev-syncromind/bookingfrontend/templates/base/event_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/group_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/organization_edit.xsl
branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-11-17 23:00:33 UTC (rev 14395)
@@ -266,6 +266,8 @@
$GLOBALS['phpgw']->jqcal->add_listener('field_to', 'datetime');
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until',
'date');
+ phpgwapi_jquery::formvalidator_generate(array('location', 'date',
'security', 'file'), 'booking_form');
+
if ($step < 2)
{
self::render_template('booking_new',
array('booking' => $booking,
@@ -353,7 +355,6 @@
public function edit()
{
-
$id = intval(phpgw::get_var('id', 'GET'));
$booking = $this->bo->read_single($id);
$booking['building'] =
$this->building_bo->so->read_single($booking['building_id']);
@@ -477,6 +478,7 @@
if ($step < 2) {
$booking['resources_json'] =
json_encode(array_map('intval', $booking['resources']));
$booking['organization_name'] =
$group['organization_name'];
+ $booking['organization_id'] = $group['organization_id'];
}
$booking['from_'] = pretty_timestamp($booking['from_']);
@@ -507,6 +509,9 @@
$GLOBALS['phpgw']->jqcal->add_listener('field_to', 'datetime');
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until',
'date');
+
+ phpgwapi_jquery::formvalidator_generate(array('location', 'date',
'security', 'file'), 'booking_form');
+
if ($step < 2)
{
self::render_template('booking_edit',
array('booking' => $booking,
@@ -634,6 +639,8 @@
$activities = $activities['results'];
self::add_javascript('bookingfrontend', 'bookingfrontend',
'booking_massupdate.js');
+
+ phpgwapi_jquery::formvalidator_generate(array('location', 'date',
'security', 'file'), 'booking_form');
self::render_template('booking_massupdate',
array('booking' => $booking,
@@ -792,6 +799,7 @@
$booking['to_'] = pretty_timestamp($booking['to_']);
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until',
'date');
+ $booking['resources_json'] = json_encode(array_map('intval',
$booking['resources']));
$this->flash_form_errors($errors);
$allocation['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule', 'id' =>
$allocation['building_id']));
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
2015-11-17 23:00:33 UTC (rev 14395)
@@ -154,6 +154,8 @@
$GLOBALS['phpgw']->jqcal->add_listener('from_', 'time');
$GLOBALS['phpgw']->jqcal->add_listener('to_', 'time');
phpgwapi_jquery::load_widget('datepicker');
+
+ phpgwapi_jquery::formvalidator_generate(array('location', 'date',
'security', 'file'), 'event_form');
self::render_template('event_edit', array('event' => $event,
'activities' => $activities, 'agegroups' => $agegroups, 'audience' =>
$audience, 'comments' => $comments));
}
@@ -357,7 +359,7 @@
$event = $this->bo->read_single($id);
$activity_path =
$this->activity_bo->get_path($event['activity_id']);
- $top_level_activity = $activity_path ? $activity_path[0]['id'] :
.1;
+ $top_level_activity = $activity_path ? $activity_path[0]['id'] :
-1;
$agegroups =
$this->agegroup_bo->fetch_age_groups($top_level_activity);
$agegroups = $agegroups['results'];
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-11-17 23:00:33 UTC (rev 14395)
@@ -37,10 +37,10 @@
{
$system_message = array_merge($system_message,
extract_values($_POST, array('time', 'title', 'message', 'name', 'phone',
'email')));
- if ($system_message['message'] == '') {
+ if ($system_message['title'] == '') {
$errors['system_message'] =
lang('Missing title');
}
- elseif ($system_message['title'] == '') {
+ elseif ($system_message['message'] == '') {
$errors['system_message'] =
lang('Missing message');
}
elseif ($system_message['name'] == '') {
Modified:
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
===================================================================
--- branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/js/bookingfrontend/application.js
2015-11-17 23:00:33 UTC (rev 14395)
@@ -198,7 +198,7 @@
var v = (n == 0) ? true : false;
return v;
},
- errorMessage: 'Invalida date',
+ errorMessage: 'Invalid date',
errorMessageKey: ''
});
} else {
Modified: branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
===================================================================
--- branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking.js
2015-11-17 23:00:33 UTC (rev 14395)
@@ -73,6 +73,38 @@
}
});
+$.formUtils.addValidator({
+ name: 'target_audience',
+ validatorFunction: function(value, $el, config, languaje, $form) {
+ var n = 0;
+ $('#audience input[name="audience[]"]').each(function(){
+ if ($(this).is(':checked')) {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Please choose at least 1 target audience',
+ errorMessageKey: ''
+})
+
+$.formUtils.addValidator({
+ name: 'number_participants',
+ validatorFunction: function(value, $el, config, languaje, $form) {
+ var n = 0;
+ $('#agegroup_tbody input').each(function() {
+ if ($(this).val() != "" && $(this).val() > 0) {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Number of participants is required',
+ errorMessageKey: ''
+});
+
function populateTableChk (url, container, colDefs) {
createTable(container, url, colDefs, 'results');
}
Modified:
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking_massupdate.js
===================================================================
---
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking_massupdate.js
2015-11-17 22:57:18 UTC (rev 14394)
+++
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/booking_massupdate.js
2015-11-17 23:00:33 UTC (rev 14395)
@@ -58,9 +58,40 @@
});
});
+$.formUtils.addValidator({
+ name: 'target_audience',
+ validatorFunction: function(value, $el, config, languaje, $form) {
+ var n = 0;
+ $('#audience input[name="audience[]"]').each(function(){
+ if ($(this).is(':checked')) {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Please choose at least 1 target audience',
+ errorMessageKey: ''
+})
+$.formUtils.addValidator({
+ name: 'number_participants',
+ validatorFunction: function(value, $el, config, languaje, $form) {
+ var n = 0;
+ $('#agegroup_tbody input').each(function() {
+ if ($(this).val() != "" && $(this).val() > 0) {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ return v;
+ },
+ errorMessage: 'Number of participants is required',
+ errorMessageKey: ''
+});
+
//YAHOO.util.Event.addListener(window, "load", function() {
// YAHOO.util.Dom.setStyle(('header'), 'display', 'none');
//});
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application_edit.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -38,6 +38,9 @@
<dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label></dt>
<dd>
<select name="activity_id" id="field_activity">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
<option>
@@ -52,7 +55,12 @@
</dd>
<dt><label for="field_description"><xsl:value-of
select="php:function('lang', 'Description')" /></label></dt>
<dd>
- <textarea id="field_description" class="full-width"
name="description"><xsl:value-of select="application/description"/></textarea>
+ <textarea id="field_description" class="full-width"
name="description">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="application/description"/>
+ </textarea>
</dd>
</dl>
</div>
@@ -69,6 +77,9 @@
<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="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="application/building_name"/></xsl:attribute>
</input>
<div id="building_container"/>
@@ -101,6 +112,7 @@
<dl class="form-col">
<div class="heading">3. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
<div id="dates-container">
+ <input type="hidden"
data-validation="application_dates" />
<xsl:for-each select="application/dates">
<xsl:variable name="index" select="position()-2"/>
<xsl:choose>
@@ -157,6 +169,7 @@
<div class="heading">4. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Target audience')" /></label></dt>
<dd>
+ <input type="hidden" data-validation="target_audience"
/>
<ul id="audience">
<xsl:for-each select="audience">
<li>
@@ -173,6 +186,7 @@
</dd>
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label></dt>
<dd>
+ <input type="hidden"
data-validation="number_participants" />
<table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
@@ -208,12 +222,18 @@
<dt><label for="field_contact_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
<dd>
<input id="field_contact_name" name="contact_name"
type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="application/contact_name"/></xsl:attribute>
</input>
</dd>
<dt><label for="field_contact_email"><xsl:value-of
select="php:function('lang', 'Email')" /></label></dt>
<dd>
<input id="field_contact_email" name="contact_email"
type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="application/contact_email"/></xsl:attribute>
</input>
</dd>
@@ -235,6 +255,7 @@
<dl class="form-col">
<div class="heading"><xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
<br/>
+ <input type="hidden"
data-validation="regulations_documents" />
<div id='regulation_documents'/>
</dl>
</div>
@@ -251,42 +272,7 @@
</a>
</div>
</div>
- </div>
-
-
-
-
-
-
-
-
- <!--dl class="form">
-
- </dl>
- <dl class="form">
-
- </dl>
- <div class="clr"/>
- <dl class="form-col">
-
- </dl>
- <dl class="form-col">
-
- </dl>
- <dl class="form-col">
-
- </dl>
- <div class="clr"/>
- <dl class="form-col">
-
- </dl>
- <dl class="form-col">
-
- </dl>
- <dl class="form-col">
-
- </dl-->
-
+ </div>
</form>
</div>
<script type="text/javascript">
@@ -295,5 +281,6 @@
var initialSelection = <xsl:value-of
select="application/resources_json"/>;
var 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.')"/>;
+
$('#field_customer_identifier_type').attr("data-validation","customer_identifier");
</script>
</xsl:template>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/templates/base/application_new.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -5,7 +5,7 @@
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST" id='application_form'>
+ <form action="" method="POST" id='application_form' name="form">
<xsl:if test="config/application_new_application">
<p style="width: 750px;">
<xsl:value-of
select="config/application_new_application"/>
@@ -26,6 +26,9 @@
</dt>
<dd>
<select name="activity_id"
id="field_activity">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
<option>
@@ -47,7 +50,12 @@
</xsl:if-->
</dt>
<dd>
- <textarea id="field_description" class="full-width"
name="description"><xsl:value-of select="application/description"/></textarea>
+ <textarea id="field_description" class="full-width"
name="description">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="application/description"/>
+ </textarea>
</dd>
<!--dt>
<xsl:if test="config/application_equipment">
@@ -71,6 +79,7 @@
</xsl:if-->
<dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Estimated number of participants')"
/></label></dt>
<dd>
+ <input type="hidden"
data-validation="number_participants" />
<table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
@@ -119,6 +128,9 @@
</input>
<input id="field_building_name"
name="building_name" type="text">
<xsl:attribute name="value"><xsl:value-of
select="application/building_name"/></xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
</input>
<div id="building_container"/>
</div>
@@ -138,6 +150,7 @@
</p>
</xsl:if-->
<div id="dates-container">
+ <input type="hidden"
data-validation="application_dates" />
<xsl:for-each select="application/dates">
<xsl:variable name="index" select="position()-2" />
<xsl:choose>
@@ -200,6 +213,7 @@
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Target audience')" /></label></dt>
<dd>
<!--div id="audience_container"> </div-->
+ <input type="hidden" data-validation="target_audience"
/>
<ul id= "audience"
style="list-style:none;padding-left:10px;">
<xsl:for-each select="audience">
<li>
@@ -232,18 +246,37 @@
<dt><label for="field_contact_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
<dd>
<input id="field_contact_name" name="contact_name"
type="text">
- <xsl:attribute name="value"><xsl:value-of
select="application/contact_name"/></xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="application/contact_name"/>
+ </xsl:attribute>
</input>
</dd>
<dt><label for="field_contact_email"><xsl:value-of
select="php:function('lang', 'E-mail address')" /></label></dt>
<dd>
<input id="field_contact_email" name="contact_email"
type="text">
- <xsl:attribute name="value"><xsl:value-of
select="application/contact_email"/></xsl:attribute>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="application/contact_email"/>
+ </xsl:attribute>
</input>
</dd>
<dt><label for="field_contact_email2"><xsl:value-of
select="php:function('lang', 'Confirm e-mail address')" /></label></dt>
<dd>
<input id="field_contact_email2" name="contact_email2"
type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>confirmation</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-confirm">
+ <xsl:text>contact_email</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="data-validation-error-msg">
+ <xsl:text>The e-mail addresses you entered do
not match</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="application/contact_email2"/></xsl:attribute>
</input>
</dd>
@@ -274,20 +307,21 @@
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
<dl class="form-col">
- <div class="heading">. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
- <!--xsl:if test="config/application_terms">
+ <div class="heading">8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
+ <input type="hidden"
data-validation="regulations_documents" />
+ <xsl:if test="config/application_terms">
<p>
<xsl:value-of select="config/application_terms"/>
</p>
- </xsl:if-->
+ </xsl:if>
<br />
<div id='regulation_documents'> </div>
<br />
- <!--xsl:if test="config/application_terms2">
+ <xsl:if test="config/application_terms2">
<p>
<xsl:value-of select="config/application_terms2"/>
</p>
- </xsl:if-->
+ </xsl:if>
</dl>
</div>
</div>
@@ -311,5 +345,6 @@
var initialSelection = <xsl:value-of
select="application/resources_json"/>;
var 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.')"/>;
+
$('#field_customer_identifier_type').attr("data-validation","customer_identifier");
</script>
</xsl:template>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_delete.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -176,8 +176,8 @@
<script type="text/javascript">
var season_id = '<xsl:value-of select="booking/season_id" />';
var group_id = '<xsl:value-of select="booking/group_id" />';
- var initialSelection = '<xsl:value-of select="booking/resource_json"
/>';
- var lang = <xsl:value-of select="php:function(('js_lang', 'Resource
Type')" />;
+ var initialSelection = '<xsl:value-of select="booking/resources_json"
/>';
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')" />;
</script>
<!--script type="text/javascript">
YAHOO.booking.season_id = '<xsl:value-of select="booking/season_id"/>';
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_edit.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -7,7 +7,7 @@
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST">
+ <form action="" method="POST" id="booking_form">
<input type="hidden" name="season_id"
value="{booking/season_id}"/>
<input type="hidden" name="allocation_id"
value="{booking/allocation_id}"/>
<input type="hidden" name="step" value="1"/>
@@ -36,6 +36,9 @@
<dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label></dt>
<dd>
<select name="activity_id" id="field_activity">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
<option>
@@ -56,7 +59,11 @@
<dl class="form-col">
<dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')"/></label></dt>
<dd>
- <input id="field_building_id" name="building_id"
type="hidden" value="{booking/building_id}"/>
+ <input id="field_building_id" name="building_id"
type="hidden" value="{booking/building_id}">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
<xsl:value-of select="booking/building_name"/>
</dd>
</dl>
@@ -71,7 +78,11 @@
<dl class="form-col">
<dt><label for="field_org"><xsl:value-of
select="php:function('lang', 'Organization')"/></label></dt>
<dd>
- <input id="field_organization_id"
name="organization_id" type="hidden" value="{booking/organization_id}"/>
+ <input id="field_organization_id"
name="organization_id" type="hidden" value="{booking/organization_id}">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
<xsl:value-of select="booking/organization_name"/>
</dd>
</dl>
@@ -79,7 +90,10 @@
<dt><label for="field_group"><xsl:value-of
select="php:function('lang', 'Group')"/></label></dt>
<dd>
<select name="group_id">
- <option value=""><xsl:value-of
select="php:function('lang', 'Select a group')"/></option>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <option value=""><xsl:value-of
select="php:function('lang', 'Select a group')"/></option>
<xsl:for-each select="groups">
<option value="{id}">
<xsl:if test="../booking/group_id = id">
@@ -95,6 +109,9 @@
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'From')"/></label></dt>
<dd>
<input class="datetime" id="field_from" type="text"
name="from_">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of select="booking/from_" />
</xsl:attribute>
@@ -110,6 +127,9 @@
<dt><label for="field_to"><xsl:value-of
select="php:function('lang', 'To')"/></label></dt>
<dd>
<input class="datetime" id="field_to" type="text"
name="to_">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of select="booking/to_"/>
</xsl:attribute>
@@ -157,6 +177,7 @@
<dl class="form-col">
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Target audience')" /></label></dt>
<dd>
+ <input type="hidden" data-validation="target_audience"
/>
<ul id="audience"
style="list-style:none;padding-left:10px;">
<xsl:for-each select="audience">
<li>
@@ -175,6 +196,7 @@
<dl class="form-col">
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label></dt>
<dd>
+ <input type="hidden"
data-validation="number_participants" />
<table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++
branches/dev-syncromind/bookingfrontend/templates/base/booking_massupdate.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -44,7 +44,7 @@
<xsl:value-of
select="php:function('lang', 'Please update the data and click the
Next-button.')" />
<xsl:value-of
select="php:function('lang', 'When clicking the Next-button you will be
presented to a list of bookings that will be updated.')" />
</p>
- <form action="" method="POST">
+ <form action="" method="POST"
name="booking_form" id="booking_form">
<input type="hidden" name="season_id"
value="{booking/season_id}"/>
<input type="hidden"
name="allocation_id" value="{booking/allocation_id}"/>
<input type="hidden" name="step"
value="1"/>
@@ -52,6 +52,9 @@
<dt><label
for="field_activity"><xsl:value-of select="php:function('lang', 'Activity')"
/></label></dt>
<dd>
<select
name="activity_id" id="field_activity">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<option
value=""><xsl:value-of select="php:function('lang', '-- select an activity
--')" /></option>
<xsl:for-each
select="activities">
<option>
@@ -67,7 +70,10 @@
<dt><label
for="field_group"><xsl:value-of select="php:function('lang',
'Group')"/></label></dt>
<dd>
<select name="group_id">
- <option
value=""><xsl:value-of select="php:function('lang', 'Select a
group')"/></option>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <option value=""><xsl:value-of
select="php:function('lang', 'Select a group')"/></option>
<xsl:for-each
select="groups">
<option
value="{id}">
<xsl:if test="../booking/group_id = id">
@@ -82,6 +88,7 @@
<dl class="form-col">
<dt><label
for="field_from"><xsl:value-of select="php:function('lang', 'Target audience')"
/></label></dt>
<dd>
+ <input type="hidden"
data-validation="target_audience" />
<ul id="audience"
style="list-style:none;padding-left:10px;">
<xsl:for-each
select="audience">
<li>
@@ -100,6 +107,7 @@
<dl class="form-col">
<dt><label
for="field_from"><xsl:value-of select="php:function('lang', 'Number of
participants')" /></label></dt>
<dd>
+ <input type="hidden"
data-validation="number_participants" />
<table id="agegroup"
class="pure-table pure-table-bordered">
<thead>
<tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/templates/base/booking_new.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -7,7 +7,7 @@
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST">
+ <form action="" method="POST" id="booking_form">
<input type="hidden" name="season_id"
value="{booking/season_id}"/>
<input type="hidden" name="allocation_id"
value="{booking/allocation_id}"/>
@@ -17,6 +17,9 @@
<dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label></dt>
<dd>
<select name="activity_id" id="field_activity">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
<option>
@@ -38,7 +41,11 @@
<dl class="form-col">
<dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')"/></label></dt>
<dd>
- <input id="field_building_id" name="building_id"
type="hidden" value="{booking/building_id}"/>
+ <input id="field_building_id" name="building_id"
type="hidden" value="{booking/building_id}">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
<xsl:value-of select="booking/building_name" />
</dd>
</dl>
@@ -61,7 +68,10 @@
<dd>
<div id="group_container">
<select name="group_id">
- <option value=""><xsl:value-of
select="php:function('lang', 'Select a group')"/></option>
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <option value=""><xsl:value-of
select="php:function('lang', 'Select a group')"/></option>
<xsl:for-each select="groups">
<option value="{id}">
<xsl:if test="../booking/group_id =
id">
@@ -84,6 +94,9 @@
</input>
</div-->
<input class="datetime" id="field_from" type="text"
name="from_">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of select="booking/from_" />
</xsl:attribute>
@@ -100,6 +113,9 @@
</input>
</div-->
<input class="datetime" id="field_to" type="text"
name="to_">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of select="booking/to_" />
</xsl:attribute>
@@ -178,6 +194,7 @@
<dl class="form-col">
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Target audience')" /></label></dt>
<dd>
+ <input type="hidden" data-validation="target_audience"
/>
<ul id="audience">
<xsl:for-each select="audience">
<li>
@@ -196,6 +213,7 @@
<dl class="form-col">
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label></dt>
<dd>
+ <input type="hidden"
data-validation="number_participants" />
<table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/event_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/event_edit.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/templates/base/event_edit.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -7,7 +7,7 @@
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST">
+ <form action="" method="POST" id="event_form" name="event_form">
<div class="pure-g">
<div class="pure-u-1">
<dl class="form-col">
@@ -15,6 +15,9 @@
<dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label></dt>
<dd>
<select name="activity_id" id="field_activity">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
<option>
@@ -50,7 +53,12 @@
<dt><label for="field_description"><xsl:value-of
select="php:function('lang', 'Description')" /></label></dt>
<dd>
- <textarea id="field_description"
class="full-width" name="description"><xsl:value-of
select="event/description"/></textarea>
+ <textarea id="field_description"
class="full-width" name="description">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="event/description"/>
+ </textarea>
</dd>
</dl>
</div>
@@ -63,9 +71,15 @@
<dd>
<div class="autocomplete">
<input id="field_building_id"
name="building_id" type="hidden">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="event/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="value"><xsl:value-of
select="event/building_name"/></xsl:attribute>
</input>
<div id="building_container"/>
@@ -90,6 +104,9 @@
</input>
</div-->
<input class="datetime pure-input-2-3" id="from_"
name="from_" type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:if test="event/from_ != ''">
<xsl:attribute name="value"><xsl:value-of
select="event/from_2" /></xsl:attribute>
</xsl:if>
@@ -105,6 +122,9 @@
</input>
</div-->
<input class="datetime pure-input-2-3" id="to_"
name="to_" type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:if test="event/to_ != ''">
<xsl:attribute name="value"><xsl:value-of
select="event/to_2" /></xsl:attribute>
</xsl:if>
@@ -117,6 +137,7 @@
<dt class="heading"><xsl:value-of
select="php:function('lang', 'Who')" /></dt>
<dt><label><xsl:value-of select="php:function('lang',
'Target audience')" /></label></dt>
<dd>
+ <input type="hidden"
data-validation="target_audience" />
<ul id="audience">
<xsl:for-each select="audience">
<li>
@@ -133,6 +154,7 @@
</dd>
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label></dt>
<dd>
+ <input type="hidden"
data-validation="number_participants" />
<table id="agegroup" class="pure-table
pure-table-bordered">
<thead>
<tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
@@ -170,6 +192,9 @@
<dt><label for="field_contact_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
<dd>
<input id="field_contact_name" name="contact_name"
type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="event/contact_name"/></xsl:attribute>
</input>
</dd>
@@ -188,6 +213,9 @@
<dt><label for="field_cost"><xsl:value-of
select="php:function('lang', 'Cost')" /></label></dt>
<dd>
<input id="field_cost" name="cost" type="text"
readonly="readonly">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="event/cost"/></xsl:attribute>
</input>
</dd>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/group_edit.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/group_edit.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/templates/base/group_edit.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -28,14 +28,27 @@
<div class="pure-u-1 pure-u-md-1-3">
<dl class="form-col">
<dt><label for="field_name"><xsl:value-of
select="php:function('lang', 'Group')" /></label></dt>
- <dd><input name="name" type="text"
value="{group/name}" /></dd>
+ <dd>
+ <input name="name" type="text"
value="{group/name}">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
+ </dd>
<dt><label for="field_shortname"><xsl:value-of
select="php:function('lang', 'Group shortname')" /></label></dt>
<dd><input name="shortname" type="text"
value="{group/shortname}" /></dd>
<dt><label for="field_organization"><xsl:value-of
select="php:function('lang', 'Organization')" /></label></dt>
<dd>
<div class="autocomplete">
- <input id="field_organization_id"
name="organization_id" type="hidden" value="{group/organization_id}"/>
+ <input id="field_organization_id"
name="organization_id" type="hidden" value="{group/organization_id}">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
<input name="organization_name" type="text"
id="field_organization_name" value="{group/organization_name}">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:if test="group/organization_id">
<xsl:attribute
name='disabled'>disabled</xsl:attribute>
</xsl:if>
@@ -81,6 +94,7 @@
</select>
</dd>
</xsl:if>
+ <!--<xsl:if test="not(new_form) and (currentapp =
'booking')">-->
<dt><label for="field_show_in_portal"><xsl:value-of
select="php:function('lang', 'Show in portal')"/></label></dt>
<dd>
<select id="field_show_in_portal"
name="show_in_portal">
@@ -98,6 +112,7 @@
</option>
</select>
</dd>
+ <!--</xsl:if>-->
</dl>
</div>
</div>
@@ -143,7 +158,6 @@
</dl>
</div>
</div>
-
<!--dl class="form-col">
</dl-->
<!--dl class="form-col"-->
@@ -152,11 +166,6 @@
<!--/dl-->
<!--div style='clear:left; padding:0; margin:0'/-->
-
-
-
-
-
<div class="form-buttons">
<xsl:if test="not(group/id)"><input type="submit"
value="{php:function('lang', 'Add')}"/></xsl:if>
<xsl:if test="group/id"><input type="submit"
value="{php:function('lang', 'Save')}"/></xsl:if>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/organization_edit.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/base/organization_edit.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++
branches/dev-syncromind/bookingfrontend/templates/base/organization_edit.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -43,11 +43,17 @@
<dd>
<xsl:if test="currentapp = 'booking'">
<input id="inputs" name="name" type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="organization/name"/></xsl:attribute>
</input>
</xsl:if>
<xsl:if test="currentapp != 'booking'">
<input id="inputs" name="name" readonly="true"
type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="organization/name"/></xsl:attribute>
</input>
</xsl:if>
@@ -184,6 +190,9 @@
<dt style="margin-top: 40px;"><label
for="field_activity"><xsl:value-of select="php:function('lang', 'Activity')"
/></label></dt>
<dd>
<select name="activity_id" id="field_activity">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
<option>
Modified:
branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
2015-11-17 22:57:18 UTC (rev 14394)
+++ branches/dev-syncromind/bookingfrontend/templates/base/system_message.xsl
2015-11-17 23:00:33 UTC (rev 14395)
@@ -20,7 +20,13 @@
<div class="pure-u-1">
<dl class="form-col">
<dt><label for="field_title"><xsl:value-of
select="php:function('lang', 'Title')" /></label></dt>
- <dd><input name="title" type="text"
value="{system_message/title}" /></dd>
+ <dd>
+ <input name="title" type="text"
value="{system_message/title}">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
+ </dd>
</dl>
</div>
</div>
@@ -30,7 +36,12 @@
<dl class="form-col">
<dt><label for="field_message"><xsl:value-of
select="php:function('lang', 'Message')" /></label></dt>
<dd>
- <textarea id="field-message" name="message"
type="text"><xsl:value-of select="system_message/message"/></textarea>
+ <textarea id="field-message" name="message"
type="text">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of select="system_message/message"/>
+ </textarea>
</dd>
</dl>
</div>
@@ -40,7 +51,13 @@
<div class="pure-u-1">
<dl class="form-col">
<dt><label for="field_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
- <dd><input name="name" type="text"
value="{system_message/name}" /></dd>
+ <dd>
+ <input name="name" type="text"
value="{system_message/name}" >
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
+ </dd>
<dt><label for="field_phone"><xsl:value-of
select="php:function('lang', 'Phone')" /></label></dt>
<dd><input name="phone" type="text"
value="{system_message/phone}" /></dd>
<dt><label for="field_email"><xsl:value-of
select="php:function('lang', 'Email')" /></label></dt>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14395] added validation,
Saul <=