From ae9e1fa688c90e128637b5c44cf4705287f6cfa1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 15 Oct 2014 18:35:56 -0700 Subject: missing event permissions --- view/tpl/event_form.tpl | 3 ++- view/tpl/event_head.tpl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 2a580e3b8..d91e44458 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -66,7 +66,8 @@
{{$sh_text}}
-{{$acl}} + + {{$acl}}
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 8388187d1..6f1d2f22c 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -115,10 +115,10 @@ $('#event-share-checkbox').change(function() { if ($('#event-share-checkbox').is(':checked')) { - $('#acl-wrapper').show(); + $('#event-permissions-button').show(); } else { - $('#acl-wrapper').hide(); + $('#event-permissions-button').hide(); } }).trigger('change'); -- cgit v1.2.3 From 6867a8a7f6060c82cba3a34cd944a3737e8e263e Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Thu, 16 Oct 2014 17:21:37 +0200 Subject: Login menu --- view/tpl/nav.tpl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 6c461f062..ac6cb1a9c 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -48,14 +48,15 @@
- {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 6719f2e75..fe683b91a 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -20,7 +20,7 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
- {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
-- cgit v1.2.3 From bae3029c639bf6f9469dd93bfedc3dce0d8510d7 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Oct 2014 16:12:05 -0700 Subject: merge madness --- view/tpl/event_form.tpl | 92 ++----------------------------------------------- view/tpl/nav.tpl | 2 +- view/tpl/photo_view.tpl | 16 +++++++-- 3 files changed, 17 insertions(+), 93 deletions(-) (limited to 'view') diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index d91e44458..ade404125 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -3,8 +3,7 @@

{{$title}}

-{{if ! $bootstrap}} -{{$format_desc}} {{/if}}{{$desc}} +{{$desc}}

@@ -17,11 +16,7 @@
{{$s_text}}
-{{if $bootstrap}} - -{{else}} -{{$s_dsel}} {{$s_tsel}} -{{/if}} +{{$s_dsel}}

@@ -31,11 +26,7 @@
{{$f_text}}
-{{if $bootstrap}} - -{{else}} -{{$f_dsel}} {{$f_tsel}} -{{/if}} +{{$f_dsel}}
@@ -73,81 +64,4 @@
- - - - - - -
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ac6cb1a9c..bc9d0ba37 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,6 +47,7 @@
- + - + {{if $edit.albums}} {{foreach $edit.albums as $al}} @@ -47,18 +47,18 @@ {{/if}}
- +
- +
{{$edit.rotatecw}}
{{$edit.rotateccw}}
-
- +
+
@@ -69,8 +69,8 @@

- - + +
-- cgit v1.2.3 From ec8bab7784b531299150ddb2c18ede40d5c5df6c Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 28 Oct 2014 11:56:00 +0100 Subject: change the way tagrm works to allow tag removal on the fly --- view/tpl/photo_view.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 54e15de74..c79cd7d56 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -85,7 +85,7 @@
{{$tag_hdr}} {{foreach $tags as $t}} - {{$t.0}}{{if $edit}}  {{/if}} + {{$t.0}}{{if $edit}}  {{/if}} {{/foreach}}
{{/if}} -- cgit v1.2.3 From 0ff4d9015b3b06412e84f6fbc32ae4e78e16d6ae Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 30 Oct 2014 14:10:55 +0100 Subject: some work on photo upload --- view/css/conversation.css | 6 +--- view/css/mod_photos.css | 23 +++--------- view/theme/redbasic/css/style.css | 6 ++++ view/theme/redbasic/php/style.php | 2 +- view/tpl/album_edit.tpl | 9 ++++- view/tpl/photos_upload.tpl | 76 +++++++++++++++++++++------------------ 6 files changed, 61 insertions(+), 61 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 6c9d757b1..959047779 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -127,10 +127,6 @@ a.wall-item-name-link { font-size: 1.112em; } -.wall-item-content img { - max-width: 95%; -} - .wall-item-title h3 { font-weight: bold; margin: 0px; @@ -262,4 +258,4 @@ a.wall-item-name-link { .item-forged { color: #FF0000; font-size: 1.5em !important; -} \ No newline at end of file +} diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index ed3e2ac26..3832ea1a6 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -9,8 +9,8 @@ } #photo-photo { - display: table; - margin: 0 auto; + display: table; + margin: 0 auto; } #photo-photo-end { @@ -22,27 +22,12 @@ margin-bottom: 25px; } -#photos-upload-newalbum-div { - float: left; - width: 175px; -} - #photos-upload-noshare { margin-bottom: 10px; } -#photos-upload-existing-album-text { - float: left; - width: 175px; -} -#photos-upload-newalbum { - float: left; -} -#photos-upload-album-select { - float: left; -} - -#photos-upload-spacer { +#photos-upload-spacer, +#photos-upload-new-end { margin-top: 25px; } #photos-upload-new-end, #photos-upload-exist-end { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e62949520..31b769460 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2341,6 +2341,12 @@ aside .nav-pills > li > a { margin-right: 10px; } +.section-content-wrapper { + padding: 7px 10px; + background-color: $comment_item_colour; + border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; +} @media screen and (max-width: 767px) { aside#region_1 { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 045ddc309..55b35af4b 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -226,7 +226,7 @@ if(! $a->install) { if (! $input_linksubmit) $input_linksubmit = "#0080FF"; if (! $input_border) - $input_border = "#666"; + $input_border = "#ccc"; if (! $input_colourhover) $input_colourhover = "#333"; if (! $input_decohover) diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index 84a47378b..a65887d3c 100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -3,7 +3,14 @@ - + + + {{foreach $albums as $al}} + {{if $al.text}} +
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 81d7b6dc0..3db292f02 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,44 +1,50 @@ -
-
{{$usage}}
-

{{$pagename}}

-
-
- -
-
- -
-
- -
- -
-
-
-
{{$existalbumtext}}
- {{$albumselect}} +
+
+
{{$usage}}
+

{{$pagename}}

+
-
-
- - -
+
+ + +
+ +
+
+ + + {{foreach $albums as $al}} + {{if $al.text}} + +
+
-
- - -
- {{$aclselect}} -
+
+ + +
-
+
+ + +
- {{$uploader}} + {{$aclselect}} - {{$default}} +
-
- +
+ + {{$uploader}} + + {{$default}} + +
+ +
-- cgit v1.2.3 From 4495a30b88a08915e817011076f2095533c903eb Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 30 Oct 2014 18:55:24 +0100 Subject: removing this was not a good idea... --- view/css/conversation.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 959047779..1e9930443 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -127,6 +127,10 @@ a.wall-item-name-link { font-size: 1.112em; } +.wall-item-content img { + max-width: 100%; +} + .wall-item-title h3 { font-weight: bold; margin: 0px; -- cgit v1.2.3 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/css/mod_photos.css | 15 ++++---------- view/css/widgets.css | 3 --- view/theme/redbasic/css/style.css | 10 ++++++---- view/tpl/photos_upload.tpl | 41 +++++++++++++++++++++++++-------------- 4 files changed, 36 insertions(+), 33 deletions(-) (limited to 'view') diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 3832ea1a6..89041bd09 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -22,24 +22,16 @@ margin-bottom: 25px; } -#photos-upload-noshare { - margin-bottom: 10px; +#photos-upload-album { + width: 100%; } -#photos-upload-spacer, -#photos-upload-new-end { - margin-top: 25px; -} #photos-upload-new-end, #photos-upload-exist-end { clear: both; } #photos-upload-exist-end { margin-bottom: 15px; } -#photos-upload-submit { - margin-top: 15px; -} - #photos-upload-select-files-text { margin-top: 15px; @@ -63,8 +55,9 @@ margin-bottom: 15px; } -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end { +#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end, #photos-upload-perms-end, #photos-upload-noshare-end{ clear: both; + margin-bottom: 10px; } #photo-edit-rotate-end { diff --git a/view/css/widgets.css b/view/css/widgets.css index 593e051da..df113b12e 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -26,9 +26,6 @@ /* search */ #search-text { - border: 1px solid #ccc; - padding: 5px; - line-height: 1.5; border-top-right-radius: 0px; border-bottom-right-radius: 0px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 31b769460..5ffc33d31 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -13,7 +13,7 @@ html { } body { - font-family: arial,freesans,sans-serif; + font-family: sans-serif, arial, freesans; font-size: $body_font_size; background-color: $bgcolour; background-image: url('$background_image'); @@ -37,7 +37,7 @@ h5, .h5, h6, .h6 { } .jslider { - font-family: arial,freesans,sans-serif; + font-family: sans-serif, arial, freesans; } abbr { @@ -84,17 +84,19 @@ a.btn-success { input[type="text"], input[type="password"], input[type="submit"], +input[type="file"], select, textarea { - font-family: arial,freesans,sans-serif; + font-family: sans-serif, arial, freesans; font-size: $body_font_size; } input { + padding: 5px; + line-height: 1.5; border: 1px solid $input_border; -moz-border-radius: $radiuspx; border-radius: $radiuspx; - padding: 3px; } input[type="submit"] { 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') 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/css/mod_photos.css | 5 ++--- view/theme/redbasic/css/style.css | 14 +++++--------- 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 +++--------- 8 files changed, 18 insertions(+), 31 deletions(-) (limited to 'view') diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 89041bd09..061f2f40a 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -66,10 +66,9 @@ #photo-edit-edit, -#photo-album-edit-wrapper { +#photo-album-edit-wrapper, +#photo-upload-form { display: none; - padding: 7px 10px; - margin-bottom: 3px; } #photo-album-edit-submit, #photo-album-edit-drop { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5ffc33d31..114098465 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -706,9 +706,7 @@ footer { cursor: pointer; } -#photo-album-edit-wrapper, -#photo-view-wrapper, -#photo-edit-edit { +#photo-view-wrapper { background-color: $item_colour; } @@ -2335,12 +2333,10 @@ aside .nav-pills > li > a { margin-bottom: 0px; } -.section-title-submenu { - margin-top: 10px; -} - -.section-title-submenu a { - margin-right: 10px; +.section-content-tools-wrapper { + padding: 7px 10px; + background-color: $comment_item_colour; + margin-bottom: 3px; } .section-content-wrapper { 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') 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/css/mod_photos.css | 62 ++------------------------ view/tpl/album_edit.tpl | 38 ++++++++-------- view/tpl/photo_album.tpl | 19 ++++---- view/tpl/photo_view.tpl | 109 ++++++++++++++++++++++----------------------- view/tpl/photos_upload.tpl | 15 +++---- 5 files changed, 94 insertions(+), 149 deletions(-) (limited to 'view') diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 061f2f40a..c37cc3332 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -13,70 +13,16 @@ margin: 0 auto; } -#photo-photo-end { - clear: both; -} - -#photo-album-end { - clear: both; - margin-bottom: 25px; -} - -#photos-upload-album { - width: 100%; -} - -#photos-upload-new-end, #photos-upload-exist-end { - clear: both; -} -#photos-upload-exist-end { - margin-bottom: 15px; -} - -#photos-upload-select-files-text { - margin-top: 15px; - margin-bottom: 15px; -} - -#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label { - float: left; - width: 150px; -} - -#photo-edit-perms-end { - margin-bottom: 15px; -} - -#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate { - float: left; - margin-bottom: 25px; -} -#photo-edit-link-wrap { - margin-bottom: 15px; -} - -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end, #photos-upload-perms-end, #photos-upload-noshare-end{ - clear: both; - margin-bottom: 10px; -} - -#photo-edit-rotate-end { - margin-bottom: 15px; -} - - -#photo-edit-edit, +#photo-edit, #photo-album-edit-wrapper, #photo-upload-form { display: none; } -#photo-album-edit-submit, #photo-album-edit-drop { - margin-top: 15px; - margin-bottom: 15px; -} - #photos-usage-message { line-height: 22px; } +#photos-upload-choose { + padding: 2px 12px; +} 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 $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}

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