X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fcommon%2Fshow_history_master.html;h=da0eed6ce9c5e6adbdc93c3c1a829113f5e0fe5c;hb=116f40a3c1a4773be9b57a535cc164d74d3171b5;hp=0fae25ea874a361a7fa36936f017cb9464f3f568;hpb=2a2a0763aaced0b072aacc542a81e08f53824981;p=kivitendo-erp.git

diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html
index 0fae25ea8..da0eed6ce 100644
--- a/templates/webpages/common/show_history_master.html
+++ b/templates/webpages/common/show_history_master.html
@@ -1,46 +1,178 @@
 <form>
-<input type="hidden" name="path" value="<TMPL_VAR NAME=path ESCAPE=HTML>">
 <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>
-<table>
+<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>
+<table style="table-layout: fixed;">
 	<tr>
-		<th class=listtop>
-			<translate>Zeitpunkt</translate>
+		<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;
+          </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>
+          </td>
+        </tr>
+      </table>
 		</th>
 		<th class=listtop>
-			<translate>Mitarbeiter</translate>
+      <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">
+              <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>
+          </td>
+        </tr>
+      </table>
 		</th>
 		<th class=listtop>
-			<translate>Vorgang</translate>
+      <table>
+        <tr>
+          <td>
+			      &nbsp;<translate>Aktion</translate>&nbsp;
+          </td>
+        </tr>
+      </table>
 		</th>
 		<th class=listtop>
-			<translate>Zusatz</translate>
-		</th>
+      <table>
+        <tr>
+          <td>
+            &nbsp;<translate>Zusatz</translate>&nbsp;
+          </td>
+        </tr>
+      </table>
+    </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>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>
+          </td>
+        </tr>
+      </table>
+    </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>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>
+          </td>
+        </tr>
+      </table>
+    </th>
 	</tr>
+  <tbody height="400" style="overflow: auto;">
 <TMPL_LOOP NAME=DATEN>
-	<tr>
-		<td>
-			<TMPL_VAR NAME=itime ESCAPE=HTML>
+  <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+		<td nowrap>
+			&nbsp;<TMPL_VAR NAME=itime ESCAPE=HTML>&nbsp;
 		</td>
-		<td>
-			<TMPL_VAR NAME=name ESCAPE=HTML>
+		<td nowrap>
+			&nbsp;<TMPL_VAR NAME=name ESCAPE=HTML>&nbsp;
 		</td>
 		<td>
-			<TMPL_VAR NAME=addition ESCAPE=HTML>
+			&nbsp;<TMPL_VAR NAME=addition ESCAPE=HTML>&nbsp;
 		</td>
 		<td>
-			<TMPL_VAR NAME=what_done ESCAPE=HTML>
-		</td>
+      &nbsp;<TMPL_VAR NAME=what_done ESCAPE=HTML>&nbsp;
+    </td>
+    <td>
+      &nbsp;<TMPL_VAR NAME=id ESCAPE=HTML>&nbsp;
+    </td>
+    <td>
+      &nbsp;<TMPL_VAR NAME=snumbers ESCAPE=HTML>&nbsp;
+    </td>
 	</tr>	
 </TMPL_LOOP>
+</tbody>
 </table>
 <TMPL_ELSE>
 <b><translate>Keine Suchergebnisse gefunden!</translate></b><br>
 </TMPL_IF>
+<p>
 <TMPL_IF NAME=NONEWWINDOW>
-<a href="javascript:history.back(-1);"><translate>back</translate></a>
+<input type="button" onclick="javascript:history.back(-1);" value="<translate>back</translate>">
 <TMPL_ELSE>
-<a href="javascript:window.close();"><translate>close</translate></a>
+<input type="button" onclick="javascript:window.close();" value="<translate>close</translate>">
 </TMPL_IF>
+</p>