X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcommon%2Fshow_history_master.html;h=5847496614fa2c2d4dc40591c205f9ea04e1adb1;hb=e0d7849f5e65cf957bbec56d23336fd55e5cd987;hp=f86ce1f8b61f2e84c7c03a57529cf1a5d9cfd0da;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git

diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html
index f86ce1f8b..584749661 100644
--- a/templates/webpages/common/show_history_master.html
+++ b/templates/webpages/common/show_history_master.html
@@ -1,85 +1,57 @@
 [% USE HTML %]
 [% IF SUCCESS %]
-<script type="text/javascript">
-  function orderBy(order,desc) {
-    var reg = /\&order\=(.+)\-\-(\d)$/;
-    reg.exec(document.location.href);
-    if(RegExp.$1 == order) {
-      document.location.href = document.location.href.substring(0,document.location.href.lastIndexOf("&order=")) + "&order=" + order + "--" + desc;
-    }
-    else {
-      if(reg.test(document.location.href)) {
-        document.location.href = document.location.href.substring(0,document.location.href.lastIndexOf("&order=")) + "&order=" + order + "--" + desc;
-      }
-      else {
-        document.location.href = document.location.href + "&order=" + order + "--" + desc;
-      }
-    }
-  }
-</script>
-<div style="position: absolute; top:10px; left:10px; clip:rect(0px, 700px, 407px, 0px);">
-<table style="width: 700px; height: 360px;">
-	<tr>
-		<th class="listtop">
+
+[% BLOCK column_header %]
+            <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
+             [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
+               <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
+             [% ELSE %]
+               <tr><td><a href="[% callback %]&order=[% column %]--0" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
+             [% END %]
+             [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
+               <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
+             [% ELSE %]
+               <tr><td><a href="[% callback %]&order=[% column %]--1" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
+             [% END %]
+            </table>
+[% END %]
+
+<table>
+  <tr>
+    <th class="listtop">
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
-			     &nbsp;<translate>Zeitpunkt</translate>&nbsp;
+           &nbsp;<translate>Zeitpunkt</translate>&nbsp;
           </td>
           <td valign="top">
-            <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-              [% IF ITIME %]
-                [% IF ITIMEBY %]
-                  <tr><td><a href="javascript:orderBy('h.itime',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-                  <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                [% ELSE %]
-                  <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
-                  <tr><td><a href="javascript:orderBy('h.itime',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                [% END %]
-              [% ELSE %]
-                <tr><td><a href="javascript:orderBy('h.itime',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-                <tr><td><a href="javascript:orderBy('h.itime',1);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              [% END %]
-            </table>
+           [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
           </td>
         </tr>
       </table>
-		</th>
-		<th class=listtop>
+    </th>
+    <th class=listtop>
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
             &nbsp;<translate>Mitarbeiter</translate>&nbsp;
           </td>
           <td valign="top">
-            <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-              [% IF NAME %]
-                [% IF NAMEBY %]
-                  <tr><td height="0" width="0"><a href="javascript:orderBy('emp.name',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-                  <tr><td height="0" width="0"><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                [% ELSE %]
-                  <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
-                  <tr><td><a href="javascript:orderBy('emp.name',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                [% END %]
-              [% ELSE %]
-                <tr><td><a href="javascript:orderBy('emp.name',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-                <tr><td><a href="javascript:orderBy('emp.name',1);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              [% END %]
-            </table>
+           [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
           </td>
         </tr>
       </table>
-		</th>
-		<th class=listtop>
+    </th>
+    <th class=listtop>
       <table>
         <tr>
           <td>
-			      &nbsp;<translate>Aktion</translate>&nbsp;
+            &nbsp;<translate>Aktion</translate>&nbsp;
           </td>
         </tr>
       </table>
-		</th>
-		<th class=listtop>
+    </th>
+    <th class=listtop>
       <table>
         <tr>
           <td>
@@ -95,20 +67,7 @@
            &nbsp;<translate>ID-Nummer</translate>&nbsp;
           </td>
           <td valign="top">
-            <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-              [% IF TRANS_ID %]
-                [% IF TRANS_IDBY %]
-                  <tr><td height="0" width="0"><a href="javascript:orderBy('h.trans_id',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-                  <tr><td height="0" width="0"><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                [% ELSE %]
-                  <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
-                  <tr><td><a href="javascript:orderBy('h.trans_id',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                [% END %]
-              [% ELSE %]
-                <tr><td><a href="javascript:orderBy('h.trans_id',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-                <tr><td><a href="javascript:orderBy('h.trans_id',1);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              [% END %]
-            </table>
+            [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
           </td>
         </tr>
       </table>
@@ -120,38 +79,25 @@
            &nbsp;<translate>Belegnummer</translate>&nbsp;
           </td>
           <td valign="top">
-            <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0" >
-              [% IF SNUMBERS %]
-                [% IF SNUMBERSBY %]
-                  <tr><td height="0" width="0"><a href="javascript:orderBy('h.snumbers',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-                  <tr><td height="0" width="0"><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                [% ELSE %]
-                  <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
-                  <tr><td><a href="javascript:orderBy('h.snumbers',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                [% END %]
-              [% ELSE %]
-                <tr><td><a href="javascript:orderBy('h.snumbers',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
-                <tr><td><a href="javascript:orderBy('h.snumbers',1);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              [% END %]
-            </table>
+            [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
           </td>
         </tr>
       </table>
     </th>
-	</tr>
-  <tbody height="380px" width="580px" style="overflow:auto;">
+  </tr>
+  <tbody>
 [% FOREACH row = DATEN %]
   <tr class="listrow[% loop.count % 2 %]">
-		<td nowrap>
-			&nbsp;[% HTML.escape(row.itime) %]&nbsp;
-		</td>
-		<td nowrap>
-			&nbsp;[% HTML.escape(row.name) %]&nbsp;
-		</td>
-		<td>
-			&nbsp;[% HTML.escape(row.addition) %]&nbsp;
-		</td>
-		<td>
+    <td nowrap>
+      &nbsp;[% HTML.escape(row.itime) %]&nbsp;
+    </td>
+    <td nowrap>
+      &nbsp;[% HTML.escape(row.name) %]&nbsp;
+    </td>
+    <td>
+      &nbsp;[% HTML.escape(row.addition) %]&nbsp;
+    </td>
+    <td>
       &nbsp;[% HTML.escape(row.what_done) %]&nbsp;
     </td>
     <td>
@@ -160,12 +106,10 @@
     <td>
       &nbsp;[% HTML.escape(row.snumbers) %]&nbsp;
     </td>
-	</tr>
+  </tr>
 [% END %]
 </tbody>
 </table>
-</div>
-<div style="position:absolute; bottom:10px; left:10px;">
 [% ELSE %]
 <b><translate>Keine Suchergebnisse gefunden!</translate></b><br>
 [% END %]
@@ -176,4 +120,3 @@
 <input type="button" onclick="javascript:window.close();" value="<translate>close</translate>">
 [% END %]
 </p>
-</div>