X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcommon%2Fshow_history_master.html;h=2e8904538418277e4ed00cd84a5d94acc258ae78;hb=0925bc9f366038b578167a1837098ebe837012c1;hp=b02d51e33469f07a11a408984325aa1df57549eb;hpb=bab39fc246bed0c9bb6906032bd47c1d61b8e2ec;p=kivitendo-erp.git

diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html
index b02d51e33..2e8904538 100644
--- a/templates/webpages/common/show_history_master.html
+++ b/templates/webpages/common/show_history_master.html
@@ -4,51 +4,147 @@
 </form> 
 <TMPL_IF NAME=SUCCESS>
 <script type="text/javascript">
-  function orderBy(order) {
-    var desc = 0;
+  function orderBy(order,desc) {
     var reg = /\&order\=(.+)\-\-(\d)$/;
     reg.exec(document.location.href);
     if(RegExp.$1 == order) {
-      if(RegExp.$2 == 0) {
-        document.location.href = document.location.href.substring(0,document.location.href.lastIndexOf("&order=")) + "&order=" + order + "--1";
-      }
-      else{  
-        document.location.href = document.location.href.substring(0,document.location.href.lastIndexOf("&order=")) + "&order=" + order + "--0";
-      }
+      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 + "--0";
+        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 + "--1";
+        document.location.href = document.location.href + "&order=" + order + "--" + desc;
       }
     }
   }
 </script>
-<table>
+<div style="position: absolute; top:10px; left:10px; clip:rect(0px, 700px, 407px, 0px);">
+<table style="width: 700px; height: 360px;">
 	<tr>
-		<th class=listtop>
-			&nbsp;<a href="javascript:orderBy('h.itime');"><translate>Zeitpunkt</translate></a>&nbsp;
+		<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>
-			&nbsp;<a href="javascript:orderBy('emp.name');"><translate>Mitarbeiter</translate></a>&nbsp;
+      <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>
-			&nbsp;<a href="javascript:orderBy('h.addition');"><translate>Aktion</translate></a>&nbsp;
+      <table>
+        <tr>
+          <td>
+			      &nbsp;<translate>Aktion</translate>&nbsp;
+          </td>
+        </tr>
+      </table>
 		</th>
 		<th class=listtop>
-      &nbsp;<a href="javascript:orderBy('h.what_done');"><translate>Zusatz</translate></a>&nbsp;
+      <table>
+        <tr>
+          <td>
+            &nbsp;<translate>Zusatz</translate>&nbsp;
+          </td>
+        </tr>
+      </table>
     </th>
     <th class=listtop>
-      &nbsp;<a href="javascript:orderBy('h.trans_id');"><translate>ID-Nummer</translate></a>&nbsp;
+      <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>
-      &nbsp;<a href="javascript:orderBy('h.snumbers');"><translate>Belegnummer</translate></a>&nbsp;
+      <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="380px" width="580px" style="overflow:auto;">
 <TMPL_LOOP NAME=DATEN>
-	<tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+  <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
 		<td nowrap>
 			&nbsp;<TMPL_VAR NAME=itime ESCAPE=HTML>&nbsp;
 		</td>
@@ -69,7 +165,10 @@
     </td>
 	</tr>	
 </TMPL_LOOP>
+</tbody>
 </table>
+</div>
+<div style="position:absolute; bottom:10px; left:10px;">
 <TMPL_ELSE>
 <b><translate>Keine Suchergebnisse gefunden!</translate></b><br>
 </TMPL_IF>
@@ -80,3 +179,4 @@
 <input type="button" onclick="javascript:window.close();" value="<translate>close</translate>">
 </TMPL_IF>
 </p>
+</div>