1
0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-23 21:50:09 +00:00

Merge branch 'master' of github.com:wbbaddons/Tims-Chat

This commit is contained in:
Tim Düsterhus 2012-06-04 20:31:20 +02:00
commit 58c8d336c6
3 changed files with 9 additions and 7 deletions

2
.gitignore vendored
View File

@ -53,3 +53,5 @@ nbactions.xml
*.js *.js
.sass-cache .sass-cache
*.css *.css
*.bak

View File

@ -5,9 +5,9 @@
//<![CDATA[ //<![CDATA[
$(function() { $(function() {
WCF.Icon.addObject({ WCF.Icon.addObject({
'wcf.icon.delete': '{@$__wcf->getPath('wcf')}icon/delete1.svg', 'wcf.icon.delete': '{@$__wcf->getPath('wcf')}icon/delete.svg',
'wcf.icon.user': '{@$__wcf->getPath('wcf')}icon/user1.svg', 'wcf.icon.user': '{@$__wcf->getPath('wcf')}icon/user.svg',
'wcf.icon.users': '{@$__wcf->getPath('wcf')}icon/users1.svg' 'wcf.icon.users': '{@$__wcf->getPath('wcf')}icon/users.svg'
}); });
new WCF.ACL.List($('#groupPermissions'), {@$objectTypeID}, ''{if $roomID|isset}, {@$roomID}{/if}); new WCF.ACL.List($('#groupPermissions'), {@$objectTypeID}, ''{if $roomID|isset}, {@$roomID}{/if});
@ -32,7 +32,7 @@
<div class="contentNavigation"> <div class="contentNavigation">
<nav> <nav>
<ul> <ul>
<li><a href="{link controller='ChatRoomList'}{/link}" title="{lang}wcf.acp.menu.link.chat.room.list{/lang}" class="button"><img src="{@$__wcf->getPath('wcf')}icon/chat1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.chat.room.list{/lang}</span></a></li> <li><a href="{link controller='ChatRoomList'}{/link}" title="{lang}wcf.acp.menu.link.chat.room.list{/lang}" class="button"><img src="{@$__wcf->getPath('wcf')}icon/chat.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.chat.room.list{/lang}</span></a></li>
</ul> </ul>
</nav> </nav>
</div> </div>

View File

@ -21,7 +21,7 @@
{if $__wcf->session->getPermission('admin.content.chat.canAddRoom')} {if $__wcf->session->getPermission('admin.content.chat.canAddRoom')}
<nav> <nav>
<ul> <ul>
<li><a href="{link controller='ChatRoomAdd'}{/link}" title="{lang}wcf.acp.chat.room.add{/lang}" class="button"><img src="{@$__wcf->getPath('wcf')}icon/add1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.chat.room.add{/lang}</span></a></li> <li><a href="{link controller='ChatRoomAdd'}{/link}" title="{lang}wcf.acp.chat.room.add{/lang}" class="button"><img src="{@$__wcf->getPath('wcf')}icon/add.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.chat.room.add{/lang}</span></a></li>
</ul> </ul>
</nav> </nav>
{/if} {/if}
@ -41,10 +41,10 @@
<span class="statusDisplay sortableButtonContainer"> <span class="statusDisplay sortableButtonContainer">
{if $__wcf->session->getPermission('admin.content.chat.canEditRoom')} {if $__wcf->session->getPermission('admin.content.chat.canEditRoom')}
<a href="{link controller='ChatRoomEdit' id=$chatRoom->roomID}{/link}"><img src="{@$__wcf->getPath('wcf')}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon16" /></a> <a href="{link controller='ChatRoomEdit' id=$chatRoom->roomID}{/link}"><img src="{@$__wcf->getPath('wcf')}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon16" /></a>
{/if} {/if}
{if $__wcf->session->getPermission('admin.content.chat.canDeleteRoom')} {if $__wcf->session->getPermission('admin.content.chat.canDeleteRoom')}
<img src="{@$__wcf->getPath('wcf')}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="jsDeleteButton jsTooltip icon16" data-object-id="{@$chatRoom->roomID}" data-confirm-message="{lang}wcf.acp.chat.delete.sure{/lang}" /> <img src="{@$__wcf->getPath('wcf')}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="jsDeleteButton jsTooltip icon16" data-object-id="{@$chatRoom->roomID}" data-confirm-message="{lang}wcf.acp.chat.delete.sure{/lang}" />
{/if} {/if}
</span> </span>
</span> </span>