<h2> => </h3>

[gosa.git] / gosa-plugins / goto / addons / goto / goto_import_file.tpl

diff --git a/gosa-plugins/goto/addons/goto/goto_import_file.tpl b/gosa-plugins/goto/addons/goto/goto_import_file.tpl
index c3a1847c8d9391cd725ae297afe5b93e224001e0..5150fbe459d7bbc0081c607faf25740243bfbcc8 100644 (file)
--- a/gosa-plugins/goto/addons/goto/goto_import_file.tpl
+++ b/gosa-plugins/goto/addons/goto/goto_import_file.tpl
@@ -1,23 +1,30 @@
-<h2>{t}Import jobs{/t}</h2>
+<h3>{t}Import jobs{/t}</h3>
+<p>
+{t}You can import a list of jobs into the GOsa job queue. This should be a semicolon seperated list of items in the following format:{/t}
+</p>
+<i>{t}timestamp{/t} ; {t}MAC-address{/t} ; {t}job type{/t} ; {t}object group{/t} [ ; {t}import base{/t} ; {t}full hostname{/t} ; {t}IP-address{/t} ; {t}DHCP group{/t} ]</i>
+<br>
+<br>
+{if !$count}
+{t}Example{/t}:
+<br>
+20080626162556 <b>;</b> 00:0C:29:99:1E:37 <b>;</b> job_trigger_activate_new <b>;</b> goto-client <b>;</b> dc=test,dc=gonicus,dc=de
+<br>
+<br>
+{/if}
 
+<p class="seperator"></p>
+&nbsp;
 <table>
        <tr>    
                <td>
-                       {t}Select the semicolon seperated list to import{/t}
+                       {t}Select list to import{/t}
                </td>
                <td>
                        <input type='file' name='file' value="{t}Browse{/t}">
                        <input type='submit' name='import' value='{t}Upload{/t}'>
                </td>
        </tr>
-       {if  $count}
-       <tr>
-               <td>{t}Start import{/t}</td>
-               <td>
-                       <input type='submit' name='start_import' value='{t}Import{/t}'>
-               </td>
-       </tr>
-       {/if}
 </table>
 
        {if  $count}
@@ -27,7 +34,8 @@
                <div style='width:100%; height:300px; overflow: scroll;'>
                <table cellpadding="3" cellspacing="0" style='width:100%; background-color: #CCCCCC; border: solid 1px #CCCCCC;'>
                        <tr>
-                               <td><b>{t}Mac{/t}</b></td>
+                               <td><b>{t}Timestamp{/t}</b></td>
+                               <td><b>{t}MAC{/t}</b></td>
                                <td><b>{t}Event{/t}</b></td>
                                <td><b>{t}Object group{/t}</b></td>
                                <td><b>{t}Base{/t}</b></td>
@@ -38,6 +46,7 @@
                {foreach from=$info item=item key=key}
                        {if $item.ERROR}
                                <tr style='background-color: #F0BBBB;'>
+                                       <td>{$item.TIMESTAMP}</td>
                                        <td>{$item.MAC}</td>
                                        <td>{$item.HEADER}</td>
                                        <td>{$item.OGROUP}</td>
@@ -55,8 +64,8 @@
                                {else}
                                        <tr class="rowxp1"> 
                                {/if}
-
-                                       <td>{$item.MAC}</td>
+                                       <td>{$item.TIMESTAMP}</td>
+                                       <td style='border-left: solid 1px #BBBBBB;'>{$item.MAC}</td>
                                        <td style='border-left: solid 1px #BBBBBB;'>{$item.HEADER}</td>
                                        <td style='border-left: solid 1px #BBBBBB;'>{$item.OGROUP}</td>
                                        <td style='border-left: solid 1px #BBBBBB;'>{$item.BASE}</td>
@@ -72,6 +81,7 @@
 <br>
 <p class='seperator'></p>
 <div style='text-align:right;width:99%; padding-right:5px; padding-top:5px;'>
-       <input type='submit' name='import_abort' value='{msgPool type=okButton}'>
+       <input type='submit' name='start_import' value='{t}Import{/t}' >&nbsp;
+       <input type='submit' name='import_abort' value='{msgPool type=backButton}'>
 </div>
 <br>