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

Add possibility to hide topic.

This commit is contained in:
Maximilian Mader 2013-07-05 16:15:07 +02:00
parent 161d0504f0
commit f02631a7c7
3 changed files with 23 additions and 4 deletions

View File

@ -253,7 +253,7 @@ Toggle fullscreen mode.
else else
$('html').removeClass 'fullscreen' $('html').removeClass 'fullscreen'
Toggle checkboxes Toggle checkboxes.
$('#timsChatMark').click (event) -> $('#timsChatMark').click (event) ->
if $(@).data 'status' if $(@).data 'status'
@ -261,6 +261,11 @@ Toggle checkboxes
else else
$('.timsChatMessageContainer').removeClass 'markEnabled' $('.timsChatMessageContainer').removeClass 'markEnabled'
Hide topic container.
$('.jsTopicCloser').on 'click', ->
$('#timsChatTopic').addClass 'hidden'
Visibly mark the message once the associated checkbox is checked. Visibly mark the message once the associated checkbox is checked.
$(document).on 'click', '.timsChatMessage :checkbox', (event) -> $(document).on 'click', '.timsChatMessage :checkbox', (event) ->
@ -632,7 +637,9 @@ Joins a room.
success: (data) -> success: (data) ->
loading = false loading = false
$('#timsChatTopic').text data.returnValues.topic $('#timsChatTopic').removeClass 'hidden'
$('#timsChatTopic > .topic').text data.returnValues.topic
if data.returnValues.topic.trim() is '' if data.returnValues.topic.trim() is ''
$('#timsChatTopic').addClass 'empty' $('#timsChatTopic').addClass 'empty'
else else

View File

@ -40,12 +40,21 @@
.transition(padding-top, .2s); .transition(padding-top, .2s);
.transition(padding-bottom, .2s); .transition(padding-bottom, .2s);
&.empty { &.empty, &.hidden {
height: 0px; height: 0px;
overflow: hidden; overflow: hidden;
border: 0px; border: 0px;
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
~ #timsChatMessageContainer {
margin-top: 0;
}
}
.jsTopicCloser {
cursor: pointer;
float: right;
} }
} }

View File

@ -70,7 +70,10 @@
{capture assign='headerNavigation'}{include application='chat' file='navigationInclude'}{/capture} {capture assign='headerNavigation'}{include application='chat' file='navigationInclude'}{/capture}
{include file='header' sandbox=false sidebarOrientation='right'} {include file='header' sandbox=false sidebarOrientation='right'}
<div id="timsChatTopic" class="container{if $room->topic|language === ''} empty{/if}">{$room->topic|language}</div> <div id="timsChatTopic" class="container{if $room->topic|language === ''} empty{/if}">
<span class="icon icon16 icon-remove jsTopicCloser"></span>
<span class="topic">{$room->topic|language}</span>
</div>
<div id="timsChatMessageContainer" class="timsChatMessageContainer marginTop container active"> <div id="timsChatMessageContainer" class="timsChatMessageContainer marginTop container active">
<p class="error noJsOnly" style="display: none;">{lang}chat.general.noJs{/lang}</p> <p class="error noJsOnly" style="display: none;">{lang}chat.general.noJs{/lang}</p>