diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php index f1321dfec..fde4828e2 100644 --- a/src/Module/BaseNotifications.php +++ b/src/Module/BaseNotifications.php @@ -127,7 +127,7 @@ abstract class BaseNotifications extends BaseModule // Set the pager $pager = new Pager(DI::args()->getQueryString(), self::ITEMS_PER_PAGE); - $notif_tpl = Renderer::getMarkupTemplate('notifications.tpl'); + $notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl'); return Renderer::replaceMacros($notif_tpl, [ '$notif_header' => $notif_header ?? DI::l10n()->t('Notifications'), '$tabs' => $tabs, diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index b22df920b..3a7499a1e 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -44,8 +44,8 @@ class Introductions extends BaseNotifications $notifs = $notif_result['notifs'] ?? []; $notif_header = $notif_result['header'] ?? ''; - $sugg = Renderer::getMarkupTemplate('suggestions.tpl'); - $tpl = Renderer::getMarkupTemplate('intros.tpl'); + $sugg = Renderer::getMarkupTemplate('notifications/suggestions.tpl'); + $tpl = Renderer::getMarkupTemplate('notifications/intros.tpl'); // The link to switch between ignored and normal connection requests $notif_show_lnk = [ @@ -111,7 +111,7 @@ class Introductions extends BaseNotifications $helptext3 = DI::l10n()->t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']); } - $dfrn_tpl = Renderer::getMarkupTemplate('netfriend.tpl'); + $dfrn_tpl = Renderer::getMarkupTemplate('notifications/netfriend.tpl'); $dfrn_text = Renderer::replaceMacros($dfrn_tpl, [ '$intro_id' => $notif['intro_id'], '$friend_selected' => $friend_selected, diff --git a/src/Module/Notifications/Notifications.php b/src/Module/Notifications/Notifications.php index 50995645c..bfccbd4e7 100644 --- a/src/Module/Notifications/Notifications.php +++ b/src/Module/Notifications/Notifications.php @@ -80,15 +80,15 @@ class Notifications extends BaseNotifications // notification and apply the correct template according to the notificationtype (label). foreach ($notifs['notifications'] as $notif) { $notification_templates = [ - 'like' => 'notifications_likes_item.tpl', - 'dislike' => 'notifications_dislikes_item.tpl', - 'attend' => 'notifications_attend_item.tpl', - 'attendno' => 'notifications_attend_item.tpl', - 'attendmaybe' => 'notifications_attend_item.tpl', - 'friend' => 'notifications_friends_item.tpl', - 'comment' => 'notifications_comments_item.tpl', - 'post' => 'notifications_posts_item.tpl', - 'notify' => 'notify.tpl', + 'like' => 'notifications/likes_item.tpl', + 'dislike' => 'notifications/dislikes_item.tpl', + 'attend' => 'notifications/attend_item.tpl', + 'attendno' => 'notifications/attend_item.tpl', + 'attendmaybe' => 'notifications/attend_item.tpl', + 'friend' => 'notifications/friends_item.tpl', + 'comment' => 'notifications/comments_item.tpl', + 'post' => 'notifications/posts_item.tpl', + 'notify' => 'notifications/notify.tpl', ]; $tpl_notif = Renderer::getMarkupTemplate($notification_templates[$notif['label']]); diff --git a/view/templates/notifications_attend_item.tpl b/view/templates/notifications/attend_item.tpl similarity index 100% rename from view/templates/notifications_attend_item.tpl rename to view/templates/notifications/attend_item.tpl diff --git a/view/templates/notifications_comments_item.tpl b/view/templates/notifications/comments_item.tpl similarity index 100% rename from view/templates/notifications_comments_item.tpl rename to view/templates/notifications/comments_item.tpl diff --git a/view/templates/notifications_dislikes_item.tpl b/view/templates/notifications/dislikes_item.tpl similarity index 100% rename from view/templates/notifications_dislikes_item.tpl rename to view/templates/notifications/dislikes_item.tpl diff --git a/view/templates/notifications_friends_item.tpl b/view/templates/notifications/friends_item.tpl similarity index 100% rename from view/templates/notifications_friends_item.tpl rename to view/templates/notifications/friends_item.tpl diff --git a/view/templates/intros.tpl b/view/templates/notifications/intros.tpl similarity index 100% rename from view/templates/intros.tpl rename to view/templates/notifications/intros.tpl diff --git a/view/templates/notifications_likes_item.tpl b/view/templates/notifications/likes_item.tpl similarity index 100% rename from view/templates/notifications_likes_item.tpl rename to view/templates/notifications/likes_item.tpl diff --git a/view/templates/netfriend.tpl b/view/templates/notifications/netfriend.tpl similarity index 100% rename from view/templates/netfriend.tpl rename to view/templates/notifications/netfriend.tpl diff --git a/view/templates/notifications_network_item.tpl b/view/templates/notifications/network_item.tpl similarity index 100% rename from view/templates/notifications_network_item.tpl rename to view/templates/notifications/network_item.tpl diff --git a/view/templates/notifications.tpl b/view/templates/notifications/notifications.tpl similarity index 100% rename from view/templates/notifications.tpl rename to view/templates/notifications/notifications.tpl diff --git a/view/templates/notify.tpl b/view/templates/notifications/notify.tpl similarity index 100% rename from view/templates/notify.tpl rename to view/templates/notifications/notify.tpl diff --git a/view/templates/notifications_posts_item.tpl b/view/templates/notifications/posts_item.tpl similarity index 100% rename from view/templates/notifications_posts_item.tpl rename to view/templates/notifications/posts_item.tpl diff --git a/view/templates/suggestions.tpl b/view/templates/notifications/suggestions.tpl similarity index 100% rename from view/templates/suggestions.tpl rename to view/templates/notifications/suggestions.tpl diff --git a/view/theme/frio/templates/notifications/attend_item.tpl b/view/theme/frio/templates/notifications/attend_item.tpl new file mode 100644 index 000000000..252b61c77 --- /dev/null +++ b/view/theme/frio/templates/notifications/attend_item.tpl @@ -0,0 +1,2 @@ + +{{include file="notifications/notify.tpl"}} diff --git a/view/theme/frio/templates/notifications/comments_item.tpl b/view/theme/frio/templates/notifications/comments_item.tpl new file mode 100644 index 000000000..252b61c77 --- /dev/null +++ b/view/theme/frio/templates/notifications/comments_item.tpl @@ -0,0 +1,2 @@ + +{{include file="notifications/notify.tpl"}} diff --git a/view/theme/frio/templates/notifications/dislikes_item.tpl b/view/theme/frio/templates/notifications/dislikes_item.tpl new file mode 100644 index 000000000..252b61c77 --- /dev/null +++ b/view/theme/frio/templates/notifications/dislikes_item.tpl @@ -0,0 +1,2 @@ + +{{include file="notifications/notify.tpl"}} diff --git a/view/theme/frio/templates/notifications/friends_item.tpl b/view/theme/frio/templates/notifications/friends_item.tpl new file mode 100644 index 000000000..252b61c77 --- /dev/null +++ b/view/theme/frio/templates/notifications/friends_item.tpl @@ -0,0 +1,2 @@ + +{{include file="notifications/notify.tpl"}} diff --git a/view/theme/frio/templates/intros.tpl b/view/theme/frio/templates/notifications/intros.tpl similarity index 100% rename from view/theme/frio/templates/intros.tpl rename to view/theme/frio/templates/notifications/intros.tpl diff --git a/view/theme/frio/templates/notifications/likes_item.tpl b/view/theme/frio/templates/notifications/likes_item.tpl new file mode 100644 index 000000000..252b61c77 --- /dev/null +++ b/view/theme/frio/templates/notifications/likes_item.tpl @@ -0,0 +1,2 @@ + +{{include file="notifications/notify.tpl"}} diff --git a/view/theme/frio/templates/notifications/network_item.tpl b/view/theme/frio/templates/notifications/network_item.tpl new file mode 100644 index 000000000..252b61c77 --- /dev/null +++ b/view/theme/frio/templates/notifications/network_item.tpl @@ -0,0 +1,2 @@ + +{{include file="notifications/notify.tpl"}} diff --git a/view/theme/frio/templates/notifications.tpl b/view/theme/frio/templates/notifications/notifications.tpl similarity index 80% rename from view/theme/frio/templates/notifications.tpl rename to view/theme/frio/templates/notifications/notifications.tpl index 1be92c4b2..591d0c3a8 100644 --- a/view/theme/frio/templates/notifications.tpl +++ b/view/theme/frio/templates/notifications/notifications.tpl @@ -1,5 +1,5 @@ - - + +
{{include file="section_title.tpl" title=$notif_header}} diff --git a/view/theme/frio/templates/notify.tpl b/view/theme/frio/templates/notifications/notify.tpl similarity index 100% rename from view/theme/frio/templates/notify.tpl rename to view/theme/frio/templates/notifications/notify.tpl diff --git a/view/theme/frio/templates/notifications/posts_item.tpl b/view/theme/frio/templates/notifications/posts_item.tpl new file mode 100644 index 000000000..252b61c77 --- /dev/null +++ b/view/theme/frio/templates/notifications/posts_item.tpl @@ -0,0 +1,2 @@ + +{{include file="notifications/notify.tpl"}} diff --git a/view/theme/frio/templates/notifications/suggestions.tpl b/view/theme/frio/templates/notifications/suggestions.tpl new file mode 100644 index 000000000..9595190e0 --- /dev/null +++ b/view/theme/frio/templates/notifications/suggestions.tpl @@ -0,0 +1,2 @@ + +{{include file="notifications/intros.tpl"}} \ No newline at end of file diff --git a/view/theme/frio/templates/notifications_attend_item.tpl b/view/theme/frio/templates/notifications_attend_item.tpl deleted file mode 100644 index 680b29a27..000000000 --- a/view/theme/frio/templates/notifications_attend_item.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -{{include file="notify.tpl"}} diff --git a/view/theme/frio/templates/notifications_comments_item.tpl b/view/theme/frio/templates/notifications_comments_item.tpl deleted file mode 100644 index 680b29a27..000000000 --- a/view/theme/frio/templates/notifications_comments_item.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -{{include file="notify.tpl"}} diff --git a/view/theme/frio/templates/notifications_dislikes_item.tpl b/view/theme/frio/templates/notifications_dislikes_item.tpl deleted file mode 100644 index 680b29a27..000000000 --- a/view/theme/frio/templates/notifications_dislikes_item.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -{{include file="notify.tpl"}} diff --git a/view/theme/frio/templates/notifications_friends_item.tpl b/view/theme/frio/templates/notifications_friends_item.tpl deleted file mode 100644 index 680b29a27..000000000 --- a/view/theme/frio/templates/notifications_friends_item.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -{{include file="notify.tpl"}} diff --git a/view/theme/frio/templates/notifications_likes_item.tpl b/view/theme/frio/templates/notifications_likes_item.tpl deleted file mode 100644 index 680b29a27..000000000 --- a/view/theme/frio/templates/notifications_likes_item.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -{{include file="notify.tpl"}} diff --git a/view/theme/frio/templates/notifications_network_item.tpl b/view/theme/frio/templates/notifications_network_item.tpl deleted file mode 100644 index 680b29a27..000000000 --- a/view/theme/frio/templates/notifications_network_item.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -{{include file="notify.tpl"}} diff --git a/view/theme/frio/templates/notifications_posts_item.tpl b/view/theme/frio/templates/notifications_posts_item.tpl deleted file mode 100644 index 680b29a27..000000000 --- a/view/theme/frio/templates/notifications_posts_item.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -{{include file="notify.tpl"}} diff --git a/view/theme/frio/templates/suggestions.tpl b/view/theme/frio/templates/suggestions.tpl deleted file mode 100644 index e2399eb49..000000000 --- a/view/theme/frio/templates/suggestions.tpl +++ /dev/null @@ -1,2 +0,0 @@ - -{{include file="intros.tpl"}} \ No newline at end of file