Move templates into sub-dir "notifications"

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,

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,

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']]);

view/theme/frio/templates/notifications/attend_item.tpl

@@ -0,0 +1,2 @@
+
+{{include file="notifications/notify.tpl"}}

view/theme/frio/templates/notifications/comments_item.tpl

@@ -0,0 +1,2 @@
+
+{{include file="notifications/notify.tpl"}}

view/theme/frio/templates/notifications/dislikes_item.tpl

@@ -0,0 +1,2 @@
+
+{{include file="notifications/notify.tpl"}}

view/theme/frio/templates/notifications/friends_item.tpl

@@ -0,0 +1,2 @@
+
+{{include file="notifications/notify.tpl"}}

view/theme/frio/templates/notifications/likes_item.tpl

@@ -0,0 +1,2 @@
+
+{{include file="notifications/notify.tpl"}}

view/theme/frio/templates/notifications/network_item.tpl

@@ -0,0 +1,2 @@
+
+{{include file="notifications/notify.tpl"}}

view/theme/frio/templates/notifications/notifications.tpl

@@ -1,5 +1,5 @@
-<script type="text/javascript" src="view/theme/frio/frameworks/jquery-color/jquery.color.js"></script>
-<script type="text/javascript" src="view/theme/frio/js/mod_notifications.js"></script>
+<script type="text/javascript" src="../../frameworks/jquery-color/jquery.color.js"></script>
+<script type="text/javascript" src="../../js/mod_notifications.js"></script>
 
 <div class="generic-page-wrapper">
 	{{include file="section_title.tpl" title=$notif_header}}

view/theme/frio/templates/notifications/posts_item.tpl

@@ -0,0 +1,2 @@
+
+{{include file="notifications/notify.tpl"}}

view/theme/frio/templates/notifications/suggestions.tpl

@@ -0,0 +1,2 @@
+
+{{include file="notifications/intros.tpl"}}

view/theme/frio/templates/notifications_attend_item.tpl

@@ -1,2 +0,0 @@
-
-{{include file="notify.tpl"}}

view/theme/frio/templates/notifications_comments_item.tpl

@@ -1,2 +0,0 @@
-
-{{include file="notify.tpl"}}

view/theme/frio/templates/notifications_dislikes_item.tpl

@@ -1,2 +0,0 @@
-
-{{include file="notify.tpl"}}

view/theme/frio/templates/notifications_friends_item.tpl

@@ -1,2 +0,0 @@
-
-{{include file="notify.tpl"}}

view/theme/frio/templates/notifications_likes_item.tpl

@@ -1,2 +0,0 @@
-
-{{include file="notify.tpl"}}

view/theme/frio/templates/notifications_network_item.tpl

@@ -1,2 +0,0 @@
-
-{{include file="notify.tpl"}}

view/theme/frio/templates/notifications_posts_item.tpl

@@ -1,2 +0,0 @@
-
-{{include file="notify.tpl"}}

view/theme/frio/templates/suggestions.tpl

@@ -1,2 +0,0 @@
-
-{{include file="intros.tpl"}}