Dev: page-odd without javascript too, move page-odd to {SURVEYFORMAT}

Dev: fixed issue : allowjumps and not showprogress for withindex class git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11152 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 13, 2011 · 71bf7c7 · 71bf7c7
1 parent 442bbf4
commit 71bf7c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 27 deletions.
diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -131,7 +131,12 @@ function templatereplace($line, $replacements=array(),&$redata=array(), $debugSr
     {
         $surveyformat = "";
     }
-    if (isset($thissurvey['showprogress']) && $thissurvey['showprogress']=="Y" && $surveyformat!="allinone" && (isset($_SESSION['step']) && $_SESSION['step']>0)){
+    if ((isset($_SESSION['step']) && $_SESSION['step'] % 2) && $surveyformat!="allinone")
+    {
+        $surveyformat .= " page-odd";
+    }
+
+    if (isset($thissurvey['allowjumps']) && $thissurvey['allowjumps']=="Y" && $surveyformat!="allinone" && (isset($_SESSION['step']) && $_SESSION['step']>0)){
         $surveyformat .= " withindex";
     }
     if (isset($thissurvey['showprogress']) && $thissurvey['showprogress']=="Y"){

diff --git a/application/libraries/Group_format.php b/application/libraries/Group_format.php
@@ -529,19 +529,6 @@ function run($args) {
         $redata = compact(array_keys(get_defined_vars()));
 		echo templatereplace(file_get_contents("$thistpl/startpage.pstpl"),array(),$redata,'Group_format[530]');
 
-		//ALTER PAGE CLASS TO PROVIDE WHOLE-PAGE ALTERNATION
-		if ($_SESSION['step'] != $_SESSION['prevstep'] ||
-		    (isset($_SESSION['stepno']) && $_SESSION['stepno'] % 2))
-		{
-		    if (!isset($_SESSION['stepno'])) $_SESSION['stepno'] = 0;
-		    if ($_SESSION['step'] != $_SESSION['prevstep']) ++$_SESSION['stepno'];
-		    if ($_SESSION['stepno'] % 2)
-		    {
-		        echo "<script type=\"text/javascript\">\n"
-		        . "  $(\"body\").addClass(\"page-odd\");\n"
-		        . "</script>\n";
-		    }
-		}
 
 		$hiddenfieldnames=implode("|", $inputnames);
 

diff --git a/application/libraries/Question_format.php b/application/libraries/Question_format.php
@@ -476,19 +476,6 @@ function run($args) {
         $redata = compact(array_keys(get_defined_vars()));
 		echo templatereplace(file_get_contents("$thistpl/startpage.pstpl"),array(),$redata,'Question_format[477]');
 
-		//ALTER PAGE CLASS TO PROVIDE WHOLE-PAGE ALTERNATION
-		if ($_SESSION['step'] != $_SESSION['prevstep'] ||
-		    (isset($_SESSION['stepno']) && $_SESSION['stepno'] % 2))
-		{
-		    if (!isset($_SESSION['stepno'])) $_SESSION['stepno'] = 0;
-		    if ($_SESSION['step'] != $_SESSION['prevstep']) ++$_SESSION['stepno'];
-		    if ($_SESSION['stepno'] % 2)
-		    {
-		        echo "<script type=\"text/javascript\">\n"
-		        . "  $(\"body\").addClass(\"page-odd\");\n"
-		        . "</script>\n";
-		    }
-		}
 
 		echo "\n<form method='post' action='".site_url("survey")."' id='limesurvey' name='limesurvey' autocomplete='off'>\n";
         echo sDefaultSubmitHandler();