Initial setup stuff

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

diff --git a/html/themes/default/images/go_logo.png b/html/themes/default/images/go_logo.png
index b2b2099b02929845028519a9c3c4fe20c809c810..9b597699c24dfabef7c9201a0a1509e8231609d2 100644 (file)
Binary files a/html/themes/default/images/go_logo.png and b/html/themes/default/images/go_logo.png differ

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index 8d2fb86b57368177d9db47512facdcecb8131e6e..1cb25177eb123526f1f37f231da9a1458ec3b013 100644 (file)
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -785,28 +785,35 @@ td.tbrhead {
 
 /* The body style */
 body.setup_body {
-       background-image: none;
+       margin-left:0px;
+       margin-right:0px;
+       margin-top:0px;
+       margin-bottom:0px;
+       color:#00008F;
+       font-family:arial,helvetica,sans-serif;
+       font-size:12px;
        background-color: #979797;
-/*     margin: 10px;*/
+       background-image: none;
 }
 
 /* The setup complete setup dialog */
 div.setup_dialog {
        background-color:#FFF;
-       border-right: solid 2px #444444;
-       border-bottom: solid 2px #666666;
-       border-top: solid 1px #666;
-       /*border-left: solid 1px #666;*/
        text-align: left;
 }
 
 /* Header col */
 div.setup_header {
-    background-color: #D2F6C2;
-       font-size: 2.0em;
-       font-weight: bold;
-/*     vertical-align: center;*/
-/*     padding:7px;*/
+       background-color: #D2F6C2;
+       height:30px;
+       padding:2px 5px 2px 5px;
+       border-bottom: 1px solid #778F6E;
+}
+
+div.setup_menu {
+       background-color: #F0F0F9;
+       padding:4px 5px 4px 5px;
+       border-bottom: 1px solid #B0B0B0;
 }
 
 /* Setup content header container */
@@ -821,7 +828,7 @@ div.setup_contents_container {
 div.setup_bottom {
        clear: left;
        background-color:#DDDDDD;       
-       border-top: solid 1px #D0D0D0; 
+       border-top: solid 1px red;
 }
 
 /*******
@@ -846,7 +853,6 @@ div.setup_plug_header {
 
 /* Content col */
 div.setup_contents {
-       border-bottom: solid 1px #D0D0D0;
        margin-right:2px;
        background-color:#FFFFFF;
        width:100%;
@@ -871,7 +877,8 @@ div.setup_navigation {
 
 /* Navigation title */
 div.setup_navigation_title {
-       font-size: 1.7em;
+       font-size: 1.2em;
+       font-weight: bold;
        background:#EEFFE6 ;
        text-decoration:none;
        width:100%;

diff --git a/setup/class_setupStep1.inc b/setup/class_setupStep1.inc
index 59a45524e6643c3340dfc770e9289f12a646e4b6..d7a759383360362ac9c5e1cfad83a35340153a26 100644 (file)
--- a/setup/class_setupStep1.inc
+++ b/setup/class_setupStep1.inc
@@ -39,8 +39,8 @@ class setup_step_1 extends setup_step
 
   function update_strings()
   {
-    $this->s_title      = _("Language selection");
-    $this->s_title_long = _("Please choose a language");
+    $this->s_title      = _("Language setup");
+    $this->s_title_long = _("Language setup");
     $this->s_info       = _("This step is allows you to select your prefered language.");
   }
   

diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index 38588672d23425f3b16bbaadee228bf30eaeff6b..e3be0e6904983a9f341e5ae1ca4354a114a38774 100644 (file)
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -8,18 +8,15 @@
                <img src='themes/default/images/go_logo.png' class='center' alt='GOsa'>
        </div>
        <div class='setup_menu'>
-               {t}GOsa setup{/t}
+               <b>{t}GOsa setup wizard{/t}</b>
        </div>
-       <div style="width:100%;">
+       <div style="padding:10px;background-color:red;">
 
                <div class='setup_navigation'>
-                       <div class='setup_navigation_title'>
-                               {t}Setup steps{/t}      
-                       </div>
                        {$navigation}           
                </div>
 
-               <ul style='padding:0px;margin:0px;      list-style-type: none;'>
+               <ul style='padding:0px;margin:0px; list-style-type:none;'>
                        <li>
                                <div>
                                        <div style='padding:12px;'>
@@ -39,11 +36,11 @@
                                
                        </li>
                </ul>
+       </div>
+</div>
                <div class='setup_bottom'>
                        {$bottom}
                </div>
-       </div>
-</div>
 <input type='hidden' name='setup_goto_step' value=''>
 </form>
 </center>

diff --git a/setup/setup_step1.tpl b/setup/setup_step1.tpl
index 23f8c5224acdc77b5bbced13c957de7e3e5f8294..3a665e39c9a433ca39c8721799c619750717cdd2 100644 (file)
--- a/setup/setup_step1.tpl
+++ b/setup/setup_step1.tpl
@@ -1,13 +1,9 @@
-<div style='width:100%;'>
+<div>
        <div class='default'>
                <b>{t}Please select your prefered language{/t}</b>
        </div>
-       <br>
-       <div  class='default' style='float:left;width:160px;'>
-               {t}Setup language{/t}
-       </div>
-       <div class='default' style=';'>
-               <select name='lang_selected' title='{t}Please your prefered language here{/t}' size=5 style='width:300px;'>
+       <div class='default' style='padding-right:10px;'>
+               <select name='lang_selected' title='{t}Please your prefered language here{/t}' size=10 width="300">
                {html_options options=$languages selected=$lang_selected}
                </select>
        </div>