From 254ca59c59591e56abe89e07a640894e7e906554 Mon Sep 17 00:00:00 2001
From: Robert Hofer <robert.hofer@technikum-wien.at>
Date: Fri, 20 Feb 2015 16:48:15 +0100
Subject: [PATCH] tablesorter from submodule

---
 .gitmodules                           |   3 +
 skin/vilesci.css                      |  29 +++++
 submodules/tablesorter                |   1 +
 vilesci/statistik/filter_overview.php | 165 ++++++++++++++++----------
 4 files changed, 134 insertions(+), 64 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 submodules/tablesorter

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..d9fbd832e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "submodules/tablesorter"]
+	path = submodules/tablesorter
+	url = git@github.com:christianbach/tablesorter.git
diff --git a/skin/vilesci.css b/skin/vilesci.css
index 322eddeac..847f9b113 100644
--- a/skin/vilesci.css
+++ b/skin/vilesci.css
@@ -598,3 +598,32 @@ option.inactive
 {
 	text-decoration:line-through;
 }
+
+html.reports, html.reports body {
+	height: 100%;
+}
+
+html.reports .icons strong {
+	font-size: 26px;
+	vertical-align: middle;
+}
+
+html.reports .icons img {
+	width: 48px;
+	vertical-align: middle;
+}
+
+#rp_main {
+	width: 100%;
+	border: 0;
+	height: 85%;
+}
+
+img.mini-icon {
+	width: 15px;
+	vertical-align: middle;
+}
+
+td.overview-id {
+	text-align: right;
+}
diff --git a/submodules/tablesorter b/submodules/tablesorter
new file mode 160000
index 000000000..b70ba2498
--- /dev/null
+++ b/submodules/tablesorter
@@ -0,0 +1 @@
+Subproject commit b70ba2498dd23d9d97605ff386cdd67ff6bd9140
diff --git a/vilesci/statistik/filter_overview.php b/vilesci/statistik/filter_overview.php
index 63a84c33a..5cc37de8a 100644
--- a/vilesci/statistik/filter_overview.php
+++ b/vilesci/statistik/filter_overview.php
@@ -22,8 +22,6 @@ require_once('../../include/functions.inc.php');
 require_once('../../include/filter.class.php');
 require_once('../../include/benutzerberechtigung.class.php');
 
-$nl="\n";
-
 if (!$db = new basis_db())
 	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
 
@@ -45,74 +43,113 @@ if(isset($_POST['action']) && $_POST['action']=='delete' && isset($_POST['filter
 $filter = new filter();
 if (!$filter->loadAll())
     die($filter->errormsg);
-
-//$htmlstr = "<table class='liste sortable'>\n";
-$htmlstr = "<form name='formular'><input type='hidden' name='check' value=''></form><table class='tablesorter' id='t1'>\n";
-$htmlstr .= "   <thead><tr>\n";
-$htmlstr .= '    <th onmouseup="document.formular.check.value=0">ID</th>
-		<th title="Kurzbezeichnung des Filters">KurzBz</th>
-		<th>ValueName</th>
-		<th>Show Value</th>
-		<th>Type</th>
-		<th>HTMLAttributes</th>
-		<th>SQL</th>
-		<th>Action</th>';
-		
-$htmlstr .= "   </tr></thead><tbody>\n";
-$i = 0;
-foreach ($filter->result as $filter)
-{
-    //$htmlstr .= "   <tr class='liste". ($i%2) ."'>\n";
-	$htmlstr .= "   <tr>\n";
-	$htmlstr .= "       <td align='right'><a href='filter_details.php?filter_id=".$filter->filter_id."' target='frame_filter_details'>".$filter->filter_id." </a>
-						<a href='filter_vorschau.php?filter_id=".$filter->filter_id."' target='_blank'>
-							<img src='../../skin/images/x-office-presentation.png' height='15px'/>
-						</a>
-						</td>\n";
-	$htmlstr .= "       <td><a href='filter_details.php?filter_id=".$filter->filter_id."' target='frame_filter_details'>".$filter->kurzbz."</a></td>\n";
-	$htmlstr .= "       <td>".$db->convert_html_chars($filter->valuename)."</td>\n";
-	$htmlstr .= "       <td>".($filter->showvalue?'Ja':'Nein')."</td>\n";
-	$htmlstr .= "       <td>".$db->convert_html_chars($filter->type)."</td>\n";
-	$htmlstr .= "       <td>".$db->convert_html_chars($filter->htmlattr)."</td>\n";
-	$htmlstr .= "       <td>".$db->convert_html_chars(substr($filter->sql,0,32))."...</td>\n";
-	$htmlstr .=	'		<td><form action="'.$_SERVER['PHP_SELF'].'" style="display: inline" name="form_'.$filter->filter_id.'" method="POST"><input type="hidden" name="filter_id" value="'.$filter->filter_id.'"><input type="hidden" name="action" value="delete"/><a href="#Loeschen" onclick="ConfirmDelete('.$filter->filter_id.');">Delete</a></form></td>';
-	$htmlstr .= "   </tr>\n";
-	$i++;
-}
-$htmlstr .= "</tbody></table>\n";
-
-
 ?>
 <html>
-<head>
-	<title>Filter &Uuml;bersicht</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
-	<script type="text/javascript" src="../../include/js/jquery.js"></script>
-	<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
-	<script language="JavaScript" type="text/javascript">
-	$(document).ready(function() 
-			{ 
+	<head>
+		<title>Filter Übersicht</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+		<script type="text/javascript" src="../../include/js/jquery.min.1.11.1.js"></script>
+		<script type="text/javascript" src="../../submodules/tablesorter/jquery.tablesorter.min.js"></script>
+		<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
+		<script language="JavaScript" type="text/javascript">
+
+			$(function() {
 				$("#t1").tablesorter(
 				{
 					sortList: [[2,0]],
 					widgets: ["zebra"]
-				}); 
+				});
 			});
-	function ConfirmDelete(filter_id)
-	{
-		if(confirm("Wollen Sie diesen Filter wirklich löschen?"))
-		{
-			document.forms['form_'+filter_id].submit();
-		}
-	}
-	</script>
-</head>
 
-<body>
-<a href="filter_details.php" target="frame_filter_details">Neuer Filter</a>
-<?php 
-    echo $htmlstr;
-?>
-</body>
+			function ConfirmDelete(filter_id)
+			{
+				if(confirm("Wollen Sie diesen Filter wirklich löschen?"))
+				{
+					document.forms['form_'+filter_id].submit();
+				}
+			}
+		</script>
+	</head>
+
+	<body>
+		<a href="filter_details.php" target="frame_filter_details">Neuer Filter</a>
+
+		<form name="formular">
+			<input type="hidden" name="check" value="">
+		</form>
+		<table class="tablesorter" id="t1">
+			<thead>
+				<tr>
+					<th onmouseup="document.formular.check.value=0">
+						ID
+					</th>
+					<th title="Kurzbezeichnung des Filters">
+						KurzBz
+					</th>
+					<th>
+						ValueName
+					</th>
+					<th>
+						Show Value
+					</th>
+					<th>
+						Type
+					</th>
+					<th>
+						HTMLAttributes
+					</th>
+					<th>
+						SQL
+					</th>
+					<th>
+						Action
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<?php foreach ($filter->result as $filter): ?>
+					<tr>
+						<td class="overview-id">
+							<a href="filter_details.php?filter_id=<?php echo $filter->filter_id ?>" target="frame_filter_details">
+								<?php echo $filter->filter_id ?>
+							</a>
+							<a href="filter_vorschau.php?filter_id=<?php echo $filter->filter_id ?>" target="_blank">
+								<img src="../../skin/images/x-office-presentation.png" class="mini-icon" />
+							</a>
+						</td>
+						<td>
+							<a href="filter_details.php?filter_id=<?php echo $filter->filter_id ?>" target="frame_filter_details">
+								<?php echo $filter->kurzbz ?>
+							</a>
+						</td>
+						<td>
+							<?php echo $db->convert_html_chars($filter->valuename) ?>
+						</td>
+						<td>
+							<?php echo $filter->showvalue ? 'Ja' : 'Nein' ?>
+						</td>
+						<td>
+							<?php echo $db->convert_html_chars($filter->type) ?>
+						</td>
+						<td>
+							<?php echo $db->convert_html_chars($filter->htmlattr) ?>
+						</td>
+						<td>
+							<?php echo $db->convert_html_chars(substr($filter->sql,0,32)) ?>...
+						</td>
+						<td>
+							<form action="<?php echo basename(__FILE__) ?>" name="form_<?php echo $filter->filter_id ?>" method="POST">
+								<input type="hidden" name="filter_id" value="<?php echo $filter->filter_id ?>">
+								<input type="hidden" name="action" value="delete" />
+								<a href="#Loeschen" onclick="ConfirmDelete(<?php echo $filter->filter_id ?>);">
+									Delete
+								</a>
+							</form>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+	</body>
 </html>