X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcommon%2Fshow_history_master.html;h=4e28b33d8a8b3ecad0e8710fd6c32e8b1c38d6dc;hb=06211d74ea81c20cd935a9f35df45a6f76590692;hp=620b120bc33a92f9f700d150c2b0d50e7fec4ba9;hpb=259775be91430bf760db9f6cc8bcec0f710cf9cf;p=kivitendo-erp.git

diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html
index 620b120bc..4e28b33d8 100644
--- a/templates/webpages/common/show_history_master.html
+++ b/templates/webpages/common/show_history_master.html
@@ -1,25 +1,21 @@
-<form>
-<input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>">
-<input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>">
-</form> 
-<TMPL_IF NAME=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>
+[% USE HTML %]
+[% IF SUCCESS %]
+
+[% 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">
@@ -29,20 +25,7 @@
 			     &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">
-              <TMPL_IF NAME=ITIME>
-                <TMPL_IF NAME=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>
-                <TMPL_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>
-                </TMPL_IF>
-              <TMPL_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>
-              </TMPL_IF>
-            </table>
+           [% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]
           </td>
         </tr>
       </table>
@@ -54,20 +37,7 @@
             &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">
-              <TMPL_IF NAME=NAME>
-                <TMPL_IF NAME=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>
-                <TMPL_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>
-                </TMPL_IF>
-              <TMPL_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>
-              </TMPL_IF>
-            </table>
+           [% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]
           </td>
         </tr>
       </table>
@@ -97,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">
-              <TMPL_IF NAME=TRANS_ID>
-                <TMPL_IF NAME=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>
-                <TMPL_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>
-                </TMPL_IF>
-              <TMPL_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>
-              </TMPL_IF>
-            </table>
+            [% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]
           </td>
         </tr>
       </table>
@@ -122,55 +79,44 @@
            &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" >
-              <TMPL_IF NAME=SNUMBERS>
-                <TMPL_IF NAME=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>
-                <TMPL_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>
-                </TMPL_IF>
-              <TMPL_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>
-              </TMPL_IF>
-            </table>
+            [% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]
           </td>
         </tr>
       </table>
     </th>
 	</tr>
-<TMPL_LOOP NAME=DATEN>
-	<tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+  <tbody>
+[% FOREACH row = DATEN %]
+  <tr class="listrow[% loop.count % 2 %]">
 		<td nowrap>
-			&nbsp;<TMPL_VAR NAME=itime ESCAPE=HTML>&nbsp;
+			&nbsp;[% HTML.escape(row.itime) %]&nbsp;
 		</td>
 		<td nowrap>
-			&nbsp;<TMPL_VAR NAME=name ESCAPE=HTML>&nbsp;
+			&nbsp;[% HTML.escape(row.name) %]&nbsp;
 		</td>
 		<td>
-			&nbsp;<TMPL_VAR NAME=addition ESCAPE=HTML>&nbsp;
+			&nbsp;[% HTML.escape(row.addition) %]&nbsp;
 		</td>
 		<td>
-      &nbsp;<TMPL_VAR NAME=what_done ESCAPE=HTML>&nbsp;
+      &nbsp;[% HTML.escape(row.what_done) %]&nbsp;
     </td>
     <td>
-      &nbsp;<TMPL_VAR NAME=id ESCAPE=HTML>&nbsp;
+      &nbsp;[% HTML.escape(row.id) %]&nbsp;
     </td>
     <td>
-      &nbsp;<TMPL_VAR NAME=snumbers ESCAPE=HTML>&nbsp;
+      &nbsp;[% HTML.escape(row.snumbers) %]&nbsp;
     </td>
-	</tr>	
-</TMPL_LOOP>
+	</tr>
+[% END %]
+</tbody>
 </table>
-<TMPL_ELSE>
+[% ELSE %]
 <b><translate>Keine Suchergebnisse gefunden!</translate></b><br>
-</TMPL_IF>
+[% END %]
 <p>
-<TMPL_IF NAME=NONEWWINDOW>
+[% IF NONEWWINDOW %]
 <input type="button" onclick="javascript:history.back(-1);" value="<translate>back</translate>">
-<TMPL_ELSE>
+[% ELSE %]
 <input type="button" onclick="javascript:window.close();" value="<translate>close</translate>">
-</TMPL_IF>
+[% END %]
 </p>