Updated rSyslog style

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

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/main.inc b/gosa-plugins/rsyslog/addons/rsyslog/main.inc
index 97944cf8f92a082121a829562671de5dee1da962..5e95b475154a211a699455a6e75ea48458ff5eed 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/main.inc
+++ b/gosa-plugins/rsyslog/addons/rsyslog/main.inc
@@ -46,7 +46,7 @@ if ( $cleanup ){
        $display.= "<input type=\"hidden\" name=\"ignore\">\n";
 
        /* Page header*/
-       $display= print_header(get_template_path('plugins/log/images/plugin.png'), _("System log view")).$display;
+       $display= print_header(get_template_path('plugins/rsyslog/images/plugin.png'), _("System log view")).$display;
 
        /* Store changes  in session */
        session::set('rsyslogTabs',$rsyslogTabs);

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
index b177f3a7b15af3e3afca7ec0d2fa3e41a9daccbb..8aa5bec7655a02d8520db787950797b7d3712de2 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
+++ b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
@@ -17,6 +17,15 @@
         {/foreach}
       </select>
     </td>
+    <td>{t}Priority{/t}:</td>
+    <td>   
+      <select name='selected_priority' onChange='document.mainform.submit();'>
+        {html_options values=$priorities options=$priorities selected=$selected_priority}
+      </select>
+    </td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
     <td>{t}From{/t}:</td>
     <td>
       <input type="text" id="startTime" name="startTime" class="date" style='width:100px' value="{$startTime}">
@@ -27,7 +36,7 @@
         {/literal}
       </script> 
     </td>
-    <td>{t}to{/t}:</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">
@@ -37,20 +46,11 @@
         {/literal}
       </script> 
     </td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td>{t}Priority{/t}:</td>
-    <td>   
-      <select name='selected_priority' onChange='document.mainform.submit();'>
-        {html_options values=$priorities options=$priorities selected=$selected_priority}
-      </select>
-    </td>
     <td>{t}Search{/t}:</td>
-    <td colspan="4">   
+    <td>   
       <input type='text' name='search_for' value='{$search_for}' style='width:250px;'>
     </td>
-    <td><input type='submit' name='search' value="{t}Search{/t}">
+    <td><input type='submit' name='search' value="{t}Search{/t}"></td>
   </tr>
 </table>