Updated rSyslog template

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

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/main.inc b/gosa-plugins/rsyslog/addons/rsyslog/main.inc
index 03ac0f231a2c949a8e3ac554509eeef3ffc656a6..37793a5b33dcd7d370f290a5f0d8b4b9742ca94e 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/main.inc
+++ b/gosa-plugins/rsyslog/addons/rsyslog/main.inc
@@ -45,9 +45,6 @@ if ( $cleanup ){
        $display= $rsyslogObject->execute ();
        $display.= "<input type=\"hidden\" name=\"ignore\">\n";
 
-       /* Page header*/
-       $display= print_header(get_template_path('plugins/rsyslog/images/plugin.png'), _("System logs")).$display;
-
        /* Store changes  in session */
        session::set('rsyslogObject',$rsyslogObject);
 }

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
index eb118ac56c67177dc763150d0e64c640de785113..91e9fd217fb46434933daf026b8613de6cbe6fd1 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
+++ b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
@@ -1,146 +1,206 @@
-<div class="contentboxh">
- <p class="contentboxh">{image path="images/launch.png" align="right"}{t}Filter{/t}
-</p>
-</div>
-<div class="contentboxb" style="border-top:1px solid #B0B0B0; padding:0px;">
-<table summary="{t}Filter{/t}" class="contentboxb" border=0>
-  <tr>
-    <td>{image path="plugins/rsyslog/images/server.png"}&nbsp;{t}Server{/t}:
-</td>
-    <td width="20%">
+
+<div id="mainlist">
+ <div class="mainlist-header">
+  <p>{t}System logs{/t}</p>
+
+  <div class="mainlist-nav">
+   <table summary="{t}Filter{/t}" style="width: 100%; table-layout: fixed;" 
+      id="t_scrolltable" cellpadding="0" cellspacing="0">
+    <tr>
+     <td class='listhead' colspan="2">{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}
+       {foreach from=$servers item=item key=key}
+        <option value='{$key}' {if $key == $selected_server} selected {/if}>{$item.cn}</option>
+       {/foreach}
       </select>
-    </td>
-    <td>{image path="plugins/rsyslog/images/workstation.png"}&nbsp;{t}Host{/t}:
-</td>
-    <td width="20%">
+     </td>
+     <td class='listhead' colspan="2" >{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}
+       {foreach from=$hosts item=item key=key}
+        <option value='{$key}' {if $key == $selected_host} selected {/if}>{$item}</option>
+       {/foreach}
       </select>
-    </td>
-    <td>{image path="images/small_warning.png"}&nbsp;{t}Severity{/t}:
-</td>
-    <td>   
+     </td>
+     <td>{t}Severity{/t}:
       <select name='selected_priority' onChange='document.mainform.submit();' size=1>
-        {html_options values=$priorities options=$priorities selected=$selected_priority}
+       {html_options values=$priorities options=$priorities selected=$selected_priority}
       </select>
-    </td>
-    <td width="">&nbsp;</td>
-  </tr>
-  <tr>
-    <td>{image path="plugins/rsyslog/images/clock.png"}&nbsp;{t}From{/t}:
-</td>
-    <td>
+     </td>
+     <td>&nbsp;</td>
+    </tr>
+    <tr>
+     <td class='listhead' style='width:5%'>{t}From{/t}:</td>
+     <td>
       <input type="text" id="startTime" name="startTime" class="date" style='width:100px' value="{$startTime}">
-      <script type="text/javascript">
-        {literal}
-        var datepicker  = new DatePicker({ relative : 'startTime', language : '{/literal}{$lang}{literal}', keepFieldEmpty : true,
-           enableCloseEffect : false, enableShowEffect : false });
-        {/literal}
-      </script> 
-    </td>
-    <td>{t}till{/t}:</td>
-    <td>
+      <script type="text/javascript">  
+       {literal}
+        var datepicker  = new DatePicker(
+         { 
+          relative : 'startTime', 
+          language : '{/literal}{$lang}{literal}', 
+          keepFieldEmpty : true,           
+          enableCloseEffect : false, 
+          enableShowEffect : false 
+         });
+       {/literal}
+      </script>
+     </td>
+     <td>{t}till{/t}:</td>
+     <td>
       <input type="text" id="stopTime" name="stopTime" class="date" style='width:100px' value="{$stopTime}">
-      <script type="text/javascript">
-        {literal}
-        var datepicker  = new DatePicker({ relative : 'stopTime', language : '{/literal}{$lang}{literal}', keepFieldEmpty : true,
-           enableCloseEffect : false, enableShowEffect : false });
-        {/literal}
-      </script> 
-    </td>
-    <td>{image path="images/lists/search.png"}&nbsp;{t}Search{/t}:
-</td>
-    <td>   
+      <script type="text/javascript">  
+       {literal}
+        var datepicker  = new DatePicker(
+         { 
+          relative : 'stopTime', 
+          language : '{/literal}{$lang}{literal}', 
+          keepFieldEmpty : true,           
+          enableCloseEffect : false, 
+          enableShowEffect : false 
+         });
+       {/literal}
+      </script>
+     </td>
+     <td>{t}Search{/t}:
       <input type='text' name='search_for' value='{$search_for}' style='width:250px;'>
-    </td>
-    <td><button type='submit' name='search'>{t}Search{/t}</button>
-</td>
-  </tr>
-</table>
-</div>
-
-{if $result.status != 'ok'}
-  <b>{t}Error{/t}: &nbsp;{$result.status}</b><br>
-  {$result.error}<br>
-{else}
+     </td>
+     <td>
+      <button type='submit' name='search'>{t}Search{/t}</button>
+     </td>
+    </tr>
+   </table>
+  </div>
+ </div>
 
+ {if $result.status != 'ok'}
+  <b>{t}Error{/t}: &nbsp;{$result.status}</b>
+  <br>
+  {$result.error}
   <br>
-  <table summary="{t}Entry list{/t}" style="width:100%;background-color: #B0B0B0;" cellspacing=1 cellpadding=2>
-    <tr style="background-color: #E8E8E8; height:26px; font-weight:bold">
-      <td>
-        <a href='?plug={$plug_id}&amp;sort_value=DeviceReportedTime'>{t}Date{/t}
-          {if $sort_value=="DeviceReportedTime"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
-        </a>
+
+ {else}
+
+  <div class="listContainer" id="d_scrollbody" style="min-height: 475px; height: 444px;">
+
+   <table summary="{t}Entry list{/t}" style="width:100%;" cellpadding="0" cellspacing="0">
+    <thead class="fixedListHeader listHeaderFormat">
+     <tr>
+      <td class='listheader'>
+       <a href='?plug={$plug_id}&amp;sort_value=DeviceReportedTime'>{t}Date{/t}</a>      
+       {if $sort_value=="DeviceReportedTime"}
+        {if $sort_type=="DESC"}
+         {$downimg}
+         {else}
+         {$upimg}
+        {/if}
+       {/if}
       </td>
-      <td>
-        <a href='?plug={$plug_id}&amp;sort_value=FromHost'>{t}Source{/t}
-          {if $sort_value=="FromHost"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
-        </a>
+      <td  class='listheader'>
+       <a href='?plug={$plug_id}&amp;sort_value=FromHost'>{t}Source{/t}</a>
+       {if $sort_value=="FromHost"}
+        {if $sort_type=="DESC"}
+         {$downimg}
+         {else}
+         {$upimg}
+        {/if}
+       {/if}
       </td>
-      <td>
-        <a href='?plug={$plug_id}&amp;sort_value=SysLogTag'>{t}Header{/t}
-          {if $sort_value=="SysLogTag"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
-        </a>
+      <td class='listheader'>
+       <a href='?plug={$plug_id}&amp;sort_value=SysLogTag'>{t}Header{/t}</a>
+       {if $sort_value=="SysLogTag"}
+        {if $sort_type=="DESC"}
+         {$downimg}
+         {else}
+         {$upimg}
+        {/if}
+       {/if}
       </td>
-      <td>
-        <a href='?plug={$plug_id}&amp;sort_value=Facility'>{t}Facility{/t}
-          {if $sort_value=="Facility"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
-        </a>
+      <td class='listheader'>
+       <a href='?plug={$plug_id}&amp;sort_value=Facility'>{t}Facility{/t}</a>
+       {if $sort_value=="Facility"}
+        {if $sort_type=="DESC"}
+         {$downimg}
+         {else}
+         {$upimg}
+        {/if}
+       {/if}
       </td>
-      <td>
-        <a href='?plug={$plug_id}&amp;sort_value=Priority'>{t}Severity{/t}
-          {if $sort_value=="Priority"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
-        </a>
+      <td class='listheader'>
+       <a href='?plug={$plug_id}&amp;sort_value=Priority'>{t}Severity{/t}</a>
+       {if $sort_value=="Priority"}
+        {if $sort_type=="DESC"}
+         {$downimg}
+         {else}
+         {$upimg}
+        {/if}
+       {/if}
       </td>
-      <td>
-        <a href='?plug={$plug_id}&amp;sort_value=Message'>{t}Message{/t}
-          {if $sort_value=="Message"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
-        </a>
+      <td class='listheader'>
+       <a href='?plug={$plug_id}&amp;sort_value=Message'>{t}Message{/t}</a>
+       {if $sort_value=="Message"}
+        {if $sort_type=="DESC"}
+         {$downimg}
+         {else}
+         {$upimg}
+        {/if}
+       {/if}
       </td>
-    </tr>
-    {foreach from=$result.entries item=item key=key}
-
-    {if ($key%2)} 
-    <tr style='background-color: #ECECEC;'>
-    {else}
-    <tr style='background-color: #F5F5F5;'>
-    {/if}
-      <td title='{$item.DeviceReportedTime}' style='width:120px'>
+     </tr>
+    </thead>
+  
+    <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'>
         {$item.DeviceReportedTime}
-      </td>
-      <td title='{$item.FromHost}'>
+       </td>
+       <td title='{$item.FromHost}' class='list1'>
         {$item.FromHost}
-      </td>
-      <td title='{$item.SysLogTag}'>
+       </td>
+       
+       <td title='{$item.SysLogTag}' class='list1'>
         {$item.SysLogTag}
-      </td>
-      <td title='{$item.Facility}'>
+       </td>
+       
+       <td title='{$item.Facility}' class='list1'>
         {$item.Facility}
-      </td>
-      <td title='{$item.Priority}'>
+       </td>
+       
+       <td title='{$item.Priority}' class='list1'>
         {$item.Priority}
-      </td>
-      <td title='{$item.Message}' style="width:400px">
-        <div style='overflow:hidden; width:400px'><nobr>{$item.Message}</nobr></div>
-      </td>
-    </tr>
-    {/foreach}
-  </table>
-  {if !$result.count == 0}
-  <hr>
-  {/if}
-  <div style='width:40%;float:left;'>{$matches}</div>
+       </td>
+       
+       <td title='{$item.Message}' style="width:400px" class='list1'>
+        <div style='overflow:hidden; width:400px'>
+         {$item.Message}
+        </div>
+       </td>
+      </tr>
+     {/foreach}
+     <tr>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+      <td class="list0">&nbsp;</td>
+     </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>
+   <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>
-{/if}
-
+  
+  <div style='width:300px;float:left;'>
+   {$page_sel}
+  </div>
+ {/if}
+</div>