From 50d9b2934742ad9fb0dc8354d405789e3c14cd00 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 1 Apr 2016 00:16:39 +0200
Subject: slightly change the way fullscreen works and bring it to mod mail

---
 view/tpl/chat.tpl         |  4 ++--
 view/tpl/mail_display.tpl | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'view/tpl')

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>
-- 
cgit v1.2.3