Dev: fixed issue #09203: Plugin settings int and float allow text for…

… survey settings

Dev: use click on button inside form to validate form

application/extensions/SettingsWidget/SettingsWidget.php

@@ -233,10 +233,10 @@ public function renderFloat($name, array $metaData, $form = null)
             {
                 $out .= CHtml::label($metaData['label'], $id, $metaData['labelOptions']);
             }
-            $out .= CHtml::textField($id, $value, array(
+            $out .= CHtml::numberField($id, $value, array(
                 'id' => $id,
                 'form' => $form,
-                'pattern' => '\d+(\.\d+)?'
+                'data-type'=>'float',
             ));
 
             return $out;
@@ -288,11 +288,12 @@ public function renderInt($name, array $metaData, $form = null)
             {
                 $out .= CHtml::label($metaData['label'], $id, $metaData['labelOptions']);
             }
-            $out .= CHtml::textField($id, $value, array(
+            $step=isset($metaData['step'])?$metaData['step']:1;
+            $out .= CHtml::numberField($id, $value, array(
                 'id' => $id,
                 'form' => $form,
                 'data-type' => 'int',
-                'pattern' => '\d+'
+                'step' => 1,
             ));
 
             return $out;

application/views/admin/survey/editSurvey_view.php

@@ -17,27 +17,26 @@
     $controller->renderPartial('/admin/survey/subview/tabPanelIntegration_view',$data);
 
 ?>
-<input type='hidden' id='surveysettingsaction' name='action' value='updatesurveysettings' />
 <input type='hidden' id='sid' name='sid' value="<?php echo $esrow['sid'];?>" />
 <input type='hidden' name='languageids' id='languageids' value="<?php echo $esrow['additional_languages'];?>" />
 <input type='hidden' name='language' value="<?php echo $esrow['language'];?>" />
+<?php if (Permission::model()->hasSurveyPermission($surveyid,'surveysettings','update')){?>
+    <div class="hidden hide" id="submitsurveybutton">
+    <p><button type="submit" name="action" value='updatesurveysettings'><?php $clang->eT("Save"); ?></button></p>
+    <?php if(Permission::model()->hasSurveyPermission($surveyid,'surveylocale','update')) { ?>
+        <p><button type="submit" name="action" value='updatesurveysettingsandeditlocalesettings'><?php $clang->eT("Save & edit survey text elements");?></button></p>
+    <?php } ?>
+    </div>
+<?php } ?>
+
 </form>
 <?php
     $controller->renderPartial('/admin/survey/subview/tabResourceManagement_view',$data);
 
 ?>
 </div>
 
-<?php
-    if (Permission::model()->hasSurveyPermission($surveyid,'surveysettings','update'))
-    {?>
-    <p><button onclick="if (UpdateLanguageIDs(mylangs,'<?php $clang->eT("All questions, answers, etc for removed languages will be lost. Are you sure?", "js");?>')) {$('#addnewsurvey').submit();}" class='standardbtn' ><?php $clang->eT("Save"); ?></button></p>
-    <?php if(Permission::model()->hasSurveyPermission($surveyid,'surveylocale','update')) { ?>
-        <p><button onclick="if (UpdateLanguageIDs(mylangs,'<?php $clang->eT("All questions, answers, etc for removed languages will be lost. Are you sure?", "js");?>')) { document.getElementById('surveysettingsaction').value = 'updatesurveysettingsandeditlocalesettings'; $('#addnewsurvey').submit();}" class='standardbtn' ><?php $clang->eT("Save & edit survey text elements");?> >></button></p>
-    <?php } ?>
-    <?php
-    }
-?>
+<div data-copy="submitsurveybutton"></div>
 <div id='dlgEditParameter'>
     <div id='dlgForm' class='form30'>
         <ul>

application/views/admin/survey/subview/tabGeneralEditSurvey_view.php

@@ -1,6 +1,12 @@
 <?php
     $yii = Yii::app();
     $controller = $yii->getController();
+    $sConfirmLanguage="$(document).on('submit','#addnewsurvey',function(){\n"
+                    . "  if(!UpdateLanguageIDs(mylangs,'".gT("All questions, answers, etc for removed languages will be lost. Are you sure?", "js")."')){\n"
+                    . "    return false;\n"
+                    . "  }\n"
+                    . "});\n";
+    Yii::app()->getClientScript()->registerScript('confirmLanguage',$sConfirmLanguage,CClientScript::POS_BEGIN);
 ?>
 <div id='general'>
     <ul>

scripts/admin/surveysettings.js

@@ -1,6 +1,12 @@
 // $Id: surveysettings.js 9757 2011-02-09 20:52:33Z c_schmitz $
-
+$(document).on('click',"[data-copy] :submit",function(){
+    $("form :input[value='"+$(this).val()+"']").click();
+});
 $(document).ready(function(){
+
+    $("[data-copy]").each(function(){
+        $(this).html($("#"+$(this).data('copy')).html());
+    });
     $("#template").change(templatechange);
     $("#template").keyup(templatechange);
     $("#copysurveyform").submit(copysurvey);