workarea-admin 3.5.10 → 3.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e1c6efc45b20cb32df207cbcb07a914752f4196d61b792ef01198641c50ef2f
-  data.tar.gz: 60408041549bd4b362f89dea3b8f2bea0f41254fcb83a576a847b8c15092778a
+  metadata.gz: 8de6779953d29152d1a845ad3a339f15273bf641763118993e3b7440eaba74db
+  data.tar.gz: 135e70f5f6573034c69de103a380d2c60c39ecfd2cb13d6ce1f82366d73326be
 SHA512:
-  metadata.gz: 736af63a13d6eea04361dd06639c66f8fb9f9562472e8e3d5393bed6fe206e35c0f9eef55620bf43604958118fc50a6fcda73435969c50fd31c4a913bfda8132
-  data.tar.gz: 5a04cbdfcab0622d3cef5b110bd804e977a8dff4e484d7c452a0bf02f99a5e48fa89872c8cfcbe995b1bcbfbe3ea8eaef4df5e251757382c263b0be5e4a4c064
+  metadata.gz: 85915842911642059a94e46fd17aec587b96a6d4d0a164f89f9fbcd679f97484334bb1c9e89638e3881a93800059ef5fe17f8800b34bde3be817da7384e04a16
+  data.tar.gz: 06d255400491919a5a60c05bb28c66210e823732bdcf5ed49daf8c82953263370cccf7aae5dabde6c473134883c3250e958135ca29b714cf32e1cbf25cc7f45f

data/app/views/workarea/admin/comments/index.html.haml

@@ -41,17 +41,6 @@
             .comments__comment-body
               %p= comment.body
 
-      .section
-        - if @commentable.subscribed_user_ids.include?(current_user.id.to_s)
-          = form_tag unsubscribe_commentable_comments_path(@commentable.to_global_id), method: :put, id: 'comment_unsubscribe_form' do
-            = button_tag t('workarea.admin.comments.index.unsubscribe'), value: 'comments_unsubscribe', class: 'button button--small'
-            %span= t('workarea.admin.comments.index.subscribe_message')
-        - else
-          = form_tag subscribe_commentable_comments_path(@commentable.to_global_id), method: :put, id: 'comment_unsubscribe_form' do
-            = button_tag t('workarea.admin.comments.index.subscribe'), value: 'comments_subscribe', class: 'button button--small'
-            %span= t('workarea.admin.comments.index.unsubscribe_message')
-
-
       .section
         .comments__new-comment
           %h2= t('workarea.admin.comments.index.new')
@@ -66,5 +55,17 @@
               %span.property__note= t('workarea.admin.comments.index.mention_note')
 
             .workflow-bar
-              .grid.grid--auto.grid--right.grid--middle
-                .grid__cell= button_tag t('workarea.admin.comments.index.create'), value: 'create_comment', class: 'workflow-bar__button workflow-bar__button--create'
+              .grid.grid--middle
+                .grid__cell.grid__cell--80
+                  - if @commentable.subscribed_user_ids.include?(current_user.id.to_s)
+                    = link_to t('workarea.admin.comments.index.unsubscribe'), unsubscribe_commentable_comments_path(@commentable.to_global_id), data: { method: 'put', tooltip: { content_id: '#unsubscribe-info' } }, class: 'workflow-bar__button'
+                    #unsubscribe-info.tooltip-content
+                      %p= t('workarea.admin.comments.index.unsubscribe_message')
+
+                  - else
+                    = link_to t('workarea.admin.comments.index.subscribe'), subscribe_commentable_comments_path(@commentable.to_global_id), data: { method: 'put', tooltip: { content_id: '#subscribe-info' } }, class: 'workflow-bar__button'
+                    #subscribe-info.tooltip-content
+                      %p= t('workarea.admin.comments.index.subscribe_message')
+
+                .grid__cell.grid__cell--20
+                  .align-right= button_tag t('workarea.admin.comments.index.create'), value: 'create_comment', class: 'workflow-bar__button workflow-bar__button--create'

data/config/locales/en.yml

@@ -631,8 +631,8 @@ en:
           removed: Your comment has been removed
           saved: Your comment has been saved
           saved_error: There was a problem saving your comment
-          comment_subscribed: Your comments subscription has been added. You will be notified of any future comments.
-          comment_unsubscribed: You have been unsubscribed from future comments.
+          comment_subscribed: You have been subscribed to comment notifications.
+          comment_unsubscribed: You have been unsubscribed from comment notifications.
         index:
           body: Comment Body
           create: Create Comment
@@ -642,10 +642,10 @@ en:
           new: New Comment
           notify: Notify Admins
           subscribe: Subscribe
-          subscribe_message: to receive emails about future comments.
+          subscribe_message: You'll be emailed when a new comment is posted on this.
           title: Comments on %{name}
           unsubscribe: Unsubscribe
-          unsubscribe_message: to stop receiving emails about future comments.
+          unsubscribe_message: Click this to stop receiving email about future comments.
         icon:
           viewed: Comments
           unviewed: Unread Comments

data/test/system/workarea/admin/comments_system_test.rb

@@ -53,10 +53,10 @@ module Workarea
         visit admin.user_path(user)
 
         click_link 'Comments'
-        click_button t('workarea.admin.comments.index.subscribe')
+        click_link t('workarea.admin.comments.index.subscribe')
         assert(page.has_content?('Success'))
 
-        click_button t('workarea.admin.comments.index.unsubscribe')
+        click_link t('workarea.admin.comments.index.unsubscribe')
         assert(page.has_content?('Success'))
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.10
+  version: 3.5.11
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.10
+        version: 3.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.10
+        version: 3.5.11
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.10
+        version: 3.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.10
+        version: 3.5.11
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email: