From d5afd0d7c223161b673dca529830be3bfc739cd2 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 11 Jul 2016 12:49:53 +0200
Subject: do not use visibility for fullscreen button and move fullscreen
 button to the right

---
 view/tpl/chat.tpl          | 4 ++--
 view/tpl/events-js.tpl     | 4 ++--
 view/tpl/events_cal-js.tpl | 4 ++--
 view/tpl/photo_album.tpl   | 4 ++--
 view/tpl/photos_recent.tpl | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 341ff7649..31be4136f 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,8 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
 			{{if $is_owner}}
 			<form id="chat-destroy" method="post" action="chat">
 				<input type="hidden" name="room_name" value="{{$room_name}}" />
@@ -10,6 +8,8 @@
 				<button class="btn btn-danger btn-xs" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</button>
 			</form>
 			{{/if}}
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
 		</div>
 		<h2>{{$room_name}}</h2>
 		<div class="clear"></div>
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 3397411a8..6299242ce 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -2,8 +2,6 @@
 	<div class="section-title-wrapper">
 		<div class="pull-right">
 			<div class="dropdown">
-				<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-				<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 				<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-down"></i>&nbsp;{{$view_label}}</button>
 				<ul class="dropdown-menu">
 					<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
@@ -16,6 +14,8 @@
 					<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
 					<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
 				</div>
+				<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+				<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 			</div>
 		</div>
 		<h2 id="title"></h2>
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
index 121c06cb5..b7836cfab 100755
--- a/view/tpl/events_cal-js.tpl
+++ b/view/tpl/events_cal-js.tpl
@@ -2,13 +2,13 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
 				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
 				<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
 			</div>
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 		</div>
 		<h2 id="title"></h2>
 		<div class="clear"></div>
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index e6cb61637..b391a00a1 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,8 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 			{{if $order}}
 			<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a>
 			{{/if}}
@@ -14,6 +12,8 @@
 				<button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
 				{{/if}}
 			</div>
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 		</div>
 		<h2>{{$album}}</h2>
 		<div class="clear"></div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index c40dda145..139f27a23 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,11 +1,11 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 			{{if $can_post}}
 			<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
 			{{/if}}
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 		</div>
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
-- 
cgit v1.2.3


From 7ee7f00bf34b11d0427f03df9494088cf56ef9ee Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 14 Jul 2016 22:41:53 -0700
Subject: Here's the basic UI for the Zot Access Tokens, requires some minor
 cleanup

---
 view/tpl/settings_tokens.tpl | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 view/tpl/settings_tokens.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
new file mode 100644
index 000000000..8763a681c
--- /dev/null
+++ b/view/tpl/settings_tokens.tpl
@@ -0,0 +1,28 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
+		<div class="section-content-tools-wrapper">
+			{{include file="field_input.tpl" field=$name}}
+			{{include file="field_input.tpl" field=$token}}
+			{{include file="field_input.tpl" field=$expires}}
+			<div class="settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+		</div>
+	</form>
+	{{if $tokens}}
+	<div>
+	<ul>
+	{{foreach $tokens as $t}}
+	<li><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a> <a href="settings/tokens/{{$t.atoken_id}}/drop"><i class="fa fa-remove btn btn-xs btn-default pull-right"></i></a></li>
+	{{/foreach}}
+	</ul>
+	</div>
+	{{/if}}
+
+</div>
-- 
cgit v1.2.3


From 5e475acb85cac2dd87f92f6c8d51dc0071e5c2eb Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 15 Jul 2016 01:33:28 -0700
Subject: cleanup and debug of atoken feature

---
 view/tpl/settings_tokens.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
index 8763a681c..73c6e9a64 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/settings_tokens.tpl
@@ -17,9 +17,9 @@
 	</form>
 	{{if $tokens}}
 	<div>
-	<ul>
+	<ul class="atoken-list">
 	{{foreach $tokens as $t}}
-	<li><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a> <a href="settings/tokens/{{$t.atoken_id}}/drop"><i class="fa fa-remove btn btn-xs btn-default pull-right"></i></a></li>
+	<li><span class="pull-right atoken-drop"><a href="settings/tokens/{{$t.atoken_id}}/drop"><i class="fa fa-trash btn btn-xs btn-default"></i></a></span><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></li>
 	{{/foreach}}
 	</ul>
 	</div>
-- 
cgit v1.2.3


From d54f5a3831ec003468e33185318a060711cb9c09 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 15 Jul 2016 01:43:09 -0700
Subject: more cleanup of atoken UI

---
 view/tpl/settings_tokens.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/tpl')

diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
index 73c6e9a64..a81d65dfc 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/settings_tokens.tpl
@@ -3,6 +3,7 @@
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
 	</div>
+	<div class="atoken-text descriptive-text">{{$desc}}</div>
 	<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 		{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
-- 
cgit v1.2.3


From 2e32b5f467e9bb66e339c56308ad8a82163566e6 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 15 Jul 2016 13:20:00 +0200
Subject: upgrade to jquery-3.1 and minor fixes

---
 view/tpl/contact_block.tpl      |  1 -
 view/tpl/cover_photo_widget.tpl | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index a32437212..6a29abaef 100755
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
@@ -11,4 +11,3 @@
 		</div>
 {{/if}}
 </div>
-<div class="clear"></div>
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 8254fc87d..5e97d3773 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -1,8 +1,17 @@
 <script>
+	var aside_padding_top;
+	var section_padding_top;
+
 	$(document).ready(function() {
+
+		aside_padding_top = parseInt($('aside').css('padding-top'));
+		section_padding_top = parseInt($('section').css('padding-top'));
+
 		if($('#cover-photo').length && $(window).width() > 755) {
 			$('.navbar-fixed-top').css('position', 'relative');
-			$('aside, section').css('padding-top', 0 + 'px');
+			$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+			$('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px');
+			$('section').css('padding-top', section_padding_top  - $('nav').outerHeight() + 'px');
 			$('main').css('opacity', 0);
 			$('header').hide();
 		}
@@ -15,9 +24,11 @@
 		if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
 			$('header').fadeIn();
 			$('main').css('opacity', 1);
-			$('aside, section').css('padding-top', $('nav').outerHeight(true) + 'px');
+			$('aside').css('padding-top', aside_padding_top + 'px');
+			$('section').css('padding-top', section_padding_top + 'px');
 			$(window).scrollTop($(window).scrollTop() - $('#cover-photo').height())
 			$('.navbar-fixed-top').css('position', 'fixed');
+			$('main').css('margin-top', '');
 			$('#cover-photo').remove();
 		}
 		if($('#cover-photo').length) {
@@ -28,7 +39,8 @@
 	$(window).resize(function () {
 		if($('#cover-photo').length && $(window).width() < 755) {
 			$('main').css('opacity', 1);
-			$('aside, section').css('padding-top', $('nav').outerHeight(true) + 'px');
+			$('aside').css('padding-top', aside_padding_top + 'px');
+			$('section').css('padding-top', section_padding_top + 'px');
 			$('.navbar-fixed-top').css('position', 'fixed');
 			$('#cover-photo').remove();
 		}
@@ -36,7 +48,7 @@
 	});
 
 	function slideUpCover() {
-		$('html, body').animate({scrollTop: $('#cover-photo').height() + 'px'});
+		$('html, body').animate({scrollTop: $('#cover-photo').height() + 1 + 'px' });
 	}
 </script>
 
-- 
cgit v1.2.3


From 4a2fb8336e71557757f13136ae62639cc9732c22 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 15 Jul 2016 14:23:10 +0200
Subject: round up height

---
 view/tpl/cover_photo_widget.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 5e97d3773..4e210a300 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -48,7 +48,7 @@
 	});
 
 	function slideUpCover() {
-		$('html, body').animate({scrollTop: $('#cover-photo').height() + 1 + 'px' });
+		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
 	}
 </script>
 
-- 
cgit v1.2.3


From f3aff45042096ab113b77492c0018d5e6b47c7e4 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 15 Jul 2016 16:31:21 -0700
Subject: provide examples for using access tokens in urls

---
 view/tpl/settings_tokens.tpl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
index a81d65dfc..6819a2e58 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/settings_tokens.tpl
@@ -4,6 +4,10 @@
 		<div class="clear"></div>
 	</div>
 	<div class="atoken-text descriptive-text">{{$desc}}</div>
+	<div class="atoken-text descriptive-text">{{$desc2}}</div>
+	<div class="atoken-example">{{$url1}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></div>
+	<div class="atoken-example">{{$url2}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></div>
+	<br />
 	<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 		{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
-- 
cgit v1.2.3


From f39d20ac978e6ea8a0d2993f9953d051e5f31254 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 17 Jul 2016 11:29:37 +0200
Subject: some work on guest access token ui

---
 view/tpl/settings_tokens.tpl | 45 +++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
index 6819a2e58..7e4b19507 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/settings_tokens.tpl
@@ -3,31 +3,38 @@
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
 	</div>
-	<div class="atoken-text descriptive-text">{{$desc}}</div>
-	<div class="atoken-text descriptive-text">{{$desc2}}</div>
-	<div class="atoken-example">{{$url1}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></div>
-	<div class="atoken-example">{{$url2}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></div>
-	<br />
-	<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
-		<div class="section-content-tools-wrapper">
+	<div class="section-content-tools-wrapper">
+		<div class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+
+		<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
 			{{include file="field_input.tpl" field=$name}}
 			{{include file="field_input.tpl" field=$token}}
 			{{include file="field_input.tpl" field=$expires}}
-			<div class="settings-submit-wrapper" >
+			<div class="settings-submit-wrapper form-group">
 				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 			</div>
-		</div>
-	</form>
+		</form>
+		<div class="descriptive-text">{{$desc2}}</div>
+		<ul>
+			<li>{{$url1}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></li>
+			<li>{{$url2}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></li>
+		</ul>
+	</div>
 	{{if $tokens}}
-	<div>
-	<ul class="atoken-list">
-	{{foreach $tokens as $t}}
-	<li><span class="pull-right atoken-drop"><a href="settings/tokens/{{$t.atoken_id}}/drop"><i class="fa fa-trash btn btn-xs btn-default"></i></a></span><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></li>
-	{{/foreach}}
-	</ul>
+	<div class="section-content-wrapper-np">
+		<table id="atoken-index">
+			{{foreach $tokens as $t}}
+			<tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row">
+				<td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
+				<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
+			</tr>
+			{{/foreach}}
+		</table>
+
 	</div>
 	{{/if}}
-
 </div>
-- 
cgit v1.2.3


From 5d0ddb3123f27fb1a2afef9fba62743ad8851736 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 17 Jul 2016 02:49:41 -0700
Subject: booboo

---
 view/tpl/settings_tokens.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
index 7e4b19507..22af381e9 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/settings_tokens.tpl
@@ -20,8 +20,8 @@
 		</form>
 		<div class="descriptive-text">{{$desc2}}</div>
 		<ul>
-			<li>{{$url1}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></li>
-			<li>{{$url2}}<span class="zat-example">&f=&zat=<span class="token-mirror"></span></span></li>
+			<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+			<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
 		</ul>
 	</div>
 	{{if $tokens}}
-- 
cgit v1.2.3


From 2b674d4cd983d637ddc863f9b87b9d863542e250 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 17 Jul 2016 12:54:10 +0200
Subject: hide fullscreen button in embedphotos modal album view

---
 view/tpl/photo_album.tpl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index b391a00a1..f097646e4 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -12,8 +12,10 @@
 				<button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
 				{{/if}}
 			</div>
+			{{if !$no_fullscreen_btn}}
 			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
 			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			{{/if}}
 		</div>
 		<h2>{{$album}}</h2>
 		<div class="clear"></div>
-- 
cgit v1.2.3