From 2e685ef9dd028c93dfc8075f5f6baf79140708df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 17 Oct 2017 20:50:34 +0200 Subject: [PATCH] Refactored in more files, and fixed issues with panel markup --- server/public/assets/css/style.css | 4 +- server/public/assets/js/frontpage.js | 14 +- server/public/layouts/remote.handlebars | 32 +- .../public/partials/channel/chat.handlebars | 2 - .../public/partials/channel/header.handlebars | 28 +- .../public/partials/channel/panel.handlebars | 779 ++++++++---------- .../partials/channel/playlist.handlebars | 2 - server/public/partials/contact.handlebars | 40 +- .../partials/frontpage/header.handlebars | 26 +- server/public/partials/modal/about.handlebars | 21 + .../public/partials/remote/header.handlebars | 26 +- server/public/partials/spinner.handlebars | 47 ++ 12 files changed, 444 insertions(+), 577 deletions(-) create mode 100644 server/public/partials/modal/about.handlebars create mode 100644 server/public/partials/spinner.handlebars diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css index bff25894..c8a7a5ca 100755 --- a/server/public/assets/css/style.css +++ b/server/public/assets/css/style.css @@ -789,7 +789,7 @@ hide mdi-action-visibility mdi-action-visibility-off /* INDEX PAGE */ -#zicon{ +.zicon{ height: 64px; transition: padding 1s ease; } @@ -2422,7 +2422,7 @@ nav ul li:hover, nav ul li.active { } - #zicon{ + .zicon{ height:100%; } /*.list-remove{ diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js index 1160bbd3..36e53924 100755 --- a/server/public/assets/js/frontpage.js +++ b/server/public/assets/js/frontpage.js @@ -395,7 +395,7 @@ function initfp() { if(window.location.hostname == "fb.zoff.me") { $("footer").addClass("hide"); } - + channel_list = $("#channel-list-container").clone().html(); if(window.location.hostname != "fb.zoff.me") share_link_modifier_frontpage(); @@ -457,16 +457,18 @@ function initfp() { } var pad = 0; - document.getElementById("zicon").addEventListener("click", function(){ - pad+=10; - document.getElementById("zicon").style.paddingLeft = pad+"%"; - if(pad >= 100) + + $(".zicon").on("click", function(e) { + e.preventDefault(); + + pad += 10; + $(".zicon").css("padding-left", pad + "vh"); + if(pad >= 80) window.location.href = 'http://etys.no'; }); if(!Helper.mobilecheck() && Frontpage.winter) { $(".mega").prepend('
'); - //Frontpage.start_snowfall(); } if(Helper.mobilecheck()){ diff --git a/server/public/layouts/remote.handlebars b/server/public/layouts/remote.handlebars index 3ab69f89..e914db10 100644 --- a/server/public/layouts/remote.handlebars +++ b/server/public/layouts/remote.handlebars @@ -1,18 +1,18 @@ {{> remote/header}} -
-
-

Remote Controller

-
-
- {{> remote/input}} - {{> remote/buttons}} - {{> remote/volume}} -
+
+
+

Remote Controller

+
+
+ {{> remote/input}} + {{> remote/buttons}} + {{> remote/volume}} +
-
- Here you can control another Zoff player from any device. -
- To find the ID of your player, click the Conf menu icon on the top right of the player page, then "Remote Control". -
You can either scan the QR code or type the ID manually. -
-
+
+ Here you can control another Zoff player from any device. +
+ To find the ID of your player, click the Conf menu icon on the top right of the player page, then "Remote Control". +
You can either scan the QR code or type the ID manually. +
+
diff --git a/server/public/partials/channel/chat.handlebars b/server/public/partials/channel/chat.handlebars index 0ed03347..dd014150 100644 --- a/server/public/partials/channel/chat.handlebars +++ b/server/public/partials/channel/chat.handlebars @@ -3,7 +3,6 @@
    • diff --git a/server/public/partials/channel/header.handlebars b/server/public/partials/channel/header.handlebars index a1f3f201..0aea7cf1 100644 --- a/server/public/partials/channel/header.handlebars +++ b/server/public/partials/channel/header.handlebars @@ -2,15 +2,12 @@
    + -
  • - Skip - -
  • + + Skip + +
    +
    • + + + -
  • - Song length - -
  • + + Song length + +
    +
    • + + + -
  • - Type - -
  • + + Type + +
    +
    • + + + -
  • - Frontpage - -
  • + + Frontpage + +
    +
    • + + + -
  • - After play - -
  • + + After play + +
    +
    • -
  • - Channel password - -
    +
    +
    • +
  • + + Channel password + +
    +
    • -
  • - Change password -
    • -
  • - Delete all songs -
    • - - - - - - -
  • - -
    • -
  • - -
    • - -
  • - -
    • + + + + + +
  • + +
    • +
  • + +
    • -
  • -