diff --git a/HTML/res/appstyles.css b/HTML/res/appstyles.css index 17238b3..8cda3dc 100644 --- a/HTML/res/appstyles.css +++ b/HTML/res/appstyles.css @@ -22,8 +22,8 @@ .pwrbox td {font: .9rem consolas, monospace; width:30%; padding:0;margin:0;} .container{margin: 10px; - display: flex; - flex-wrap:wrap;} +display: flex; +flex-wrap:wrap;} div label input {margin-right: 100px;} @@ -188,6 +188,9 @@ width:100%; .crselect { height:120px; -overflow: hidden; +margin-top: 0; } - +.selhed +{ + margin: 15px 5px 2px 5px; +} \ No newline at end of file diff --git a/HTML/res/cron.js b/HTML/res/cron.js index eeaa0fe..9d47e65 100644 --- a/HTML/res/cron.js +++ b/HTML/res/cron.js @@ -1,8 +1,8 @@ objects_test = ["scene_1", "scene_2", "scene_3", "scene_4", "scene_5", "scene_6", "scene_7", "scene_8", "scene_9", "scene_10", "scene_11", "scene_12", "scene_13", "scene_14", "scene_15", "scene_16"]; actions_test = ["start", "stop"]; -timarr_test = [{ 'num': 1, 'obj': 2, 'act': 0, 'start': 1000000000, 'cron': '*/2 * * * * *' }, -{ 'num': 2, 'obj': 12, 'act': 1, 'start': 1622222222, 'cron': '6 0 12 * * *' }, -{ 'num': 3, 'obj': 8, 'act': 0, 'start': 1675757575, 'cron': '* * * * * *' }]; +timarr_test = [{ 'num': 1, 'obj': 2, 'act': 0, 'cron': '*/2 * * * * *' }, +{ 'num': 2, 'obj': 12, 'act': 1, 'cron': '6 0 12 * * *' }, +{ 'num': 3, 'obj': 8, 'act': 0, 'cron': '* * * * * *' }]; function savetm(n) { } @@ -89,7 +89,6 @@ function handleSelect(tnum, type) cinp.value = c[0] + " " + c[1] + " " + c[2] + " " + c[3] + " " + c[4] + " " + c[5]; } function deltm(n) { - alert("Delete timer " + n); timarr_test.splice(n - 1, 1); drawtimers(timarr_test); } @@ -101,7 +100,8 @@ function closecron(n) { function setcron(n) { var target = document.getElementById("cronext" + n); var content = ""; - content += (""); + content +=("Seconds:"); + content += (""); content += ("Every Sec"); content += ("Even Sec"); content += ("Odd Sec"); @@ -109,9 +109,10 @@ function setcron(n) { content += ("Every 15 Sec"); content += ("Every 30 Sec"); for (s = 0; s < 60; s++) { content += ("" + s + ""); } - content += (""); + content += (""); - content += (""); + content +=("Minutes:"); + content += (""); content += ("Every Min"); content += ("Even Min"); content += ("Odd Min"); @@ -119,18 +120,20 @@ function setcron(n) { content += ("Every 15 Min"); content += ("Every 30 Min"); for (s = 0; s < 60; s++) { content += ("" + s + ""); } - content += (""); + content += (""); - content += (""); + content +=("Hours:"); + content += (""); content += ("Every Hour"); content += ("Even Hours"); content += ("Odd Hours"); content += ("Every 6 Hours"); content += ("Every 12 Hours"); for (s = 0; s < 24; s++) { content += ("" + s + ""); } - content += (""); + content += (""); - content += (""); + content +=("Days:"); + content += (""); content += ("Every Day"); content += ("Even Days"); content += ("Odd Days"); @@ -138,9 +141,10 @@ function setcron(n) { content += ("Every 10 Days"); content += ("Every 15 Days"); for (s = 0; s < 32; s++) { content += ("" + s + ""); } - content += (""); + content += (""); - content += (""); + content +=("Months:"); + content += (""); content += ("Every Month"); content += ("Even Month"); content += ("Odd Month"); @@ -158,9 +162,10 @@ function setcron(n) { content += ("Oct"); content += ("Nov"); content += ("Dec"); - content += (""); + content += (""); - content += (""); + content +=("Weekdays:"); + content += (""); content += ("Every Weekday"); content += ("Monday-Friday"); content += ("Weekend Days"); @@ -171,10 +176,7 @@ function setcron(n) { content += ("Thu"); content += ("Fri"); content += ("Sat"); - content += (""); - - - content += ("Ready"); + content += (""); var mainbut = document.getElementById("setcronbut"+n); mainbut.innerHTML = "Close editor"; mainbut.onclick = function (){ var target = document.getElementById("cronext"+n); @@ -191,27 +193,28 @@ function drawtimers(tarr) { content += (""); content += (""); - //content +=("Cron string:"); + content +=("Cron:"); content += (""); content += ("Open editor") - content += (""); + /*Extended editor content*/ + content += (""); - content += (""); - content += (""); - for (k = 0; k < actions_test.length; k++) { - var selected = (tarr[i - 1].act == k) ? "selected" : ""; - content += ("" + actions_test[k] + ""); - } - content += (""); - - content += (""); + content +=("Object:"); + content += (""); for (k = 0; k < objects_test.length; k++) { var selected = (tarr[i - 1].obj == k) ? "selected" : ""; content += ("" + objects_test[k] + ""); } content += (""); + content +=("Action:"); + content += (""); + for (k = 0; k < actions_test.length; k++) { + var selected = (tarr[i - 1].act == k) ? "selected" : ""; + content += ("" + actions_test[k] + ""); + } + content += (""); content += ("Save"); content += ("Delete"); diff --git a/HTML/res/styles.css b/HTML/res/styles.css index ccd8d39..5088516 100644 --- a/HTML/res/styles.css +++ b/HTML/res/styles.css @@ -299,7 +299,7 @@ img { input, select, .btn, .lab, textarea { font:.85rem consolas,monospace; padding-left:3px; - background-color:var(--first-color); + background-color:var(--panel-bgr-color); color:var(--text-color); border:1px solid rgba(255, 255, 255, 0.4); border-radius: 5px; @@ -314,6 +314,13 @@ input::-webkit-inner-spin-button { margin: 0; } +select { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + background-color: var(--panel-bgr-color); +} + .btn{min-width:100px; color:var(--text-color);} .btn:active{background-color: var(--accent-color); border:none;} .btn:hover {border:1px solid rgba(255, 255, 255, 0.6);}