diff --git a/livesupport/modules/htmlUI/var/formmask/general.inc.php b/livesupport/modules/htmlUI/var/formmask/general.inc.php index 1405039e5..5f010eef8 100755 --- a/livesupport/modules/htmlUI/var/formmask/general.inc.php +++ b/livesupport/modules/htmlUI/var/formmask/general.inc.php @@ -281,14 +281,19 @@ $ui_fmask = array( 'element' => 'cancel', 'type' => 'button', 'label' => 'Cancel', - 'attributes'=> array('onClick' => "location.href='".UI_BROWSER."'"), + 'attributes'=> array( + 'class'=> "button", + 'onClick' => "location.href='".UI_BROWSER."'"), 'groupit' => TRUE ), array( 'element' => 'Submit', 'type' => 'submit', 'label' => 'Submit', - 'groupit' => TRUE + 'groupit' => TRUE, + 'attributes' => array( + 'class'=> "button", + ), ), array( 'group' => array('cancel', 'Submit') diff --git a/livesupport/modules/htmlUI/var/formmask/metadata.inc.php b/livesupport/modules/htmlUI/var/formmask/metadata.inc.php index 9d8a0ecd8..10db29456 100755 --- a/livesupport/modules/htmlUI/var/formmask/metadata.inc.php +++ b/livesupport/modules/htmlUI/var/formmask/metadata.inc.php @@ -1,513 +1,520 @@ - array( - array( - 'element' => 'act', - 'type' => 'hidden', - ), - array( - 'element' => 'id', - 'type' => 'hidden' - ), - array( - 'element' => 'langid', - 'type' => 'hidden' - ), - ), - 'buttons' => array ( - array( - 'element' =>'reset', - 'type' =>'reset', - 'label' =>'Reset', - 'groupit' => TRUE, - ), - array( - 'element' => 'cancel', - 'type' => 'button', - 'label' => 'Cancel', - 'attributes'=> array('onClick' => "location.href='".UI_BROWSER."'"), - 'groupit' => TRUE - ), - array( - 'element' =>'button', - 'type' =>'button', - 'label' =>'Submit', - 'groupit' => TRUE, - 'attributes'=> array( - 'onClick' => 'return switchMDataLang();' - ), - ), - array( - 'group' => array('reset', 'cancel', 'button'), - ) - ), - 'tabs' => array( - array( - 'element' => 'Main', - 'type' => 'button', - 'label' => 'Main', - 'groupit' => TRUE, - 'attributes' => array('onClick' => 'showMain()') - ), - array( - 'element' => 'Music', - 'type' => 'button', - 'label' => 'Music', - 'groupit' => TRUE, - 'attributes' => array('onClick' => 'showMusic()') - ), - array( - 'element' => 'Talk', - 'type' => 'button', - 'label' => 'Talk', - 'groupit' => TRUE, - 'attributes' => array('onClick' => 'showTalk()') - ), - array( - 'group' => array('Main', 'Music', 'Talk'), - ) - - ), - 'langswitch' => array( - array( - 'element' => 'langid', - 'type' => 'select', - 'label' => 'Language', - 'options' => array( - 'en' => 'English', - 'cz' => 'Czech', - 'de' => 'German', - 'hu' => 'Hungarian', - ), - 'attributes'=> array('onChange' => 'return switchMDataLang()') - ) - ), - 'pages' => array( - 'Main' => array( - array( - 'element' => 'dc:title', - 'type' => 'text', - 'label' => 'Title', - 'required' => TRUE, - 'id3' => 'Title' - ), - array( - 'element' => 'dc:creator', - 'type' => 'text', - 'label' => 'Creator', - 'required' => TRUE, - 'id3' => 'Artist' - ), - array( - 'element' => 'dc:type', - 'type' => 'text', - 'label' => 'Genre', - 'required' => TRUE, - 'id3' => 'Genre' - ), - array( - 'element' => 'dc:format', - 'type' => 'select', - 'label' => 'File format', - 'required' => TRUE, - 'options' => array( - 'File' => 'File', - 'live stream' => 'Live Stream', - 'networked file'=> 'Networked File', - ), - 'attributes'=> array('disabled' => 'on'), - 'id3' => FALSE - ), - array( - 'element' => 'dcterms:extent', - 'type' => 'text', - 'label' => 'Length', - 'attributes'=> array('disabled' => 'on'), - 'id3' => FALSE - ), - ), - 'Music' => array( - array( - 'element' => 'dc:title', - 'type' => 'text', - 'label' => 'Title', - 'id3' => 'Title' - ), - array( - 'element' => 'dc:creator', - 'type' => 'text', - 'label' => 'Creator', - 'id3' => 'Artist' - ), - array( - 'element' => 'dc:source', - 'type' => 'text', - 'label' => 'Album', - 'id3' => 'Album' - ), - /* - array( - 'element' => 'ls:year', - 'type' => 'date', - 'label' => 'Year', - 'options' => array( - 'language' => 'en', - 'format' => 'dMY', - 'addEmptyOption'=> TRUE, - 'minYear' => 1900 - ), - 'id3' => 'Year' - ), - */ - array( - 'element' => 'ls:year', - 'type' => 'select', - 'label' => 'Year', - 'options' => _getNumArr(1900, date('Y')+5), - 'id3' => 'Year' - ), - array( - 'element' => 'dc:type', - 'type' => 'text', - 'label' => 'Genre', - 'id3' => 'Genre' - ), - array( - 'element' => 'dc:description', - 'type' => 'textarea', - 'label' => 'Description', - 'id3' => 'Comment' - ), - array( - 'element' => 'dc:format', - 'type' => 'select', - 'label' => 'Format', - 'options' => array( - 'File' => 'File', - 'live stream' => 'Live Stream', - 'networked file'=> 'Networked File' - ), - 'attributes'=> array('disabled' => 'on'), - 'id3' => FALSE - ), - array( - 'element' => 'ls:bpm', - 'type' => 'text', - 'label' => 'BPM', - 'rule' => 'numeric', - 'id3' => 'BPM' - ), - array( - 'element' => 'ls:rating', - 'type' => 'text', - 'label' => 'Rating', - 'rule' => 'numeric', - 'id3' => 'Rating' - ), - array( - 'element' => 'dcterms:extent', - 'type' => 'text', - 'label' => 'Length', - 'attributes'=> array('disabled' => 'on'), - 'id3' => FALSE - ), - array( - 'element' => 'ls:encoded_by', - 'type' => 'text', - 'label' => 'Encoded by', - 'id3' => 'Encoded by' - ), - array( - 'element' => 'ls:track_num', - 'type' => 'select', - 'label' => 'Track number', - 'options' => _getNumArr(0, 99), - 'id3' => 'Track' - ), - array( - 'element' => 'ls:disc_num', - 'type' => 'select', - 'label' => 'Disc number', - 'options' => _getNumArr(0, 20), - 'id3' => 'Disk' - ), - array( - 'element' => 'ls:mood', - 'type' => 'text', - 'label' => 'Mood', - 'id3' => 'Mood' - ), - array( - 'element' => 'dc:publisher', - 'type' => 'text', - 'label' => 'Label', - 'id3' => 'Label' - ), - array( - 'element' => 'ls:composer', - 'type' => 'text', - 'label' => 'Composer', - 'id3' => 'Composer' - ), - array( - 'element' => 'ls:bitrate', - 'type' => 'text', - 'label' => 'Bitrate', - 'rule' => 'numeric', - 'id3' => 'Bitrate' - ), - array( - 'element' => 'ls:channels', - 'type' => 'select', - 'label' => 'Channels', - 'options' => array( - '' => '', - 'mono' => 'Mono', - 'stereo' => 'Stereo', - '5.1' => '5.1' - ), - 'id3' => 'Channels' - ), - array( - 'element' => 'ls:samplerate', - 'type' => 'select', - 'label' => 'Sample rate', - 'options' => array(), ## vervollständigen! - 'id3' => 'Samplerate' - ), - array( - 'element' => 'ls:encoder', - 'type' => 'text', - 'label' => 'Encoder software used', - 'id3' => 'Encoder' - ), - array( - 'element' => 'ls:crc', - 'type' => 'text', - 'label' => 'Checksum', - 'rule' => 'numeric', - 'id3' => 'CRC' - ), - array( - 'element' => 'ls:lyrics', - 'type' => 'textarea', - 'label' => 'Lyrics', - 'id3' => 'Lyrics' - ), - array( - 'element' => 'ls:orchestra', - 'type' => 'text', - 'label' => 'Orchestra or band', - 'id3' => 'Orchestra or band' - ), - array( - 'element' => 'ls:conductor', - 'type' => 'text', - 'label' => 'Conductor', - 'id3' => 'Conductor' - ), - array( - 'element' => 'ls:lyricist', - 'type' => 'text', - 'label' => 'Lyricist', - 'id3' => 'Lyricist' - ), - array( - 'element' => 'ls:originallyricist', - 'type' => 'text', - 'label' => 'Original lyricist', - 'id3' => 'Original lyricist' - ), - array( - 'element' => 'ls:radiostationname', - 'type' => 'text', - 'label' => 'Radio station name', - 'id3' => 'Radio station name' - ), - array( - 'element' => 'ls:audiofileinfourl', - 'type' => 'text', - 'label' => 'Audio file information web page', - 'id3' => 'Audio file information web page' - ), - array( - 'rule' => 'regex', - 'element' => 'ls:audiofileinfourl', - 'format' => UI_REGEX_URL, - 'rulemsg' => 'Audio file information web page seems not to be valid URL' - ), - array( - 'element' => 'ls:artisturl', - 'type' => 'text', - 'label' => 'Artist web page', - 'id3' => 'Artist web page' - ), - array( - 'rule' => 'regex', - 'element' => 'ls:artisturl', - 'format' => UI_REGEX_URL, - 'rulemsg' => 'Artist web page seems not to be valid URL' - ), - array( - 'element' => 'ls:audiosourceurl', - 'type' => 'text', - 'label' => 'Audio source web page', - 'id3' => 'Audio source web page' - ), - array( - 'rule' => 'regex', - 'element' => 'ls:audiosourceurl', - 'format' => UI_REGEX_URL, - 'rulemsg' => 'Audio source web page seems not to be valid URL' - ), - array( - 'element' => 'ls:radiostationurl', - 'type' => 'text', - 'label' => 'Radio station web page', - 'id3' => 'Radio station web page' - ), - array( - 'rule' => 'regex', - 'element' => 'ls:radiostationurl', - 'format' => UI_REGEX_URL, - 'rulemsg' => 'Radio station web page seems not to be valid URL' - ), - array( - 'element' => 'ls:buycdurl', - 'type' => 'text', - 'label' => 'Buy CD web page', - 'id3' => 'Buy CD webpage' - ), - array( - 'rule' => 'regex', - 'element' => 'ls:buycdurl', - 'format' => UI_REGEX_URL, - 'rulemsg' => 'Buy CD web page seems not to be valid URL' - ), - array( - 'element' => 'ls:isrcnumber', - 'type' => 'text', - 'label' => 'ISRC number', - 'rule' => 'numeric', - 'id3' => 'ISRC' - ), - array( - 'element' => 'ls:catalognumber', - 'type' => 'text', - 'label' => 'Catalog number', - 'rule' => 'numeric', - 'id3' => 'Catalog' - ), - array( - 'element' => 'ls:originalartist', - 'type' => 'text', - 'label' => 'Original artist', - 'id3' => 'Original Artist' - ), - array( - 'element' => 'dc:rights', ## ??? - 'type' => 'text', - 'label' => 'Copyright', - 'id3' => 'Copyright' - ), - ), - 'Talk' => array( - array( - 'element' => 'dc:title', - 'type' => 'text', - 'label' => 'Title', - ), - array( - 'element' => 'dcterms:temporal', ## time/date!! - 'type' => 'text', - 'label' => 'Report date/time', - ), - array( - 'element' => 'dcterms:spatial', ## menu - 'type' => 'textarea', - 'label' => 'Report location', - ), - array( - 'element' => 'dcterms:entity', - 'type' => 'textarea', - 'label' => 'Report organizations', - ), - array( - 'element' => 'dc:description', - 'type' => 'textarea', - 'label' => 'Description', - ), - array( - 'element' => 'dc:creator', ## menu?? - 'type' => 'text', - 'label' => 'Creator', - ), - array( - 'element' => 'dc:subject', - 'type' => 'text', - 'label' => 'Subject', - ), - array( - 'element' => 'dc:type', ## menu - 'type' => 'text', - 'label' => 'Genre', - ), - array( - 'element' => 'dc:format', - 'type' => 'select', - 'label' => 'Format', - 'options' => array( - 'File' => 'File', - 'live stream' => 'Live Stream', - 'networked file'=> 'Networked File' - ), - 'attributes'=> array('disabled' => 'on') - ), - array( - 'element' => 'dc:contributor', - 'type' => 'text', - 'label' => 'Contributor', - ), - array( - 'element' => 'dc:language', ##menu - 'type' => 'text', - 'label' => 'Language', - ), - array( - 'element' => 'dc:rights', - 'type' => 'text', - 'label' => 'Copyright', - ), - ) - ), - 'playlist' => array( - array( - 'element' => 'dc:title', - 'type' => 'text', - 'label' => 'Title', - 'required' => TRUE, - 'id3' => 'Title' - ), - array( - 'element' => 'dc:creator', - 'type' => 'text', - 'label' => 'Creator', - 'required' => TRUE, - 'id3' => 'Artist' - ), - array( - 'element' => 'dcterms:extent', - 'type' => 'text', - 'label' => 'Length', - 'attributes'=> array('readonly' => 'on'), - 'id3' => FALSE - ), - array( - 'element' => 'dc:description', - 'type' => 'textarea', - 'label' => 'Description', - 'id3' => 'Comment' - ), - ) -); + array( + array( + 'element' => 'act', + 'type' => 'hidden', + ), + array( + 'element' => 'id', + 'type' => 'hidden' + ), + array( + 'element' => 'langid', + 'type' => 'hidden' + ), + ), + 'buttons' => array ( + array( + 'element' =>'reset', + 'type' =>'reset', + 'label' =>'Reset', + 'groupit' => TRUE, + 'attributes' => array( + 'class'=> "button", + ), + ), + array( + 'element' => 'cancel', + 'type' => 'button', + 'label' => 'Cancel', + 'attributes'=> array( + 'class'=> "button", + 'onClick' => "location.href='".UI_BROWSER."'" + ), + 'groupit' => TRUE, + ), + array( + 'element' =>'button', + 'type' =>'button', + 'label' =>'Submit', + 'groupit' => TRUE, + 'attributes'=> array( + 'class'=> "button", + 'onClick' => 'return switchMDataLang();' + ), + ), + array( + 'group' => array('reset', 'cancel', 'button'), + ) + ), + 'tabs' => array(/* + array( + 'element' => 'Main', + 'type' => 'button', + 'label' => 'Main', + 'groupit' => TRUE, + 'attributes' => array('onClick' => 'showMain()') + ), + array( + 'element' => 'Music', + 'type' => 'button', + 'label' => 'Music', + 'groupit' => TRUE, + 'attributes' => array('onClick' => 'showMusic()') + ), + array( + 'element' => 'Talk', + 'type' => 'button', + 'label' => 'Talk', + 'groupit' => TRUE, + 'attributes' => array('onClick' => 'showTalk()') + ), + array( + 'group' => array('Main', 'Music', 'Talk'), + ) +*/ + ), + 'langswitch' => array( + array( + 'element' => 'langid', + 'type' => 'select', + 'label' => 'Language', + 'options' => array( + 'en' => 'English', + 'cz' => 'Czech', + 'de' => 'German', + 'hu' => 'Hungarian', + ), + 'attributes'=> array('onChange' => 'return switchMDataLang()') + ) + ), + 'pages' => array( + 'Main' => array( + array( + 'element' => 'dc:title', + 'type' => 'text', + 'label' => 'Title', + 'required' => TRUE, + 'id3' => 'Title' + ), + array( + 'element' => 'dc:creator', + 'type' => 'text', + 'label' => 'Creator', + 'required' => TRUE, + 'id3' => 'Artist' + ), + array( + 'element' => 'dc:type', + 'type' => 'text', + 'label' => 'Genre', + 'required' => TRUE, + 'id3' => 'Genre' + ), + array( + 'element' => 'dc:format', + 'type' => 'select', + 'label' => 'File format', + 'required' => TRUE, + 'options' => array( + 'File' => 'File', + 'live stream' => 'Live Stream', + 'networked file'=> 'Networked File', + ), + 'attributes'=> array('disabled' => 'on'), + 'id3' => FALSE + ), + array( + 'element' => 'dcterms:extent', + 'type' => 'text', + 'label' => 'Length', + 'attributes'=> array('disabled' => 'on'), + 'id3' => FALSE + ), + ), + 'Music' => array( + array( + 'element' => 'dc:title', + 'type' => 'text', + 'label' => 'Title', + 'id3' => 'Title' + ), + array( + 'element' => 'dc:creator', + 'type' => 'text', + 'label' => 'Creator', + 'id3' => 'Artist' + ), + array( + 'element' => 'dc:source', + 'type' => 'text', + 'label' => 'Album', + 'id3' => 'Album' + ), + /* + array( + 'element' => 'ls:year', + 'type' => 'date', + 'label' => 'Year', + 'options' => array( + 'language' => 'en', + 'format' => 'dMY', + 'addEmptyOption'=> TRUE, + 'minYear' => 1900 + ), + 'id3' => 'Year' + ), + */ + array( + 'element' => 'ls:year', + 'type' => 'select', + 'label' => 'Year', + 'options' => _getNumArr(1900, date('Y')+5), + 'id3' => 'Year' + ), + array( + 'element' => 'dc:type', + 'type' => 'text', + 'label' => 'Genre', + 'id3' => 'Genre' + ), + array( + 'element' => 'dc:description', + 'type' => 'textarea', + 'label' => 'Description', + 'id3' => 'Comment' + ), + array( + 'element' => 'dc:format', + 'type' => 'select', + 'label' => 'Format', + 'options' => array( + 'File' => 'File', + 'live stream' => 'Live Stream', + 'networked file'=> 'Networked File' + ), + 'attributes'=> array('disabled' => 'on'), + 'id3' => FALSE + ), + array( + 'element' => 'ls:bpm', + 'type' => 'text', + 'label' => 'BPM', + 'rule' => 'numeric', + 'id3' => 'BPM' + ), + array( + 'element' => 'ls:rating', + 'type' => 'text', + 'label' => 'Rating', + 'rule' => 'numeric', + 'id3' => 'Rating' + ), + array( + 'element' => 'dcterms:extent', + 'type' => 'text', + 'label' => 'Length', + 'attributes'=> array('disabled' => 'on'), + 'id3' => FALSE + ), + array( + 'element' => 'ls:encoded_by', + 'type' => 'text', + 'label' => 'Encoded by', + 'id3' => 'Encoded by' + ), + array( + 'element' => 'ls:track_num', + 'type' => 'select', + 'label' => 'Track number', + 'options' => _getNumArr(0, 99), + 'id3' => 'Track' + ), + array( + 'element' => 'ls:disc_num', + 'type' => 'select', + 'label' => 'Disc number', + 'options' => _getNumArr(0, 20), + 'id3' => 'Disk' + ), + array( + 'element' => 'ls:mood', + 'type' => 'text', + 'label' => 'Mood', + 'id3' => 'Mood' + ), + array( + 'element' => 'dc:publisher', + 'type' => 'text', + 'label' => 'Label', + 'id3' => 'Label' + ), + array( + 'element' => 'ls:composer', + 'type' => 'text', + 'label' => 'Composer', + 'id3' => 'Composer' + ), + array( + 'element' => 'ls:bitrate', + 'type' => 'text', + 'label' => 'Bitrate', + 'rule' => 'numeric', + 'id3' => 'Bitrate' + ), + array( + 'element' => 'ls:channels', + 'type' => 'select', + 'label' => 'Channels', + 'options' => array( + '' => '', + 'mono' => 'Mono', + 'stereo' => 'Stereo', + '5.1' => '5.1' + ), + 'id3' => 'Channels' + ), + array( + 'element' => 'ls:samplerate', + 'type' => 'select', + 'label' => 'Sample rate', + 'options' => array(), ## vervollständigen! + 'id3' => 'Samplerate' + ), + array( + 'element' => 'ls:encoder', + 'type' => 'text', + 'label' => 'Encoder software used', + 'id3' => 'Encoder' + ), + array( + 'element' => 'ls:crc', + 'type' => 'text', + 'label' => 'Checksum', + 'rule' => 'numeric', + 'id3' => 'CRC' + ), + array( + 'element' => 'ls:lyrics', + 'type' => 'textarea', + 'label' => 'Lyrics', + 'id3' => 'Lyrics' + ), + array( + 'element' => 'ls:orchestra', + 'type' => 'text', + 'label' => 'Orchestra or band', + 'id3' => 'Orchestra or band' + ), + array( + 'element' => 'ls:conductor', + 'type' => 'text', + 'label' => 'Conductor', + 'id3' => 'Conductor' + ), + array( + 'element' => 'ls:lyricist', + 'type' => 'text', + 'label' => 'Lyricist', + 'id3' => 'Lyricist' + ), + array( + 'element' => 'ls:originallyricist', + 'type' => 'text', + 'label' => 'Original lyricist', + 'id3' => 'Original lyricist' + ), + array( + 'element' => 'ls:radiostationname', + 'type' => 'text', + 'label' => 'Radio station name', + 'id3' => 'Radio station name' + ), + array( + 'element' => 'ls:audiofileinfourl', + 'type' => 'text', + 'label' => 'Audio file information web page', + 'id3' => 'Audio file information web page' + ), + array( + 'rule' => 'regex', + 'element' => 'ls:audiofileinfourl', + 'format' => UI_REGEX_URL, + 'rulemsg' => 'Audio file information web page seems not to be valid URL' + ), + array( + 'element' => 'ls:artisturl', + 'type' => 'text', + 'label' => 'Artist web page', + 'id3' => 'Artist web page' + ), + array( + 'rule' => 'regex', + 'element' => 'ls:artisturl', + 'format' => UI_REGEX_URL, + 'rulemsg' => 'Artist web page seems not to be valid URL' + ), + array( + 'element' => 'ls:audiosourceurl', + 'type' => 'text', + 'label' => 'Audio source web page', + 'id3' => 'Audio source web page' + ), + array( + 'rule' => 'regex', + 'element' => 'ls:audiosourceurl', + 'format' => UI_REGEX_URL, + 'rulemsg' => 'Audio source web page seems not to be valid URL' + ), + array( + 'element' => 'ls:radiostationurl', + 'type' => 'text', + 'label' => 'Radio station web page', + 'id3' => 'Radio station web page' + ), + array( + 'rule' => 'regex', + 'element' => 'ls:radiostationurl', + 'format' => UI_REGEX_URL, + 'rulemsg' => 'Radio station web page seems not to be valid URL' + ), + array( + 'element' => 'ls:buycdurl', + 'type' => 'text', + 'label' => 'Buy CD web page', + 'id3' => 'Buy CD webpage' + ), + array( + 'rule' => 'regex', + 'element' => 'ls:buycdurl', + 'format' => UI_REGEX_URL, + 'rulemsg' => 'Buy CD web page seems not to be valid URL' + ), + array( + 'element' => 'ls:isrcnumber', + 'type' => 'text', + 'label' => 'ISRC number', + 'rule' => 'numeric', + 'id3' => 'ISRC' + ), + array( + 'element' => 'ls:catalognumber', + 'type' => 'text', + 'label' => 'Catalog number', + 'rule' => 'numeric', + 'id3' => 'Catalog' + ), + array( + 'element' => 'ls:originalartist', + 'type' => 'text', + 'label' => 'Original artist', + 'id3' => 'Original Artist' + ), + array( + 'element' => 'dc:rights', ## ??? + 'type' => 'text', + 'label' => 'Copyright', + 'id3' => 'Copyright' + ), + ), + 'Talk' => array( + array( + 'element' => 'dc:title', + 'type' => 'text', + 'label' => 'Title', + ), + array( + 'element' => 'dcterms:temporal', ## time/date!! + 'type' => 'text', + 'label' => 'Report date/time', + ), + array( + 'element' => 'dcterms:spatial', ## menu + 'type' => 'textarea', + 'label' => 'Report location', + ), + array( + 'element' => 'dcterms:entity', + 'type' => 'textarea', + 'label' => 'Report organizations', + ), + array( + 'element' => 'dc:description', + 'type' => 'textarea', + 'label' => 'Description', + ), + array( + 'element' => 'dc:creator', ## menu?? + 'type' => 'text', + 'label' => 'Creator', + ), + array( + 'element' => 'dc:subject', + 'type' => 'text', + 'label' => 'Subject', + ), + array( + 'element' => 'dc:type', ## menu + 'type' => 'text', + 'label' => 'Genre', + ), + array( + 'element' => 'dc:format', + 'type' => 'select', + 'label' => 'Format', + 'options' => array( + 'File' => 'File', + 'live stream' => 'Live Stream', + 'networked file'=> 'Networked File' + ), + 'attributes'=> array('disabled' => 'on') + ), + array( + 'element' => 'dc:contributor', + 'type' => 'text', + 'label' => 'Contributor', + ), + array( + 'element' => 'dc:language', ##menu + 'type' => 'text', + 'label' => 'Language', + ), + array( + 'element' => 'dc:rights', + 'type' => 'text', + 'label' => 'Copyright', + ), + ) + ), + 'playlist' => array( + array( + 'element' => 'dc:title', + 'type' => 'text', + 'label' => 'Title', + 'required' => TRUE, + 'id3' => 'Title' + ), + array( + 'element' => 'dc:creator', + 'type' => 'text', + 'label' => 'Creator', + 'required' => TRUE, + 'id3' => 'Artist' + ), + array( + 'element' => 'dcterms:extent', + 'type' => 'text', + 'label' => 'Length', + 'attributes'=> array('disabled' => 'on'), + 'id3' => FALSE + ), + array( + 'element' => 'dc:description', + 'type' => 'textarea', + 'label' => 'Description', + 'id3' => 'Comment' + ), + ) +); ?> \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/html/img/bt_bottom_sm.gif b/livesupport/modules/htmlUI/var/html/img/bt_bottom_sm.gif new file mode 100755 index 000000000..29364b324 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/bt_bottom_sm.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/bt_bottom_xsm.gif b/livesupport/modules/htmlUI/var/html/img/bt_bottom_xsm.gif new file mode 100755 index 000000000..a048f3ca6 Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/bt_bottom_xsm.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/bt_top_sm.gif b/livesupport/modules/htmlUI/var/html/img/bt_top_sm.gif new file mode 100755 index 000000000..f55b49fbc Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/bt_top_sm.gif differ diff --git a/livesupport/modules/htmlUI/var/html/img/bt_top_xsm.gif b/livesupport/modules/htmlUI/var/html/img/bt_top_xsm.gif new file mode 100755 index 000000000..7bae60c8c Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/bt_top_xsm.gif differ diff --git a/livesupport/modules/htmlUI/var/html/styles_livesupport.css b/livesupport/modules/htmlUI/var/html/styles_livesupport.css index dfe14b5eb..5fd78271a 100755 --- a/livesupport/modules/htmlUI/var/html/styles_livesupport.css +++ b/livesupport/modules/htmlUI/var/html/styles_livesupport.css @@ -3,7 +3,7 @@ body { font-size: 12px; font-size: 12px; color: #2C2C2C; margin: 0px; - background: #FFF url("css_img/bg_head.gif") no-repeat; + background: #FFF url("css_img/bg_head.gif") no-repeat; } img { font-size: 12px; @@ -281,21 +281,50 @@ input, select { font-size: 12px; left: auto; } -#tabnav { + +/* #################################### 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 { +#tabnav ul { width: auto; list-style: none; padding: 0; display: block; } -#tabnav a { +#tabnav a { background: url("css_img/bt_tab_off.gif"); display: block; color: #666; @@ -307,17 +336,17 @@ input, select { font-size: 12px; text-align: center; } -#tabnav a:hover { +#tabnav a:hover { background: url("css_img/bt_tab_on.gif"); color: #FFF; } -#tabnav a.active { +#tabnav a.active { background: url("css_img/bt_tab_on.gif"); color: #FFF; } -#tabnav li { +#tabnav li { padding: 0; float: left; } @@ -363,7 +392,7 @@ input, select { font-size: 12px; } .container_table { font-size: 12px; - height: 275px; + /*height: 275px;*/ overflow: auto; } @@ -452,22 +481,22 @@ table tr.red td { font-size: 12px; margin-left: 15px; } -.container_browse { +.container_browse { width: 170px; float: left; margin: 0px 0px 10px 0px; } -.area_browse { +.area_browse { width: 174px; height: 100px; } -.area_browse[class] { +.area_browse[class] { width: 180px; } -.comment_browse { +.comment_browse { font-size: 10px; } @@ -488,56 +517,48 @@ label { font-size: 12px; /* ############################################# scheduler ################################# */ -.container_calender_overview { font-size: 12px; +.container_calender_overview { width: 235px; } -.container_calender_overview p { font-size: 12px; +.container_calender_overview p { font-size: 10px; margin-top: 0; float: right; } -.month_year { font-size: 12px; +.month_year { border: 1px solid #cdcdcd; border-bottom: none; padding: 5px 20px; float: right; } -.calender_overview { font-size: 12px; +.calender_overview { border: 1px solid #cdcdcd; } -table.calender_overview_table { font-size: 12px; +table.calender_overview_table { 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; +table.calender_overview_table td { border: 0; text-align: center; - padding: 5px 5px 0 5px; + padding: 2px; + font-size: 10px; } -table.calender_overview_table td.full { font-size: 12px; +table.calender_overview_table td.full { 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; +table.calender_overview_table td.week { border-right: 1px solid #cdcdcd; } -table.calender_overview_table a.active { font-size: 12px; +table.calender_overview_table a.full { color: #FFF; font-weight: bold; background-color: #5286ba; @@ -546,21 +567,36 @@ table.calender_overview_table a.active { font-size: 12px; display: block; } -table.calender_overview_table a { font-size: 12px; +table.calender_overview_table td.today { + border: 1px black solid; +} + +table.calender_overview_table td.current { + background: #d5e2ee; + /*#d5e2ee;*/ +} + +table.calender_overview_table td.nothing { + background: #eee; + /*#d5e2ee;*/ +} + +table.calender_overview_table a { text-decoration: none; color: #000; } -table.calender_overview_table a.not_this_month { font-size: 12px; +table.calender_overview_table td.not_this_month { color: #999; + background-color: #fff; } -.head_scheduler { font-size: 12px; +.head_scheduler { float: left; width: 50%; } -.container_button_scheduler { font-size: 12px; +.container_button_scheduler { float: left; width: 50%; text-align: right; diff --git a/livesupport/modules/htmlUI/var/html/styles_popup.css b/livesupport/modules/htmlUI/var/html/styles_popup.css new file mode 100755 index 000000000..cbf5ae552 --- /dev/null +++ b/livesupport/modules/htmlUI/var/html/styles_popup.css @@ -0,0 +1,751 @@ +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; +} diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php index 3c024c8bd..bc0fbd0a6 100644 --- a/livesupport/modules/htmlUI/var/html/ui_browser.php +++ b/livesupport/modules/htmlUI/var/html/ui_browser.php @@ -36,6 +36,11 @@ if (is_array($_REQUEST['popup'])){ $Smarty->display('popup/login.tpl'); break; + case "deleteItem": + $Smarty->assign('id', $_REQUEST['id']); + $Smarty->display('popup/deleteItem.tpl'); + break; + case "_2PL.simpleManagement": $Smarty->assign('target', 'PL.simpleManagement'); $Smarty->display('popup/_redirector.tpl'); @@ -43,20 +48,20 @@ if (is_array($_REQUEST['popup'])){ case "PL.changeTransition"; $Smarty->assign('dynform', $uiBrowser->PLAYLIST->changeTransitionForm($_REQUEST['id'], $_REQUEST['type'], $ui_fmask['PL.changeTransition'])); - $Smarty->display('playlist/changeTransition.tpl'); + $Smarty->display('popup/PLAYLIST.changeTransition.tpl'); + break; + + case "PL.deleteActive": + $Smarty->display('popup/PLAYLIST.deleteActive.tpl'); break; case "SCHEDULER.addItem": - $Smarty->display('scheduler/addItem.tpl'); + $Smarty->display('popup/SCHEDULER.addItem.tpl'); break; case "SCHEDULER.removeItem": $Smarty->assign('gunid', $_REQUEST['gunid']); - $Smarty->display('scheduler/removeItem.tpl'); - break; - - case "PL.deleteActive": - $Smarty->display('playlist/deleteActive.tpl'); + $Smarty->display('popup/SCHEDULER.removeItem.tpl'); break; } } diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index dbf61d333..249d19382 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->setReload(); + $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/file/edit.tpl b/livesupport/modules/htmlUI/var/templates/file/edit.tpl index 8b03809aa..2d33bb133 100755 --- a/livesupport/modules/htmlUI/var/templates/file/edit.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/edit.tpl @@ -1,46 +1,35 @@ -
-{include file="sub/x.tpl"} +
+ +
+

+ {if $editItem.id} + ##Edit## + {else} + ##New## + {/if} + {$editItem.type|capitalize} +

-

-{if $editItem.id} - Edit -{else} - New -{/if} -{$editItem.type|capitalize} -

+ {if $editItem.type == 'audioclip' || $editItem.type == 'file'} +
{include file="file/fileform.tpl"}
+
{include file="file/metadataform.tpl"}
+ + + {/if} -{if $editItem.type == 'audioclip' || $editItem.type == 'file'} - - -
- {include file="file/fileform.tpl"} + {if $editItem.type == 'webstream'} +
{include file="file/webstreamform.tpl"}
+
{include file="file/metadataform.tpl"}
+ + + {/if} + + {if $editItem.type == 'playlist'} + {include file="file/metadataform.tpl"} + {/if}
-
- {include file="file/metadataform.tpl"} +
-{/if} - - -{if $editItem.type == 'webstream'} - - -
- {include file="file/webstreamform.tpl"} -
-
- {include file="file/metadataform.tpl"} -
-{/if} - -{if $editItem.type == 'playlist'} -
- {include file="file/metadataform.tpl"} -
-{/if} - -
- + ##Name## + ##Duration## + ##Artist## + ##Type## + ##Move## + + + + {foreach from=$PL->getFlat() key='pos' item='i'} + + + + + ##Fade## {$i.fadein_ms|string_format:"%d"} ms + + + + {$i.title} + {$i.duration} + {$i.creator} + {$i.type} + + ##move up## + ##move down## + + + {/foreach} + {if $n} + + + + ##Fade## {$i.fadein_ms|string_format:"%d"} ms + + {else} + + ##No Entry## + + {/if} + + +
+ +
+ + + +
+
+ + +
+
+ + + + +{*
@@ -5,12 +85,14 @@ {foreach from=$PL->getFlat() key='pos' item='i'} - + - + {/foreach} {if $n} - + {/if} @@ -44,3 +128,4 @@
active Playlist: {$PL.children.0.children.0.content}
{$i.fadein_ms|string_format:"%d"} ms
@@ -24,7 +106,9 @@
{$i.fadeout_ms|string_format:"%d"} ms
+*} diff --git a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl index 111d84a8e..c6b120d60 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl @@ -1,7 +1,7 @@ {assign var="_form" value=$PL->metaDataForm($PL_id)} {assign var="dynform" value=$_form.main} -{$_form.langswitch} +{* $_form.langswitch *} {include file="sub/dynForm_plain.tpl"} + + + + diff --git a/livesupport/modules/htmlUI/var/templates/playlist/deleteActive.tpl b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.deleteActive.tpl similarity index 87% rename from livesupport/modules/htmlUI/var/templates/playlist/deleteActive.tpl rename to livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.deleteActive.tpl index 3b7c616ef..787b332a6 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/deleteActive.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.deleteActive.tpl @@ -1,4 +1,4 @@ -{include file="header.tpl"} +{include file="popup/header.tpl"}
Are you sure to delete active Playlist? diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/addItem.tpl b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl similarity index 99% rename from livesupport/modules/htmlUI/var/templates/scheduler/addItem.tpl rename to livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl index 4ff337183..0e79b5d88 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/addItem.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl @@ -1,4 +1,4 @@ -{include file="header.tpl"} +{include file="popup/header.tpl"}
{if $SCHEDULER->_copyPlFromSP()} diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/removeItem.tpl b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl similarity index 88% rename from livesupport/modules/htmlUI/var/templates/scheduler/removeItem.tpl rename to livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl index 4ab5fb2fe..0c1f47eb8 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/removeItem.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl @@ -1,4 +1,4 @@ -{include file="header.tpl"} +{include file="popup/header.tpl"}
Are you sure to remove this entry? diff --git a/livesupport/modules/htmlUI/var/templates/popup/deleteItem.tpl b/livesupport/modules/htmlUI/var/templates/popup/deleteItem.tpl new file mode 100755 index 000000000..afb2d4e02 --- /dev/null +++ b/livesupport/modules/htmlUI/var/templates/popup/deleteItem.tpl @@ -0,0 +1,11 @@ +{include file="popup/header.tpl"} + +
+Are you sure to delete this Item? +
+ + +
+ + + diff --git a/livesupport/modules/htmlUI/var/templates/popup/header.tpl b/livesupport/modules/htmlUI/var/templates/popup/header.tpl new file mode 100755 index 000000000..ae7c0cf55 --- /dev/null +++ b/livesupport/modules/htmlUI/var/templates/popup/header.tpl @@ -0,0 +1,12 @@ +{* *} + + + + + LIVESUPPORT + + + + + +
diff --git a/livesupport/modules/htmlUI/var/templates/popup/login.tpl b/livesupport/modules/htmlUI/var/templates/popup/login.tpl index f3ee6057e..60f68a8a3 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/login.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/login.tpl @@ -1,6 +1,4 @@ -{*Smarty template*} - -{include file="header.tpl"} +{include file="popup/header.tpl"} {$login.javascript}
diff --git a/livesupport/modules/htmlUI/var/templates/popup/logout.tpl b/livesupport/modules/htmlUI/var/templates/popup/logout.tpl index 1d65c8c1d..c312d3cce 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/logout.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/logout.tpl @@ -1,6 +1,4 @@ -{*Smarty template*} - -{include file="header.tpl"} +{include file="popup/header.tpl"}
diff --git a/livesupport/modules/htmlUI/var/templates/popup/signover.tpl b/livesupport/modules/htmlUI/var/templates/popup/signover.tpl index 448e2a905..ce75ebf03 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/signover.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/signover.tpl @@ -1,6 +1,4 @@ -{*Smarty template*} - -{include file="header.tpl"} +{include file="popup/header.tpl"}
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl index cb3eb4af4..faea28572 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl @@ -3,6 +3,76 @@ {$SCHEDULER->buildMonth()} {$SCHEDULER->buildWeek()} + + +
+

Click any date below to view in scheduler

+
+ + + + + + + + + + {foreach from=$SCHEDULER->Week item="_Weekday"} + + {/foreach} + + +{foreach from=$SCHEDULER->Month item="_Day"} + + {if $_Day.isFirst} + + + {/if} + + + {if $_Day.isEmpty} + + {if $_Day.isLast} + + {/if} +{/foreach} +
<< +
+ +
+
+
+ +
+
>>
##CW##{$_Weekday.label.short|truncate:2:""}
{$_Day.week} + {elseif $_Day.isToday} + + {elseif $_Day.isCurrent} + + {else} + + {/if} + {if $_Day.isSelected} + {$_Day.day} + {else} + {$_Day.day} + {/if} + +
+
+
+ @@ -33,11 +103,6 @@ - - {foreach from=$SCHEDULER->Week item="_Weekday"} - - {/foreach} - {foreach from=$SCHEDULER->Month item="_Day"} {if $_Day.isFirst} diff --git a/livesupport/modules/htmlUI/var/templates/scratchpad.tpl b/livesupport/modules/htmlUI/var/templates/scratchpad.tpl index 1896db715..1742a542d 100755 --- a/livesupport/modules/htmlUI/var/templates/scratchpad.tpl +++ b/livesupport/modules/htmlUI/var/templates/scratchpad.tpl @@ -9,7 +9,10 @@
{$SCHEDULER->curr.year}-{$SCHEDULER->curr.month}-{$SCHEDULER->curr.day}
>>
 {$_Weekday.label.short}
- + + @@ -22,9 +25,9 @@ @@ -36,8 +39,7 @@ {/if} + +{assign var="_PL_activeId" value=NULL} + + + {* {assign var="_PL_activeId" value=$PL->getActiveId()} diff --git a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl index c01650c4c..b9f0c022b 100755 --- a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl @@ -59,9 +59,33 @@ } function hpopup(url, name) - { //, 'width=1, height=1' + { + var width = 10; + var height = 10; + var screenX; + var screenY; + var Xpos; + var Ypos; + var Pwidth; + var Pheight; + + if (ie5) { + Xpos = window.screenLeft; + Ypos = window.screenTop; + Pwidth = document.body.clientWidth; + Pheight = document.body.clientHeight; + } else { + Xpos = window.screenX; + Ypos = window.screenY; + Pwidth = window.innerWidth; + Pheight = window.innerHeight; + } url = url + '&is_popup=1'; - popupwin = window.open(url, name); + screenX = (Xpos + Pwidth/2 - width/2); + screenY = (Ypos + Pheight/2 - height/2); + arg = 'width='+width+', height='+height+', scrollbars=no, menubar=no, depend=yes, left='+screenX+', top='+screenY; + + popupwin = window.open(url, name, arg); //window.parent.focus(); } {/literal} diff --git a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl similarity index 95% rename from livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl rename to livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl index 39df007f5..19888ddc4 100755 --- a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl @@ -63,7 +63,7 @@ function contextmenu(param) { break; case "PL.editMetaData": - contextmenuHtml = contextmenuHtml + "
  •  Edit MData 
  • "; + contextmenuHtml = contextmenuHtml + "
  •  Edit Metadata 
  • "; break; case "SP.addItem": @@ -84,7 +84,8 @@ function contextmenu(param) { break; case "delete": - contextmenuHtml = contextmenuHtml + "
  •  !Delete Item! 
  • "; + //contextmenuHtml = contextmenuHtml + "
  •  Delete Item 
  • "; + contextmenuHtml = contextmenuHtml + "
  •  Delete Item 
  • "; break; case "fileList": diff --git a/livesupport/modules/htmlUI/var/templates/statusbar.tpl b/livesupport/modules/htmlUI/var/templates/statusbar.tpl index 30afdfac4..2261c98e1 100755 --- a/livesupport/modules/htmlUI/var/templates/statusbar.tpl +++ b/livesupport/modules/htmlUI/var/templates/statusbar.tpl @@ -1,3 +1,6 @@ +{assign var='_nowplaying' value=$SCHEDULER->getNowNextClip()} +{assign var='_nextplaying' value=$SCHEDULER->getNowNextClip(1)} + {include file="script/clock.js.tpl"} @@ -18,8 +21,11 @@
    - on air - + {if $_nowplaying} + on air + {else} + off air + {/if}
    @@ -39,11 +45,9 @@
    - {assign var='_nowplaying' value=$SCHEDULER->getNowNextClip()} - {assign var='_nextplaying' value=$SCHEDULER->getNowNextClip(1)} {if $_nowplaying}
    Now Playing: {$_nowplaying.title}
    -
    +
     
    @@ -60,6 +64,11 @@
    + +{assign var='_nowplaying' value=NULL} +{assign var='_nextplaying' value=NULL} + + {*
    diff --git a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl index 10129ffde..c87a8c72c 100755 --- a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl +++ b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl @@ -29,7 +29,7 @@ onContextmenu="return contextmenu('{$i.id}' , 'PL.addItem', 'delete' {/if} {else} - , 'PL.activate', 'PL.create', 'PL.editMetaData', 'delete' + , 'PL.activate', 'PL.create', 'delete' {/if} {/if} diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php index b87a4130a..5c3dd3fa9 100644 --- a/livesupport/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/modules/htmlUI/var/ui_base.inc.php @@ -380,7 +380,7 @@ class uiBase function _formElementEncode($str) { $str = str_replace(':', '__', $str); - $str = str_replace('.', '_', $str); + #$str = str_replace('.', '_', $str); return $str; } @@ -388,7 +388,7 @@ class uiBase function _formElementDecode($str) { $str = str_replace('__', ':', $str); - $str = str_replace('_', '.', $str); + #$str = str_replace('_', '.', $str); return $str; } } diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php index 8f0440778..65b509d19 100644 --- a/livesupport/modules/htmlUI/var/ui_browser.class.php +++ b/livesupport/modules/htmlUI/var/ui_browser.class.php @@ -182,7 +182,9 @@ class uiBrowser extends uiBase { 'id' => $id, 'act' => $id ? 'editFile' : 'uploadFile')); $this->_parseArr2Form($form, $mask); - return $form->toHTML(); + $renderer =& new HTML_QuickForm_Renderer_Array(true, true); + $form->accept($renderer); + return $renderer->toArray(); } @@ -210,7 +212,9 @@ class uiBrowser extends uiBase { ); $form->setConstants($const); $this->_parseArr2Form($form, $mask); - return $form->toHTML(); + $renderer =& new HTML_QuickForm_Renderer_Array(true, true); + $form->accept($renderer); + return $renderer->toArray(); } diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index 30f4c2648..416f108c1 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -169,10 +169,11 @@ class uiHandler extends uiBase { return FALSE; } + $this->_setMDataValue($r, UI_MDATA_KEY_TITLE, $formdata['mediafile']['name']); $this->transMData($r); $this->redirUrl = UI_BROWSER."?act=editFile&id=$r"; - $this->_retMsg('Audioclip Data saved'); + if (UI_VERBOSE) $this->_retMsg('Audioclip Data saved'); return $r; } @@ -185,9 +186,10 @@ class uiHandler extends uiBase { $ia = $this->gb->analyzeFile($id, $this->sessid); $s = $ia['playtime_seconds']; $extent = date('H:i:s', floor($s)-date('Z')).substr(number_format($s, 6), strpos(number_format($s, 6), '.')); + $this->_setMdataValue($id, UI_MDATA_KEY_DURATION, $extent); - $this->gb->setMDataValue($r, UI_MDATA_KEY_FORMAT, $this->sessid, UI_MDATA_VALUE_FORMAT_FILE); - + $this->_setMDataValue($id, UI_MDATA_KEY_FORMAT, UI_MDATA_VALUE_FORMAT_FILE); + foreach ($mask['pages'] as $key=>$val) { foreach ($mask['pages'][$key] as $k=>$v) { if ($v['id3'] != FALSE) { @@ -230,12 +232,15 @@ class uiHandler extends uiBase { $this->redirUrl = UI_BROWSER."?act=editWebstream&id=".$id; return FALSE; } - $length = sprintf('%02d', $formdata['length']['H']).':'.sprintf('%02d', $formdata['length']['i']).':'.sprintf('%02d', $formdata['length']['s']).'.000000'; - $this->gb->setMDataValue($r, UI_MDATA_KEY_TITLE, $this->sessid, $formdata['title']); - $this->gb->setMDataValue($r, UI_MDATA_KEY_DURATION, $this->sessid, $length); - $this->gb->setMDataValue($r, UI_MDATA_KEY_FORMAT, $this->sessid, UI_MDATA_VALUE_FORMAT_STREAM); + + $extent = sprintf('%02d', $formdata['length']['H']).':'.sprintf('%02d', $formdata['length']['i']).':'.sprintf('%02d', $formdata['length']['s']).'.000000'; + + $this->_setMDataValue($r, UI_MDATA_KEY_TITLE, $formdata['title']); + $this->_setMDataValue($r, UI_MDATA_KEY_DURATION, $extent); + $this->_setMDataValue($r, UI_MDATA_KEY_FORMAT, UI_MDATA_VALUE_FORMAT_STREAM); + $this->redirUrl = UI_BROWSER."?act=editWebstream&id=$r"; - $this->_retMsg('Stream Data saved'); + if (UI_VERBOSE) $this->_retMsg('Stream Data saved'); return $r; } @@ -251,7 +256,7 @@ class uiHandler extends uiBase { $this->gb->setMDataValue($id, UI_MDATA_KEY_TITLE, $this->sessid, $formdata['title']); $this->gb->setMDataValue($id, UI_MDATA_KEY_URL, $this->sessid, $formdata['url']); $this->gb->setMDataValue($id, UI_MDATA_KEY_DURATION, $this->sessid, $length); - $this->_retMsg('Stream Data changed'); + if (UI_VERBOSE) $this->_retMsg('Stream Data changed'); $this->redirUrl = UI_BROWSER.'?act=editWebstream&id='.$formdata['id']; } @@ -275,7 +280,7 @@ class uiHandler extends uiBase { $this->_retMsg('Unable to set $1: $2', $key, $val); } } - $this->_retMsg('Metadata saved'); + if (UI_VERBOSE) $this->_retMsg('Metadata saved'); $this->redirUrl = UI_BROWSER."?act=editItem&id=$id"; } diff --git a/livesupport/modules/htmlUI/var/ui_handler_init.php b/livesupport/modules/htmlUI/var/ui_handler_init.php index 2ac9983ed..3011573ab 100644 --- a/livesupport/modules/htmlUI/var/ui_handler_init.php +++ b/livesupport/modules/htmlUI/var/ui_handler_init.php @@ -8,10 +8,7 @@ require_once dirname(__FILE__).'/ui_handler.class.php'; ## initialize objects ############################################### $uiHandler =& new uiHandler($config); $uiBase =& $uiHandler; -?> - - - - diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php index d161ef4b4..7443d6d8f 100755 --- a/livesupport/modules/htmlUI/var/ui_playlist.class.php +++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php @@ -7,6 +7,7 @@ class uiPlaylist $this->activeId =& $_SESSION[UI_PLAYLIST_SESSNAME]['activeId']; $this->token =& $_SESSION[UI_PLAYLIST_SESSNAME]['token']; $this->reloadUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close'; + $this->redirectUrl = UI_BROWSER.'?popup[]=_2PL.simpleManagement&popup[]=_close'; } function setReload() @@ -14,6 +15,11 @@ class uiPlaylist $this->Base->redirUrl = $this->reloadUrl; } + function setRedirect() + { + $this->Base->redirUrl = $this->redirectUrl; + } + function get() { if (!$this->activeId) { @@ -48,7 +54,8 @@ class uiPlaylist $this->token = $this->Base->gb->lockPlaylistForEdit($plid, $this->Base->sessid); $this->Base->gb->savePref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY, $plid.':'.$this->token); $this->activeId = $plid; - if ($msg) $this->Base->_retMsg('Playlist "$1" activated', $this->Base->_getMDataValue($plid, UI_MDATA_KEY_TITLE)); + if ($msg && UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" activated', $this->Base->_getMDataValue($plid, UI_MDATA_KEY_TITLE)); + return TRUE; } @@ -64,11 +71,11 @@ class uiPlaylist } $plgunid = $this->Base->gb->releaseLockedPlaylist($this->token, $this->Base->sessid); if (PEAR::isError($plgunid)) { - if (UI_VERBOSE) print_r($plgunid); - if (UI_WARNING) $this->Base->_retMsg('Unable to release Playlist'); + #print_r($plgunid); + if (UI_WARNING) $this->Base->_retMsg('Unable to release Playlist'); return FALSE; } - if($msg) $this->Base->_retMsg('Playlist "$1" released', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE)); + if ($msg && UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" released', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE)); $this->activeId = NULL; $this->token = NULL; $this->Base->gb->delPref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY); @@ -81,7 +88,7 @@ class uiPlaylist $tmpid = $this->activeId; $this->release(FALSE); $this->activate($tmpid, FALSE); - $this->Base->_retMsg('Playlist "$1" saved', $this->Base->_getMDataValue($tmpid, UI_MDATA_KEY_TITLE)); + if (UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" saved', $this->Base->_getMDataValue($tmpid, UI_MDATA_KEY_TITLE)); return $this->activeId; } @@ -90,16 +97,16 @@ class uiPlaylist function revert() { if(!$this->token) { - if (UI_WARNING) $this->Base->_retMsg('No Playlist is looked by You'); + if (UI_WARNING) $this->Base->_retMsg('No Playlist is looked by You'); return FALSE; } $plgunid = $this->Base->gb->revertEditedPlaylist($this->token, $this->Base->sessid); if (PEAR::isError($plgunid)) { - if (UI_VERBOSE) print_r($plgunid); + # print_r($plgunid); if (UI_WARNING) $this->Base->_retMsg('Unable to revert to looked state'); return FALSE; } - $this->Base->_retMsg('Playlist "$1" reverted', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE)); + if (UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" reverted', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE)); $this->activeId = NULL; $this->token = NULL; $this->Base->gb->delPref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY); @@ -413,9 +420,9 @@ class uiPlaylist $this->Base->_retMsg('Unable to set $1: $2', $key, $val); } } - $this->Base->_retMsg('Metadata saved'); - #$this->Base->redirUrl = UI_BROWSER."?act=PL.simpleManagement&id=$id"; - $this->Base->redirUrl = UI_BROWSER."?act=PL.editMetaData&id=$id"; + if (UI_VERBOSE) $this->Base->_retMsg('Metadata saved'); + $this->Base->redirUrl = UI_BROWSER."?act=PL.simpleManagement&id=$id"; + #$this->Base->redirUrl = UI_BROWSER."?act=PL.editMetaData&id=$id"; } diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php index c99a4ef41..5797827fa 100755 --- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php +++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php @@ -221,7 +221,7 @@ class uiScheduler extends uiCalendar 'duration' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_DURATION), 'elapsed' => $clip['elapsed'], 'remaining' => $clip['remaining'], - 'percentage'=> 50 + 'percentage'=> 100 * $this->Base->gb->_plTimeToSecs($clip['elapsed']) / ( $this->Base->gb->_plTimeToSecs($clip['elapsed']) + $this->Base->gb->_plTimeToSecs($clip['remaining'])) ); }
    ##Title## ##Duration## ##Type## {if $_PL_activeId == $i.id} - {$i.title|truncate:30} + {$i.title|truncate:12} {else} - {$i.title|truncate:30} + {$i.title|truncate:12} {/if} {$i.duration}