[Fmsystem-commits] [14393]

[Saul]

Revision: 14393
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14393
Author:   psaul
Date:     2015-11-17 22:55:53 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
    branches/dev-syncromind/booking/templates/base/organization_edit.xsl

Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php     
2015-11-17 14:23:31 UTC (rev 14392)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php     
2015-11-17 22:55:53 UTC (rev 14393)
@@ -811,11 +811,11 @@
                 $application['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
                 
                 self::add_javascript('booking', 'booking', 'application.js');
-                
-                phpgwapi_jquery::formvalidator_generate(array('location', 
'date', 'security', 'file'), 'application_form');
             } else {
                 self::add_javascript('bookingfrontend', 'bookingfrontend', 
'application.js');
             }
+            
+            phpgwapi_jquery::formvalidator_generate(array('location', 'date', 
'security', 'file'), 'application_form');
 
                        self::adddatetimepicker();
 
@@ -878,7 +878,6 @@
                         
                        $this->flash_form_errors($errors);
                         $this->set_case_officer($application);
-                       self::add_javascript('booking', 'booking', 
'application.js');
                        self::adddatetimepicker();
                        
                        $application['resources_json'] = 
json_encode(array_map('intval', $application['resources']));
@@ -903,9 +902,13 @@
                 $tabs = array();
                 $tabs['generic'] = array('label' => lang('Application Edit'), 
'link' => '#application_edit');
                 $active_tab = 'generic';
+                self::add_javascript('booking', 'booking', 'application.js');
                 $application['tabs'] = 
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-                $application['validator'] = 
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security', 
'file'), 'application_form');
+            } else {
+                self::add_javascript('bookingfrontend', 'bookingfrontend', 
'application.js');
             }
+            
+            phpgwapi_jquery::formvalidator_generate(array('location', 'date', 
'security', 'file'), 'application_form');
 
                        self::render_template_xsl('application_edit', 
array('application' => $application, 'activities' => $activities, 'agegroups' 
=> $agegroups, 'audience' => $audience));
                }

Modified: branches/dev-syncromind/booking/templates/base/organization_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/organization_edit.xsl        
2015-11-17 14:23:31 UTC (rev 14392)
+++ branches/dev-syncromind/booking/templates/base/organization_edit.xsl        
2015-11-17 22:55:53 UTC (rev 14393)
@@ -96,7 +96,7 @@
                             </div>
                             <div class="pure-control-group">
                                 <label for="field_email"><xsl:value-of 
select="php:function('lang', 'Email')" /></label>
-                                <input id="field_email" name="email" 
type="text" class="pure-u-1" data-validation="email">
+                                <input id="field_email" name="email" 
type="text" class="pure-u-1">
                                     <xsl:attribute name="value"><xsl:value-of 
select="organization/email"/></xsl:attribute>                                   
                                 
                                 </input>
                             </div>
@@ -181,6 +181,9 @@
                                 <div class="pure-control-group pure-u-sm-1-1 
pure-u-md-2-3 pure-u-lg-1-2">
                                     <label for="field_activity"><xsl:value-of 
select="php:function('lang', 'Activity')" /></label>
                                     <select name="activity_id" 
id="field_activity" class="pure-u-2-3">
+                                        <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>