diff options
| -rw-r--r-- | view/css/mod_chat.css | 4 | ||||
| -rw-r--r-- | view/js/main.js | 10 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 12 | ||||
| -rw-r--r-- | view/tpl/chat.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/mail_display.tpl | 10 |
5 files changed, 26 insertions, 14 deletions
diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css index 3dd8309d3..830cc2f06 100644 --- a/view/css/mod_chat.css +++ b/view/css/mod_chat.css @@ -1,5 +1,4 @@ -#chatroom-new, -#inline { +#chatroom-new { display: none; } @@ -31,7 +30,6 @@ aside { } #chatTopBar { - float: left; width: 100%; overflow-y: auto; } diff --git a/view/js/main.js b/view/js/main.js index d6d1238d4..4e99bf1aa 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1454,13 +1454,15 @@ function zid(s) { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { - $('#fullscreen, aside').hide(); - $('#inline').show(); + $('#fullscreen-btn, header, nav, aside').hide(); + $('main').css({'width': '100%', 'max-width': 'none'}); + $('#inline-btn').show(); $('.generic-content-wrapper').addClass('fullscreen'); } else { - $('#fullscreen, aside').show(); - $('#inline').hide(); + $('#fullscreen-btn, header, nav, aside').show(); + $('main').removeAttr('style'); + $('#inline-btn').hide(); $('.generic-content-wrapper').removeClass('fullscreen'); } } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3172a6520..6feb1154b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1519,19 +1519,27 @@ nav .dropdown-menu { } .generic-content-wrapper.fullscreen { - position: fixed; + position: absolute; width: 100%; height: 100%; top: 0px; left: 0px; + border: 0px; border-radius: 0px; - z-index: 10000; } .generic-content-wrapper.fullscreen .section-title-wrapper { border-radius: 0px; } +.generic-content-wrapper.fullscreen .section-content-wrapper { + border-radius: 0px; +} + +#inline-btn { + display: none; +} + .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 47b1e83b1..4750f81fd 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(); 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> + <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="icon-resize-full"></i></button> + <button id="inline-btn" 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}}" /> diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 24e763571..a7754daf2 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,8 +1,12 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - {{if $mailbox == 'combined'}} - <a class="btn btn-xs btn-danger pull-right" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> - {{/if}} + <div class="pull-right"> + <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button> + <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button> + {{if $mailbox == 'combined'}} + <a class="btn btn-xs btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> + {{/if}} + </div> <h2>{{$prvmsg_header}}</h2> <div class="clear"></div> </div> |