Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
sebastian 2005-04-05 15:40:44 +00:00
parent 54fd432bfc
commit 13d71ed3c2
20 changed files with 7957 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

2
livesupport/modules/htmlUI/var/html/styles_livesupport.css
View file

@ -49,7 +49,7 @@ form { font-size: 12px;
background-color: #F7F9FB;
padding: 0 25px 0 25px;
cursor: pointer;
width: 150px;
width: 170px;
}
.button_large { font-size: 12px;
font-weight: bold;

16
livesupport/modules/htmlUI/var/localizer/data.inc.php
View file

@ -537,8 +537,10 @@ class Data {
$n = 0;
$filePattern = '/(.*).php/'; // all .php files
$functPattern1 = '/tra( )*\(( )*\'([^\']*)\'/iU'; // like tra('edit "$1"', ...); '
$functPattern2 = '/tra( )*\(( )*"([^"]*)"/iU'; // like tra("edit '$1'", ...); "
$functPattern[] = '/tra( )*\(( )*\'([^\']*)\'/iU'; // like tra('edit "$1"', ...); '
$functPattern[] = '/tra( )*\(( )*"([^"]*)"/iU'; // like tra("edit '$1'", ...); "
$functPattern[] = '/_retMsg( )*\(( )*\'([^\']*)\'/iU'; // '
$functPattern[] = '/_retMsg( )*\(( )*"([^"]*)"/iU'; // "
$files = File_Find::mapTreeMultiple($file['dir'], 1);
@ -559,19 +561,13 @@ class Data {
return FALSE;
foreach ($data as $line) {
if (preg_match_all($functPattern1, $line, $m)) { // collact all matches
foreach ($functPattern as $pattern) {
if (preg_match_all($pattern, $line, $m)) { // collact all matches
foreach ($m[3] as $match) {
$n++;
$matches[$match] = $n;
}
}
if (preg_match_all($functPattern2, $line, $m)) { // collact all matches
foreach ($m[3] as $match) {
$n++;
$matches[$match] = $n;
}
}
}

2
livesupport/modules/htmlUI/var/localizer/display.inc.php
View file

@ -359,7 +359,7 @@ class Display {
<input type="hidden" name="pos" value="'.$pos.'">';
for($n=1; $n<=$amount; $n++) {
$html .= "<tr><td><input name='newKey[$n]' size='50'></td></tr>";
$html .= "<tr><td><input name='newKey[$n]' type='text' size='100'></td></tr>";
}
$html .=

5
livesupport/modules/htmlUI/var/localizer/languages.xml
View file

@ -30,4 +30,9 @@
<Name>Serbian(SR)</Name>
<NativeName>Serbian</NativeName>
</language>
<language>
<Id>es.Spanish</Id>
<Name>Spanish(SR)</Name>
<NativeName>Spanish</NativeName>
</language>
</languages>

4
livesupport/modules/htmlUI/var/localizer/main.php
View file

@ -149,8 +149,8 @@ switch ($_REQUEST[action]) {
'base' => $_REQUEST['base'],
'Id' => _DEFAULT_LANG_);
#$newKeys = Data::collectExprPHP($file);
$newKeys = Data::collectExprTPL($file);
$newKeys = Data::collectExprPHP($file);
$newKeys = array_merge($newKeys, Data::collectExprTPL($file));
$msg = Data::checkKeys($file, $newKeys);

2
livesupport/modules/htmlUI/var/localizer/require.inc.php
View file

@ -12,7 +12,7 @@ require_once('helpfunctions.php');
define('_DEFAULT_LANG_', 'en.English');
define('_PREFIX_', 'locals');
define('_PREFIX_GLOBAL_','globals');
#define('_PREFIX_GLOBAL_','globals');
define('_LANG_BASE_', 'xml');
define('_DENY_HTML_', FALSE);
define('_ENCODING_', 'UTF-8');

1425
livesupport/modules/htmlUI/var/locals.cz.Czech.xml
View file

File diff suppressed because it is too large Load diff

1425
livesupport/modules/htmlUI/var/locals.de.German.xml
View file

File diff suppressed because it is too large Load diff

671
livesupport/modules/htmlUI/var/locals.en.English.xml
View file

@ -1,11 +1,226 @@
<?xml version="1.0" encoding="UTF-8"?>
<language>
<status />
<Id>en.English</Id>
<item>
<key>$1 must be $2</key>
<value />
</item>
<item>
<key>Access denied.</key>
<value />
</item>
<item>
<key>Already active Playlist</key>
<value />
</item>
<item>
<key>Audioclip Data saved</key>
<value />
</item>
<item>
<key>Cannot create Playlist</key>
<value />
</item>
<item>
<key>Cannot delete this Playlist</key>
<value />
</item>
<item>
<key>Cannot move item</key>
<value />
</item>
<item>
<key>Cannot remove Item from Playlist</key>
<value />
</item>
<item>
<key>ChangeFadeInfo failed</key>
<value />
</item>
<item>
<key>Do</key>
<value />
</item>
<item>
<key>Entry $1 was already on SP since $2.nMoved to Top.</key>
<value />
</item>
<item>
<key>Entry added at $1 with ScheduleId: $2</key>
<value />
</item>
<item>
<key>Entry with ScheduleId $1 removed</key>
<value />
</item>
<item>
<key>Error on add item to Playlist</key>
<value />
</item>
<item>
<key>Error saving Settings</key>
<value />
</item>
<item>
<key>Error uploading Logo</key>
<value />
</item>
<item>
<key>Error: $1</key>
<value />
</item>
<item>
<key>File $1 was not uploadet.</key>
<value />
</item>
<item>
<key>Folder is not empty. You can override this protection by clicking DEL again</key>
<value />
</item>
<item>
<key>Found looked Playlist</key>
<value />
</item>
<item>
<key>Invalid Form Data</key>
<value />
</item>
<item>
<key>Login failed</key>
<value />
</item>
<item>
<key>Metadata saved</key>
<value />
</item>
<item>
<key>Missing value for $1</key>
<value />
</item>
<item>
<key>No Item(s) selected</key>
<value />
</item>
<item>
<key>No Playlist is looked by You</key>
<value />
</item>
<item>
<key>Note: Station Preferences not setup proberly.</key>
<value />
</item>
<item>
<key>Password changed</key>
<value />
</item>
<item>
<key>Passwords do not match.</key>
<value />
</item>
<item>
<key>Playlist &quot;$1&quot; activated</key>
<value />
</item>
<item>
<key>Playlist &quot;$1&quot; released</key>
<value />
</item>
<item>
<key>Playlist &quot;$1&quot; reverted</key>
<value />
</item>
<item>
<key>Playlist &quot;$1&quot; saved</key>
<value />
</item>
<item>
<key>Playlist is looked by $1</key>
<value />
</item>
<item>
<key>ScratchPad length is not set in System Preferences, so it cannot be used.</key>
<value />
</item>
<item>
<key>Select a Value</key>
<value />
</item>
<item>
<key>Settings saved</key>
<value />
</item>
<item>
<key>Stream Data changed</key>
<value />
</item>
<item>
<key>Stream Data saved</key>
<value />
</item>
<item>
<key>Subject $1 added.</key>
<value />
</item>
<item>
<key>Target is not Folder</key>
<value />
</item>
<item>
<key>Unable to release Playlist</key>
<value />
</item>
<item>
<key>Unable to revert to looked state</key>
<value />
</item>
<item>
<key>Unable to set &quot;$1&quot; to &quot;$2&quot; langue &quot;$3&quot;</key>
<value />
</item>
<item>
<key>Unable to set $1: $2</key>
<value />
</item>
<item>
<key>Upload of file $1 was incomplete.</key>
<value />
</item>
<item>
<key>Uploaded file $1 is greater than LiveSupport system setting.</key>
<value />
</item>
<item>
<key>Uploaded file $1 is greater than setting in php.ini.</key>
<value />
</item>
<item>
<key>Wrong old pasword.</key>
<value />
</item>
<item>
<key>You have an Playlist already activated,n first close it</key>
<value />
</item>
<item>
<key>Access</key>
<value />
</item>
<item>
<key>Activate this Playlist</key>
<value />
</item>
<item>
<key>Add Audio</key>
<value />
</item>
<item>
<key>Add Criteria</key>
<value />
</item>
<item>
<key>Add to Playlist</key>
<value />
</item>
<item>
<key>Add to ScratchPad</key>
<value />
@ -14,6 +229,58 @@
<key>Add to active Playlist</key>
<value />
</item>
<item>
<key>Album</key>
<value />
</item>
<item>
<key>Artist</key>
<value />
</item>
<item>
<key>Artist web page</key>
<value />
</item>
<item>
<key>Audio file information web page</key>
<value />
</item>
<item>
<key>Audio source web page</key>
<value />
</item>
<item>
<key>BPM</key>
<value />
</item>
<item>
<key>Bitrate</key>
<value />
</item>
<item>
<key>Browse</key>
<value />
</item>
<item>
<key>Buy CD web page</key>
<value />
</item>
<item>
<key>CW</key>
<value />
</item>
<item>
<key>Cancel</key>
<value />
</item>
<item>
<key>Catalog number</key>
<value />
</item>
<item>
<key>Category</key>
<value />
</item>
<item>
<key>Change Fadein</key>
<value />
@ -27,79 +294,11 @@
<value />
</item>
<item>
<key>Delete File</key>
<key>Channels</key>
<value />
</item>
<item>
<key>Display this Playlist</key>
<value />
</item>
<item>
<key>Edit File</key>
<value />
</item>
<item>
<key>Edit Metadata</key>
<value />
</item>
<item>
<key>Insert Playlist here</key>
<value />
</item>
<item>
<key>List Folder</key>
<value />
</item>
<item>
<key>Listen to File</key>
<value />
</item>
<item>
<key>New Playlist using File</key>
<value />
</item>
<item>
<key>Remove File from Playlist</key>
<value />
</item>
<item>
<key>Remove Playlist</key>
<value />
</item>
<item>
<key>Remove from Scratchpad</key>
<value />
</item>
<item>
<key>Save and Close Playlist</key>
<value />
</item>
<item>
<key>Help</key>
<value />
</item>
<item>
<key>Access</key>
<value />
</item>
<item>
<key>Add Audio</key>
<value />
</item>
<item>
<key>Add to Playlist</key>
<value />
</item>
<item>
<key>Artist</key>
<value />
</item>
<item>
<key>Browse</key>
<value />
</item>
<item>
<key>CW</key>
<key>Checksum</key>
<value />
</item>
<item>
@ -110,6 +309,22 @@
<key>Clear Playlist</key>
<value />
</item>
<item>
<key>Composer</key>
<value />
</item>
<item>
<key>Conductor</key>
<value />
</item>
<item>
<key>Contributor</key>
<value />
</item>
<item>
<key>Copyright</key>
<value />
</item>
<item>
<key>Count</key>
<value />
@ -126,14 +341,34 @@
<key>Data</key>
<value />
</item>
<item>
<key>Date</key>
<value />
</item>
<item>
<key>Day</key>
<value />
</item>
<item>
<key>Delete File</key>
<value />
</item>
<item>
<key>Delete Playlist</key>
<value />
</item>
<item>
<key>Description</key>
<value />
</item>
<item>
<key>Disc number</key>
<value />
</item>
<item>
<key>Display this Playlist</key>
<value />
</item>
<item>
<key>Duration</key>
<value />
@ -142,6 +377,22 @@
<key>Edit</key>
<value />
</item>
<item>
<key>Edit File</key>
<value />
</item>
<item>
<key>Edit Metadata</key>
<value />
</item>
<item>
<key>Encoded by</key>
<value />
</item>
<item>
<key>Encoder software used</key>
<value />
</item>
<item>
<key>Fade</key>
<value />
@ -158,30 +409,98 @@
<key>File Management</key>
<value />
</item>
<item>
<key>File Type</key>
<value />
</item>
<item>
<key>File format</key>
<value />
</item>
<item>
<key>File type</key>
<value />
</item>
<item>
<key>Folder Structure</key>
<value />
</item>
<item>
<key>Format</key>
<value />
</item>
<item>
<key>Frequency</key>
<value />
</item>
<item>
<key>Genre</key>
<value />
</item>
<item>
<key>Go</key>
<value />
</item>
<item>
<key>Group Name</key>
<value />
</item>
<item>
<key>Help</key>
<value />
</item>
<item>
<key>ISRC number</key>
<value />
</item>
<item>
<key>Insert Playlist here</key>
<value />
</item>
<item>
<key>Item</key>
<value />
</item>
<item>
<key>KW</key>
<key>Label</key>
<value />
</item>
<item>
<key>Language</key>
<value />
</item>
<item>
<key>Length</key>
<value />
</item>
<item>
<key>Length&lt;br&gt;&lt;small&gt;Enter zero for Live Stream&lt;/small&gt;</key>
<value />
</item>
<item>
<key>Library Search</key>
<value />
</item>
<item>
<key>List Folder</key>
<value />
</item>
<item>
<key>Listen to File</key>
<value />
</item>
<item>
<key>Local Time</key>
<value />
</item>
<item>
<key>Lyricist</key>
<value />
</item>
<item>
<key>Lyrics</key>
<value />
</item>
<item>
<key>MDataXML</key>
<value />
@ -190,6 +509,14 @@
<key>Main</key>
<value />
</item>
<item>
<key>Maximum length of ScratchPad</key>
<value />
</item>
<item>
<key>Media File</key>
<value />
</item>
<item>
<key>Media Library</key>
<value />
@ -206,6 +533,10 @@
<key>Monthly View</key>
<value />
</item>
<item>
<key>Mood</key>
<value />
</item>
<item>
<key>Move</key>
<value />
@ -226,10 +557,18 @@
<key>New</key>
<value />
</item>
<item>
<key>New Password</key>
<value />
</item>
<item>
<key>New Playlist</key>
<value />
</item>
<item>
<key>New Playlist using File</key>
<value />
</item>
<item>
<key>New Playlist using Item</key>
<value />
@ -250,14 +589,46 @@
<key>No objects</key>
<value />
</item>
<item>
<key>Old Password</key>
<value />
</item>
<item>
<key>Open last Playlist</key>
<value />
</item>
<item>
<key>Operator</key>
<value />
</item>
<item>
<key>Orchestra or band</key>
<value />
</item>
<item>
<key>Original artist</key>
<value />
</item>
<item>
<key>Original lyricist</key>
<value />
</item>
<item>
<key>PL Editor</key>
<value />
</item>
<item>
<key>Page</key>
<value />
</item>
<item>
<key>Password</key>
<value />
</item>
<item>
<key>Playlist</key>
<value />
</item>
<item>
<key>Playlist Editor</key>
<value />
@ -266,10 +637,22 @@
<key>Playlist Metadata</key>
<value />
</item>
<item>
<key>Radio station name</key>
<value />
</item>
<item>
<key>Radio station web page</key>
<value />
</item>
<item>
<key>Range</key>
<value />
</item>
<item>
<key>Rating</key>
<value />
</item>
<item>
<key>RawAnalyze</key>
<value />
@ -278,14 +661,62 @@
<key>Remove</key>
<value />
</item>
<item>
<key>Remove File from Playlist</key>
<value />
</item>
<item>
<key>Remove Playlist</key>
<value />
</item>
<item>
<key>Remove Selected</key>
<value />
</item>
<item>
<key>Remove from Scratchpad</key>
<value />
</item>
<item>
<key>Repeat Password</key>
<value />
</item>
<item>
<key>Report date/time</key>
<value />
</item>
<item>
<key>Report location</key>
<value />
</item>
<item>
<key>Report organizations</key>
<value />
</item>
<item>
<key>Reset</key>
<value />
</item>
<item>
<key>Retype Password</key>
<value />
</item>
<item>
<key>Revert to Saved</key>
<value />
</item>
<item>
<key>Rows Per Page</key>
<value />
</item>
<item>
<key>Rows per Page</key>
<value />
</item>
<item>
<key>Sample rate</key>
<value />
</item>
<item>
<key>Save Playlist</key>
<value />
@ -294,6 +725,10 @@
<key>Save and Close</key>
<value />
</item>
<item>
<key>Save and Close Playlist</key>
<value />
</item>
<item>
<key>Scheduler</key>
<value />
@ -310,10 +745,26 @@
<key>Search</key>
<value />
</item>
<item>
<key>Search Library</key>
<value />
</item>
<item>
<key>Signed in</key>
<value />
</item>
<item>
<key>Station Logo</key>
<value />
</item>
<item>
<key>Station Logo Path</key>
<value />
</item>
<item>
<key>Station Name</key>
<value />
</item>
<item>
<key>Station Settings</key>
<value />
@ -322,14 +773,42 @@
<key>Station Time</key>
<value />
</item>
<item>
<key>Station URL</key>
<value />
</item>
<item>
<key>StationPrefs</key>
<value />
</item>
<item>
<key>Stream</key>
<value />
</item>
<item>
<key>Stream URL</key>
<value />
</item>
<item>
<key>Subject</key>
<value />
</item>
<item>
<key>Submit</key>
<value />
</item>
<item>
<key>System Settings</key>
<value />
</item>
<item>
<key>Talk</key>
<value />
</item>
<item>
<key>Time</key>
<value />
</item>
<item>
<key>Title</key>
<value />
@ -342,6 +821,10 @@
<key>Today</key>
<value />
</item>
<item>
<key>Track number</key>
<value />
</item>
<item>
<key>Tree view</key>
<value />
@ -350,14 +833,26 @@
<key>Type</key>
<value />
</item>
<item>
<key>Upload</key>
<value />
</item>
<item>
<key>UploadM</key>
<value />
</item>
<item>
<key>User Password</key>
<value />
</item>
<item>
<key>User/Groups</key>
<value />
</item>
<item>
<key>Username</key>
<value />
</item>
<item>
<key>Week</key>
<value />
@ -366,6 +861,14 @@
<key>Weekly View</key>
<value />
</item>
<item>
<key>Year</key>
<value />
</item>
<item>
<key>calendar week</key>
<value />
</item>
<item>
<key>copy</key>
<value />
@ -402,28 +905,4 @@
<key>previous</key>
<value />
</item>
<item>
<key>{$o.name}</key>
<value />
</item>
<item>
<key>{$sec.header}</key>
<value />
</item>
<item>
<key>$1 must be $2</key>
<value />
</item>
<item>
<key>Do</key>
<value />
</item>
<item>
<key>Missing value for $1</key>
<value />
</item>
<item>
<key>Select a Value</key>
<value />
</item>
</language>

1424
livesupport/modules/htmlUI/var/locals.hu.Hungarian.xml
View file

File diff suppressed because it is too large Load diff

1426
livesupport/modules/htmlUI/var/locals.nl.Dutch.xml
View file

File diff suppressed because it is too large Load diff

1425
livesupport/modules/htmlUI/var/locals.sr.Serbian.xml
View file

File diff suppressed because it is too large Load diff

19
livesupport/modules/htmlUI/var/templates/library/results.tpl
View file

@ -1,3 +1,5 @@
{assign var="_PL_activeId" value=$PL->getActiveId()}
{if $_results.cnt > 0}
<form name="SEARCHRESULTS">
<div class="head" style="width:535px; height: 21px;">&nbsp;</div>
@ -46,14 +48,27 @@
##Page##:&nbsp;&nbsp;{$_results.page+1}&nbsp;&nbsp;
##Range##:&nbsp;{$_criteria.offset+1}-{if ($_criteria.offset+$_criteria.limit)>$_results.cnt}{$_results.cnt}{else}{$_criteria.offset+$_criteria.limit}{/if}
</div>
<select name="SEARCHRESULTS_multiaction">
<option>##Multiple Action:##</option>
<option onClick="collector_submit('SEARCHRESULTS', 'SP.addItem')">##Add file(s) to ScratchPad##</option>
{if $_PL_activeId}
<input type="button" class="button" value="##To Playlist##" onClick="collector_submit('SEARCHRESULTS', 'PL.addItem')">
<option onClick="collector_submit('SEARCHRESULTS', 'PL.addItem')">##Add file(s) to active Playlist##</option>
{else}
<input type="button" class="button" value="##New Playlist##" onClick="collector_submit('SEARCHRESULTS', 'PL.create')">
<option onClick="collector_submit('SEARCHRESULTS', 'PL.create')">##New Playlist using this file(s)##</option>
{/if}
</select>
<script type="text/javascript">
document.forms['SEARCHRESULTS'].elements['SEARCHRESULTS_multiaction'].options[0].selected=true;
//document.forms['SEARCHRESULTS'].elements['all'].checked = false;
//collector_switchAll('SEARCHRESULTS')
</script>
</div>
</form>
{else}
##No match found.##
{/if}
{assign var="_PL_activeId" value=NULL}

4
livesupport/modules/htmlUI/var/templates/menu.tpl
View file

@ -1,7 +1,7 @@
<!-- start nav -->
<div class="container_nav">
<ul id="nav">
<!-- <li><a href="{$UI_BROWSER}?id={$START.fid}&act=uploadFileM">##UploadM##</a></li> -->
<!-- <li><a href="{$UI_BROWSER}?id={$START.fid}&act=uploadFileM">UploadM</a></li> -->
<li><a href="{$UI_BROWSER}?folderId={$START.fid}&act=editFile">##Add Audio##</a>
<ul>
<li><a href="{$UI_BROWSER}?folderId={$START.fid}&act=editFile">##File##</a></li>
@ -16,7 +16,7 @@
</li>
<li><a href="{$UI_BROWSER}?id={$START.fid}&act=PL.simpleManagement">##Playlist Editor##</a></li>
<li><a href="{$UI_BROWSER}?act=SCHEDULER">##Scheduler##</a></li>
<!-- <li><a href="{$UI_BROWSER}?act=MetaDataValues&Main=1">##Metadata##</a></li> -->
<!-- <li><a href="{$UI_BROWSER}?act=MetaDataValues&Main=1">Metadata</a></li> -->
<li><a href="{$UI_BROWSER}?act=changeStationPrefs">##Station Settings##</a>
{*
<ul>

72
livesupport/modules/htmlUI/var/templates/scratchpad.tpl
View file

@ -1,4 +1,5 @@
{assign var="_PL_activeId" value=$PL->getActiveId()}
<!-- start scratch pad -->
{if is_array($SCRATCHPAD)}
<form name="SP">
@ -10,9 +11,6 @@
<!-- start table header -->
<tr class="blue_head">
<td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('SP')"></td>
<script type="text/javascript">
document.forms['SP'].elements['all'].checked = false;
</script>
<td style="width: 95px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');" id="blue_head">##Title##</a></td>
<td style="width: 69px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');" id="blue_head">##Duration##</td>
<td style="width: 41px; border: 0"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');" id="blue_head">##Type##</td>
@ -41,15 +39,17 @@
<div class="footer" style="width:255px;">
<select name="SP_multiaction">
<option>##Multiple Action:##</option>
<option onClick="collector_submit('SP', 'SP.removeItem')">##Remove##</option>
<option onClick="collector_submit('SP', 'SP.removeItem')">##Remove file(s)##</option>
{if $_PL_activeId}
<option onClick="collector_submit('SP', 'PL.addItem')">##Add to Playlist##</option>
<option onClick="collector_submit('SP', 'PL.addItem')">##Add file(s) to active Playlist##</option>
{else}
<option onClick="collector_submit('SP', 'PL.create')">##New Playlist using Item##</option>
<option onClick="collector_submit('SP', 'PL.create')">##New Playlist using this file(s)##</option>
{/if}
</select>
<script type="text/javascript">
document.forms['SP'].elements['SP_multiaction'].options[0].selected = true;
//document.forms['SP'].elements['all'].checked = false;
//collector_switchAll('SP');
</script>
<a href="#" onClick="collector_clearAll('SP', 'SP.removeItem')" id="blue_head">##Clear##</a>
</div>
@ -60,62 +60,4 @@
{assign var="_PL_activeId" value=NULL}
<!-- end scratch pad -->
{*
<!-- old template -->
{assign var="_PL_activeId" value=$PL->getActiveId()}
<div id="scratchpad">
<center><b>ScratchPad</b>
{if is_array($SCRATCHPAD)}
<form name="SP">
<input type="hidden" name="act">
<table>
<tr style="background-color: {cycle values='#eeeeee, #dadada'}">
<th></th>
<td align="center"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');">[Title]</a></td>
<td align="center"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=duration', 'order');">[Duration]</a></td>
<td align="center"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=type', 'order');">[Type]</a></td>
<td align="center">Remove</td>
</tr>
{foreach from=$SCRATCHPAD item=i}
<tr style="background-color: {cycle values='#eeeeee, #dadada'}" {assign var="moreContextBefore" value=", 'SP.removeItem'"} {include file="sub/contextmenu.tpl"}>
<td><input type="checkbox" name="{$i.id}"></td>
<td>
{if $_PL_activeId == $i.id}
<b>{$i.title|truncate:30}</b>
{else}
{$i.title|truncate:30}
{/if}
</td>
<td>{$i.duration}</td>
<td>{$i.type} </td>
<th><a href="#" onclick="hpopup('{$UI_HANDLER}?act=SP.removeItem&id={$i.id}', 'SP')">X</th>
</tr>
{/foreach}
<tr style="background-color: {cycle values='#eeeeee, #dadada'}">
<td><input type="checkbox" name="all" onClick="collector_switchAll('SP')"></th>
<td align="center" colspan="2">
<select name="SP_multiaction">
<option>Multiple Action:</option>
<option onClick="collector_submit('SP', 'SP.removeItem')">Remove</option>
{if $_PL_activeId}
<option onClick="collector_submit('SP', 'PL.addItem')">Add to Playlist</option>
{else}
<option onClick="collector_submit('SP', 'PL.create')">New Playlist using Item</option>
{/if}
</select>
<script type="text/javascript">
document.forms['SP'].elements['SP_multiaction'].options[0].selected=true;
</script>
</th>
<td align="center" colspan="2"><a href="#" onClick="collector_clearAll('SP', 'SP.removeItem')">[Clear]</a></th>
</tr>
</table>
</form>
{/if}
</div>
</center>
*}
{assign var="_PL_activeId" value=NULL}

3
livesupport/modules/htmlUI/var/templates/script/collector.js.tpl
View file

@ -1,7 +1,6 @@
{*Smarty template*}
{literal}
<script type="text/javascript">
function collector_submit(formname, action)
{
var href = '{/literal}{$UI_HANDLER}{literal}?act='+action;

12
livesupport/modules/htmlUI/var/ui_handler.class.php
View file

@ -490,16 +490,16 @@ class uiHandler extends uiBase {
return;
}
if(FALSE === $this->gb->authenticate($ulogin, $oldpass)){
$this->_retMsg('Wrong old pasword.');
$this->_retMsg('Old password was incorrect.');
return;
}
if($pass !== $pass2){
$this->_retMsg("Passwords do not match.").
$this->_retMsg("Passwords did not match.").
"($pass/$pass2)";
$this->redirUrl = UI_BROWSER.'?act=subjects';
return;
}
$this->_retMsg('Password changed');
$this->_retMsg('Password changed.');
$this->redirUrl = UI_BROWSER.'?act=subjects';
$this->gb->passwd($ulogin, $oldpass, $pass);
}
@ -602,10 +602,10 @@ class uiHandler extends uiBase {
if ($val['error']) {
switch ($val['error']) {
case 1: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is greater than setting in php.ini.', $mask[$key]['label']); break;
case 2: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is greater than LiveSupport system setting.', $mask[$key]['label']); break;
case 1: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is bigger than setting in php.ini.', $mask[$key]['label']); break;
case 2: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is bigger than LiveSupport´s system setting.', $mask[$key]['label']); break;
case 3: $was_error = TRUE; $this->_retMsg('Upload of file $1 was incomplete.', $mask[$key]['label']); break;
case 4: if ($mask[$key]['required']) {$was_error = TRUE; $this->_retMsg('File $1 was not uploadet.', $mask[$key]['label']);} break;
case 4: if ($mask[$key]['required']) {$was_error = TRUE; $this->_retMsg('File $1 was not uploaded.', $mask[$key]['label']);} break;
}
}
}

14
livesupport/modules/htmlUI/var/ui_playlist.class.php
View file

@ -48,7 +48,7 @@ class uiPlaylist
return FALSE;
}
if(($userid = $this->Base->gb->playlistIsAvailable($plid, $this->Base->sessid)) !== TRUE) {
if (UI_WARNING) $this->Base->_retMsg('Playlist is looked by $1', $this->Base->gb->getSubjName($userid));
if (UI_WARNING) $this->Base->_retMsg('Playlist has been locked by $1', $this->Base->gb->getSubjName($userid));
return FALSE;
}
$this->token = $this->Base->gb->lockPlaylistForEdit($plid, $this->Base->sessid);
@ -66,13 +66,13 @@ class uiPlaylist
# delete PL from session
# remove token from ls_pref
if(!$this->token) {
if (UI_WARNING) $this->Base->_retMsg('No Playlist is looked by You');
if (UI_WARNING) $this->Base->_retMsg('There is no playlist available to unlock.');
return FALSE;
}
$plgunid = $this->Base->gb->releaseLockedPlaylist($this->token, $this->Base->sessid);
if (PEAR::isError($plgunid)) {
#print_r($plgunid);
if (UI_WARNING) $this->Base->_retMsg('Unable to release Playlist');
if (UI_WARNING) $this->Base->_retMsg('Unable to release Playlist.');
return FALSE;
}
if ($msg && UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" released', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE));
@ -97,13 +97,13 @@ 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 locked by You.');
return FALSE;
}
$plgunid = $this->Base->gb->revertEditedPlaylist($this->token, $this->Base->sessid);
if (PEAR::isError($plgunid)) {
# print_r($plgunid);
if (UI_WARNING) $this->Base->_retMsg('Unable to revert to looked state');
if (UI_WARNING) $this->Base->_retMsg('Unable to revert to locked state.');
return FALSE;
}
if (UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" reverted', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE));
@ -120,7 +120,7 @@ class uiPlaylist
function reportLookedPL($setMsg=FALSE)
{
if(is_string($saved = $this->Base->gb->loadPref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY))) {
if ($setMsg == TRUE) $this->Base->_retMsg('Found looked Playlist');
if ($setMsg == TRUE) $this->Base->_retMsg('Found locked Playlist.');
return TRUE;
}
return FALSE;
@ -271,7 +271,7 @@ class uiPlaylist
#print_r($r);
if (PEAR::isError($r)) {
if (UI_VERBOSE) print_r($r);
$this->Base->_retMsg('ChangeFadeInfo failed');
$this->Base->_retMsg('Change fade information failed.');
return FALSE;
}
}

16
livesupport/modules/htmlUI/var/ui_scratchpad.class.php
View file

@ -64,24 +64,34 @@ class uiScratchPad
}
function addItem($id)
function addItem($ids)
{
if(!$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]) {
if (UI_WARNING) $this->Base->_retMsg('ScratchPad length is not set in System Preferences, so it cannot be used.');
return false;
}
if (!$ids) {
if (UI_WARNING) $this->Base->_retMsg('No Item(s) selected');
return FALSE;
}
if (!is_array($ids))
$ids = array($ids);
$item = $this->Base->_getMetaInfo($id);
$sp = $this->get();
foreach ($ids as $id) {
$item = $this->Base->_getMetaInfo($id);
foreach ($sp as $key=>$val) {
if ($val['id'] == $item['id']) {
unset($sp[$key]);
if (UI_VERBOSE) $this->Base->_retMsg('Entry $1 was already on SP since $2.\nMoved to Top.', $item['title'], $val['added']);
if (UI_VERBOSE) $this->Base->_retMsg('Entry $1 was already on the ScratchPad. It has been moved to the top of the list.', $item['title'], $val['added']);
} else {
#$this->Base->incAccessCounter($id);
}
}
$sp = array_merge(array($item), is_array($sp) ? $sp : NULL);
}
for ($n=0; $n<$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]; $n++) {
if (is_array($sp[$n])) $this->items[$n] = $sp[$n];
}