Merge pull request gitcoinco#2132 from arun1595/moderator-admin-actions

Isolate moderator and admin actions for ease of usability
thelostone-mc · Aug 31, 2018 · 2ac66ca · 2ac66ca
2 parents 2836aff + dc4a527
commit 2ac66ca
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css
@@ -344,6 +344,12 @@ a.btn {
   margin-bottom: 10px;
 }
 
+.sticky {
+  position: fixed;
+  top: 0;
+  z-index: 1010;
+}
+
 #btn-white {
   background-color: #FFFFFF;
   border: 1px solid #979797;
@@ -522,6 +528,18 @@ a.btn {
   padding-left: 5px;
 }
 
+#moderator-admin-actions:not(:empty) {
+  background: #F2F6F9;
+  padding: 16px 0 10px;
+  text-align: center;
+  left: 0;
+}
+
+#moderator-admin-actions:not(:empty) a {
+  border: none !important;
+  margin: 0 3px 5px;
+}
+
 @media (max-width: 767px) {
 
   #title {

diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js
@@ -960,7 +960,7 @@ var do_actions = function(result) {
       enabled: true,
       href: url,
       text: gettext('Suspend Auto Approval'),
-      parent: 'right_actions',
+      parent: 'moderator-admin-actions',
       title: gettext('Suspend *Auto Approval* of Bounty Hunters Who Have Applied for This Bounty'),
       color: 'white',
       buttonclass: 'admin-only'
@@ -977,7 +977,7 @@ var do_actions = function(result) {
       enabled: true,
       href: url,
       text: gettext('Hide Bounty'),
-      parent: 'right_actions',
+      parent: 'moderator-admin-actions',
       title: gettext('Hides Bounty from Active Bounties'),
       color: 'white',
       buttonclass: 'admin-only'
@@ -994,7 +994,7 @@ var do_actions = function(result) {
       enabled: true,
       href: url,
       text: gettext('Toggle Remarket Ready'),
-      parent: 'right_actions',
+      parent: 'moderator-admin-actions',
       title: gettext('Sets Remarket Ready if not already remarket ready.  Unsets it if already remarket ready.'),
       color: 'white',
       buttonclass: 'admin-only'
@@ -1011,7 +1011,7 @@ var do_actions = function(result) {
       enabled: true,
       href: url,
       text: gettext('Mark as Reviewed'),
-      parent: 'right_actions',
+      parent: 'moderator-admin-actions',
       title: gettext('Marks the bounty activity as reviewed.'),
       color: 'white',
       buttonclass: 'admin-only'
@@ -1027,7 +1027,7 @@ var do_actions = function(result) {
       enabled: true,
       href: url,
       text: gettext('Contact Funder'),
-      parent: 'right_actions',
+      parent: 'moderator-admin-actions',
       title: gettext('Contact Funder via Email'),
       color: 'white',
       buttonclass: 'admin-only contact_bounty_hunter'
@@ -1043,7 +1043,7 @@ var do_actions = function(result) {
       enabled: true,
       href: url,
       text: gettext('Snooze Gitcoinbot'),
-      parent: 'right_actions',
+      parent: 'moderator-admin-actions',
       title: gettext('Snooze Gitcoinbot reminders'),
       color: 'white',
       buttonclass: 'admin-only snooze_gitcoin_bot'
@@ -1059,7 +1059,7 @@ var do_actions = function(result) {
       enabled: true,
       href: url,
       text: gettext('Override Status'),
-      parent: 'right_actions',
+      parent: 'moderator-admin-actions',
       title: gettext('Override Status with a status of your choosing'),
       color: 'white',
       buttonclass: 'admin-only admin_override_satatus'
@@ -1075,7 +1075,7 @@ var do_actions = function(result) {
       enabled: true,
       href: url,
       text: gettext('View in Admin'),
-      parent: 'right_actions',
+      parent: 'moderator-admin-actions',
       title: gettext('View in Admin'),
       color: 'white',
       buttonclass: 'admin-only'
@@ -1291,6 +1291,17 @@ const is_bounty_expired = function(bounty) {
 };
 
 var main = function() {
+  const moderatorAndAdminActions = $('#moderator-admin-actions');
+  const scrollHeight = 150;
+
+  $(window).scroll(RAFThrottle(() => {
+    if (window.scrollY > scrollHeight) {
+      moderatorAndAdminActions.addClass('sticky');
+    } else {
+      moderatorAndAdminActions.removeClass('sticky');
+    }
+  }));
+
   setTimeout(function() {
     // setup
     attach_work_actions();

diff --git a/app/dashboard/templates/bounty/details.html b/app/dashboard/templates/bounty/details.html
@@ -43,6 +43,7 @@ <h6>{% trans "Be the OSS Funding you wish to see in the world." %}</h6>
           </div>
         </div>
 
+        <div class="col-12" id="moderator-admin-actions"></div>
         <div class="col-12" id="bounty_details">
           <div class="row font-body">
             <div class="d-none d-lg-block col-lg-1">