From 0d3952498c829e4db7845b9a4bff27c40ed40e2a Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 16 Aug 2013 16:34:56 +0300 Subject: [PATCH] added working schedule --- static/css/base-site.css | 12 +++++- static/css/jquery.timepicker.css | 69 ++++++++++++++++++++++++++++++ static/css/ui.css | 4 ++ static/js/base-site.js | 17 +++++++- static/js/jquery.timepicker.min.js | 1 + static/js/ui.js | 30 ++++++++++++- templates/base-site.html | 61 +++++++++++++++++++++++++- templates/base.html | 4 ++ 8 files changed, 193 insertions(+), 5 deletions(-) create mode 100755 static/css/jquery.timepicker.css create mode 100644 static/js/jquery.timepicker.min.js diff --git a/static/css/base-site.css b/static/css/base-site.css index 9e05412..6d92e45 100644 --- a/static/css/base-site.css +++ b/static/css/base-site.css @@ -27,9 +27,12 @@ /* layout */ +html { + font-family: 'Maven Pro'; +} + div.page, div.header-container { - font-family: 'Maven Pro'; position: relative; min-width: 1000px; max-width: 1580px; @@ -78,6 +81,7 @@ div.page-container.stretched { div.settings { background-color: #313131; position: absolute; + z-index: 1; top: 0px; left: 0px; width: 0px; @@ -140,7 +144,7 @@ span.settings-item-label { span.settings-item-unit { font-size: 0.6em; - padding-left: 5px; + padding: 0px 0.2em; } div.settings-item-separator { @@ -174,6 +178,10 @@ div.check-box.on.section div.check-box-button { background-color: #3498db; } +input[type=text].working-schedule.number { + width: 50px; +} + /* media queries */ diff --git a/static/css/jquery.timepicker.css b/static/css/jquery.timepicker.css new file mode 100755 index 0000000..ad4665d --- /dev/null +++ b/static/css/jquery.timepicker.css @@ -0,0 +1,69 @@ + +.ui-timepicker-wrapper { + overflow-y: auto; + height: 150px; + width: 6.5em; + background: #414141; + border: 1px solid #515151; + -webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2); + -moz-box-shadow:0 5px 10px rgba(0,0,0,0.2); + box-shadow:0 5px 10px rgba(0,0,0,0.2); + outline: none; + z-index: 10001; + margin: 0; +} + +.ui-timepicker-wrapper.ui-timepicker-with-duration { + width: 11em; +} + +.ui-timepicker-list { + margin: 0; + padding: 0; + list-style: none; +} + +.ui-timepicker-duration { + margin-left: 5px; color: #888; +} + +.ui-timepicker-list:hover .ui-timepicker-duration { + color: #888; +} + +.ui-timepicker-list li { + padding: 3px 0 3px 5px; + cursor: pointer; + white-space: nowrap; + color: white; + list-style: none; + font-size: 0.8em; + margin: 0; +} + +.ui-timepicker-list:hover .ui-timepicker-selected { + background: #aaa; color: black; +} + +li.ui-timepicker-selected, +.ui-timepicker-list li:hover, +.ui-timepicker-list .ui-timepicker-selected:hover { + background: #1980EC; color: #fff; +} + +li.ui-timepicker-selected .ui-timepicker-duration, +.ui-timepicker-list li:hover .ui-timepicker-duration { + color: #ccc; +} + +.ui-timepicker-list li.ui-timepicker-disabled, +.ui-timepicker-list li.ui-timepicker-disabled:hover, +.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled { + color: #888; + cursor: default; +} + +.ui-timepicker-list li.ui-timepicker-disabled:hover, +.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled { + background: #f2f2f2; +} diff --git a/static/css/ui.css b/static/css/ui.css index 61ea310..78bb79f 100644 --- a/static/css/ui.css +++ b/static/css/ui.css @@ -107,6 +107,10 @@ input[type=password].error { background-repeat: no-repeat; } +input[type=text].time { + width: 75px; +} + /* combo box */ diff --git a/static/js/base-site.js b/static/js/base-site.js index ba57deb..3cff20d 100644 --- a/static/js/base-site.js +++ b/static/js/base-site.js @@ -36,6 +36,21 @@ function initUI() { makeNumberValidator($('#gapEntry'), 1, 86400, false, false); makeNumberValidator($('#preCaptureEntry'), 0, 100, false, false); makeNumberValidator($('#postCaptureEntry'), 0, 100, false, false); + + makeTimeValidator($('#mondayFrom')); + makeTimeValidator($('#mondayTo')) + makeTimeValidator($('#tuesdayFrom')); + makeTimeValidator($('#tuesdayTo')) + makeTimeValidator($('#wednesdayFrom')); + makeTimeValidator($('#wednesdayTo')) + makeTimeValidator($('#thursdayFrom')); + makeTimeValidator($('#thursdayTo')) + makeTimeValidator($('#fridayFrom')); + makeTimeValidator($('#fridayTo')) + makeTimeValidator($('#saturdayFrom')); + makeTimeValidator($('#saturdayTo')) + makeTimeValidator($('#sundayFrom')); + makeTimeValidator($('#sundayTo')) } $(document).ready(function () { @@ -50,7 +65,7 @@ $(document).ready(function () { $('div.page-container').addClass('stretched'); $('div.settings-top-bar').addClass('open'); } - }); + }).click(); initUI(); }); diff --git a/static/js/jquery.timepicker.min.js b/static/js/jquery.timepicker.min.js new file mode 100644 index 0000000..72b6b11 --- /dev/null +++ b/static/js/jquery.timepicker.min.js @@ -0,0 +1 @@ +!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){function b(a){if(a.minTime&&(a.minTime=s(a.minTime)),a.maxTime&&(a.maxTime=s(a.maxTime)),a.durationTime&&"function"!=typeof a.durationTime&&(a.durationTime=s(a.durationTime)),a.disableTimeRanges.length>0){for(var b in a.disableTimeRanges)a.disableTimeRanges[b]=[s(a.disableTimeRanges[b][0]),s(a.disableTimeRanges[b][1])];a.disableTimeRanges=a.disableTimeRanges.sort(function(a,b){return a[0]-b[0]})}return a}function c(b){var c=b.data("timepicker-settings"),d=b.data("timepicker-list");d&&d.length&&(d.remove(),b.data("timepicker-list",!1)),d=a("