Fixed issue #08735: "Exit and clear survey" button text is a link <a>…

… which adopts the <a> CSS-style (color) Dev: Fix the button only, other must be in dev for 2.06 or 2.1
LimeSurvey · Feb 20, 2014 · 8c9c638 · 8c9c638
1 parent cdc8cb9
commit 8c9c638
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -171,8 +171,8 @@ protected function createIncrementalQuestionIndex($LEMsessid, $surveyMode)
     */
     function run($surveyid,$args) {
         global $errormsg;
-
         extract($args);
+
         if (!$thissurvey) {
             $thissurvey = getSurveyInfo($surveyid);
         }
@@ -243,7 +243,6 @@ function run($surveyid,$args) {
         }
         else
         {
-
             //RUN THIS IF THIS IS THE FIRST TIME , OR THE FIRST PAGE ########################################
             if (!isset($_SESSION[$LEMsessid]['step'])) // || !$_SESSION[$LEMsessid]['step']) - don't do this for step0, else rebuild the session
             {
@@ -272,7 +271,7 @@ function run($surveyid,$args) {
             }
 
             $totalquestions = $_SESSION['survey_'.$surveyid]['totalquestions'];
-            
+
             if (!isset($_SESSION[$LEMsessid]['totalsteps']))
             {
                 $_SESSION[$LEMsessid]['totalsteps'] = 0;
@@ -296,13 +295,17 @@ function run($surveyid,$args) {
                 else
                 {
                     // trying to use browser back buttons, which may be disallowed if no 'previous' button is present
-					$LEMskipReprocessing=true;
+                    $LEMskipReprocessing=true;
                     $move = "movenext"; // so will re-display the survey
                     $invalidLastPage=true;
                     $backpopup=$clang->gT("Please use the LimeSurvey navigation buttons or index.  It appears you attempted to use the browser back button to re-submit a page.");
                 }
             }
-
+            if(isset($move) && $move=="clearcancel")
+            {
+                $moveResult = LimeExpressionManager::JumpTo($_SESSION[$LEMsessid]['step'], false, true, false, true);
+                //$backpopup=$clang->gT("Clear all need confirmation.");
+            }
             if (!(isset($_POST['saveall']) || isset($_POST['saveprompt']) || isset($_GET['sid']) || $LEMskipReprocessing || (isset($move) && (preg_match('/^changelang_/',$move)))))
             {
                 $_SESSION[$LEMsessid]['prevstep'] = $_SESSION[$LEMsessid]['step'];

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -2336,6 +2336,9 @@ function getMove()
         if(Yii::app()->request->getParam($sAccepteMove))
             $move=$sAccepteMove;
     }
+    if($move=='clearall' && App()->request->getPost('confirm-clearall')!='confirm'){
+            $move="clearcancel";
+    }
     if($move=='default')
     {
         $surveyid=Yii::app()->getConfig('surveyID');

diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -368,13 +368,9 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     }
     if (isset($surveyid) && !$iscompleted)
     {
-        $aURLParams=array('move'=>'clearall','lang'=>$s_lang);
-        if (returnGlobal('token'))
-        {
-            $aURLParams['token'] = trim(sanitize_token(strip_tags(returnGlobal('token'))));
-        }
-        // Use a real link for accessibility : this need to be accessible without javascript
-        $_clearall="<a href='".Yii::app()->getController()->createUrl("survey/index/sid/$surveyid",$aURLParams,'&amp;')."' class='clearall button confirm-needed' title='".$clang->gT("Are you sure you want to clear all your responses?", 'js')."'>".$clang->gT("Exit and clear survey")."</a>";
+        $_clearall=CHtml::htmlButton($clang->gT("Exit and clear survey"),array('type'=>'submit','id'=>"clearall",'value'=>'clearall','name'=>'clearall','class'=>'clearall button','data-confirmedby'=>'confirm-clearall'));
+        $_clearall.=CHtml::checkBox("confirm-clearall",false,array('id'=>'confirm-clearall','value'=>'confirm','class'=>'hide jshide'));
+        $_clearall.=CHtml::label($clang->gT("Are you sure you want to clear all your responses?"),'confirm-clearall',array('class'=>'hide jshide'));
     }
     else
     {

diff --git a/scripts/survey_runtime.js b/scripts/survey_runtime.js
@@ -106,9 +106,10 @@ function limesurveySubmitHandler(){
 
 // Ask confirmation on click on .needconfirm
 function needConfirmHandler(){
-    $(document).on('click',".confirm-needed", function(event){
-        text=$(this).attr('title');
+    $(document).on('click',"[data-confirmedby]", function(event){
+        text=$("label[for='"+$(this).data('confirmedby')+"']").html();
         if (confirm(text)) {
+            $("#"+$(this).data('confirmedby')).prop('checked',true);
             return true;
         }
         $(".button.ui-button" ).button( "option", "disabled", false );