From f648809856b852d3819a8c1a0d624fd725ed8a34 Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Sun, 22 Oct 2017 19:52:08 +0200 Subject: Portfolio widget - CSS update --- view/tpl/photo_album_portfolio.tpl | 40 +++++++++++++++++++++++++++++++++++++- view/tpl/photo_portfolio_card.tpl | 6 ++++++ view/tpl/photo_portfolio_orbit.tpl | 5 +++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 view/tpl/photo_portfolio_card.tpl create mode 100644 view/tpl/photo_portfolio_orbit.tpl (limited to 'view/tpl') diff --git a/view/tpl/photo_album_portfolio.tpl b/view/tpl/photo_album_portfolio.tpl index 7aadbc7e0..1635e0ae1 100755 --- a/view/tpl/photo_album_portfolio.tpl +++ b/view/tpl/photo_album_portfolio.tpl @@ -1,3 +1,39 @@ +{{if isset($mode) && $mode == 'orbit'}} +
+
+ +
    + + + {{foreach $photos as $photo}} + {{include file="photo_portfolio_orbit.tpl"}} + {{/foreach}} +
+ +
+
+
+ +
+
+{{elseif isset($mode) && $mode =='card'}} +
+
+ {{foreach $photos as $photo}} + {{include file="photo_portfolio_card.tpl"}} + {{/foreach}} +
+
+
+ +
+
+{{else}}
{{foreach $photos as $photo}} @@ -8,4 +44,6 @@
-
\ No newline at end of file +
+{{/if}} + diff --git a/view/tpl/photo_portfolio_card.tpl b/view/tpl/photo_portfolio_card.tpl new file mode 100644 index 000000000..5fddd3d37 --- /dev/null +++ b/view/tpl/photo_portfolio_card.tpl @@ -0,0 +1,6 @@ +
+ {{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}} +
+

{{$photo.desc}}

+
+
diff --git a/view/tpl/photo_portfolio_orbit.tpl b/view/tpl/photo_portfolio_orbit.tpl new file mode 100644 index 000000000..b2883265c --- /dev/null +++ b/view/tpl/photo_portfolio_orbit.tpl @@ -0,0 +1,5 @@ + +
  • + {{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}} +
    {{$photo.desc}}
    +
    • -- cgit v1.2.3 From 0061ac8584feb6d18962518263ab18617dbf8dc5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 22 Oct 2017 21:01:58 +0200 Subject: do not show seen notifys in notifications - show them in mod notifications instead. Update notifications count also on notifications updates --- view/tpl/notify.tpl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl index ae6e160b1..b5bccc8a4 100755 --- a/view/tpl/notify.tpl +++ b/view/tpl/notify.tpl @@ -1,3 +1,10 @@ -
    - {{$item_text}} {{$item_when}} +
    + {{if ! $item_seen}} + {{$new}} + {{/if}} + + + {{$item_text}}
    + {{$item_when}} +
    -- cgit v1.2.3 From 37b7b2f1a8712f9541becba54f8b7fa88aaa9bc4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 22 Oct 2017 21:44:39 -0700 Subject: mod_display: provide alternate serialisations (starting with atom) --- view/tpl/atom_feed.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl index fe38fdc80..b1e92cdbf 100755 --- a/view/tpl/atom_feed.tpl +++ b/view/tpl/atom_feed.tpl @@ -15,7 +15,9 @@ {{$feed_title}} {{$red}} + {{if $profile_page}} + {{/if}} {{if $author}} {{$author}} {{/if}} -- cgit v1.2.3 From 71e0e55b0b5bc1746cb481056b027e76c1821ef7 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 30 Oct 2017 18:49:18 -0700 Subject: provide a 'tile' view (view only) mode to mod_cloud --- view/tpl/cloud_directory.tpl | 35 +++++++++++++++++++++++++++++++++++ view/tpl/cloud_header.tpl | 1 + 2 files changed, 36 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index e8ae6a590..3beeb4f8a 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,4 +1,38 @@
    + {{if $tiles}} + + {{if $parentpath}} +
    +
    + + +
    +
    .. +
    +
    + {{/if}} + + {{foreach $entries as $item}} +
    +
    + {{if $item.photo_icon}} + + {{else}} + + {{/if}} + +
    +
    + {{$item.displayName}} + +
    + {{if $item.is_owner}} + + {{/if}} +
    + {{/foreach}} +
    + {{else}} @@ -42,4 +76,5 @@ {{/foreach}}
    + {{/if}}
    diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index c1e589341..468f2febc 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -1,6 +1,7 @@
    {{if $actionspanel}}
    + {{if $is_owner}}  {{$shared}} {{/if}} -- cgit v1.2.3 From 16a2bfa95b5ba487825213239e759e23893cf7ab Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 30 Oct 2017 21:00:17 -0700 Subject: move tile styles to theme instead of template file --- view/tpl/cloud_directory.tpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 3beeb4f8a..40278661f 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -2,27 +2,27 @@ {{if $tiles}} {{if $parentpath}} -
    +
    - +
    -
    .. +
    ..
    {{/if}} {{foreach $entries as $item}} -
    +
    {{if $item.photo_icon}} - + {{else}} - + {{/if}}
    -
    +
    {{$item.displayName}}
    -- cgit v1.2.3 From 6efef3922b9fe6864c0855e6407b77ca54af70c5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 31 Oct 2017 15:41:44 -0700 Subject: add another delivery control parameter (force queue threshold) --- view/tpl/admin_site.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/tpl') diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index d6ff34f93..6b39e844a 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -88,6 +88,7 @@ {{include file="field_input.tpl" field=$timeout}} {{include file="field_input.tpl" field=$delivery_interval}} {{include file="field_input.tpl" field=$delivery_batch_count}} + {{include file="field_input.tpl" field=$force_queue}} {{include file="field_input.tpl" field=$poll_interval}} {{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$abandon_days}} -- cgit v1.2.3 From bff1e215cce27706fabe9f1764bce5c5a5b3b434 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 31 Oct 2017 18:04:01 -0700 Subject: pdledit - show original/system layout text for comparison --- view/tpl/pdledit.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl index 2ea89b6c1..66b8209c9 100644 --- a/view/tpl/pdledit.tpl +++ b/view/tpl/pdledit.tpl @@ -11,7 +11,10 @@

    +
    {{$original}}
    +
    {{$src}}
    +
    -- cgit v1.2.3 From 98b53801e062f1fe1b5ae16c6e30635b21ebef91 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 31 Oct 2017 19:56:14 -0700 Subject: provide personal config for channel_menu; the site can set an initial site-wide value but this but there isn't a corresponding admin setting currently and can only be set by manual config --- view/tpl/settings_display.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/tpl') diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index d8c1ac7aa..d1e6e0609 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -64,6 +64,7 @@ {{include file="field_input.tpl" field=$channel_divmore_height}} {{include file="field_input.tpl" field=$network_divmore_height}} {{include file="field_checkbox.tpl" field=$nosmile}} + {{include file="field_checkbox.tpl" field=$channel_menu}} {{include file="field_checkbox.tpl" field=$title_tosource}} {{include file="field_checkbox.tpl" field=$channel_list_mode}} {{include file="field_checkbox.tpl" field=$network_list_mode}} -- cgit v1.2.3 From 22d45a8d1ecfa0a0a2b8429ec3233e7099e84b66 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 1 Nov 2017 02:53:12 -0700 Subject: support for netselect query --- view/tpl/build_query.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index a76d4e549..bfe5c8a08 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -29,6 +29,7 @@ var bParam_dbegin = "{{$dbegin}}"; var bParam_mid = "{{$mid}}"; var bParam_verb = "{{$verb}}"; + var bParam_net = "{{$net}}"; function buildCmd() { var udargs = ((page_load) ? "/load" : ""); @@ -57,6 +58,7 @@ if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin; if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid; if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb; + if(bParam_net != "") bCmd = bCmd + "&net=" + bParam_net; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; return(bCmd); } -- cgit v1.2.3 From 94e548b07a129fc6a57c38b5d6799e86ca3d34ba Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 6 Nov 2017 11:25:49 +0100 Subject: lets try this in the wild for a while --- view/tpl/cloud_actionspanel.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index baee48da3..fc3e7f82f 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -26,7 +26,7 @@ - {{**include file="field_checkbox.tpl" field=$notify**}} + {{include file="field_checkbox.tpl" field=$notify}}
    {{if $lockstate}} -- cgit v1.2.3 From 3f1a4b655900d64ad2c13f1906eb77eaf15d11b5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 6 Nov 2017 20:13:14 -0800 Subject: second half of issue #893 - move channel default permissions to its own module so we can apply different page/widget layouts than for connedit; the relevant functionality is abandoned on mod_connedit but still intact. Trying a slightly different look/behaviour for inherited settings and the associated checkboxes. This may need a bit more tweaking but overall looks a lot cleaner. --- view/tpl/defperms.tpl | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100755 view/tpl/defperms.tpl (limited to 'view/tpl') diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl new file mode 100755 index 000000000..f4a711957 --- /dev/null +++ b/view/tpl/defperms.tpl @@ -0,0 +1,55 @@ +
    +
    +

    {{$header}}

    +
    +
    + + + + + +
    +
    +
    +
    +
    +

    {{$autolbl}}

    +

    {{$permnote_self}}

    +
    + {{if $permcat_enable}} + +  {{$permcat_new}} + {{include file="field_select.tpl" field=$permcat}} + {{/if}} + +
    + {{foreach $perms as $prm}} + {{include file="field_checkbox.tpl" field=$prm}} + {{/foreach}} +
    + + {{if $hidden_perms}} + {{foreach $hidden_perms as $prm}} + + {{/foreach}} + {{/if}} + + + +
    +
    + {{$autoapprove}} +
    + {{include file="field_checkbox.tpl" field=$autoperms}} +
    + +
    + +
    +
    +
    +
    +
    + +
    +
    -- cgit v1.2.3 From 549866c0900c1ff550e001323c59a74352920770 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Nov 2017 10:43:13 +0100 Subject: add location info to the navbar --- view/tpl/navbar_default.tpl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index b330993c8..4f0b9a110 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -17,8 +17,8 @@
    {{/if}} {{if $userinfo}} -
    -
    +
    +
    {{$userinfo.name}}
    @@ -60,7 +60,13 @@ {{/if}}
    - + + {{$sel.name}} + {{if $sitelocation}} +
    + {{$sitelocation}} + {{/if}} +
    {{/if}}
    -- cgit v1.2.3 From 1bb6dfc9a03550063d5b25fd804e586d45eb61fa Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Nov 2017 10:58:15 +0100 Subject: move style out of template --- view/tpl/navbar_default.tpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 4f0b9a110..d02ad2e97 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -60,11 +60,10 @@ {{/if}}
    - + {{$sel.name}} {{if $sitelocation}} -
    - {{$sitelocation}} +
    {{$sitelocation}} {{/if}}
    -- cgit v1.2.3 From 9d584fc72062422ec38a6321aedb7ca43f4ea429 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 Nov 2017 08:57:30 +0100 Subject: truncate nav-app-link if appropriate --- view/tpl/navbar_default.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index d02ad2e97..1f771e5ae 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -59,8 +59,8 @@
    {{/if}}
    -
    - + -- cgit v1.2.3 From a8d527f1cda1c35ca19c7c94435c78d1036e4861 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 8 Nov 2017 11:01:19 +0100 Subject: only show nav app link if we have a selected app --- view/tpl/navbar_default.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index e4150ba50..994254bc4 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -60,12 +60,14 @@ {{/if}}
    {{/if}}
    -- cgit v1.2.3 From e7d20efb1b8d579bcb9bdef99205aad19281f6b2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 8 Nov 2017 12:00:15 +0100 Subject: css fixes --- view/tpl/navbar_default.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 994254bc4..426d32047 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -59,17 +59,17 @@
    {{/if}}
    +{{if $sel.name}} {{/if}} +{{/if}}
    {{if $nav.help.6}} {{/if}} - +
    -- cgit v1.2.3 From cc0d53e6959f333d26003af64439b2fd8a8d665c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 30 Nov 2017 16:24:18 -0800 Subject: made it to prepareHtml --- view/tpl/cloud_directory.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 88b6bf563..7017df344 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -52,7 +52,7 @@ {{/if}} - {{* this is needed to append the upload files in the right order *}} + {{* this is needed to append the upload files in the right order *}} {{foreach $entries as $item}} -- cgit v1.2.3 From 0e8e0b48b3fd6f4d6d0dd60039743371930af08d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 30 Nov 2017 19:05:24 -0800 Subject: more or less working chunked uploads on /cloud now. --- view/tpl/cloud_actionspanel.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 8d39a8383..6b876d2ac 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -21,7 +21,7 @@
    {{if $quota.limit || $quota.used}}
    {{if $quota.warning}}{{$quota.warning}} {{/if}}{{if $quota.desc}}{{$quota.desc}}

    {{/if}}{{$info}}
    {{/if}} -
    + -- cgit v1.2.3 From 3b6d7e306656f1263b80430fbcfdb413bf99ead9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 30 Nov 2017 21:40:37 -0800 Subject: make sure we get a file upload progress indicator in the tiles view. --- view/tpl/cloud_directory.tpl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 7017df344..ad3caff88 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,8 +1,12 @@
    {{if $tiles}} + + {{* this is needed to append the upload files in the right order *}} +
    {{if $parentpath}}
    +
    -- cgit v1.2.3 From dcad9ce26a0de72ba3ad5b86ddb62298598ac380 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Dec 2017 21:00:39 +0100 Subject: add a filter for notification to show new posts only --- view/tpl/notifications_widget.tpl | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 18f3ef12d..90f03faf0 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -22,7 +22,7 @@ }); {{if $module == 'display' || $module == 'hq'}} - $(document).on('click touch', '.notification', function(e) { + $(document).on('click', '.notification', function(e) { var b64mid = $(this).data('b64mid'); var notify_id = $(this).data('notify_id'); var path = $(this)[0].pathname.substr(1,7); @@ -53,6 +53,16 @@ }); {{/if}} + {{foreach $notifications as $notification}} + {{if $notification.filter}} + $(document).on('click', '#tt-{{$notification.type}}-only', function(e) { + e.preventDefault(); + $('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggle(); + $(this).toggleClass('active'); + }); + {{/if}} + {{/foreach}} + function getData(b64mid, notify_id) { $('.thread-wrapper').remove(); bParam_mid = b64mid; @@ -72,7 +82,7 @@
    {{/foreach}} -- cgit v1.2.3 From 4d7acdd44d4413c5bb712fe05a77bcaccc3054a5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 11 Dec 2017 15:47:54 -0800 Subject: try as best we can to keep the directory table (cloud list mode) inside the containing div. It looks pretty bad when you have a long filename. --- view/tpl/cloud_directory.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index ad3caff88..660e1e011 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -39,12 +39,12 @@ {{else}} - - - + + + - - + + {{if $parentpath}} -- cgit v1.2.3 From 7a7bfd9de75abf6e8f601102b6d5f80396a8b3a4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 12 Dec 2017 11:10:12 +0100 Subject: Revert "try as best we can to keep the directory table (cloud list mode) inside the containing div. It looks pretty bad when you have a long filename." This reverts commit 4d7acdd44d4413c5bb712fe05a77bcaccc3054a5. --- view/tpl/cloud_directory.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 660e1e011..ad3caff88 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -39,12 +39,12 @@ {{else}}
    {{$name}}{{$name}} {{*{{$type}}*}}{{$size}}{{$lastmod}}{{$size}}{{$lastmod}}
    - - - + + + - - + + {{if $parentpath}} -- cgit v1.2.3 From 08820fd655460a9628a99d9f5af111675c494afa Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 14 Dec 2017 13:30:31 -0800 Subject: hubzilla issue #928 --- view/tpl/msg-header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index d71d432fb..b6856f139 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -26,7 +26,7 @@ }); $('#prvmail-attach-wrapper').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); - $('#prvmail-attach-wrapper-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); + $('#prvmail-attach-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); }); -- cgit v1.2.3 From ab3b126ff6a3dd76292c6c96482ed6835df966f6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 18 Dec 2017 12:46:37 +0100 Subject: notifications: only handle item otype notify_ids --- view/tpl/notifications_widget.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 0974045fe..299c07592 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -28,6 +28,9 @@ var path = $(this)[0].pathname.substr(1,7); var stateObj = { b64mid: b64mid }; + if(b64mid === 'undefined' && notify_id === 'undefined') + return; + {{if $module == 'display'}} history.pushState(stateObj, '', 'display/' + b64mid); {{/if}} -- cgit v1.2.3 From 5a2b17a1da78dc413b0fe195ed5c34ec23f27d1c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 4 Jan 2018 11:31:48 +0100 Subject: fix nav update regressions - fixes issue #950 --- view/tpl/admin_site.tpl | 2 +- view/tpl/jot-header.tpl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 399ee42cf..a2a9f3f27 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -23,7 +23,7 @@ $.post(url, data, function(data) { if(timer) clearTimeout(timer); - NavUpdate(); + updateInit(); $.colorbox.close(); }) diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 2f9dd9f15..ffaa4e208 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -340,7 +340,7 @@ var activeCommentText = ''; $.get('{{$baseurl}}/tagger/' + id + '?term=' + reply); if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,3000); + timer = setTimeout(updateInit,3000); liking = 1; } } @@ -359,7 +359,7 @@ var activeCommentText = ''; if(reply && reply.length) { commentBusy = true; $('body').css('cursor', 'wait'); - $.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate); + $.get('{{$baseurl}}/filer/' + id + '?term=' + reply, updateInit); liking = 1; $('#item-filer-dialog').modal('hide'); } @@ -372,13 +372,13 @@ var activeCommentText = ''; function itemBookmark(id) { $.get('{{$baseurl}}/bookmarks?f=&item=' + id); if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,1000); + timer = setTimeout(updateInit,1000); } function itemAddToCal(id) { $.get('{{$baseurl}}/events/add/' + id); if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,1000); + timer = setTimeout(updateInit,1000); } function toggleVoting() { @@ -409,7 +409,7 @@ var activeCommentText = ''; if(id && icon) { $.get('{{$baseurl}}/react?f=&postid=' + id + '&emoji=' + icon); if(timer) clearTimeout(timer); - timer = setTimeout(NavUpdate,1000); + timer = setTimeout(updateInit,1000); } } -- cgit v1.2.3 From ffe058d48f5a8c4d38c893ece09cdaac8078e9e5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 6 Jan 2018 12:16:45 +0100 Subject: make active notifications filter sticky --- view/tpl/notifications_widget.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 299c07592..095fa8056 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -63,7 +63,7 @@ $(document).on('click', '#tt-{{$notification.type}}-only', function(e) { e.preventDefault(); $('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggle(); - $(this).toggleClass('active'); + $(this).toggleClass('active sticky-top'); }); {{/if}} {{/foreach}} -- cgit v1.2.3 From fefc78a849ade52927f6ae88a3c1f03501d66930 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 7 Jan 2018 19:14:19 +0100 Subject: start with nonactive state for the notifications button and display some text if there are no notifications on small screens only --- view/tpl/notifications_widget.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 095fa8056..9d2e08c41 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -85,6 +85,9 @@ {{if $notifications}}
    {{$name}}{{$name}} {{*{{$type}}*}}{{$size}}{{$lastmod}}{{$size}}{{$lastmod}}