1
0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-10-31 14:10:08 +00:00

Merge remote-tracking branch 'origin/master' into suspensionList

This commit is contained in:
Tim Düsterhus 2013-06-11 01:03:55 +02:00
commit 2c0e0e3796
2 changed files with 2 additions and 2 deletions

View File

@ -59,7 +59,7 @@
</div>
</section>
{else}
<p class="warning">{lang}chat.acp.room.noItems{/lang}</p>
<p class="warning">{lang}wcf.global.noItems{/lang}</p>
{/if}
{include file='footer'}

View File

@ -112,7 +112,7 @@
{include file='messageFormSmilies' wysiwygSelector=''}
{/if}
<nav id="timsChatOptions" class="marginTop">
<nav id="timsChatOptions" class="marginTop buttonGroupNavigation">
<span class="invisible">{lang}chat.general.controls{/lang}</span>
<ul class="smallButtons buttonGroup">
<li><a id="timsChatAutoscroll" accesskey="d" class="button active timsChatToggle jsTooltip" title="{lang}chat.general.scroll{/lang}" data-status="1"><span class="icon icon16 icon-arrow-down"></span><span class="invisible">{lang}chat.general.scroll{/lang}</span></a></li>{*