workarea-admin 3.5.2 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f094f20692e9751c2f3508fd322ef71eb6a5852565ed2fdfd6c76962e95dbc19
-  data.tar.gz: 4a78f4b702f8613fdb4aa0c4826967c1f5dd985d9a4a8dd7f0bd0cb15b0fea1a
+  metadata.gz: b1558c260ab12c9d4240000e2a7df00313dd818985de7d71131d83abc449af35
+  data.tar.gz: 6adde7ce114066200bf246547febd3c86d8d0b1ecb5d1c565e656aad613c6126
 SHA512:
-  metadata.gz: be1df3f80583a12e8126cb06b8c0ddaff6928b39cd94ff09b293e5b7f4f2a4a3a4803447b13b07088d9d0850ae4652d69532a438c9f3dd8cca6b949f9b1dab7d
-  data.tar.gz: 8e12e61aa4c349212709b8a79c10cb047fac22b11217060d99f7e66f32a9be33405bfd96135830cd486daeedc453892ca46be1d193d66499b5aa2ba869a33551
+  metadata.gz: ec05e38635c7685c4041a73f22b41624b0e7e05027e9c611b1cbdfeae9187d5716b70b2c34f5d9f2ffd7413a2d4fefa0c48c592fd85223f3d02a224c53a52d54
+  data.tar.gz: e5aa47646c9600073fe5e531dbfef0a5517033167f2919f7046fa504007118fc1f2a278cbf5f21cfc07af0c40a574f4b6be3ddba016ec8c77ee1003c4d489f39

data/app/assets/stylesheets/workarea/admin/base/_forms.scss

@@ -4,8 +4,7 @@
 
 $forms-color:              $off-black !default;
 $forms-bg-color:           $white !default;
-$forms-disabled-color:     $gray !default;
-$forms-disabled-bg-color:  $light-gray !default;
+$forms-disabled-opacity:   0.5 !default;
 $forms-placeholder-color:  $dark-gray !default;
 
 
@@ -65,10 +64,9 @@ textarea {
 button,
 input, textarea,
 select, optgroup, option {
-    &[disabled], &[readonly] /* [1] */
+    &[disabled], &[readonly], /* [1] */
     fieldset[disabled] & { /* [2] */
-        color: $forms-disabled-color;
-        background-color: $forms-disabled-bg-color;
+        opacity: $forms-disabled-opacity;
         cursor: not-allowed;
     }
 }

data/app/assets/stylesheets/workarea/admin/components/_button.scss

@@ -5,7 +5,6 @@
 $button-color:            $white !default;
 $button-bg-color:         $blue !default;
 $button-hover-bg-color:   $bright-blue !default;
-$button-disabled-opacity: 0.5 !default;
 
 $button-font-size:        16px !default;
 $button-small-font-size:  14px !default;
@@ -42,11 +41,6 @@ $button-destroy-hover-bg-color:  $bright-red !default;
         background-color: $button-hover-bg-color;
     }
 
-    &[disabled] {
-        opacity: $button-disabled-opacity;
-        cursor: not-allowed;
-    }
-
     .card__button & {
         @include center;
     }

data/app/assets/stylesheets/workarea/admin/components/_workflow_bar.scss

@@ -6,7 +6,6 @@ $workflow-bar-bg-color:  $white !default;
 
 $workflow-bar-button-color:                 $blue !default;
 $workflow-bar-button-bg-color:              $white !default;
-$workflow-bar-button-disabled-opacity:       0.5 !default;
 $workflow-bar-button-border-color:           $shadow-color !default;
 
 $workflow-bar-button-create-color:           $white !default;
@@ -74,11 +73,6 @@ $workflow-bar-button-confirm-delete-hover-bg-color:  $bright-red !default;
         &:hover {
             text-decoration: none;
         }
-
-        &[disabled] {
-            opacity: $workflow-bar-button-disabled-opacity;
-            cursor: not-allowed;
-        }
     }
 
     .workflow-bar__button--left-divide {

data/app/helpers/workarea/admin/buttons_helper.rb

@@ -0,0 +1,14 @@
+module Workarea
+  module Admin
+    module ButtonsHelper
+      def button_tag(*args)
+        options = args.reverse.detect { |a| a.is_a?(Hash) }
+        options ||= args.append({}).last
+
+        options[:data] ||= {}
+        options[:data][:disable] = true unless options[:data].key?(:disable)
+        super(*args)
+      end
+    end
+  end
+end

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

@@ -168,8 +168,18 @@
               %p= t('workarea.admin.dashboards.index.no_activity_as_of', time: local_time(Time.current)).html_safe
             - else
               - @activity.days.each_with_index do |(day, entries), index|
-                - entries.take(15).each do |entry|
-                  = render_activity_entry(entry)
+                .activity-group
+                  .grid
+                    .grid__cell.grid__cell--20
+                      .date-marker
+                        - if day == Date.today
+                          .date-marker__annotation= t('workarea.admin.timeline.today')
+                        .date-marker__month= local_time(day, format: '%b')
+                        .date-marker__day= local_time(day, format: '%e')
+                    .grid__cell.grid__cell--80
+                      .activity-group__activities
+                        - entries.take(15).each do |entry|
+                          = render_activity_entry(entry)
 
         - unless @activity.entries.blank?
           .section

data/app/views/workarea/admin/style_guides/components/_button.html.haml

@@ -25,6 +25,10 @@
     = link_to '#' do
       %span.button Span Button
 
+  %p should support disabled state:
+  .style-guide__example-block
+    = button_tag 'Button', class: 'button', type: 'button', disabled: true
+
 
 #button--small.style-guide__subsection
 
@@ -43,6 +47,10 @@
   .style-guide__example-block
     = button_tag 'Button Element', class: 'button button--create'
 
+  %p should support disabled state:
+  .style-guide__example-block
+    = button_tag 'Button Element', class: 'button button--create', disabled: true
+
 
 #button--destroy.style-guide__subsection
 
@@ -51,3 +59,7 @@
   %p should change the color of a button:
   .style-guide__example-block
     = button_tag 'Button Element', class: 'button button--destroy'
+
+  %p should support disabled state:
+  .style-guide__example-block
+    = button_tag 'Button Element', class: 'button button--destroy', disabled: true

data/test/helpers/workarea/admin/buttons_helper_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class ButtonsHelperTest < ViewTest
+      def test_button_tag
+        result = button_tag('Content', { data: { foo: 'bar' } })
+        assert_match('Content', result)
+        assert_match('data-foo="bar"', result)
+        assert_match('data-disable="true"', result)
+
+        result = button_tag({ data: { foo: 'bar' } })
+        assert_match('data-foo="bar"', result)
+        assert_match('data-disable="true"', result)
+
+        result = button_tag({ data: { foo: 'bar', disable: false } })
+        assert_match('data-foo="bar"', result)
+        refute_match('data-disable="true"', result)
+
+        result = button_tag('Content')
+        assert_match('Content', result)
+        assert_match('data-disable="true"', result)
+
+        result = button_tag
+        assert_match('data-disable="true"', result)
+
+        result = button_tag({ data: { foo: 'bar' } }) { 'Content' }
+        assert_match('Content', result)
+        assert_match('data-foo="bar"', result)
+        assert_match('data-disable="true"', result)
+
+        result = button_tag { 'Content' }
+        assert_match('Content', result)
+        assert_match('data-disable="true"', result)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-01-07 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.2
+        version: 3.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.5.3
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.5.3
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -508,6 +508,7 @@ files:
 - app/helpers/workarea/admin/application_helper.rb
 - app/helpers/workarea/admin/bookmarks_helper.rb
 - app/helpers/workarea/admin/bulk_actions_helper.rb
+- app/helpers/workarea/admin/buttons_helper.rb
 - app/helpers/workarea/admin/changesets_helper.rb
 - app/helpers/workarea/admin/configurations_helper.rb
 - app/helpers/workarea/admin/content_block_icon_helper.rb
@@ -1286,6 +1287,7 @@ files:
 - test/dummy/script/rails
 - test/dummy/tmp/screenshots/.keep
 - test/helpers/workarea/admin/application_helper_test.rb
+- test/helpers/workarea/admin/buttons_helper_test.rb
 - test/helpers/workarea/admin/facets_helper_test.rb
 - test/helpers/workarea/admin/icons_helper_test.rb
 - test/helpers/workarea/admin/imports_helper_test.rb