diff options
| -rw-r--r-- | includes/sys_menu.php | 41 | ||||
| -rw-r--r-- | public/css/base.css | 24 | ||||
| -rw-r--r-- | public/pic/icons/clock.png | bin | 0 -> 885 bytes | |||
| -rw-r--r-- | public/pic/icons/email.png | bin | 0 -> 572 bytes | |||
| -rw-r--r-- | templates/guest_credits.html | 20 | ||||
| -rw-r--r-- | templates/layout.html | 15 |
6 files changed, 23 insertions, 77 deletions
diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 7eeaa70a..5c69be39 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -73,46 +73,7 @@ function make_navigation_for($name, $pages) { } function make_menu() { - return make_navigation() . make_onlineusers() . make_langselect(); -} - -function make_onlineusers() { - global $privileges, $user; - $html = '<nav class="container online"><h4>Helfer online</h4>'; - - $query = "SELECT UID, Nick, lastLogIn " . "FROM User " . "WHERE (`lastLogIn` > '" . (time() - 60 * 60) . "') " . "ORDER BY lastLogIn DESC"; - $users = sql_select($query); - - if (count($users) > 0) { - $html .= "<ul class=\"content\">"; - - foreach ($users as $online_user) { - if (isset ($user) && $online_user['UID'] == $user['UID']) - continue; - - $html .= "<li>"; - - //if (isset ($user)) - //$html .= DisplayAvatar($online_user['UID']); - - // Show Admin Page - if (in_array("admin_user_edit", $privileges)) { - $html .= '<a href="admin/userChangeNormal.php?enterUID=' . $online_user['UID'] . '&Type=Normal">' . $online_user['Nick'] . '</a>'; - } else { - $html .= $online_user['Nick']; - } - $last_action = time() - $online_user['lastLogIn']; - - $html .= " " . date("i:s", $last_action); - $html .= "</li>\n"; - } - - $html .= "</ul>"; - } else { - $html .= '<p class="content">Nobody...</p>'; - } - $html .= '</nav>'; - return $html; + return make_navigation() . make_langselect(); } function make_langselect() { diff --git a/public/css/base.css b/public/css/base.css index a427dd31..d040f612 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -19,16 +19,8 @@ article, details { float: none; } -footer { - clear: both; - display: block; +.small { font-size: 12px; - text-align: center; - width: 100%; -} - -footer p { - margin: 10px auto; } #logo { @@ -52,11 +44,6 @@ footer p { margin-left: 200px; } -.container.online .content { - max-height: 15em; - overflow: auto; -} - a { color: #000; } @@ -76,6 +63,9 @@ dd { h1, h2, h3, h4 { font-size: 16px; +} + +h1, h4 { padding: 0 4px; } @@ -96,7 +86,11 @@ nav { } #content h2 { - margin-top: 20px; + margin-top: 15px; +} + +#content h2:first-child { + margin-top: 0; } p { diff --git a/public/pic/icons/clock.png b/public/pic/icons/clock.png Binary files differnew file mode 100644 index 00000000..450d6b3a --- /dev/null +++ b/public/pic/icons/clock.png diff --git a/public/pic/icons/email.png b/public/pic/icons/email.png Binary files differnew file mode 100644 index 00000000..3d6d5711 --- /dev/null +++ b/public/pic/icons/email.png diff --git a/templates/guest_credits.html b/templates/guest_credits.html index 61446801..63b6100d 100644 --- a/templates/guest_credits.html +++ b/templates/guest_credits.html @@ -1,18 +1,8 @@ -<h2>The angelsystem has been (re)done by:</h2> -<ul> - <li> - cookie - </li> - <li> - helios - </li> - <li> - msquare - </li> - <li> - jplitza - </li> -</ul> +<h2>Source code</h2> +<p>The original system was written by <a href="https://github.com/cookieBerlin/engelsystem">cookie</a>. It was then completely rewritten and greatly enhanced by <a href="http://notrademark.de/">msquare</a> and <a href="http://helios.planetcyborg.de/">helios</a> of <a href="http://planetcyborg.de">planet cyborg</a> and <a href="http://jplitza.de/">jplitza</a>.</p> + +<h2>Hosting</h2> +<p>The webspace, development platform and domain is currently provided by <a href="https://www.wybt.net/">Would you buy this?</a> (ichdasich).</p> <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> diff --git a/templates/layout.html b/templates/layout.html index f6d19c6f..b5ebce1a 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -23,6 +23,14 @@ <div id="body"> <div id="menu"> %menu% + <nav class="container small"> + <ul> + <li><a href="mailto:erzengel@lists.ccc.de">Contact <img src="pic/icons/email.png" alt="E-Mail"></a></li> + <li><a href="mailto:bugs@engelsystem.de">Bugs / Features <img src="pic/icons/email.png" alt="E-Mail"></a></li> + <li><a href="https://vcs.wybt.net/engelsystem/trac/">Development Platform</a></li> + <li><a href="?p=credits">Credits</a></li> + </ul> + </nav> </div> <div id="content" class="container"> <h1>%title%</h1> @@ -33,13 +41,6 @@ <div class="clear"></div> </div> <footer> - <p> - © copyleft | <a href="mailto:erzengel@lists.ccc.de">Contact</a> - | <a href="mailto:bugs@engelsystem.de">Bugs / Features</a> - | <a href="?p=credits">Credits</a> - <br/> - This is hell. Temporarily. - </p> </footer> </body> </html> |
