harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various fixes regarding mod chat

Browse Source
This commit is contained in:
Mario Vavti 2016-03-31 22:42:28 +02:00
parent 3fdd110e07
commit 6c2673ae2a
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/widgets.php
View File

@ -811,7 +811,7 @@ function widget_chatroom_list($arr) {
function widget_chatroom_members() { function widget_chatroom_members() {
$o = replace_macros(get_markup_template('chatroom_members.tpl'), array( $o = replace_macros(get_markup_template('chatroom_members.tpl'), array(
'$header' => t('Chatroom Members') '$header' => t('Chat Members')
)); ));
return $o; return $o;

5
view/css/mod_chat.css
View File

@ -33,7 +33,6 @@ aside {
#chatTopBar { #chatTopBar {
float: left; float: left;
width: 100%; width: 100%;
height: 400px;
overflow-y: auto; overflow-y: auto;
} }
@ -115,6 +114,10 @@ aside {
height: 100%; height: 100%;
top: 0px; top: 0px;
left: 0px; left: 0px;
border-radius: 0px;
z-index: 10000; z-index: 10000;
} }
.generic-content-wrapper.fullscreen .section-title-wrapper {
border-radius: 0px;
}

4
view/theme/redbasic/css/style.css
View File

@ -1375,6 +1375,10 @@ img.mail-conv-sender-photo {
background-color: $item_colour; background-color: $item_colour;
} }
#chatMembers img {
border-radius: $radiuspx;
}
/* nav bootstrap */ /* nav bootstrap */

21
view/tpl/chat.tpl
View File

@ -30,8 +30,8 @@
<div class="form-group"> <div class="form-group">
</div> </div>
<div id="chat-submit-wrapper" class="form-group"> <div id="chat-submit-wrapper">
<div id="chat-submit" class="btn-group dropup pull-right"> <div id="chat-submit" class="dropup pull-right">
<button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="icon-caret-down"></i></button> <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="icon-caret-down"></i></button>
<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button> <button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@ -109,14 +109,13 @@ $(document).ready(function() {
chat_timer = setTimeout(load_chats,300); chat_timer = setTimeout(load_chats,300);
$('#chatroom_bookmarks, #vcard').hide(); $('#chatroom_bookmarks, #vcard').hide();
$('#chatroom_list, #chatroom_members').show(); $('#chatroom_list, #chatroom_members').show();
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23 );
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 40 );
}); });
$(window).resize(function () { $(window).resize(function () {
var navHeight = $('.generic-content-wrapper').hasClass('fullscreen') ? 0 : $('nav').outerHeight(true) var navHeight = $('.generic-content-wrapper').hasClass('fullscreen') ? 0 : $('nav').outerHeight(true);
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - navHeight - 40 ); $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - navHeight - 23);
$('#chatTopBar').scrollTop($('#chatTopBar').scrollTop() + $('#chatTopBar').outerHeight(true));
}); });
$('#chat-form').submit(function(ev) { $('#chat-form').submit(function(ev) {
@ -196,18 +195,18 @@ function addmailtext(data) {
} }
function makeFullScreen() { function makeFullScreen() {
$('#fullscreen').hide(); $('#fullscreen, aside').hide();
$('#inline').show(); $('#inline').show();
$('.generic-content-wrapper').addClass('fullscreen'); $('.generic-content-wrapper').addClass('fullscreen');
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 20); $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23);
} }
function makeInline() { function makeInline() {
$('#fullscreen').show(); $('#fullscreen, aside').show();
$('#inline').hide(); $('#inline').hide();
$('.generic-content-wrapper').removeClass('fullscreen'); $('.generic-content-wrapper').removeClass('fullscreen');
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 40 ); $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23);
} }
</script> </script>