diff --git a/livesupport/modules/htmlUI/var/Smarty/libs/plugins/outputfilter.localizer.php b/livesupport/modules/htmlUI/var/Smarty/libs/plugins/outputfilter.localizer.php index 69c967058..6a396525b 100755 --- a/livesupport/modules/htmlUI/var/Smarty/libs/plugins/outputfilter.localizer.php +++ b/livesupport/modules/htmlUI/var/Smarty/libs/plugins/outputfilter.localizer.php @@ -26,7 +26,7 @@ } function smarty_outputfilter_localizer($compiled, &$smarty) - { + { $pattern = '/##.*##/U'; return preg_replace_callback($pattern, 'smarty_tra', $compiled); } diff --git a/livesupport/modules/htmlUI/var/formmask/general.inc.php b/livesupport/modules/htmlUI/var/formmask/general.inc.php index 9f06d2d4b..1405039e5 100755 --- a/livesupport/modules/htmlUI/var/formmask/general.inc.php +++ b/livesupport/modules/htmlUI/var/formmask/general.inc.php @@ -10,19 +10,7 @@ $ui_fmask = array( array( 'element' => 'basics', 'type' => 'header', - 'label' => 'Basic Settings', - ), - array( - 'element' => 'stationMaxfilesize', - 'isPref' => TRUE, - 'type' => 'text', - 'label' => 'Reduce Upload Filesize
(must be smaller than ' .ini_get('upload_max_filesize').')', - 'rule' => 'numeric', - 'attributes' => array( - 'onClick' => 'alert ("Note: System Maximum is set to '. - ini_get('upload_max_filesize') - .' in php.ini\n You can just reduce this amount here.")' - ) + 'label' => 'Station Settings', ), array( 'rule' => 'nopunctuation', @@ -70,6 +58,18 @@ $ui_fmask = array( 'format' => UI_REGEX_URL, 'rulemsg' => 'URL seems not to be valid' ), + array( + 'element' => 'stationlogo', + 'type' => 'file', + 'label' => 'Station Logo', + 'requiredmsg'=> 'please select Logo file', + 'attributes'=> array('multiple' => 'application/pdf') + ), + array( + 'element' => 'systemsettings', + 'type' => 'header', + 'label' => 'System Settings' + ), array( 'element' => UI_SCRATCHPAD_MAXLENGTH_KEY, 'isPref' => TRUE, @@ -82,16 +82,16 @@ $ui_fmask = array( ) ), array( - 'element' => 'upload', - 'type' => 'header', - 'label' => 'Upload' - ), - array( - 'element' => 'stationlogo', - 'type' => 'file', - 'label' => 'Station Logo', - 'requiredmsg'=> 'please select Logo file', - 'attributes'=> array('multiple' => 'application/pdf') + 'element' => 'stationMaxfilesize', + 'isPref' => TRUE, + 'type' => 'text', + 'label' => 'Reduce Upload Filesize
(must be smaller than ' .ini_get('upload_max_filesize').')', + 'rule' => 'numeric', + 'attributes' => array( + 'onClick' => 'alert ("Note: System Maximum is set to '. + ini_get('upload_max_filesize') + .' in php.ini\n You can just reduce this amount here.")' + ) ), array( 'element' =>'Submit', @@ -473,16 +473,20 @@ $ui_fmask = array( 'element' => 'category', 'type' => 'select', 'label' => 'Category', - 'attributes'=> array('onChange' => 'this.form.act.value="BROWSE.setCategory"; this.form.submit()') + 'attributes'=> array( + 'onChange' => 'this.form.act.value="BROWSE.setCategory"; this.form.submit()', + 'style' => 'width: 180px;', + 'id' => 'category_1' + ) ), 'value' => array( 'element' => 'value', 'type' => 'select', 'multiple' => TRUE, 'attributes'=> array( - 'size' => 10, - 'STYLE' => 'width: 220px', - 'onChange' => 'this.form.act.value="BROWSE.setValue"; this.form.submit()' + 'size' => 10, + 'class' => 'area_browse', + 'onChange' => 'this.form.act.value="BROWSE.setValue"; this.form.submit()' ) ) ), @@ -524,6 +528,11 @@ $ui_fmask = array( 'type' => 'hidden', 'constant' => 'SEARCH.simpleSearch' ), + array( + 'element' => 'simplesearch', + 'type' => 'header', + 'label' => 'Library Search', + ), array( 'element' => 'criterium', 'type' => 'text', diff --git a/livesupport/modules/htmlUI/var/html/css_img/bg_head.gif b/livesupport/modules/htmlUI/var/html/css_img/bg_head.gif new file mode 100755 index 000000000..26d280b43 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bg_head.gif differ diff --git a/livesupport/modules/htmlUI/var/html/css_img/bg_headRight_left.gif b/livesupport/modules/htmlUI/var/html/css_img/bg_headRight_left.gif new file mode 100755 index 000000000..d4a7cbb14 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bg_headRight_left.gif differ diff --git a/livesupport/modules/htmlUI/var/html/css_img/bg_headRight_right.gif b/livesupport/modules/htmlUI/var/html/css_img/bg_headRight_right.gif new file mode 100755 index 000000000..fd3e66ef2 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bg_headRight_right.gif differ diff --git a/livesupport/modules/htmlUI/var/html/css_img/bg_navigation.gif b/livesupport/modules/htmlUI/var/html/css_img/bg_navigation.gif new file mode 100755 index 000000000..0e0725f8b Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bg_navigation.gif differ diff --git a/livesupport/modules/htmlUI/var/html/css_img/bg_scala_in.gif b/livesupport/modules/htmlUI/var/html/css_img/bg_scala_in.gif new file mode 100755 index 000000000..73ca65143 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bg_scala_in.gif differ diff --git a/livesupport/modules/htmlUI/var/html/css_img/bg_scala_in_scheduler.gif b/livesupport/modules/htmlUI/var/html/css_img/bg_scala_in_scheduler.gif new file mode 100755 index 000000000..fc448125d Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bg_scala_in_scheduler.gif differ diff --git a/livesupport/modules/htmlUI/var/html/css_img/bt_tab_off.gif b/livesupport/modules/htmlUI/var/html/css_img/bt_tab_off.gif new file mode 100755 index 000000000..4390969cc Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bt_tab_off.gif differ diff --git a/livesupport/modules/htmlUI/var/html/css_img/bt_tab_on.gif b/livesupport/modules/htmlUI/var/html/css_img/bt_tab_on.gif new file mode 100755 index 000000000..2d9efd94b Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/css_img/bt_tab_on.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/bg_head.gif b/livesupport/modules/htmlUI/var/html/img/bg_head.gif new file mode 100755 index 000000000..26d280b43 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/bg_head.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/bt_bottom.gif b/livesupport/modules/htmlUI/var/html/img/bt_bottom.gif new file mode 100755 index 000000000..057de2ca4 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/bt_bottom.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/bt_delete.gif b/livesupport/modules/htmlUI/var/html/img/bt_delete.gif new file mode 100755 index 000000000..65c5c3e34 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/bt_delete.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/bt_top.gif b/livesupport/modules/htmlUI/var/html/img/bt_top.gif new file mode 100755 index 000000000..1f12c8ac5 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/bt_top.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/el_offair.gif b/livesupport/modules/htmlUI/var/html/img/el_offair.gif new file mode 100755 index 000000000..3ba8c96bf Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/el_offair.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/el_onair.gif b/livesupport/modules/htmlUI/var/html/img/el_onair.gif new file mode 100755 index 000000000..7262a7ae6 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/el_onair.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_locked.gif b/livesupport/modules/htmlUI/var/html/img/ic_locked.gif new file mode 100755 index 000000000..4d6b72474 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_locked.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_playlist_01.gif b/livesupport/modules/htmlUI/var/html/img/ic_playlist_01.gif new file mode 100755 index 000000000..c55c43cd9 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_playlist_01.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_playlist_01_blue1.gif b/livesupport/modules/htmlUI/var/html/img/ic_playlist_01_blue1.gif new file mode 100755 index 000000000..0cb6d2c44 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_playlist_01_blue1.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_playlist_01_blue2.gif b/livesupport/modules/htmlUI/var/html/img/ic_playlist_01_blue2.gif new file mode 100755 index 000000000..3cf581e19 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_playlist_01_blue2.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_playlist_02_blue1.gif b/livesupport/modules/htmlUI/var/html/img/ic_playlist_02_blue1.gif new file mode 100755 index 000000000..669a5229a Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_playlist_02_blue1.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_playlist_02_blue2.gif b/livesupport/modules/htmlUI/var/html/img/ic_playlist_02_blue2.gif new file mode 100755 index 000000000..d181dbc29 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_playlist_02_blue2.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_playlist_03_blue1.gif b/livesupport/modules/htmlUI/var/html/img/ic_playlist_03_blue1.gif new file mode 100755 index 000000000..fbb3cf11d Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_playlist_03_blue1.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_playlist_03_blue2.gif b/livesupport/modules/htmlUI/var/html/img/ic_playlist_03_blue2.gif new file mode 100755 index 000000000..7f8cddbd6 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_playlist_03_blue2.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_01_blue1.gif b/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_01_blue1.gif new file mode 100755 index 000000000..6fc7e1f1e Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_01_blue1.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_01_blue2.gif b/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_01_blue2.gif new file mode 100755 index 000000000..aed400423 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_01_blue2.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_02_blue1.gif b/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_02_blue1.gif new file mode 100755 index 000000000..f0eab3d91 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_02_blue1.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_02_blue2.gif b/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_02_blue2.gif new file mode 100755 index 000000000..03c0b4828 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/ic_scratchpad_02_blue2.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/logo_livesupport.gif b/livesupport/modules/htmlUI/var/html/img/logo_livesupport.gif new file mode 100755 index 000000000..0b5ba9e3b Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/logo_livesupport.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/logo_wnyc.gif b/livesupport/modules/htmlUI/var/html/img/logo_wnyc.gif new file mode 100755 index 000000000..49edf2467 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/logo_wnyc.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/progress.gif b/livesupport/modules/htmlUI/var/html/img/progress.gif new file mode 100755 index 000000000..c8da5b331 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/progress.gif differ diff --git a/livesupport/modules/htmlUI/var/html/styles_livesupport.css b/livesupport/modules/htmlUI/var/html/styles_livesupport.css new file mode 100755 index 000000000..dfe14b5eb --- /dev/null +++ b/livesupport/modules/htmlUI/var/html/styles_livesupport.css @@ -0,0 +1,726 @@ +body { font-size: 12px; + font-family: Arial, Verdana, Helvetica, sans-serif; + font-size: 12px; + color: #2C2C2C; + margin: 0px; + background: #FFF url("css_img/bg_head.gif") no-repeat; +} + +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; +} + +/*######################### 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; +} + +#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 { font-size: 12px; + width: 235px; +} + +.container_calender_overview p { font-size: 12px; + font-size: 10px; + margin-top: 0; + float: right; +} + +.month_year { font-size: 12px; + border: 1px solid #cdcdcd; + border-bottom: none; + padding: 5px 20px; + float: right; +} + +.calender_overview { font-size: 12px; + border: 1px solid #cdcdcd; +} + +table.calender_overview_table { font-size: 12px; + width: 100%; + margin-bottom: 5px; +} + +table.calender_overview_table th { font-size: 12px; + background-color: #5286ba; + color: #FFF; +} + +table.calender_overview_table td { font-size: 12px; + border: 0; + text-align: center; + padding: 5px 5px 0 5px; +} + +table.calender_overview_table td.full { font-size: 12px; + font-weight: bold +} + +table.calender_overview_table th.week { font-size: 12px; + border-right: 1px solid #FFF; +} + +table.calender_overview_table td.week { font-size: 12px; + border-right: 1px solid #cdcdcd; +} + +table.calender_overview_table a.active { font-size: 12px; + 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; +} diff --git a/livesupport/modules/htmlUI/var/templates/changeStationPrefs.tpl b/livesupport/modules/htmlUI/var/templates/changeStationPrefs.tpl index 8087a3160..6487e08dc 100755 --- a/livesupport/modules/htmlUI/var/templates/changeStationPrefs.tpl +++ b/livesupport/modules/htmlUI/var/templates/changeStationPrefs.tpl @@ -1,6 +1,6 @@ -
-{include file="sub/x.tpl"} -
+{*include file="sub/x.tpl"*} +
+
{include file="sub/dynForm_sections.tpl"} -
+ \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/file/edit.tpl b/livesupport/modules/htmlUI/var/templates/file/edit.tpl index c0c3e1b2b..8b03809aa 100755 --- a/livesupport/modules/htmlUI/var/templates/file/edit.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/edit.tpl @@ -41,21 +41,21 @@ -{literal} + diff --git a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl index 48f2c8086..933ae2cb6 100755 --- a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl @@ -41,36 +41,21 @@ function spread(element, name) function showMain() { - document.getElementById('metadataform').style.height=400; - document.getElementById('masterpanel').style.height=600; - document.getElementById('div_Main').style.visibility=''; - document.getElementById('div_Main').style.height=''; - document.getElementById('div_Music').style.visibility='hidden'; - document.getElementById('div_Music').style.height='0'; - document.getElementById('div_Talk').style.visibility='hidden'; - document.getElementById('div_Talk').style.height='0'; + document.getElementById('div_Main').style.display='inline'; + document.getElementById('div_Music').style.display='none'; + document.getElementById('div_Talk').style.display='none'; } function showMusic() { - document.getElementById('metadataform').style.height=1600; - document.getElementById('masterpanel').style.height=1800; - document.getElementById('div_Main').style.visibility='hidden'; - document.getElementById('div_Main').style.height='0'; - document.getElementById('div_Music').style.visibility=''; - document.getElementById('div_Music').style.height=''; - document.getElementById('div_Talk').style.visibility='hidden'; - document.getElementById('div_Talk').style.height='0'; + document.getElementById('div_Main').style.display='none'; + document.getElementById('div_Music').style.display='inline'; + document.getElementById('div_Talk').style.display='none'; } function showTalk() { - document.getElementById('metadataform').style.height=800; - document.getElementById('masterpanel').style.height=1000; - document.getElementById('div_Main').style.visibility='hidden'; - document.getElementById('div_Main').style.height='0'; - document.getElementById('div_Music').style.visibility='hidden'; - document.getElementById('div_Music').style.height='0'; - document.getElementById('div_Talk').style.visibility=''; - document.getElementById('div_Talk').style.height=''; + document.getElementById('div_Main').style.display='none'; + document.getElementById('div_Music').style.display='none'; + document.getElementById('div_Talk').style.display='inline'; } showMain(); {/literal} diff --git a/livesupport/modules/htmlUI/var/templates/file/objects.tpl b/livesupport/modules/htmlUI/var/templates/file/objects.tpl index b7c7f93a8..db50a745c 100755 --- a/livesupport/modules/htmlUI/var/templates/file/objects.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/objects.tpl @@ -14,6 +14,7 @@ {if count($structure.listdata)} {foreach from=$structure.listdata item=i} + {assign var="_listen_gunid" value=$i.gunid} diff --git a/livesupport/modules/htmlUI/var/templates/footer.tpl b/livesupport/modules/htmlUI/var/templates/footer.tpl index c62269fe9..62692091c 100644 --- a/livesupport/modules/htmlUI/var/templates/footer.tpl +++ b/livesupport/modules/htmlUI/var/templates/footer.tpl @@ -1,6 +1,5 @@ {*Smarty template*} - - + - + \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/header.tpl b/livesupport/modules/htmlUI/var/templates/header.tpl index 0f204a514..511990d3b 100755 --- a/livesupport/modules/htmlUI/var/templates/header.tpl +++ b/livesupport/modules/htmlUI/var/templates/header.tpl @@ -1,12 +1,33 @@ -{*Smarty template*} - - - - - - {include file="script/basics.js.tpl"} - {include file="script/contextMenue.js.tpl"} - {include file="script/collector.js.tpl"} - - - \ No newline at end of file +{* *} + + + + + LIVESUPPORT + + {literal} + + {/literal} + + + + {include file="script/basics.js.tpl"} + {include file="script/contextMenue.js.tpl"} + {include file="script/collector.js.tpl"} + + + +
diff --git a/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl b/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl index 895045b6e..0cd76ffe6 100755 --- a/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl @@ -1,41 +1,73 @@ -{literal} - -{/literal} -
-{include file="sub/x.tpl"} - - - - - - - - - - - - - -
- {foreach from=$browseForm.col1 item=dynform} - {include file="sub/dynForm_plain.tpl"} - {/foreach} - - {foreach from=$browseForm.col2 item=dynform} - {include file="sub/dynForm_plain.tpl"} - {/foreach} - - {foreach from=$browseForm.col3 item=dynform} - {include file="sub/dynForm_plain.tpl"} - {/foreach} -
- {foreach from=$browseForm.global item=dynform} - {include file="sub/dynForm_plain.tpl"} - {/foreach} -
- -
\ No newline at end of file +{assign var="_style_select" value=" style='width: 180px;'"} +{assign var="_style_textarea" value=" class='area_browse'"} + + +
+

Browse

+ + + + +
+ {foreach from=$browseForm.col1 item=dynform} + {include file="library/dynForm_browse.tpl"} + {/foreach} + + {foreach from=$browseForm.col2 item=dynform} + {include file="library/dynForm_browse.tpl"} + {/foreach} + + {foreach from=$browseForm.col3 item=dynform} + {include file="library/dynForm_browse.tpl"} + {/foreach} +
+ {foreach from=$browseForm.global item=dynform} + {include file="sub/dynForm_plain.tpl"} + {/foreach} +
+ +{assign var="_style_select" value=""} +{assign var="_style_textarea" value=""} +{* +{literal} + +{/literal} +
+{include file="sub/x.tpl"} + + + + + + + + + + + + + +
+ {foreach from=$browseForm.col1 item=dynform} + {include file="sub/dynForm_plain.tpl"} + {/foreach} + + {foreach from=$browseForm.col2 item=dynform} + {include file="sub/dynForm_plain.tpl"} + {/foreach} + + {foreach from=$browseForm.col3 item=dynform} + {include file="sub/dynForm_plain.tpl"} + {/foreach} +
+ {foreach from=$browseForm.global item=dynform} + {include file="sub/dynForm_plain.tpl"} + {/foreach} +
+ +
+*} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/library/dynForm_browse.tpl b/livesupport/modules/htmlUI/var/templates/library/dynForm_browse.tpl new file mode 100755 index 000000000..c1f646b93 --- /dev/null +++ b/livesupport/modules/htmlUI/var/templates/library/dynForm_browse.tpl @@ -0,0 +1,58 @@ +{$dynform.javascript} + +{$dynform.hidden} + +{foreach item=element from=$dynform.elements} + {if $element.style} + {include file="smarty-dynamic-`$element.style`.tpl} + {/if} + {* + NOTE: Another way ist to have smarty template code in + $element.style. In this case you can do: + + {if $element.style} + {eval var=$element.style} + {/if} + *} + + + {if $element.type eq 'static'} + {$element.html} + + {else} +
+ {if $element.label} + + {/if} + {if $element.error}{$element.error}
{/if} + {if $element.type eq "group"} + {foreach key=gkey item=gitem from=$element.elements} + {$gitem.label}{$gitem.html} + {if $gitem.required}*{/if} + {if $element.separator}{cycle values=$element.separator} + {/if} + {/foreach} + {else} + {$element.html} + {/if} + +
+ {/if} +{/foreach} + + {if $dynform.requirednote and not $dynform.frozen} + {*
+ {$dynform.requirednote} +
*} + {/if} + + + diff --git a/livesupport/modules/htmlUI/var/templates/library/main.tpl b/livesupport/modules/htmlUI/var/templates/library/main.tpl index c5ffb3042..fffbf0de8 100755 --- a/livesupport/modules/htmlUI/var/templates/library/main.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/main.tpl @@ -1,15 +1,30 @@ -{if $searchForm} - {assign var="_act_prefix" value="SEARCH"} - {include file="library/searchForm.tpl"} - {SEARCH->getResult assign=_results} - {SEARCH->getCriteria assign=_criteria} -{/if} - -{if $browseForm} - {assign var="_act_prefix" value="BROWSE"} - {include file="library/browseForm.tpl"} - {BROWSE->getResult assign=_results} - {BROWSE->getCriteria assign=_criteria} -{/if} - -{include file="library/results.tpl"} \ No newline at end of file +{if $searchForm} +
+ +
+
+ {assign var="_act_prefix" value="SEARCH"} + {include file="library/searchForm.tpl"} + {SEARCH->getResult assign=_results} + {SEARCH->getCriteria assign=_criteria} +{/if} + +{if $browseForm} +
+ +
+
+ {assign var="_act_prefix" value="BROWSE"} + {include file="library/browseForm.tpl"} + {BROWSE->getResult assign=_results} + {BROWSE->getCriteria assign=_criteria} +{/if} + +{include file="library/results.tpl"} +
\ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/library/results.tpl b/livesupport/modules/htmlUI/var/templates/library/results.tpl index b99917af9..b45731091 100755 --- a/livesupport/modules/htmlUI/var/templates/library/results.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/results.tpl @@ -1,12 +1,61 @@ +{if $_results.cnt > 0} +
 
+
+ + + + + + + + {foreach from=$_results.items item=i} + + + + + + + + + {/foreach} +
##Title####Creator####Duration####Type##
+ {if $PLAYLIST.id == $i.id} + {$i.title|truncate:30} + {else} + {$i.title|truncate:30} + {/if} + {$i.creator}{$i.duration}{$i.type}
+
+
+
+ {if $_results.prev}##previous##{/if} + {foreach from=$_results.pagination item=p key=k} + {$p} + {/foreach} + {if $_results.next}##next##{/if} +    + ##Count##: {$_results.cnt}   + ##Page##:  {$_results.page+1}   + ##Range##: {$_criteria.offset+1}-{if ($_criteria.offset+$_criteria.limit)>$_results.cnt}{$_results.cnt}{else}{$_criteria.offset+$_criteria.limit}{/if} +
+ +
+ +{else} + ##No match found.## +{/if} + + +{*
{if $_results.cnt > 0} - - - - + + + + {foreach from=$_results.items item=i} @@ -46,8 +95,9 @@
{tra 0=Title}{tra 0=Creator}{tra 0=Duration}{tra 0=Type}##Title####Creator####Duration####Type##
{else} - No match found. + ##No match found.## {/if} -
+
+*} diff --git a/livesupport/modules/htmlUI/var/templates/library/searchForm.js.tpl b/livesupport/modules/htmlUI/var/templates/library/searchForm.js.tpl index e86bd05f9..dc48893cd 100755 --- a/livesupport/modules/htmlUI/var/templates/library/searchForm.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/searchForm.js.tpl @@ -3,8 +3,7 @@ function SearchForm_displayRow(row) { - document.getElementById('searchRow_' + row).style.visibility = 'visible'; - document.getElementById('searchRow_' + row).style.height = '30px'; + document.getElementById('searchRow_' + row).style.display = 'inline'; } function SearchForm_addRow() @@ -18,21 +17,22 @@ function SearchForm_addRow() return false; } } - + function SearchForm_hideRow(row) { - document.getElementById('searchRow_' + row).style.visibility = 'hidden'; - document.getElementById('searchRow_' + row).style.height = '0px'; - document.forms['search'].elements['row_' + Number(row) + '[0]'].options[0].selected=true; - document.forms['search'].elements['row_' + Number(row) + '[1]'].options[0].selected=true; + document.getElementById('searchRow_' + row).style.display = 'none'; + document.forms['search'].elements['row_' + Number(row) + '[0]'].options[0].selected = true; + document.forms['search'].elements['row_' + Number(row) + '[1]'].options[0].selected = true; document.forms['search'].elements['row_' + Number(row) + '[2]'].value = ''; } function SearchForm_dropRow(row) { + if (document.forms['search'].elements['counter'].value <= 1) + return false; var n; - for (n=row; n -{include file="sub/x.tpl"} -
{foreach from=$searchForm item=dynform} +
+

##Search##

{include file="sub/dynForm_plain.tpl"} +
{/foreach} -
-
- diff --git a/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl b/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl index 05a524d7e..17bd3be6f 100755 --- a/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl @@ -1,5 +1,12 @@ {assign var="dynform" value=$simpleSearchForm} - -
-{include file="sub/dynForm_plain.tpl"} -
+ +
+

##Library Search##

+
+
+ + +
+
+
+ \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/main.tpl b/livesupport/modules/htmlUI/var/templates/main.tpl index f49d7bc4d..807ab71a7 100755 --- a/livesupport/modules/htmlUI/var/templates/main.tpl +++ b/livesupport/modules/htmlUI/var/templates/main.tpl @@ -2,6 +2,4 @@ {include file="header.tpl"} {include file="masterpanel.tpl"} - - - + \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl index 585644a79..edd7ea55e 100755 --- a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl +++ b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl @@ -1,4 +1,8 @@ +{*Smarty template*} + +{*
+*} {include file="statusbar.tpl"} @@ -6,14 +10,6 @@ {include file="menu_top.tpl"} {/if} -{if $SCRATCHPAD} - {include file="scratchPad.tpl"} -{/if} - -{if $simpleSearchForm} - {include file="library/simpleSearchForm.tpl"} -{/if} - {if $structure} {include file="file/path.tpl"} {/if} @@ -50,9 +46,20 @@ {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/main.tpl"} {/if} +{*
- +*} diff --git a/livesupport/modules/htmlUI/var/templates/menu_top.tpl b/livesupport/modules/htmlUI/var/templates/menu_top.tpl index 789f5e811..81887957b 100755 --- a/livesupport/modules/htmlUI/var/templates/menu_top.tpl +++ b/livesupport/modules/htmlUI/var/templates/menu_top.tpl @@ -1,13 +1,33 @@ - \ No newline at end of file + +
+ +
+ +{* + + +*} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl index 865952003..d44d6c28c 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl @@ -5,14 +5,12 @@ {foreach from=$PL->getFlat() key='pos' item='i'} - + {$i.fadein_ms|string_format:"%d"} ms - + @@ -26,9 +24,7 @@ {/foreach} {if $n} - + {$i.fadeout_ms|string_format:"%d"} ms {/if} diff --git a/livesupport/modules/htmlUI/var/templates/scratchPad.tpl b/livesupport/modules/htmlUI/var/templates/scratchPad.tpl index 27ccd7cb7..1896db715 100755 --- a/livesupport/modules/htmlUI/var/templates/scratchPad.tpl +++ b/livesupport/modules/htmlUI/var/templates/scratchPad.tpl @@ -1,4 +1,63 @@ {assign var="_PL_activeId" value=$PL->getActiveId()} + +{if is_array($SCRATCHPAD)} +
+
+

##Scratch Pad##

+
 
+
+ + + + + + + + + + + {foreach from=$SCRATCHPAD item=i} + + + + + + + + {/foreach} + +
##Title####Duration####Type##
+ {if $_PL_activeId == $i.id} + {$i.title|truncate:30} + {else} + {$i.title|truncate:30} + {/if} + {$i.duration}{$i.type|truncate:8}
+
+ +
+ + + + ##Clear## +
+
+
+{/if} + +{* + +{assign var="_PL_activeId" value=$PL->getActiveId()}
ScratchPad @@ -52,3 +111,4 @@ {/if}
+*} diff --git a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl index 1252a74fa..c14c9d378 100755 --- a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl @@ -48,7 +48,7 @@ Ypos = window.screenY; Pwidth = window.innerWidth; Pheight = window.innerHeight; - } + } url = url + '&is_popup=1'; screenX = (Xpos + Pwidth/2 - width/2); screenY = (Ypos + Pheight/2 - height/2); @@ -58,11 +58,11 @@ window.popupwin.focus(); } - function hpopup(url, name) //hidden popup! 'width=1, height=1' - { + function hpopup(url, name) + { url = url + '&is_popup=1'; - popupwin = window.open(url, name); - //window.parent.focus(); + popupwin = window.open(url, name, 'width=1, height=1'); + window.parent.focus(); } {/literal} diff --git a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl index 879bac367..5f30f8c7b 100644 --- a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl @@ -1,9 +1,9 @@ -{literal} - -{/literal} + diff --git a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl index f2d235da6..c6af808bc 100755 --- a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl @@ -5,126 +5,136 @@ // Nur für IE 5+ und NN 6+ ie5 = (document.getElementById && document.all && document.styleSheets) ? 1 : 0; nn6 = (document.getElementById && !document.all) ? 1 : 0; -menuStatus = 0; -document.onmouseup = hideMenu; -document.write(''); -menuWidth = 0, -menuHeight = 0; +contextmenuStatus = 0; +document.onmouseup = hidecontextmenu; +document.write('
'); +contextmenuWidth = 0, +contextmenuHeight = 0; + +function contextmenu(param) { + var contextmenuHeader = "
" + + "
    "; + var contextmenuFooter = "
"; + var contextmenuHtml = ''; -function menu(param) { - var menuHeader = ""; - var menuHtml = ''; var sp2 = "  "; var sp5 = sp2 + sp2 + " "; // Leerzeichen als Abstandshalter (flexibler und code-sparender als eine aufwendige Tabellenkonstruktion) ; var oF = "onfocus = 'if (this.blur) this.blur()'"; // Um hässlichen Linkrahmen in einigen Browsern zu vermeiden; var entry = new Array(); - //menuStatus = 0; + //contextmenuStatus = 0; - for (var i = 1; i < menu.arguments.length; ++i) { - switch (menu.arguments[i]) { + for (var i = 1; i < contextmenu.arguments.length; ++i) { + switch (contextmenu.arguments[i]) { + {/literal} case "PL.display": - menuHtml = menuHtml + " Display this Playlist "; + contextmenuHtml = contextmenuHtml + "
  •  Display this Playlist 
    • "; break; case "PL.release": - menuHtml = menuHtml + " Release Playlist "; + contextmenuHtml = contextmenuHtml + "
  •  Release Playlist 
    • "; break; case "PL.addItem": - menuHtml = menuHtml + " Add to active Playlist "; + contextmenuHtml = contextmenuHtml + "
  •  Add to active Playlist 
    • "; break; case "PL.removeItem": - menuHtml = menuHtml + " Remove Item from Playlist "; + contextmenuHtml = contextmenuHtml + "
  •  Remove Item from Playlist 
    • "; break; case "PL.activate": - menuHtml = menuHtml + " Activate this Playlist "; + contextmenuHtml = contextmenuHtml + "
  •  Activate this Playlist 
    • "; break; case "PL.create": - menuHtml = menuHtml + " New Playlist using Item "; + contextmenuHtml = contextmenuHtml + "
  •  New Playlist using Item 
    • "; break; case "PL.changeFadeIn": - menuHtml = menuHtml + " Change Fadein "; + contextmenuHtml = contextmenuHtml + "
  •  Change Fadein 
    • "; break; case "PL.changeTransition": - menuHtml = menuHtml + " Change Transition "; + contextmenuHtml = contextmenuHtml + "
  •  Change Transition 
    • "; break; case "PL.changeFadeOut": - menuHtml = menuHtml + " Change Fadeout "; + contextmenuHtml = contextmenuHtml + "
  •  Change Fadeout 
    • "; break; case "PL.editMetaData": - menuHtml = menuHtml + " Edit MData "; + contextmenuHtml = contextmenuHtml + "
  •  Edit MData 
    • "; break; case "SP.addItem": - menuHtml = menuHtml + " Add to ScratchPad "; + contextmenuHtml = contextmenuHtml + "
  •  Add to ScratchPad 
    • "; break; case "SP.removeItem": - menuHtml = menuHtml + " Remove from Scratchpad "; + contextmenuHtml = contextmenuHtml + "
  •  Remove from Scratchpad 
    • "; + break; + + case "listen": + i++; + contextmenuHtml = contextmenuHtml + "
  •  Listen 
    • "; break; case "edit": - menuHtml = menuHtml + " Edit "; + contextmenuHtml = contextmenuHtml + "
  •  Edit 
    • "; break; case "delete": - menuHtml = menuHtml + " !Delete Item! "; + contextmenuHtml = contextmenuHtml + "
  •  !Delete Item! 
    • "; break; case "fileList": - menuHtml = menuHtml + " List Folder "; + contextmenuHtml = contextmenuHtml + "
  •  List Folder 
    • "; break; case "SCHEDULER.addItem": - menuHtml = menuHtml + " Insert Playlist here "; + contextmenuHtml = contextmenuHtml + "
  •  Insert Playlist here 
    • "; break; case "SCHEDULER.removeItem": - menuHtml = menuHtml + " Remove Playlist "; + contextmenuHtml = contextmenuHtml + "
  •  Remove Playlist 
    • "; break; + {literal} } } - document.getElementById('menucontainer').innerHTML = menuHeader + menuHtml + menuFooter; + document.getElementById('contextmenucontainer').innerHTML = contextmenuHeader + contextmenuHtml + contextmenuFooter; - document.oncontextmenu = showMenu; + document.oncontextmenu = showcontextmenu; return false; } -function showMenu(e) { +function showcontextmenu(e) { if (ie5) { - if (event.clientX > menuWidth) xPos = event.clientX - menuWidth + document.body.scrollLeft; + if (event.clientX > contextmenuWidth) xPos = event.clientX - contextmenuWidth + document.body.scrollLeft; else xPos = event.clientX + document.body.scrollLeft; - if (event.clientY > menuHeight) yPos = event.clientY - menuHeight + document.body.scrollTop; + if (event.clientY > contextmenuHeight) yPos = event.clientY - contextmenuHeight + document.body.scrollTop; else yPos = event.clientY + document.body.scrollTop; } else { - if (e.pageX > menuWidth + window.pageXOffset) xPos = e.pageX - menuWidth; - else xPos = e.pageX; - if (e.pageY > menuHeight + window.pageYOffset) yPos = e.pageY - menuHeight; - else yPos = e.pageY; + if (e.pageX > contextmenuWidth + window.pageXOffset) xPos = e.pageX - contextmenuWidth; + else xPos = e.pageX; + if (e.pageY > contextmenuHeight + window.pageYOffset) yPos = e.pageY - contextmenuHeight; + else yPos = e.pageY; } - document.getElementById("menu").style.left = xPos; - document.getElementById("menu").style.top = yPos; - menuStatus = 1; + document.getElementById("contextmenu").style.left = xPos; + document.getElementById("contextmenu").style.top = yPos; + //document.getElementById('contextmenustyle').innerHTML = ''; + + contextmenuStatus = 1; document.oncontextmenu = null; } -function hideMenu(e) { - if (menuStatus == 1) { - setTimeout("document.getElementById('menu').style.top =- 250", 100); - menuStatus = 0; +function hidecontextmenu(e) { + if (contextmenuStatus == 1) { + setTimeout("document.getElementById('contextmenu').style.top =- 250", 100); + contextmenuStatus = 0; } } @@ -143,9 +153,48 @@ function darklight() {/literal} diff --git a/livesupport/modules/htmlUI/var/templates/statusbar.tpl b/livesupport/modules/htmlUI/var/templates/statusbar.tpl index 69fe078df..0a15362de 100755 --- a/livesupport/modules/htmlUI/var/templates/statusbar.tpl +++ b/livesupport/modules/htmlUI/var/templates/statusbar.tpl @@ -1,36 +1,95 @@ -{include file="script/clock.js.tpl"} -
    - -
    - server time -
    - -
    - -
    - local time -
    - -
    - -
    - -
    - -
    - {$STATIONPREFS.stationName} -
    - {$STATIONPREFS.frequency} -
    - -
    - {$SCHEDULER->getNowNextClip()} -
    - {$STATIONPREFS.frequency} -
    - -
    - {include file="userinfo.tpl"} -
    - -
    \ No newline at end of file +{include file="script/clock.js.tpl"} + + +
    + Livesupport Logo +
    + {include file="userinfo.tpl"} +
    +
    + + +
    + +
    + {$STATIONPREFS.stationName} +
    {$STATIONPREFS.stationFrequency}
    +
    + + +
    + on air + +
    + + +
    +

    ##Station Time##

    +
    {$smarty.now|date_format:"%H:%M:%S"} +
    cet
    +
    + {* +

    ##Local Time##

    +
    + +
    cet
    +
    + *} +
    + + +
    + {$SCHEDULER->getNowNextClip()} +
    Now Playing: Don Quixote
    +
    +
     
    +
    +
    +
    Elapsed:00:05:24
    +
    Remaining:00:02:05
    +
    +
    +

    Playing Next: Diego Diego 00:03:25

    +
    + +
    + + +{* + +
    + +
    + server time +
    + +
    + +
    + local time +
    + +
    + +
    + +
    + +
    + {$STATIONPREFS.stationName} +
    + {$STATIONPREFS.frequency} +
    + +
    + {$SCHEDULER->getNowNextClip()} +
    + {$STATIONPREFS.frequency} +
    + +
    + {include file="userinfo.tpl"} +
    + +
    +*} diff --git a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl index 570ada9b5..10129ffde 100755 --- a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl +++ b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl @@ -1,10 +1,9 @@ {assign var="_PL_activeId" value=$PL->getActiveId()} -onMouseOver="highlight()" -onMouseOut="darklight()" -onContextmenu="return menu('{$i.id}' +onContextmenu="return contextmenu('{$i.id}' {$moreContextBefore} - {if ($i.type == 'audioclip' || $i.type == 'webstream')} + {if $i.type == 'audioclip'} + , 'listen', '{$i.gunid}' {if $_PL_activeId} , 'PL.addItem' {else} @@ -13,7 +12,16 @@ onContextmenu="return menu('{$i.id}' , 'edit', 'delete' {/if} - {if ($i.type == 'playlist')} + {if $i.type == 'webstream'} + {if $_PL_activeId} + , 'PL.addItem' + {else} + , 'PL.create' + {/if} + , 'edit', 'delete' + {/if} + + {if $i.type == 'playlist'} {if $_PL_activeId} {if $_PL_activeId == $i.id} , 'PL.release' diff --git a/livesupport/modules/htmlUI/var/templates/sub/dynForm_plain.tpl b/livesupport/modules/htmlUI/var/templates/sub/dynForm_plain.tpl index 84cf3582e..274a7532c 100644 --- a/livesupport/modules/htmlUI/var/templates/sub/dynForm_plain.tpl +++ b/livesupport/modules/htmlUI/var/templates/sub/dynForm_plain.tpl @@ -3,8 +3,6 @@ {$dynform.hidden} {foreach item=element from=$dynform.elements} - - {if $element.style} {include file="smarty-dynamic-`$element.style`.tpl} {/if} @@ -18,23 +16,28 @@ *} - {if $element.type eq 'static'} + {if $element.type eq 'static'} {$element.html} {else} -
    - {if $element.required}*{/if} - {if $element.label}{$element.label}:{/if} - - - {if $element.error}{$element.error}
    {/if} - {if $element.type eq "group"} - {foreach key=gkey item=gitem from=$element.elements}{$gitem.label}{$gitem.html}{if $gitem.required}*{/if}{if $element.separator}{cycle values=$element.separator}{/if}{/foreach} - {else} - {$element.html} - {/if} -
    {$element.label_note}
    - +
    + {if $element.label} + + {/if} + {if $element.error}{$element.error}
    {/if} + {if $element.type eq "group"} + {foreach key=gkey item=gitem from=$element.elements} + {$gitem.label}{$gitem.html} + {if $gitem.required}*{/if} + {if $element.separator}{cycle values=$element.separator} + {/if} + {/foreach} + {else} + {$element.html} + {/if} +
    {$element.label_note}
    {/if} {/foreach} @@ -44,7 +47,6 @@ {$dynform.requirednote}
    {/if} - {$dynform.hidden} {foreach item=sec key=i from=$dynform.sections} - - - {$sec.header} - +

    ##{$sec.header}##

    {foreach item=element from=$sec.elements} @@ -26,54 +22,63 @@ {elseif $element.type eq "submit" or $element.type eq "reset"} {if not $dynform.frozen} - -   - {$element.html} - +
    + {$element.html} +
    {/if} {else} - {if $element.type eq "textarea"} - - {if $element.required}*{/if}{$element.label}
    +
    + +
    {else} - - {if $element.required}*{/if}{$element.label}: - +
    + +
    {/if} - {if $element.error}{$element.error}
    {/if} + {if $element.error} + + {/if} {if $element.type eq "group"} {foreach key=gkey item=gitem from=$element.elements} + {if $element.separator}{cycle values=$element.separator}{/if} {/foreach} {else} {$element.html} {/if}
    {$element.label_note}
    - - - {/if} {/foreach} {/foreach} {if $dynform.requirednote and not $dynform.frozen} - -   - {$dynform.requirednote} - +
    + +
    {/if} - -  +{*

    Collected Errors:
    {foreach key=name item=error from=$dynform.errors} {$error} in element [{$name}]
    {/foreach}

    +*} + \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/userinfo.tpl b/livesupport/modules/htmlUI/var/templates/userinfo.tpl index a973979d2..5e3e924eb 100755 --- a/livesupport/modules/htmlUI/var/templates/userinfo.tpl +++ b/livesupport/modules/htmlUI/var/templates/userinfo.tpl @@ -1,11 +1,11 @@ {*Smarty template*} {if $USER.userid} - Login: {$USER.login} -
    - [logout] - [sign over] +
    ##Signed in## : {$USER.login}
    + + {* + + *} {else} - [login] -{/if} - + +{/if} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php index 9a18bcb0c..b87a4130a 100644 --- a/livesupport/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/modules/htmlUI/var/ui_base.inc.php @@ -20,9 +20,9 @@ function errCallBack($err) function tra($input) { // just a dummy function yet - $nr=func_num_args(); - if ($nr>1) - for ($i=1; $i<$nr; $i++){ + $nr = func_num_args(); + if ($nr > 1) + for ($i = 1; $i < $nr; $i++){ $name = '$'.$i; $val = func_get_arg($i); $input = str_replace($name, $val, $input); @@ -91,10 +91,14 @@ class uiBase $this->dbc->setFetchMode(DB_FETCHMODE_ASSOC); $this->gb =& new GreenBox($this->dbc, $config); $this->config =& $config; + $this->config['accessRawAudioUrl'] = $config['storageUrlPath'].'/xmlrpc/simpleGet.php'; + $this->sessid = $_REQUEST[$config['authCookieName']]; $this->userid = $this->gb->getSessUserId($this->sessid); $this->login = $this->gb->getSessLogin($this->sessid); + $this->langid =& $_SESSION['lanid']; + $this->id = $_REQUEST['id'] ? $_REQUEST['id'] : $this->gb->getObjId($this->login, $this->gb->storId); $this->pid = $this->gb->getparent($this->id) != 1 ? $this->gb->getparent($this->id) : FALSE; $this->type = $this->gb->getFileType($this->id); @@ -336,7 +340,7 @@ class uiBase function _getMDataValue($id, $key) - { + { if (is_array($arr = $this->gb->getMDataValue($id, $key, $this->sessid))) { $value = current($arr); return $value['value']; diff --git a/livesupport/modules/htmlUI/var/ui_browse.class.php b/livesupport/modules/htmlUI/var/ui_browse.class.php index 9039be317..e073b949b 100755 --- a/livesupport/modules/htmlUI/var/ui_browse.class.php +++ b/livesupport/modules/htmlUI/var/ui_browse.class.php @@ -146,6 +146,7 @@ class uiBrowse function searchDB() { $this->results = array('page' => $this->criteria['offset']/$this->criteria['limit']); + $this->criteria['conditions'] = array(); for($col=4; $col>=1; $col--) { if (is_array($this->col[$col]['criteria'])) { @@ -158,6 +159,24 @@ class uiBrowse foreach ($results['results'] as $rec) { $this->results['items'][] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($rec)); } + + /* + ## test + for ($n=0; $n<=$this->criteria['limit']; $n++) { + $this->results['items'][] = Array + ( + 'id' => 24, + 'gunid' => '1cc472228d0cb2ac', + 'title' => 'Strom 10min', + 'creator' => 'Sebastian', + 'duration' => '   10:00', + 'type' => 'webstream' + ); + } + $results['cnt'] = 500; + $this->results['cnt'] = $results['cnt']; + ## end test + */ $this->pagination($results); #print_r($this->criteria); #print_r($this->results); diff --git a/livesupport/modules/htmlUI/var/ui_browser_init.php b/livesupport/modules/htmlUI/var/ui_browser_init.php index e88880b3f..2f182c439 100644 --- a/livesupport/modules/htmlUI/var/ui_browser_init.php +++ b/livesupport/modules/htmlUI/var/ui_browser_init.php @@ -18,7 +18,7 @@ $uiBase =& $uiBrowser; ## load Smarty+filters ############################################## require_once dirname(__FILE__).'/SmartyExtensions.inc.php'; #$Smarty->load_filter('output', 'trimwhitespace'); -$Smarty->load_filter('post', 'template_marker'); +#$Smarty->load_filter('post', 'template_marker'); $Smarty->load_filter('output', 'localizer'); @@ -28,15 +28,15 @@ $Smarty->assign('UI_HANDLER', UI_HANDLER); $Smarty->assign('ACT', $_REQUEST['act']); $Smarty->assign('CONFIG', $config); $Smarty->assign('START', array( - 'id' => &$uiBrowser->id, - 'pid' => &$uiBrowser->pid, - 'fid' => &$uiBrowser->fid, - 'sessid' => &$uiBrowser->sessid - )); -$Smarty->assign('USER', array('sessid' => &$uiBrowser->sessid, - 'userid' => &$uiBrowser->userid, - 'login' => &$uiBrowser->login - )); + 'id' => &$uiBrowser->id, + 'pid' => &$uiBrowser->pid, + 'fid' => &$uiBrowser->fid, + 'sessid' => &$uiBrowser->sessid) + ); +$Smarty->assign('USER', array('sessid' => &$uiBrowser->sessid, + 'userid' => &$uiBrowser->userid, + 'login' => &$uiBrowser->login) + ); $uiBrowser->loadStationPrefs($ui_fmask['stationPrefs']); $Smarty->assign('STATIONPREFS', $uiBrowser->STATIONPREFS); diff --git a/livesupport/modules/htmlUI/var/ui_conf.php b/livesupport/modules/htmlUI/var/ui_conf.php index 7f33ddef1..eb6c69426 100755 --- a/livesupport/modules/htmlUI/var/ui_conf.php +++ b/livesupport/modules/htmlUI/var/ui_conf.php @@ -16,7 +16,6 @@ define('UI_QFORM_REQUIRED', '../templates/sub/form_required.tpl'); define('UI_QFORM_REQUIREDNOTE', '../templates/sub/form_requirednote.tpl'); define('UI_QFORM_ERROR', '../templates/sub/form_error.tpl'); define('UI_SEARCH_MAX_ROWS', 8); -define('UI_SEARCH_MIN_ROWS', 2); define('UI_REGEX_URL', '/^(ht|f)tps?:\/\/[^ ]+$/'); define('UI_PL_ACCESSTOKEN_KEY', 'playlistToken'); define('UI_SCRATCHPAD_KEY', 'djBagContents'); diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index e5d6d0d6f..81d76b8e1 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -41,14 +41,14 @@ class uiHandler extends uiBase { #$this->_cleanArray($_SESSION); if (!$this->_validateForm($formdata, $mask)) { - $_SESSION['retransferFormData']['login']=$formdata['login']; + $_SESSION['retransferFormData']['login'] = $formdata['login']; $this->redirUrl = UI_BROWSER.'?popup[]=login'; return FALSE; } $sessid = $this->gb->login($formdata['login'], $formdata['pass']); if(!$sessid || PEAR::isError($sessid)){ $this->_retMsg('Login failed'); - $_SESSION['retransferFormData']['login']=$formdata['login']; + $_SESSION['retransferFormData']['login'] = $formdata['login']; $this->redirUrl = UI_BROWSER.'?popup[]=login'; return FALSE; } @@ -63,6 +63,7 @@ class uiHandler extends uiBase { return FALSE; } $this->sessid = $sessid; + $this->langid = $formdata['langid']; $this->redirUrl = UI_BROWSER.'?popup[]=_clear_parent&popup[]=_close'; return TRUE; } @@ -266,7 +267,7 @@ class uiHandler extends uiBase { } } $data = $this->_dateArr2Str($mData); - foreach ($data as $key=>$val) { + foreach ($data as $key=>$val) { $r = $this->gb->setMDataValue($id, $key, $this->sessid, $val); if (PEAR::isError($r)) { $this->_retMsg('Unable to set $1: $2', $key, $val); diff --git a/livesupport/modules/htmlUI/var/ui_handler_init.php b/livesupport/modules/htmlUI/var/ui_handler_init.php index 8b668ac6b..2ac9983ed 100644 --- a/livesupport/modules/htmlUI/var/ui_handler_init.php +++ b/livesupport/modules/htmlUI/var/ui_handler_init.php @@ -10,9 +10,8 @@ $uiHandler =& new uiHandler($config); $uiBase =& $uiHandler; ?> - -Your request is processed... + diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php index ac9ecfec1..ea3424d8e 100755 --- a/livesupport/modules/htmlUI/var/ui_playlist.class.php +++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php @@ -357,7 +357,7 @@ class uiPlaylist { include dirname(__FILE__).'/formmask/metadata.inc.php'; - #$id = $this->activeId; + $id = $this->activeId; foreach ($mask['playlist'] as $k=>$v) { $mask['playlist'][$k]['element'] = $this->Base->_formElementEncode($v['element']); @@ -409,6 +409,7 @@ class uiPlaylist foreach ($data as $key=>$val) { $r = $this->Base->gb->setMDataValue($id, $key, $this->Base->sessid, $val); if (PEAR::isError($r)) { + #print_r($r); $this->Base->_retMsg('Unable to set $1: $2', $key, $val); } } diff --git a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php index 9c0efffbc..d3bbfb001 100755 --- a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php +++ b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php @@ -85,6 +85,7 @@ class uiScratchPad for ($n=0; $n<$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]; $n++) { if (is_array($sp[$n])) $this->items[$n] = $sp[$n]; } + ksort($this->items); } diff --git a/livesupport/modules/htmlUI/var/ui_search.class.php b/livesupport/modules/htmlUI/var/ui_search.class.php index 0f6518a43..379ba9f1c 100755 --- a/livesupport/modules/htmlUI/var/ui_search.class.php +++ b/livesupport/modules/htmlUI/var/ui_search.class.php @@ -32,7 +32,7 @@ class uiSearch #print_r($this->criteria['form']); include dirname(__FILE__).'/formmask/metadata.inc.php'; $form = new HTML_QuickForm('search', UI_STANDARD_FORM_METHOD, UI_HANDLER); - $form->setConstants(array('id'=>$id, 'counter'=>$this->criteria['counter'] ? $this->criteria['counter'] : UI_SEARCH_MIN_ROWS)); + $form->setConstants(array('id'=>$id, 'counter'=>$this->criteria['counter'] ? $this->criteria['counter'] : 1)); foreach ($mask['pages'] as $key=>$val) { foreach ($mask['pages'][$key] as $v){ @@ -45,10 +45,10 @@ class uiSearch } }; }; - for($n=1; $n<=UI_SEARCH_MAX_ROWS; $n++) { + for($n = 1; $n <= UI_SEARCH_MAX_ROWS; $n++) { unset ($group); $form->addElement('static', 's1', NULL, "
    "); - if ($n>UI_SEARCH_MIN_ROWS && $n>$this->criteria['counter']) $form->addElement('static', 's1_style', NULL, ""); + if ($n > 1 && $n > $this->criteria['counter']) $form->addElement('static', 's1_style', NULL, ""); $sel = &$form->createElement('hierselect', "row_$n", NULL); $sel->setOptions(array($col1, $col2)); $group[] = &$sel; @@ -73,7 +73,7 @@ class uiSearch $this->results = NULL; $this->criteria['conditions'] = NULL; $this->criteria['offset'] = NULL; - $this->criteria['form'] = NULL; + $this->criteria['form'] = NULL; $this->criteria['operator'] = $formdata['operator']; $this->criteria['filetype'] = $formdata['filetype']; $this->criteria['limit'] = $formdata['limit']; @@ -147,6 +147,7 @@ class uiSearch function searchDB() { $this->results = array('page' => $this->criteria['offset']/$this->criteria['limit']); + #print_r($this->criteria); $results = $this->Base->gb->localSearch($this->criteria, $this->Base->sessid); if (PEAR::isError($results)) { @@ -157,6 +158,25 @@ class uiSearch $this->results['items'][] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($rec)); } $this->results['cnt'] = $results['cnt']; + + /* + ## test + for ($n=0; $n<=$this->criteria['limit']; $n++) { + $this->results['items'][] = Array + ( + 'id' => 24, + 'gunid' => '1cc472228d0cb2ac', + 'title' => 'Strom 10min', + 'creator' => 'Sebastian', + 'duration' => '   10:00', + 'type' => 'webstream' + ); + } + $results['cnt'] = 500; + $this->results['cnt'] = $results['cnt']; + ## end test + */ + #print_r($this->results); $this->pagination($results); }