Index: common_functions.php =================================================================== --- common_functions.php (revision 9992) +++ common_functions.php (working copy) @@ -3024,13 +3024,13 @@ } if (strpos($line, "{CLEARALL}") !== false) { - $clearall = "gT("Are you sure you want to clear all your responses?",'js')."')) {window.open('{$publicurl}/index.php?sid=$surveyid&move=clearall&lang=".$_SESSION['s_lang']; if (returnglobal('token')) { $clearall .= "&token=".urlencode(trim(sanitize_xss_string(strip_tags(returnglobal('token'))))); } - $clearall .= "', '_self')}\" />"; + $clearall .= "', '_self')}\" >".$clang->gT("Exit and Clear Survey").""; $line=str_replace("{CLEARALL}", $clearall, $line); @@ -3055,19 +3055,19 @@ { if($thissurvey['tokenanswerspersistence'] != 'Y') { - $saveall = "\t\t\t" - ."\n\t\t\t"; // Show Save So Far button + $saveall = "\t\t\t" + ."\n\t\t\t"; // Show Save So Far button } else { - $saveall= "\t\t\t"; // Show Save So Far button + $saveall= "\t\t\t"; // Show Save So Far button }; } elseif (!isset($_SESSION['step']) || !$_SESSION['step']) //First page, show LOAD { if($thissurvey['tokenanswerspersistence'] != 'Y') { - $saveall = "\t\t\t"; + $saveall = "\t\t\t"; } else { @@ -3080,7 +3080,7 @@ } else { - $saveall= ""; // Show Save So Far button + $saveall= ""; // Show Save So Far button } } else @@ -3219,7 +3219,7 @@ $saveform .="".$clang->gT("Security Question").":
\n"; } $saveform .= "\n" - . "\n" + . "\n" . ""; $line=str_replace("{SAVEFORM}", $saveform, $line); } @@ -3241,7 +3241,7 @@ $loadform .="\n" - . "\n"; + . "\n"; $line=str_replace("{LOADFORM}", $loadform, $line); } //REGISTER SURVEY DETAILS @@ -3312,7 +3312,7 @@ } $registerform .= " />\n"; } */ - $registerform .= "" + $registerform .= "" ."\n" ."\n" ."\n"; Index: index.php =================================================================== --- index.php (revision 9992) +++ index.php (working copy) @@ -16,7 +16,6 @@ require_once(dirname(__FILE__).'/classes/core/startup.php'); - require_once(dirname(__FILE__).'/config-defaults.php'); require_once(dirname(__FILE__).'/common.php'); require_once(dirname(__FILE__).'/classes/core/language.php'); @@ -1002,7 +1001,7 @@ $js_header_includes[] = '/scripts/jquery/jquery-ui.js'; $css_header_includes[]= '/scripts/jquery/css/start/jquery-ui.css'; $css_header_includes[]= '/scripts/jquery/css/start/lime-progress.css'; - + $size = intval(($currentstep-1)/$total*100); $graph = '