Some cleanup in the handling of new package creation

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

diff --git a/TODO b/TODO
index ea965da92ef45078026a3b8e2c7b6b0ac6807c36..11317ec03b931df8f595047ca7759bb90136ba9b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -30,8 +30,6 @@ Target for 2.4.1:
 
 * Fix fai objects to generate tags if needed (sub objects, phone me...)
 
-* Remove the refresh button from faiPackageNew (the second one)
-
 
 Target for 2.5:
 ===============

diff --git a/plugins/admin/fai/class_faiPackageNew.inc b/plugins/admin/fai/class_faiPackageNew.inc
index e9aaa6d2625fbfe616bce67a57de50e2caf0c758..1267e712c24cbc62e51a4a28af008114e8341490 100644 (file)
--- a/plugins/admin/fai/class_faiPackageNew.inc
+++ b/plugins/admin/fai/class_faiPackageNew.inc
@@ -62,12 +62,11 @@ class faiPackageNew extends plugin
     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)){
-          $str .= "<input ".$rel." type='checkbox' value='".$section."' name='section_".$section."' checked>".$section."<br>";
+          $str .= "<input type='checkbox' value='".$section."' name='section_".$section."' checked>".$section."<br>";
         }else{
-          $str .= "<input ".$rel." type='checkbox' value='".$section."' name='section_".$section."'>".$section."<br>";
+          $str .= "<input type='checkbox' value='".$section."' name='section_".$section."'>".$section."<br>";
         }
         $str .="<input type='hidden' name='wasOnPage_".$section."'>";
       }

diff --git a/plugins/admin/fai/faiPackageNew.tpl b/plugins/admin/fai/faiPackageNew.tpl
index 22ded91efb74e354610fc11f8199c318944567b4..e7dc4be301118794774006f8210da825e7c02e7a 100644 (file)
--- a/plugins/admin/fai/faiPackageNew.tpl
+++ b/plugins/admin/fai/faiPackageNew.tpl
@@ -18,12 +18,14 @@
 <table summary="">
 <tr>
        <td height="30">
-               <b><LABEL for="release">{t}Following releases are available{/t}</LABEL></b>
+               <b><LABEL for="release">{t}Release{/t}</LABEL></b>
        </td>
        <td>
-               <select name="FAIdebianReleaseS" title="{t}Release{/t}">
+               <select name="FAIdebianReleaseS" title="{t}Release{/t}" onChange='document.mainform.submit();'>
                        {html_options options=$releases selected=$release}
                </select>
+               &nbsp;
+               <input type="submit" value="{t}Refresh{/t}" name="SetRepository">
        </td>
 </tr>
 <tr>
@@ -32,12 +34,11 @@
        </td>
        <td>
                {$sections} 
-               <input type="submit" value="{t}set{/t}" name="SetRepository">
        </td>
 </tr>
 </table>
 <input type="hidden" name="YesItIsPostedPackages" value="1">
-<p class="seperator">&nbsp;
+<p class="seperator" style="margin-bottom:5px">&nbsp;
 </p>
 
 <div align="right" style="align:right;">