From 5456ee7f655b854c37cddf0479f0d8757802ca86 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 22 Feb 2018 21:45:00 -0800 Subject: cloud 'view-as-tiles' toggle wasn't available (at all) for guests and they are the most likely to prefer that view. Fix that and make tiles the default view for guests, and list mode the default view for the channel owner. --- view/tpl/cloud_header.tpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index 468f2febc..307dc8956 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -1,14 +1,15 @@
- {{if $actionspanel}}
+ {{if $actionspanel}} {{if $is_owner}}  {{$shared}} {{/if}} + {{/if}}
- {{/if}} +

{{$header}}

-- cgit v1.2.3 From 3dd64e7916872d21122c8184abb80eaa5a79a3fc Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 23 Feb 2018 13:21:49 -0800 Subject: usability: click your own profile photo to change it instead of hunting it down in the profile edit navmenu. We still need work on the 'or use a photo from your albums' to use something like the photo selection widget in the post editor as you otherwise have to track down the 'use as profile photo' entry in the photo detail navmenu instead of just clicking an image. --- view/tpl/profile_vcard.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 0f30e5816..07e6dcc0a 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,6 +1,6 @@
{{if ! $zcard}} -
{{$profile.fullname}}
+
{{if $editmenu}}{{/if}}{{$profile.fullname}}{{if $editmenu}}{{/if}}
{{/if}} {{if $connect}}
{{$connect}}
-- cgit v1.2.3 From 2d91aed183a08a78bc2cc0f3554f3d4c277ae798 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 23 Feb 2018 19:23:17 -0800 Subject: use embed photos javascript widget to select existing photos for profile and cover photos --- view/tpl/cover_photo.tpl | 26 ++++++++++++++++++++++++-- view/tpl/profile_photo.tpl | 29 ++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index 4352501ae..28bc7dc24 100755 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -21,9 +21,31 @@
-
+ diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index ca107bfcc..8dc640e35 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -22,6 +22,8 @@ {{else}} + + @@ -40,9 +44,32 @@
-
+ + -- cgit v1.2.3 From 59dafb610d049c8b19a038871fa282231f809c93 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 23 Feb 2018 19:36:46 -0800 Subject: style the 'use existing' button a wee bit --- view/tpl/cover_photo.tpl | 3 +-- view/tpl/profile_photo.tpl | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index 28bc7dc24..f2758b36d 100755 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -22,9 +22,8 @@
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index 8dc640e35..04d04d549 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -45,9 +45,8 @@
-- cgit v1.2.3 From 7ddf51722cdbe2d69084b7e9597fc6b11aeeb686 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 23 Feb 2018 19:43:05 -0800 Subject: style the buttons even more --- view/tpl/cover_photo.tpl | 4 ++-- view/tpl/profile_photo.tpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index f2758b36d..7ad4482e4 100755 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -22,8 +22,8 @@
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index 04d04d549..1f468c2e5 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -45,8 +45,8 @@
-- cgit v1.2.3 From c618bfc607498998916f01fd9c6985c2ecd47356 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 24 Feb 2018 19:42:39 +0100 Subject: mark connections where we do not have post_comments permissions with an no entry sign. --- view/tpl/connection_template.tpl | 7 ++++++- view/tpl/contact_template.tpl | 3 +++ view/tpl/micropro_img.tpl | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 8e49c9e27..4543a69d0 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -18,7 +18,12 @@
- {{$contact.name}} + + {{$contact.name}} + + {{if $contact.oneway}} + + {{/if}}
{{if $contact.status}} diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl index 3d1bfa4a4..2a2f996f4 100755 --- a/view/tpl/contact_template.tpl +++ b/view/tpl/contact_template.tpl @@ -1,6 +1,9 @@
{{$contact.name}} + {{if $contact.oneway}} + + {{/if}}
{{$contact.name}}
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl index a7c5973f3..7464430b5 100755 --- a/view/tpl/micropro_img.tpl +++ b/view/tpl/micropro_img.tpl @@ -1 +1 @@ -
+
{{if $oneway}}{{/if}}
-- cgit v1.2.3 From 3153129e2eb968a189a8a7050d06892cbc13c651 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 24 Feb 2018 13:20:59 -0800 Subject: make the profile photo image picker work correctly with multiple profiles. --- view/tpl/profile_photo.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index 1f468c2e5..832f135f3 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -27,7 +27,7 @@
-- cgit v1.2.3 From 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 25 Feb 2018 19:25:00 -0800 Subject: hubzilla issue #979 - alter image selection widget to accept/submit on choose (jot, wiki, cover_photo, profile_photo) --- view/tpl/cover_photo.tpl | 4 ---- view/tpl/jot-header.tpl | 20 ++++++++------------ view/tpl/jot.tpl | 4 ---- view/tpl/profile_photo.tpl | 6 ------ view/tpl/wiki.tpl | 41 +++++++++++++++++------------------------ 5 files changed, 25 insertions(+), 50 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index 7ad4482e4..cbcf46320 100755 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -41,10 +41,6 @@
-
- - -
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 0ffc8b349..c1dab52d5 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -459,13 +459,7 @@ var activeCommentText = ''; if (typeof($(image).parent()[0]) !== 'undefined') { var imageparent = document.getElementById($(image).parent()[0].id); $(imageparent).toggleClass('embed-photo-selected-photo'); - } - }); - $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); - $('#embed-photo-OKButton').click(function () { - $('.embed-photo-selected-photo').each(function (index) { - var href = $(this).attr('href'); + var href = $(imageparent).attr('href'); $.post("embedphotos/photolink", {href: href}, function(ddata) { if (ddata['status']) { @@ -476,12 +470,14 @@ var activeCommentText = ''; } return false; }, - 'json'); - }); - $('#embedPhotoModalBodyAlbumDialog').html(''); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('hide'); + 'json'); + $('#embedPhotoModalBodyAlbumDialog').html(''); + $('#embedPhotoModalBodyAlbumDialog').off('click'); + $('#embedPhotoModal').modal('hide'); + } }); + $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); } else { window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']); } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 13e7602be..bc9339d4c 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -293,10 +293,6 @@
-
- - -
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index 832f135f3..edde6af3f 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -35,8 +35,6 @@
{{/if}} - -
@@ -65,10 +63,6 @@
-
- - -
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index f1ab1ebad..2be323deb 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -91,10 +91,6 @@
-
- - -
@@ -391,16 +387,10 @@ if (typeof($(image).parent()[0]) !== 'undefined') { var imageparent = document.getElementById($(image).parent()[0].id); $(imageparent).toggleClass('embed-photo-selected-photo'); - } - }); - $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); - $('#embed-photo-OKButton').click(function () { - $('.embed-photo-selected-photo').each(function (index) { - var href = $(this).attr('href'); - $.post("embedphotos/photolink", {href: href}, - function(ddata) { - if (ddata['status']) { + var href = $(imageparent).attr('href'); + $.post("embedphotos/photolink", {href: href}, + function(ddata) { + if (ddata['status']) { {{if !$mimeType || $mimeType == 'text/markdown'}} var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' ) editor.getSession().insert(editor.getCursorPosition(), imgURL) @@ -408,17 +398,20 @@ var currentContent = $('#editor').val(); $('#editor').val(currentContent + ddata['photolink']); {{/if}} - } else { - window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']); - } - return false; + } else { + window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']); + } + return false; }, - 'json'); - }); - $('#embedPhotoModalBodyAlbumDialog').html(''); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('hide'); - }); + 'json'); + $('#embedPhotoModalBodyAlbumDialog').html(''); + $('#embedPhotoModalBodyAlbumDialog').off('click'); + $('#embedPhotoModal').modal('hide'); + } + }); + + $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); } else { window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']); } -- cgit v1.2.3 From d2ed3a9abbb5c68d1a02eae629bc103aa43a1263 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 25 Feb 2018 21:40:19 -0800 Subject: provide opt-out link and text with notification emails --- view/tpl/email_notify_html.tpl | 3 +++ view/tpl/email_notify_text.tpl | 1 + 2 files changed, 4 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 5b4954c8e..f4e12d793 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -21,6 +21,9 @@ {{$hitemlink}} {{$thanks}} {{$site_admin}} + + {{$opt_out1}} + {{$opt_out2}} diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl index 56925c18b..5f1984edb 100755 --- a/view/tpl/email_notify_text.tpl +++ b/view/tpl/email_notify_text.tpl @@ -11,3 +11,4 @@ {{$thanks}} {{$site_admin}} +{{$opt_out1}} {{$opt_out2}} \ No newline at end of file -- cgit v1.2.3 From be3e0ca9a11923e1eba6b565af512c9339597f74 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 26 Feb 2018 12:54:26 +0100 Subject: change fontname in css and fix issue with unicode characters --- view/tpl/acl_selector.tpl | 2 +- view/tpl/navbar_default.tpl | 2 +- view/tpl/navbar_tucson.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index f4f851c8a..e032071b3 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -31,7 +31,7 @@
- + {{$showlimitedDesc}}
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 2c9570938..b0b3198c6 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -120,7 +120,7 @@