Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Make scheduler more flexible

Schedules can now be set for any aribtary group of days of the week.

Sorry about the css; I couldnt work out where the un-minified version
lived.
  • Loading branch information...
commit 2da37016854afc816dbdd3be60bbf59f413c2c02 1 parent b73570f
Lucas Parry authored
18 interfaces/Classic/templates/config_scheduling.tmpl
@@ -31,16 +31,14 @@ $T('hour'):<br>
31 31 <!--#end for#-->
32 32 </select>
33 33 <br>$T('sch-frequency'): <br>
34   -<select name="dayofweek">
35   -<option value="*" selected>$T('daily')
36   -<option value="1">$T('monday')
37   -<option value="2">$T('tuesday')
38   -<option value="3">$T('wednesday')
39   -<option value="4">$T('thursday')
40   -<option value="5">$T('friday')
41   -<option value="6">$T('saturday')
42   -<option value="7">$T('sunday')
43   -</select>
  34 +<input type="checkbox" name="daysofweek" value="1">$T('monday')<br/>
  35 +<input type="checkbox" name="daysofweek" value="2">$T('tuesday')<br/>
  36 +<input type="checkbox" name="daysofweek" value="3">$T('wednesday')<br/>
  37 +<input type="checkbox" name="daysofweek" value="4">$T('thursday')<br/>
  38 +<input type="checkbox" name="daysofweek" value="5">$T('friday')<br/>
  39 +<input type="checkbox" name="daysofweek" value="6">$T('saturday')<br/>
  40 +<input type="checkbox" name="daysofweek" value="7">$T('sunday')<br/>
  41 +
44 42 <br>$T('sch-action'):<br>
45 43 <select name="action">
46 44 <!--#for $action in $actions#-->
21 interfaces/Config/templates/config_scheduling.tmpl
@@ -34,17 +34,16 @@ else:
34 34 </select>
35 35 </div>
36 36 <div class="field-pair">
37   - <label class="config" for="dayofweek">$T('sch-frequency')</label>
38   - <select name="dayofweek" id="dayofweek">
39   - <option value="*" selected="selected">$T('daily')</option>
40   - <option value="1">$T('monday')</option>
41   - <option value="2">$T('tuesday')</option>
42   - <option value="3">$T('wednesday')</option>
43   - <option value="4">$T('thursday')</option>
44   - <option value="5">$T('friday')</option>
45   - <option value="6">$T('saturday')</option>
46   - <option value="7">$T('sunday')</option>
47   - </select>
  37 + <label class="config" for="daysofweek">$T('sch-frequency')</label>
  38 + <div class="checkbox-days">
  39 + <p><input type="checkbox" name="daysofweek" value="1"><label>$T('monday')</label></p>
  40 + <p><input type="checkbox" name="daysofweek" value="2"><label>$T('tuesday')</label></p>
  41 + <p><input type="checkbox" name="daysofweek" value="3"><label>$T('wednesday')</label></p>
  42 + <p><input type="checkbox" name="daysofweek" value="4"><label>$T('thursday')</label></p>
  43 + <p><input type="checkbox" name="daysofweek" value="5"><label>$T('friday')</label></p>
  44 + <p><input type="checkbox" name="daysofweek" value="6"><label>$T('saturday')</label></p>
  45 + <p><input type="checkbox" name="daysofweek" value="7"><label>$T('sunday')</label></p>
  46 + </div>
48 47 </div>
49 48 <div class="field-pair alt">
50 49 <label class="config" for="action">$T('sch-action')</label>
6 interfaces/Config/templates/staticcfg/css/style.css
@@ -8,4 +8,8 @@
8 8 * BEGIN jquery.qtip.css
9 9 */.ui-tooltip,.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:280px;min-width:50px;font-size:10.5px;line-height:12px}.ui-tooltip-fluid{display:block;visibility:hidden;position:static!important;float:left!important}.ui-tooltip-content{position:relative;padding:5px 9px;overflow:hidden;border:1px solid #000001;text-align:left;word-wrap:break-word;overflow:hidden}.ui-tooltip-titlebar{position:relative;min-height:14px;padding:5px 35px 5px 10px;overflow:hidden;border:1px solid #000001;border-width:1px 1px 0;font-weight:bold}.ui-tooltip-titlebar+.ui-tooltip-content{border-top-width:0!important}/*! Default close button class */.ui-tooltip-titlebar .ui-state-default{position:absolute;right:4px;top:50%;margin-top:-9px;cursor:pointer;outline:medium none;border-width:1px;border-style:solid}* html .ui-tooltip-titlebar .ui-state-default{top:16px}.ui-tooltip-titlebar .ui-icon,.ui-tooltip-icon .ui-icon{display:block;text-indent:-1000em}.ui-tooltip-icon,.ui-tooltip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.ui-tooltip-icon .ui-icon{width:18px;height:14px;text-align:center;text-indent:0;font:normal bold 10px/13px Tahoma,sans-serif;color:inherit;background:transparent none no-repeat -100em -100em}/*! Default tooltip style */.ui-tooltip-default .ui-tooltip-titlebar,.ui-tooltip-default .ui-tooltip-content{border-color:#f1d031;background-color:#ffffa3;color:#555}.ui-tooltip-default .ui-tooltip-titlebar{background-color:#ffef93}.ui-tooltip-default .ui-tooltip-icon{border-color:#CCC;background:#f1f1f1;color:#777}.ui-tooltip-default .ui-tooltip-titlebar .ui-state-hover{border-color:#AAA;color:#111}#qtip-overlay{position:fixed;left:-10000em;top:-10000em}#qtip-overlay.blurs{cursor:pointer}#qtip-overlay div{position:absolute;left:0;top:0;width:100%;height:100%;background-color:black;opacity:.7;filter:alpha(opacity=70);-ms-filter:"alpha(opacity=70)"}.ui-tooltip .ui-tooltip-tip{margin:0 auto;overflow:hidden;z-index:10}.ui-tooltip .ui-tooltip-tip,.ui-tooltip .ui-tooltip-tip *{position:absolute;line-height:.1px!important;font-size:.1px!important;color:#123456;background:transparent;border:0 dashed transparent}.ui-tooltip .ui-tooltip-tip canvas{top:0;left:0}/*! Light tooltip style */.ui-tooltip-light .ui-tooltip-titlebar,.ui-tooltip-light .ui-tooltip-content{border-color:#e2e2e2;color:#454545}.ui-tooltip-light .ui-tooltip-content{background-color:white}.ui-tooltip-light .ui-tooltip-titlebar{background-color:#f1f1f1}/*! Dark tooltip style */.ui-tooltip-dark .ui-tooltip-titlebar,.ui-tooltip-dark .ui-tooltip-content{border-color:#303030;color:#f3f3f3}.ui-tooltip-dark .ui-tooltip-content{background-color:#505050}.ui-tooltip-dark .ui-tooltip-titlebar{background-color:#404040}.ui-tooltip-dark .ui-tooltip-icon{border-color:#444}.ui-tooltip-dark .ui-tooltip-titlebar .ui-state-hover{border-color:#303030}/*! Cream tooltip style */.ui-tooltip-cream .ui-tooltip-titlebar,.ui-tooltip-cream .ui-tooltip-content{border-color:#f9e98e;color:#a27d35}.ui-tooltip-cream .ui-tooltip-content{background-color:#fbf7aa}.ui-tooltip-cream .ui-tooltip-titlebar{background-color:#f0de7d}.ui-tooltip-cream .ui-state-default .ui-tooltip-icon{background-position:-82px 0}/*! Red tooltip style */.ui-tooltip-red .ui-tooltip-titlebar,.ui-tooltip-red .ui-tooltip-content{border-color:#d95252;color:#912323}.ui-tooltip-red .ui-tooltip-content{background-color:#f78b83}.ui-tooltip-red .ui-tooltip-titlebar{background-color:#f06d65}.ui-tooltip-red .ui-state-default .ui-tooltip-icon{background-position:-102px 0}.ui-tooltip-red .ui-tooltip-icon{border-color:#d95252}.ui-tooltip-red .ui-tooltip-titlebar .ui-state-hover{border-color:#d95252}/*! Green tooltip style */.ui-tooltip-green .ui-tooltip-titlebar,.ui-tooltip-green .ui-tooltip-content{border-color:#90d93f;color:#3f6219}.ui-tooltip-green .ui-tooltip-content{background-color:#caed9e}.ui-tooltip-green .ui-tooltip-titlebar{background-color:#b0de78}.ui-tooltip-green .ui-state-default .ui-tooltip-icon{background-position:-42px 0}/*! Blue tooltip style */.ui-tooltip-blue .ui-tooltip-titlebar,.ui-tooltip-blue .ui-tooltip-content{border-color:#add9ed;color:#5e99bd}.ui-tooltip-blue .ui-tooltip-content{background-color:#e5f6fe}.ui-tooltip-blue .ui-tooltip-titlebar{background-color:#d0e9f5}.ui-tooltip-blue .ui-state-default .ui-tooltip-icon{background-position:-2px 0}/*! Add shadows to your tooltips in: FF3+, Chrome 2+, Opera 10.6+, IE6+, Safari 2+ */.ui-tooltip-shadow{-webkit-box-shadow:1px 1px 3px 1px rgba(0,0,0,0.15);-moz-box-shadow:1px 1px 3px 1px rgba(0,0,0,0.15);box-shadow:1px 1px 3px 1px rgba(0,0,0,0.15)}.ui-tooltip-shadow .ui-tooltip-titlebar,.ui-tooltip-shadow .ui-tooltip-content{filter:progid:DXImageTransform.Microsoft.Shadow(Color='gray',Direction=135,Strength=3);-ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Color='gray', Direction=135, Strength=3)";_margin-bottom:-3px;.margin-bottom:-3px}/*! Add rounded corners to your tooltips in: FF3+, Chrome 2+, Opera 10.6+, IE9+, Safari 2+ */.ui-tooltip-rounded,.ui-tooltip-rounded .ui-tooltip-content,.ui-tooltip-tipsy,.ui-tooltip-tipsy .ui-tooltip-content,.ui-tooltip-youtube,.ui-tooltip-youtube .ui-tooltip-content{-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px}.ui-tooltip-rounded .ui-tooltip-titlebar,.ui-tooltip-tipsy .ui-tooltip-titlebar,.ui-tooltip-youtube .ui-tooltip-titlebar{-moz-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.ui-tooltip-rounded .ui-tooltip-titlebar+.ui-tooltip-content,.ui-tooltip-tipsy .ui-tooltip-titlebar+.ui-tooltip-content,.ui-tooltip-youtube .ui-tooltip-titlebar+.ui-tooltip-content{-moz-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px}/*! Youtube tooltip style */.ui-tooltip-youtube{-webkit-box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;box-shadow:0 0 3px #333}.ui-tooltip-youtube .ui-tooltip-titlebar,.ui-tooltip-youtube .ui-tooltip-content{_margin-bottom:0;.margin-bottom:0;background:transparent;background:rgba(0,0,0,0.85);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#D9000000,endColorstr=#D9000000);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#D9000000,endColorstr=#D9000000)";color:white;border-color:#ccc}.ui-tooltip-youtube .ui-tooltip-icon{border-color:#222}.ui-tooltip-youtube .ui-tooltip-titlebar .ui-state-hover{border-color:#303030}.ui-tooltip-jtools{background:#232323;background:rgba(0,0,0,0.7);background-image:-moz-linear-gradient(top,#717171,#232323);background-image:-webkit-gradient(linear,left top,left bottom,from(#717171),to(#232323));border:2px solid #ddd;border:2px solid rgba(241,241,241,1);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 12px #333;-moz-box-shadow:0 0 12px #333;box-shadow:0 0 12px #333}.ui-tooltip-jtools .ui-tooltip-titlebar{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A)"}.ui-tooltip-jtools .ui-tooltip-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323)"}.ui-tooltip-jtools .ui-tooltip-titlebar,.ui-tooltip-jtools .ui-tooltip-content{background:transparent;color:white;border:0 dashed transparent}.ui-tooltip-jtools .ui-tooltip-icon{border-color:#555}.ui-tooltip-jtools .ui-tooltip-titlebar .ui-state-hover{border-color:#333}.ui-tooltip-cluetip{-webkit-box-shadow:4px 4px 5px rgba(0,0,0,0.4);-moz-box-shadow:4px 4px 5px rgba(0,0,0,0.4);box-shadow:4px 4px 5px rgba(0,0,0,0.4)}.ui-tooltip-cluetip .ui-tooltip-titlebar{background-color:#87876a;color:white;border:0 dashed transparent}.ui-tooltip-cluetip .ui-tooltip-content{background-color:#d9d9c2;color:#111;border:0 dashed transparent}.ui-tooltip-cluetip .ui-tooltip-icon{border-color:#808064}.ui-tooltip-cluetip .ui-tooltip-titlebar .ui-state-hover{border-color:#696952;color:#696952}.ui-tooltip-tipsy{border:0}.ui-tooltip-tipsy .ui-tooltip-titlebar,.ui-tooltip-tipsy .ui-tooltip-content{_margin-bottom:0;.margin-bottom:0;background:transparent;background:rgba(0,0,0,.87);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#D9000000,endColorstr=#D9000000);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#D9000000,endColorstr=#D9000000)";color:white;border:0 transparent;font-size:11px;font-family:'Lucida Grande',sans-serif;font-weight:bold;line-height:16px;text-shadow:0 1px black}.ui-tooltip-tipsy .ui-tooltip-titlebar{padding:6px 35px 0 10}.ui-tooltip-tipsy .ui-tooltip-content{padding:6px 10}.ui-tooltip-tipsy .ui-tooltip-icon{border-color:#222;text-shadow:none}.ui-tooltip-tipsy .ui-tooltip-titlebar .ui-state-hover{border-color:#303030}.ui-tooltip-tipped .ui-tooltip-titlebar,.ui-tooltip-tipped .ui-tooltip-content{border:3px solid #959fa9;filter:none;-ms-filter:none}.ui-tooltip-tipped .ui-tooltip-titlebar{background:#3a79b8;background-image:-moz-linear-gradient(top,#3a79b8,#2e629d);background-image:-webkit-gradient(linear,left top,left bottom,from(#3a79b8),to(#2e629d));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D)";color:white;font-weight:normal;font-family:serif;border-bottom-width:0;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0}.ui-tooltip-tipped .ui-tooltip-content{background-color:#f9f9f9;color:#454545;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.ui-tooltip-tipped .ui-tooltip-icon{border:2px solid #285589;background:#285589}.ui-tooltip-tipped .ui-tooltip-icon .ui-icon{background-color:#fbfbfb;color:#555}.ui-tooltip:not(.ie9haxors) div.ui-tooltip-content,.ui-tooltip:not(.ie9haxors) div.ui-tooltip-titlebar{filter:none;-ms-filter:none}/*!
10 10 * BEGIN config.css
11   - */html{overflow-y:auto;-webkit-overflow-scrolling:touch}a{color:#00f;text-decoration:none}a:visited{color:#00b}a:hover{color:#f00}a:focus{outline:0}#sidebar{background-color:#ededed;background-image:linear-gradient(top,#ededed 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ededed,#f5f5f5);background-image:-moz-linear-gradient(center top,#ededed 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left 500,color-stop(0,#ededed),color-stop(1,#f5f5f5));background-image:-webkit-linear-gradient(top,#ededed 0,#f5f5f5 100%);background-image:-ms-linear-gradient(top,#ededed 0,#f5f5f5 100%);border-right:1px solid #c2c2c2;bottom:0;left:0;position:absolute;top:0;width:150px;-moz-box-shadow:inset -12px 0 30px -30px #000;-webkit-box-shadow:inset -12px 0 30px -30px #000;box-shadow:inset -12px 0 30px -30px #000;text-shadow:#f5f5f5 0 1px 0;z-index:2}#sidebar-pane{border-right:1px solid #c2c2c2;position:absolute;padding:0;margin:0;font-size:1px;overflow:hidden;top:0;width:5px;left:151px;cursor:default;height:100%;background-color:#dfdfdf;text-align:left;z-index:2}#sidebar-trigger{position:absolute;padding:0;margin:0;overflow:hidden;text-align:center;font-size:1px;cursor:pointer;z-index:1;visibility:visible;height:35px;width:5px;top:50%;left:0}.trigger-left{background:url('../images/mini-left.gif') no-repeat scroll right top transparent}.trigger-right{background:url('../images/mini-right.gif') no-repeat scroll right top transparent}#logo{display:block;margin:auto;margin-top:5px}#tab-container{bottom:0;left:0;overflow-x:hidden;overflow-y:auto;position:absolute;right:0;text-align:right;top:50px}#tab-container a{text-decoration:none}#tab-container div{border-bottom:1px solid transparent;border-top:1px solid transparent;color:#808080;cursor:pointer;font-size:13px;height:28px;line-height:28px;padding-right:25px}#tab-container div.active,#tab-container div:hover{background-color:#d4d4d4;border-color:#bfbfbf;color:#000;-moz-box-shadow:inset -12px 0 30px -30px #000;-webkit-box-shadow:inset -12px 0 30px -30px #000;box-shadow:inset -12px 0 30px -30px #000;text-shadow:0 1px 0 #dbdbdb}#content{bottom:0;left:156px;color:#000;overflow-y:scroll;position:absolute;right:0;top:0;padding:15px 20px 20px;min-width:400px;font-size:13px}.colmask{z-index:20;position:relative;clear:both;float:left;overflow:visible;border:1px solid #dfdede;background:#f4f4f4;width:100%}.section,.Servers form,#addFeed,#addFeedContent{border-bottom:1px solid #dfdede;overflow:auto}.section:last-child,.Servers form:last-child{border:0}.col2{z-index:10;float:left;overflow:auto;font-family:"Trebuchet MS",Verdana,Helvetica,sans-serif;padding:12px;width:250px}.col1{z-index:11;width:100%;float:none;padding:12px 0}.col2 h3{background:none repeat scroll 0 0 #666;color:#fff;padding:6px 8px;vertical-align:middle;margin:0}.example{background-color:#fefeee}.presets input{margin:2px 0}label.config{overflow:auto;float:left;width:24%;font-weight:700;display:block;text-align:left;margin-right:10px;margin-left:20px}label.narrow{width:200px!important}label.wide{width:auto!important}.desc{display:block;margin:0 0 0 24%;padding:3px 0 0 31px;font-size:12px;font-style:italic}.desc.narrow{margin:0 0 0 200px!important}.desc-check{font-size:12px;font-style:italic;padding:0 1px}.col2 p{font-size:12px;color:#666;margin:1em 0}div.field-pair{padding:6px;clear:both;float:none;overflow:hidden;min-width:555px}#content fieldset{border:0;outline:0;min-width:350px;margin:0;padding:0 12px 12px 6px}textarea,select,input[type="date"],input[type="datetime"],input[type="datetime-local"],input[type="email"],input[type="month"],input[type="number"],input[type="password"],input[type="search"],input[type="tel"],input[type="text"],input[type="time"],input[type="url"],input[type="week"]{padding-left:5px;border:1px solid #d4d0c8}select .selected{font-weight:700}select option{padding-left:5px}input[type='checkbox']{display:block;white-space:nowrap;padding:0;margin-left:5px}textarea:hover,select:hover,input[type="date"]:hover,input[type="datetime"]:hover,input[type="datetime-local"]:hover,input[type="email"]:hover,input[type="month"]:hover,input[type="number"]:hover,input[type="password"]:hover,input[type="search"]:hover,input[type="tel"]:hover,input[type="text"]:hover,input[type="time"]:hover,input[type="url"]:hover,input[type="week"]:hover,textarea:focus,select:focus,input[type="date"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="email"]:focus,input[type="month"]:focus,input[type="number"]:focus,input[type="password"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="text"]:focus,input[type="time"]:focus,input[type="url"]:focus,input[type="week"]:focus{background-color:#fffff0;border:1px solid #aaa}.col1 input[type='checkbox']{position:absolute;top:auto!important;height:16px;width:16px;margin-left:0}.alt{background-color:#eee}.even{background-color:#dfdede}.readonly{background-color:#eff}.multiple_cats{padding:5px 10px!important;margin-top:2px}.padding{padding:6px}.disabled{color:#aaa}.padTable p{margin-top:0}.nomargin{margin:0}.copyright{margin:0;padding:6px}.path{font-family:Verdana,Helvetica,Sans-serif,sans;color:#000;font-weight:400}.darkred{color:#900}.scheduleEntry{padding:3px 0}.time{padding:0 10px;color:#000;font-weight:700}.frequency{padding-right:5px;letter-spacing:.5px}.padTable{padding:15px;overflow:auto;clear:both}.padTable h3{margin-top:0}.catTable th,.catTable td{padding:5px}.catTable th{text-align:center}.default{background-color:#ffffe0;border-bottom:1px solid #aaa;border-top:1px solid #ddd}.hidden{visibility:hidden}.float-left{float:left}.float-right{float:right}.align-left{text-align:left}.align-right{text-align:right}.align-center{text-align:center}.nowrap{white-space:nowrap}.Key{display:none;border:1px solid #ccc;width:425px}.Key th{background:none repeat scroll 0 0 #666;color:#fff;margin:0;padding:3px 9px}.Key td{padding:2px}.Key tr{border-bottom:1px solid #ccc}#infoTable{font-family:Verdana,Helvetica,Sans-serif,sans;font-size:12px;width:100%}#infoTable tr{line-height:17px}.infoTableHeader,.infoTableCell{padding:6px}.infoTableHeader{font-weight:700;width:160px}.infoTableSeperator{border-top:1px solid #ddd}.icon{padding-left:20px}.loading{background:url('../images/loading16.gif') no-repeat left bottom}.success{background:url('../images/yes16.png') no-repeat left bottom}.failure{background:url('../images/no16.png') no-repeat left bottom}#fileBrowserDialog{max-height:480px;overflow-y:auto}#fileBrowserDialog h1{border-bottom:1px solid #4e4e4e;font-size:1em;font-weight:700;margin-bottom:12px;padding-bottom:4px;text-align:left}#fileBrowserDialog ul{margin:0;padding:0}#fileBrowserDialog ul li{margin:2px;padding:4px 0;cursor:pointer;list-style-type:none}#fileBrowserDialog ul li a{color:#000;display:block}#fileBrowserDialog ul li a:hover{color:#00f;background:0}#fileBrowserDialog ul li a span.ui-icon{margin:0 4px;float:left}.browserDialog .ui-dialog-buttonpane{background-color:transparent!important}.browserDialog.busy .ui-dialog-buttonpane{background:url('../images/loading-bar.gif') 10px 50% no-repeat!important}.fileBrowser{margin-left:5px!important}.ui-autocomplete-loading{background:#fff url('../images/loading16.gif') right center no-repeat}.ui-autocomplete{max-height:140px;overflow-y:scroll;overflow-x:hidden}* html .ui-autocomplete{height:140px}.ui-menu .ui-menu-item{background-color:#eee}.ui-menu .ui-menu-item-alternate{background-color:#fff}.ui-menu a.ui-state-hover{background:0;background-color:#0a246a;color:#fff}h2.activeRSS{margin-bottom:10px}.activeRSS a,.activeRSS a:visited{text-decoration:none;color:#000}.activeRSS a:hover{color:#4b4742}.favicon{background-position:center center!important;opacity:1;top:-1px;height:16px;width:16px;float:left;margin-right:2px}.feed{text-decoration:none}.feed_enabled{color:#000}.feed_disabled{color:#900}#subscriptions td{border:0 none;padding-top:.4em}#subscriptions .chk{padding-right:5px;width:14px}#subscriptions .title{font-weight:bold;padding-right:.3em;width:auto}.ie6 .subscription-title{width:20em}.subscription-title{max-width:35em;min-width:20em;overflow:hidden;white-space:nowrap}.data-row td{border-top:1px solid #ddd}.controls{text-align:right;padding-right:5px;white-space:nowrap}.feed-row td{color:#777;max-width:40em;padding:0 0 .5em}.feed-row div{padding-right:10px}.tab-content{background-color:#f8f4e7}span.count{-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;background:none repeat scroll 0 0 #aca79c;color:#fff;margin:-3px 0 0 5px;padding:1px 10px}a.current .count{background-color:#777!important}a.current:hover .count{background-color:#333!important}ul.tabs{margin:0!important;padding:0;height:30px}ul.tabs li{float:left;padding:0;margin:0;list-style-type:none}ul.tabs a{float:left;font-size:13px;display:block;padding:5px 30px;text-decoration:none;border:1px solid #dfdede;height:18px;background-color:#f1ede0;color:#777;margin-right:2px;position:relative;top:1px;outline:0;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius-topleft:4px;-moz-border-radius-topright:4px;border-top-left-radius:4px;border-top-right-radius:4px}ul.tabs a:hover{background-color:#fcf8eb;color:#333}ul.tabs a.current{background-color:#f8f4e7;border-bottom:1px solid #f8f4e7;color:#000;cursor:default}.ui-tooltip-qrcode{max-width:320px}.ui-tooltip-qrcode img{margin:0 auto}
  11 + */html{overflow-y:auto;-webkit-overflow-scrolling:touch}a{color:#00f;text-decoration:none}a:visited{color:#00b}a:hover{color:#f00}a:focus{outline:0}#sidebar{background-color:#ededed;background-image:linear-gradient(top,#ededed 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ededed,#f5f5f5);background-image:-moz-linear-gradient(center top,#ededed 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left 500,color-stop(0,#ededed),color-stop(1,#f5f5f5));background-image:-webkit-linear-gradient(top,#ededed 0,#f5f5f5 100%);background-image:-ms-linear-gradient(top,#ededed 0,#f5f5f5 100%);border-right:1px solid #c2c2c2;bottom:0;left:0;position:absolute;top:0;width:150px;-moz-box-shadow:inset -12px 0 30px -30px #000;-webkit-box-shadow:inset -12px 0 30px -30px #000;box-shadow:inset -12px 0 30px -30px #000;text-shadow:#f5f5f5 0 1px 0;z-index:2}#sidebar-pane{border-right:1px solid #c2c2c2;position:absolute;padding:0;margin:0;font-size:1px;overflow:hidden;top:0;width:5px;left:151px;cursor:default;height:100%;background-color:#dfdfdf;text-align:left;z-index:2}#sidebar-trigger{position:absolute;padding:0;margin:0;overflow:hidden;text-align:center;font-size:1px;cursor:pointer;z-index:1;visibility:visible;height:35px;width:5px;top:50%;left:0}.trigger-left{background:url('../images/mini-left.gif') no-repeat scroll right top transparent}.trigger-right{background:url('../images/mini-right.gif') no-repeat scroll right top transparent}#logo{display:block;margin:auto;margin-top:5px}#tab-container{bottom:0;left:0;overflow-x:hidden;overflow-y:auto;position:absolute;right:0;text-align:right;top:50px}#tab-container a{text-decoration:none}#tab-container div{border-bottom:1px solid transparent;border-top:1px solid transparent;color:#808080;cursor:pointer;font-size:13px;height:28px;line-height:28px;padding-right:25px}#tab-container div.active,#tab-container div:hover{background-color:#d4d4d4;border-color:#bfbfbf;color:#000;-moz-box-shadow:inset -12px 0 30px -30px #000;-webkit-box-shadow:inset -12px 0 30px -30px #000;box-shadow:inset -12px 0 30px -30px #000;text-shadow:0 1px 0 #dbdbdb}#content{bottom:0;left:156px;color:#000;overflow-y:scroll;position:absolute;right:0;top:0;padding:15px 20px 20px;min-width:400px;font-size:13px}.colmask{z-index:20;position:relative;clear:both;float:left;overflow:visible;border:1px solid #dfdede;background:#f4f4f4;width:100%}.section,.Servers form,#addFeed,#addFeedContent{border-bottom:1px solid #dfdede;overflow:auto}.section:last-child,.Servers form:last-child{border:0}.col2{z-index:10;float:left;overflow:auto;font-family:"Trebuchet MS",Verdana,Helvetica,sans-serif;padding:12px;width:250px}.col1{z-index:11;width:100%;float:none;padding:12px 0}.col2 h3{background:none repeat scroll 0 0 #666;color:#fff;padding:6px 8px;vertical-align:middle;margin:0}.example{background-color:#fefeee}.presets input{margin:2px 0}label.config{overflow:auto;float:left;width:24%;font-weight:700;display:block;text-align:left;margin-right:10px;margin-left:20px}label.narrow{width:200px!important}label.wide{width:auto!important}.desc{display:block;margin:0 0 0 24%;padding:3px 0 0 31px;font-size:12px;font-style:italic}.desc.narrow{margin:0 0 0 200px!important}.desc-check{font-size:12px;font-style:italic;padding:0 1px}.col2 p{font-size:12px;color:#666;margin:1em 0}div.field-pair{padding:6px;clear:both;float:none;overflow:hidden;min-width:555px}#content fieldset{border:0;outline:0;min-width:350px;margin:0;padding:0 12px 12px 6px}textarea,select,input[type="date"],input[type="datetime"],input[type="datetime-local"],input[type="email"],input[type="month"],input[type="number"],input[type="password"],input[type="search"],input[type="tel"],input[type="text"],input[type="time"],input[type="url"],input[type="week"]{padding-left:5px;border:1px solid #d4d0c8}select .selected{font-weight:700}select option{padding-left:5px}input[type='checkbox']{display:block;white-space:nowrap;padding:0;margin-left:5px}textarea:hover,select:hover,input[type="date"]:hover,input[type="datetime"]:hover,input[type="datetime-local"]:hover,input[type="email"]:hover,input[type="month"]:hover,input[type="number"]:hover,input[type="password"]:hover,input[type="search"]:hover,input[type="tel"]:hover,input[type="text"]:hover,input[type="time"]:hover,input[type="url"]:hover,input[type="week"]:hover,textarea:focus,select:focus,input[type="date"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="email"]:focus,input[type="month"]:focus,input[type="number"]:focus,input[type="password"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="text"]:focus,input[type="time"]:focus,input[type="url"]:focus,input[type="week"]:focus{background-color:#fffff0;border:1px solid #aaa}.col1 input[type='checkbox']{position:absolute;top:auto!important;height:16px;width:16px;margin-left:0}.alt{background-color:#eee}.even{background-color:#dfdede}.readonly{background-color:#eff}.multiple_cats{padding:5px 10px!important;margin-top:2px}.padding{padding:6px}.disabled{color:#aaa}.padTable p{margin-top:0}.nomargin{margin:0}.copyright{margin:0;padding:6px}.path{font-family:Verdana,Helvetica,Sans-serif,sans;color:#000;font-weight:400}.darkred{color:#900}.scheduleEntry{padding:3px 0}.time{padding:0 10px;color:#000;font-weight:700}.frequency{padding-right:5px;letter-spacing:.5px}.padTable{padding:15px;overflow:auto;clear:both}.padTable h3{margin-top:0}.catTable th,.catTable td{padding:5px}.catTable th{text-align:center}.default{background-color:#ffffe0;border-bottom:1px solid #aaa;border-top:1px solid #ddd}.hidden{visibility:hidden}.float-left{float:left}.float-right{float:right}.align-left{text-align:left}.align-right{text-align:right}.align-center{text-align:center}.nowrap{white-space:nowrap}.Key{display:none;border:1px solid #ccc;width:425px}.Key th{background:none repeat scroll 0 0 #666;color:#fff;margin:0;padding:3px 9px}.Key td{padding:2px}.Key tr{border-bottom:1px solid #ccc}#infoTable{font-family:Verdana,Helvetica,Sans-serif,sans;font-size:12px;width:100%}#infoTable tr{line-height:17px}.infoTableHeader,.infoTableCell{padding:6px}.infoTableHeader{font-weight:700;width:160px}.infoTableSeperator{border-top:1px solid #ddd}.icon{padding-left:20px}.loading{background:url('../images/loading16.gif') no-repeat left bottom}.success{background:url('../images/yes16.png') no-repeat left bottom}.failure{background:url('../images/no16.png') no-repeat left bottom}#fileBrowserDialog{max-height:480px;overflow-y:auto}#fileBrowserDialog h1{border-bottom:1px solid #4e4e4e;font-size:1em;font-weight:700;margin-bottom:12px;padding-bottom:4px;text-align:left}#fileBrowserDialog ul{margin:0;padding:0}#fileBrowserDialog ul li{margin:2px;padding:4px 0;cursor:pointer;list-style-type:none}#fileBrowserDialog ul li a{color:#000;display:block}#fileBrowserDialog ul li a:hover{color:#00f;background:0}#fileBrowserDialog ul li a span.ui-icon{margin:0 4px;float:left}.browserDialog .ui-dialog-buttonpane{background-color:transparent!important}.browserDialog.busy .ui-dialog-buttonpane{background:url('../images/loading-bar.gif') 10px 50% no-repeat!important}.fileBrowser{margin-left:5px!important}.ui-autocomplete-loading{background:#fff url('../images/loading16.gif') right center no-repeat}.ui-autocomplete{max-height:140px;overflow-y:scroll;overflow-x:hidden}* html .ui-autocomplete{height:140px}.ui-menu .ui-menu-item{background-color:#eee}.ui-menu .ui-menu-item-alternate{background-color:#fff}.ui-menu a.ui-state-hover{background:0;background-color:#0a246a;color:#fff}h2.activeRSS{margin-bottom:10px}.activeRSS a,.activeRSS a:visited{text-decoration:none;color:#000}.activeRSS a:hover{color:#4b4742}.favicon{background-position:center center!important;opacity:1;top:-1px;height:16px;width:16px;float:left;margin-right:2px}.feed{text-decoration:none}.feed_enabled{color:#000}.feed_disabled{color:#900}#subscriptions td{border:0 none;padding-top:.4em}#subscriptions .chk{padding-right:5px;width:14px}#subscriptions .title{font-weight:bold;padding-right:.3em;width:auto}.ie6 .subscription-title{width:20em}.subscription-title{max-width:35em;min-width:20em;overflow:hidden;white-space:nowrap}.data-row td{border-top:1px solid #ddd}.controls{text-align:right;padding-right:5px;white-space:nowrap}.feed-row td{color:#777;max-width:40em;padding:0 0 .5em}.feed-row div{padding-right:10px}.tab-content{background-color:#f8f4e7}span.count{-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;background:none repeat scroll 0 0 #aca79c;color:#fff;margin:-3px 0 0 5px;padding:1px 10px}a.current .count{background-color:#777!important}a.current:hover .count{background-color:#333!important}ul.tabs{margin:0!important;padding:0;height:30px}ul.tabs li{float:left;padding:0;margin:0;list-style-type:none}ul.tabs a{float:left;font-size:13px;display:block;padding:5px 30px;text-decoration:none;border:1px solid #dfdede;height:18px;background-color:#f1ede0;color:#777;margin-right:2px;position:relative;top:1px;outline:0;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius-topleft:4px;-moz-border-radius-topright:4px;border-top-left-radius:4px;border-top-right-radius:4px}ul.tabs a:hover{background-color:#fcf8eb;color:#333}ul.tabs a.current{background-color:#f8f4e7;border-bottom:1px solid #f8f4e7;color:#000;cursor:default}.ui-tooltip-qrcode{max-width:320px}.ui-tooltip-qrcode img{margin:0 auto}
  12 +.checkbox-days{float: left}
  13 +.checkbox-days p{margin: 0 0 5px 0}
  14 +.checkbox-days input {vertical-align:middle; margin-top: -1px;}
  15 +.checkbox-days label{padding-left: 20px}
19 interfaces/Plush/templates/config_scheduling.tmpl
@@ -36,18 +36,15 @@ else:
36 36 </label>
37 37 </div>
38 38 <div class="field-pair alt">
39   - <label class="nocheck clearfix" for="dayofweek">
  39 + <label class="nocheck clearfix" for="daysofweek">
40 40 <span class="component-title">$T('sch-frequency')</span>
41   - <select name="dayofweek" id="dayofweek">
42   - <option value="*" selected>$T('daily')</option>
43   - <option value="1">$T('monday')</option>
44   - <option value="2">$T('tuesday')</option>
45   - <option value="3">$T('wednesday')</option>
46   - <option value="4">$T('thursday')</option>
47   - <option value="5">$T('friday')</option>
48   - <option value="6">$T('saturday')</option>
49   - <option value="7">$T('sunday')</option>
50   - </select>
  41 + <input type="checkbox" name="daysofweek" value="1">$T('monday')<br/>
  42 + <input type="checkbox" name="daysofweek" value="2">$T('tuesday')<br/>
  43 + <input type="checkbox" name="daysofweek" value="3">$T('wednesday')<br/>
  44 + <input type="checkbox" name="daysofweek" value="4">$T('thursday')<br/>
  45 + <input type="checkbox" name="daysofweek" value="5">$T('friday')<br/>
  46 + <input type="checkbox" name="daysofweek" value="6">$T('saturday')<br/>
  47 + <input type="checkbox" name="daysofweek" value="7">$T('sunday')<br/>
51 48 </label>
52 49 </div>
53 50 <div class="field-pair">
19 interfaces/smpl/templates/config_scheduling.tmpl
@@ -26,17 +26,14 @@ else:
26 26 <!--#end for#-->
27 27 </select>
28 28 <br class="clear" />
29   -<label class="label">$T('sch-frequency'):</label>
30   -<select name="dayofweek">
31   -<option value="*" selected>$T('daily')
32   -<option value="1">$T('monday')
33   -<option value="2">$T('tuesday')
34   -<option value="3">$T('wednesday')
35   -<option value="4">$T('thursday')
36   -<option value="5">$T('friday')
37   -<option value="6">$T('saturday')
38   -<option value="7">$T('sunday')
39   -</select>
  29 +<label class="label" for="daysofweek">$T('sch-frequency'):</label>
  30 +<input type="checkbox" name="daysofweek" value="1">$T('monday')<br/>
  31 +<input type="checkbox" name="daysofweek" value="2">$T('tuesday')<br/>
  32 +<input type="checkbox" name="daysofweek" value="3">$T('wednesday')<br/>
  33 +<input type="checkbox" name="daysofweek" value="4">$T('thursday')<br/>
  34 +<input type="checkbox" name="daysofweek" value="5">$T('friday')<br/>
  35 +<input type="checkbox" name="daysofweek" value="6">$T('saturday')<br/>
  36 +<input type="checkbox" name="daysofweek" value="7">$T('sunday')<br/>
40 37 <br class="clear" />
41 38 <label class="label">$T('sch-action'):</label>
42 39 <select name="action">
15 sabnzbd/interface.py
@@ -1901,7 +1901,7 @@ def get_days():
1901 1901
1902 1902 actions = []
1903 1903 actions.extend(_SCHED_ACTIONS)
1904   - days = get_days()
  1904 + day_names = get_days()
1905 1905 conf['schedlines'] = []
1906 1906 snum = 1
1907 1907 conf['taskinfo'] = []
@@ -1909,7 +1909,7 @@ def get_days():
1909 1909 line = ev[3]
1910 1910 conf['schedlines'].append(line)
1911 1911 try:
1912   - m, h, day, action = line.split(' ', 3)
  1912 + m, h, day_numbers, action = line.split(' ', 3)
1913 1913 except:
1914 1914 continue
1915 1915 action = action.strip()
@@ -1929,7 +1929,10 @@ def get_days():
1929 1929 act = ''
1930 1930 if act in ('enable_server', 'disable_server'):
1931 1931 action = Ttemplate("sch-" + act) + ' ' + server
1932   - item = (snum, '%02d' % int(h), '%02d' % int(m), days.get(day, '**'), '%s %s' % (action, value))
  1932 +
  1933 + days_of_week = ", ".join([day_names.get(i, "**") for i in day_numbers])
  1934 + item = (snum, '%02d' % int(h), '%02d' % int(m), days_of_week, '%s %s' % (action, value))
  1935 +
1933 1936 conf['taskinfo'].append(item)
1934 1937 snum += 1
1935 1938
@@ -1954,7 +1957,7 @@ def addSchedule(self, **kwargs):
1954 1957
1955 1958 minute = kwargs.get('minute')
1956 1959 hour = kwargs.get('hour')
1957   - dayofweek = kwargs.get('dayofweek')
  1960 + days_of_week = ''.join([str(x) for x in kwargs.get('daysofweek')])
1958 1961 action = kwargs.get('action')
1959 1962 arguments = kwargs.get('arguments')
1960 1963
@@ -1964,7 +1967,7 @@ def addSchedule(self, **kwargs):
1964 1967 elif arguments in ('off','disable'):
1965 1968 arguments = '0'
1966 1969
1967   - if minute and hour and dayofweek and action:
  1970 + if minute and hour and days_of_week and action:
1968 1971 if action == 'speedlimit':
1969 1972 if not (arguments and arguments.isdigit()):
1970 1973 action = '0'
@@ -1983,7 +1986,7 @@ def addSchedule(self, **kwargs):
1983 1986 if action:
1984 1987 sched = cfg.schedules()
1985 1988 sched.append('%s %s %s %s %s' %
1986   - (minute, hour, dayofweek, action, arguments))
  1989 + (minute, hour, days_of_week, action, arguments))
1987 1990 cfg.schedules.set(sched)
1988 1991
1989 1992 config.save_config()
2  sabnzbd/scheduler.py
@@ -82,7 +82,7 @@ def init():
82 82 continue
83 83
84 84 if d.isdigit():
85   - d = [int(d)]
  85 + d = [int(i) for i in d]
86 86 else:
87 87 d = range(1, 8)
88 88

2 comments on commit 2da3701

thezoggy

you can just provide me the css and i can runt he build script to make it all nice and pretty

Lucas Parry
Owner

It's just those 4 lines at the bottom, the extra line shows up in the diff because of the extra newline on the end.

.checkbox-days{float: left}
.checkbox-days p{margin: 0 0 5px 0}
.checkbox-days input {vertical-align:middle; margin-top: -1px;}
.checkbox-days label{padding-left: 20px}

I'm no css wizard so I'm happy to concede there's probably a better way to style this

Please sign in to comment.
Something went wrong with that request. Please try again.