[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9344a78)
Updated layout
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 19 Apr 2007 09:45:43 +0000 (09:45 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 19 Apr 2007 09:45:43 +0000 (09:45 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6117 594d385d-05f5-0310-b6e9-bd551577e9d8

setup/class_setupStep_Config1.inc patch | blob | history
setup/class_setupStep_Config2.inc patch | blob | history
setup/setup_config2.tpl patch | blob | history

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 1afc3b07de0c84ff6b81aa65105aa39dc80d3604..0ddccb48d495163a24e67ac52772f637035f6699 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -27,6 +27,7 @@ class Step_Config1 extends setup_step
   var $groupou    =  "ou=groups";
   var $peopledn   = "cn";
   var $uidbase    = 1000;
+  var $header_image = "images/ldapserver.png";
 
   var $base_hook         = "/usr/bin/sudo myscript"; 
   var $base_hook_active  = FALSE; 
diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 9f3076b131415ffaa79ab53cc821f60e84b8501a..454289b1786d887510ca3cf2e72ab7272618dcdd 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -27,6 +27,7 @@ class Step_Config2 extends setup_step
   var $sambaidmapping = FALSE;
   var $minid          = 100;       
   var $account_expiration  =FALSE;
+  var $header_image = "images/ldapserver.png";
 
   var $generic_settings  = array( "idgen"         => "{%sn}-{%givenName[2-4]}",
                                   "idgen_active"  => FALSE,
@@ -56,8 +57,8 @@ class Step_Config2 extends setup_step
   function update_strings()
   {
     $this->s_title      = _("GOsa settings 2/3");
-    $this->s_title_long = _("GOsa generic settings, page 2/3");
-    $this->s_info       = _("This dialog allows you to setup GOsa behaviour");
+    $this->s_title_long = _("GOsa settings 2/3");
+    $this->s_info       = _("Customize special parameters");
   }
 
  
diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index b7810aae54307affd45606f4921bbba65d573629..46b36ee5bbab47342cea02bb6e7777fec7f3a18c 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -7,12 +7,7 @@
 {/foreach}
 {/if}
 <div class='default' style='margin:12px; '>  
-    <div style='float:left; width:600px;'>
-               <br>
-               <b>{t}Samba settings{/t}</b>
-       </div>
-
-       
+    <p><b>{t}Samba settings{/t}</b></p>
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Samba SID{/t}
@@ -21,16 +16,12 @@
             {if $samba_settings.samba_sid_active == FALSE}
                 <input type='checkbox' value='1' name='samba_sid_active'
                     onClick='changeState("samba_sid");'>
-                <input style='width:90%' id='samba_sid' name='samba_sid' type='text' value='{$samba_settings.samba_sid}' disabled>
+                <input size=20 id='samba_sid' name='samba_sid' type='text' value='{$samba_settings.samba_sid}' disabled>
             {else}
                 <input type='checkbox' value='1' name='samba_sid_active' checked>
-                <input style='width:90%' id='samba_sid' name='samba_sid' type='text' value='{$samba_settings.samba_sid}'  >
+                <input size=20 id='samba_sid' name='samba_sid' type='text' value='{$samba_settings.samba_sid}'  >
             {/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'>
@@ -41,56 +32,41 @@
             {if $samba_settings.samba_rid_active == FALSE}
                 <input type='checkbox' value='1' name='samba_rid_active'
                     onClick='changeState("samba_rid");'>
-                <input style='width:90%' id='samba_rid' name='samba_rid' type='text' value='{$samba_settings.samba_rid}' disabled>
+                <input size=20 id='samba_rid' name='samba_rid' type='text' value='{$samba_settings.samba_rid}' disabled>
             {else}
                 <input type='checkbox' value='1' name='samba_rid_active' checked>
-                <input style='width:90%' id='samba_rid' name='samba_rid' type='text' value='{$samba_settings.samba_rid}'  >
+                <input size=20 id='samba_rid' name='samba_rid' type='text' value='{$samba_settings.samba_rid}'  >
             {/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}Samba SID mapping{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="sambaidmapping" size="1" title="">
-                       {html_options options=$bool selected=$sambaidmapping}
-            </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 style='float:left; width:600px;'>
-               <br>
-               <b>{t}Additional GOsa settings{/t}</b>
-       </div>
-       
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Windows workstation ou{/t}
+            {t}Workstation container{/t}
         </div>
         <div class='step4_value'>
             {if $generic_settings.wws_ou_active == FALSE}
                 <input type='checkbox' value='1' name='wws_ou_active'
                     onClick='changeState("wws_ou");'>
-                <input style='width:90%' id='wws_ou' name='wws_ou' type='text' value='{$generic_settings.wws_ou}' disabled>
+                <input size=40 id='wws_ou' name='wws_ou' type='text' value='{$generic_settings.wws_ou}' disabled>
             {else}
                 <input type='checkbox' value='1' name='wws_ou_active' checked>
-                <input style='width:90%' id='wws_ou' name='wws_ou' type='text' value='{$generic_settings.wws_ou}'  >
+                <input size=40 id='wws_ou' name='wws_ou' type='text' value='{$generic_settings.wws_ou}'  >
             {/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 class='step4_container'>
+        <div class='step4_name'>
+            {t}Samba SID mapping{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="sambaidmapping" size="1" title="">
+                       {html_options options=$bool selected=$sambaidmapping}
+            </select>
         </div>
     </div>
 
+    <p><b>{t}Additional GOsa settings{/t}</b></p>
+       
     <div class='step4_container'>
         <div class='step4_name'>
             {t}GID / UID min id{/t}
@@ -105,10 +81,6 @@
                 <input style='width:90%' id='minid' name='minid' type='text' value='{$generic_settings.minid}'  >
             {/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'>
@@ -120,10 +92,6 @@
                        {html_options options=$bool selected=$strict}
             </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 class='step4_container'>
@@ -135,8 +103,6 @@
                        {html_options options=$bool selected=$governmentmode}
                        </select>
         </div>
-        <div class='step4_status'>
-        </div>
     </div>
 
        
@@ -154,10 +120,6 @@
                 <input style='width:90%' id='idgen' name='idgen' type='text' value='{$generic_settings.idgen}'  >
             {/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'>
@@ -168,16 +130,10 @@
                        {html_options options=$bool selected=$account_expiration}
             </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 class='step4_container' style='height:12em;'>
-       <div class='step4_name'  style='height:12em;'>
-            {t}Enable snapshot functionality{/t}
-        </div>
-        <div class='step4_value'  style='height:12em;'>
+       <p><b>{t}Snapshots / Undo{/t}</b></p>
+        <div class='step4_name'  style='height:12em;width:60%;background-color:red;'>
             {if $generic_settings.snapshot_active == FALSE}
                 <input type='checkbox' value='1' name='snapshot_active'
                     onClick='  
@@ -186,65 +142,42 @@
                                                                changeState("snapshot_server");                                                 
                                                                changeState("snapshot_user");                                                   
                                                                changeState("snapshot_password");'>{t}Enable{/t}<br>
-                <div style='float:left;width:120px;'>
-                                       {t}Snapshot base{/t}&nbsp;
-                               </div>
-                               <input style='width:220' id='snapshot_base' name='snapshot_base' 
+               {t}Snapshot base{/t}&nbsp;
+               <input style='width:220' id='snapshot_base' name='snapshot_base' 
                                        type='text' value='{$generic_settings.snapshot_base}' disabled><br>
-                <div style='float:left;width:120px;'>
                    {t}Ldap base{/t}&nbsp;
-                               </div>
                                <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base' 
                                        type='text' value='{$generic_settings.snapshot_ldap_base}' disabled><br>
-                <div style='float:left;width:120px;'>
                    {t}Server{/t}&nbsp;
-                               </div>
                                <input style='width:220' id='snapshot_server' name='snapshot_server' 
                                        type='text' value='{$generic_settings.snapshot_server}' disabled><br>
-                <div style='float:left;width:120px;'>
                        {t}User{/t}&nbsp;
-                               </div>
                                <input style='width:220' id='snapshot_user' name='snapshot_user' 
                                        type='text' value='{$generic_settings.snapshot_user}' disabled><br>
-                <div style='float:left;width:120px;'>
                        {t}Password{/t}&nbsp;
-                               </div>
                                <input style='width:220' id='snapshot_password' name='snapshot_password' 
                                        type='password' value='{$generic_settings.snapshot_password}' disabled>
             {else}
                 <input type='checkbox' value='1' name='snapshot_active' checked>{t}Enable{/t}<br>
-                <div style='float:left;width:120px;'>
                    {t}Snapshot base{/t}&nbsp;
-                               </div>
                                <input style='width:220' id='snapshot_base' name='snapshot_base' 
                                        type='text' value='{$generic_settings.snapshot_base}'><br>
-                <div style='float:left;width:120px;'>
                    {t}Ldap base{/t}&nbsp;
-                               </div>
                                <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base' 
                                        type='text' value='{$generic_settings.snapshot_ldap_base}'><br>
-                <div style='float:left;width:120px;'>
                        {t}Server{/t}&nbsp;
-                               </div>
                                <input style='width:220' id='snapshot_server' name='snapshot_server' 
                                        type='text' value='{$generic_settings.snapshot_server}'><br>
-                <div style='float:left;width:120px;'>
                    {t}User{/t}&nbsp;
-                               </div>
                                <input style='width:220' id='snapshot_user' name='snapshot_user' 
                                        type='text' value='{$generic_settings.snapshot_user}'><br>
-                <div style='float:left;width:120px;'>
                        {t}Password{/t}&nbsp;
-                               </div>
                                <input style='width:220;' id='snapshot_password' name='snapshot_password' 
                                        type='password' value='{$generic_settings.snapshot_password}'>
             {/if}
         </div>
-        <div class='step4_status'  style='height:12em;'>
-            {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='step6_posted'>
+<div style="clear:both"></div>
GONICUS system administrator (SVN clone)