diff --git a/livesupport/modules/htmlUI/var/html/css_img/bt_tabsm_off.gif b/livesupport/modules/htmlUI/var/html/css_img/bt_tabsm_off.gif new file mode 100755 index 000000000..47cb7c8fb Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bt_tabsm_off.gif differ diff --git a/livesupport/modules/htmlUI/var/html/css_img/bt_tabsm_on.gif b/livesupport/modules/htmlUI/var/html/css_img/bt_tabsm_on.gif new file mode 100755 index 000000000..269b49f4a Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bt_tabsm_on.gif differ diff --git a/livesupport/modules/htmlUI/var/html/styles_livesupport.css b/livesupport/modules/htmlUI/var/html/styles_livesupport.css index 5fd78271a..4dcbdf3bc 100755 --- a/livesupport/modules/htmlUI/var/html/styles_livesupport.css +++ b/livesupport/modules/htmlUI/var/html/styles_livesupport.css @@ -351,10 +351,53 @@ input, select { font-size: 12px; float: left; } + +/*############## SMALL Navigation tabs on top of content box ############*/ +#tabnavsmall { + position: absolute; + top: 175px; + left: 20px; + z-index: 1; +} + +#tabnavsmall ul { + width: auto; + list-style: none; + padding: 0; + display: block; +} + +#tabnavsmall a { + background: url("css_img/bt_tabsm_off.gif"); + display: block; + color: #666; + font-size: 11px; + font-weight: bold; + text-decoration: none; + width: 50px; + margin-right: 10px; + text-align: center; +} + +#tabnavsmall a:hover { + background: url("css_img/bt_tabsm_on.gif"); + color: #FFF; +} + +#tabnavsmall a.active { + background: url("css_img/bt_tabsm_on.gif"); + color: #FFF; +} + +#tabnavsmall li { + padding: 0; + float: left; +} + /* #################################### CONTENTAREA ############################### */ -.content { font-size: 12px; +.content { margin: 19px; margin-top: 0; float: left; @@ -608,48 +651,55 @@ table.scheduler_day td { font-size: 12px; padding-top: 2px; } -table.scheduler_week { font-size: 12px; +table.scheduler_week_time { + width: 20px; + border: 1px solid #7392A6; +} + +table.scheduler_week { width: 790px; border: 1px solid #7392A6; } -table.scheduler_week th { font-size: 12px; +table.scheduler_week a { + text-decoration: none; + color: #fff; +} + +table.scheduler_week th { background-color: #8baed1; color: #FFF; font-weight: bold; text-align: left; } -table.scheduler_week th.firstrow { font-size: 12px; - width: 34px; -} - -table.scheduler_week th.date { font-size: 12px; - width: 22px; +table.scheduler_week th.date { + width: 20px; border-left: 1px solid #7392A6; } -table.scheduler_week th.day { font-size: 12px; - width: 86px; +table.scheduler_week th.day { + width: 186px; } -table.scheduler_week td.firstrow_secondcol { font-size: 12px; +table.scheduler_week td.firstrow_secondcol { background-color: #CFDEE7; border: none; border-bottom: 1px solid #757575; padding: 0; } -table.scheduler_week td.date_secondcol { font-size: 12px; +table.scheduler_week td.date_secondcol { + width: 20px; background-color: #CFDEE7; border: none; border-left: 1px solid #7392A6; border-bottom: 1px solid #757575; - padding: 2px; + padding: 0px; font-weight: bold; } -table.scheduler_week td.day_secondcol { font-size: 12px; +table.scheduler_week td.day_secondcol { background-color: #CFDEE7; border: none; border-bottom: 1px solid #757575; @@ -657,14 +707,14 @@ table.scheduler_week td.day_secondcol { font-size: 12px; padding-left: 2px; } -table.scheduler_week td.firstrow { font-size: 12px; +table.scheduler_week td.firstrow { border: none; border-bottom: 1px solid #7392A6; padding: 2px; font-weight: bold; } -table.scheduler_week td.date { font-size: 12px; +table.scheduler_week td.date { border: none; border-left: 1px solid #7392A6; border-bottom: 1px solid #7392A6; @@ -672,7 +722,7 @@ table.scheduler_week td.date { font-size: 12px; background-color: #D0D0D0; } -table.scheduler_week td.date_full { font-size: 12px; +table.scheduler_week td.date_full { border: none; border-left: 1px solid #7392A6; border-bottom: 1px solid #7392A6; @@ -680,7 +730,7 @@ table.scheduler_week td.date_full { font-size: 12px; background-color: #97BACF; } -table.scheduler_week td.date_locked { font-size: 12px; +table.scheduler_week td.date_locked { border: none; border-left: 1px solid #7392A6; border-bottom: 1px solid #7392A6; @@ -690,14 +740,14 @@ table.scheduler_week td.date_locked { font-size: 12px; padding-top: 3px; } -table.scheduler_week td.day { font-size: 12px; +table.scheduler_week td.day { border: none; border-bottom: 1px solid #7392A6; padding: 0; background-color: #EAEAEA; } -table.scheduler_week td.day_full { font-size: 12px; +table.scheduler_week td.day_full { border: none; border-bottom: 1px solid #7392A6; padding: 2px; @@ -721,12 +771,11 @@ table.scheduler_week td p { font-size: 12px; margin: 0; } -table.scheduler_month{ font-size: 12px; +table.scheduler_month{ width: 790px; - border: 1px solid #7392A6; } -table.scheduler_month th { font-size: 12px; +table.scheduler_month th { background-color: #8baed1; color: #FFF; font-weight: bold; @@ -734,28 +783,37 @@ table.scheduler_month th { font-size: 12px; border: 1px solid #7392A6; } -table.scheduler_month td { font-size: 12px; +table.scheduler_month td { width: 113px; border: 1px solid #7392A6; padding: 2px; text-align: left; } -table.scheduler_month p { font-size: 12px; +table.scheduler_month p { margin: 0 0 10px 0; font-weight: bold; font-size: 11px; } -table.scheduler_month .scala { font-size: 12px; + +table.scheduler_month a { + color: #000; +} + +table.scheduler_month td.today { + background: #d5e2ee; +} + +table.scheduler_month .scala { margin: 0 0 2px 4px; - width: 96px; + width: 100px; height: 12px; background-color: #DADADA; border: 1px solid #7F95A7; } -table.scheduler_month .scala .scala_in { font-size: 12px; +table.scheduler_month .scala .scala_in { background: #DADADA url("css_img/bg_scala_in_scheduler.gif") repeat-x top left; font-size:1px; height: 12px; diff --git a/livesupport/modules/htmlUI/var/html/styles_popup.css b/livesupport/modules/htmlUI/var/html/styles_popup.css index cbf5ae552..68127b984 100755 --- a/livesupport/modules/htmlUI/var/html/styles_popup.css +++ b/livesupport/modules/htmlUI/var/html/styles_popup.css @@ -1,751 +1,131 @@ -body { font-size: 12px; - font-family: Arial, Verdana, Helvetica, sans-serif; - font-size: 12px; - color: #2C2C2C; - margin: 0px; -} - - -form { font-size: 12px; - margin: 15px 0 15px 0; -} - -.clearer { font-size: 12px; - clear: both; - height: 0; - line-height: 0; - font-size: 0; -} - -.container { font-size: 12px; - width: 100%; -} - -.button { font-size: 12px; - font-weight: bold; - color: #666; - background-color: #F7F9FB; - padding: 0 25px 0 25px; - cursor: pointer; - width: 100px; -} - -.button_large { font-size: 12px; - font-weight: bold; - color: #666; - background-color: #F7F9FB; - padding: 0 25px 0 25px; - cursor: pointer; - width: 150px; -} - -.button_small { font-size: 12px; - font-weight: bold; - color: #666; - background-color: #F7F9FB; - cursor: pointer; - width: 34px; -} - -input, select { font-size: 12px; - font-family: Arial, Verdana, Helvetica, sans-serif; - font-size: 12px; - border-top: 1px solid #C7CCCC; - border-left: 1px solid #C7CCCC; - border-bottom: 1px solid #A4A9A9; - border-right: 1px solid #A4A9A9; -} - -.checkbox { font-size: 12px; - border: none; -} - -.input { font-size: 12px; - height: 16px; -} - -.input[class] { font-size: 12px; - height: 15px; -} - -/*######################### HEADER ########################### */ - -.headLeft { font-size: 12px; - margin: 26px 16px 0 10px; - float: left; - width: 169px; -} - -.headLeft[class] { font-size: 12px; - margin-left: 22px; -} - -.headLeft .container { font-size: 12px; - margin-left: 10px; -} - -.loginname { font-size: 12px; - margin: 15px 0 8px 0; - font-weight: bold; -} - -.headRight { font-size: 12px; - float: left; - margin-top: 10px; - height: 115px; -} - -.station { font-size: 12px; - margin: 30px 30px 0 30px; - float: left; -} - -.frequence { font-size: 12px; - margin: 15px 0 8px 0; -} - -.onair { font-size: 12px; - float: left; - margin: 24px 30px 0 0; -} - -.onair img { font-size: 12px; - display: block; - margin-top: 10px; -} - -/* ************* station time **************** */ - -.stationtime { font-size: 12px; - margin: 34px 30px 0 0; - float: left; - font-weight: bold; - color: #666; -} - -.stationtime { font-size: 12px; - text-transform: uppercase; -} - -.stationtime h1 { font-size: 12px; - font-size: 12px; - margin: 0; - text-transform: none; -} - -.stationtime .clock { font-size: 12px; - font-size: 22px; - float: left; - margin: 0; -} - -.stationtime .timezone { font-size: 12px; - float: left; - margin: 9px 0 0 15px; -} - -/* *************** what playing ****************** */ - -.whatplaying { font-size: 12px; - float: left; - border: 1px solid #CCC; - background-color: #F9FAFB; - margin-top: 13px; - padding: 10px 8px; - width: 250px; -} - -.whatplaying .nowplaying { font-size: 12px; - font-weight: bold; - font-size: 15px; -} - -.whatplaying .scala { font-size: 12px; - width: 250px; - height: 8px; - margin-top: 5px; - background-color: #DADADA; - border-top: 1px solid #B5B5B5; - border-left: 1px solid #B5B5B5; - border-bottom: 1px solid #6F6F6F; - border-right: 1px solid #6F6F6F; -} - -.whatplaying .scala .scala_in { font-size: 12px; - background: #DADADA url("css_img/bg_scala_in.gif") repeat-x top left; - font-size:1px; - height: 8px; -} - -.whatplaying .time { font-size: 12px; - width: 250px; - font-size: 11px; -} - -.whatplaying .time .left { font-size: 12px; - float: left; - width: 125px; -} - -.whatplaying .time .right { font-size: 12px; - width: 125px; - float: left; - text-align: right; -} - -.whatplaying p { font-size: 12px; - font-size: 11px; - font-weight: bold; - margin: 10px 0 0 0; -} - -/* #################################### NAVIGATION ############################### */ - -.container_nav { font-size: 12px; - height: 26px; - clear: both; - background: url("css_img/bg_navigation.gif") repeat-x top left; - margin-bottom: 38px; -} - -.container_nav[class] { font-size: 12px; - padding-left: 10px; - margin-bottom: 50px; -} - -#nav, #nav ul { font-size: 12px; - float: left; - width: auto; - list-style: none; - line-height: 24px; - padding: 0; - margin: 2px 0 0 15px; - display: block; -} - -#nav a { font-size: 12px; - display: block; - color: #666; - text-decoration: none; - padding-right: 40px; -} - -#nav li { font-size: 12px; - float: left; - padding: 0; -} - -#nav li ul { font-size: 12px; - display: block; - position: absolute; - left: -999px; - width: 120px; - font-weight: normal; - margin: 0; - z-index: 1; -} - -#nav li ul li { font-size: 12px; - clear: both; - margin: 0; -} - -#nav li ul a { font-size: 12px; - width: 100px; - line-height: 25px; - background: #eee; - padding-left : 5px; - border-top: 0px solid #ACB3BA; - border-left: 1px solid #ACB3BA; - border-bottom: 1px solid #ACB3BA; - border-right: 1px solid #ACB3BA; -} - -#nav a:hover { font-size: 12px; - color: #000; -} - -#nav li li a:hover { font-size: 12px; - background: #D6E3EF; -} - -#nav li:hover ul , #nav li:hover ul, #nav li.sfhover ul , #nav li.sfhover ul { font-size: 12px; - left: -999em; -} - -#nav li:hover ul, #nav li li:hover ul, #nav li li li:hover ul, #nav li.sfhover ul, #nav li li.sfhover ul, #nav li li li.sfhover ul { font-size: 12px; - left: auto; -} - - -/* #################################### contenttabnav ############################### */ - -.contenttabnav { - height: 26px; - clear: both; - /*background: url("css_img/bg_navigation.gif") repeat-x top left;*/ - margin-bottom: 12px; - margin-top: 12px; -} - -.contenttabnav[class] { - padding-left: 10px; - margin-top: 12px; - margin-bottom: 12px; -} - -.contenttabnav A { font-size: 12px; - /*display: block;*/ - color: #5286ba; - text-decoration: none; -} - -.contenttabnav a:hover { font-size: 12px; - color: #000; - text-decoration: underline; -} - -/*############## Navigation tabs on top of content box ############*/ -#tabnav { - position: absolute; - top: 175px; - left: 20px; - z-index: 1; -} - -#tabnav ul { - width: auto; - list-style: none; - padding: 0; - display: block; -} - -#tabnav a { - background: url("css_img/bt_tab_off.gif"); - display: block; - color: #666; - font-size: 11px; - font-weight: bold; - text-decoration: none; - width: 99px; - margin-right: 10px; - text-align: center; -} - -#tabnav a:hover { - background: url("css_img/bt_tab_on.gif"); - color: #FFF; -} - -#tabnav a.active { - background: url("css_img/bt_tab_on.gif"); - color: #FFF; -} - -#tabnav li { - padding: 0; - float: left; -} - -/* #################################### CONTENTAREA ############################### */ - - -.content { font-size: 12px; - margin: 19px; - margin-top: 0; - float: left; -} - -.container_elements { font-size: 12px; - border: 1px solid #cfcfcf; - padding: 6px; - margin-bottom: 21px; -} - -.container_elements h1 { font-size: 12px; - font-size: 18px; - margin: 0 0 4px 0; - color: #666; -} - -.head { font-size: 12px; - background-color: #5286ba; - font-weight: bold; - color: #FFF; -} - -.head .left { font-size: 12px; - padding: 5px 0 3px 10px; - float: left; - width: 330px; -} - -.head .right { font-size: 12px; - padding: 5px 10px 3px 0; - float: left; - text-align: right; - width: 224px; -} - -.container_table { font-size: 12px; - /*height: 275px;*/ - overflow: auto; -} - - -table { font-size: 12px; - border-collapse: collapse; -} - -table td { font-size: 12px; - padding: 0 6px 0 12px; - border-right: 1px solid #333; - height: 19px; - vertical-align: top; -} - -table tr.blue_head td { font-size: 12px; - background-color: #8baed1; - color: #FFF; - font-weight: bold; - -} - -A#blue_head { font-size: 12px; - color:#fff; -} - -table tr.blue1 td { font-size: 12px; - color: #000; - background-color: #d5e2ee; -} - -table tr.blue2 td { font-size: 12px; - color: #000; - background-color: #f5f5f5; -} - -table tr.red td { font-size: 12px; - background-color: #FBAAAA; -} - -.footer { font-size: 12px; - padding: 4px 5px 5px 0; - background-color: #8baed1; - text-align: right; - margin-bottom: 8px; -} - -.container_button { font-size: 12px; - margin-top: 4px; -} - -.container_search { - margin-bottom: 4px; -} - -.comment { font-size: 12px; - float: left; - font-size: 10px; - margin: 5px 0 0 10px; -} - -.select_width_comment { font-size: 12px; - float:left; - margin-left: 3px; -} - -.select_width_comment[class] { font-size: 12px; - margin-left: 0; -} - - -.tablebottom { font-size: 12px; - float: left; - margin-left: 0px; - background-color: #8baed1; -} - -.counter { font-size: 12px; - float: left; - margin-left: 7px; - font-weight: bold; - background-color: #8baed1; -} - -.counter[class] { font-size: 12px; - margin-left: 15px; -} - -.container_browse { - width: 170px; - float: left; - margin: 0px 0px 10px 0px; -} - -.area_browse { - width: 174px; - height: 100px; -} - -.area_browse[class] { - width: 180px; -} - -.comment_browse { - font-size: 10px; -} - -.container_button_upload { font-size: 12px; - margin: 20px 0 0 204px; -} - -.container_button_upload[class] { font-size: 12px; - margin-left: 200px; -} - -label { font-size: 12px; - display: block; - float: left; - width: 200px; -} - - -/* ############################################# scheduler ################################# */ - -.container_calender_overview { - width: 235px; -} - -.container_calender_overview p { - font-size: 10px; - margin-top: 0; - float: right; -} - -.month_year { - border: 1px solid #cdcdcd; - border-bottom: none; - padding: 5px 20px; - float: right; -} - -.calender_overview { - border: 1px solid #cdcdcd; -} - -table.calender_overview_table { - width: 100%; - margin-bottom: 5px; -} - -table.calender_overview_table th { - background-color: #5286ba; - color: #FFF; -} - -table.calender_overview_table td { - border: 0; - text-align: center; - padding: 5px 5px 0 5px; -} - -table.calender_overview_table td.full { - font-weight: bold -} - -table.calender_overview_table th.week { - border-right: 1px solid #FFF; -} - -table.calender_overview_table td.week { - border-right: 1px solid #cdcdcd; -} - -table.calender_overview_table a.active { - color: #FFF; - font-weight: bold; - background-color: #5286ba; - padding: 1px 0; - width: 100%; - display: block; -} - -table.calender_overview_table a { font-size: 12px; - text-decoration: none; - color: #000; -} - -table.calender_overview_table a.not_this_month { font-size: 12px; - color: #999; -} - -.head_scheduler { font-size: 12px; - float: left; - width: 50%; -} - -.container_button_scheduler { font-size: 12px; - float: left; - width: 50%; - text-align: right; - margin-top: 5px; -} - -table.scheduler_day td { font-size: 12px; - border-bottom: 1px solid #ccc; - padding-top: 2px; -} - -table.scheduler_week { font-size: 12px; - width: 790px; - border: 1px solid #7392A6; -} - -table.scheduler_week th { font-size: 12px; - background-color: #8baed1; - color: #FFF; - font-weight: bold; - text-align: left; -} - -table.scheduler_week th.firstrow { font-size: 12px; - width: 34px; -} - -table.scheduler_week th.date { font-size: 12px; - width: 22px; - border-left: 1px solid #7392A6; -} - -table.scheduler_week th.day { font-size: 12px; - width: 86px; -} - -table.scheduler_week td.firstrow_secondcol { font-size: 12px; - background-color: #CFDEE7; - border: none; - border-bottom: 1px solid #757575; - padding: 0; -} - -table.scheduler_week td.date_secondcol { font-size: 12px; - background-color: #CFDEE7; - border: none; - border-left: 1px solid #7392A6; - border-bottom: 1px solid #757575; - padding: 2px; - font-weight: bold; -} - -table.scheduler_week td.day_secondcol { font-size: 12px; - background-color: #CFDEE7; - border: none; - border-bottom: 1px solid #757575; - padding: 0; - padding-left: 2px; -} - -table.scheduler_week td.firstrow { font-size: 12px; - border: none; - border-bottom: 1px solid #7392A6; - padding: 2px; - font-weight: bold; -} - -table.scheduler_week td.date { font-size: 12px; - border: none; - border-left: 1px solid #7392A6; - border-bottom: 1px solid #7392A6; - padding: 0; - background-color: #D0D0D0; -} - -table.scheduler_week td.date_full { font-size: 12px; - border: none; - border-left: 1px solid #7392A6; - border-bottom: 1px solid #7392A6; - padding: 0; - background-color: #97BACF; -} - -table.scheduler_week td.date_locked { font-size: 12px; - border: none; - border-left: 1px solid #7392A6; - border-bottom: 1px solid #7392A6; - background-color: #FFCACB; - text-align: center; - padding: 0; - padding-top: 3px; -} - -table.scheduler_week td.day { font-size: 12px; - border: none; - border-bottom: 1px solid #7392A6; - padding: 0; - background-color: #EAEAEA; -} - -table.scheduler_week td.day_full { font-size: 12px; - border: none; - border-bottom: 1px solid #7392A6; - padding: 2px; - background-color: #E7ECEF; -} - -table.scheduler_week td.day_locked { font-size: 12px; - border: none; - border-bottom: 1px solid #7392A6; - padding: 2px; - background-color: #EAEAEA; -} - -table.scheduler_week td h2 { font-size: 12px; - font-size: 11px; - margin: 0; -} - -table.scheduler_week td p { font-size: 12px; - font-size: 11px; - margin: 0; -} - -table.scheduler_month{ font-size: 12px; - width: 790px; - border: 1px solid #7392A6; -} - -table.scheduler_month th { font-size: 12px; - background-color: #8baed1; - color: #FFF; - font-weight: bold; - text-align: center; - border: 1px solid #7392A6; -} - -table.scheduler_month td { font-size: 12px; - width: 113px; - border: 1px solid #7392A6; - padding: 2px; - text-align: left; -} - -table.scheduler_month p { font-size: 12px; - margin: 0 0 10px 0; - font-weight: bold; - font-size: 11px; -} - -table.scheduler_month .scala { font-size: 12px; - margin: 0 0 2px 4px; - width: 96px; - height: 12px; - background-color: #DADADA; - border: 1px solid #7F95A7; -} - -table.scheduler_month .scala .scala_in { font-size: 12px; - background: #DADADA url("css_img/bg_scala_in_scheduler.gif") repeat-x top left; - font-size:1px; - height: 12px; -} +body { + font-size: 12px; + font-family: Arial, Verdana, Helvetica, sans-serif; + font-size: 12px; + color: #2C2C2C; + margin: 0px; + vertical-align : middle; +} + +img { font-size: 12px; + border: none; +} + +form { font-size: 12px; + margin: 15px 0 15px 0; +} + +.clearer { font-size: 12px; + clear: both; + height: 0; + line-height: 0; + font-size: 0; +} + +.container { font-size: 12px; + width: 100%; +} + +.button { font-size: 12px; + font-weight: bold; + color: #666; + background-color: #F7F9FB; + padding: 0 25px 0 25px; + cursor: pointer; + width: 100px; +} + +.button_large { font-size: 12px; + font-weight: bold; + color: #666; + background-color: #F7F9FB; + padding: 0 25px 0 25px; + cursor: pointer; + width: 150px; +} + +.button_small { font-size: 12px; + font-weight: bold; + color: #666; + background-color: #F7F9FB; + cursor: pointer; + width: 34px; +} + +input, select { font-size: 12px; + font-family: Arial, Verdana, Helvetica, sans-serif; + font-size: 12px; + border-top: 1px solid #C7CCCC; + border-left: 1px solid #C7CCCC; + border-bottom: 1px solid #A4A9A9; + border-right: 1px solid #A4A9A9; +} + +.checkbox { font-size: 12px; + border: none; +} + +.input { font-size: 12px; + height: 16px; +} + +.input[class] { font-size: 12px; + height: 15px; +} + + +/* #################################### CONTENTAREA ############################### */ + + +.content { font-size: 12px; + margin: 19px; + margin-top: 0; + float: left; +} + +.container_elements { font-size: 12px; + border: 1px solid #cfcfcf; + padding: 6px; + margin-bottom: 21px; +} + +.container_elements h1 { font-size: 12px; + font-size: 18px; + margin: 0 0 4px 0; + color: #666; +} + +.head { font-size: 12px; + background-color: #5286ba; + font-weight: bold; + color: #FFF; +} + +.head .left { font-size: 12px; + padding: 5px 0 3px 10px; + float: left; + width: 330px; +} + +.head .right { font-size: 12px; + padding: 5px 10px 3px 0; + float: left; + text-align: right; + width: 224px; +} + +.container_table { font-size: 12px; + /*height: 275px;*/ + overflow: auto; +} + + +table { font-size: 12px; + border-collapse: collapse; +} + +table td { font-size: 12px; + padding: 0 6px 0 12px; + height: 19px; +} + diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index 249d19382..db1e57d3e 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/livesupport/modules/htmlUI/var/html/ui_handler.php @@ -179,7 +179,7 @@ switch($_REQUEST['act']){ case "PL.activate": if ($uiHandler->PLAYLIST->activate($_REQUEST['id']) === TRUE) $uiHandler->SCRATCHPAD->addItem($_REQUEST['id']); - $uiHandler->PLAYLIST->setRedirect(); + $uiHandler->PLAYLIST->setRedirect(); break; case "PL.create": @@ -267,7 +267,7 @@ if ($uiHandler->alertMsg) $_SESSION['alertMsg'] = $uiHandler->alertMsg; if (ob_get_contents()) { $ui_wait = 5; } -ob_end_clean; +ob_end_clean; ?> diff --git a/livesupport/modules/htmlUI/var/templates/loader/index.tpl b/livesupport/modules/htmlUI/var/templates/loader/index.tpl index 92c68fda2..318c92a56 100755 --- a/livesupport/modules/htmlUI/var/templates/loader/index.tpl +++ b/livesupport/modules/htmlUI/var/templates/loader/index.tpl @@ -3,13 +3,13 @@
- +
+ - + - + - - +
diff --git a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl index 831da739d..c0dc10b84 100755 --- a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl +++ b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl @@ -1,8 +1,5 @@ {*Smarty template*} -{* -
-*} {include file="statusbar.tpl"} @@ -16,48 +13,51 @@ {/if} *} -{if $fileList} - {include file="file/list.tpl"} -{/if} - -{if $showLibrary} - {include file="library/main.tpl"} -{/if} - -{if $showSubjects} - {include file="subjects.tpl"} -{/if} - -{if $showFile} - {include file="filedata.tpl"} -{/if} - -{if $editItem} - {include file="file/edit.tpl"} -{/if} - -{if $changeStationPrefs} - {include file="stationprefs.tpl"} -{/if} - -{if $PL_simpleManagement} - {include file="playlist/simpleManagement.tpl"} -{/if} - -
-{if $simpleSearchForm} - {include file="library/simpleSearchForm.tpl"} -{/if} - -{if $SCRATCHPAD} - {include file="scratchpad.tpl"} -{/if} -
- {if $showScheduler} +
+ {include file="scheduler/calendar.tpl"} + {if $SCRATCHPAD} + {include file="scratchpad.tpl"} + {/if} +
{include file="scheduler/main.tpl"} -{/if} +{else} -{* -
-*} + {if $fileList} + {include file="file/list.tpl"} + {/if} + + {if $showLibrary} + {include file="library/main.tpl"} + {/if} + + {if $showSubjects} + {include file="subjects.tpl"} + {/if} + + {if $showFile} + {include file="filedata.tpl"} + {/if} + + {if $editItem} + {include file="file/edit.tpl"} + {/if} + + {if $changeStationPrefs} + {include file="stationprefs.tpl"} + {/if} + + {if $PL_simpleManagement} + {include file="playlist/simpleManagement.tpl"} + {/if} + +
+ {if $simpleSearchForm} + {include file="library/simpleSearchForm.tpl"} + {/if} + + {if $SCRATCHPAD} + {include file="scratchpad.tpl"} + {/if} +
+{/if} diff --git a/livesupport/modules/htmlUI/var/templates/popup/header.tpl b/livesupport/modules/htmlUI/var/templates/popup/header.tpl index ae7c0cf55..0f48fd70a 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/header.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/header.tpl @@ -9,4 +9,4 @@ -
+ diff --git a/livesupport/modules/htmlUI/var/templates/popup/login.tpl b/livesupport/modules/htmlUI/var/templates/popup/login.tpl index 60f68a8a3..001c7bad8 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/login.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/login.tpl @@ -1,18 +1,23 @@ {include file="popup/header.tpl"} {$login.javascript} -
-
- {$login.hidden} - - - - - -
{$login.login.label}{$login.login.html}
{$login.pass.label}{$login.pass.html}
{$login.langid.label}{$login.langid.html}
{$login.requirednote}{$login.Submit.html} {$login.cancel.html}
-
-
- + + + + +
+
+
+ {$login.hidden} + + + + + +
{$login.login.label}{$login.login.html}
{$login.pass.label}{$login.pass.html}
{$login.langid.label}{$login.langid.html}
{$login.requirednote}{$login.Submit.html} {$login.cancel.html}
+
+
+
diff --git a/livesupport/modules/htmlUI/var/templates/popup/logout.tpl b/livesupport/modules/htmlUI/var/templates/popup/logout.tpl index c312d3cce..05650860b 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/logout.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/logout.tpl @@ -1,18 +1,22 @@ {include file="popup/header.tpl"} -
-
-
- - - -
{tra 0='Are you sure to logout $1' 1=$USER.login}
-   - -
-
-
-
+ + + + +
+
+
+ + + +
{tra 0='Are you sure to logout $1' 1=$USER.login}
+   + +
+
+
+
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl index faea28572..557453d1c 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl @@ -3,13 +3,25 @@ {$SCHEDULER->buildMonth()} {$SCHEDULER->buildWeek()} + + + +
+

##Scheduler Navigation##

-

Click any date below to view in scheduler

@@ -72,7 +84,9 @@
+
+{* @@ -133,3 +147,4 @@ {/foreach}
{$SCHEDULER->curr.year}-{$SCHEDULER->curr.month}-{$SCHEDULER->curr.day}
+*} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/main.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/main.tpl index de55088f4..acad53cf7 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/main.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/main.tpl @@ -1,17 +1,4 @@ {include file="scheduler/mouseOver.js.tpl"} -
-{include file="sub/x.tpl"} - - - - - - - -{include file="scheduler/calendar.tpl"} - {assign var="view" value=$SCHEDULER->curr.view} {include file="scheduler/$view.tpl"} - -
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl index 8a2eb4427..630c95738 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl @@ -1,6 +1,42 @@ {$SCHEDULER->buildMonth()} {$SCHEDULER->buildWeek()} + + +
+
+

##Monthly View##

+ + + {foreach from=$SCHEDULER->Week item="_Weekday"} + + {/foreach} + + +{foreach from=$SCHEDULER->Month item="_Day"} + {if $_Day.isSelected} + {assign var="percentage" value=$SCHEDULER->getDayUsagePercentage($_Day.year, $_Day.month, $_Day.day)} + {else} + {assign var="percentage" value="0"} + {/if} + + {if $_Day.isFirst} + + {/if} + + + + {if $_Day.isLast} + + {/if} +{/foreach} + +{*
{$_Weekday.label.full}
+

{$_Day.day}

+
+
+
+
@@ -31,3 +67,4 @@ {/foreach}
+*} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl index 8336223b4..8db38e91c 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl @@ -3,6 +3,114 @@ {assign var="_minwidth" value=20} {assign var="_scale" value=$SCHEDULER->getDayTimingScale()} + + +
+
+

##Weekly View##

+
+ + +
+
 
+ + + {foreach from=$SCHEDULER->Week item="_Day"} + +{/foreach} + + + + + + + + + + + + + + + + + + +{foreach from=$SCHEDULER->Week item="_Day"} + {assign var="_oneday" value=$SCHEDULER->getDayTiming($_Day.year, $_Day.month, $_Day.day)} + {assign var="_year" value=$_Day.year} + {assign var="_month" value=$_Day.month} + {assign var="_day" value=$_Day.day} + {assign var="_hour" value=$_Day.hour} + + + + + +{/foreach} + + + + + + + + + + + + + + + + + + +
{$_Day.label.full}
29303101020304
+ + {foreach from=$_scale item="_hour"} + + + + {/foreach} +
+
{$_hour|string_format:'%02d'}
+
+
+ + {foreach from=$_oneday item="i"} + {assign var = "_start" value = $i.entry.start|regex_replace:"/[0-9]+T/":""} + {assign var = "_end" value = $i.entry.end|regex_replace:"/[0-9]+T/":""} + {assign var = "_period" value = "$_start-$_end"} + {assign var = "_title" value = $i.entry.title} + {assign var = "_creator" value = $i.entry.creator} + + + {if is_array($i.entry)} + {if $i.length/$_divisor > $_minwidth} + + {else} + + {/if} + {else} + + {/if} + + {/foreach} +
{$_title}
{$_period}
{$_creator}
+
12p

Cat Fancy

12:00 - 14:00

Dave Simmons

locked

Talk of the Nation

21:00 - 24:00

Ira Flatow

+ {* +
+ + + +
+ *} +
 
+
+
+ + @@ -32,7 +140,7 @@ {assign var="_hour" value=$_Day.hour}
- +
{foreach from=$_scale item="_hour"}
@@ -71,3 +179,4 @@
+ diff --git a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl index b9f0c022b..92f4df874 100755 --- a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl @@ -60,15 +60,15 @@ function hpopup(url, name) { - var width = 10; - var height = 10; + var width = 50; + var height = 50; var screenX; var screenY; var Xpos; var Ypos; var Pwidth; var Pheight; - + if (ie5) { Xpos = window.screenLeft; Ypos = window.screenTop; diff --git a/livesupport/modules/htmlUI/var/templates/userinfo.tpl b/livesupport/modules/htmlUI/var/templates/userinfo.tpl index 5e3e924eb..1f3f75ca7 100755 --- a/livesupport/modules/htmlUI/var/templates/userinfo.tpl +++ b/livesupport/modules/htmlUI/var/templates/userinfo.tpl @@ -2,10 +2,10 @@ {if $USER.userid}
##Signed in## : {$USER.login}
- + {* - + *} {else} - -{/if} \ No newline at end of file + +{/if}