Merge branch 'develop' of github.com:LimeSurvey/LimeSurvey into develop

LimeSurvey · Jul 3, 2015 · b234943 · b234943
2 parents fa65637 + 5320a8c
commit b234943
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git 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
@@ -397,21 +397,9 @@ function validation_message($ia,$show)
     if (!$show) {
         $class .= ' hide-tip';
     }
-    $tip = '<span class="' . $class . '" id="vmsg_' . $ia[0] . '">' . $qinfo['validTip'] . "</span>";
+    $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 =' <span class="questionhelp">'.$tip.'</span>';
-    //        }
-    //        return '<br /><span class="errormandatory">'.$tip.'</span><br />';
-    //    }
-    //    else {
-    //        return $tip;
-    //    }
 }
 
 // TMSW Validation -> EM

diff --git a/scripts/admin/listsurvey.js b/scripts/admin/listsurvey.js
@@ -17,9 +17,9 @@ $(document).ready(function(){
                 + '<input class="ownername_button" id="ownername_button_'+survey_id+'" type="button" initial_text="'+initial_text+'" value="'+delBtnCaption+'">');
                 $.each(oData, function(key,value){
                     $('#ownername_select_'+survey_id).
-                    append($("<option id='opt_"+key+"'></option>").
-                    attr("value",key).
-                    text(value));
+                    append($("<option id='opt_"+value+"'></option>").
+                    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
@@ -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 */