From d30d0e14235a93dadd594b54e121d63569bc6541 Mon Sep 17 00:00:00 2001 From: sebastian Date: Fri, 1 Jul 2005 15:21:35 +0000 Subject: [PATCH] cleared tabs on file-/stream-upload improved test for streams --- .../modules/htmlUI/var/html/ui_browser.php | 4 + .../modules/htmlUI/var/html/ui_handler.php | 2 +- .../modules/htmlUI/var/locals.en_US.xml | 2283 ++++++++--------- .../htmlUI/var/templates/file/edit.tpl | 27 +- .../var/templates/file/metadataform.tpl | 37 - .../modules/htmlUI/var/templates/footer.tpl | 2 +- .../htmlUI/var/templates/loader/index.tpl | 12 +- .../modules/htmlUI/var/templates/menu.tpl | 2 +- .../htmlUI/var/templates/popup/testStream.tpl | 20 +- .../modules/htmlUI/var/ui_base.inc.php | 4 +- .../modules/htmlUI/var/ui_browser.class.php | 7 +- .../modules/htmlUI/var/ui_browser_init.php | 6 +- livesupport/modules/htmlUI/var/ui_conf.php | 3 + 13 files changed, 1184 insertions(+), 1225 deletions(-) diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php index 30fd76d8d..1a5caa712 100644 --- a/livesupport/modules/htmlUI/var/html/ui_browser.php +++ b/livesupport/modules/htmlUI/var/html/ui_browser.php @@ -100,6 +100,10 @@ if (is_array($_REQUEST['popup'])){ $Smarty->assign('data', $uiBrowser->testStream($_REQUEST['url'])); $Smarty->display('popup/testStream.tpl'); break; + + case "help": + $Smarty->display('popup/help.tpl'); + break; } } die(); diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index 28223e9e8..29c194a44 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/livesupport/modules/htmlUI/var/html/ui_handler.php @@ -263,7 +263,7 @@ switch($_REQUEST['act']){ break; default: - if ($uiHandler->userid) $uiHandler->_retMsg("Unknown method: $1", $_REQUEST["act"]); + if ($uiHandler->userid) $uiHandler->_retMsg("Unknown method: $1.\\nSee Help for more information.", $_REQUEST["act"]); $uiHandler->redirUrl = UI_BROWSER; if ($_REQUEST['is_popup']) $uiHandler->redirUrl .= '?popup[]=_reload_parent&popup[]=_close'; diff --git a/livesupport/modules/htmlUI/var/locals.en_US.xml b/livesupport/modules/htmlUI/var/locals.en_US.xml index e08a9b3f9..6b31c2052 100644 --- a/livesupport/modules/htmlUI/var/locals.en_US.xml +++ b/livesupport/modules/htmlUI/var/locals.en_US.xml @@ -1,1145 +1,1140 @@ - - - - en_US - - Stream Data - - - - Preferences - - - - Show Info - - - - Mo - - - - Tu - - - - We - - - - Th - - - - Fr - - - - Sa - - - - Su - - - - January - - - - February - - - - March - - - - April - - - - May - - - - July - - - - August - - - - September - - - - October - - - - November - - - - December - - - - June - - - - Monday - - - - Tuesday - - - - Wednesday - - - - Thursday - - - - Friday - - - - Saturday - - - - Sunday - - - - $1 must be $2 - - - - + - - - - - - - - - Access to home directory failed. - - - - Nothing selected. - - - - Unable to activate playlist "$1" - - - - User or group "$1" already exists. - - - - created at $1 - - - - Add Group - - - - Add Members - - - - Add User - - - - Add selected - - - - Add to group - - - - Are you sure to discard all changes? - - - - Are you sure you want to change existing metadata? - - - - Back to overview - - - - Change password - - - - Close Playlist - - - - Current Members - - - - Delete - - - - Do you want to save changes? - - - - Edit - - - - Login - - - - Manage group members - - - - Members - - - - No group members - - - - Nothing left - - - - Remove from group - - - - Remove selected - - - - User/Group Management - - - - You need to have at least one non-open playlist on ScratchPad to schedule it. - - - - empty - - - - h - - - - login - - - - logout - - - - m - - - - s - - - - sign over - - - - Are you sure to remove playlist "$1"? - - - - Are you sure to delete active Playlist? - Are you sure to delete open Playlist? - - - Are you sure to logout $1? - - - - Unable to set "$1" to value "$2". - - - - $1 uses an unsupported file type. - - - - $1 must be $2 - $1 must be $2. - - - Uploaded file $1 is bigger than LiveSupports system setting. - Uploaded file $1 is bigger than LiveSupport´s system setting. - - - ScratchPad - ScratchPad - - - Access denied. - Access denied. - - - Already active Playlist - Already open playlist. - - - Audioclip Data saved - Audioclip data saved. - - - Cannot create Playlist - Cannot create an playlist. - - - Cannot delete this Playlist - Cannot delete this playlist. - - - Cannot move item - Cannot move file in playlist. - - - Cannot remove Item from Playlist - Cannot remove file from playlist. - - - Change fade information failed. - Change fade information failed. - - - Do - Do - - - Entry $1 was already on the ScratchPad. It has been moved to the top of the list. - Entry $1 was already on the ScratchPad. It has been moved to the top of the list. - - - Entry added at $1 with ScheduleId: $2 - Entry added at $1 with schedule ID $2. - - - Entry with ScheduleId $1 removed - Entry with schedule ID $1 removed. - - - Error on add item to Playlist - Error on add item to playlist. - - - Error saving Settings - Error saving System preferences. - - - Error uploading Logo - Error uploading Logo. - - - Error: $1 - Error: $1 - - - File $1 was not uploaded. - File $1 was not uploaded. - - - Folder is not empty. You can override this protection by clicking DEL again - Folder is not empty. You can override this protection by clicking DEL again. - - - Found locked Playlist. - Found locked playlist. - - - Invalid Form Data - There was some Invalid form data. - - - Login failed - Login failed. - - - Metadata saved - Metadata saved. - - - Missing value for $1 - Missing value for $1. - - - No Item(s) selected - No files selected. - - - No Playlist is locked by You. - No active playlist. - - - Note: Station Preferences not setup proberly. - Note: Station Preferences not setup properly. - - - Old password was incorrect. - Old password was incorrect. - - - Password changed. - Password changed. - - - Passwords did not match. - Passwords did not match. - - - Playlist "$1" activated - Playlist "$1" opened. - - - Playlist "$1" released - Playlist "$1" released. - - - Playlist "$1" reverted - Playlist "$1" reverted. - - - Playlist "$1" saved - Playlist "$1" saved. - - - Playlist has been locked by $1 - Playlist has been locked by $1. - - - ScratchPad length is not set in System Preferences, so it cannot be used. - ScratchPad length is not set in System Preferences, so it cannot be used. - - - Select a Value - Select a Value - - - Settings saved - Station preferences saved. - - - Stream Data changed - Stream data changed. - - - Stream Data saved - Stream data saved. - - - Subject $1 added. - Subject $1 added. - - - Target is not Folder - Target is not folder. - - - There is no playlist available to unlock. - There is no playlist available to unlock. - - - Unable to release Playlist. - Unable to release Playlist. - - - Unable to revert to locked state. - Unable to revert to locked state. - - - Upload of file $1 was incomplete. - Upload of file $1 was incomplete. - - - Uploaded file $1 is bigger than setting in php.ini. - Uploaded file $1 is bigger than setting in php.ini. - - - You have an Playlist already activated, first close it - You have already an open Playlist, first close it. - - - Access - Access - - - Activate this Playlist - Activate this Playlist - - - Add Audio - Add Audio - - - Add Criteria - Add Criteria - - - Add file(s) to ScratchPad - Add files to ScratchPad - - - Add file(s) to active Playlist - Add files to open Playlist - - - Add to ScratchPad - Add to ScratchPad - - - Add to active Playlist - Add to open Playlist - - - Album - Album - - - Artist - Artist - - - Artist web page - Artist web page - - - Audio file information web page - Audio file information web page - - - Audio source web page - Audio source web page - - - BPM - BPM - - - Bitrate - Bitrate - - - Browse - Browse - - - Buy CD web page - Buy CD web page - - - CW - WK - - - Cancel - Cancel - - - Catalog number - Catalog number - - - Category - Category - - - Change Fadein - Change Fadein - - - Change Fadeout - Change Fadeout - - - Change Transition - Change Transition - - - Channels - Channels - - - Checksum - Checksum - - - Clear - Clear - - - Clear Playlist - Clear Playlist - - - Composer - Composer - - - Conductor - Conductor - - - Contributor - Contributor - - - Data - Data - - - Date - Date - - - Day - Day - - - Delete File - Delete file - - - Delete Playlist - Delete playlist - - - Description - Description - - - Disc number - Disc number - - - Display this Playlist - Display this playlist - - - Duration - Duration - - - Edit File - Edit file - - - Edit Playlist - Edit playlist - - - Edit Metadata - Edit metadata - - - Encoded by - Encoded by - - - Encoder software used - Encoder software used - - - Fade - Fade - - - File - File - - - File List - File List - - - File Management - File management - - - File Type - File type - - - File format - File format - - - File type - File type - - - Folder Structure - Folder structure - - - Format - Format - - - Frequency - Frequency - - - Genre - Genre - - - Go - Go - - - Group Name - Group name - - - Help - Help - - - ISRC number - SRC number - - - Insert Playlist here - Insert playlist here - - - Insert Playlist after previous - - - - Item - Item - - - Label - Label - - - Language - Language - - - Length - Length - - - Length<br><small>Enter zero for Live Stream</small> - Length<br><small>Enter zero for Live Stream</small> - - - Library Search - Library search - - - List Folder - List folder - - - Listen to File - Listen to file - - - Local Time - Local time - - - Lyricist - Lyricist - - - Lyrics - Lyrics - - - MDataXML - MDataXML - - - Main - Main - - - Maximum length of ScratchPad - Maximum length of ScratchPad - - - Media File - Media file - - - Metadata - Metadata - - - Month - Month - - - Monthly View - Monthly view - - - Mood - Mood - - - Move - Move - - - Multiple Action: - Multiple action: - - - Music - Music - - - Name - Name - - - New - New - - - New Password - New password - - - New Playlist using this File - New playlist using file - - - New Playlist using this file(s) - New playlist using files - - - New empty Playlist - Create new empty playlist - - - No Entry - No entry - - - No match found. - No match found. - - - No objects - No objects. - - - Old Password - Old Password - - - Open last Playlist - Open last playlist - - - Operator - Operator - - - Orchestra or band - Orchestra or band - - - Original artist - Original artist - - - Original lyricist - Original lyricist - - - Page - Page - - - Password - Password - - - Playlist - Playlist - - - Playlists - Playlists - - - Playlist Metadata - Playlist metadata - - - Radio station name - Radio station name - - - Radio station web page - Radio station web page - - - Range - Range - - - Rating - Rating - - - RawAnalyze - RawAnalyze - - - Remove File from Playlist - Remove file from playlist - - - Remove Playlist - Remove playlist - - - Remove Selected - Remove selected - - - Remove file(s) - Remove files - - - Remove from Scratchpad - Remove from Scratchpad - - - Repeat Password - Repeat password - - - Report date/time - Report date/time - - - Report location - Report location - - - Report organizations - Report organizations - - - Reset - Reset - - - Reset Criteria - - - - Retype Password - Retype password - - - Revert to Saved - Revert to saved - - - Rows per Page - Rows per page - - - Sample rate - Sample rate - - - Save Playlist - Save playlist - - - Save and Close - Save and close - - - Scheduler - Scheduler - - - Scheduler Navigation - Scheduler navigation - - - Search - Search - - - Search Library - Search library - - - Signed in - Signed in - - - Station Logo - Station logo - - - Station Name - Station name - - - Station Settings - Station settings - - - Station Time - Station time - - - Station URL - Station URL - - - Stream - Stream - - - Stream URL - Stream URL - - - Subject - Subject - - - Submit - Submit - - - System Settings - System settings - - - Talk - Talk - - - Time - Time - - - Title - Title - - - Today - Today - - - Track number - Track number - - - Tree view - Tree view - - - Type - Type - - - User Password - User password - - - User/Groups - User/Groups - - - Username - Username - - - Week - Week - - - Weekly View - Weekly view - - - Year - Year - - - calendar week - calendar week - - - copy - copy - - - go up - go up - - - move - move - - - move down - move down - - - move up - move up - - - new&nbsp;folder - new folder - - - next - next - - - previous - previous - + + + en_US + + Stream Data + + + + Preferences + + + + Show Info + + + + Mo + + + + Tu + + + + We + + + + Th + + + + Fr + + + + Sa + + + + Su + + + + January + + + + February + + + + March + + + + April + + + + May + + + + July + + + + August + + + + September + + + + October + + + + November + + + + December + + + + June + + + + Monday + + + + Tuesday + + + + Wednesday + + + + Thursday + + + + Friday + + + + Saturday + + + + Sunday + + + + $1 must be $2 + $1 must be $2. + + + + + + + + - + + + + Access to home directory failed. + + + + Nothing selected. + + + + Unable to activate playlist "$1" + + + + User or group "$1" already exists. + + + + created at $1 + + + + Add Group + + + + Add Members + + + + Add User + + + + Add selected + + + + Add to group + + + + Are you sure to discard all changes? + + + + Are you sure you want to change existing metadata? + + + + Back to overview + + + + Change password + + + + Close Playlist + + + + Current Members + + + + Delete + + + + Do you want to save changes? + + + + Edit + + + + Login + + + + Manage group members + + + + Members + + + + No group members + + + + Nothing left + + + + Remove from group + + + + Remove selected + + + + User/Group Management + + + + You need to have at least one non-open playlist on ScratchPad to schedule it. + + + + empty + + + + h + + + + login + + + + logout + + + + m + + + + s + + + + sign over + + + + Are you sure to remove playlist "$1"? + + + + Are you sure to delete active Playlist? + Are you sure to delete open Playlist? + + + Are you sure to logout $1? + + + + Unable to set "$1" to value "$2". + + + + $1 uses an unsupported file type. + + + + Uploaded file $1 is bigger than LiveSupports system setting. + Uploaded file $1 is bigger than LiveSupport´s system setting. + + + ScratchPad + ScratchPad + + + Access denied. + Access denied. + + + Already active Playlist + Already open playlist. + + + Audioclip Data saved + Audioclip data saved. + + + Cannot create Playlist + Cannot create an playlist. + + + Cannot delete this Playlist + Cannot delete this playlist. + + + Cannot move item + Cannot move file in playlist. + + + Cannot remove Item from Playlist + Cannot remove file from playlist. + + + Change fade information failed. + Change fade information failed. + + + Do + Do + + + Entry $1 was already on the ScratchPad. It has been moved to the top of the list. + Entry $1 was already on the ScratchPad. It has been moved to the top of the list. + + + Entry added at $1 with ScheduleId: $2 + Entry added at $1 with schedule ID $2. + + + Entry with ScheduleId $1 removed + Entry with schedule ID $1 removed. + + + Error on add item to Playlist + Error on add item to playlist. + + + Error saving Settings + Error saving System preferences. + + + Error uploading Logo + Error uploading Logo. + + + Error: $1 + Error: $1 + + + File $1 was not uploaded. + File $1 was not uploaded. + + + Folder is not empty. You can override this protection by clicking DEL again + Folder is not empty. You can override this protection by clicking DEL again. + + + Found locked Playlist. + Found locked playlist. + + + Invalid Form Data + There was some Invalid form data. + + + Login failed + Login failed. + + + Metadata saved + Metadata saved. + + + Missing value for $1 + Missing value for $1. + + + No Item(s) selected + No files selected. + + + No Playlist is locked by You. + No active playlist. + + + Note: Station Preferences not setup proberly. + Note: Station Preferences not setup properly. + + + Old password was incorrect. + Old password was incorrect. + + + Password changed. + Password changed. + + + Passwords did not match. + Passwords did not match. + + + Playlist "$1" activated + Playlist "$1" opened. + + + Playlist "$1" released + Playlist "$1" released. + + + Playlist "$1" reverted + Playlist "$1" reverted. + + + Playlist "$1" saved + Playlist "$1" saved. + + + Playlist has been locked by $1 + Playlist has been locked by $1. + + + ScratchPad length is not set in System Preferences, so it cannot be used. + ScratchPad length is not set in System Preferences, so it cannot be used. + + + Select a Value + Select a Value + + + Settings saved + Station preferences saved. + + + Stream Data changed + Stream data changed. + + + Stream Data saved + Stream data saved. + + + Subject $1 added. + Subject $1 added. + + + Target is not Folder + Target is not folder. + + + There is no playlist available to unlock. + There is no playlist available to unlock. + + + Unable to release Playlist. + Unable to release Playlist. + + + Unable to revert to locked state. + Unable to revert to locked state. + + + Upload of file $1 was incomplete. + Upload of file $1 was incomplete. + + + Uploaded file $1 is bigger than setting in php.ini. + Uploaded file $1 is bigger than setting in php.ini. + + + You have an Playlist already activated, first close it + You have already an open Playlist, first close it. + + + Access + Access + + + Activate this Playlist + Activate this Playlist + + + Add Audio + Add Audio + + + Add Criteria + Add Criteria + + + Add file(s) to ScratchPad + Add files to ScratchPad + + + Add file(s) to active Playlist + Add files to open Playlist + + + Add to ScratchPad + Add to ScratchPad + + + Add to active Playlist + Add to open Playlist + + + Album + Album + + + Artist + Artist + + + Artist web page + Artist web page + + + Audio file information web page + Audio file information web page + + + Audio source web page + Audio source web page + + + BPM + BPM + + + Bitrate + Bitrate + + + Browse + Browse + + + Buy CD web page + Buy CD web page + + + CW + WK + + + Cancel + Cancel + + + Catalog number + Catalog number + + + Category + Category + + + Change Fadein + Change Fadein + + + Change Fadeout + Change Fadeout + + + Change Transition + Change Transition + + + Channels + Channels + + + Checksum + Checksum + + + Clear + Clear + + + Clear Playlist + Clear Playlist + + + Composer + Composer + + + Conductor + Conductor + + + Contributor + Contributor + + + Data + Data + + + Date + Date + + + Day + Day + + + Delete File + Delete file + + + Delete Playlist + Delete playlist + + + Description + Description + + + Disc number + Disc number + + + Display this Playlist + Display this playlist + + + Duration + Duration + + + Edit File + Edit file + + + Edit Playlist + Edit playlist + + + Edit Metadata + Edit metadata + + + Encoded by + Encoded by + + + Encoder software used + Encoder software used + + + Fade + Fade + + + File + File + + + File List + File List + + + File Management + File management + + + File Type + File type + + + File format + File format + + + File type + File type + + + Folder Structure + Folder structure + + + Format + Format + + + Frequency + Frequency + + + Genre + Genre + + + Go + Go + + + Group Name + Group name + + + Help + Help + + + ISRC number + SRC number + + + Insert Playlist here + Insert playlist here + + + Insert Playlist after previous + + + + Item + Item + + + Label + Label + + + Language + Language + + + Length + Length + + + Length<br><small>Enter zero for Live Stream</small> + Length<br><small>Enter zero for Live Stream</small> + + + Library Search + Library search + + + List Folder + List folder + + + Listen to File + Listen to file + + + Local Time + Local time + + + Lyricist + Lyricist + + + Lyrics + Lyrics + + + MDataXML + MDataXML + + + Main + Main + + + Maximum length of ScratchPad + Maximum length of ScratchPad + + + Media File + Media file + + + Metadata + Metadata + + + Month + Month + + + Monthly View + Monthly view + + + Mood + Mood + + + Move + Move + + + Multiple Action: + Multiple action: + + + Music + Music + + + Name + Name + + + New + New + + + New Password + New password + + + New Playlist using this File + New playlist using file + + + New Playlist using this file(s) + New playlist using files + + + New empty Playlist + New Playlist + + + No Entry + No entry + + + No match found. + No match found. + + + No objects + No objects. + + + Old Password + Old Password + + + Open last Playlist + Open last playlist + + + Operator + Operator + + + Orchestra or band + Orchestra or band + + + Original artist + Original artist + + + Original lyricist + Original lyricist + + + Page + Page + + + Password + Password + + + Playlist + Playlist + + + Playlists + Playlists + + + Playlist Metadata + Playlist metadata + + + Radio station name + Radio station name + + + Radio station web page + Radio station web page + + + Range + Range + + + Rating + Rating + + + RawAnalyze + RawAnalyze + + + Remove File from Playlist + Remove file from playlist + + + Remove Playlist + Remove playlist + + + Remove Selected + Remove selected + + + Remove file(s) + Remove files + + + Remove from Scratchpad + Remove from Scratchpad + + + Repeat Password + Repeat password + + + Report date/time + Report date/time + + + Report location + Report location + + + Report organizations + Report organizations + + + Reset + Reset + + + Reset Criteria + + + + Retype Password + Retype password + + + Revert to Saved + Revert to saved + + + Rows per Page + Rows per page + + + Sample rate + Sample rate + + + Save Playlist + Save playlist + + + Save and Close + Save and close + + + Scheduler + Scheduler + + + Scheduler Navigation + Scheduler navigation + + + Search + Search + + + Search Library + Search library + + + Signed in + Signed in + + + Station Logo + Station logo + + + Station Name + Station name + + + Station Settings + Station settings + + + Station Time + Station time + + + Station URL + Station URL + + + Stream + Stream + + + Stream URL + Stream URL + + + Subject + Subject + + + Submit + Submit + + + System Settings + System settings + + + Talk + Talk + + + Time + Time + + + Title + Title + + + Today + Today + + + Track number + Track number + + + Tree view + Tree view + + + Type + Type + + + User Password + User password + + + User/Groups + User/Groups + + + Username + Username + + + Week + Week + + + Weekly View + Weekly view + + + Year + Year + + + calendar week + calendar week + + + copy + copy + + + go up + go up + + + move + move + + + move down + move down + + + move up + move up + + + new&nbsp;folder + new folder + + + next + next + + + previous + previous + \ 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 8939d1ed4..b49e6fe96 100755 --- a/livesupport/modules/htmlUI/var/templates/file/edit.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/edit.tpl @@ -1,4 +1,7 @@
+{if $_REQUEST.act == addFileMData || $_REQUEST.act == addWebstreamMData || $_REQUEST.act == editItem} + {include file="file/tabswitch.tpl"} +{/if}

{if $_REQUEST.act == addFileData || $_REQUEST.act == addFileMData || $_REQUEST.act == addWebstreamData || $_REQUEST.act == addWebstreamMData} @@ -34,11 +37,6 @@
{include file="file/metadataform.tpl"}
- - {if $editItem.id} - - - {/if} {/if} {if $editItem.type == 'playlist'} @@ -48,28 +46,15 @@

- - diff --git a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl index 32565f847..b74741ebc 100755 --- a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl @@ -1,13 +1,5 @@ {UIBROWSER->metaDataForm id=$editItem.id langid=$editItem.curr_langid assign="_metadataform"} - - {assign var="dynform" value=$_metadataform.langswitch} {include file="sub/dynForm_plain.tpl"} @@ -69,34 +61,5 @@ function spread(element, name) if (document.forms['editMetaData'].elements['Music___' + name]) document.forms['editMetaData'].elements['Music___' + name].value = element.value; if (document.forms['editMetaData'].elements['Talk___' + name]) document.forms['editMetaData'].elements['Talk___' + name].value = element.value; } - -function showMain() -{ - document.getElementById('div_Main').style.display = 'inline'; - document.getElementById('div_Music').style.display = 'none'; - document.getElementById('div_Talk').style.display = 'none'; - document.getElementById('switch_Main').className = 'active'; - document.getElementById('switch_Music').className = ''; - document.getElementById('switch_Talk').className = ''; -} -function showMusic() -{ - document.getElementById('div_Main').style.display = 'none'; - document.getElementById('div_Music').style.display = 'inline'; - document.getElementById('div_Talk').style.display = 'none'; - document.getElementById('switch_Main').className = ''; - document.getElementById('switch_Music').className = 'active'; - document.getElementById('switch_Talk').className = ''; -} -function showTalk() -{ - document.getElementById('div_Main').style.display = 'none'; - document.getElementById('div_Music').style.display = 'none'; - document.getElementById('div_Talk').style.display = 'inline'; - document.getElementById('switch_Main').className = ''; - document.getElementById('switch_Music').className = ''; - document.getElementById('switch_Talk').className = 'active'; -} -showMain(); {/literal} diff --git a/livesupport/modules/htmlUI/var/templates/footer.tpl b/livesupport/modules/htmlUI/var/templates/footer.tpl index a3a10bb00..1a7976bf1 100644 --- a/livesupport/modules/htmlUI/var/templates/footer.tpl +++ b/livesupport/modules/htmlUI/var/templates/footer.tpl @@ -1,4 +1,4 @@ -
LiveSupport 1.0 rc ©2005 MDLF - maintained and distributed under GNU/GPL by CAMPWARE
+
{$UI_VERSION} ©2005 MDLF - maintained and distributed under GNU/GPL by CAMPWARE
diff --git a/livesupport/modules/htmlUI/var/templates/loader/index.tpl b/livesupport/modules/htmlUI/var/templates/loader/index.tpl index 54580c406..513921dcf 100755 --- a/livesupport/modules/htmlUI/var/templates/loader/index.tpl +++ b/livesupport/modules/htmlUI/var/templates/loader/index.tpl @@ -3,16 +3,6 @@
-
- + diff --git a/livesupport/modules/htmlUI/var/templates/menu.tpl b/livesupport/modules/htmlUI/var/templates/menu.tpl index 385c32667..10f7a4f96 100755 --- a/livesupport/modules/htmlUI/var/templates/menu.tpl +++ b/livesupport/modules/htmlUI/var/templates/menu.tpl @@ -45,7 +45,7 @@ {/if} -
  • ##Help##
    • +
  • ##Help##
    • diff --git a/livesupport/modules/htmlUI/var/templates/popup/testStream.tpl b/livesupport/modules/htmlUI/var/templates/popup/testStream.tpl index 57f8b06db..02b8f6a0c 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/testStream.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/testStream.tpl @@ -14,17 +14,18 @@
    {if $data.type.valid === true} {tra str='Stream is wanted type $1.' 1=$data.type.type} + {else} {tra str='Stream has wrong content type $1.' 1=$data.type.type} {/if}
    -

    - +

    +
    +
    {if $data.header} - Returned connection header: - 
    {$data.header}
    + Returned connection header:
    {$data.header}
    {/if}
    @@ -32,6 +33,17 @@
    {tra str='Connection to $1 port $2 $3' 1=$data.host 2=$data.port 3='failed'}
    {/if} + diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php index be61befbc..7985f72e5 100644 --- a/livesupport/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/modules/htmlUI/var/ui_base.inc.php @@ -21,8 +21,8 @@ function tra($input) { ## initialize at first call of this function ### - #$GS =& $_SESSION['GS']; - static $GS; + $GS =& $_SESSION['GS']; + #static $GS; global $uiBase; if ($uiBase->langid && !is_array($GS)) { diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php index f41f7b23a..2a80d6aa6 100644 --- a/livesupport/modules/htmlUI/var/ui_browser.class.php +++ b/livesupport/modules/htmlUI/var/ui_browser.class.php @@ -375,6 +375,11 @@ class uiBrowser extends uiBase { */ function testStream($url) { + touch(UI_TESTSTREAM_MU3_TMP); + $handle = fopen(UI_TESTSTREAM_MU3_TMP, "w"); + fwrite($handle, $url); + fclose($handle); + $parse = parse_url($url); $host = $parse["host"]; $port = $parse["port"] ? $parse["port"] : 80; @@ -394,7 +399,7 @@ class uiBrowser extends uiBase { if ($type = stristr($val, "content-type:")) { $type = explode(':', $type); - foreach ($this->config['stream_types'] as $t) { echo $t; + foreach ($this->config['stream_types'] as $t) { if (preg_match('/'.str_replace('/', '\/', $t).'/i', $type[1])) { $match = TRUE; break; diff --git a/livesupport/modules/htmlUI/var/ui_browser_init.php b/livesupport/modules/htmlUI/var/ui_browser_init.php index 236c710bd..da98cf497 100644 --- a/livesupport/modules/htmlUI/var/ui_browser_init.php +++ b/livesupport/modules/htmlUI/var/ui_browser_init.php @@ -24,8 +24,10 @@ $Smarty->load_filter('output', 'localizer'); ## some basic things ################################################ -$Smarty->assign('UI_BROWSER', UI_BROWSER); -$Smarty->assign('UI_HANDLER', UI_HANDLER); +foreach (get_defined_constants() as $k=>$v) { + $Smarty->assign($k, $v); +} + $Smarty->assign('ACT', $_REQUEST['act']); $Smarty->assign('CONFIG', $config); $Smarty->assign('START', array( diff --git a/livesupport/modules/htmlUI/var/ui_conf.php b/livesupport/modules/htmlUI/var/ui_conf.php index 62a8a0158..9b8b4b8f1 100755 --- a/livesupport/modules/htmlUI/var/ui_conf.php +++ b/livesupport/modules/htmlUI/var/ui_conf.php @@ -1,4 +1,7 @@ /tmp/scheduler.log 2>&1 &'); ## adjust the path here define('UI_SCHEDULER_DAEMON_NAME', 'scheduler'); ## this is just name of scheduler process to grep in process list for it