From b78e9d01fdcbf9a66336f304000a1b9f123d2099 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 2 Mar 2010 19:56:46 +0000
Subject: [PATCH] Cleaned filter stuff

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15867 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/html/themes/modern/style.css        |  9 +++
 gosa-core/plugins/admin/users/user-filter.tpl | 73 +++++++++----------
 gosa-core/plugins/admin/users/user-list.tpl   |  9 ++-
 3 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index 88de78ade..292f0a7dd 100644
--- a/gosa-core/html/themes/modern/style.css
+++ b/gosa-core/html/themes/modern/style.css
@@ -1167,3 +1167,12 @@ font-weight:normal;
 background-color:#418DD4;                                      
 background-image:none;                                         
 }                       
+
+
+/* Filter */
+
+div.filter {
+  border:1px solid blue;
+}
+
+
diff --git a/gosa-core/plugins/admin/users/user-filter.tpl b/gosa-core/plugins/admin/users/user-filter.tpl
index 227243dcf..a878872f6 100644
--- a/gosa-core/plugins/admin/users/user-filter.tpl
+++ b/gosa-core/plugins/admin/users/user-filter.tpl
@@ -1,40 +1,37 @@
-<div class="contentboxh">
- <p class="contentboxh">
-  <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
- </p>
-</div>
+<div class="filter">
+
+   <h3>Filter
+
+
+  {$TEMPLATES}&nbsp;<LABEL for='TEMPLATES'>{t}Show templates{/t}</LABEL><br>
+  {$FUNCTIONAL}&nbsp;<LABEL for='FUNCTIONAL'>{t}Show functional users{/t}</LABEL><br>
+  {$POSIX}&nbsp;<LABEL for='POSIX'>{t}Show POSIX users{/t}</LABEL><br>
+  {$MAIL}&nbsp;<LABEL for='MAIL'>{t}Show Mail users{/t}</LABEL><br>
+  {$SAMBA}&nbsp;<LABEL for='SAMBA'>{t}Show Samba users{/t}</LABEL><br>
+
+  <hr>
+
+  {$SCOPE}
+
+  <table>
+   <tr>
+    <td>
+     <label for="NAME">
+      <img src="images/lists/search.png" align=middle>&nbsp;Name
+     </label>
+    </td>
+    <td>
+     {$NAME}
+    </td>
+   </tr>
+  </table>
+
+  <table>
+   <tr>
+    <td width="100%" align="right">
+     {$APPLY}
+    </td>
+   </tr>
+  </table>
 
-<div class="contentboxb">
-
-<div style="border-top:1px solid #AAAAAA"></div>
-
-{$TEMPLATES}&nbsp;<LABEL for='TEMPLATES'>{t}Show templates{/t}</LABEL><br>
-{$FUNCTIONAL}&nbsp;<LABEL for='FUNCTIONAL'>{t}Show functional users{/t}</LABEL><br>
-{$POSIX}&nbsp;<LABEL for='POSIX'>{t}Show POSIX users{/t}</LABEL><br>
-{$MAIL}&nbsp;<LABEL for='MAIL'>{t}Show Mail users{/t}</LABEL><br>
-{$SAMBA}&nbsp;<LABEL for='SAMBA'>{t}Show Samba users{/t}</LABEL><br>
-
- <div style="border-top:1px solid #AAAAAA"></div>
- {$SCOPE}
-
- <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td>
-    <label for="NAME">
-     <img src="images/lists/search.png" align=middle>&nbsp;Name
-    </label>
-   </td>
-   <td>
-    {$NAME}
-   </td>
-  </tr>
- </table>
-
- <table summary=""  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td width="100%" align="right">
-    {$APPLY}
-   </td>
-  </tr>
- </table>
 </div>
diff --git a/gosa-core/plugins/admin/users/user-list.tpl b/gosa-core/plugins/admin/users/user-list.tpl
index b1c5e38aa..229b93737 100644
--- a/gosa-core/plugins/admin/users/user-list.tpl
+++ b/gosa-core/plugins/admin/users/user-list.tpl
@@ -5,11 +5,16 @@
   <div class="mainlist-header">
    <p>{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
    <div class="mainlist-nav">
+    <div style='float:right'>Gustav</div>
     <table>
      <tr>
-      <td>{$ROOT}</td><td>{$BACK}</td><td>{$HOME}</td><td>{$RELOAD}</td><td class="left-border">{t}Base{/t} {$BASE}</td><td class="left-border">{$ACTIONS}</td>
+      <td>{$ROOT}</td>
+      <td>{$BACK}</td>
+      <td>{$HOME}</td>
+      <td>{$RELOAD}</td>
+      <td class="left-border">{t}Base{/t} {$BASE}</td>
+      <td class="left-border">{$ACTIONS}</td>
      </tr>
-
     </table>
    </div>
   </div>
-- 
2.30.2