Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 08:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move templates into sub-dir "notifications"

Browse source
This commit is contained in:
nupplaPhil 2020-01-23 00:16:34 +01:00
parent 512b00550e
commit 5c4eb2b2c9
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
34 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/BaseNotifications.php
View file

@ -127,7 +127,7 @@ abstract class BaseNotifications extends BaseModule
// Set the pager // Set the pager
$pager = new Pager(DI::args()->getQueryString(), self::ITEMS_PER_PAGE); $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, [ return Renderer::replaceMacros($notif_tpl, [
'$notif_header' => $notif_header ?? DI::l10n()->t('Notifications'), '$notif_header' => $notif_header ?? DI::l10n()->t('Notifications'),
'$tabs' => $tabs, '$tabs' => $tabs,

6
src/Module/Notifications/Introductions.php
View file

@ -44,8 +44,8 @@ class Introductions extends BaseNotifications
$notifs = $notif_result['notifs'] ?? []; $notifs = $notif_result['notifs'] ?? [];
$notif_header = $notif_result['header'] ?? ''; $notif_header = $notif_result['header'] ?? '';
$sugg = Renderer::getMarkupTemplate('suggestions.tpl'); $sugg = Renderer::getMarkupTemplate('notifications/suggestions.tpl');
$tpl = Renderer::getMarkupTemplate('intros.tpl'); $tpl = Renderer::getMarkupTemplate('notifications/intros.tpl');
// The link to switch between ignored and normal connection requests // The link to switch between ignored and normal connection requests
$notif_show_lnk = [ $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']); $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, [ $dfrn_text = Renderer::replaceMacros($dfrn_tpl, [
'$intro_id' => $notif['intro_id'], '$intro_id' => $notif['intro_id'],
'$friend_selected' => $friend_selected, '$friend_selected' => $friend_selected,

18
src/Module/Notifications/Notifications.php
View file

@ -80,15 +80,15 @@ class Notifications extends BaseNotifications
// notification and apply the correct template according to the notificationtype (label). // notification and apply the correct template according to the notificationtype (label).
foreach ($notifs['notifications'] as $notif) { foreach ($notifs['notifications'] as $notif) {
$notification_templates = [ $notification_templates = [
'like' => 'notifications_likes_item.tpl', 'like' => 'notifications/likes_item.tpl',
'dislike' => 'notifications_dislikes_item.tpl', 'dislike' => 'notifications/dislikes_item.tpl',
'attend' => 'notifications_attend_item.tpl', 'attend' => 'notifications/attend_item.tpl',
'attendno' => 'notifications_attend_item.tpl', 'attendno' => 'notifications/attend_item.tpl',
'attendmaybe' => 'notifications_attend_item.tpl', 'attendmaybe' => 'notifications/attend_item.tpl',
'friend' => 'notifications_friends_item.tpl', 'friend' => 'notifications/friends_item.tpl',
'comment' => 'notifications_comments_item.tpl', 'comment' => 'notifications/comments_item.tpl',
'post' => 'notifications_posts_item.tpl', 'post' => 'notifications/posts_item.tpl',
'notify' => 'notify.tpl', 'notify' => 'notifications/notify.tpl',
]; ];
$tpl_notif = Renderer::getMarkupTemplate($notification_templates[$notif['label']]); $tpl_notif = Renderer::getMarkupTemplate($notification_templates[$notif['label']]);

0
view/templates/notifications_attend_item.tpl → view/templates/notifications/attend_item.tpl
View file

0
view/templates/notifications_comments_item.tpl → view/templates/notifications/comments_item.tpl
View file

0
view/templates/notifications_dislikes_item.tpl → view/templates/notifications/dislikes_item.tpl
View file

0
view/templates/notifications_friends_item.tpl → view/templates/notifications/friends_item.tpl
View file

0
view/templates/intros.tpl → view/templates/notifications/intros.tpl
View file

0
view/templates/notifications_likes_item.tpl → view/templates/notifications/likes_item.tpl
View file

0
view/templates/netfriend.tpl → view/templates/notifications/netfriend.tpl
View file

0
view/templates/notifications_network_item.tpl → view/templates/notifications/network_item.tpl
View file

0
view/templates/notifications.tpl → view/templates/notifications/notifications.tpl
View file

0
view/templates/notify.tpl → view/templates/notifications/notify.tpl
View file

0
view/templates/notifications_posts_item.tpl → view/templates/notifications/posts_item.tpl
View file

0
view/templates/suggestions.tpl → view/templates/notifications/suggestions.tpl
View file

2
view/theme/frio/templates/notifications/attend_item.tpl Normal file
View file

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

2
view/theme/frio/templates/notifications/comments_item.tpl Normal file
View file

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

2
view/theme/frio/templates/notifications/dislikes_item.tpl Normal file
View file

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

2
view/theme/frio/templates/notifications/friends_item.tpl Normal file
View file

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

0
view/theme/frio/templates/intros.tpl → view/theme/frio/templates/notifications/intros.tpl
View file

2
view/theme/frio/templates/notifications/likes_item.tpl Normal file
View file

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

2
view/theme/frio/templates/notifications/network_item.tpl Normal file
View file

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

4
view/theme/frio/templates/notifications.tpl → view/theme/frio/templates/notifications/notifications.tpl
View file

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

0
view/theme/frio/templates/notify.tpl → view/theme/frio/templates/notifications/notify.tpl
View file

2
view/theme/frio/templates/notifications/posts_item.tpl Normal file
View file

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

2
view/theme/frio/templates/notifications/suggestions.tpl Normal file
View file

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

2
view/theme/frio/templates/notifications_attend_item.tpl
View file

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

2
view/theme/frio/templates/notifications_comments_item.tpl
View file

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

2
view/theme/frio/templates/notifications_dislikes_item.tpl
View file

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

2
view/theme/frio/templates/notifications_friends_item.tpl
View file

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

2
view/theme/frio/templates/notifications_likes_item.tpl
View file

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

2
view/theme/frio/templates/notifications_network_item.tpl
View file

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

2
view/theme/frio/templates/notifications_posts_item.tpl
View file

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

2
view/theme/frio/templates/suggestions.tpl
View file

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