From 000a30d8d70f724e67792abf3713accd71b62dae Mon Sep 17 00:00:00 2001 From: Suzanne Aitchison Date: Thu, 25 Mar 2021 08:37:53 +0000 Subject: [PATCH] add main content to notifications page (#13111) --- app/views/notifications/index.html.erb | 44 ++++++++++++++------------ 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb index c186edf8d..5cd7f9fb9 100644 --- a/app/views/notifications/index.html.erb +++ b/app/views/notifications/index.html.erb @@ -40,30 +40,32 @@ <% if user_signed_in? %> -
-

Notifications

- Settings -
+
+
+

Notifications

+ Settings +
-
-
- <%= render "notifications/nav_menu" %> -
-
-
- <%= render "notifications_list", params: params %> +
+
+ <%= render "notifications/nav_menu" %>
+
+
+ <%= render "notifications_list", params: params %> +
- <%# new or less active users that don't have a page worth of notifications - won't be shown the "load more" button %> - <% if @notifications.size >= @initial_page_size %> - - <% end %> -
-
- <%= render "articles/fitvids" %> + <%# new or less active users that don't have a page worth of notifications + won't be shown the "load more" button %> + <% if @notifications.size >= @initial_page_size %> + + <% end %> +
+
+ <%= render "articles/fitvids" %> +
<% else %> <%= render "devise/registrations/registration_form" %> <% end %>