From 7cc1f5c2e7e0fe6884f0ff42665719afda5b22ce Mon Sep 17 00:00:00 2001 From: james Date: Mon, 13 Jun 2011 12:24:17 -0400 Subject: [PATCH] CC-2289:Differentiate between time and duration - css has been modified (from Vlad) - new image were added (from Vlad) --- .../css/images/input_with_calendar_bg.png | Bin 1082 -> 1074 bytes .../public/css/images/input_with_time_bg.png | Bin 1135 -> 1259 bytes .../public/css/images/search_auto_bg.png | Bin 1293 -> 1193 bytes airtime_mvc/public/css/styles.css | 127 ++++++++++++++++-- .../public/js/airtime/schedule/add-show.js | 81 +---------- 5 files changed, 124 insertions(+), 84 deletions(-) diff --git a/airtime_mvc/public/css/images/input_with_calendar_bg.png b/airtime_mvc/public/css/images/input_with_calendar_bg.png index 12e2d3f8061b4cf26077c52ccd0ad521576d86ca..219a68fb0ab693de80d8a6552bf4eec339cd1665 100644 GIT binary patch delta 411 zcmdnRv57;mGr-TCmrII^fq{Y7)59eQNQ(loFb5lutoL*4-l(X|6k}##YGLZ)VrXe( zXlZEZYT#sUWawn*Xk_H%Y--|WYOJJCkz3&FYvq!kT$-DjSK{ens{|C$OUX>Jg6cKG zrFZfICIbbCB4;<8ias#OKoz+d;8di;>{NeVcJ^1G(^q)9IEGZ*O8WEvzdiF-Mqy^& z103d41Uu)lEln3ZnRY<*WRC}zV^@!)q~!TY2j;b&|2_SHnSs%^iHD9o|7%iom~Xmw zN&z{ZSGk5CLQknUUjEs!=oqj>P%iadHXL%iP7oNQ2lEXdq zt4kGJ-wSuuZg5nX-juOwXUX9<-a|*+gf8l-s_C#_S*mkHO*n|*#077M=&vU(bQ`Z` bVv%4-6D>Zj>3eel(9sN@u6{1-oD!M<6`6&u delta 419 zcmdnQv5P~oGr-TCmrII^fq{Y7)59f*fq^Lk$d=<^29n3sCT!cNsLT{&U}RxwU}|P+ zY~o~MXy|HS>FjFkVq|LOXl`n0WNK-yq)?Gt;OlGUlAm0fo0?bR>0+w{6wyn`OtFIM zHN&NM@&YCU1*jrpoQgg$$-oqu;8di;>{K7uG$#b;bj1Ll5ZAkR?_Roe>DaMj+qP|+ zI(6#Jn>Sy-e*O3F-!*I2{Qmv>(4j-w;v4LMikm%M978H@y}9AY#bn6iaB)@V)t&zv zMMaiv_IH^1eU@;GznH9fhQYcE2{8)}GBgNx-e5nqsq49sm{VXx|A|zcmQCGTHwknd z+O@vL*EKTYz4g@iLyHX7NE+MwN9>6BQxRc#`RF3WHFGxm<$x4iY##|`oJUuQ{;$Kkq)y{{rb#apl28pJzX3_DsCnH`TyUZc`Ji3v**6Xs^dM=$5aJ7{@@nvO9^_9nI9#1dwYL>d3pKgyE}`YpM8IS z|NDjv0eKa^N$snYIhu@(jf4OF`8kebrHhKY=!%X{?AmNzo(UcTI2_*qw9A7Ah3>H6J=MP9yowU6bZs;cVs$jHdhhKG|| zPj7GwSfi<}y;;$_fyd?hx4XN`>sPK=(ZRsG`uNkc^}BbMzyH^-JLkgD1+U&c;@*6^ zTTJ)S&)?tQS5L^E5ZiW!?PT*6M_~iM!{_Af>;9DG<>>`yX1*-U>4LcT$(#ml>&BpM z+8VNri{wSJKYjYNhF{+95AP?b6RrWxWy~MdV{Ue?suWf@z;MX-q>{teqou%0+w{6wyn`OtFIM zHN>TN@&YCU1&AUuSDcDIFv-9ax#3i#!|YUV7Vn@3bh>4LPl)T?yLT^Ly0mTEwqwVR zef#$9%a<<~E?j79Yg@5m#oW1b4Wm77*cWT&CSz-hYWaF4=`+++w$kPzL*-j)&&1I(>}NGFNh*;pcK#3=353anjdqdVtALmPJijTxb z2!7V$+qC6rc!akwd*rvE?3mlzu11v=PPn~MPqtgmI_$>A7az6O#I>sIejjmFwmU`d q{g+v7|F{@|E@NP5Sl`dU%<$rx(DC;XI~RgPJYD@<)-gLJGywpKPqo7U diff --git a/airtime_mvc/public/css/images/search_auto_bg.png b/airtime_mvc/public/css/images/search_auto_bg.png index 6026bb51a876536ccb027726f630f47c234e9a77..95933679325f9017d3c71034ca9ff7373b6889f2 100644 GIT binary patch delta 551 zcmeC>TFI%{8Q|y6%O%Cdz`(%k>ERLtq=kT3oP!NWvN6j)nW(72n6lAJopJIk#+1of zjGFZYzP?ueMVaZDd5JkL`N^fZsd*)yF1AV)xdnPDnJHF|hNh-QZYIvg2Ifw#28M=C z&ZdTz2F9)~7EWfa=7vs63P6=WGqCBkbTzOrHZ?P{G%_?ZG;}qvbT)T%a&)t>bT%|_ zHZnB^>Yc33B&h&ZXNXJPXlNU1SD_EMj7@J#~xw#ob9ph?f?r3RfY~!oQuGiFXq5;}UgRcy`HNz)RT z!?IQ~nP1pJldQ;APKe3^F@3Lu1vNsF<&)g+6^O5MCWF=3{ z<%^}GH*MERN@z`zs%WXo|d0m=GV-!D&8)L>ND=%vm$`3|Gf zxZhS~@wIIT|^dnHw6q8aTO{I=h$|n>#rgJDD4rxlFcWl7T65 z!l~#9lR*sBBnw=MloX0ff>P70Qu32ab5rw5JY8&+Dsl_-QZiGlpn5HF>787_>{LG? z^@BVE17owNi(^Q|tv7cKPu~g%afbyT2{>_V?P@>-EoA9ezqDh7`*?W%1 z7fR<=G6u}3=eM8s^0(c${gw0h+nv2$Zsk5Uwd2um-Czcd0_8QYt7MMv`Tvyb*v`yZ ze{af{FeswP%rF_?}m@D=a--ADF@zJYD@<);T3K0RTB-_!0mB diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index c204c11b0..f5a166b18 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -331,8 +331,7 @@ fieldset.plain { .padded-strong { padding:10px; } -.input_text { - background:#dddddd url("images/input_bg.png") repeat-x scroll 0 0 ; +.input_text, input[type="text"], input[type="password"] { font-family:Arial, Helvetica, sans-serif; border: 1px solid #5b5b5b; font-size: 12px; @@ -341,14 +340,22 @@ fieldset.plain { padding: 0; text-indent: 3px; width:auto; + background-color: #dddddd; + border: 1px solid #5b5b5b; + box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset; +} + +input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_text_area:focus { + border: 1px solid #0088f1; } .auto-search { background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0; text-indent:25px; } -.input_text_area { - background:#dddddd url("images/input_bg.png") repeat-x scroll 0 0 ; +.input_text_area, textarea { + background-color: #dddddd; border: 1px solid #5b5b5b; + box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset; font-size: 13px; text-indent: 3px; } @@ -1200,10 +1207,14 @@ button, input { margin-right:6px } .button-bar-top .input_text.hasDatepicker, .input_text.hasDatepicker { - background:url(images/input_with_calendar_bg.png) no-repeat right 0; + background-image:url(images/input_with_calendar_bg.png); + background-repeat:no-repeat; + background-position:right 0; } .input_text.hasTimepicker { - background:url(images/input_with_time_bg.png) no-repeat right 0; + background-image:url(images/input_with_time_bg.png); + background-repeat:no-repeat; + background-position:right 0; } ul.errors { display:block; @@ -1445,11 +1456,12 @@ div.success{ } .formrow-repeat li { list-style-type:none; - margin:0 0 7px 0; + margin:0 0 8px 0; padding:0; - /*height:26px;*/ + height:25px; display:block; } +/* .formrow-repeat li .ui-button-icon-only { width:1.8em; } @@ -1467,6 +1479,37 @@ div.success{ display: block; line-height: 110%; } +*/ + +#add_show_rebroadcast_relative .ui-button-icon-only, +#add_show_rebroadcast_absolute .ui-button-icon-only { + width: 1.8em; +} +#add_show_rebroadcast_relative .ui-button-icon-only .ui-button-text, +#add_show_rebroadcast_absolute .ui-button-icon-only .ui-button-text, +#add_show_rebroadcast_relative .ui-button-icons-only .ui-button-text, +#add_show_rebroadcast_absolute .ui-button-icons-only .ui-button-text, +#add_show_rebroadcast_relative .ui-button-text-icon-primary .ui-button-text, +#add_show_rebroadcast_absolute .ui-button-text-icon-primary .ui-button-text { + font-size:12px; +} + +#add_show_rebroadcast_relative .ui-button-icon-only .ui-icon, +#add_show_rebroadcast_absolute .ui-button-icon-only .ui-icon { + margin-top: -8px; + position: absolute; + top: 50%; +} +#add_show_rebroadcast_relative .ui-button-text-icon-primary .ui-icon, +#add_show_rebroadcast_absolute .ui-button-text-icon-primary .ui-icon { + left: 0.4em; +} +#add_show_rebroadcast_relative .ui-button .ui-button-text, +#add_show_rebroadcast_absolute .ui-button .ui-button-text { + display: block; + line-height: 14px; +} + .formrow-repeat li .inline-text { color: #666666; padding: 0 6px 0 0; @@ -1613,3 +1656,71 @@ dd.radio-inline-list, .preferences dd.radio-inline-list { button.ui-button.md-cancel { padding: .4em 1em; } + +/*--//////////////////////// Changes/add-ons Jun 8th, 2011 ////////////////////////--*/ + +.dialogPopup.ui-dialog-content { + padding: 0.9em 1em; +} +.dialogPopup dl { + margin:0; + padding:0; +} +.dialogPopup dt { + margin:0; + padding: 0 0 5px; +} +.dialogPopup dt label { + font-weight: bold; +} +.dialogPopup dd { + margin:0 0 4px 0; + padding: 0 0 5px; +} +.dialogPopup dd input[type="text"]{ + width:100%; +} + +.info-text p { + font-size:12px; + color:#5b5b5b; + line-height:150%; + margin-top:0; +} + +.dialogPopup label input[type="checkbox"] { + float:left; + margin-right:6px; +} + +.dialogPopup fieldset { + padding: 10px; +} +.dialogPopup fieldset dd input[type="text"] { + width:99%; +} +fieldset.display_field { + background-color:#d5d5d5; + box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset; +} +label span { + font-weight:normal; +} + +.dialogPopup .display_field dt, .dialogPopup .display_field dd { + color: #353535; + float: left; + font-size: 13px; + margin: 0; + min-width: 90px; + padding: 6px 0; + text-align: left; + width:60%; + +} + +.dialogPopup .display_field dt { + clear: left; + font-weight:bold; + width:40%; +} \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index f350ded21..3839bdbe0 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -349,88 +349,16 @@ function setAddShowEvents() { var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val()); if(startDateTime.getTime() > endDateTime.getTime()){ - $('#add_show_end_date_no_repeat').css('background', '#F49C9C'); - $('#add_show_end_time').css('background', '#F49C9C'); + $('#add_show_end_date_no_repeat').css('background-color', '#F49C9C'); + $('#add_show_end_time').css('background-color', '#F49C9C'); }else{ - $('#add_show_end_date_no_repeat').css('background', ''); - $('#add_show_end_time').css('background', ''); + $('#add_show_end_date_no_repeat').css('background-color', ''); + $('#add_show_end_time').css('background-color', ''); } // calculate duration calculateDuration(endDateTime, startDateTime); }); - // auto puplate end date and time - /*$('#add_show_start_date, #add_show_end_time_no_repeat').change(function(){ - var startDate = $('#add_show_start_date').val().split('-'); - var startDateTime = new Date(startDate[1]+' '+startDate[2]+','+startDate[0]); - - var endDate = $('#add_show_end_date_no_repeat').val().split('-'); - var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]); - - if(startDateTime.getTime() > endDateTime.getTime()){ - if($(this) == $('#add_show_start_date')){ - var endDateTemp = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2); - $('#add_show_end_date_no_repeat').val(endDateTemp); - }else{ - var startDateTemp = startDateTime.getFullYear() + '-' + pad(startDateTime.getMonth()+1,2) + '-' + pad(startDateTime.getDate(),2); - $('#add_show_end_date_no_repeat').val(startDateTemp); - } - } - - var startDateTime = new Date(startDate[1]+' '+startDate[2]+','+startDate[0]+' '+$('#add_show_start_time').val()); - - var endDate = $('#add_show_end_date_no_repeat').val().split('-'); - var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val()); - - // if changed start time is greater than end, set end time to start time + 1 hour - if(startDateTime.getTime() > endDateTime.getTime()){ - endDateTime = new Date(startDateTime.getTime() + (1*60*60*1000)); - } - - var endDate = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2); - var endTime = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2); - - $('#add_show_end_date_no_repeat').val(endDate); - $('#add_show_end_time').val(endTime); - - // calculate duration - calculateDuration(endDateTime, startDateTime) - - }) - $('#add_show_start_time, #add_show_end_time').change(function(){ - var startDate = $('#add_show_start_date').val().split('-'); - var startDateTime = new Date(startDate[1]+' '+startDate[2]+','+startDate[0]+' '+$('#add_show_start_time').val()); - - var endDate = $('#add_show_end_date_no_repeat').val().split('-'); - var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val()); - - if($(this) == $('#add_show_start_time')){ - // if changed start time is greater than end, set end time to start time + 1 hour - if(startDateTime.getTime() > endDateTime.getTime()){ - endDateTime = new Date(startDateTime.getTime() + (1*60*60*1000)); - } - - var endDate = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2); - var endTime = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2); - - $('#add_show_end_date_no_repeat').val(endDate); - $('#add_show_end_time').val(endTime); - }else{ - // if changed start time is greater than end, set end time to start time + 1 hour - if(startDateTime.getTime() > endDateTime.getTime()){ - endDateTime = new Date(startDateTime.getTime() + (1*60*60*1000)); - } - - var endDate = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2); - var endTime = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2); - - $('#add_show_end_date_no_repeat').val(endDate); - $('#add_show_end_time').val(endTime); - } - - // calculate duration - calculateDuration(endDateTime, startDateTime) - })*/ function calculateDuration(endDateTime, startDateTime){ var duration; @@ -444,6 +372,7 @@ function setAddShowEvents() { } $('#add_show_duration').val(duration); } + function pad(number, length) { var str = '' + number; while (str.length < length) {