dev Some usability changes...

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8428 b72ed6b6-b9f8-46b5-92b4-906544132732

admin/html.php

@@ -2825,7 +2825,7 @@
 		$newsurvey .= "<div class='tab-page'> <h2 class='tab'>".$clang->gT("General")."</h2>\n";
 
 		// * Survey Language
-		$newsurvey .= "<ul><li><label for='language'><span class='annotationasterisk'>*</span>".$clang->gT("Base Language:")."</label>\n"
+		$newsurvey .= "<ul><li><label for='language' title='".$clang->gT("This is the base language of your survey and it can't be changed later. You can add more languages after you have created the survey.")."'><span class='annotationasterisk'>*</span>".$clang->gT("Base Language:")."</label>\n"
 		. "<select id='language' name='language'>\n";
 
 
@@ -2844,8 +2844,7 @@
 		if(empty($owner['full_name'])) $owner['full_name']=$siteadminname;
 		if(empty($owner['email'])) $owner['email'] = $siteadminemail;
 
-		$newsurvey .= "</select><span class='annotation'> ".$clang->gT("*This setting cannot be changed later!")."</span>\n"
-		. "</li>\n";
+		$newsurvey .= "</select><span class='annotation'> ".$clang->gT("*This setting cannot be changed later!")."</span></li>\n";
 
 		$newsurvey .= ""
 		. "<li><label for='surveyls_title'><span class='annotationasterisk'>*</span>".$clang->gT("Title").":</label>\n"

admin/questionhandling.php

@@ -184,6 +184,10 @@
 			    if ($esrow['language'] == $baselang) $basesettings = array('lid' => $esrow['lid'], 'lid1' => $esrow['lid1'],'question_order' => $esrow['question_order'],'other' => $esrow['other'],'mandatory' => $esrow['mandatory'],'type' => $esrow['type'],'title' => $esrow['title'],'preg' => $esrow['preg'],'question' => $esrow['question'],'help' => $esrow['help']);
 
 		    }
+            if ($egresult==false or $egresult->RecordCount()==0)
+            {
+                safe_die('Invalid question id');
+            }
 
 
 		    while (list($key,$value) = each($questlangs))

admin/scripts/fckeditor.265/editor/skins/limesurvey/fck_editor.css

@@ -34,7 +34,7 @@ body
 
 #xEditingArea
 {
-	border: #696969 1px solid;
+	border: #8195BA 1px solid;
 }
 
 .SourceField

admin/usercontrol.php

@@ -94,12 +94,12 @@
 	}
 	elseif($action == "login" && $useWebserverAuth === false)	// normal login
 	{
-		$loginsummary = "<br /><strong>".$clang->gT("Logging in...")."</strong><br />\n";
+		$loginsummary = '';
 
 		if (isset($postuser) && isset($_POST['password']))
 		{
 			include("database.php");
-			$query = "SELECT uid, users_name, password, parent_id, email, lang, htmleditormode,dateformat FROM ".db_table_name('users')." WHERE users_name=".$connect->qstr($postuser);
+			$query = "SELECT * FROM ".db_table_name('users')." WHERE users_name=".$connect->qstr($postuser);
 			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; //Checked
 			$result = $connect->SelectLimit($query, 1) or safe_die ($query."<br />".$connect->ErrorMsg());
 			if ($result->RecordCount() < 1)
@@ -127,6 +127,7 @@
 				    session_regenerate_id();
                     $_SESSION['loginID'] = intval($fields['uid']);
 					$_SESSION['user'] = $fields['users_name'];
+                    $_SESSION['full_name'] = $fields['full_name'];
 					$_SESSION['htmleditormode'] = $fields['htmleditormode'];
                     $_SESSION['dateformat'] = $fields['dateformat'];
 					// Compute a checksession random number to test POSTs
@@ -147,7 +148,7 @@
 					}
 					$login = true;
 
-					$loginsummary .= "<br />" .str_replace("{NAME}", $_SESSION['user'], $clang->gT("Welcome {NAME}")) . "<br />";
+                    $loginsummary .= "<br /><span style='font-weight:bold;'>" .sprintf($clang->gT("Welcome %s!"),$_SESSION['user']) . "</span><br />";
 					$loginsummary .= $clang->gT("You logged in successfully.");
 
 					if (isset($_POST['refererargs']) && $_POST['refererargs'] &&
@@ -182,7 +183,7 @@
 		// a link with all params before first auto-login
 		unset($surveyid);
 
-		$loginsummary = "<br /><strong>".$clang->gT("Logging in...")."</strong><br />\n";
+		$loginsummary = '';
 		// getting user name, optionnally mapped
 		if (isset($userArrayMap) && is_array($userArrayMap) &&
 			isset($userArrayMap[$_SERVER['PHP_AUTH_USER']]))
@@ -288,8 +289,8 @@
 			$clang = new limesurvey_lang($_SESSION['adminlang']);
 			$login = true;
 
-			$loginsummary .= "<br />" .str_replace("{NAME}", $_SESSION['user'], $clang->gT("Welcome {NAME}")) . "<br />";
-			$loginsummary .= $clang->gT("You logged in successfully.");
+            $loginsummary .= "<br /><span style='font-weight:bold;'>" .sprintf($clang->gT("Welcome %s!"),$_SESSION['user']) . "</span><br />";
+ 			$loginsummary .= $clang->gT("You logged in successfully.");
 
 			if (isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] &&
 				strpos($_SERVER['QUERY_STRING'], "action=logout") === FALSE)

common.php

@@ -430,14 +430,14 @@ function showadminmenu()
                         . "</div>\n"
                         . "</div>\n";
           //  $adminmenu .= "<p style='margin:0;font-size:1px;line-height:1px;height:1px;'>&nbsp;</p>"; //CSS Firefox 2 transition fix
-            if (!isset($action) && !isset($surveyid) && count(getsurveylist(true))==0) {
+            if (!isset($action) && !isset($surveyid)) {
                 $adminmenu.= '<div style="width:500px;margin:0 auto;">'
                              .'<h2>'.sprintf($clang->gT("Welcome to %s!"),'LimeSurvey').'</h2>'
-                             .'<p>'.$clang->gT("Some piece-of-cake steps to create your very own first survey:").'<br/>'
+                             .'<p>'.$clang->gT("There are four easy steps to create your own survey:").'<br/>'
                              .'<ol>'
                              .'<li>'.sprintf($clang->gT('Create a new survey clicking on the %s icon in the upper right.'),"<img src='$imagefiles/add_small.png' name='ShowHelp' title='' alt='". $clang->gT("Add survey")."'/>").'</li>'
-                             .'<li>'.$clang->gT('Create a new group inside your survey.').'</li>'
-                             .'<li>'.$clang->gT('Create one or more question inside the new group.').'</li>'
+                             .'<li>'.$clang->gT('Create a new question group inside your survey.').'</li>'
+                             .'<li>'.$clang->gT('Create one or more question inside the new question group.').'</li>'
                              .'<li>'.sprintf($clang->gT('Done. Test your survey using the %s icon.'),"<img src='$imagefiles/do_small.png' name='ShowHelp' title='' alt='". $clang->gT("Test survey")."'/>").'</li>'
                              .'</ol></p><br />&nbsp;</div>';
             }