diff --git a/README.MD b/README.MD index aadd988..b9ea556 100644 --- a/README.MD +++ b/README.MD @@ -3,6 +3,7 @@ # ToDo - [P] Endpoint docs - [ ] Better WS frames -- [ ] Diffrent time picker for countdown selection +- [X] Diffrent time picker for countdown selection - [X] Deprecate old UI -- [X] Proper 404 page \ No newline at end of file +- [X] Proper 404 page +- [ ] Countdown to time \ No newline at end of file diff --git a/static/css/mainStyle.css b/static/css/mainStyle.css index e72f03b..2ae1f08 100644 --- a/static/css/mainStyle.css +++ b/static/css/mainStyle.css @@ -117,4 +117,13 @@ pre { .hidden { display: none !important; +} + +.trans { + transition: .5s +} + +.helperTip { + opacity: 0.8; + font-size: small; } \ No newline at end of file diff --git a/static/js/interface.js b/static/js/interface.js index 35a7843..638c1a1 100644 --- a/static/js/interface.js +++ b/static/js/interface.js @@ -228,14 +228,11 @@ $(function () { // Presets $(".pres").click(function (event) { currentTime = parseInt(event.currentTarget.value) - const times = msToTime(currentTime) - $("#timerHoursV")[0].innerHTML = times[3]; - $("#timerMinuteV")[0].innerHTML = times[2]; - $("#timerSecondsV")[0].innerHTML = times[1]; + $("#customValue").data("durationPicker").setValue(currentTime/1000) }) - $(".goTimer").click(function (event) { + $(".goTimer").on("click", function (event) { event.currentTarget.innerHTML = '
' setTimeout(function () { event.currentTarget.innerHTML = 'Go' @@ -477,4 +474,32 @@ function saveOption(path, callback) { xmlHttp.onloadend = function (event) { callback(event, xmlHttp) } -} \ No newline at end of file +} + +navStatus = true +function openNav() { + document.getElementById("navbarToggleExternalContent").style.width = "250px"; + document.getElementById("navbarToggleExternalContent").style.opacity = "1"; + document.getElementById("navbarToggleExternalContent").style.display = "block"; + document.getElementById("navbarToggleExternalContent").style.zIndex = 999999; + document.getElementById("pageCont").style.marginLeft = "0px"; + navStatus = true + } + + function closeNav() { + document.getElementById("navbarToggleExternalContent").style.width = "0px"; + document.getElementById("navbarToggleExternalContent").style.opacity = "0"; + document.getElementById("navbarToggleExternalContent").style.display = "none"; + document.getElementById("navbarToggleExternalContent").style.zIndex = -999999; + document.getElementById("pageCont").style.marginLeft = "0"; + navStatus = false + } + + function toogleNav(){ + if(navStatus){ + closeNav() + }else{ + openNav() + } + + } \ No newline at end of file diff --git a/templates/newAdminPanel.html b/templates/newAdminPanel.html index ffc7f28..001c4ed 100644 --- a/templates/newAdminPanel.html +++ b/templates/newAdminPanel.html @@ -32,7 +32,8 @@
-
+
- + +
+ +
@@ -103,11 +111,26 @@
-

Mode

+

Mode + +

@@ -151,72 +174,13 @@


- - - - -
- - -
- - - -
- -
-
-
-


-

Timer / Messaging

-
-
-
-

H

-
- 0
- -
- -
-

M

-
- 0
- -
- -
-

S

-
- 0
- -
-
- -
-
-
- -
- -
+

Messaging + +

+ + +
-
+


+

Timer

+
+ + + + +
+ + + + + + + + + + + +
+
+ + + +
+ + +
+
+
+ + + + +