Updated layout

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

diff --git a/plugins/admin/fai/class_faiPackageNew.inc b/plugins/admin/fai/class_faiPackageNew.inc
index b90107a990fe52a31aa8f42feccd4e634a0b426a..60aea4affc4de21ac220217f7108bd6d8316a869 100644 (file)
--- a/plugins/admin/fai/class_faiPackageNew.inc
+++ b/plugins/admin/fai/class_faiPackageNew.inc
@@ -61,6 +61,8 @@ class faiPackageNew extends plugin
   {
     $str = "";
     if(is_array($secs)){
+      sort($secs);
+      $secs= array_unique($secs);
       $rel  = " onClick='document.mainform.submit();' ";
       foreach($secs as $section){
         if(in_array($section,$this->FAIdebianSection)){

diff --git a/plugins/admin/fai/faiPackageNew.tpl b/plugins/admin/fai/faiPackageNew.tpl
index 2325d330434887fef2b67c44b649d558da52db24..5ca0eff5d56e5a07e2c9649219f4bfc6cd77d743 100644 (file)
--- a/plugins/admin/fai/faiPackageNew.tpl
+++ b/plugins/admin/fai/faiPackageNew.tpl
@@ -1,7 +1,4 @@
-<div style="font-size: 18px;">
-    {t}Repository settings{/t}
-</div>
-<br>
+<h1>{t}Repository settings{/t}</h1>
 <p class="seperator">
 {t}To add packages to your package list you have to setup the repository settings first.{/t}
 <br>
@@ -21,9 +18,7 @@
 <table>
 <tr>
        <td height="30">
-               <h2>
-                       <LABEL for="release">{t}Following releases are available{/t}</LABEL>: 
-               </h2>
+               <b><LABEL for="release">{t}Following releases are available{/t}</LABEL></b>
        </td>
        <td>
                <select name="FAIdebianReleaseS" title="{t}Release{/t}">
@@ -32,9 +27,8 @@
        </td>
 </tr>
 <tr>
-       <td height="30">
-        <h2>{t}Sections for this release{/t}: </h2> 
-               
+       <td height="30" style="vertical-align:top">
+        <b>{t}Sections for this release{/t}</b>
        </td>
        <td>
                {$sections} 

diff --git a/plugins/admin/systems/class_servRepositorySetup.inc b/plugins/admin/systems/class_servRepositorySetup.inc
index 3336616a0dbeead0e99491261948a00f9f929c59..9330f48317b37d0917a92ec3e25ba70ed556551a 100644 (file)
--- a/plugins/admin/systems/class_servRepositorySetup.inc
+++ b/plugins/admin/systems/class_servRepositorySetup.inc
@@ -72,7 +72,7 @@ class servRepositorySetup  extends plugin
     }
 
     $divlist = new divSelectBox("servRepositorySetup");
-    $divlist->setHeight("120");
+    $divlist->setHeight("220");
 
     $dellink = "<input type='image' src='images/edittrash.png' title='delete' alt='delete' name='delete_%s' value='%s'>";
 
@@ -140,7 +140,7 @@ class servRepositorySetup  extends plugin
     while($attr = $ldap->fetch()){
       $ret[$attr['cn'][0]]= $attr['cn'][0];   
     }
-    $ret['none']=_("Master");
+    $ret['none']= "";
     return($ret);
   }
 

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 1653aab8e11d34db74a31a03148fd289a4e5a635..a5cfa2063def19c0e042c88d59850b4557337528 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -46,7 +46,7 @@ class workstartup extends plugin
     /* Creating a list of valid Mirrors 
      * none will not be saved to ldap.
      */
-    $this->FAIdebianMirrors   = array("none"=>_("none"));
+    $this->FAIdebianMirrors   = array();
     $ldap   = $this->config->get_ldap_link();
     $ldap->cd($this->config->current['BASE']);
     $ldap->search("(objectClass=FAIrepository)",array("FAIdebianMirror"));

diff --git a/plugins/admin/systems/servRepository.tpl b/plugins/admin/systems/servRepository.tpl
index 4453b44f5f6e8d9ed2e0f464205c7ab1003df3c8..72e3b1b86388df3bd93edf0f927a2aa56380a378 100644 (file)
--- a/plugins/admin/systems/servRepository.tpl
+++ b/plugins/admin/systems/servRepository.tpl
@@ -32,11 +32,9 @@
                
                                <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
                                        <tr>
-                                               <td width="50%">
-                                                       <img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display groups of user{/t}
-                                               </td>
-                                               <td>
-                                                       <input type='text' name='regex' maxlength='20' value='{$regex}' 
+                                               <td width="100%">
+                                                       <img alt="" src="{$search_image}" align=middle>&nbsp;
+                                                       <input type='text' name='regex' style='width:90%' maxlength='20' value='{$regex}' 
                                                                title='{t}Search filter{/t}' onChange="mainform.submit()">
                                                </td>
                                        </tr>

diff --git a/plugins/admin/systems/servRepositorySetup.tpl b/plugins/admin/systems/servRepositorySetup.tpl
index fb39b0e6642a0d018c677efacf731a0d664444ac..e5b7b85f9009d6650369ea302810917b430ed616 100644 (file)
--- a/plugins/admin/systems/servRepositorySetup.tpl
+++ b/plugins/admin/systems/servRepositorySetup.tpl
@@ -2,17 +2,17 @@
 
 <table width="100%">
        <tr>
-               <td width="50%" valign="top">
+               <td width="50%" valign="top" style="border-right:1px solid #A0A0A0">
                        <table>
                                <tr>
-                                       <td>{t}Release{/t} :
+                                       <td>{t}Release{/t}
                                        </td>
                                        <td>
                                                <input type="text" value="{$Release}" name="Release" {$ReleaseACL}>
                                        </td>
                                </tr>
                                <tr>
-                                       <td>{t}Parent server{/t} :
+                                       <td>{t}Parent server{/t}
                                        </td>
                                        <td>
                                                <select name="ParentServer" {$ParentServerACL}>
@@ -21,16 +21,16 @@
                                        </td>
                                </tr>
                                <tr>
-                                       <td>{t}Url{/t} :
+                                       <td>{t}URL{/t}
                                        </td>
                                        <td>
-                                               <input type="text" value="{$Url}" name="Url" {$UrlACL}>
+                                               <input type="text" size="40" value="{$Url}" name="Url" {$UrlACL}>
                                        </td>
                                </tr>
                        </table>
                </td>
                <td>
-                       {t}Sections{/t} :<br>
+                       {t}Sections{/t}<br>
                        {$Sections}
                        <input type="text"              name="SectionName" value="">
                        <input type="submit"    name="AddSection"  value="{t}Add{/t}">
@@ -38,9 +38,8 @@
        </tr>
 </table>
 <p class="plugbottom">
-  <input type=submit name="repository_setup_save" value="{t}Save{/t}">
+  <input type=submit name="repository_setup_save" value="{t}Apply{/t}">
   &nbsp;
   <input type=submit name="repository_setup_cancel" value="{t}Cancel{/t}">
 </p>
 
-