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

some tweaks

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
livesupport/modules/htmlUI/var/formmask/generic.inc.php
View file

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

2
livesupport/modules/htmlUI/var/templates/file/data.tpl
View file

@ -2,7 +2,7 @@
{include file="sub/x.tpl"} {include file="sub/x.tpl"}
<center> <center>
{if $fMetaData} {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}
{if $_analyzeFile} {if $_analyzeFile}
{$_analyzeFile} {$_analyzeFile}

2
livesupport/modules/htmlUI/var/templates/file/objects.tpl
View file

@ -35,7 +35,7 @@
{/if} {/if}
</span> </span>
</td> </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"> <td style="border: 0">
{* &nbsp;<a href="javascript:frename('{$i.name}', '{$i.id}')">[rename]</a> *} {* &nbsp;<a href="javascript:frename('{$i.name}', '{$i.id}')">[rename]</a> *}
&nbsp;<a href="javascript:fmove('{$i.id}', '.')">##move##</a> &nbsp;<a href="javascript:fmove('{$i.id}', '.')">##move##</a>

2
livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl
View file

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

2
livesupport/modules/htmlUI/var/templates/library/results.tpl
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="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="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"> <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> </td>
</tr> </tr>
<!-- end item --> <!-- end item -->

7
livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl
View file

@ -1,2 +1,7 @@
style="cursor: pointer" 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'
)"

2
livesupport/modules/htmlUI/var/templates/playlist/editor.tpl
View file

@ -43,7 +43,7 @@
</td> </td>
<td {include file="playlist/actionhandler.tpl"}>{$i.creator}</td> <td {include file="playlist/actionhandler.tpl"}>{$i.creator}</td>
<td {include file="playlist/actionhandler.tpl"}> <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>
<td style="border: 0"> <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> <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>

2
livesupport/modules/htmlUI/var/templates/playlist/editor_dragitem.tpl
View file

@ -57,7 +57,7 @@
</td> </td>
<td style="width: 200px" {include file="playlist/actionhandler.tpl"}>{$i.creator}</td> <td style="width: 200px" {include file="playlist/actionhandler.tpl"}>{$i.creator}</td>
<td style="width: 35px" {include file="playlist/actionhandler.tpl"}> <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>
<td style="width: 35px; border: 0"> <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> <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>

192
livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.arrangeItems.tpl
View file

@ -1,96 +1,96 @@
{include file="popup/header.tpl"} {include file="popup/header.tpl"}
{include file="script/alttext.js.tpl"} {include file="script/alttext.js.tpl"}
<div class="container_elements" style="width: 500px"> <div class="container_elements" style="width: 500px">
<div> <div>
<div style="float: left;"><h1>##Reorder Playlist## </h1></div> <div style="float: left;"><h1>##Reorder Playlist## </h1></div>
<div style="float: right;"><h1>{$PL->title} &nbsp; {getHour time=$PL->duration}##h##&nbsp;{getMinute time=$PL->duration}##m##&nbsp;{getSecond time=$PL->duration}##s##</h1></div> <div style="float: right;"><h1>{$PL->title} &nbsp; {getHour time=$PL->duration}##h##&nbsp;{getMinute time=$PL->duration}##m##&nbsp;{getSecond time=$PL->duration}##s##</h1></div>
</div> </div>
<br><br> <br><br>
{$UI_PL_DRAG_INTRO} {$UI_PL_DRAG_INTRO}
<form name="PL" action="{$UI_HANDLER}"> <form name="PL" action="{$UI_HANDLER}">
<input type="hidden" name="act" value="PL.reArrange"> <input type="hidden" name="act" value="PL.reArrange">
<div> <div>
<table style="width: 500px;"> <table style="width: 500px;">
<tr class="blue_head"> <tr class="blue_head">
<td>##Title##</td> <td>##Title##</td>
<td style="width: 50px;">##Duration##</td> <td style="width: 50px;">##Duration##</td>
<td style="width: 150px">##Artist##</td> <td style="width: 150px">##Artist##</td>
<td style="width: 35px; border:0">##Type##</td> <td style="width: 35px; border:0">##Type##</td>
</tr> </tr>
</table> </table>
</div> </div>
<div id="draglist_container"> <div id="draglist_container">
{foreach from=$PL->getFlat($PL->activeId) key='pos' item='i'} {foreach from=$PL->getFlat($PL->activeId) key='pos' item='i'}
<!-- start item --> <!-- start item -->
<div style="position: relative; left: 0px; top: 0px;"> <div style="position: relative; left: 0px; top: 0px;">
<!-- {$n++} --> <!-- {$n++} -->
<table style="width: 500px;"> <table style="width: 500px;">
<!-- clip information --> <!-- clip information -->
<tr><td style="border:0" colspan="5"></tr> <tr><td style="border:0" colspan="5"></tr>
<tr class="blue1"> <tr class="blue1">
<td>{$i.title}</td> <td>{$i.title}</td>
<td style="width: 50px;">{assign var="_duration" value=$i.duration}{niceTime in=$_duration}</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: 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> </tr>
<!-- end clip information --> <!-- end clip information -->
</table> </table>
<input type="hidden" name="pl_items[{$i.attrs.id}]"> <input type="hidden" name="pl_items[{$i.attrs.id}]">
</div> </div>
<!-- end item --> <!-- end item -->
{/foreach} {/foreach}
</div> </div>
<br> <br>
<div style="width: 500px;"> <div style="width: 500px;">
<div style="float: left;"><input type="button" class="button_large" value="##Cancel##" onClick="window.close()"> </div> <div style="float: left;"><input type="button" class="button_large" value="##Cancel##" onClick="window.close()"> </div>
<div style="float: right;"><INPUT TYPE="button" class="button_large" VALUE="##Save Reorder##" onClick="javascript:draglist_manager.do_submit('PL','draglist_container')"></div> <div style="float: right;"><INPUT TYPE="button" class="button_large" VALUE="##Save Reorder##" onClick="javascript:draglist_manager.do_submit('PL','draglist_container')"></div>
</div> </div>
</form> </form>
<br> <br>
</div> </div>
{assign var="_duration" value=null} {assign var="_duration" value=null}
<script language="JavaScript" src="assets/dom-drag.js" type="text/javascript"></script> <script language="JavaScript" src="assets/dom-drag.js" type="text/javascript"></script>
<script language="JavaScript" src="assets/draglist.js" type="text/javascript"></script> <script language="JavaScript" src="assets/draglist.js" type="text/javascript"></script>
<script language="JavaScript"> <script language="JavaScript">
// a bit ugly. draglist.js assumes the existence of a global // a bit ugly. draglist.js assumes the existence of a global
// dragListIndex array. // dragListIndex array.
var dragListIndex = new Array(); var dragListIndex = new Array();
// manager classes. // manager classes.
draglist_manager = new fv_dragList('draglist_container'); draglist_manager = new fv_dragList('draglist_container');
// queries all top level <divs> under the draglist_container // queries all top level <divs> under the draglist_container
// div and sets up dragging. // div and sets up dragging.
draglist_manager.setup(); draglist_manager.setup();
// queries all top level <span>'s under the draglist_container_horz // queries all top level <span>'s under the draglist_container_horz
// div and sets up horizontal dragging. // div and sets up horizontal dragging.
// addes the newly created dragList to the list of draglists on // addes the newly created dragList to the list of draglists on
// the page (i.e. we can have more than one on a page) // the page (i.e. we can have more than one on a page)
addDragList( draglist_manager ); addDragList( draglist_manager );
</script> </script>
</body> </body>
</html> </html>

22
livesupport/modules/htmlUI/var/templates/popup/SUBJECTS.confirmRemoveSubj.tpl
View file

@ -1,11 +1,11 @@
{include file="popup/header.tpl"} {include file="popup/header.tpl"}
<center> <center>
{tra 0='Are you sure to remove "$1"?' 1=$_REQUEST.login} {tra 0='Are you sure to remove "$1"?' 1=$_REQUEST.login}
<br><br> <br><br>
<input type="button" class="button" onClick="window.close()" value="Cancel"> <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> </center>
</body> </body>
</html> </html>

2
livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
View file

@ -38,7 +38,7 @@
{foreach from=$_entrys[$_hour] item="i"} {* hier werden die Einträge welche in der jeweil. h beginnen durchlaufen *} {foreach from=$_entrys[$_hour] item="i"} {* hier werden die Einträge welche in der jeweil. h beginnen durchlaufen *}
<div {include file="scheduler/removeitem.tpl"}> <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; &nbsp;
<b>{$i.title}</b> <b>{$i.title}</b>
{$i.start}-{$i.end} {$i.start}-{$i.end}

2
livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
View file

@ -50,7 +50,7 @@
<td class="day_full"> <td class="day_full">
{foreach from=$_entrys[$_day.day][$_hour] item="i"} {foreach from=$_entrys[$_day.day][$_hour] item="i"}
<div {include file="scheduler/removeitem.tpl"}> <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; &nbsp;
<h2>{$i.title|truncate:12}</h2> <h2>{$i.title|truncate:12}</h2>
<p>{$i.start|truncate:8:""} - {$i.end|truncate:8:""}</p> <p>{$i.start|truncate:8:""} - {$i.end|truncate:8:""}</p>

2
livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl
View file

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

4
livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl
View file

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

2
livesupport/modules/htmlUI/var/templates/script/basics.js.tpl
View file

@ -62,7 +62,7 @@
screenX = (Xpos + Pwidth/2 - width/2); screenX = (Xpos + Pwidth/2 - width/2);
screenY = (Ypos + Pheight/2 - height/2); screenY = (Ypos + Pheight/2 - height/2);
url = url + '&is_popup=1'; 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); popupwin = window.open(url, name, arg);
window.popupwin.focus(); window.popupwin.focus();

6
livesupport/modules/htmlUI/var/templates/sub/mouseover.tpl → livesupport/modules/htmlUI/var/templates/sub/alttext.tpl
View file

@ -1,14 +1,14 @@
{UIBROWSER->getMDataArr id=$i.id assign='_metaarr'} {UIBROWSER->getMDataArr id=$i.id assign='_metaarr'}
onMouseover = "showalttext('<div style=&quot;font-size: 120%; font-weight: bold&quot;>##{$i.type|lower|capitalize}##: {$_metaarr.metadata.Title}</div>' + onMouseover = "showalttext('<div style=&quot;font-size: 120%; font-weight: bold&quot;>##{$i.type|lower|capitalize}##: {$_metaarr.metadata.Title}</div>' +
{if $i.type|lower == 'playlist'} {if $i.type|lower == 'playlist'}
{if $PL->isUSedBy($i.id) != false}'<div>##(used by {$PL->isUSedBy($i.id)})##</div>' + {/if} {if $PL->isUSedBy($i.id) != false}'<div>##(used by {$PL->isUSedBy($i.id)})##</div>' + {/if}
{foreach from=$PL->getFlat($i.id) item='_pli'} {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} {/foreach}
{/if} {/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()" onMouseout = "hidealttext()"
{assign var='_metaarr' value=null} {assign var='_metaarr' value=null}

25
livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
View file

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

12
livesupport/modules/htmlUI/var/templates/subjects/manageGroupMember.tpl
View file

@ -23,9 +23,9 @@
{foreach from=$_member item="i"} {foreach from=$_member item="i"}
<tr class="{cycle values='blue1, blue2'}"> <tr class="{cycle values='blue1, blue2'}">
<td><input type="checkbox" class="checkbox" name="{$i.id}"/></td> <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" <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'} {if $i.type|lower == 'u'}
<img src="img/user.png" border="0" alt="User" /> <img src="img/user.png" border="0" alt="User" />
{else} {else}
@ -41,7 +41,7 @@
</table> </table>
</div> </div>
<div class="footer" style="width:250px;"> <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>
</div> </div>
<!-- end current group member --> <!-- end current group member -->
@ -70,9 +70,9 @@
<!-- start item --> <!-- start item -->
<tr class="{cycle values='blue1, blue2'}"> <tr class="{cycle values='blue1, blue2'}">
<td><input type="checkbox" class="checkbox" name="{$i.id}"/></td> <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" <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'} {if $i.type|lower == 'u'}
<img src="img/user.png" border="0" alt="User" /> <img src="img/user.png" border="0" alt="User" />
{else} {else}
@ -91,7 +91,7 @@
</table> </table>
</div> </div>
<div class="footer" style="width:250px;"> <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>
</div> </div>
<!-- end add group member --> <!-- end add group member -->

5
livesupport/modules/htmlUI/var/templates/subjects/overview.tpl
View file

@ -13,7 +13,8 @@
{foreach from=$SUBJECTS->getSubjectsWCnt() item=i} {foreach from=$SUBJECTS->getSubjectsWCnt() item=i}
{if $i.type|lower == 'g'}{assign var="_type" value="group"}{else}{assign var="_type" value="user"}{/if} {if $i.type|lower == 'g'}{assign var="_type" value="group"}{else}{assign var="_type" value="user"}{/if}
<tr class="{cycle values='blue1, blue2'}" <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>{$i.login}</td>
<td style="width: 30px; text-align: center;"> <td style="width: 30px; text-align: center;">
@ -39,4 +40,4 @@
</div> </div>
</div> </div>
{assign var="_type" value=null} {assign var="_type" value=null}

2
livesupport/modules/htmlUI/var/ui_browser.class.php
View file

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

37
livesupport/modules/htmlUI/var/ui_smartyExtensions.inc.php
View file

@ -10,9 +10,6 @@ $Smarty->assign_by_ref ('JSCOM', $jscom);
$Smarty->register_function('str_repeat', 'S_str_repeat'); $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('tra', 'S_tra');
$Smarty->register_function('getHour', 'S_getHour'); $Smarty->register_function('getHour', 'S_getHour');
$Smarty->register_function('getMinute', 'S_getMinute'); $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 * 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]); 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) function S_getHour($param)
{ {
## input format is HH:MM:SS.dddddd ## input format is HH:MM:SS.dddddd
@ -116,8 +81,6 @@ function S_getSecond($param)
return strftime("%S", $curr); return strftime("%S", $curr);
} }
function S_niceTime($param) function S_niceTime($param)
{ {
extract($param); extract($param);