From ae4c68a10bf9a9dcd7add4f760bdc43d767cb61e Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Sat, 25 Apr 2020 17:54:52 +0200 Subject: [PATCH] Use layout inheritance by convention --- app/views/layouts/{notification.haml => notifications.haml} | 3 ++- app/views/notifications/index.haml | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) rename app/views/layouts/{notification.haml => notifications.haml} (76%) diff --git a/app/views/layouts/notification.haml b/app/views/layouts/notifications.haml similarity index 76% rename from app/views/layouts/notification.haml rename to app/views/layouts/notifications.haml index 30ffd22d..5d015895 100644 --- a/app/views/layouts/notification.haml +++ b/app/views/layouts/notifications.haml @@ -7,4 +7,5 @@ = yield - Notification.for(current_user).update_all(new: false) -- provide(:title, generate_title("Notifications")) \ No newline at end of file +- provide(:title, generate_title("Notifications")) +- parent_layout "base" \ No newline at end of file diff --git a/app/views/notifications/index.haml b/app/views/notifications/index.haml index 249a825c..16947232 100644 --- a/app/views/notifications/index.haml +++ b/app/views/notifications/index.haml @@ -17,6 +17,4 @@ - if @more_data_available %button#load-more-btn.btn.btn-default{type: :button, data: { last_id: @notifications_last_id }} - Load more - -- parent_layout "notification" \ No newline at end of file + Load more \ No newline at end of file