From 606708987fb509c01fac761a62009498364149c9 Mon Sep 17 00:00:00 2001
From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
Date: Fri, 22 Feb 2019 13:20:51 +0100
Subject: [PATCH] Notification changes on settings page [SCI 3084] (#1517)

* Fix css and update text settings
---
 app/assets/stylesheets/system_notifications.scss   | 13 +++++++++++--
 app/assets/stylesheets/themes/main_navigation.scss |  3 ++-
 app/views/system_notifications/index.html.erb      | 14 +++++++-------
 .../settings/account/preferences/index.html.erb    |  2 +-
 config/locales/en.yml                              |  4 ++--
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/system_notifications.scss b/app/assets/stylesheets/system_notifications.scss
index 8cf7f8a12..57cbe24be 100644
--- a/app/assets/stylesheets/system_notifications.scss
+++ b/app/assets/stylesheets/system_notifications.scss
@@ -25,6 +25,7 @@
 
   &:hover {
     background: $color-concrete;
+    color: $color-emperor;
     opacity: .7;
   }
 
@@ -101,8 +102,13 @@
     }
   }
 
-  .no-notification-meessage {
-    padding: 20px 0;
+  .system-notifications-container {
+    display: inline-block;
+    width: 100%;
+  }
+
+  .no-notification-message {
+    margin: 20px 0;
   }
 
   .title-container {
@@ -124,10 +130,13 @@
     margin-top: 10px;
   }
 }
+
 #manage-module-system-notification-modal {
+
   .modal-title {
     margin-left: 20px;
   }
+
   .modal-body {
     margin: 20px;
   }
diff --git a/app/assets/stylesheets/themes/main_navigation.scss b/app/assets/stylesheets/themes/main_navigation.scss
index ce1c7e2f6..1cf0b5944 100644
--- a/app/assets/stylesheets/themes/main_navigation.scss
+++ b/app/assets/stylesheets/themes/main_navigation.scss
@@ -395,7 +395,8 @@
   word-wrap: break-word;
 
   .system-notifications-no-recent {
-    padding: 0 0 10px 10px;
+    padding: 10px;
+    text-align: center;
   }
 
   .system-notifications-dropdown-header {
diff --git a/app/views/system_notifications/index.html.erb b/app/views/system_notifications/index.html.erb
index 058ae92bc..a7e3f8ab1 100644
--- a/app/views/system_notifications/index.html.erb
+++ b/app/views/system_notifications/index.html.erb
@@ -20,16 +20,16 @@
   <div class="system-notifications-container">
     <%= render partial: "list", locals: { notifications: @system_notifications[:notifications] } %>
   </div>
-    <div class="text-center">
-    <% if @system_notifications[:more_notifications_url] && @system_notifications[:notifications].present? %>
-        <a class="btn btn-default btn-more-notifications"
+  <div class="text-center">
+  <% if @system_notifications[:more_notifications_url] && @system_notifications[:notifications].present? %>
+      <a class="btn btn-default btn-more-notifications"
           href="<%= @system_notifications[:more_notifications_url] %>"
           data-remote="true">
           <%= t("system_notifications.index.more_notifications") %></a>
-    <% else %>
-        <span class="no_notification_meessage"><%= t("system_notifications.index.no_notifications") %></span>
-    <% end %>
-    </div>
+  <% else %>
+      <span class="no-notification-message"><%= t("system_notifications.index.no_notifications") %></span>
+  <% end %>
+  </div>
 </div>
 
 <%= javascript_include_tag("system_notifications/index") %>
diff --git a/app/views/users/settings/account/preferences/index.html.erb b/app/views/users/settings/account/preferences/index.html.erb
index d80e29fc9..7b010a7f5 100644
--- a/app/views/users/settings/account/preferences/index.html.erb
+++ b/app/views/users/settings/account/preferences/index.html.erb
@@ -152,7 +152,7 @@
             </div>
             <div class="row">
               <div class="col-sm-2">
-                <span class="system-message hidden-sm"><i class="fas fa-chess-rook" aria-hidden="true"></i></span>
+                <span class="system-message hidden-sm"><i class="fas fa-gift" aria-hidden="true"></i></span>
               </div>
               <div class="col-sm-10">
                 <strong><%=t 'notifications.form.system_message' %></strong>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 819d90d43..c100fbeb6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1872,8 +1872,8 @@ en:
       assignments_description: 'Assignment notifications appear whenever you get assigned to a team, project, task.'
       recent_notification: 'Recent changes'
       recent_notification_description: 'Recent changes notifications appear whenever there is a change on a task you are assigned to.'
-      system_message: 'System message'
-      system_message_description: 'System message notifications are specifically sent by site maintainers to notify all users about a system update.'
+      system_message: "What's New in SciNote"
+      system_message_description: 'You will be notified about new SciNote features, releases and improvements you can benefit from.'
     deliver:
       download_link: "Download link:"
       download_text: "Click the link to download the file."