From e332d1074f1b663ec66d37b0f575df2e41d5535c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 1 May 2017 21:10:04 -0700
Subject: move theme specific files to theme dir

---
 view/tpl/photo_album.tpl | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100755 view/tpl/photo_album.tpl

(limited to 'view/tpl/photo_album.tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
deleted file mode 100755
index 8bacb1575..000000000
--- a/view/tpl/photo_album.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="{{if !$no_fullscreen_btn}}generic-content-wrapper{{/if}}">
-	<div class="section-title-wrapper">
-		<div class="pull-right">
-			{{if $order}}
-			<a class="btn btn-outline-secondary btn-sm" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a>
-			{{/if}}
-			<div class="btn-group btn-group">
-				{{if $album_edit.1}}
-				<i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
-				{{/if}}
-				{{if $can_post}}
-				<button class="btn btn-sm btn-success btn-sm" 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>
-		</div>
-		<h2>{{$album}}</h2>
-		<div class="clear"></div>
-	</div>
-	{{$upload_form}}
-	{{$album_edit.1}}
-	<div class="section-content-wrapper-np">
-		<div id="photo-album-contents-{{$album_id}}">
-			{{foreach $photos as $photo}}
-				{{include file="photo_top.tpl"}}
-			{{/foreach}}
-			<div id="page-end"></div>
-		</div>
-	</div>
-</div>
-<div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
-<div id="page-spinner"></div>
-- 
cgit v1.2.3


From 80ec92ce8d9f615eeb06d92b67ad1ff840cad0cc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 12:46:50 -0700
Subject: Revert "move theme specific files to theme dir"

This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c.
---
 view/tpl/photo_album.tpl | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 view/tpl/photo_album.tpl

(limited to 'view/tpl/photo_album.tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
new file mode 100755
index 000000000..8bacb1575
--- /dev/null
+++ b/view/tpl/photo_album.tpl
@@ -0,0 +1,32 @@
+<div class="{{if !$no_fullscreen_btn}}generic-content-wrapper{{/if}}">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $order}}
+			<a class="btn btn-outline-secondary btn-sm" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a>
+			{{/if}}
+			<div class="btn-group btn-group">
+				{{if $album_edit.1}}
+				<i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+				{{/if}}
+				{{if $can_post}}
+				<button class="btn btn-sm btn-success btn-sm" 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>
+		</div>
+		<h2>{{$album}}</h2>
+		<div class="clear"></div>
+	</div>
+	{{$upload_form}}
+	{{$album_edit.1}}
+	<div class="section-content-wrapper-np">
+		<div id="photo-album-contents-{{$album_id}}">
+			{{foreach $photos as $photo}}
+				{{include file="photo_top.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
+	</div>
+</div>
+<div class="photos-end"></div>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<div id="page-spinner"></div>
-- 
cgit v1.2.3


From 11cdd0033d7cff690a9df75d8b5a3b8a29f8098b Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sun, 30 Jul 2017 10:45:59 +0200
Subject: no need for jquery here

---
 view/tpl/photo_album.tpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'view/tpl/photo_album.tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 8bacb1575..89b169f58 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -28,5 +28,8 @@
 	</div>
 </div>
 <div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<script>
+	loadingPage = false;
+	justifyPhotos('photo-album-contents-{{$album_id}}');
+</script>
 <div id="page-spinner"></div>
-- 
cgit v1.2.3