workarea-admin 3.5.10 → 3.5.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/workarea/admin/comments/index.html.haml +14 -13
  3. data/config/locales/en.yml +4 -4
  4. data/test/system/workarea/admin/comments_system_test.rb +2 -2
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1e1c6efc45b20cb32df207cbcb07a914752f4196d61b792ef01198641c50ef2f
4
- data.tar.gz: 60408041549bd4b362f89dea3b8f2bea0f41254fcb83a576a847b8c15092778a
3
+ metadata.gz: 8de6779953d29152d1a845ad3a339f15273bf641763118993e3b7440eaba74db
4
+ data.tar.gz: 135e70f5f6573034c69de103a380d2c60c39ecfd2cb13d6ce1f82366d73326be
5
5
  SHA512:
6
- metadata.gz: 736af63a13d6eea04361dd06639c66f8fb9f9562472e8e3d5393bed6fe206e35c0f9eef55620bf43604958118fc50a6fcda73435969c50fd31c4a913bfda8132
7
- data.tar.gz: 5a04cbdfcab0622d3cef5b110bd804e977a8dff4e484d7c452a0bf02f99a5e48fa89872c8cfcbe995b1bcbfbe3ea8eaef4df5e251757382c263b0be5e4a4c064
6
+ metadata.gz: 85915842911642059a94e46fd17aec587b96a6d4d0a164f89f9fbcd679f97484334bb1c9e89638e3881a93800059ef5fe17f8800b34bde3be817da7384e04a16
7
+ data.tar.gz: 06d255400491919a5a60c05bb28c66210e823732bdcf5ed49daf8c82953263370cccf7aae5dabde6c473134883c3250e958135ca29b714cf32e1cbf25cc7f45f
data/app/views/workarea/admin/comments/index.html.haml CHANGED
@@ -41,17 +41,6 @@
41
41
  .comments__comment-body
42
42
  %p= comment.body
43
43
 
44
- .section
45
- - if @commentable.subscribed_user_ids.include?(current_user.id.to_s)
46
- = form_tag unsubscribe_commentable_comments_path(@commentable.to_global_id), method: :put, id: 'comment_unsubscribe_form' do
47
- = button_tag t('workarea.admin.comments.index.unsubscribe'), value: 'comments_unsubscribe', class: 'button button--small'
48
- %span= t('workarea.admin.comments.index.subscribe_message')
49
- - else
50
- = form_tag subscribe_commentable_comments_path(@commentable.to_global_id), method: :put, id: 'comment_unsubscribe_form' do
51
- = button_tag t('workarea.admin.comments.index.subscribe'), value: 'comments_subscribe', class: 'button button--small'
52
- %span= t('workarea.admin.comments.index.unsubscribe_message')
53
-
54
-
55
44
  .section
56
45
  .comments__new-comment
57
46
  %h2= t('workarea.admin.comments.index.new')
@@ -66,5 +55,17 @@
66
55
  %span.property__note= t('workarea.admin.comments.index.mention_note')
67
56
 
68
57
  .workflow-bar
69
- .grid.grid--auto.grid--right.grid--middle
70
- .grid__cell= button_tag t('workarea.admin.comments.index.create'), value: 'create_comment', class: 'workflow-bar__button workflow-bar__button--create'
58
+ .grid.grid--middle
59
+ .grid__cell.grid__cell--80
60
+ - if @commentable.subscribed_user_ids.include?(current_user.id.to_s)
61
+ = 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'
62
+ #unsubscribe-info.tooltip-content
63
+ %p= t('workarea.admin.comments.index.unsubscribe_message')
64
+
65
+ - else
66
+ = 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'
67
+ #subscribe-info.tooltip-content
68
+ %p= t('workarea.admin.comments.index.subscribe_message')
69
+
70
+ .grid__cell.grid__cell--20
71
+ .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 CHANGED
@@ -631,8 +631,8 @@ en:
631
631
  removed: Your comment has been removed
632
632
  saved: Your comment has been saved
633
633
  saved_error: There was a problem saving your comment
634
- comment_subscribed: Your comments subscription has been added. You will be notified of any future comments.
635
- comment_unsubscribed: You have been unsubscribed from future comments.
634
+ comment_subscribed: You have been subscribed to comment notifications.
635
+ comment_unsubscribed: You have been unsubscribed from comment notifications.
636
636
  index:
637
637
  body: Comment Body
638
638
  create: Create Comment
@@ -642,10 +642,10 @@ en:
642
642
  new: New Comment
643
643
  notify: Notify Admins
644
644
  subscribe: Subscribe
645
- subscribe_message: to receive emails about future comments.
645
+ subscribe_message: You'll be emailed when a new comment is posted on this.
646
646
  title: Comments on %{name}
647
647
  unsubscribe: Unsubscribe
648
- unsubscribe_message: to stop receiving emails about future comments.
648
+ unsubscribe_message: Click this to stop receiving email about future comments.
649
649
  icon:
650
650
  viewed: Comments
651
651
  unviewed: Unread Comments
data/test/system/workarea/admin/comments_system_test.rb CHANGED
@@ -53,10 +53,10 @@ module Workarea
53
53
  visit admin.user_path(user)
54
54
 
55
55
  click_link 'Comments'
56
- click_button t('workarea.admin.comments.index.subscribe')
56
+ click_link t('workarea.admin.comments.index.subscribe')
57
57
  assert(page.has_content?('Success'))
58
58
 
59
- click_button t('workarea.admin.comments.index.unsubscribe')
59
+ click_link t('workarea.admin.comments.index.unsubscribe')
60
60
  assert(page.has_content?('Success'))
61
61
  end
62
62
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: workarea-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.10
4
+ version: 3.5.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Crouse
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-28 00:00:00.000000000 Z
11
+ date: 2020-05-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: workarea-core
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.5.10
19
+ version: 3.5.11
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.5.10
26
+ version: 3.5.11
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: workarea-storefront
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.5.10
33
+ version: 3.5.11
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.5.10
40
+ version: 3.5.11
41
41
  description: Provides site administration functionality for the Workarea Commerce
42
42
  Platform.
43
43
  email: