[Fmsystem-commits] [16029] more on eventplanner

[sigurdne]

Revision: 16029
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16029
Author:   sigurdne
Date:     2016-11-27 17:41:11 +0000 (Sun, 27 Nov 2016)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/js/portico/application.edit.js
    trunk/eventplanner/templates/base/application.xsl

Modified: trunk/eventplanner/js/portico/application.edit.js
===================================================================
--- trunk/eventplanner/js/portico/application.edit.js   2016-11-27 17:40:38 UTC 
(rev 16028)
+++ trunk/eventplanner/js/portico/application.edit.js   2016-11-27 17:41:11 UTC 
(rev 16029)
@@ -6,11 +6,26 @@
 validate_submit = function()
 {
        var active_tab = $("#active_tab").val();
+       conf = {
+       //      modules: 'date, security, file',
+               validateOnBlur: false,
+               scrollToTopOnError: true,
+               errorMessagePosition: 'top'
+       //      language: validateLanguage
+       };
 
+       var test = $('form').isValid(false, conf);
+       if (!test)
+       {
+               return;
+       }
+
        if(active_tab === 'first_tab')
        {
                $('#tab-content').responsiveTabs('activate', 1);
                $("#save_button").val(lang['save']);
+               $("#save_button_bottom").val(lang['save']);
+               $("#active_tab").val('demands');
        }
        else
        {
@@ -135,12 +150,14 @@
        else if(tab === 'first_tab')
        {
                $("#save_button").val(lang['next']);
+               $("#save_button_bottom").val(lang['next']);
                $("#floating-box").show();
                $("#submit_group_bottom").show();
        }
        else
        {
                $("#save_button").val(lang['save']);
+               $("#save_button_bottom").val(lang['save']);
                $("#floating-box").show();
                $("#submit_group_bottom").show();
        }

Modified: trunk/eventplanner/templates/base/application.xsl
===================================================================
--- trunk/eventplanner/templates/base/application.xsl   2016-11-27 17:40:38 UTC 
(rev 16028)
+++ trunk/eventplanner/templates/base/application.xsl   2016-11-27 17:41:11 UTC 
(rev 16029)
@@ -49,15 +49,15 @@
                                                                <tbody>
                                                                        <tr>
                                                                                
<td width="200px">
-                                                                               
        <xsl:variable name="lang_savel">
+                                                                               
        <xsl:variable name="lang_save">
                                                                                
                <xsl:value-of select="php:function('lang', 'next')"/>
                                                                                
        </xsl:variable>
                                                                                
        <input type="button" class="pure-button pure-button-primary" 
name="save" id="save_button" onClick="validate_submit();">
                                                                                
                <xsl:attribute name="value">
-                                                                               
                        <xsl:value-of select="$lang_savel"/>
+                                                                               
                        <xsl:value-of select="$lang_save"/>
                                                                                
                </xsl:attribute>
                                                                                
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="$lang_savel"/>
+                                                                               
                        <xsl:value-of select="$lang_save"/>
                                                                                
                </xsl:attribute>
                                                                                
        </input>
                                                                                
</td>
@@ -480,7 +480,7 @@
                                                                                
<xsl:text>required</xsl:text>
                                                                        
</xsl:attribute>
                                                                        
<xsl:attribute name="data-validation-error-msg">
-                                                                               
<xsl:value-of select="php:function('lang', 'audience_limit')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'audience limit')"/>
                                                                        
</xsl:attribute>
                                                                        
<xsl:attribute name="placeholder">
                                                                                
<xsl:value-of select="php:function('lang', 'integer')"/>
@@ -750,20 +750,21 @@
                                                                        
</xsl:for-each>
                                                                </div>
                                                        </div>
-
-
                                                </fieldset>
-
-
-
                                        </div>
 
                                </div>
                                <div id="submit_group_bottom" 
class="proplist-col">
-                                       <input type="submit" class="pure-button 
pure-button-primary" name="save">
+                                       <xsl:variable name="lang_save">
+                                               <xsl:value-of 
select="php:function('lang', 'next')"/>
+                                       </xsl:variable>
+                                       <input type="button" class="pure-button 
pure-button-primary" name="save" id="save_button_bottom" 
onClick="validate_submit();">
                                                <xsl:attribute name="value">
-                                                       <xsl:value-of 
select="php:function('lang', 'save')"/>
+                                                       <xsl:value-of 
select="$lang_save"/>
                                                </xsl:attribute>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="$lang_save"/>
+                                               </xsl:attribute>
                                        </input>
                                        <xsl:variable name="cancel_url">
                                                <xsl:value-of 
select="cancel_url"/>