diff options
Diffstat (limited to 'static')
| -rw-r--r-- | static/eyecancer.js | 62 | ||||
| -rw-r--r-- | static/eyecancer.min.js | 1 | ||||
| -rwxr-xr-x | static/footer.php | 38 | ||||
| -rw-r--r-- | static/header.php | 3 | ||||
| -rw-r--r-- | static/modal-edit-gallery.php | 2 | ||||
| -rw-r--r-- | static/modal-new-gallery.html | 2 | ||||
| -rw-r--r-- | static/style.css | 2 | ||||
| -rw-r--r-- | static/style.min.css | 2 | ||||
| -rw-r--r-- | static/tablesorter.css | 38 | ||||
| -rw-r--r-- | static/tablesorter.min.css | 1 |
10 files changed, 53 insertions, 98 deletions
diff --git a/static/eyecancer.js b/static/eyecancer.js deleted file mode 100644 index 10c90e0..0000000 --- a/static/eyecancer.js +++ /dev/null @@ -1,62 +0,0 @@ -function randomizeColor(c){ - var bg=document.getElementsByClassName("random-bg"); - for (var i=0; i<bg.length; i++){ - bg[i].style.backgroundColor=c; - bg[i].style.background=c; - bg[i].style.borderColor=c; - } - var f=document.getElementsByClassName("random-font"); - for (var i=0; i<f.length; i++){ - f[i].style.color=c; - } -}; - -function getRandomPosition(pos){ - if(pos == "left"){ - var mul = $(window).width(); - } else if (pos = "top"){ - var mul = $(window).height() - $("nav").height() - $("footer").height(); - } - var pos = Math.floor(Math.random() * mul); - return pos; -} - -function startRandomizer(){ - $("h1").addClass("random-font"); - $("table").addClass("effect-vv"); - $("form").addClass("effect-vv"); - $(".ec").addClass("effect-vv"); - var cancer = ["A","B","C","D","E","F",0,1,2,3,4,5,6,7,8,9]; - var images = ["flare1.png"]; - var imgid = ["fi", "si", "ti", "foi"]; - for ( var i = 0; i<imgid.length; i++){ - $(".wrapper").append("<img class='gen' id='"+imgid[i]+"' src='/static/img/flare1.png'style='visibility:hidden;'/>"); - } - $(".navbar").append("<audio src='/static/chu.mp3' autoplay loop></audio>") - window.setInterval(function () { - $("#gen").remove(); - var newcancer = "#"; - for ( var i = 0; i<6; i++){ - newcancer = newcancer + cancer[Math.floor(Math.random() * cancer.length)]; - } - randomizeColor( newcancer ); - $(".gen").fadeOut(750, function t(){ - for ( var i = 0; i<imgid.length; i++){ - $("#"+imgid[i]).css({"visibility":"visible","position":"absolute","top": getRandomPosition("top") + "px", "left": getRandomPosition("left") + "px"}); - } - $(".gen").fadeToggle(750); - } - ); - $(".effect").effect( "pulsate", 750); - $(".effect").effect( "shake", 750); - $(".effect-vv").effect( "shake", 750); - $(".effect-vv").effect( "pulsate", 750); - }, 1500) -} - -$( document ).ready( function() { - $("#loader").fadeOut(); - $("#loader-bg").delay(1000).fadeOut("slow"); - //window.setTimeout(startRandomizer(),1000); - startRandomizer(); -}); diff --git a/static/eyecancer.min.js b/static/eyecancer.min.js deleted file mode 100644 index 1483787..0000000 --- a/static/eyecancer.min.js +++ /dev/null @@ -1 +0,0 @@ -function randomizeColor(e){var t=document.getElementsByClassName("random-bg");for(var n=0;n<t.length;n++){t[n].style.backgroundColor=e;t[n].style.background=e;t[n].style.borderColor=e}var r=document.getElementsByClassName("random-font");for(var n=0;n<r.length;n++){r[n].style.color=e}}function getRandomPosition(e){if(e=="left"){var t=$(window).width()}else if(e="top"){var t=$(window).height()-$("nav").height()-$("footer").height()}var e=Math.floor(Math.random()*t);return e}function startRandomizer(){$("h1").addClass("random-font");$("table").addClass("effect-vv");$("form").addClass("effect-vv");$(".ec").addClass("effect-vv");var e=["A","B","C","D","E","F",0,1,2,3,4,5,6,7,8,9];var t=["flare1.png"];var n=["fi","si","ti","foi"];for(var r=0;r<n.length;r++){$(".wrapper").append("<img class='gen' id='"+n[r]+"' src='/static/img/flare1.png'style='visibility:hidden;'/>")}$(".navbar").append("<audio src='/static/chu.mp3' autoplay loop></audio>");window.setInterval(function(){$("#gen").remove();var t="#";for(var r=0;r<6;r++){t=t+e[Math.floor(Math.random()*e.length)]}randomizeColor(t);$(".gen").fadeOut(750,function(){for(var t=0;t<n.length;t++){$("#"+n[t]).css({visibility:"visible",position:"absolute",top:getRandomPosition("top")+"px",left:getRandomPosition("left")+"px"})}$(".gen").fadeToggle(750)});$(".effect").effect("pulsate",750);$(".effect").effect("shake",750);$(".effect-vv").effect("shake",750);$(".effect-vv").effect("pulsate",750)},1500)}$(document).ready(function(){$("#loader").fadeOut();$("#loader-bg").delay(1e3).fadeOut("slow");startRandomizer()}) diff --git a/static/footer.php b/static/footer.php index 06d4295..7c05018 100755 --- a/static/footer.php +++ b/static/footer.php @@ -1,13 +1,14 @@ </div> - <div class="footer random-bg"> + <div class="footer random-bg "> <div class="container"> - <div class="row"> + <!--div class="row"> <div class="col-md-6"> - <p class="effect">v4.1 Built with <a href="http://getbootstrap.com" title="Twitter Bootstrap" class="footer-a">Bootstrap</a>, - <a href="http://redis.io" title="Redis.io" class="footer-a">Redis</a> and <a href="http://mariadb.org" title="MariaDB.org" class="footer-a">MariaDB</a>.</p> + <p class="effect"><span class="pull-right"><span class="fa fa-copyright"></span> Copyright 2014 <a class="footer-a" href="//www.moehm.org/" target="_blank" title="www.moehm.org">Maximilian Möhring</a></span></p> </div> - <div class="col-md-6"> - <p class="effect"><span class="pull-right"><span class="fa fa-copyright"></span> Copyright 2014 <a class="footer-a" href="//www.moehm.org/" target="_blank">Maximilian Möhring</a></span></p> + </div--> + <div class="row"> + <div class="text-right"> + <p class="effect">v4.2 <span class="fa fa-copyright"> Copyright 2014 <a class="footer-a" id="copyright-text" href="//www.moehm.org/" target="_blank" title="https://www.moehm.org/">Maximilian Möhring</a></p> </div> </div> </div> @@ -15,27 +16,4 @@ <script src="//code.jquery.com/jquery-1.11.1.min.js"></script> <script src="//code.jquery.com/ui/1.11.1/jquery-ui.min.js" defer></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" defer></script> - <?php include("static/piwik.html"); ?> - <script>function loadFancy(){ - document.getElementById("loader").style.visibility="visible"; - document.getElementById("loader-bg").style.visibility="visible"; - - var eyecancer = document.createElement("script"); - eyecancer.type = "text/javascript"; - eyecancer.src = "/static/eyecancer.min.js"; - document.getElementsByTagName("head")[0].appendChild(eyecancer); - - return false; - }</script> -<script> - $('#btn-send').click(function () { - var btn = $(this) - btn.button('loading') - $.ajax().always(function () { - }); - }); - $('.close').click(function () { - $('#btn-send').button('reset'); - }); -</script> - + <script src="/js/functions.js" defer></script> diff --git a/static/header.php b/static/header.php index 1fabb3f..69a9c4b 100644 --- a/static/header.php +++ b/static/header.php @@ -19,7 +19,8 @@ <a href="/?page=liste" title="Liste aller JG-Mitglieder"><span class="glyphicon glyphicon-th-list"></span> Adressen <span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> <li><a href="/?page=download&task=download&type=plain" title="Download: text/plain"><span class="glyphicon glyphicon-download"></span> Download als Text</a></li> - <li><a href="/?page=download&task=download&type=csv" title="Download: text/csv"><span class="glyphicon glyphicon-arrow-down"></span> Download als CSV</a></li> + <!--li><a href="/?page=download&task=download&type=csv" title="Download: text/csv"><span class="glyphicon glyphicon-arrow-down"></span> Download als CSV</a></li--> + <li><a href="/?page=download&task=download&type=csv" title="Download: text/csv"><span class="fa fa-download"></span> Download als CSV</a></li> </ul> </li> <li> diff --git a/static/modal-edit-gallery.php b/static/modal-edit-gallery.php index e5a2c48..d16e580 100644 --- a/static/modal-edit-gallery.php +++ b/static/modal-edit-gallery.php @@ -14,7 +14,7 @@ <div class="form-group"> <label class="col-md-4 control-label" for="name">Galerie Name</label> <div class="col-md-6"> - <input id="name" name="name" value="<?php echo htmlentities($row["name"]); ?>" placeholder="Wie heißt die neue Foto Galerie? (Pflicht)" class="form-control input-md" required="" type="text"> + <input id="name" name="name" value="<?php echo htmlentities($row["name"]); ?>" placeholder="Wie heißt die Fotogalerie? (Pflicht)" class="form-control input-md" required="" type="text"> </div> </div> diff --git a/static/modal-new-gallery.html b/static/modal-new-gallery.html index 88e0f18..3d0b3f9 100644 --- a/static/modal-new-gallery.html +++ b/static/modal-new-gallery.html @@ -14,7 +14,7 @@ <div class="form-group"> <label class="col-md-4 control-label" for="name">Galerie Name</label> <div class="col-md-6"> - <input id="name" name="name" placeholder="Wie heißt die neue Foto Galerie? (Pflicht)" class="form-control input-md" required="" type="text"> + <input id="name" name="name" placeholder="Wie heißt die neue Fotogalerie? (Pflicht)" class="form-control input-md" required="" type="text"> </div> </div> diff --git a/static/style.css b/static/style.css index 62f0c50..f6319cc 100644 --- a/static/style.css +++ b/static/style.css @@ -99,7 +99,7 @@ a { position: absolute; left: 50%; top: 50%; - background-image: url(/static/img/loading.gif); + background-image: url(/img/loading.gif); background-repeat: no-repeat; background-position: center; -webkit-background-size: cover; diff --git a/static/style.min.css b/static/style.min.css index 9fca366..138e391 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%}.footer-a{color:#fff}.footer-a:hover{color:#fff;text-decoration:underline}.noscript{background-color:#dd5148;color:#fff}.table-center{margin:0 auto!important;float:none!important}.disabled{color:#5E5E5E;text-decoration:line-through}.random-bg,.random-font{transition:all 1500ms}.wrapper{overflow:hidden}#loader-bg{position:fixed;background-color:#fefefe;z-index:99999;height:100%;width:100%;overflow:hidden!important;visibility:hidden}#loader{width:40px;height:40px;position:absolute;left:50%;top:50%;background-image:url(/static/img/loading.gif);background-repeat:no-repeat;background-position:center;-webkit-background-size:cover;background-size:cover;margin:-20px 0 0 -20px;visibility:hidden}.fa-external-link{font-size:.5em}.a-black{color:#000}.a-restore:hover{text-decoration:none}.desc{color:#666}.font-small{font-size:.8em}.nav-tabs{margin:20px} +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%}.footer-a{color:#fff}.footer-a:hover{color:#fff;text-decoration:underline}.noscript{background-color:#dd5148;color:#fff}.table-center{margin:0 auto!important;float:none!important}.disabled{color:#5E5E5E;text-decoration:line-through}.random-bg,.random-font{transition:all 1500ms}.wrapper{overflow:hidden}#loader-bg{position:fixed;background-color:#fefefe;z-index:99999;height:100%;width:100%;overflow:hidden!important;visibility:hidden}#loader{width:40px;height:40px;position:absolute;left:50%;top:50%;background-repeat:no-repeat;background-position:center;-webkit-background-size:cover;background-size:cover;margin:-20px 0 0 -20px;visibility:hidden}.fa-external-link{font-size:.5em}.a-black{color:#000}.a-restore:hover{text-decoration:none}.desc{color:#666}.font-small{font-size:.8em}.nav-tabs{margin:20px} diff --git a/static/tablesorter.css b/static/tablesorter.css new file mode 100644 index 0000000..ac9dfda --- /dev/null +++ b/static/tablesorter.css @@ -0,0 +1,38 @@ +th { + padding-left: 20px !important; +} +th:hover { + background-color: #f9f9f9; + transition: 1s; +} + +.tablesorter-default { + width: 100%; +} + +.tablesorter-default .header, +.tablesorter-default .tablesorter-header { + background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); + background-position: center left; + background-repeat: no-repeat; + cursor: pointer; + white-space: normal; + padding: 4px 20px 0px 4px; +} +.tablesorter-default thead .headerSortUp, +.tablesorter-default thead .tablesorter-headerSortUp, +.tablesorter-default thead .tablesorter-headerAsc { + background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); + border-bottom: #3083D6 2px solid; +} +.tablesorter-default thead .headerSortDown, +.tablesorter-default thead .tablesorter-headerSortDown, +.tablesorter-default thead .tablesorter-headerDesc { + background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); + border-bottom: #3083D6 2px solid; +} +.tablesorter-default thead .sorter-false { + background-image: none; + cursor: default; + padding: 4px; +} diff --git a/static/tablesorter.min.css b/static/tablesorter.min.css new file mode 100644 index 0000000..e42578e --- /dev/null +++ b/static/tablesorter.min.css @@ -0,0 +1 @@ +th{padding-left:20px!important}th:hover{background-color:#f9f9f9;transition:1s}.tablesorter-default{width:100%}.tablesorter-default .header,.tablesorter-default .tablesorter-header{background-image:url(data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==);background-position:center left;background-repeat:no-repeat;cursor:pointer;white-space:normal;padding:4px 20px 0 4px}.tablesorter-default thead .headerSortUp,.tablesorter-default thead .tablesorter-headerAsc,.tablesorter-default thead .tablesorter-headerSortUp{background-image:url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7);border-bottom:#3083D6 2px solid}.tablesorter-default thead .headerSortDown,.tablesorter-default thead .tablesorter-headerDesc,.tablesorter-default thead .tablesorter-headerSortDown{background-image:url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7);border-bottom:#3083D6 2px solid}.tablesorter-default thead .sorter-false{background-image:none;cursor:default;padding:4px} |
