Fix global activities page after refactoring [SCI-2994][SCI-3024]

app/assets/stylesheets/global_activities.scss

@@ -12,6 +12,41 @@
       grid-area: activities;
       min-height: 600px;
     }
+
+    .activities-counter-label {
+      margin-left: 10px;
+    }
+
+    .activities-group {
+      list-style: none;
+      padding-left: 0;
+    }
+
+    .activities-group-expand-button {
+      color: $color-emperor;
+    }
+
+    .activity-card {
+      border-radius: 5px;
+      margin-right: 10px;
+      padding: 5px;
+
+      &:hover {
+        background-color: $brand-primary-light;
+      }
+
+      .atwho-user-popover {
+        padding-left: 0;
+      }
+
+      .activity-timestamp {
+        color: $color-silver-chalice;
+      }
+
+      .navigational-breadcrumbs {
+        color: $color-silver-chalice;
+      }
+    }
   }
 }
 
@@ -107,6 +142,11 @@
     position: relative;
     width: 200px;
 
+    a {
+      color: $color-emperor;
+      margin: 0 5px;
+    }
+
     span {
       display: inline-block;
       text-align: center;

app/assets/stylesheets/themes/global_activities.scss

@@ -1,91 +0,0 @@
-@import 'constants';
-
-.global-activities__container {
-  background: white;
-  padding: 1em;
-  margin-top: 2em;
-  grid-template-columns: 3fr 1fr;
-  display: grid;
-  grid-template-areas:
-      "top top"
-      "main side";
-}
-
-.global-activities__top{
-  grid-area: top;
-  grid-template-columns: 1fr 3fr;
-}
-
-.global-activities__main{
-  display: grid;
-  grid-template-areas:
-    "actions search"
-    "activities activities";
-  grid-area: main;
-}
-
-.global-activities__side{
-  grid-area: side;
-}
-
-.global-activities_activities-list{
-  border-top: 1px solid $gray-lighter;
-  margin-top: 2em;
-  grid-area: activities;
-  overflow-y: scroll;
-  min-height: 600px;
-
-  .activities-counter-label {
-    margin-left: 10px;
-  }
-
-  .activities-group {
-    list-style: none;
-    padding-left: 0;
-  }
-
-  .activities-group-expand-button {
-    color: $color-emperor;
-  }
-
-  .activity-card {
-    border-radius: 5px;
-    margin-right: 10px;
-    padding: 5px;
-
-    &:hover {
-      background-color: $brand-primary-light;
-    }
-
-    .atwho-user-popover {
-      padding-left: 0;
-    }
-
-    .activity-timestamp {
-      color: $color-silver-chalice;
-    }
-
-    .navigational-breadcrumbs {
-      color: $color-silver-chalice;
-    }
-  }
-}
-
-.global-activities__top-actions {
-  grid-area: actions;
-
-  a {
-    color: $color-emperor;
-  }
-}
-
-.global-activities__search-container{
-  grid-area: search;
-}
-
-.global-activiteis__title{
-  grid-area: title;
-  font-size: $font-size-h4;
-  color: $gray-darker;
-  border-bottom: 1px solid $gray-lighter;
-}

app/views/global_activities/_top_pane.html.erb

@@ -1,7 +1,15 @@
-<h3 class="ga-title">Global activities</h3>
+<h3 class="ga-title">
+  <%= t('activities.index.global_activities_title') %>
+</h3>
 <div class="ga-top-actions">
-  <span><i class="fas fa-caret-square-down"></i> Expand All</span>
-  <span><i class="fas fa-caret-square-up"></i> Colapse All</span>
+  <a id="global-activities-expand-all" href="#" data-turbolinks="false">
+    <i class="fas fa-caret-square-down"></i>
+    <%= t('activities.index.expand_all') %>
+  </a>
+  <a id="global-activities-colapse-all" href="#" data-turbolinks="false">
+    <i class="fas fa-caret-square-up"></i>
+    <%= t('activities.index.collapse_all') %>
+  </a>
 </div>
 <div class="ga-search-container">
   <div class="input-group">
@@ -19,4 +27,4 @@
       <%= t('global_activities.index.clear_filters') %>
     </span>
   </div>
-</div>
+</div>

app/views/global_activities/index.html.erb

@@ -1,3 +1,4 @@
+<% provide :head_title, t('nav.label.activities') %>
 
 <div class="global-activities-container container-flex">
   <div class="row">

config/locales/en.yml

@@ -1303,6 +1303,7 @@ en:
       see_all: "show all"
   activities:
     index:
+      global_activities_title: "Global activities"
       today: "Today"
       more_activities: "Show more activities"
       no_activities: "No activities!"