Adjusted Comboboxes and moved styles to css file

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@1843 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jul 30, 2006 · 63977df · 63977df
1 parent 6222903
commit 63977df
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 15 deletions.
diff --git a/admin/html.php b/admin/html.php
@@ -350,7 +350,7 @@
 			}
 		$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' align='left' border='0' hspace='0'>\n"
 						. "\t\t\t\t</td>\n"
-						. "\t\t\t\t<td align='right' valign='middle' width='330'>\n";
+						. "\t\t\t\t<td align='right' valign='middle' width='380'>\n";
 		if (!$gid) 
 			{
 			$surveysummary .= "\t\t\t\t\t<input type='image' src='$imagefiles/close.gif' title='". _("Close this Survey")."' alt='". _("Close this Survey")."' align='right'  name='CloseSurveyWindow' "
@@ -379,9 +379,8 @@
 							. "onmouseout=\"hideTooltip()\"" 
                     		. "onmouseover=\"showTooltip(event,'"._("Add New Group to Survey")."');return false\">\n" ;
 			}
-		$surveysummary .= "$setfont<font size='1' color='#222222'><strong>"._("Groups").":</strong>"
-						. "\t\t<select style='font-size: 9; font-family: verdana; color: #222222; "
-						. "background: silver; width: 160' name='groupselect' "
+		$surveysummary .= "<font class=\"boxcaption\">"._("Groups").":</font>"
+						. "\t\t<select class=\"listboxgroups\" name='groupselect' "
 						. "onChange=\"window.open(this.options[this.selectedIndex].value,'_top')\">\n";
 		if (getgrouplist($gid))
 			{
@@ -392,7 +391,7 @@
 			$surveysummary .= "<option>"._("None")."</option>\n";
 			}
 		$surveysummary .= "</select>\n"
-						. "\t\t\t\t</font></font></td>"
+						. "\t\t\t\t</td>"
 						. "</tr>\n"
 						. "\t\t\t</table>\n"
 						. "\t\t</td>\n"
@@ -475,7 +474,7 @@
 						. "\t\t<td>$setfont {$s1row['template']}</font></td></tr>\n"
 						. "\t<tr $showstyle id='surveydetails8'><td align='right' valign='top'>$setfont<strong>"
 						. _("Language:")."</strong></font></td>\n";
-		if (!$s1row['language']) {$language=$currentadminlang;} else {$language=$s1row['language'];}
+		if (!$s1row['language']) {$language=getLanguageNameFromCode($currentadminlang);} else {$language=getLanguageNameFromCode($s1row['language']);}
 		if ($s1row['urldescrip']==""){$s1row['urldescrip']=$s1row['url'];}
 		$surveysummary .= "\t\t<td>$setfont$language</font></td></tr>\n"
 						. "\t<tr $showstyle id='surveydetails9'><td align='right' valign='top'>$setfont<strong>"
@@ -603,13 +602,11 @@
 						   . "onmouseout=\"hideTooltip()\"" 
                            . "onmouseover=\"showTooltip(event,'"._("Add New Question to Group")."');return false\">\n";
 			}
-		$groupsummary .= "\t\t\t\t\t$setfont<font size='1'><strong>"._("Questions").":</strong> <select name='qid' "
-					   . "onChange=\"window.open(this.options[this.selectedIndex].value, '_top')\" "
-					   . "style='font-size:9; font-family: verdana; color: #333333; background-color: "
-					   . "silver; width: 160'>\n"
+		$groupsummary .= "\t\t\t\t\t<font class=\"boxcaption\">"._("Questions").":</font> <select class=\"listboxquestions\" name='qid' "
+					   . "onChange=\"window.open(this.options[this.selectedIndex].value, '_top')\">\n"
 					   . getquestions()
 					   . "\t\t\t\t\t</select>\n"
-					   . "\t\t\t\t</font></font></td></tr>\n"
+					   . "\t\t\t\t</td></tr>\n"
 					   . "\t\t\t</table>\n"
 					   . "\t\t</td>\n"
 					   . "\t</tr>\n";

diff --git a/admin/index.html b/admin/index.html
@@ -0,0 +1,7 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0; URL=admin.php">
+</head>
+<body>
+</body>
+</html>
diff --git a/admin/styles/default/adminstyle.css b/admin/styles/default/adminstyle.css
@@ -90,6 +90,32 @@ td 		{
         	background: SILVER; 
         	width: 180
         }
+.listboxgroups
+        {
+        	margin-top: 10px;
+        	height: 20px;
+        	font-size: 10;
+        	font-family: verdana;
+        	color: #333333;
+        	background: SILVER;
+        	width: 180
+        }
+.listboxquestions
+        {
+        	margin-top: 10px;
+        	height: 20px;
+        	font-size: 10;
+        	font-family: verdana;
+        	color: #333333;
+        	background: SILVER;
+        	width: 180
+        }
+.boxcaption
+        {
+        	font-size: 12;
+        	font-family: verdana;
+			font-weight: bold;
+        }
 .saveOrderbtn
 	   {
 	     		border: thin solid #000000;
@@ -162,4 +188,4 @@ td 		{
 		background-color:#EEE;
 		margin-top:2px;
 	}
-
+
diff --git a/common.php b/common.php
@@ -275,7 +275,7 @@ function showadminmenu()
                     . "onmouseout=\"hideTooltip()\"" 
                     . "onmouseover=\"showTooltip(event,'"._("Template Editor")."');return false\">\n"
                     . "\t\t\t\t</td>\n";
-        $adminmenu .= "\t\t\t\t<td align='right' width='400'>\n"
+        $adminmenu .= "\t\t\t\t<td align='right' width='450'>\n"
                     . "\t\t\t\t\t<input type='image' src='$imagefiles/showhelp.png' name='ShowHelp' title=''" 
                     . "alt='". _("Show Help")."' align='right' onClick=\"showhelp('show')\"" 
                     . "onmouseout=\"hideTooltip()\"" 
@@ -286,13 +286,13 @@ function showadminmenu()
                     . " alt='". _("Create or Import New Survey")."' onClick=\"window.open('$scriptname?action=newsurvey', '_top')\""
                     . "onmouseout=\"hideTooltip()\"" 
                     . "onmouseover=\"showTooltip(event,'"._("Create or Import New Survey")."');return false\">\n"
-                    . "\t\t\t\t\t$setfont<font size='2'><strong>"._("Surveys").":</strong> "
+                    . "\t\t\t\t\t<font class=\"boxcaption\">"._("Surveys").":</font>"
                     . "\t\t\t\t\t<select class=\"listboxsurveys\""
                     . "onChange=\"window.open(this.options[this.selectedIndex].value,'_top')\">\n"
                     //. $surveyselect
                     . getsurveylist()
                     . "\t\t\t\t\t</select>\n"
-                    . "\t\t\t\t</font></font></td>\n"
+                    . "\t\t\t\t</td>\n"
                     . "\t\t\t</tr>\n"
                     . "\t\t</table>\n"
                     . "\t</td>\n"