integral 1.0.1 → 1.5.0

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

@@ -0,0 +1,15 @@
+- content_for :title, t('.title', title: decorated_resource.title)
+.card.listing
+  = 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
+
+  = render partial: 'integral/backend/activities/shared/grid', locals: { grid: @grid }
+

data/app/views/integral/backend/activities/shared/{_log.haml → 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

@@ -0,0 +1,24 @@
+:ruby
+  category ||= Integral::Category.new
+  modal_id ||= 'new_category_modal'
+  slug_id = "category_title_#{(Time.now.to_f * 1000).to_i}"
+
+.reveal{ data: { 'reveal' => true, 'multiple-opened' => 'true' }, id: modal_id }
+  %button.close-button{ type: 'button', data: { close: '' }, aria: { label: "Close" }}
+    %span{ aria: { hidden: 'true' } } ×
+  = simple_form_for [:backend, category], validate: true, remote: true, html: { class: 'remote-form' } do |f|
+    .modal-header
+      %h4= title
+    .modal-content.padded
+      = 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.dark
+      .grid-x
+        .cell.medium-6
+          = 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

@@ -1,41 +1,29 @@
-- @image ||= Integral::Image.new
+- @resource ||= Integral::Image.new
 - form_path ||= backend_img_index_url
 
-= simple_form_for @image, validate: true, multipart: true, authenticity_token: true, url: form_path do |f|
+= 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 @image.persisted?
-                = image_tag @image.url
-              - if !@image.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 @image.persisted?
+            - 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: @image.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(@image.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,3 +1,3 @@
-= content_for :title, t('.title', name: @image.title)
-= render 'form'
+= content_for :title, t('.title', name: @resource.title)
 
+= 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, @list], validate: true, html: { class: 'are-you-sure', 'data-confirm-dirty-form' => true, id: :list_form } do |f|
+= 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

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

@@ -1,7 +1,7 @@
 -# TODO - Use this partial to DRY up views.
 -# Currently causes a stackoverflow
 - formatted_item = Integral::ListItemRenderer.new(f.object)
-- children_allowed ||= @list.children?
+- children_allowed ||= @resource.children?
 
 .list-item-container
   .list-item{ 'data-persisted' => "#{f.object.persisted?}" }

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

@@ -23,15 +23,15 @@
               Override defaults
               = icon('chevron-down')
       .cell
-        = f.input :title, wrapper_html: { class: 'alternative' }, input_html: { class: formatted_item.title_required? ? 'title-field required' : 'title-field' }
+        = f.input :title, wrapper_html: { class: 'alternative' }, input_html: { 'data-character-counter' => 'true', class: formatted_item.title_required? ? 'title-field required' : 'title-field' }
       .cell.medium-8.link-attribute{ class: f.object.basic? || !f.object.persisted? ? 'hide' : '' }
         = f.input :url, wrapper_html: { class: "alternative" }, input_html: { class: 'url-field' }
       .cell.medium-4.link-attribute.align-self-middle.flex-container{ class: f.object.basic? || !f.object.persisted? ? 'hide' : '' }
         = f.input :target, as: :boolean, checked_value: '_blank', unchecked_value: '_self', input_html: { class: 'target-field' }, wrapper_html: { class: 'alternative' }
       .cell
-        = f.input :subtitle, wrapper_html: { class: 'alternative' }, as: :string
+        = f.input :subtitle, input_html: { 'data-character-counter' => 'true' }, wrapper_html: { class: 'alternative' }, as: :string
       .cell.medium-8
-        = f.input :description, wrapper_html: { class: 'alternative' }, as: :string, hint: false
+        = f.input :description, input_html: { 'data-character-counter' => 'true' }, wrapper_html: { class: 'alternative' }, as: :string, hint: false
       .cell.medium-4
         = f.input :image_id, as: :hidden, input_html: { class: 'image-field', data: { image_present: formatted_item.non_object_image?, fallback_image: formatted_item.fallback_image } }
         .image-preview.center

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

@@ -1,6 +1,7 @@
+-# TODO: Tidy up this duplication also present in the child_fields partial - Attempted but was causing stack level issues
 -# = render 'item_container', f: f
 - formatted_item = Integral::ListItemRenderer.new(f.object)
-- children_allowed ||= @list.children?
+- children_allowed ||= @resource.children?
 
 .list-item-container
   = f.input :priority, as: :hidden, input_html: { class: 'priority-field' }
@@ -12,7 +13,7 @@
       %span.title= formatted_item.title
       %span.url= formatted_item.url
     .actions
-      = icon('edit', class: 'action', 'data-open' => "list-item-modal-#{f.object.id}", class: 'modal-trigger')
+      = icon('edit', 'data-open' => "list-item-modal-#{f.object.id}", class: 'modal-trigger')
 
       - if children_allowed
         .add-children

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

@@ -1,14 +1,12 @@
 .card.list-management
-  .card-section
-    .top-bar
-      .top-bar-left
-        = f.input :children, wrapper_html: { class: 'alternative' }, disabled: locked
-      .top-bar-right
-        = f.input :list_item_limit, wrapper_html: { class: 'alternative' }, disabled: locked
-    #list-items.sortable
-      = link_to_add_association f, :list_items, 'data-association-insertion-method' => 'after', id: 'top-add-list-button', 'data-association-insertion-node' => '#top-add-list-button', force_non_association_create: true do
-        .add-list-item
-          = icon('plus')
-      = f.simple_fields_for :list_items do |list_item|
-        = render 'list_item_fields', f: list_item
-
+  .top-bar
+    .top-bar-left
+      = f.input :children, wrapper_html: { class: 'alternative' }, disabled: locked
+    .top-bar-right
+      = f.input :list_item_limit, wrapper_html: { class: 'alternative' }, disabled: locked
+  #list-items.sortable
+    = link_to_add_association f, :list_items, 'data-association-insertion-method' => 'after', id: 'top-add-list-button', 'data-association-insertion-node' => '#top-add-list-button', force_non_association_create: true do
+      .add-list-item
+        = icon('plus')
+    = f.simple_fields_for :list_items do |list_item|
+      = render 'list_item_fields', f: list_item

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

@@ -1,2 +1,23 @@
-= render 'form'
+= content_for :actionbar do
+  %ul.menu.horizontal
+    - if policy(Integral::List).duplicate?
+      = link_to t('integral.actions.clone'), duplicate_backend_list_url(@resource.id), class: 'button white', method: :post, data: { confirm: t('integral.actions.confirmation.clone') }, icon: :history, wrapper: :li
+
+= simple_form_for [:backend, @resource], validate: true, html: { class: 'are-you-sure', 'data-confirm-dirty-form' => true, 'data-list-item-limit' => @resource.list_item_limit, id: :list_form } do |f|
+  = f.input :lock_version, as: :hidden
+  .grid-x
+    .cell.medium-6.flex-container
+      .card= f.input :title, hint: false, disabled: f.object.locked?
+    .cell.medium-6.flex-container
+      .card= f.input :description, hint: false, disabled: f.object.locked?
+    .cell
+      = render partial: 'integral/backend/lists/manager', locals: { f: f, locked: f.object.locked? }
+    .cell= f.button :button
+
+-# Image Selector
+= render partial: 'integral/backend/shared/record_selector/modal', locals: { search_path: list_backend_img_index_path, title: t('integral.prompts.select_image'), name: 'Image', create_modal: '#new_image_modal', initialize: true }
+= render partial: 'integral/backend/images/create_modal'
+
+- Integral::ActsAsListable.objects.each do |listable|
+  = render partial: 'integral/backend/shared/record_selector/modal', locals: { search_path: listable.listable_options[:selector_path], title: listable.listable_options[:selector_title], name: listable.to_s.parameterize, initialize: true }
 

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

@@ -0,0 +1,9 @@
+- 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).duplicate?
+  = link_to t('integral.actions.clone'), duplicate_backend_resource_url(resource.id), method: :post, data: { confirm: t('integral.actions.confirmation.clone') }, icon: :clone, wrapper: :li
+-# - if policy(Integral::Version).manager?
+-#   = link_to t('integral.actions.view_history'), activities_backend_resource_url(resource.id), icon: :history, 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/lists/grid/_row_content.haml

@@ -0,0 +1,3 @@
+%td= resource.title
+%td= resource.description
+%td= l(resource.updated_at)

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

@@ -1,18 +1,12 @@
-.card.listing
-  .card-section
-    %h2.show-for-small-only= t('.title')
-    = link_to t('integral.actions.create'), new_backend_list_url, class: 'button hollow show-for-small-only create'
-    .top-bar
-      .top-bar-left.hide-for-small-only
-        = link_to t('integral.actions.create'), new_backend_list_url, class: 'button hollow'
-      .top-bar-right
-        = simple_form_for :grid, url: backend_lists_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/lists/list.haml

@@ -0,0 +1,11 @@
+.card.listing
+  %h2.show-for-small-only= page_title
+  = link_to t('integral.actions.create'), 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.create'), 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/lists/show.haml

@@ -1,26 +1,30 @@
--# = icon_link_to 'content_copy', '#clone-modal', class: 'button', data: { tooltip: t('integral.actions.clone') }, icon_classes: 'small'
+= content_for :title, @resource.title
 
-= content_for :title, t('.title', title: @list.title)
+.grid-x
+  .cell.large-6
+    -# Left Column
+    .grid-x
+      .cell
+        .card
+          %h2= @resource.title
+          %p.subtitle= @resource.description
+          %hr
 
-= simple_form_for [:backend, @list], validate: true, html: { class: 'are-you-sure', 'data-confirm-dirty-form' => true, 'data-list-item-limit' => @list.list_item_limit, id: :list_form } do |f|
-  = f.input :lock_version, as: :hidden
-  .grid-x.grid-padding-x
-    .cell.medium-6.flex-container
-      .card
-        .card-section
-          = f.input :title, hint: false, disabled: true
-    .cell.medium-6.flex-container
-      .card
-        .card-section
-          = f.input :description, hint: false, disabled: true
-    .cell
-      = render partial: 'integral/backend/lists/manager', locals: { f: f, locked: true }
-    .cell
-      = f.button :button
+          .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).duplicate?
+                  = link_to t('integral.actions.clone'), duplicate_backend_resource_url(@resource.id), method: :post, data: { confirm: t('integral.actions.confirmation.clone') }, icon: :clone, wrapper: :cell
+                - if policy(resource_klass).manager?
+                  = link_to t('integral.actions.delete'), backend_resource_url(@resource.id), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') }, icon: :remove, wrapper: :cell
+                -# - if policy(Integral::Version).manager?
+                -#   = link_to t('integral.actions.view_history'), activities_backend_resource_url(@resource.id), icon: :history, wrapper: :cell
 
--# Image Selector
-= render partial: 'integral/backend/shared/record_selector/modal', locals: { search_path: backend_img_index_path, title: t('integral.prompts.select_image'), name: 'Image', create_modal: '#new_image_modal', initialize: true }
-= render partial: 'integral/backend/images/create_modal'
-
-- Integral::ActsAsListable.objects.each do |listable|
-  = render partial: 'integral/backend/shared/record_selector/modal', locals: { search_path: listable.listable_options[:selector_path], title: listable.listable_options[:selector_title], name: listable.to_s.parameterize, initialize: true }
+      -# .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)