diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index fa7cf76fd..7e21d1376 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -567,15 +567,14 @@ class Application_Model_ShowInstance { public function getTimeScheduled() { $time = $this->_showInstance->getDbTimeFilled(); - - if (is_null($time)) { - $time = "00:00:00"; + + if ($time != "00:00:00") { + $milliseconds = substr(round(substr($time, 8), 2), 1); + $time = substr($time, 0, 8) . $milliseconds; + } else { + $time = "00:00:00.00"; } - else { - $formatter = new LengthFormatter($time); - $time = $formatter->format(); - } - + return $time; } @@ -610,9 +609,17 @@ class Application_Model_ShowInstance { $interval = $start->diff($end); $days = $interval->format("%d"); + $hours = sprintf("%02d" ,$interval->format("%h")); + + if ($days > 0) { + $totalHours = $days * 24 + $hours; + //$interval object does not have milliseconds so hard code to .00 + $returnStr = $totalHours . ":" . $interval->format("%I:%S") . ".00"; + } else { + $returnStr = $hours . ":" . $interval->format("%I:%S") . ".00"; + } - if ($days > 0) return "24:" . $interval->format("%I:%S"); - else return $interval->format("%h:%I:%S"); + return $returnStr; } public function getShowListContent() diff --git a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml index 00a9f2cd2..8eae5cb58 100644 --- a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml +++ b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml @@ -53,4 +53,4 @@ To play the media you will need to either update your browser to a recent version or update your Flash plugin. - \ No newline at end of file + diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index b4da890c9..983bb64a5 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -684,7 +684,7 @@ input[type="checkbox"] { width:13px; height:13px; } -/*---//////////////////// LOGIN ////////////////////---*/ +/*---//////////////////// LOGIN & PASSWORD RESET ////////////////////---*/ .login_box { margin: 0 auto 0 auto; @@ -703,7 +703,7 @@ input[type="checkbox"] { border:1px solid #181818; border-top-color:#4f4f4f; margin:0; - padding:8px 0 8px 14px; + padding:8px 0 8px 20px; font-size:15px; font-weight:bold; color:#bebebe; @@ -754,7 +754,7 @@ input[type="checkbox"] { .login-content { background:url(images/login_content_bg.png) no-repeat 0 bottom; - padding:10px 10px 12px 14px; + padding:10px 20px 14px; text-align:left; } .login-content dl, .login-content dl.zend_form { @@ -766,23 +766,23 @@ input[type="checkbox"] { } .login-content dd { - padding: 4px 0; - float: left; + /*float: left;*/ font-size: 1.2em; margin: 0; - padding: 4px 0 4px 15px; + padding: 0 0 9px 0; + display:block; } .login-content dt { - clear: left; color: #666666; - float: left; + /*float: left;*/ font-size: 1.2em; font-weight: bold; margin: 0; - padding: 4px 0; + padding: 0 0 6px 0; text-align: left; min-width:90px; clear:left; + display:block; } dt.block-display, dd.block-display { @@ -794,11 +794,31 @@ dt.block-display, dd.block-display { .login-content dt label { padding-right:0; + color:#a8a8a8; } -.login-content dd .input_text { - padding-right:0; - width:280px; +.login-content dd .input_text, .login-content dd input[type="text"], .login-content dd input[type="password"] { + width:99%; + font-size:14px; + padding: 6px 0 6px 3px; } +.login-content dd input.ui-button, .login-content dd input.btn { + width:100%; + font-size:14px; + padding: 6px 10px 6px; +} +.login-content .hidden, .hidden { + display:none; +} +.login-content .text-right, .text-right { + text-align:right; +} +.login-content .link { + color:#FF5D1A; + text-decoration:none; + } + .login-content .link:hover { + text-decoration:underline; + } /*---//////////////////// END LOGIN ////////////////////---*/ @@ -2566,4 +2586,74 @@ dd .stream-status { } .close-round:active { background-position:0 -36px; - } \ No newline at end of file + } + + +/*---//////////////////// NEW BUTTONS ////////////////////---*/ +.btn { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + padding: 4px 10px 4px; + margin-bottom: 0; + font-size: 13px; + line-height: 18px; + color: #fff; + text-align: center; + vertical-align: middle; + background-image: -moz-linear-gradient(top, #a3a3a3, #6e6e6e); + background-image: -ms-linear-gradient(top, #a3a3a3, #6e6e6e); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#a3a3a3), to(#6e6e6e)); + background-image: -webkit-linear-gradient(top, #a3a3a3, #6e6e6e); + background-image: -o-linear-gradient(top, #a3a3a3, #6e6e6e); + background-image: linear-gradient(top, #a3a3a3, #6e6e6e); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a3a3a3', endColorstr='#6e6e6e', GradientType=0); + border:1px solid #575757; + border-bottom-color: #333333; + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05); + cursor: pointer; + *margin-left: .3em; +} + + +.btn.disabled, +.btn[disabled] { + background: #fff; +} +.btn:active, +.btn.active { + background-color: #cccccc \9; +} +.btn:first-child { + *margin-left: 0; +} +.btn:hover { + color: #fff; + text-decoration: none; + background-color: #e6e6e6; + background-image: -moz-linear-gradient(top, #868686, #535353); + background-image: -ms-linear-gradient(top, #868686, #535353); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#868686), to(#535353)); + background-image: -webkit-linear-gradient(top, #868686, #535353); + background-image: -o-linear-gradient(top, #868686, #535353); + background-image: linear-gradient(top, #868686, #535353); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0); +} + +.btn.active, +.btn:active { + background-image: none; + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255,0.2); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2); + background-color: #727272; + outline: 0; + border-top-color:#333333 +} \ No newline at end of file diff --git a/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css b/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css index 1172a27ce..c1138458a 100644 --- a/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css +++ b/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css @@ -645,4 +645,4 @@ a.jp-shuffle-off:hover { font-weight:bold; } -/* @end */ \ No newline at end of file +/* @end */