From 27bc0fe2182afafee830bda8b161f67282f631c8 Mon Sep 17 00:00:00 2001
From: root
Date: Tue, 30 Sep 2014 04:39:21 +0200
Subject: fixed bug, added download page, prettified 404 page and general
 design

---
 static/error.webm    | Bin 0 -> 915587 bytes
 static/header.php    |  25 ++++++++++++++++---------
 static/style.min.css |   2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 static/error.webm

(limited to 'static')

diff --git a/static/error.webm b/static/error.webm
new file mode 100644
index 0000000..35eef31
Binary files /dev/null and b/static/error.webm differ
diff --git a/static/header.php b/static/header.php
index d20ddf9..f47d815 100644
--- a/static/header.php
+++ b/static/header.php
@@ -7,15 +7,23 @@
                                         <span class="icon-bar"></span>
                                         <span class="icon-bar"></span>
                                 </button>
-                                <a class="navbar-brand" href="/?page=index" title="Startseite">Home</a>
+                                <a class="navbar-brand" href="/?page=index" title="Startseite"><span class="glyphicon glyphicon-home"></span> Home</a>
+                                <!--a class="navbar-brand" href="/?page=index" title="Startseite">Home</a-->
                         </div>
 <div class="collapse navbar-collapse" id="navbarCollapse">
                                 <ul class="nav navbar-nav navbar-left">
-                                        <li>
-                                                <a href="/?page=liste" title="Liste aller JG-Mitglieder">Adressliste</a>
+                                        <li class="dropdown">
+                                                <a href="/?page=liste" title="Liste aller JG-Mitglieder"><span class="glyphicon glyphicon-th-list"></span> Adressliste <span class="caret"></span></a>
+						<ul class="dropdown-menu" role="menu">
+							<li><a href="/?page=download&task=download&type=plain" title="Download: text/plain">Download als Text</a></li>
+							<li><a href="/?page=download&task=download&type=csv" title="Download: text/csv">Download als CSV</a></li>
+						</ul>
                                         </li>
+						<li>
+                                                	<a href="https://lists.iamfabulous.de/mailman/listinfo/jungegemeinde" target="_blank" title="JG E-Mail Verteiler"><span class="glyphicon glyphicon-envelope"></span> E-Mail Verteiler</a>
+						</li>
                                         <li>
-                                                <a href="https://lists.iamfabulous.de/mailman/listinfo/jungegemeinde" target="_blank" title="JG E-Mail Verteiler">E-Mail Verteiler</a>
+                                                <a href="https://lists.iamfabulous.de/mailman/private/jungegemeinde" target="_blank" title="Archiv der Mailing Liste "><span class="glyphicon glyphicon-send"></span> Mail Archiv</a>
                                         </li>
                                 </ul>
 				<ul class="nav navbar-nav navbar-right">
@@ -23,17 +31,17 @@
 					<?php
 					if ( $user->isLoggedIn() ) {
 					?>
-                                                <a href="/?page=account" title="Manage deinen Account">Account</a>
+                                                <a href="/?page=account" title="Manage deinen Account"><span class="glyphicon glyphicon-user"></span> Account</a>
 					</li>
 					<li>
-						<a href="/?page=logout" title="Beende die Session">Logout</a>
+						<a href="/?page=logout" title="Beende die Session"><span class="glyphicon glyphicon-off"></span> Logout</a>
 					<?php
 					} else  {
 					?>
-                                                <a href="/?page=register&goto=index" title="Registriere dich für unbeschränkten Zugang">Register</a>
+                                                <a href="/?page=register&goto=index" title="Registriere dich für unbeschränkten Zugang"><span class="glyphicon glyphicon-user"></span> Register</a>
 					</li>
 					<li>
-						<a href="/?page=login&goto=index" title="Login">Login</a>
+						<a href="/?page=login&goto=index" title="Login"><span class="glyphicon glyphicon-off"></span> Login</a>
 					<?php
 					}
 					?>
@@ -51,4 +59,3 @@
                         </div>
                 </div>
         </noscript>
-
diff --git a/static/style.min.css b/static/style.min.css
index dc54b0f..52aa281 100644
--- a/static/style.min.css
+++ b/static/style.min.css
@@ -1 +1 @@
-html{position:relative;min-height:100%}body{margin-bottom:60px}a{color:#3083D6}.navbar-default{border-color:#3083D6;background:#3083D6}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a{color:#fff}.footer{border-color:#3083D6;background:#3083D6;color:#fff;position:absolute;bottom:0;width:100%}#copyright-text{color:#fff}.noscript{background-color:red;color:#fff}.table-center{margin:0 auto!important;float:none!important}.disabled{color:#5E5E5E;text-decoration:line-through}
+html{position:relative;min-height:100%}body{margin-bottom:60px}a{color:#3083D6}.navbar-default{border-color:#3083D6;background:#3083D6}.navbar-default .navbar-brand{color:#fff}.navbar-default .navbar-nav>li>a{color:#fff}.footer{border-color:#3083D6;background:#3083D6;color:#fff;position:absolute;bottom:0;width:100%}#copyright-text{color:#fff}.noscript{background-color:#DD5148;color:#fff}.table-center{margin:0 auto!important;float:none!important}.disabled{color:#5E5E5E;text-decoration:line-through}
-- 
cgit v1.2.3