Dev Some usability changes when creating a survey

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8422 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Feb 22, 2010 · e8ea8a4 · e8ea8a4
1 parent fae2128
commit e8ea8a4
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/admin/html.php b/admin/html.php
@@ -779,11 +779,11 @@
 			$surveysummary .= $clang->gT("Survey cannot be activated yet.")."<br />\n";
 			if ($sumcount2 == 0 && hasRight($surveyid,'define_questions'))
 			{
-				$surveysummary .= "<font class='statusentryhighlight'>[".$clang->gT("You need to add question groups")."]</font><br />";
+				$surveysummary .= "<span class='statusentryhighlight'>[".$clang->gT("You need to add question groups")."]</span><br />";
 			}
 			if ($sumcount3 == 0 && hasRight($surveyid,'define_questions'))
 			{
-				$surveysummary .= "<font class='statusentryhighlight'>[".$clang->gT("You need to add questions")."]</font><br />";
+				$surveysummary .= "<span class='statusentryhighlight'>[".$clang->gT("You need to add questions")."]</span><br />";
 			}
 		}
 		$surveysummary .=  $surveysummary2
@@ -2825,15 +2825,15 @@
 		$newsurvey .= "<div class='tab-page'> <h2 class='tab'>".$clang->gT("General")."</h2>\n";
 
 		// * Survey Language
-		$newsurvey .= "<ul><li><label for='language'>".$clang->gT("Base Language:")."</label>\n"
+		$newsurvey .= "<ul><li><label for='language'><span class='annotationasterisk'>*</span>".$clang->gT("Base Language:")."</label>\n"
 		. "<select id='language' name='language'>\n";
 
 
 		foreach (getLanguageData() as  $langkey2=>$langname)
 		{
 			$newsurvey .= "<option value='".$langkey2."'";
 			if ($defaultlang == $langkey2) {$newsurvey .= " selected='selected'";}
-			$newsurvey .= ">".$langname['description']." - ".$langname['nativedescription']."</option>\n";
+			$newsurvey .= ">".$langname['description']."</option>\n";
 		}
 
         //Use the current user details for the default administrator name and email for this survey
@@ -2844,12 +2844,12 @@
 		if(empty($owner['full_name'])) $owner['full_name']=$siteadminname;
 		if(empty($owner['email'])) $owner['email'] = $siteadminemail;
 
-		$newsurvey .= "</select><font size='1'> ".$clang->gT("This setting cannot be changed later!")."</font>\n"
+		$newsurvey .= "</select><span class='annotation'> ".$clang->gT("*This setting cannot be changed later!")."</span>\n"
 		. "</li>\n";
 
 		$newsurvey .= ""
-		. "<li><label for='surveyls_title'>".$clang->gT("Title").":</label>\n"
-		. "<input type='text' size='82' maxlength='200' id='surveyls_title' name='surveyls_title' /><font size='1'> ".$clang->gT("(This field is mandatory.)")."</font></li>\n"
+		. "<li><label for='surveyls_title'><span class='annotationasterisk'>*</span>".$clang->gT("Title").":</label>\n"
+		. "<input type='text' size='82' maxlength='200' id='surveyls_title' name='surveyls_title' /> <span class='annotation'>".$clang->gT("*Required")."</span></li>\n"
 		. "<li><label for='description'>".$clang->gT("Description:")."</label>\n"
 		. "<textarea cols='80' rows='10' id='description' name='description'></textarea>"
 		. getEditor("survey-desc","description", "[".$clang->gT("Description:", "js")."]",'','','',$action)

diff --git a/admin/scripts/admin_core.js b/admin/scripts/admin_core.js
@@ -41,7 +41,7 @@ $(document).ready(function(){
         }
     });    
 
-    $('#noncompletedlbl[title]').each(function() {
+    $('label[title]').each(function() {
         if($(this).attr('title') != '')
         {
              $(this).qtip({

diff --git a/admin/scripts/fckeditor.265/editor/plugins/LimeFitWin/lang/en.js b/admin/scripts/fckeditor.265/editor/plugins/LimeFitWin/lang/en.js
@@ -24,4 +24,5 @@
  * File Authors:
  *         Anton Suprun (kpobococ at gmail dot com)
  */
-FCKLang.SwitchtoolbarBtn = 'Switch Toolbar';
+FCKLang.SwitchtoolbarBtn = 'Switch Toolbar';
+FCKLang.LimeFitWinBtn = 'Toggle fullscreen & advanced options';
diff --git a/admin/scripts/fckeditor.265/editor/plugins/LimeReplacementFields/lang/en.js b/admin/scripts/fckeditor.265/editor/plugins/LimeReplacementFields/lang/en.js
@@ -20,5 +20,5 @@
  *
  * Placholder English language file.
  */
-FCKLang.LimeReplacementFieldsBtn	= 'Insert/Edit LimeReplacementField' ;
-FCKLang.LimeReplacementFieldsDlgTitle	= 'LimeReplacementField Properties' ;
+FCKLang.LimeReplacementFieldsBtn	= 'Insert/edit LimeSurvey replacement field' ;
+FCKLang.LimeReplacementFieldsDlgTitle	= 'LimeSurvey replacement field properties' ;
diff --git a/admin/styles/default/adminstyle.css b/admin/styles/default/adminstyle.css
@@ -307,6 +307,16 @@ textarea {
 	color: #E00;
 }
 
+.annotationasterisk
+{
+        color: #E00;
+}
+
+.annotation {
+    font-size: 10px;
+    color: #E00;
+}
+
 .errortitle {
 	font-weight: 700;
 	color: #FF0F0F;