From e6b2d12e93d22cc6d0f6fee095b86544dbc2e488 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 25 Mar 2010 15:11:02 +0000
Subject: [PATCH] Updated rSyslog template

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17296 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../rsyslog/addons/rsyslog/class_rsyslog.inc  |  4 +-
 .../rsyslog/addons/rsyslog/rSyslog.tpl        | 56 ++++++++++---------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
index 0f0cf05b6..fae7feead 100644
--- a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
+++ b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
@@ -138,8 +138,8 @@ class rsyslog extends plugin
     $smarty->assign("limit",    $this->limit);
     $smarty->assign("page",    $this->page);
     $smarty->assign("plug_id", $_GET['plug']);
-    $smarty->assign("downimg", "<img src='images/lists/sort-down.png' class='center' alt='\\/' border='0'>");
-    $smarty->assign("upimg", "<img src='images/lists/sort-up.png' class='center' alt='\\/' border='0'>");
+    $smarty->assign("downimg", image('images/lists/sort-down.png'));
+    $smarty->assign("upimg", image('images/lists/sort-up.png'));
     $smarty->assign("result", $result);
     $smarty->assign("matches", sprintf(_("%s entries match the filter"), $result["count"]));
     if($this->limits[$this->limit] != '-'){
diff --git a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
index 91e9fd217..bd70efa28 100644
--- a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
+++ b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
@@ -4,32 +4,31 @@
   <p>{t}System logs{/t}</p>
 
   <div class="mainlist-nav">
-   <table summary="{t}Filter{/t}" style="width: 100%; table-layout: fixed;" 
+   <table summary="{t}Filter{/t}" style="width: 100%;" 
       id="t_scrolltable" cellpadding="0" cellspacing="0">
     <tr>
-     <td class='listhead' colspan="2">{t}Server{/t}:
+     <td colspan="2" style='width:25%;'>{t}Server{/t}:
       <select name='selected_server' onChange='document.mainform.submit();' size=1>
        {foreach from=$servers item=item key=key}
         <option value='{$key}' {if $key == $selected_server} selected {/if}>{$item.cn}</option>
        {/foreach}
       </select>
      </td>
-     <td class='listhead' colspan="2" >{t}Host{/t}:
+     <td colspan="2" style='width:25%;'>{t}Host{/t}:
       <select name='selected_host' onChange='document.mainform.submit();' size=1>
        {foreach from=$hosts item=item key=key}
         <option value='{$key}' {if $key == $selected_host} selected {/if}>{$item}</option>
        {/foreach}
       </select>
      </td>
-     <td>{t}Severity{/t}:
+     <td colspan="2">{t}Severity{/t}:
       <select name='selected_priority' onChange='document.mainform.submit();' size=1>
        {html_options values=$priorities options=$priorities selected=$selected_priority}
       </select>
      </td>
-     <td>&nbsp;</td>
     </tr>
     <tr>
-     <td class='listhead' style='width:5%'>{t}From{/t}:</td>
+     <td>{t}From{/t}:</td>
      <td>
       <input type="text" id="startTime" name="startTime" class="date" style='width:100px' value="{$startTime}">
       <script type="text/javascript">  
@@ -151,26 +150,26 @@
     <tbody class="listScrollContent listBodyFormat" id="t_nscrollbody">
      {foreach from=$result.entries item=item key=key}
       <tr>
-       <td title='{$item.DeviceReportedTime}' style='width:120px' class='list1'>
+       <td title="{$item.DeviceReportedTime}" style='width:120px' class='list1'>
         {$item.DeviceReportedTime}
        </td>
-       <td title='{$item.FromHost}' class='list1'>
+       <td title="{$item.FromHost}" class='list1'>
         {$item.FromHost}
        </td>
        
-       <td title='{$item.SysLogTag}' class='list1'>
+       <td title="{$item.SysLogTag}" class='list1'>
         {$item.SysLogTag}
        </td>
        
-       <td title='{$item.Facility}' class='list1'>
+       <td title="{$item.Facility}" class='list1'>
         {$item.Facility}
        </td>
        
-       <td title='{$item.Priority}' class='list1'>
+       <td title="{$item.Priority}" class='list1'>
         {$item.Priority}
        </td>
        
-       <td title='{$item.Message}' style="width:400px" class='list1'>
+       <td title="{$item.Message}" style="width:400px" class='list1'>
         <div style='overflow:hidden; width:400px'>
          {$item.Message}
         </div>
@@ -187,20 +186,25 @@
      </tr>
     </tbody>
    </table>
-  </div>
- 
-  <div style='width:40%;float:left;'>
-   {$matches}
-  </div>
-  
-  <div style='width:80px;float:right;'>
-   <select name='limit' onChange='document.mainform.submit();' size=1>
-    {html_options options=$limits selected=$limit}
-   </select>
-  </div>
-  
-  <div style='width:300px;float:left;'>
-   {$page_sel}
+  </div >
+
+  <div class="nlistFooter">
+
+    <div style='width:40%;float:left;'>
+     {$matches}
+    </div>
+   
+    <div style='width:80px;float:right;'>
+     <select name='limit' onChange='document.mainform.submit();' size=1>
+      {html_options options=$limits selected=$limit}
+     </select>
+    </div>
+    
+    <div style='width:300px;float:left;'>
+     {$page_sel}
+    </div>
+    <div class='clear'></div>
   </div>
  {/if}
 </div>
+<br>
-- 
2.30.2