From 2982212797dd64e1be13de20dc158842734ee5f8 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 31 Oct 2014 14:33:41 +0100 Subject: more work on photo upload --- view/tpl/photos_upload.tpl | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 3db292f02..4c53a7c62 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -8,11 +8,11 @@
-
- -
-
- + + +
+ + {{foreach $albums as $al}} {{if $al.text}} @@ -22,27 +22,38 @@
+ {{$aclselect}} + + {{if $default}} +
+ +
+
+ + +
+ {{/if}} +
-
- - +
+
+ {{if $uploader}} +
- - {{$aclselect}} -
- -
- {{$uploader}} + {{/if}} - {{$default}}
-- cgit v1.2.3 From 5d1bb1b6854b4601eedaa9d39a40832b29d434e5 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 31 Oct 2014 16:09:46 +0000 Subject: Smarty3 now lives in store --- view/tpl/smarty3/README | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 view/tpl/smarty3/README (limited to 'view/tpl') diff --git a/view/tpl/smarty3/README b/view/tpl/smarty3/README deleted file mode 100644 index 78ff8d9a1..000000000 --- a/view/tpl/smarty3/README +++ /dev/null @@ -1,4 +0,0 @@ -view/tpl/smarty3 - -This directory must exist and be writeable by the webserver in order to store compiled template files, which are created dynamically. Please see the installation instructions. - -- cgit v1.2.3 From 5d151b988605bc5aedbef65b687a43dedbc574e9 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 31 Oct 2014 20:25:43 +0100 Subject: do not reload page for photo upload --- view/tpl/album_edit.tpl | 2 +- view/tpl/photo_album.tpl | 3 ++- view/tpl/photo_albums.tpl | 8 ++------ view/tpl/photo_view.tpl | 2 +- view/tpl/photos_recent.tpl | 3 ++- view/tpl/photos_upload.tpl | 12 +++--------- 6 files changed, 11 insertions(+), 19 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index a65887d3c..a6815352a 100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 0a26fc367..2c0b8e5b9 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -5,13 +5,14 @@ {{/if}} {{if $can_post}} -  {{$upload.0}} + {{/if}}

{{$album}}

+{{$upload_form}} {{$album_edit.1}}
{{foreach $photos as $photo}} diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 0f8b809ac..de1105bbc 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,17 +1,13 @@ diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index c79cd7d56..d1b077f36 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -31,7 +31,7 @@
-
+
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 91b088c93..7727abcea 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,10 +1,11 @@
{{if $can_post}} -  {{$upload.0}} + {{/if}}

{{$title}}

+{{$upload_form}}
{{foreach $photos as $photo}} {{include file="photo_top.tpl"}} diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 4c53a7c62..5bb0092d6 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,18 +1,12 @@ -
-
-
{{$usage}}
-

{{$pagename}}

-
-
- -
+
+
- + {{foreach $albums as $al}} {{if $al.text}} -- cgit v1.2.3 From 30281b161c6e3089a89c5035498bb72a72e66e4a Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 1 Nov 2014 20:30:13 +0100 Subject: close the eventual open tool if the other opens --- view/tpl/photo_album.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 2c0b8e5b9..7b1566a15 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,11 +1,11 @@
{{if $album_edit.1}} - + {{/if}} {{if $can_post}} - + {{/if}}

{{$album}}

-- cgit v1.2.3 From dc5e05d3349bc493e4c1f33fb2561bb80ddd0c7f Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 1 Nov 2014 23:55:36 +0100 Subject: even more photos work --- view/tpl/album_edit.tpl | 38 ++++++++-------- view/tpl/photo_album.tpl | 19 ++++---- view/tpl/photo_view.tpl | 109 ++++++++++++++++++++++----------------------- view/tpl/photos_upload.tpl | 15 +++---- 4 files changed, 90 insertions(+), 91 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index a6815352a..f5495f149 100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -1,22 +1,22 @@
- - - - - - - {{foreach $albums as $al}} - {{if $al.text}} - - -
+ +
+ + + + {{foreach $albums as $al}} + {{if $al.text}} + +
+
+ + +
+ +
+
- - - -
-
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 7b1566a15..7175a62da 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,13 +1,16 @@
-
- {{if $album_edit.1}} - - {{/if}} - - {{if $can_post}} - - {{/if}} +
+ +
+ {{if $album_edit.1}} + + {{/if}} + {{if $can_post}} + + {{/if}} +
+

{{$album}}

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index d1b077f36..37aab3c96 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -2,28 +2,28 @@
+
-
- {{if $prevlink}} - - {{/if}} - {{if $nextlink}} - - {{/if}} -
-
{{if $tools}} - + {{/if}} - {{if $edit}} - - {{/if}} - - {{if $lock}} - - {{/if}} -   +
+ {{if $edit}} + + {{/if}} + {{if $lock}} + + {{/if}} +
+
+ {{if $prevlink}} + + {{/if}} + {{if $nextlink}} + + {{/if}} +

{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}

@@ -31,55 +31,54 @@
-
+
- - - {{if $edit.albums}} - - {{foreach $edit.albums as $al}} - {{if $al.text}} -