diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
index 35fb8a4d87b..ecabcd58a6a 100644
--- a/application/controllers/admin/surveyadmin.php
+++ b/application/controllers/admin/surveyadmin.php
@@ -481,9 +481,9 @@ public function ajaxgetusers()
if (count($result) > 0)
{
foreach ($result as $rows)
- $aUsers[$rows['uid']] = $rows['user'];
+ $aUsers[$rows['user']]=$rows['uid'];
}
- asort($aUsers);
+ ksort($aUsers);
$ajaxoutput = ls_json_encode($aUsers) . "\n";
echo $ajaxoutput;
}
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index 091c6c7c03d..3012a3408d5 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -397,21 +397,9 @@ function validation_message($ia,$show)
if (!$show) {
$class .= ' hide-tip';
}
- $tip = '' . $qinfo['validTip'] . "";
+ $tip = CHtml::tag('div',array('class'=>$class,'id'=>"vmsg_{$ia[0]}"),$qinfo['validTip']); // div inside div (w3c)
$isValid = $qinfo['valid'];
return array($tip,$isValid);
- // if (!$qinfo['valid']) {
- // if (strlen($tip) == 0) {
- // $help = gT('This question must be answered correctly');
- // }
- // else {
- // $tip =' '.$tip.'';
- // }
- // return '
'.$tip.'
';
- // }
- // else {
- // return $tip;
- // }
}
// TMSW Validation -> EM
diff --git a/scripts/admin/listsurvey.js b/scripts/admin/listsurvey.js
index 0b609e70e4d..e5a89c4e122 100644
--- a/scripts/admin/listsurvey.js
+++ b/scripts/admin/listsurvey.js
@@ -17,9 +17,9 @@ $(document).ready(function(){
+ '');
$.each(oData, function(key,value){
$('#ownername_select_'+survey_id).
- append($("").
- attr("value",key).
- text(value));
+ append($("").
+ attr("value",value).
+ text(key));
});
$("#ownername_select_"+survey_id+ " option[id=opt_"+old_owner+"]").attr("selected","selected");
}
diff --git a/styles/expressions.css b/styles/expressions.css
index 6a38420c49c..eadc46eb0be 100644
--- a/styles/expressions.css
+++ b/styles/expressions.css
@@ -1,6 +1,7 @@
.em-expression{background:#eee8aa /* palegoldenrod */ ;display:inline-block;font-weight: bold;border:1px dotted #ccc}
.em-haveerror{border-color: #ff4500}
.em-var-string{color: #808080 /* gray */}
+.em-var-string{font-weight: normal;}
.em-function{color: #0000ff /* blue */; }
.em-var-static,a.em-var-static{color:#a0522d /* sienna */}/* Static */
.em-var-before,a.em-var-before{color:#9370db /* mediumpurple*/ }/* Var used before set */