integral 1.4.0 → 1.5.0

data/app/policies/integral/base_policy.rb

@@ -25,27 +25,22 @@ module Integral
       !permitted_attribute?(attribute)
     end
 
-    # @return [Array] attributes the user is authorization to edit
+    # @return [Array] attributes the user is authorized to edit
     def permitted_attributes
       raise NotImplementedError
     end
 
+    %i[destroy block unblock index list show new create edit update duplicate grid receives_notifications].each do |method|
+      define_method "#{method}?" do
+        manager?
+      end
+    end
+
     private
 
     # @return [Symbol] role name
     def role_name
       raise NotImplementedError
     end
-
-    alias destroy? manager?
-    alias index? manager?
-    alias list? manager?
-    alias show? manager?
-    alias new? manager?
-    alias create? manager?
-    alias edit? manager?
-    alias update? manager?
-    alias duplicate? manager?
-    alias grid? manager?
   end
 end

data/app/policies/integral/page_policy.rb

@@ -25,6 +25,7 @@ module Integral
     end
 
     alias edit? update?
+    alias list? index?
 
     def destroy?
       user.admin? || user.role?([:page_manager])

data/app/policies/integral/version_policy.rb

@@ -1,18 +1,10 @@
 module Integral
   # Handles Activity authorization
   class VersionPolicy < BasePolicy
-    # For some reason authorize_with_klass seems to be delegating manager? calls to BasePolicy rather than using the override
-    # app/controllers/integral/backend/activities_controller.rb:37:in `authorize_with_klass'
-    # @return [Boolean] whether or not user has manager access
-    def index?
-      manager?
-    end
-
     def manager?
       user.admin?
     end
 
-    alias grid? manager?
     alias activity? manager?
     alias activities? manager?
   end

data/app/views/devise/invitations/edit.haml

@@ -4,7 +4,7 @@
   .input-group
     %span.input-group-label
       = icon('key')
-    = f.input :password, input_html: { class: 'input-group-field' }, label: false
+    = f.input :password, input_html: { 'data-character-counter' => 'false', class: 'input-group-field' }, label: false
   .input-group
     %span.input-group-label
       = icon('key')
@@ -12,6 +12,3 @@
 
   .form-actions
     = f.button :button, t("devise.invitations.edit.submit_button"), class: 'button expanded'
-
-= render "devise/shared/links"
-

data/app/views/devise/mailer/invitation_instructions.inky-haml

@@ -0,0 +1,20 @@
+:ruby
+  name = @resource.invited_by.present? ? @resource.invited_by.name : 'Someone'
+
+%p
+  = t("devise.mailer.invitation_instructions.hello", email: @resource.name)
+  \!
+
+%p= t("devise.mailer.invitation_instructions.someone_invited_you", url: integral.backend_dashboard_url, name: name)
+
+%row
+  %columns{ small: 12 }
+    %spacer{ size: 10 }
+    %center
+      %button{ href: accept_invitation_url(@resource, :invitation_token => @token), class: 'large' }= t("devise.mailer.invitation_instructions.accept")
+    %spacer{ size: 10 }
+
+- if @resource.invitation_due_at
+  %p= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format'))
+
+%p= t("devise.mailer.invitation_instructions.ignore").html_safe

data/app/views/integral/backend/activities/grid/_dropdown_actions.haml

@@ -0,0 +1 @@
+= link_to t('integral.actions.open_in_new_tab'), backend_resource_url(resource), target: :blank, icon: 'external-link', wrapper: :li

data/app/views/integral/backend/activities/grid/_row_content.haml

@@ -0,0 +1,13 @@
+%td= l(resource.created_at)
+%td
+  - if resource.whodunnit.present?
+    = link_to backend_user_url(resource.whodunnit.id) do
+      %span.label.clear
+        = image_tag resource.whodunnit.avatar.url(:thumbnail), class: :avatar
+        = resource.whodunnit.name
+%td
+  %span.label= resource.event
+%td= resource.item_type.constantize.model_name.human
+%td
+  = link_to resource.item_url do
+    = resource.item_title

data/app/views/integral/backend/activities/index.haml

@@ -1,15 +1,9 @@
 .card.listing
-  .card-section
-    = simple_form_for :grid, url: grid_backend_activities_url, method: :post, remote: true, html: { id: :grid_form } do |f|
-      = f.hidden_field(:descending, value: @grid.descending, class: 'desc-field')
-      = f.hidden_field(:order, value: @grid.order, class: 'order-field')
-      = f.hidden_field(:page, value: grid_options[:page], class: 'page-field')
+  .top-bar
+    .top-bar-right
+      = render_resource_grid_form do |f|
+        %li= f.input :user, collection: Integral::User.all.map {|u| [u.name, u.id]}, label: t('integral.records.attributes.user'), wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
+        %li= f.input :action, collection: Integral::Version.available_actions, label: 'Action', wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
+        %li= f.input :object, collection: Integral::Version.available_objects, label: 'Object', wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
 
-      .top-bar
-        .top-bar-right
-          %ul.align-right.menu.filters
-            %li= f.input :user, collection: Integral::User.all.map {|u| [u.name, u.id]}, label: t('integral.records.attributes.user'), wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
-            %li= f.input :action, collection: Integral::Version.available_actions, label: 'Action', wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
-            %li= f.input :object, collection: Integral::Version.available_objects, label: 'Object', wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
-
-    = render_data_grid
+  = render_resource_grid

data/app/views/integral/backend/activities/shared/_grid.haml

@@ -1,21 +1,36 @@
+- options = { columns: [:date, :user, :action, :actions], order: true }
+
 = render_data_grid do
-  = render layout: 'integral/backend/shared/grid', locals: { grid: grid, options: { columns: [:date, :user, :action, :actions], order: true }} do |grid|
-    - if grid.assets.any?
-      - grid.assets.decorate.each do |activity|
-        %tr
-          %td= l(activity.created_at)
-          %td
-            - if activity.whodunnit.present?
-              = link_to backend_user_url(activity.whodunnit.id) do
-                %span.label.clear
-                  = image_tag activity.whodunnit.avatar.url(:thumbnail), class: :avatar
-                  = activity.whodunnit.name
-          %td
-            %span.label= activity.event
-          -# Currently not possible to show this as changeset isn't available in the query resultset for performance reasons - One possible solution would be to create a Grid class for each Version - rather than unioning all the tables it only includes it's own
-          -# %td= activity.attributes_changed
-          %td.actions
-            = link_to activity.url do
-              = icon('eye')
-    - else
-      = render partial: 'integral/backend/shared/empty_grid'
+  %table.integral-grid.wice-grid.table-striped
+    %thead
+      %tr
+        - grid.html_columns(*options[:columns]).uniq { |col| col.name }.sort_by{ |item| options[:columns].index item.name }.each do |column|
+          %th{ class: datagrid_column_classes(grid, column) }
+            - if column.supports_order? && options[:order]
+              %button{ data: { sort: column.name, desc: (!grid.descending).to_s }}
+                = column.header
+            - else
+              = column.header
+    %tbody
+      - if grid.assets.any?
+        - grid.assets.decorate.each do |activity|
+          %tr
+            %td= l(activity.created_at)
+            %td
+              - if activity.whodunnit.present?
+                = link_to backend_user_url(activity.whodunnit.id) do
+                  %span.label.clear
+                    = image_tag activity.whodunnit.avatar.url(:thumbnail), class: :avatar
+                    = activity.whodunnit.name
+            %td
+              %span.label= activity.event
+            -# Currently not possible to show this as changeset isn't available in the query resultset for performance reasons - One possible solution would be to create a Grid class for each Version - rather than unioning all the tables it only includes it's own
+            -# %td= activity.attributes_changed
+            %td.actions
+              = link_to activity.url do
+                = icon('eye')
+      - else
+        = render partial: 'integral/backend/shared/grid/empty'
+
+  = render partial: 'integral/backend/shared/grid/pagination', locals: { records: grid.assets }
+  = icon('spinner', class: 'fa-pulse fa-3x fa-fw load-indicator')

data/app/views/integral/backend/activities/shared/index.haml

@@ -1,15 +1,15 @@
-- content_for :title, t('.title', title: @resource.title)
+- content_for :title, t('.title', title: decorated_resource.title)
 .card.listing
-  .card-section
-    = simple_form_for :grid, url: form_url, method: :get, remote: true, html: { id: :grid_form, 'data-type' => :json } do |f|
-      = f.hidden_field(:descending, value: @grid.descending, class: 'desc-field')
-      = f.hidden_field(:order, value: @grid.order, class: 'order-field')
-      = f.hidden_field(:page, value: grid_options[:page], class: 'page-field')
+  = simple_form_for :grid, url: form_url, method: :get, remote: true, html: { id: :grid_form, 'data-type' => :json } do |f|
+    = f.hidden_field(:descending, value: @grid.descending, class: 'desc-field')
+    = f.hidden_field(:order, value: @grid.order, class: 'order-field')
+    = f.hidden_field(:page, value: grid_options[:page], class: 'page-field')
 
-      .top-bar
-        .top-bar-right
-          %ul.align-right.menu.filters
-            %li= f.input :user, collection: Integral::User.all.map {|u| [u.name, u.id]}, label: t('integral.records.attributes.user'), wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
-            %li= f.input :action, collection: Integral::Version.available_actions, label: 'Action', wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
+    .top-bar
+      .top-bar-right
+        %ul.align-right.menu.filters
+          %li= f.input :user, collection: Integral::User.all.map {|u| [u.name, u.id]}, label: t('integral.records.attributes.user'), wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
+          %li= f.input :action, collection: Integral::Version.available_actions, label: 'Action', wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
+
+  = render partial: 'integral/backend/activities/shared/grid', locals: { grid: @grid }
 
-    = render partial: 'integral/backend/activities/shared/grid', locals: { grid: @grid }

data/app/views/integral/backend/activities/shared/show.haml

@@ -1,7 +1,7 @@
 - content_for :title, t('integral.navigation.activity_log')
-.grid-x.grid-padding-x
-  .cell.small-12.medium-9
-    .card.object
+.grid-x
+  .cell.medium-9
+    .card-unpadded.object
       .card-section
         %h2 Activity Data
         -# - if record.to_card[:image].present?
@@ -26,15 +26,15 @@
                 = image_tag @activity.whodunnit.avatar.url(:thumbnail), class: :avatar
                 = @activity.whodunnit.name
 
-  .cell.small-12.medium-3
-    %ul.menu.vertical
+  .cell.medium-3
+    %ul.no-bullet
       %li
-        = link_to @activity.item_url, class: 'button white' do
+        = link_to @activity.item_url, class: 'button white expanded' do
           = icon('eye')
           = t('integral.actions.view_record')
       - if @activity.whodunnit.present?
         %li
-          = link_to backend_user_url(@activity.whodunnit.id), class: 'button white' do
+          = link_to backend_user_url(@activity.whodunnit.id), class: 'button white expanded' do
             = icon('eye')
             = t('integral.actions.view_user')
       -# %li

data/app/views/integral/backend/activities/show.haml

@@ -1,4 +1,4 @@
-= content_for :title, "Activity #{activity.id}"
+= content_for :title, "Activity #{@resource.id}"
 
 .card-panel
   %table.table-striped.table-bordered.table.wice-grid

data/app/views/integral/backend/categories/_modal.haml

@@ -13,11 +13,10 @@
       = f.input :title, wrapper_html: { class: 'alternative' }, input_html: { id: slug_id }
       = f.input :slug, wrapper_html: { class: 'alternative' }, input_html: { data: { slugify: "##{slug_id}" } }
       = f.input :description, as: :text, wrapper_html: { class: 'alternative' }
-      %hr
-      %h2= t('integral.records.attributes.featured_image')
+      %hr.dark
       .grid-x
         .cell.medium-6
-          = render partial: 'integral/backend/shared/image_preview', locals: { f:f, image_attr: :image }
+          = render partial: 'integral/backend/shared/image_preview', locals: { f:f }
 
     .modal-footer
       = f.button :button, class: 'button'

data/app/views/integral/backend/images/_form.haml

@@ -3,39 +3,27 @@
 
 = simple_form_for @resource, validate: true, multipart: true, authenticity_token: true, url: form_path do |f|
   = f.input :lock_version, as: :hidden
-  .grid-x.grid-padding-x
+  .grid-x
     .cell.medium-8
       .grid-y
-        .cell
-          .card
-            .card-section
-              = f.input :title
-        .cell
-          .card
-            .card-section
-              = f.input :description
+        = f.input :title
+        = f.input :description
     .cell.medium-4
       .grid-y
         .cell
           .card
-            .card-section
-              - if @resource.persisted?
-                = image_tag @resource.url
-              - if !@resource.persisted? || Integral.editable_persisted_images
-                = f.input :file, :wrapper_html => { :class => "file-field" }, validate: { presence: true }, input_html: { accept: "image/*" }
-              - else
-                = f.input :file, as: :string, label: false, disabled: true
+            - if @resource.persisted?
+              = image_tag @resource.url
+            - if !@resource.persisted? || Integral.editable_persisted_images
+              = f.input :file, :wrapper_html => { :class => "file-field" }, validate: { presence: true }, input_html: { accept: "image/*" }
+            - else
+              = f.input :file, as: :string, label: false, disabled: true
         - if @resource.persisted?
           .cell
-            .grid-x.grid-padding-x
+            .grid-x
               .cell.medium-6
-                .card
-                  .card-section
-                    = f.input :dimensions, readonly: true, input_html: { value: @resource.dimensions }
+                .card= f.input :dimensions, readonly: true, input_html: { value: @resource.dimensions }
               .cell.medium-6
-                .card
-                  .card-section
-                    = f.input :file_size, as: :string, readonly: true, input_html: { value: number_to_human_size(@resource.file_size) }
+                .card= f.input :file_size, as: :string, readonly: true, input_html: { value: number_to_human_size(@resource.file_size) }
 
-    .cell
-      = f.button :button
+    .cell= f.button :button

data/app/views/integral/backend/images/edit.haml

@@ -1,11 +1,3 @@
 = content_for :title, t('.title', name: @resource.title)
 
--# = content_for :actionbar do
--#   %ul.menu.horizontal
--#     - if policy(Integral::Version).manager?
--#       %li
--#         = link_to activities_backend_page_url(@resource.id), class: 'button white' do
--#           = icon('history')
--#           = t('integral.navigation.activity')
-
-= render 'form'
+= render partial: 'form', locals: { form_path: backend_img_url(@resource) }

data/app/views/integral/backend/images/grid/_dropdown_actions.haml

@@ -0,0 +1,5 @@
+- if policy(resource_klass).update?
+  = link_to t('integral.actions.edit'), edit_backend_resource_url(resource.id), icon: :edit, wrapper: :li
+= link_to t('integral.actions.open_in_new_tab'), backend_resource_url(resource.id), target: :blank, icon: 'external-link', wrapper: :li
+- if policy(resource_klass).destroy?
+  = link_to t('integral.actions.delete'), backend_resource_url(resource.id), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') }, icon: :remove, wrapper: :li

data/app/views/integral/backend/images/grid/_row_content.haml

@@ -0,0 +1,5 @@
+%td
+  = image_tag resource.file.url(:small), class: :preview
+  = resource.title.truncate(30)
+%td= l(resource.updated_at, format: :long)
+

data/app/views/integral/backend/images/index.haml

@@ -1,18 +1,12 @@
-.card.listing
-  .card-section
-    %h2.show-for-small-only= t('.title')
-    = link_to t('integral.actions.upload'), new_backend_img_url, class: 'button hollow show-for-small-only create'
-    .top-bar
-      .top-bar-left.hide-for-small-only
-        = link_to t('integral.actions.upload'), new_backend_img_url, class: 'button hollow'
-      .top-bar-right
-        = simple_form_for :grid, url: backend_img_index_url, method: :get, remote: true, html: { id: :grid_form, 'data-type' => :json } do |f|
-          = hidden_field_tag(:gridview, true)
-          = f.hidden_field(:descending, value: @grid.descending, class: 'desc-field')
-          = f.hidden_field(:order, value: @grid.order, class: 'order-field')
-          = f.hidden_field(:page, value: grid_options[:page], class: 'page-field')
+.grid-x
+  -# Left Column
+  .cell.large-6
+    .grid-y
+      .cell= render_card(:recent_resources)
+      .cell= render_card(:at_a_glance)
 
-          %ul.align-right.menu.filters
-            %li= f.input :title, placeholder: t('integral.actions.search'), wrapper_html: { class: 'filter search' }, hint: false, label: false
-
-    = render partial: 'grid'
+  -# Right Column
+  .cell.large-6
+    .grid-y
+      .cell= render_card(:recent_activity)
+      .cell.xlarge-6= render_card(:recent_user_activity)

data/app/views/integral/backend/images/list.haml

@@ -0,0 +1,11 @@
+.card.listing
+  %h2.show-for-small-only= page_title
+  = link_to t('integral.actions.upload'), new_backend_resource_url, class: 'button hollow show-for-small-only create'
+  .top-bar
+    .top-bar-left.hide-for-small-only
+      = link_to t('integral.actions.upload'), new_backend_resource_url, class: 'button hollow'
+    .top-bar-right
+      = render_resource_grid_form do |f|
+        %li= f.input :title, placeholder: t('integral.actions.search'), wrapper_html: { class: 'filter search' }, hint: false, label: false
+
+  = render_resource_grid

data/app/views/integral/backend/images/show.haml

@@ -0,0 +1,26 @@
+= content_for :title, @resource.title
+
+.grid-x
+  .cell.large-6
+    -# Left Column
+    .grid-x
+      .cell
+        .card
+          %h2= @resource.title
+          %p.subtitle= @resource.description
+          %hr
+
+          .grid-x.actions
+            .cell.xlarge-8.xxlarge-6
+              .grid-x.small-up-2
+                - if policy(resource_klass).manager?
+                  = link_to t('integral.actions.edit'), edit_backend_resource_url(@resource.id), icon: :edit, wrapper: :cell
+                - if policy(resource_klass).destroy?
+                  = link_to t('integral.actions.delete'), backend_resource_url(@resource.id), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') }, icon: :remove, wrapper: :cell
+
+      -# .cell.medium-6.flex-container= render_card(:object, { title: 'Essentials', record: @resource })
+      .cell.xlarge-6.flex-container= render_card(:recent_user_activity)
+  .cell.large-6
+    -# Right Column
+    .grid-x
+      .cell= render_card(:recent_activity)

data/app/views/integral/backend/lists/_form.haml

@@ -1,25 +1,12 @@
 = simple_form_for [:backend, @resource], validate: true, html: { class: 'are-you-sure', 'data-confirm-dirty-form' => true, id: :list_form } do |f|
   = f.input :lock_version, as: :hidden
-  .grid-x.grid-padding-x
+  .grid-x
     .cell.medium-8
       .grid-y
-        .cell
-          .card
-            .card-section
-              = f.input :title
-        .cell
-          .card
-            .card-section
-              = f.input :description
+        = f.input :title
+        = f.input :description
     .cell.medium-4
       .grid-y
-        .cell
-          .card
-            .card-section
-              = f.input :list_item_limit
-        .cell
-          .card
-            .card-section
-              = f.input :children
-    .cell
-      = f.button :button
+        = f.input :list_item_limit
+        = f.input :children
+    .cell= f.button :button