From ea9127b1d016612082f20480eb65be65630bdfe9 Mon Sep 17 00:00:00 2001 From: Naomi Date: Thu, 10 Feb 2011 18:24:29 -0500 Subject: [PATCH] CC-1910 new close button for add show --- .../scripts/schedule/add-show-form.phtml | 2 +- public/css/styles.css | 53 +++++++++++++++++-- public/js/airtime/schedule/add-show.js | 1 - 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/application/views/scripts/schedule/add-show-form.phtml b/application/views/scripts/schedule/add-show-form.phtml index e6c712228..9de9bdd60 100644 --- a/application/views/scripts/schedule/add-show-form.phtml +++ b/application/views/scripts/schedule/add-show-form.phtml @@ -1,7 +1,7 @@
+ Close -
diff --git a/public/css/styles.css b/public/css/styles.css index 33c10d2a8..0b56c43e1 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -174,7 +174,7 @@ select { border-width:1px 1px 0 1px; background:#141414 url(images/progressbar_bg.png) repeat-x 0 0; } -.progressbar .progress-song, .progressbar .progress-show { +.progressbar .progress-song, .progressbar .progress-show, .progressbar .progress-show-error { height:4px; width:0%; background:#f97202 url(images/progressbar_song.png) repeat-x 0 0; @@ -182,6 +182,9 @@ select { .progressbar .progress-show { background:#02cef9 url(images/progressbar_show.png) repeat-x 0 0; } +.progressbar .progress-show-error { + background:#d40000 url(images/progressbar_show_error.png) repeat-x 0 0; +} .now-playing-info .lenght { color:#c4c4c4; padding-left:6px; @@ -777,8 +780,8 @@ dt.block-display, dd.block-display { font-size:16px; font-weight:normal; } -#schedule_calendar { - width:98.5%; +#schedule_calendar { + width:98.5% } div.ui-datepicker { /*font-size: 75%;*/ @@ -1254,7 +1257,7 @@ ul.errors li { height:38px; } -.add-button { +.add-button, .ui-widget-content a.add-button { border: 1px solid #242424; background-color: #353535; background: -moz-linear-gradient(top, #494949 0, #353535 100%); @@ -1270,7 +1273,7 @@ ul.errors li { float:left; position:relative; } -.add-button:hover { +.add-button:hover, .ui-widget-content a.add-button:hover { border: 1px solid #000000; background-color: #353535; background: -moz-linear-gradient(top, #353535 0, #000000 100%); @@ -1293,3 +1296,43 @@ ul.errors li { background-position: -32px -128px; } +/*---//////////////////// NOW PLAYING COLORS ////////////////////---*/ +.playing-song { + background-color:#ff753c; +} +.playing-list { + background-color:#b4e0f7; +} +.gap { + background-color:#da5454; +} +.icon-link, .ui-widget-content a.icon-link { + color: #646464; + position: relative; + text-decoration: none; + padding: 0 0 0 20px; +} +.icon-link .ui-icon { + background-image:url(redmond/images/ui-icons_666666_256x240.png); + background-repeat: no-repeat; + display: block; + height: 16px; + left: 0.2em; + margin: -3px 5px 0 0; + overflow: hidden; + position: absolute; + top: 2px; + width: 16px; +} +.icon-link:hover, .ui-widget-content a.icon-link:hover { + color: #444444; + text-decoration:underline; +} +.icon-link:hover .ui-icon { + background-image:url(redmond/images/ui-icons_454545_256x240.png); +} + +.button-bar .icon-link { + float:left; + margin:7px 0 0 1px; +} \ No newline at end of file diff --git a/public/js/airtime/schedule/add-show.js b/public/js/airtime/schedule/add-show.js index 18f3fa137..091aedf88 100644 --- a/public/js/airtime/schedule/add-show.js +++ b/public/js/airtime/schedule/add-show.js @@ -113,7 +113,6 @@ function setAddShowEvents() { $("#add-show-close") - .button() .click(function(event){ event.stopPropagation(); event.preventDefault();