aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_chat.css14
-rw-r--r--view/js/main.js13
-rw-r--r--view/theme/redbasic/css/style.css14
-rw-r--r--view/tpl/chat.tpl73
4 files changed, 61 insertions, 53 deletions
diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
index 75e858542..3dd8309d3 100644
--- a/view/css/mod_chat.css
+++ b/view/css/mod_chat.css
@@ -107,17 +107,3 @@ aside {
.leave {
color: red;
}
-
-.generic-content-wrapper.fullscreen {
- position: fixed;
- width: 100%;
- height: 100%;
- top: 0px;
- left: 0px;
- border-radius: 0px;
- z-index: 10000;
-}
-
-.generic-content-wrapper.fullscreen .section-title-wrapper {
- border-radius: 0px;
-}
diff --git a/view/js/main.js b/view/js/main.js
index 04b317914..d6d1238d4 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1451,3 +1451,16 @@ function zid(s) {
return s;
}
+
+function makeFullScreen(full) {
+ if(typeof full=='undefined' || full == true) {
+ $('#fullscreen, aside').hide();
+ $('#inline').show();
+ $('.generic-content-wrapper').addClass('fullscreen');
+ }
+ else {
+ $('#fullscreen, aside').show();
+ $('#inline').hide();
+ $('.generic-content-wrapper').removeClass('fullscreen');
+ }
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 443f96da9..3172a6520 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1518,6 +1518,20 @@ nav .dropdown-menu {
word-wrap: break-word;
}
+.generic-content-wrapper.fullscreen {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ top: 0px;
+ left: 0px;
+ border-radius: 0px;
+ z-index: 10000;
+}
+
+.generic-content-wrapper.fullscreen .section-title-wrapper {
+ border-radius: 0px;
+}
+
.chatroom-index-row:hover td,
.locs-index-row:hover td,
[id^="cloud-index-"]:hover td,
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 1001f28b3..47b1e83b1 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,8 +1,8 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button id="fullscreen" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button>
- <button id="inline" type="button" class="btn btn-default btn-xs" onclick="makeInline();"><i class="icon-resize-small"></i></button>
+ <button id="fullscreen" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="icon-resize-full"></i></button>
+ <button id="inline" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="icon-resize-small"></i></button>
{{if $is_owner}}
<form id="chat-destroy" method="post" action="chat">
<input type="hidden" name="room_name" value="{{$room_name}}" />
@@ -109,12 +109,16 @@ $(document).ready(function() {
chat_timer = setTimeout(load_chats,300);
$('#chatroom_bookmarks, #vcard').hide();
$('#chatroom_list, #chatroom_members').show();
- $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23 );
+ adjustInlineTopBarHeight();
});
$(window).resize(function () {
- var navHeight = $('.generic-content-wrapper').hasClass('fullscreen') ? 0 : $('nav').outerHeight(true);
- $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - navHeight - 23);
+ if($('.generic-content-wrapper').hasClass('fullscreen')) {
+ adjustFullscreenTopBarHeight();
+ }
+ else {
+ adjustInlineTopBarHeight();
+ }
$('#chatTopBar').scrollTop($('#chatTopBar').scrollTop() + $('#chatTopBar').outerHeight(true));
});
@@ -177,7 +181,6 @@ function update_chats(chats) {
}
-
function chatJotGetLink() {
reply = prompt("{{$linkurl}}");
if(reply && reply.length) {
@@ -194,47 +197,39 @@ function addmailtext(data) {
$("#chatText").val(currentText + data);
}
-function makeFullScreen() {
- $('#fullscreen, aside').hide();
- $('#inline').show();
- $('.generic-content-wrapper').addClass('fullscreen');
+function adjustFullscreenTopBarHeight() {
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23);
-
}
-function makeInline() {
- $('#fullscreen, aside').show();
- $('#inline').hide();
- $('.generic-content-wrapper').removeClass('fullscreen');
+function adjustInlineTopBarHeight() {
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23);
}
-</script>
-<script>
function isMobile() {
-if( navigator.userAgent.match(/Android/i)
- || navigator.userAgent.match(/webOS/i)
- || navigator.userAgent.match(/iPhone/i)
- || navigator.userAgent.match(/iPad/i)
- || navigator.userAgent.match(/iPod/i)
- || navigator.userAgent.match(/BlackBerry/i)
- || navigator.userAgent.match(/Windows Phone/i)
- ){
- return true;
- }
- else {
- return false;
- }
+ if( navigator.userAgent.match(/Android/i)
+ || navigator.userAgent.match(/webOS/i)
+ || navigator.userAgent.match(/iPhone/i)
+ || navigator.userAgent.match(/iPad/i)
+ || navigator.userAgent.match(/iPod/i)
+ || navigator.userAgent.match(/BlackBerry/i)
+ || navigator.userAgent.match(/Windows Phone/i)
+ ){
+ return true;
+ }
+ else {
+ return false;
+ }
}
-$(function(){
- $('#chatText').keypress(function(e){
- if (e.keyCode == 13 && e.shiftKey||isMobile()) {
- }
- else if (e.keyCode == 13) {
- e.preventDefault();
- $('#chat-form').trigger('submit');
- }
- });
+$(function(){
+ $('#chatText').keypress(function(e){
+ if (e.keyCode == 13 && e.shiftKey||isMobile()) {
+ //do nothing
+ }
+ else if (e.keyCode == 13) {
+ e.preventDefault();
+ $('#chat-form').trigger('submit');
+ }
+ });
});
</script>