some tweaks

This commit is contained in:
sebastian 2005-08-02 12:22:26 +00:00
parent 9f47bdc30f
commit 2f268aba62
21 changed files with 158 additions and 178 deletions

View file

@ -79,8 +79,10 @@ $ui_fmask = array(
'options' => array(
5 => 5,
10 => 10,
25 => 25
25 => 25,
50 => 50
),
'default' => 10,
'required' => TRUE
),
array(

View file

@ -2,7 +2,7 @@
{include file="sub/x.tpl"}
<center>
{if $fMetaData}
<textarea rows="25" cols="90" style="font-size:small">{htmlspecialchars str=$fMetaData}</textarea>
<textarea rows="25" cols="90" style="font-size:small">{$fMetaData|escape:'html'}</textarea>
{/if}
{if $_analyzeFile}
{$_analyzeFile}

View file

@ -35,7 +35,7 @@
{/if}
</span>
</td>
<td><img src="img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {include file="sub/mouseover.tpl"} /></td>
<td><img src="img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {include file="sub/alttext.tpl"} /></td>
<td style="border: 0">
{* &nbsp;<a href="javascript:frename('{$i.name}', '{$i.id}')">[rename]</a> *}
&nbsp;<a href="javascript:fmove('{$i.id}', '.')">##move##</a>

View file

@ -6,7 +6,7 @@ onClick="return contextmenu('{$i.id}'
{if $_PL_activeId}
, 'PL.addItem'
{else}
, 'PL.create', '{$i.title|truncate:20}'
, 'PL.create', '{$i.title|truncate:20|escape:'html'}'
{/if}
, 'edit', '##audioclip##'
, 'delete', '##audioclip##'

View file

@ -27,7 +27,7 @@
<td {include file="library/actionhandler.tpl"} style="cursor: pointer">{$i.creator}</td>
<td {include file="library/actionhandler.tpl"} style="text-align: right; cursor: pointer">{assign var="_duration" value=$i.duration}{niceTime in=$_duration}</td>
<td {include file="library/actionhandler.tpl"} style="border: 0; text-align: center; cursor: pointer">
<img src="img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {include file="sub/mouseover.tpl"} />
<img src="img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {include file="sub/alttext.tpl"} />
</td>
</tr>
<!-- end item -->

View file

@ -1,2 +1,7 @@
style="cursor: pointer"
onClick="return contextmenu('{$i.attrs.id}', {if $i.type|lower == "audioclip"}'listen', '{$i.gunid}', '{$i.type}', {/if} 'PL.removeItem')"
onClick="return contextmenu('{$i.attrs.id}',
{if $i.type|lower == 'audioclip'}
'listen', '{$i.gunid}', '{$i.type}',
{/if}
'PL.removeItem'
)"

View file

@ -43,7 +43,7 @@
</td>
<td {include file="playlist/actionhandler.tpl"}>{$i.creator}</td>
<td {include file="playlist/actionhandler.tpl"}>
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} />
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/alttext.tpl"} />
</td>
<td style="border: 0">
<a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos-1}')"><img src="img/bt_top_xsm.png" alt="##move up##" vspace=1 hspace=1/></a>

View file

@ -57,7 +57,7 @@
</td>
<td style="width: 200px" {include file="playlist/actionhandler.tpl"}>{$i.creator}</td>
<td style="width: 35px" {include file="playlist/actionhandler.tpl"}>
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} />
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/alttext.tpl"} />
</td>
<td style="width: 35px; border: 0">
<a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos-1}')"><img src="img/bt_top_xsm.png" alt="##move up##" vspace=1 hspace=1/></a>

View file

@ -37,7 +37,7 @@
<td>{$i.title}</td>
<td style="width: 50px;">{assign var="_duration" value=$i.duration}{niceTime in=$_duration}</td>
<td style="width: 150px">{$i.creator}</td>
<td style="width: 35px; border:0"><img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /></td>
<td style="width: 35px; border:0"><img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/alttext.tpl"} /></td>
</tr>
<!-- end clip information -->
</table>

View file

@ -4,7 +4,7 @@
{tra 0='Are you sure to remove "$1"?' 1=$_REQUEST.login}
<br><br>
<input type="button" class="button" onClick="window.close()" value="Cancel">
<input type="button" class="button" onClick="location.href='{$UI_HANDLER}?act=SUBJECTS.removeSubj&login={urlencode str=$_REQUEST.login}'" value="OK">
<input type="button" class="button" onClick="location.href='{$UI_HANDLER}?act=SUBJECTS.removeSubj&login={$_REQUEST.login|escape:'url'}'" value="OK">
</center>
</body>

View file

@ -38,7 +38,7 @@
{foreach from=$_entrys[$_hour] item="i"} {* hier werden die Einträge welche in der jeweil. h beginnen durchlaufen *}
<div {include file="scheduler/removeitem.tpl"}>
<img src="img/playlist.png" border="0" {include file="sub/mouseover.tpl"}>
<img src="img/playlist.png" border="0" {include file="sub/alttext.tpl"}>
&nbsp;
<b>{$i.title}</b>
{$i.start}-{$i.end}

View file

@ -50,7 +50,7 @@
<td class="day_full">
{foreach from=$_entrys[$_day.day][$_hour] item="i"}
<div {include file="scheduler/removeitem.tpl"}>
<img src="img/playlist.png" border="0" {include file="sub/mouseover.tpl"}>
<img src="img/playlist.png" border="0" {include file="sub/alttext.tpl"}>
&nbsp;
<h2>{$i.title|truncate:12}</h2>
<p>{$i.start|truncate:8:""} - {$i.end|truncate:8:""}</p>

View file

@ -6,7 +6,7 @@ onClick="return contextmenu('{$i.id}'
{if $_PL_activeId}
, 'PL.addItem'
{else}
, 'PL.create', '{$i.title|truncate:20}'
, 'PL.create', '{$i.title|truncate:20|escape:'html'}'
{/if}
, 'edit', '##audioclip##'
, 'delete', '##audioclip##'

View file

@ -41,9 +41,9 @@
<td {include file="scratchpad/actionhandler.tpl"} style="border: 0; text-align: center; cursor: pointer">
{if $PL->isAvailable($i.id) == false}
<div align="left"><img src="img/ico_lock.png">
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /></div>
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/alttext.tpl"} /></div>
{else}
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /> {/if}
<img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/alttext.tpl"} /> {/if}
</td>
</tr>
<!-- end item -->

View file

@ -62,7 +62,7 @@
screenX = (Xpos + Pwidth/2 - width/2);
screenY = (Ypos + Pheight/2 - height/2);
url = url + '&is_popup=1';
arg = 'width='+width+', height='+height+', scrollbars=yes, menubar=no, depend=yes, left='+screenX+', top='+screenY;
arg = 'width='+width+', height='+height+',resizable=yes, scrollbars=no, menubar=no, depend=yes, left='+screenX+', top='+screenY;
popupwin = window.open(url, name, arg);
window.popupwin.focus();

View file

@ -5,10 +5,10 @@ onMouseover = "showalttext('<div style=&quot;font-size: 120%; font-weight: bold&
{if $PL->isUSedBy($i.id) != false}'<div>##(used by {$PL->isUSedBy($i.id)})##</div>' + {/if}
{foreach from=$PL->getFlat($i.id) item='_pli'}
'<div>{$_pli.title} &nbsp;{$_pli.duration|truncate:8:''}</div>' +
'<div>{$_pli.title|escape:'html'} &nbsp;{$_pli.duration|truncate:8:''}</div>' +
{/foreach}
{/if}
'{foreach from=$_metaarr.metadata key='_key' item='_item'}{if $_key != 'Title'}<div>{$_key}: {$_item}</div>{/if}{/foreach}')"
'{foreach from=$_metaarr.metadata key='_key' item='_item'}{if $_key != 'Title'}<div>{$_key}: {$_item|escape:'quotes'}</div>{/if}{/foreach}')"
onMouseout = "hidealttext()"
{assign var='_metaarr' value=null}

View file

@ -2,23 +2,26 @@
onClick="return contextmenu('{$i.id}'
{$moreContextBefore}
{if $i.type|lower == 'audioclip'}
, 'listen', '{$i.gunid}'
, 'listen', '{$i.gunid}', '##audioclip##'
{if $_PL_activeId}
, 'PL.addItem'
{else}
, 'PL.create'
, 'PL.create', '{$i.title|truncate:20|escape:'html'}'
{/if}
, 'edit', 'delete'
, 'edit', '##audioclip##'
, 'delete', '##audioclip##'
{/if}
{if $i.type|lower == 'webstream'}
{if $_PL_activeId}
, 'PL.addItem'
{else}
, 'PL.create'
, 'PL.create', '{$i.title|truncate:20|escape:'html'}'
{/if}
, 'edit', 'delete'
, 'edit', '##webstream##'
, 'delete', '##webstream##'
{/if}
{if $i.type|lower == 'playlist'}
@ -26,15 +29,21 @@ onClick="return contextmenu('{$i.id}'
{if $_PL_activeId == $i.id}
, 'PL.release'
{else}
, 'SCHEDULER.addPL', 'PL.addItem', 'delete'
, 'SCHEDULER.addPL'
, 'PL.addItem'
, 'delete'
{/if}
{else}
, 'SCHEDULER.addPL', 'PL.activate', 'PL.create', 'delete'
, 'SCHEDULER.addPL'
, 'PL.activate'
, 'PL.create', '{$i.title|truncate:20|escape:'html'}'
, 'delete'
{/if}
{/if}
{if ($i.type|lower == 'folder')}
, 'fileList', 'delete'
, 'fileList'
, 'delete', '##playlist##'
{/if}
{$moreContextAfter}
)"

View file

@ -23,9 +23,9 @@
{foreach from=$_member item="i"}
<tr class="{cycle values='blue1, blue2'}">
<td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
<td onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.removeSubjFromGr')">{$i.login}</td>
<td onClick="return contextmenu('login={$i.login|escape:'url'}&gname={$_gname|escape:'url'}', 'SUBJECTS.removeSubjFromGr')">{$i.login}</td>
<td style="border: 0; text-align: center"
onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.removeSubjFromGr')">
onClick="return contextmenu('login={$i.login|escape:'url'}&gname={$_gname|escape:'url'}', 'SUBJECTS.removeSubjFromGr')">
{if $i.type|lower == 'u'}
<img src="img/user.png" border="0" alt="User" />
{else}
@ -41,7 +41,7 @@
</table>
</div>
<div class="footer" style="width:250px;">
<a href="" onClick="collector_submit('GRP', 'SUBJECTS.removeSubjFromGr&gname={urlencode str=$_gname}')" id="blue_head">##Remove selected##</a>
<a href="" onClick="collector_submit('GRP', 'SUBJECTS.removeSubjFromGr&gname={$_gname|escape:'url'}')" id="blue_head">##Remove selected##</a>
</div>
</div>
<!-- end current group member -->
@ -70,9 +70,9 @@
<!-- start item -->
<tr class="{cycle values='blue1, blue2'}">
<td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
<td onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.addSubj2Gr')">{$i.login}</td>
<td onClick="return contextmenu('login={$i.login|escape:'url'}&gname={$_gname|escape:'url'}', 'SUBJECTS.addSubj2Gr')">{$i.login}</td>
<td style="border: 0; text-align: center"
onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.removeSubjFromGr')">
onClick="return contextmenu('login={$i.login|escape:'url'}&gname={$_gname|escape:'url'}', 'SUBJECTS.removeSubjFromGr')">
{if $i.type|lower == 'u'}
<img src="img/user.png" border="0" alt="User" />
{else}
@ -91,7 +91,7 @@
</table>
</div>
<div class="footer" style="width:250px;">
<a href="" onClick="collector_submit('NOGRP', 'SUBJECTS.addSubj2Gr&gname={urlencode str=$_gname}')" id="blue_head">##Add selected##</a>
<a href="" onClick="collector_submit('NOGRP', 'SUBJECTS.addSubj2Gr&gname={$_gname|escape:'url'}')" id="blue_head">##Add selected##</a>
</div>
</div>
<!-- end add group member -->

View file

@ -13,7 +13,8 @@
{foreach from=$SUBJECTS->getSubjectsWCnt() item=i}
{if $i.type|lower == 'g'}{assign var="_type" value="group"}{else}{assign var="_type" value="user"}{/if}
<tr class="{cycle values='blue1, blue2'}"
onClick="return contextmenu('id={$i.id}&login={urlencode str=$i.login}', {if $i.type|lower eq 'g'}'SUBJECTS.manageGroupMember', {else}'SUBJECTS.chgPasswd', {/if} 'SUBJECTS.removeSubj')"
style="cursor: pointer"
onClick="return contextmenu('id={$i.id}&login={$i.login|escape:'url'}', {if $i.type|lower eq 'g'}'SUBJECTS.manageGroupMember', {else}'SUBJECTS.chgPasswd', {/if} 'SUBJECTS.removeSubj')"
>
<td>{$i.login}</td>
<td style="width: 30px; text-align: center;">

View file

@ -292,7 +292,7 @@ class uiBrowser extends uiBase {
}
ksort($arr);
#print_r($arr);
return array('metadata' => $arr);
}

View file

@ -10,9 +10,6 @@ $Smarty->assign_by_ref ('JSCOM', $jscom);
$Smarty->register_function('str_repeat', 'S_str_repeat');
$Smarty->register_function('urlencode', 'S_urlencode');
$Smarty->register_function('htmlspecialchars', 'S_htmlspecialchars');
$Smarty->register_function('system', 'S_system');
$Smarty->register_function('tra', 'S_tra');
$Smarty->register_function('getHour', 'S_getHour');
$Smarty->register_function('getMinute', 'S_getMinute');
@ -36,37 +33,6 @@ function S_str_repeat($param)
}
/**
* urlencode
*
* Encode given string to use in URL.
*
* @param str string, string to encode
* @return string, encoded string
*/
function S_urlencode($param)
{
extract($param);
return urlencode($str);
}
/**
* htmlspecialchars
*
* convert special chars in given string to html-entitys.
*
* @param str string, string to convert
* @return string, converted string
*/
function S_htmlspecialchars($param)
{
extract($param);
return htmlspecialchars($str);
}
/**
* tra
*
@ -82,7 +48,6 @@ function S_tra($in)
echo tra($param[0], $param[1], $param[2], $param[3], $param[4], $param[5], $param[6], $param[7], $param[8], $param[9]);
}
function S_getHour($param)
{
## input format is HH:MM:SS.dddddd
@ -116,8 +81,6 @@ function S_getSecond($param)
return strftime("%S", $curr);
}
function S_niceTime($param)
{
extract($param);