fixed style and regex input

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

diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index 47561675fb487c745352f0c51b0631b53c3f6302..1aad83f56c0c822289e7cc70d165405d77439ceb 100644 (file)
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -60,8 +60,9 @@ class servrepository extends plugin
     $display= "";
 
     /* Smarty vars*/
+    $smarty->assign("infoimage",    get_template_path('images/info.png'));
     $smarty->assign("search_image", get_template_path('images/search.png'));
-    $smarty->assign("launchimage",  get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage",  get_template_path('images/launch.png'));
     $smarty->assign("tree_image",   get_template_path('images/tree.png'));
     $smarty->assign("alphabet",     generate_alphabet());
     $smarty->assign("apply",        apply_filter());
@@ -155,23 +156,36 @@ class servrepository extends plugin
       Repository setup dialog handling /END
     */
 
-    $divlist = new divSelectBox("repositories");
+    $divlist = new divList("repositories");
+    $divlist->SetEntriesPerPage(12);
     $divlist->setHeight(400);
+
+    $divlist->setHeader(array(array("string"=>_("Release"),"attach"=>"style='width:80px;'"),
+                              array("string"=>_("Sections")),
+                              array("string"=>_("Options"),"attach"=>"style='border-right:0px;width:69px;'")
+                       )     );
+
     $link   = "<a href='?plug=".$_GET['plug']."&act=open&id=%s'>%s</a>";
     $edit   = "<input type='image' value='%s' name='edit_%s'   src='images/edit.png'>&nbsp;";
     $delete = "<input type='image' value='%s' name='delete_%s' src='images/edittrash.png'>";
    
     foreach($this->repositories as $name => $reps){
+
       $str = " ";
+
+      if(preg_match("/".str_replace("*",".*",$this->regex)."/",$reps['Release'])){
+    
+
       foreach($reps['Sections'] as $sec){
         $str.=$sec." ";  
       }    
   
       $divlist->AddEntry(array(
-                              array("string"=>preg_replace("/%s/",$name,$link)),
+                              array("string"=>preg_replace("/%s/",$name,$link),"attach"=>"style='width:80px;'"),
                               array("string"=>sprintf($link,$name,_("Sections")." :".$str)),
-                              array("string"=>preg_replace("/%s/",$name,$edit.$delete),"attach"=>"style='border-right:0px;'")
+                              array("string"=>preg_replace("/%s/",$name,$edit.$delete),"attach"=>"style='border-right:0px;width:50px;text-align:right;'")
                               ));
+      }
     }
  
     $smarty -> assign("Repositories",$divlist->DrawList());
@@ -200,6 +214,9 @@ class servrepository extends plugin
   function save_object()
   {
     plugin::save_object();
+    if(isset($_POST['regex'])){
+      $this->regex = $_POST['regex'];
+    }
   }
 
 

diff --git a/plugins/admin/systems/servRepository.tpl b/plugins/admin/systems/servRepository.tpl
index 72e3b1b86388df3bd93edf0f927a2aa56380a378..c98e74a14ef8761cb5d9d82a65687ceb84cadd4a 100644 (file)
--- a/plugins/admin/systems/servRepository.tpl
+++ b/plugins/admin/systems/servRepository.tpl
@@ -1,46 +1,50 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
-       <tr>
-               <td style="vertical-align:top;" width="50%">
-   
-                       <div class="contentboxh" style="width:610px; height:20px;">
-                       <p class="contentboxh" style="font-size:12px">
-                               <b>{t}Repositories{/t}</b>
-                       </p>
-                       </div>
-
-                       <div class="contentboxb">
-                               <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-                                       {$Repositories}
-                                       <input type="submit" value="{t}Add{/t}" name="AddRepository">
-                               </p>
-                       </div>
-
-               </td>
-
-               <td style="vertical-align:top;">
-                       <div class="contentboxh" style="height:20px;">
-                       <p class="contentboxh" style="font-size:12px">
-                                       <img src="{$launchimage}" align="right" alt="[F]">
-                                       <b>{t}Filters{/t}</b>
-                               </p>
-                       </div>
-
-                       <div class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-                               <table summary="" style="width:100%;">
-                                       {$alphabet}
-                               </table>
-               
-                               <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-                                       <tr>
-                                               <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>
-                               </table>
-                               {$apply}
-                       </div>
-               </td>
-       </tr>
+<tr>
+  <td style="vertical-align:top;width:600px">
+  <div class="contentboxh">
+    <p class="contentboxh">
+     {t}List of configured repositories.{/t}
+    </p>
+  </div>
+  <div class="contentboxb" style="border-top:1px solid #B0B0B0;">
+{$Repositories}
+    <input type=hidden name="edit_helper">
+  </div>
+  </td>
+  <td style="vertical-align:top;">
+   <div class="contentboxh">
+    <p class="contentboxh"><img src="{$infoimage}" align="right" alt="[i]">{t}Information{/t}</p>
+   </div>
+   <div class="contentboxb" style="padding:0px;margin:0px;" >
+   <p class="contentboxb">
+     {t}This menu allows you to create, delete and edit FAI classes.{/t}
+   </p>
+   </div>
+   <br>
+   <div class="contentboxh">
+    <p class="contentboxh">
+                       <img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}
+       </p>
+   </div>
+   <div class="contentboxb">
+     <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
+      {$alphabet}
+     </table>
+     <table summary=""  style="width:100%;border-top:1px solid #B0B0B0;">
+     <tr>
+     <td>
+     <label for="regex"><img alt="{t}Display objects matching{/t}" src="{$search_image}" align='middle' title='{t}Display objects matching{/t}'/>
+     </td>
+     <td width="99%">
+     <input type='text' name='regex' maxlength='20' style='width:99%' value='{$regex}' id='filter' 
+     title='{t}Regular expression for matching object names{/t}' onChange="mainform.submit()">
+     </td>
+     </tr>
+     </table>
+                         {$apply}
+   </div>
+  </td>
+</tr>
 </table>
+
+<input type="hidden" name="ignore">