From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 18 Apr 2007 09:23:47 +0000 (+0000)
Subject: Style update
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=24ca41bb7697aeab181dfd653fd0356c9f0c83ad;p=gosa.git

Style update


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6081 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index aa2ba3425..a2cd38c31 100644
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -792,7 +792,7 @@ body.setup_body {
 	color:#00008F;
 	font-family:arial,helvetica,sans-serif;
 	font-size:12px;
-	background-color: #979797;
+	background-color: white;
 	background-image: none;
 }
 
@@ -854,9 +854,11 @@ div.setup_plug_header {
 /* Content col */
 div.setup_contents {
 	margin-right:2px;
-	background-color:#FFFFFF;
+	background-color:white;
 	width:80%;
 	margin-left:20%;
+	border:1px solid #AAAAAA;
+	padding:2px;
 }
 
 /* default.*/
@@ -868,9 +870,11 @@ div.default {
 /* Navigation col */
 div.setup_navigation {
 	width:19%;
-	background-color:#E8E8E8;
-	padding-left: 2px;;
-	padding-right: 2px;;
+	background-color:white;
+	padding-left: 2px;
+	padding-right: 2px;
+	border:1px solid #AAAAAA;
+	float:left;
 }
 
 
@@ -878,39 +882,36 @@ div.setup_navigation {
 div.setup_navigation_title {
 	font-size: 1.2em;
 	font-weight: bold;
-	background:#EEFFE6 ;
 	text-decoration:none;
 	width:100%;
 	padding-top:8px;
 	padding-bottom:8px;
-	border-right: solid 1px #AAAAAA;
-	border-bottom: solid 1px #BBBBBB;
+	border-top:1px dashed #AAAAAA;
 }
 
 /* The box used for each setup step */
 a.navigation_element, div.navigation_element {
-	background: #EEFFE6;
 	text-decoration:none;
-	border-right: solid 1px #AAAAAA;
-	border-bottom: solid 1px #BBBBBB;
-	float:left;
+	padding-top:8px;
+	padding-bottom:8px;
+	border-top:1px dashed #AAAAAA;
 	width:100%;
 }
 
 /* The box used for each setup step */
 a.navigation_element_active, div.navigation_element_active {
-	background: #D2F6C2;
-	background: #dfffdf;
 	text-decoration:none;
-	float:left;
 	width:100%;
-	border-right: solid 1px #AAAAAA;
-	border-bottom: solid 1px #BBBBBB;
+	padding-top:8px;
+	padding-bottom:8px;
+	border-top:1px dashed #AAAAAA;
+	background-color:#F0F0F0;
 }
 
 /* An enabled setup step will use this style in navigation*/
 div.navigation_title_active {
 	font-size: 1.2em;
+	background-color:#F0F0F0;
 	font-weight: bold;
 	cursor: pointer;
 	padding: 3px;
@@ -928,9 +929,6 @@ div.navigation_title_disabled {
 
 /* Disabled setup steps */
 div.navigation_title_inactive {
-
-	background-color: #dfffdf;
-	background-color: #e5e5e5;
 	font-size: 1.2em;
 	font-weight: bold;
 	text-decoration:none;
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 4dbd86a48..c00ad32e4 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -56,7 +56,6 @@ class setup
 
   function execute()
   {
-    $smarty = get_smarty();
     $this->o_steps[$this->i_last]->set_active(FALSE);
     $this->o_steps[$this->i_current]->set_active();
     $content = $this->o_steps[$this->i_current]->execute();
@@ -235,15 +234,15 @@ class setup
     $str ="";
     $str.="   <div style='text-align:right;float:top;'>";
     if(isset($this->o_steps[$this->i_current -1]) && $this->o_steps[$this->i_current -1]->is_enabled()){
-      $str .= "<input type='submit' name='last' value='"._("Backward")."'>";
+      $str .= "<input type='submit' name='last' value='"._("Back")."'>";
     }else{
-      $str .= "<input type='button' name='last' value='"._("Backward")."' disabled>";
+      $str .= "<input type='button' name='last' value='"._("Back")."' disabled>";
     }
-
+    $str.= "&nbsp;";
     if(isset($this->o_steps[$this->i_current + 1])){
-      $str .= "<input type='submit' name='next' value='"._("Forward")."'>";
+      $str .= "<input type='submit' name='next' value='"._("Continue")."'>";
     }else{
-      $str .= "<input type='button' value='"._("Forward")."' disabled>";
+      $str .= "<input type='button' value='"._("Continue")."' disabled>";
     }
     $str .="</div>";
     return($str);
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index f685da56c..a5d86103e 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -117,12 +117,14 @@ class setup_step extends plugin
 
   function print_header()
   {
-    $display= print_header(get_template_path($this->header_image),$this->s_title_long,"");  
+    $image= get_template_path($this->header_image);
+    $display= "<div style='padding:3px;'>";
+    $display.= "  <p class=\"center\" style=\"margin:0px 0px 0px 5px;padding:0px;font-size:24px;\"><img class=\"center\" src=\"$image\" align=\"middle\" alt=\"*\">&nbsp;".$this->s_title_long."</p>\n";
+    $display.= "</div>\n";
+
     return($display);
   }
 }
 
-
-
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index 9eeed0f02..7ea9af5e5 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -1,44 +1,45 @@
-<body class='setup_body' >
-<center>
+<body class='setup_body'>
 {$php_errors}
 <form action='setup.php' name='mainform' method='post' enctype='multipart/form-data'>
 <input id='focus' name='focus' type='image' src='images/empty.png' style='width:0px; height:0px;' >
 <div class='setup_dialog'>
 	<div class='setup_header'>
-		<img src='themes/default/images/go_logo.png' class='center' alt='GOsa'>
+		<div style="float:left;"><img src='themes/default/images/go_logo.png' class='center' alt='GOsa'></div>
+		<div style="padding-top:8px;text-align:right;height:28px">{$version}</div>
 	</div>
 	<div class='setup_menu'>
 		<b>{t}GOsa setup wizard{/t}</b>
 	</div>
 
-	<div style="padding:10px;background-color:green;">
+	<div style="padding:10px;background-color:white;">
 
 		<div class='setup_navigation'>
+			<div style='padding:4px'>
+				<img src='images/fai.png' class='center' alt='{t}Installation{/t}'>&nbsp;&nbsp;<font style="font-size:24px;">{t}Steps{/t}</font>
+			</div>
 			{$navigation}		
 		</div>
 	
 		<div class='setup_contents'>
-				<div class='plugtop'>
-					{$header}
-				</div>
+			<div style='border-bottom:1px dashed #AAAAAA'>
+				<font style="font-size:24px;">
+				{$header}
+				</font>
+			</div>
 			<div style='padding-left:12px;'>
 				{$contents}
+				<p class='seperator' style='margin-bottom:10px;'>&nbsp;</p>
+				{$bottom}
+				<br>
 			</div>
 		</div>
-	
+		<div style="clear:both">	</div>
 	</div>
 </div>
 
-<div class='setup_bottom'>
-	{$bottom}
-</div>
 
 <input type='hidden' name='setup_goto_step' value=''>
 </form>
-</center>
-<div style='width:100%; text-align:right'>
-	{$version}
-</div>
 
 <script type='javascript'>
 	document.getElementById('focus').focus();
diff --git a/setup/setup_language.tpl b/setup/setup_language.tpl
index 3a665e39c..247008373 100644
--- a/setup/setup_language.tpl
+++ b/setup/setup_language.tpl
@@ -1,20 +1,13 @@
 <div>
 	<div class='default'>
-		<b>{t}Please select your prefered language{/t}</b>
+		<p><b>{t}Please select the prefered language{/t}</b></p>
+		<p>
+		{t}At this point, you can select the site wide default langauge. Choosing 'automatic' will use the language requested by the browser. This setting can be overriden per user.{/t}
+		</p>
 	</div>
-	<div class='default' style='padding-right:10px;'>
-		<select name='lang_selected' title='{t}Please your prefered language here{/t}' size=10 width="300">
+	<div class='default' style='padding-right:10px; margin-bottom:20px;'>
+		<select name='lang_selected' title='{t}Please your prefered language here{/t}' size=10 style="width:100%">
 		{html_options options=$languages selected=$lang_selected}
 		</select>
 	</div>
 </div>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>