Updated limesurvey to revision 11019

include/limesurvey/admin/import_functions.php

@@ -1422,12 +1422,12 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
             {
                 if (isset($aQIDReplacements[$insertdata['cqid']]))
                 {
+                    $oldcqid = $insertdata['cqid']; //Save for cfield transformation
                     $insertdata['cqid']=$aQIDReplacements[$insertdata['cqid']]; // remap the qid
                 }
                 else continue; // a problem with this answer record -> don't consider
 
                 list($oldcsid, $oldcgid, $oldqidanscode) = explode("X",$insertdata["cfieldname"],3);
-
                 // replace the gid for the new one in the cfieldname(if there is no new gid in the $aGIDReplacements array it means that this condition is orphan -> error, skip this record)
                 if (!isset($aGIDReplacements[$oldcgid]))
                     continue;
@@ -1440,11 +1440,11 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
             {
                 if (preg_match("/^\+/",$oldcsid))
                 {
-                    $newcfieldname = '+'.$newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldqid));
+                    $newcfieldname = '+'.$newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldcqid));
                 }
                 else
                 {
-                    $newcfieldname = $newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldqid));
+                    $newcfieldname = $newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldcqid));
                 }
             }
             else

include/limesurvey/admin/printablesurvey.php

@@ -136,7 +136,7 @@ if(isset($showsgqacode) && $showsgqacode == true)
 }
 else
 {
-	$surveyname = "";
+	$surveyname = $surveyname;
 }
 
 $survey_output = array(
@@ -442,7 +442,7 @@ while ($degrow = $degresult->FetchRow())
                             FROM ".db_table_name("conditions")."
                             WHERE  ".db_table_name("conditions").".qid={$deqrow['qid']}
                                 AND ".db_table_name("conditions").".scenario={$scenariorow['scenario']}
-                            group by cqid, method, cfieldname, value
+                            group by cqid, method
                             ORDER BY cqid";
                 $distinctresult=db_execute_assoc($distinctquery);
                 //Loop through each condition for a particular scenario.
@@ -493,7 +493,7 @@ while ($degrow = $degresult->FetchRow())
                         {
                             $explanation .= $clang->gT("Answer was")." ";
                         }
-                    	$explanation .= " ".$distinctrow['value'];
+                    	$explanation .= " `".$distinctrow['value']."`";
                     }
                     if(!$distinctrow['cqid']) { // cqid == 0  ==> token attribute match
                         $tokenData = GetTokenFieldsAndNames($surveyid);
@@ -531,7 +531,7 @@ while ($degrow = $degresult->FetchRow())
                         {
                             $explanation .= $clang->gT("is")." ";
                         }
-                        $answer_section = $distinctrow['value'];
+                        $explanation .= " `".$distinctrow['value']."`";
                     }
 
                     $conquery="SELECT cid, cqid, q.title,\n"

include/limesurvey/admin/scripts/admin_core.js

@@ -47,9 +47,7 @@ $(document).ready(function(){
                                 target: 'bottomRight'}
                         },
                show: {effect: { length:50}},
- 			   hide: { when: 'mouseout' },
+ 			   hide: { when: 'mouseout' }
- 			   api: { onRender: function() {$(this.options.hide.when.target).bind('click', this.hide);}}
-
                });
         }
     });    

include/limesurvey/admin/statistics_function.php

@@ -79,7 +79,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
     //$allfields ="";
     global $connect, $dbprefix, $clang,
     $rooturl, $rootdir, $homedir, $homeurl, $tempdir, $tempurl, $scriptname, $imagedir,
-    $chartfontfile, $chartfontsize, $admintheme, $pdfdefaultfont, $pdffontsize;
+    $chartfontfile, $chartfontsize, $admintheme, $pdfdefaultfont, $pdffontsize, $showaggregateddata;
 
     $fieldmap=createFieldMap($surveyid, "full");
 

include/limesurvey/docs/release_notes.txt

@@ -78,6 +78,38 @@ HOW TO UPGRADE from a LimeSurvey 1.70(+) version to the latest 1.9x
 Thank you to everyone who helped with this new release!
 
 
+Changes from 1.91+ (build 10951) to 1.91+ (build 11018)
+#Updated translation : French (b00z00)
+#Updated translation: German (c_schmitz)
+#Updated translation: German Informal (c_schmitz)
+#Updated translation: German informal (c_schmitz)
+-Fixed issue: Survey Name not displaying when $showsgqacode is false. (jcleeland)
+-Fixed issue: groups of "or"ed conditions were displaying multiple times. Removed additional "group by" entries in initial SQL that was causing the repeated processing of groups. (jcleeland)
+-Fixed issue #5426: default <option> tag redundant in language chooser (c_schmitz)
+-Fixed issue #5461: Arithmetic mean and deviation are not displayed even if showaggregateddata is set to 1- thanks to jpasquier (c_schmitz)
+-Fixed issue #5462: Survey crashes if the referrer URL contains a single quote (c_schmitz)
+-Fixed issue 05386: System still delete the user account even I cancel the deletion in confirmation box. (tpartner)
+-Fixed issue #5459: Conditions are not imported correctly for multiple choice questions (mennodekker)
+
+Changes from 1.91+ (build 10859) to 1.91+ (build 10951)
+#Updated translation: Croatian (idobraca)
+#Updated translation: Dutch by Han Velthuis (c_schmitz)
+#Updated translation: Dutch informal by Han Velthuis (c_schmitz)
+#Updated translation: French (c_schmitz)
+-Fixed issue #5401: large and huge free text max characters not respected on mouse-based paste events (tpartner)
+-Fixed issue #5400: QueXML export on Windows Server (IIS) (azammitdcarf)
+-Fixed issue #5413: Non admin-user cannot export to SPSS or R (c_schmitz)
+-Fixed issue #5430: Docblock added. (mot3)
+-Fixed issue #5430: JSON.php / Services_JSON has license inside docblock already. (mot3)
+-Fixed issue #5432: Exporting responses to PDF fails when using IE (c_schmitz)
+-Fixed issue #5432: Option to export responses to PDF by participant fails when using IE (c_schmitz)
+-Fixed issue #5434: If Captcha is used and token persistence is enabled the returning participant starts at the beginning of the survey instead of the last page submitted (c_schmitz)
+-Fixed issue #5439: {TOKEN:ATTRIBUTE_1} is not replaced everywhere (c_schmitz)
+-Fixed issue #5443: Survey is starting on the last question group when usen token answer persistences and usesleft (c_schmitz)
+-Fixed issue #5444: Browse uploaded resources unavailable (c_schmitz)
+-Fixed issue #5445: File .htaccess include in the resources export file (c_schmitz)
+-Fixed issue: Some SMTP gates not correctly confirming email acceptance causing the SMTP send seemingly to fail while the mail was correctly sent (c_schmitz)
+
 Changes from 1.91+ (build 10746) to 1.91+ (build 10859)
 -Fixed #5414: export to application (R) filenames are not consistent (mennodekker)
 -Fixed issue: Token registration system was not checking survey settings for token length, defaulting to 15. Fixed. (jcleeland)

include/limesurvey/index.php

@@ -1102,7 +1102,6 @@ function makelanguagechanger()
         $lang = GetBaseLanguageFromSurveyID($surveyid);
 
         $htmlcode ="<select name=\"select\" class='languagechanger' onchange=\"javascript:window.location=this.value\">\n";
-        $htmlcode .= "<option value=\"$relativeurl/index.php?sid=". $surveyid ."&amp;lang=". $lang ."$tokenparam\">".getLanguageNameFromCode($lang,false)."</option>\n";
         $sAddToURL = "";
         $sTargetURL = "$relativeurl/index.php";
         if ($previewgrp){

include/limesurvey/save.php

@@ -642,7 +642,7 @@ function createinsertquery()
             $query .= ", '".$_SESSION['s_lang']."'";
             if ($thissurvey['refurl'] == "Y")
             {
-                $query .= ", '".$_SESSION['refurl']."'";
+                $query .= ", '".db_quote($_SESSION['refurl'])."'";
             }
             if ($bFinalizeThisAnswer === true && ($thissurvey['format'] != "A"))
             {

include/limesurvey/templates/citronade/base.css

@@ -1,190 +0,0 @@
-/* This part don't have to be modified */
-/* Base style only */
-/* --- STYLES DE BASE --- */ 
-/* source: http://www.alsacreations.com/astuce/lire/654-feuille-de-styles-de-base.html */
-html { font-size: 100%; } 
-body { 
-	margin: 0; 
-  padding: 0;
-  font-family: Arial, Helvetica, FreeSans, sans-serif; 
-  font-size: .85em;
-  line-height: 1.4; 
-  color: black; 
-  background: white; 
-} 
- 
-html,body{ height: 100%;}
-
-h1, h2, h3, h4, h5, h6 { 
-  margin: 1em 0 .5em 0; 
-  line-height: 1.2; 
-  font-weight: bold; 
-  font-style: normal; 
-} 
-h1 {font-size: 1.5em;} 
-h2 {font-size: 1.3em;} 
-h3 {font-size: 1.2em;} 
-h4 {font-size: 1.1em;}
-h5 {font-size: 1em;}
-h6 {font-size: 1em;}
- 
-ul, ol { margin: .75em 0 .75em 32px; padding: 0; } 
-p { margin: .75em 0; } 
-address { margin: .75em 0; font-style: italic; } 
- 
-a {text-decoration: underline;} 
-a:link {color: #11C;} 
-a:visited {color: #339;} 
-a:hover, a:focus, a:active {color: #00F;} 
-a:active {outline: none;} 
-a img {border: none;} 
- 
-em {font-style: italic;} 
-strong {font-weight: bold;} 
- 
-form, fieldset {margin: 0;padding: 0;border: none;} 
-input, button, select {vertical-align: middle;}
-
-/* --- STYLES DE BASE SUPPLÉMENTAIRES --- */ 
- 
-abbr[title] { border-bottom: 1px dotted; cursor: help; } 
-blockquote { margin: .75em 0 .75em 20px;padding: 0 0 0 10px;border-left: solid 2px #ddd;} 
-q, cite {font-style: italic;} 
-q cite, q q {font-style: normal;} 
-blockquote p, li p {margin: .5em 0;} 
-dl {margin: .75em 0;} 
-dt {margin: .75em 0 0 0;font-weight: bold;} 
-dd {margin: .25em 0 .25em 32px;} 
- 
-table {
-	margin: 0; 
-  border: 1px solid gray; /* Pas de bordure = "none". */ 
-  border-collapse: separate; /* Valeur par défaut: "separate". */ 
-  border-spacing: 0; 
-} 
-table td, table th { 
-  padding: 4px; /* Pas de retrait autour du texte = "0". */ 
-  border: 1px solid #ccc; /* Pas de bordure = "none". */ 
-  vertical-align: top; /* Valeur par défaut: "middle" */ 
-} 
-table {
-  border: 1px solid gray; /* Pas de bordure = "none". */ 
-} 
- 
-/* Semantic HTML 5 */ 
-article, aside, dialog, figure, footer, header, 
-hgroup, menu, nav, section {display: block;}
-
-/* --- LIMESURVEY BASE --- */ 
-ul#surveylist{list-style: none ;}
-.hide{
-    position: absolute;
-    top: -9999px;
-    left: -9999px;
-}
-.error{color: #f70;}
-.good{color: #090;}
-.problem{color: #f70;}
-
-/*****
-Default styles for the jQuery UI progress bar
-*****/
-#progress-wrapper {
-  width: 252px;
-  height: 2em;
-  margin: 10px auto 0 auto;
-  font-size: 12px;
-}
-
-#progress-wrapper #progress-pre {
-  float: left;
-  margin: 0 5px 0 0;
-  width: 45px;
-  text-align: right;
-}
-
-#progress-wrapper .ui-widget-content {
-  float: left;
-  width: 150px;
-  height: 1em;
-  text-align: left;
-  border-width: 1px
-  border-style: solid
-  border-color: #666666;
-}
-
-#progress-wrapper .ui-widget-header {
-  background-color: #AAAAAA;
-  background-image: none;
-  border: 1px solid #666666;
-}
-
-#progress-wrapper #progress-post {
-  float: left;
-  margin: 0 0 0 5px;
-  width: 45px;
-  text-align: left;
-}
-
-/*****
-Default styles for the jQuery UI slider
-*****/
-.ui-slider{width:15em;	margin: 0.4em 0 0.2em;display:inline;display:inline-block;border:1px solid #666666;
-	-webkit-border-radius: 5px;-moz-border-radius: 5px;border-radius: 5px;}
-.slider_showmin {
-  float: left;
-  width: 3em;
-  margin: 1.4em 0 0 0;
-  font-size: 0.7em;
-  font-weight: normal;
-  text-align: left;
-  color:#666666;
-}
-
-.slider_showmax {
-  float: right;
-  width: 3em;
-  margin: 1.4em 0 0 0;
-  font-size: 0.7em;
-  font-weight: normal;
-  text-align: right;
-  color:#666666;
-}
-
-.slider_lefttext {
-  display: inline;
-  display: inline-block;
-  position:relative;
-  top:-0.5em;
-  padding-right: 1em;
-  text-align: right;
-  font-size: 0.9em;
-  color:#666666;
-}
-
-.slider_righttext {
-  display: inline;
-  display: inline-block;
-  position:relative;
-  top:-0.5em;
-  padding-left: 1em;
-  font-size: 0.9em;
-  color:#666666;
-}
-
-.slider_callout { 
-    overflow: hidden; 
-    position: absolute; 
-    top: -1.3em;
-    margin-left:0.8em;
-    text-align:right;
-    color: #333;
-    font-size:0.9em;
-}
-
-#percentcomplete{height:20px;margin:5px 0;display:block;}
-#progress-wrapper {
-	height: 20px;
-	margin: 0 auto;
-}
-

include/limesurvey/templates/citronade/ie_fix.css

@@ -1,23 +0,0 @@
-/* The following styles are for versions of IE */
-.tools input,
-	.tools a,
-	.navigator input,
-	input#savebutton,
-	input#loadbutton
-		{height:2em}
-
- .multiple-opt-comments  .answers 
-,.multiple-short-txt  .answers 
-,.numeric-multi  .answers 
-,.multiple-opt .answers 
-{
-	overflow:hidden;
-}
-.multiple-opt .answers ul li input.checkbox
-, .list-radio .answers ul li input.radio
-, .list-with-comment .answers ul li input.radio 
-, .list-radio-flexible .answers ul li input.radio 
-{
-	margin-left:0;
-}
-.ui-slider{display:inline;}

include/limesurvey/templates/citronade/ie_fix_6.css

@@ -1,156 +0,0 @@
-/* The following styles are for versions of IE 6 and older */
-
-.choice-5-pt-radio ul {
-	margin-left: 2.5em;
-}
- .yes-no ul
-,.gender ul {
-	margin-left: 1em;
-}
-
-.multiple-short-txt ul.numbers-only li span {
-	width: 10em;
-}
-
-
- .multiple-short-txt ul
-,.multiple-opt-comments ul
-,.numeric-multi ul
-,.multiple-short-txt ul li
-,.multiple-opt-comments ul li
-,.numeric-multi ul li {
-	margin-left: 0%;
-	padding-left: 0%;
-}
-
-
-.multiple-short-txt ul label {
-    margin-left: 0em;
-    float:left;
-    display: block;
-    width: 40%;      
-    text-align:right;
-}
-
-
-.multiple-opt-comments ul li label{
-    float: left;
-    width: 35%; 
-    display:block; 
-    margin:0;
-    padding:0;    
-    padding-left:25px;
-}
-
-
-.multiple-opt-comments ul li span.comment{
-    float:left;
-    width:40%;
-    display:block;
-    margin:0;
-    padding:0; 
-}
-
-.multiple-opt-comments ul li span.comment input{
-    width:200px;
-}
-
-.multiple-short-txt ul li,
-.multiple-opt-comments ul li {  
-    float: left;  
-    clear: left;  
-    width: 100%;  
-}
-
-.innergraph img {
-    height:16px;
-    vertical-align:top;
-    margin:0px 0px 0px 0px;
-}
-
-.rank select {
-    margin-top:4px !important;
-}
-
-.multiple-short-txt td.answer,
-.date td.answer,
-.yes-no td.answer,
-.list-radio td.answer,
-.list-radio-flexible td.answer,
-.choice-5-pt-radio td.answer,
-.gender td.answer {
-    padding-bottom:10px;
-}
-
-.date button {
-    line-height:15px;
-    height:21px;
-    width:22px;
-}
-
-td.questionhelp {
-    text-align:left;
-}
-
-.numeric-multi ul li label {
-    float: left;
-	width: auto;  
-}
-
-.numeric-multi ul {
-	float: left; 
-	margin: 0 0 1.5em 0 !important;
-	padding: 0 ;
-}
-
-.numeric-multi ul li {  
-    width: 98%;
-}
-
-.numeric-multi ul li span {
-    padding-left:0;
-}
-
-.numeric-multi input {
-    padding-left:1px;
-}
-
-input.submit
-{
-    padding:0px;
-}
-
-/** UI Slider **/
-
-.numeric-multi label.slider-label {
-	margin-top: 1.3em;
-	display: inline;
-	width: 40%;
-}
-
-.slider_lefttext {
-	float: left;
-	padding-top: 1.4em;
-}
-
-.slider_righttext {
-	float: left;
-	padding-top: 1.4em;
-}
-
-.ui-slider-1 {
-	position: relative;
-}
-
-.slider_showmin {
-	margin: 0;
-	position: absolute;
-	top: 15px;
-}
-
-.slider_showmax {
-	margin: 0;
-	position: absolute;
-	top: 15px;
-	left: 150px;
-}

include/limesurvey/templates/citronade/ie_fix_7.css

@@ -1,136 +0,0 @@
-/* The following styles are for all versions of IE 7 */
-.choice-5-pt-radio ul {
-	margin-left: 2.5em;
-}
- .yes-no ul
-,.gender ul {
-	margin-left: 1em;
-}
-
-.multiple-short-txt ul.numbers-only li span {
-	width: 10em;
-}
-
-
- .multiple-short-txt ul
-,.multiple-opt-comments ul
-,.numeric-multi ul
-,.multiple-short-txt ul li
-,.multiple-opt-comments ul li
-,.numeric-multi ul li {
-	margin-left: 0%;
-	padding-left: 0%;
-}
-
-
-.multiple-short-txt ul label {
-    margin-left: 0em;
-    float:left;
-    display: block;
-    width: 40%;      
-    text-align:right;
-}
-
-
-.multiple-opt-comments ul li label{
-    float: left;
-    width: 35%; 
-    display:block; 
-    margin:0;
-    padding:0;    
-    padding-left:25px;
-}
-
-
-.multiple-opt-comments ul li span.comment{
-    float:left;
-    width:40%;
-    display:block;
-    margin:0;
-    padding:0; 
-}
-
-.multiple-opt-comments ul li span.comment input{
-    width:200px;
-}
-
-.multiple-short-txt ul li,
-.multiple-opt-comments ul li {  
-    float: left;  
-    clear: left;  
-    width: 100%;  
-}
-
-.innergraph img {
-    height:16px;
-    vertical-align:top;
-    margin:0px 0px 0px 0px;
-}
-
-.multiple-short-txt td.answer,
-.date td.answer,
-.yes-no td.answer,
-.list-radio td.answer,
-.list-radio-flexible td.answer,
-.choice-5-pt-radio td.answer,
-.gender td.answer {
-    padding-bottom:10px;
-}
-
-.choice-5-pt-radio label
-{
-    margin:0 ;
-    padding:0;
-}
-
-.date button {
-    line-height:15px;
-    height:21px;
-    width:22px;
-}
-
-td.questionhelp {
-    text-align:left;
-}
-
-.numeric-multi ul li label {
-    float: left;
-	width: auto; 
-}
-
-.numeric-multi ul li {  
-    float: left;  
-    clear: left;  
-    width: 100%;  
-}
-
-.numeric-multi ul li span {
-    padding-left:0;
-}
-
-.numeric-multi input {
-    padding-left:1px;
-}
-
-input.submit
-{
-    padding:0px;
-}
-
-/** UI Slider **/
-
-.numeric-multi label.slider-label {
-	margin-top: 1.3em;
-	display: inline;
-	width: 40%;
-}
-
-.slider_lefttext {
-	float: left;
-	padding-top: 1.4em;
-}
-
-.slider_righttext {
-	float: left;
-	padding-top: 1.4em;
-}

include/limesurvey/templates/citronade/ie_fix_8.css

@@ -1,13 +0,0 @@
-/* The following styles are for IE 8 only*/
-.rank label
-{
-  line-height: 27px;
-}
-
-td .rank {
-    padding-right:20px;    
-}
-
-td.questionhelp {
-    text-align:left;
-}

include/limesurvey/templates/citronade/startpage.pstpl

@@ -6,14 +6,17 @@
 	<style type="text/css" media="aural tty">
         progress-graph .zero, progress-graph .graph, progress-graph .cent { display: none; }
 	</style>
-	<link rel="stylesheet" type="text/css"  media="all" href="{TEMPLATEURL}base.css" />
 	<!-- The following line includes template.css and if an RTL-language is used template-rtl.css -->
     {TEMPLATECSS}
 	<link rel="stylesheet" type="text/css"  media="print" href="{TEMPLATEURL}print.css" />
 	<script type="text/javascript" src="{TEMPLATEURL}template.js"></script>
 	<link rel="shortcut icon" href="{TEMPLATEURL}favicon.ico" />		
 </head>
-<body>
+<!--[if lt IE 7 ]> <body class="lang-{SURVEYLANGAGE} {SURVEYFORMAT} ie ie6"> <![endif]-->
+<!--[if IE 7 ]> <body class="lang-{SURVEYLANGAGE} {SURVEYFORMAT} ie ie7"> <![endif]-->
+<!--[if IE 8 ]> <body class="lang-{SURVEYLANGAGE} {SURVEYFORMAT} ie ie8"> <![endif]-->
+<!--[if IE 9 ]> <body class="lang-{SURVEYLANGAGE} {SURVEYFORMAT} ie ie9"> <![endif]-->
+<!--[if gt IE 9]><!--><body class="lang-{SURVEYLANGAGE} {SURVEYFORMAT}"><!--<![endif]-->
 <div id="container">
 	<div id="head">
 		<div class="wrapper">

include/limesurvey/templates/citronade/template.css

@@ -12,19 +12,22 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
+/* This part don't have to be modified */
+/* Base style only */
+html{font-size:100%}body{font-family:Arial, Helvetica, FreeSans, sans-serif;font-size:.85em;line-height:1.4;color:#000;background:#FFF;margin:0;padding:0}html,body{height:100%}h1,h2,h3,h4,h5,h6{line-height:1.2;font-weight:700;font-style:normal;margin:1em 0 .5em}h1{font-size:1.5em}h2{font-size:1.3em}h3{font-size:1.2em}h4{font-size:1.1em}ul,ol{margin:.75em 0 .75em 32px;padding:0}address{font-style:italic;margin:.75em 0}a{text-decoration:underline}a:link{color:#11C}a:visited{color:#339}a:hover,a:focus,a:active{color:#00F}a:active{outline:none}a img{border:none}strong{font-weight:700}form,fieldset{border:none;margin:0;padding:0}input,button,select{vertical-align:middle}abbr[title]{border-bottom:1px dotted;cursor:help}blockquote{border-left:solid 2px #ddd;margin:.75em 0 .75em 20px;padding:0 0 0 10px}q cite,q q{font-style:normal}blockquote p,li p{margin:.5em 0}dt{font-weight:700;margin:.75em 0 0}dd{margin:.25em 0 .25em 32px}table{border-collapse:separate;border-spacing:0;border:1px solid gray;margin:0}table td,table th{border:1px solid #ccc;vertical-align:top;padding:4px}article,aside,dialog,figure,footer,header,hgroup,menu,nav,section{display:block}ul#surveylist{list-style:none}.hide{position:absolute;top:-9999px;left:-9999px}.good{color:#090}#progress-wrapper{width:252px;font-size:12px;height:20px;margin:0 auto}#progress-wrapper #progress-pre{float:left;width:45px;text-align:right;margin:0 5px 0 0}#progress-wrapper .ui-widget-content{float:left;width:150px;height:1em;text-align:left;border-color:#666;border-style:solid;border-width:1px}#progress-wrapper .ui-widget-header{background-color:#AAA;background-image:none;border:1px solid #666}#progress-wrapper #progress-post{float:left;width:45px;text-align:left;margin:0 0 0 5px}.ui-slider{width:15em;display:inline-block;border:1px solid #666;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;margin:.4em 0 .2em}.slider_showmin{float:left;width:3em;font-size:.7em;font-weight:400;text-align:left;color:#666;margin:1.4em 0 0}.slider_showmax{float:right;width:3em;font-size:.7em;font-weight:400;text-align:right;color:#666;margin:1.4em 0 0}.slider_lefttext{display:inline-block;position:relative;top:-.5em;padding-right:1em;text-align:right;font-size:.9em;color:#666}.slider_righttext{display:inline-block;position:relative;top:-.5em;padding-left:1em;font-size:.9em;color:#666}.slider_callout{overflow:hidden;position:absolute;top:-1.3em;margin-left:.8em;text-align:right;color:#333;font-size:.9em}#percentcomplete{height:20px;display:block;margin:5px 0}h5,h6{font-size:1em}p,dl{margin:.75em 0}em,q,cite{font-style:italic}.error,.problem{color:#f70}
+.ie .ui-slider{display:inline;}
 /* --------------------------------------------- */
 /* Basic adaptation of the template :            */
 /* color and image                               */
 /* --------------------------------------------- */
 
-body {background:#FEFEFE;color:#222;}
+body {background:#FEFEFE;color:#444;}
 a:link {color: #5670A1;} 
 a:visited {color: #5670A1;} 
 a:hover, a:focus, a:active {background-color: #E5F8A8;color: #5670A1;} 
 /* Global margin and with*/
 /* width of limesurvey contents parts */
-.wrapper,#content{padding:0;margin:0 auto;max-width:1024px;}
+.wrapper,#content{padding:0;margin:0 auto;max-width:1024px;width:auto !important; width:1024px}
 
 /* Head decoration */
 #head{
@@ -90,6 +93,14 @@ ul#surveylist li a.surveytitle{color:#5670A1;}
 	#languagechanger select[disabled]
 	{border:1px solid #dbdbdb;background:#FEFEFE;color:#dbdbdb;cursor:inherit;}
 
+.ie .tools input,
+	.ie .tools a,
+	.ie .navigator input,
+	.ie input#savebutton,
+	.ie input#loadbutton
+		{height:2em}
+
+/* gloabl information block */
 .note,#tokenmessage{border:#8195BA 1px solid;background:#EEF6FF;}
 
 /* Group decoration */
@@ -397,6 +408,12 @@ table.question tbody td.ddarrayseparator{border-top-width: 0px;}
     text-align: left;
     margin: 1em 0;
 }
+.ie .multiple-opt-comments  .answers,
+	.ie .multiple-short-txt  .answers,
+	.ie .numeric-multi  .answers,
+	.ie .multiple-opt .answers 
+	{overflow:hidden;}
+
 /* some inline list */
  .choice-5-pt-radio .answers ul li
 ,.yes-no .answers ul li
@@ -689,7 +706,11 @@ text-align:center;
 {
 	margin-left:45%;
 }
-
+.ie .multiple-opt .answers ul li input.checkbox,
+	.ie .list-radio .answers ul li input.radio,
+	.ie .list-with-comment .answers ul li input.radio,
+	.ie .list-radio-flexible .answers ul li input.radio 
+	{margin-left:0;}
 
  .text-short input
  ,.text-short textarea