Layout updates

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

diff --git a/html/images/welcome.png b/html/images/welcome.png
new file mode 100644 (file)
index 0000000..0964749
Binary files /dev/null and b/html/images/welcome.png differ

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index 4810309ab8d9b0abfafabc66542044343a78185f..6f72053dd6fdca53fdfacbe61bac7498b694b062 100644 (file)
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -1031,7 +1031,7 @@ div.step2_warning_text{
 
 li.step4_name, div.step4_name {
        float:left;
-       width:15%;
+       width:20%;
        height:2.0em;
 }
 

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 8ee39b2f2b24495c626c45db32cfb8b7187257c6..1afc3b07de0c84ff6b81aa65105aa39dc80d3604 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -72,8 +72,8 @@ class Step_Config1 extends setup_step
   function update_strings()
   {
     $this->s_title      = _("GOsa settings 1/3");
-    $this->s_title_long = _("GOsa generic settings, page 1/3");
-    $this->s_info       = _("This dialog allows you to setup GOsa behaviour");
+    $this->s_title_long = _("GOsa settings 1/3");
+    $this->s_info       = _("GOsa generic settings");
   }
 
   

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index 9572a774762f38c3b0235bc298d9cd1e40794d30..376eb5c116c734da302a462ce73fc3aede8cd676 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -7,110 +7,83 @@
 {/foreach}
 {/if}
 
-<div class='default' style='margin:12px; '>
-    <div style='float:left; '>
-               <br>
-               <b>{t}GOsa settings{/t}</b>
-       </div>
+<div class='default'>
+    <p><b>{t}Look and feel{/t}</b></p>
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}GOsa theme{/t}
+            {t}Theme{/t}
         </div>
         <div class='step4_value'>
             <select name="theme">
                 {html_options options=$themes selected=$theme}
             </select>
         </div>
-        <div class='step4_status'>
+    </div>
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Show PHP errors{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="errorlvl" size="1" title="">
+                       {html_options options=$bool selected=$errorlvl}
+            </select>
         </div>
     </div>
 
+    <p><b>{t}People and group storage{/t}</b></p>
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}People dn attribute{/t}
+            {t}People DN attribute{/t}
         </div>
         <div class='step4_value'>
             <select size="1" name="peopledn">
                 {html_options values=$peopledns output=$peopledns selected=$peopledn}
             </select>
         </div>
-        <div class='step4_status'>
-        </div>
     </div>
 
        <div class='step4_container'>
         <div class='step4_name'>
-            {t}People storage ou{/t}
+            {t}People storage subtree{/t}
         </div>
         <div class='step4_value'>
-            <input type='text' name='peopleou' maxlength='40' size='20' value='{$peopleou}'>
-        </div>
-        <div class='step4_status'>
+            <input type='text' name='peopleou' maxlength='40' size='40' value='{$peopleou}'>
         </div>
     </div>
 
 
        <div class='step4_container'>
         <div class='step4_name'>
-            {t}Group storage ou{/t}
+            {t}Group storage subtree{/t}
         </div>
         <div class='step4_value'>
-            <input type='text' name='groupou' maxlength='40' size='20' value='{$groupou}'>
-        </div>
-        <div class='step4_status'>
+            <input type='text' name='groupou' maxlength='40' size='40' value='{$groupou}'>
         </div>
     </div>
 
-    <div class='step4_container'>
+    <div class='step4_container' style="margin-bottom:5px;">
         <div class='step4_name'>
-            {t}ID base for users/groups{/t}
+            {t}Number base for people/groups{/t}
         </div>
         <div class='step4_value'>
             <input type='text' name='uidbase' maxlength='20' size='10' value='{$uidbase}'>
-        </div>
-        <div class='step4_status'>
-        </div>
-    </div>
-
-
-       <div class='step4_container'>
-       <div class='step4_name'>
-                {t}Base hook{/t}
-        </div>
-        <div class='step4_value'>
+           <br>
             {if $base_hook_active == FALSE}
                 <input type='checkbox' value='1' name='base_hook_active'
                     onClick='changeState("base_hook");'>
-                <input style='width:90%' id='base_hook' name='base_hook' type='text' value='{$base_hook}'      disabled>
+                {t}Use hook{/t}
+                <input id='base_hook' name='base_hook' size=40 type='text' value='{$base_hook}'      disabled>
             {else}
                 <input type='checkbox' value='1' name='base_hook_active' checked>
-                <input style='width:90%' id='base_hook' name='base_hook' type='text' value='{$base_hook}'  >
+                {t}Use hook{/t}
+                <input id='base_hook' name='base_hook' size=40 type='text' value='{$base_hook}'  >
             {/if}
         </div>
-        <div class='step4_status'>
-            {t}Infos in FAQ{/t}&nbsp;
-            <img class='center'  alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
         </div>
     </div>
 
-
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Display PHP errors{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="errorlvl" size="1" title="">
-                       {html_options options=$bool selected=$errorlvl}
-            </select>
-        </div>
-        <div class='step4_status'>
-        </div>
-    </div>
-    <div style='float:left;'>
-               <br>
-               <b>{t}Password settings{/t}</b>
-       </div>
+    <p><b>{t}Password settings{/t}</b></p>
 
     <div class='step4_container'>
         <div class='step4_name'>
@@ -154,36 +127,25 @@
                        {/if}
        
         </div>
-        <div class='step4_status'  style='height:4em;'>
-                       {t}Infos in FAQ{/t}&nbsp;
-                       <img class='center'  alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
-        </div>
     </div>
 
           <div class='step4_container'>
         <div class='step4_name'>
-                {t}External script{/t}
+                {t}Password change hook{/t}
         </div>
         <div class='step4_value'>
             {if $pwd_rules.externalpwdhook_active == FALSE}
                 <input type='checkbox' value='1' name='externalpwdhook_active'
                     onClick='changeState("externalpwdhook");'>
-                <input style='width:90%' id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' disabled>
+                <input id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' disabled>
             {else}
                 <input type='checkbox' value='1' name='externalpwdhook_active' checked>
-                <input style='width:90%' id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}'  >
+                <input size=40 id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}'  >
             {/if}
         </div>
-        <div class='step4_status'>
-                       {t}Infos in FAQ{/t}&nbsp;
-                       <img class='center'  alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
-        </div>
     </div>
 
-    <div style='float:left; '>
-               <br>
-               <b>{t}Mail settings{/t}</b>
-       </div>
+    <p><b>{t}Mail settings{/t}</b></p>
 
     <div class='step4_container'>
         <div class='step4_name'>
@@ -207,33 +169,24 @@
             {if $mail_settings.vacationdir_active == FALSE}
                 <input type='checkbox' value='1' name='vacationdir_active'
                     onClick='changeState("vacationdir");'>
-                <input style='width:90%' id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}' disabled>
+                <input size=40 id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}' disabled>
             {else}
                 <input type='checkbox' value='1' name='vacationdir_active' checked>
-                <input style='width:90%' id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}'  >
+                <input size=40 id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}'  >
             {/if}
         </div>
-        <div class='step4_status'>
-                       {t}Infos in FAQ{/t}&nbsp;
-                       <img class='center'  alt='!'  src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
-        </div>
     </div>
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Use cyrus account style{/t}
+            {t}Use Cyrus UNIX style{/t}
         </div>
         <div class='step4_value'>
             <select name="cyrusunixstyle" size="1" title="">
                        {html_options options=$bool selected=$cyrusunixstyle}
             </select>
         </div>
-        <div class='step4_status'>
-                       {t}Infos in FAQ{/t}&nbsp;
-                       <img class='center'  alt='!'  src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
-        </div>
     </div>
-</div>
 
 <input type='hidden' value='1' name='step5_posted'>
 <!--