dev Applied several fixes for new features

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@7687 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Sep 28, 2009 · a35e221 · a35e221
1 parent 43417b4
commit a35e221
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/admin/globalsettings.php b/admin/globalsettings.php
@@ -68,7 +68,7 @@ function globalsettingssave()
                        setGlobalSetting('timeadjust',$savetime);
                        setGlobalSetting('usepdfexport',strip_tags($_POST['usepdfexport']));
                        setGlobalSetting('usercontrolSameGroupPolicy',strip_tags($_POST['usercontrolSameGroupPolicy']));
-                       $editsurvey .= "<br/>Global settings were saved.<br/>&nbsp;"   ;
+                       $editsurvey .= "<br/>".$clang->gT("Global settings were saved.")."<br/>&nbsp;";
         }                                                                
     }
 }

diff --git a/admin/scripts/admin_core.js b/admin/scripts/admin_core.js
@@ -15,23 +15,32 @@ $(document).ready(function(){
                               duration: 'fast'
                             }, $.datepicker.regional[userlanguage]);
     }
+
+
     // Loads the tooltips for the toolbars
-    $('img[alt]').qtip({
-       style: { name: 'cream',
-                tip:true, 
-                color:'#111111', 
-                border: {
-                     width: 1,
-                     radius: 5,
-                     color: '#EADF95'}
-               },  
-       position: { adjust: { 
-                screen: true, scroll:true },
-                corner: {
-                        target: 'bottomRight'}
-                },
-       show: {effect: { length:50}}
-    });
+    $('img[alt]').each(function() {
+        if($(this).attr('alt') != '')
+        {
+             $(this).qtip({
+               style: { name: 'cream',
+                        tip:true, 
+                        color:'#111111', 
+                        border: {
+                             width: 1,
+                             radius: 5,
+                             color: '#EADF95'}
+                       },  
+               position: { adjust: { 
+                        screen: true, scroll:true },
+                        corner: {
+                                target: 'bottomRight'}
+                        },
+               show: {effect: { length:50}}
+
+           });
+        }
+    });    
+
 
     if ($('#showadvancedattributes').length>0) updatequestionattributes();
 

diff --git a/common.php b/common.php
@@ -324,7 +324,7 @@ function showadminmenu()
 		{
 			$adminmenu  .= " --  ".$clang->gT("Logged in as:"). " <strong>"
                         . "<a href=\"#\" onclick=\"window.open('$scriptname?action=personalsettings', '_top')\" title=\"".$clang->gTview("Edit your personal preferences")."\" >"
-                        . $_SESSION['user']." <img src='$imagefiles/profile_edit.png' name='ProfileEdit' title='".$clang->gT("Edit your personal preferences")."' /></a>"
+                        . $_SESSION['user']." <img src='$imagefiles/profile_edit.png' name='ProfileEdit' alt='".$clang->gT("Edit your personal preferences")."' /></a>"
                         . "</strong>\n";
 		}
         if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 && isset($updateavailable) && $updateavailable==1)   
@@ -3256,7 +3256,7 @@ function questionAttributes($returnByName=false)
     "caption"=>$clang->gT('Answer width'));
 
     $qattributes["array_filter"]=array(
-    "types"=>"ABCEFR:;",
+    "types"=>"1ABCEFR:;",
     'inputtype'=>'text',
 
     "help"=>$clang->gT("Enter the code of a Multiple options question to filter the answer options in this array."),

diff --git a/qanda.php b/qanda.php
@@ -1158,15 +1158,14 @@ function countdown(questionid,timer,action,warning,warninghide,disable){
 function do_boilerplate($ia)
 {
 	$qidattributes=getQuestionAttributes($ia[0]);
+    $answer='';
 
 	if (trim($qidattributes['time_limit'])!='')
 	{
 		$answer .= return_timer_script($qidattributes, $ia);
 	}
 
-	$answer .= '
-		<input type="hidden" name="$ia[1]" id="answer'.$ia[1].'" value="" />
-';
+	$answer .= '<input type="hidden" name="$ia[1]" id="answer'.$ia[1].'" value="" />';
 	$inputnames[]=$ia[1];
 
 	return array($answer, $inputnames);
@@ -3389,7 +3388,7 @@ function do_multipleshorttext($ia)
     $answer='';
 	$qidattributes=getQuestionAttributes($ia[0]);
 
-    if ($qidattributes['other_numbers_only']==1)
+    if ($qidattributes['numbers_only']==1)
     {
 		$numbersonly = 'onkeypress="return goodchars(event,\'0123456789.\')"';
 	}