Merge branch 'master' of https://vcs.wybt.net/engelsystem/git

includes/pages/admin_user.php

@@ -293,16 +293,15 @@ function admin_user() {
     <a href="' . page_link_to("admin_user") . '&OrderBy=Nick">Nick</a>
     </th>
     <th><a href="' . page_link_to("admin_user") . '&OrderBy=Vorname">Vorname</a> <a href="' . page_link_to("admin_user") . '&OrderBy=Name">Name</a></th>
+    <th><a href="' . page_link_to("admin_user") . '&OrderBy=DECT">DECT</a></th>
     <th><a href="' . page_link_to("admin_user") . '&OrderBy=Alter">Alter</a></th>
-    <th>
-    <a href="' . page_link_to("admin_user") . '&OrderBy=email">E-Mail</a>
-    </th>
-    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Size">Gr&ouml;&szlig;e</a></th>
-    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Gekommen">Gekommen</a></th>
-    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Aktiv">Aktiv</a></th>
-    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Tshirt">T-Shirt</a></th>
+    <th><a href="' . page_link_to("admin_user") . '&OrderBy=email">E-Mail</a></th>
+    <th class="rotate"><div><a href="' . page_link_to("admin_user") . '&OrderBy=Gekommen">Gekommen</a></div></th>
+    <th class="rotate"><div><a href="' . page_link_to("admin_user") . '&OrderBy=Aktiv">Aktiv</a></div></th>
+    <th class="rotate"><div><a href="' . page_link_to("admin_user") . '&OrderBy=Tshirt">T-Shirt</a></div></th>
+    <th class="rotate"><div><a href="' . page_link_to("admin_user") . '&OrderBy=Size">Gr&ouml;&szlig;e</a></div></th>
     <th><a href="' . page_link_to("admin_user") . '&OrderBy=lastLogIn">Last login</a></th>
-    <th>&Auml;nd.</th>
+    <th>Edit</th>
     </tr></thead>';
     $Gekommen = 0;
     $Active = 0;
@@ -340,6 +339,7 @@ function admin_user() {
       else
         $html .= "\t<td>" . mysql_result($Erg, $n, "Nick") . "</td>\n";
       $html .= "\t<td>" . mysql_result($Erg, $n, "Vorname") . " " . mysql_result($Erg, $n, "Name") . "</td>\n";
+      $html .= "\t<td>" . mysql_result($Erg, $n, "DECT") . "</td>\n";
       $html .= "\t<td>" . mysql_result($Erg, $n, "Alter") . "</td>\n";
       $html .= "\t<td>";
       if (strlen(mysql_result($Erg, $n, "email")) > 0)
@@ -347,25 +347,25 @@ function admin_user() {
         mysql_result($Erg, $n, "email") . "</a>";
       $html .= '<div class="hidden">' . $title . '</div>';
       $html .= "</td>\n";
-      $html .= "\t<td>" . mysql_result($Erg, $n, "Size") . "</td>\n";
       $Gekommen += mysql_result($Erg, $n, "Gekommen");
-      $html .= "\t<td>" . mysql_result($Erg, $n, "Gekommen") . "</td>\n";
+      $html .= "\t<td class=\"" . (mysql_result($Erg, $n, "Gekommen") == 1? 'true' : 'false') . "\">" . mysql_result($Erg, $n, "Gekommen") . "</td>\n";
       $Active += mysql_result($Erg, $n, "Aktiv");
-      $html .= "\t<td>" . mysql_result($Erg, $n, "Aktiv") . "</td>\n";
+      $html .= "\t<td class=\"" . (mysql_result($Erg, $n, "Aktiv") == 1? 'true' : 'false') . "\">" . mysql_result($Erg, $n, "Aktiv") . "</td>\n";
       $Tshirt += mysql_result($Erg, $n, "Tshirt");
-      $html .= "\t<td>" . mysql_result($Erg, $n, "Tshirt") . "</td>\n";
+      $html .= "\t<td class=\"" . (mysql_result($Erg, $n, "Tshirt") == 1? 'true' : 'false') . "\">" . mysql_result($Erg, $n, "Tshirt") . "</td>\n";
+      $html .= "\t<td>" . mysql_result($Erg, $n, "Size") . "</td>\n";
       $last_login = mysql_result($Erg, $n, "lastLogIn");
       if($last_login == 0)
         $html .= "<td>never</td>";
       else
-        $html .= "<td>" . date("Y-m-d H:i", $last_login) . "</td>";
+        $html .= "<td>" . date('d.m.&\n\b\s\p;H:i', $last_login) . "</td>";
       $html .= "\t<td>" . '<a href="' . page_link_to("admin_user") . '&id=' . mysql_result($Erg, $n, "UID") . '">Edit</a>' .
           "</td>\n";
       $html .= "</tr>\n";
     }
     $html .= "<tr>" .
-        "<td></td><td></td><td></td><td></td><td></td>" .
-        "<td>$Gekommen</td><td>$Active</td><td>$Tshirt</td><td></td><td></td></tr>\n";
+        "<th>Summe</th><th></th><th></th><th></th><th></th>" .
+        "<th>$Gekommen</th><th>$Active</th><th>$Tshirt</th><th></th><th></th><th></th></tr>\n";
     $html .= "\t</table>\n";
     // Ende Userliste
   }

public/css/base.css

@@ -145,12 +145,39 @@ fieldset p label input {
 
 th {
     background: #f0f0f0;
+    vertical-align: bottom;
 }
 
 td, th {
     border: 1px solid #888;
 }
 
+td.true, td.false {
+	color: transparent;
+}
+
+td.true {
+	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGrSURBVDjLvZPZLkNhFIV75zjvYm7VGFNCqoZUJ+roKUUpjRuqp61Wq0NKDMelGGqOxBSUIBKXWtWGZxAvobr8lWjChRgSF//dv9be+9trCwAI/vIE/26gXmviW5bqnb8yUK028qZjPfoPWEj4Ku5HBspgAz941IXZeze8N1bottSo8BTZviVWrEh546EO03EXpuJOdG63otJbjBKHkEp/Ml6yNYYzpuezWL4s5VMtT8acCMQcb5XL3eJE8VgBlR7BeMGW9Z4yT9y1CeyucuhdTGDxfftaBO7G4L+zg91UocxVmCiy51NpiP3n2treUPujL8xhOjYOzZYsQWANyRYlU4Y9Br6oHd5bDh0bCpSOixJiWx71YY09J5pM/WEbzFcDmHvwwBu2wnikg+lEj4mwBe5bC5h1OUqcwpdC60dxegRmR06TyjCF9G9z+qM2uCJmuMJmaNZaUrCSIi6X+jJIBBYtW5Cge7cd7sgoHDfDaAvKQGAlRZYc6ltJlMxX03UzlaRlBdQrzSCwksLRbOpHUSb7pcsnxCCwngvM2Rm/ugUCi84fycr4l2t8Bb6iqTxSCgNIAAAAAElFTkSuQmCC') no-repeat center center;
+}
+
+td.false {
+	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIhSURBVDjLlZPrThNRFIWJicmJz6BWiYbIkYDEG0JbBiitDQgm0PuFXqSAtKXtpE2hNuoPTXwSnwtExd6w0pl2OtPlrphKLSXhx07OZM769qy19wwAGLhM1ddC184+d18QMzoq3lfsD3LZ7Y3XbE5DL6Atzuyilc5Ciyd7IHVfgNcDYTQ2tvDr5crn6uLSvX+Av2Lk36FFpSVENDe3OxDZu8apO5rROJDLo30+Nlvj5RnTlVNAKs1aCVFr7b4BPn6Cls21AWgEQlz2+Dl1h7IdA+i97A/geP65WhbmrnZZ0GIJpr6OqZqYAd5/gJpKox4Mg7pD2YoC2b0/54rJQuJZdm6Izcgma4TW1WZ0h+y8BfbyJMwBmSxkjw+VObNanp5h/adwGhaTXF4NWbLj9gEONyCmUZmd10pGgf1/vwcgOT3tUQE0DdicwIod2EmSbwsKE1P8QoDkcHPJ5YESjgBJkYQpIEZ2KEB51Y6y3ojvY+P8XEDN7uKS0w0ltA7QGCWHCxSWWpwyaCeLy0BkA7UXyyg8fIzDoWHeBaDN4tQdSvAVdU1Aok+nsNTipIEVnkywo/FHatVkBoIhnFisOBoZxcGtQd4B0GYJNZsDSiAEadUBCkstPtN3Avs2Msa+Dt9XfxoFSNYF/Bh9gP0bOqHLAm2WUF1YQskwrVFYPWkf3h1iXwbvqGfFPSGW9Eah8HSS9fuZDnS32f71m8KFY7xs/QZyu6TH2+2+FAAAAABJRU5ErkJggg==') no-repeat center center;
+}
+
+.rotate {
+	/* this is a hack because the height of the row isn't adjusted automatically */
+	height: 6em;
+}
+
+.rotate div {
+	transform: rotate(270deg);
+	width: 1ex;
+	margin: 0 auto -2px;
+	-webkit-transform: rotate(270deg);
+	padding: 0 3px;
+	white-space: nowrap;
+}
+
 textarea {
 	font-family: inherit;
 	font-size: inherit;

public/css/style11.css

@@ -27,7 +27,7 @@ footer, footer a {
 }
 
 tr:hover > td {
-	background: #f0f0f0;
+	background-color: #f0f0f0;
 }
 
 .selection ul li.heading {

templates/guest_credits.html

@@ -13,3 +13,6 @@
         jplitza
     </li>
 </ul>
+
+<h2>Icons</h2>
+<p>Some icons from the <a href="http://www.famfamfam.com/lab/icons/silk/">famfamfam.com silk iconset</a> have been used. They are licensed under the <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>.</p>