integral 1.4.0 → 1.5.0

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

@@ -2,20 +2,10 @@
 
 = content_for :actionbar do
   %ul.menu.horizontal
-    %li
-      = link_to post_url(@resource), class: 'button white' do
-        = icon('eye')
-        = t('integral.actions.view')
-    - if policy(Integral::Post).duplicate?
-      %li
-        = link_to duplicate_backend_post_url(@resource.id), class: 'button white', method: :post, data: { confirm: t('integral.actions.confirmation.clone') } do
-          = icon('history')
-          = t('integral.actions.clone')
+    = link_to t('integral.actions.view_on_site'), post_url(@resource), class: 'button white', icon: :eye, wrapper: :li
+    - if policy(resource_klass).duplicate?
+      = link_to t('integral.actions.clone'), duplicate_backend_resource_url(@resource.id), class: 'button white', method: :post, data: { confirm: t('integral.actions.confirmation.clone') }, icon: :history, wrapper: :li
     - if policy(Integral::Version).manager?
-      %li
-        = link_to activities_backend_post_url(@resource.id), class: 'button white' do
-          = icon('history')
-          = t('integral.navigation.activity')
+      = link_to t('integral.navigation.activity'), activities_backend_resource_url(@resource.id), class: 'button white', icon: :history, wrapper: :li
 
 = render 'form'
-

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

@@ -0,0 +1,10 @@
+- 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.view_on_site'), post_url(resource), icon: :eye, 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/posts/grid/_row_content.haml

@@ -0,0 +1,6 @@
+%td= resource.title.truncate(30)
+%td= resource.category.title
+%td
+  %span.label= t("integral.statuses.#{resource.status}")
+%td= number_with_delimiter(resource.view_count)
+%td= l(resource.updated_at, format: :long)

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

@@ -1,14 +1,14 @@
-.grid-x.grid-padding-x
+.grid-x
   -# Left Column
   .cell.large-6
-    .grid-x.grid-padding-x
-      .cell= render_card(:recent_posts)
+    .grid-x
+      .cell= render_card(:recent_resources)
       .cell= render_card(:categories)
-      .cell= render_card(:at_a_glance, { dataset: dataset_at_a_glance_posts })
+      .cell= render_card(:at_a_glance)
 
   -# Right Column
   .cell.large-6
-    .grid-x.grid-padding-x
+    .grid-x
       .cell= render_card(:recent_activity)
-      .cell.large-6= render_card(:recent_user_activity)
+      .cell.xlarge-6= render_card(:recent_user_activity)
       .cell.large-6= render_card(:top_post_authors)

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

@@ -1,20 +1,13 @@
 .card.listing
-  .card-section
-    %h2.show-for-small-only= page_title
-    = link_to t('integral.actions.create'), new_backend_post_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_post_url, class: 'button hollow'
-      .top-bar-right
-        = simple_form_for :grid, url: list_backend_posts_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')
+  %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 :user, collection: Integral::User.all, label: t('integral.records.attributes.user'), wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
+        %li= f.input :status, collection: resource_klass.available_statuses, label: t('integral.records.attributes.status'), wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
+        %li= f.input :title, placeholder: t('integral.actions.search'), wrapper_html: { class: 'filter search' }, hint: false, label: false
 
-          %ul.align-right.menu.filters
-            %li= f.input :user, collection: Integral::User.all, label: t('integral.records.attributes.user'), wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
-            %li= f.input :status, collection: Integral::Post.available_statuses, label: t('integral.records.attributes.status'), wrapper_html: { class: 'filter' }, input_html: { 'data-filter' => true }, required: false
-            %li= f.input :title, placeholder: t('integral.actions.search'), wrapper_html: { class: 'filter search' }, hint: false, label: false
-
-    = render partial: 'grid'
+  = render_resource_grid

data/app/views/integral/backend/posts/new.haml

@@ -1,2 +1 @@
 = render 'form'
-

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

@@ -3,52 +3,29 @@
 .grid-x
   .cell.large-6
     -# Left Column
-    .grid-x.grid-padding-x
+    .grid-x
       .cell
         .card
-          .card-section
-            %h2= @resource.title
-            %p.subtitle= @resource.description
-            %hr
+          %h2= @resource.title
+          %p.subtitle= @resource.description
+          %hr
 
-            .grid-x.actions
-              .cell.xlarge-8.xxlarge-6
-                .grid-x.small-up-2
-                  .cell
-                    = link_to post_url(@resource) do
-                      = icon('eye')
-                      = t('integral.actions.view_on_site')
-                  - if policy(Integral::Post).manager?
-                    .cell
-                      = link_to edit_backend_post_url(@resource.id) do
-                        = icon('edit')
-                        = t('integral.actions.edit')
-                  - if policy(Integral::Post).duplicate?
-                    .cell
-                      = link_to duplicate_backend_post_url(@resource.id), method: :post, data: { confirm: t('integral.actions.confirmation.clone') } do
-                        = icon('clone')
-                        = t('integral.actions.clone')
-                  - if policy(Integral::Post).manager?
-                    .cell
-                      = link_to backend_post_url(@resource.id), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
-                        = icon('remove')
-                        = t('integral.actions.delete')
-                  - if policy(Integral::Version).manager?
-                    .cell
-                      = link_to activities_backend_post_url(@resource.id) do
-                        = icon('history')
-                        = t('integral.actions.view_history')
+          .grid-x.actions
+            .cell.xlarge-8.xxlarge-6
+              .grid-x.small-up-2
+                = link_to t('integral.actions.view_on_site'), post_url(@resource), icon: :eye, wrapper: :cell
+                - 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), icon: :remove, wrapper: :cell, method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') }
+                - if policy(resource_klass).manager?
+                  = link_to t('integral.actions.view_history'), activities_backend_resource_url(@resource.id), icon: :history, wrapper: :cell
 
       .cell.medium-6.flex-container= render_card(:object, { title: 'Essentials', record: @resource })
-      .cell.medium-6.flex-container= render_card(:recent_user_activity)
+      .cell.xlarge-6.flex-container= render_card(:recent_user_activity)
   .cell.large-6
     -# Right Column
-    .grid-x.grid-padding-x
+    .grid-x
       .cell= render_card(:recent_activity)
-      -# Could use the at_a_glance card to show user edits
-      -# .cell= render_card(:at_a_glance, { dataset: dataset_dashboard_atg })
-      -# .cell
-      -#   .card
-      -#     .card-section
-      -#       %h2= t('integral.backend.cards.last_week')
-      -#       = render_line_chart(dataset_dashboard_last_week)

data/app/views/integral/backend/shared/_breadcrumbs.haml

@@ -1,9 +1,12 @@
-- if @breadcrumbs.present? || content_for?(:actionbar)
+- if @breadcrumbs.present? || content_for?(:actionbar) || render_default_action_bar?
   #action-bar.top-bar
     - if @breadcrumbs.present?
       .top-bar-left
         %ul.breadcrumbs
-          = render_breadcrumbs :tag => :li, :separator => ""
-    - if content_for?(:actionbar)
+          = render_breadcrumbs tag: :li, separator: ""
+    - if content_for?(:actionbar) || render_default_action_bar?
       .top-bar-right
-        = content_for(:actionbar)
+        - if content_for?(:actionbar)
+          = content_for(:actionbar)
+        - else
+          = render partial: "integral/backend/shared/action_bar/#{action_name}"

data/app/views/integral/backend/shared/_image_preview.haml

@@ -1,12 +1,14 @@
-- image = f.object.send(image_attr)
+- attribute = attribute.present? ? attribute : :image
+- help_text = help_text.present? ? help_text : ''
+- image = f.object.send(attribute)
 - image_path = image&.file&.url(:medium)
 - unlinkHiddenClass = image.present? ? '' : 'hide'
 - placeholderHiddenClass = image.present? ? 'hide' : ''
 
 .image-select
-  -# = f.label image_attr
+  = f.label attribute
   .image-container
-    = f.hidden_field "#{image_attr}_id"
+    = f.hidden_field "#{attribute}_id"
     = image_tag image_url('integral/image-not-set.png'), class: "placeholder #{placeholderHiddenClass}"
     %img.actual{ src: image_path }
     %ul.menu.align-left.menu-unlinked{ class: placeholderHiddenClass }
@@ -21,3 +23,8 @@
       %li
         %button.button.clear.edit
           = icon('pencil-square-o')
+
+  - if help_text.present?
+    %br
+    %p.help-text= help_text
+

data/app/views/integral/backend/shared/_image_selector.haml

@@ -1,4 +1,4 @@
 - initialize = defined?(initialize) ? initialize : false
 .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: initialize, data_attributes: { 'image-selector' => true }}
+  = 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: initialize, data_attributes: { 'image-selector' => true }}
   = render partial: 'integral/backend/images/create_modal'

data/app/views/integral/backend/shared/_notification_subscription_toggle.haml

@@ -0,0 +1,22 @@
+:ruby
+  if subscribable.is_a?(Class)
+    subscribable_id = nil
+    subscribable_type = subscribable.name
+  else
+    subscribable_id = subscribable.id
+    subscribable_type = subscribable.class.name
+  end
+  receives_notifications = current_user.receives_notifications_for?(subscribable)
+
+= simple_form_for :subscription, url: backend_notification_subscription_url(id: 1), remote: true, method: :put, html: { 'data-form-unsubscribe-notifications' => true, class: receives_notifications ? '' : 'hide' } do |f|
+  = f.hidden_field :state, value: :unsubscribed
+  = f.hidden_field :subscribable_type, value: subscribable_type
+  = f.hidden_field :subscribable_id, value: subscribable_id
+  = f.button :button, class: 'clear', data: { tooltip: true, position: :left, alignment: :center }, title: t('integral.tooltips.unsubscribe') do
+    = icon('bell-slash-o')
+= simple_form_for :subscription, url: backend_notification_subscription_url(id: 1), remote: true, method: :put, html: { 'data-form-subscribe-notifications' => true, class: receives_notifications ? 'hide' : '' } do |f|
+  = f.hidden_field :state, value: :subscribed
+  = f.hidden_field :subscribable_type, value: subscribable_type
+  = f.hidden_field :subscribable_id, value: subscribable_id
+  = f.button :button, class: 'clear', data: { tooltip: true, position: :left, alignment: :center }, title: t('integral.tooltips.subscribe') do
+    = icon('bell-o')

data/app/views/integral/backend/shared/action_bar/_index.haml

@@ -0,0 +1,9 @@
+%ul.menu.horizontal
+  - if policy(resource_klass).new?
+    %li
+      = link_to new_backend_resource_url, class: 'button white' do
+        = icon('plus')
+        = t('integral.actions.create')
+        = resource_klass.model_name.human.capitalize
+  - if resource_klass.respond_to?(:subscribable?) && resource_klass.subscribable?
+    %li= render partial: 'integral/backend/shared/notification_subscription_toggle', locals: { subscribable: resource_klass }

data/app/views/integral/backend/shared/action_bar/_show.haml

@@ -0,0 +1,3 @@
+%ul.menu.horizontal
+  - if @resource.respond_to?(:subscribable?) && @resource.subscribable?
+    %li= render partial: 'integral/backend/shared/notification_subscription_toggle', locals: { subscribable: @resource }

data/app/views/integral/backend/shared/cards/_at_a_glance.haml

@@ -1,5 +1,5 @@
+- dataset ||= dataset_at_a_glance
 .card
-  .card-section
-    %h2= t('integral.backend.cards.at_a_glance')
-    = render_donut_chart(dataset)
+  %h2= t('integral.backend.cards.at_a_glance')
+  = render_donut_chart(dataset)
 

data/app/views/integral/backend/shared/cards/_categories.haml

@@ -1,34 +1,33 @@
 .card
-  .card-section
-    .card-action-title
-      %h2 Categories
-      %button.button.hollow{ 'data-open' => 'new_category_modal' } Create
-    %table.hover
-      - Integral::Category.all.decorate.each do |category|
-        %tr
-          %td= category.title
-          %td
-            %span.badge= category.posts.count
-          %td
-            %button.button--action-pane{ 'data-toggle' => "dropdown-pane-actions-category-#{category.id}" }
-              = icon('ellipsis-v')
-            .dropdown-pane.dropdown-pane--actions{ id: "dropdown-pane-actions-category-#{category.id}", data: { dropdown: true, position: :bottom, alignment: :right, close_on_click: 'true' } }
-              %ul.menu.vertical
-                %li
-                  %button{ data: { modal_url: edit_backend_category_url(category.id), button_edit_category: "modal--category-edit-#{category.id}" } }
-                    = icon('edit')
-                    = t('integral.actions.edit')
-                %li
-                  - if category.posts.count.zero?
-                    = link_to backend_category_url(category.id), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion'), button_delete_category: true }, remote: true do
-                      = icon('remove')
-                      = t('integral.actions.delete')
+  .card-action-title
+    %h2 Categories
+    %button.button.hollow{ 'data-open' => 'new_category_modal' } Create
+  %table.hover
+    - Integral::Category.all.decorate.each do |category|
+      %tr
+        %td= category.title
+        %td
+          %span.badge= category.posts.count
+        %td
+          %button.button--action-pane{ 'data-toggle' => "dropdown-pane-actions-category-#{category.id}" }
+            = icon('ellipsis-v')
+          .dropdown-pane.dropdown-pane--actions{ id: "dropdown-pane-actions-category-#{category.id}", data: { dropdown: true, position: :bottom, alignment: :right, close_on_click: 'true' } }
+            %ul.menu.vertical
+              %li
+                %button{ data: { modal_url: edit_backend_category_url(category.id), button_edit_category: "modal--category-edit-#{category.id}" } }
+                  = icon('edit')
+                  = t('integral.actions.edit')
+              %li
+                - if category.posts.count.zero?
+                  = link_to backend_category_url(category.id), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion'), button_delete_category: true }, remote: true do
+                    = icon('remove')
+                    = t('integral.actions.delete')
 
 
-                  - else
-                    %button.disabled{ title: "Cannot delete categories which include posts.", data: { tooltip: true, position: "bottom", alignment: "center" } }
-                      = icon('remove')
-                      = t('integral.actions.delete')
+                - else
+                  %button.disabled{ title: "Cannot delete categories which include posts.", data: { tooltip: true, position: "bottom", alignment: "center" } }
+                    = icon('remove')
+                    = t('integral.actions.delete')
 
 
 = render partial: 'integral/backend/categories/modal', locals: { title: 'Category Creation' }

data/app/views/integral/backend/shared/cards/_object.haml

@@ -1,4 +1,4 @@
-.card.object
+.card-unpadded.object
   - if record.present?
     .card-section
       %h2= title

data/app/views/integral/backend/shared/cards/_recent_activity.haml

@@ -3,18 +3,18 @@
 - grid ||= recent_site_activity_grid
 - activities = cast_activities(grid.assets.limit(5))
 
-.card
-  .card-section
-    %h2= title
-    - if activities.present?
-      .timeline{ class: classes }
-        = render partial: 'integral/backend/activities/activity', collection: activities
+.card.flex-auto
+  %h2= title
+  - if activities.present?
+    .timeline{ class: classes }
+      = render partial: 'integral/backend/activities/activity', collection: activities
 
-      - if grid.assets.count > 5
-        %button.button.clear.expanded{ data: { recent_activity: true, recent_activity_created_at: activities.last.created_at.utc, recent_activity_user: grid.user, recent_activity_object: grid.object, recent_activity_item_id: grid.item_id, container_id: "modal--recent-activity-#{SecureRandom.hex}", recent_activity_title: title } }
-          = t('integral.actions.view_more')
+    - if grid.assets.count > 5
+      %button.button.clear.expanded{ data: { recent_activity: true, recent_activity_created_at: activities.last.created_at.utc, recent_activity_user: grid.user, recent_activity_object: grid.object, recent_activity_item_id: grid.item_id, container_id: "modal--recent-activity-#{SecureRandom.hex}", recent_activity_title: title } }
+        = t('integral.actions.view_more')
 
-    - else
-      = t('integral.backend.graphs.data_unavailable')
-      = image_tag image_path('integral/backend/data-unavailable.png'), class: 'data-unavailable'
+  - else
+    %p.data-unavailable
+      %span= t('integral.backend.graphs.data_unavailable')
+      = image_tag image_path('integral/backend/data-unavailable.png')
 

data/app/views/integral/backend/shared/cards/_recent_resources.haml

@@ -0,0 +1,17 @@
+-# This partial could be updated to allow for customising the rows, scope and title
+.card
+  .card-action-title
+    %h2
+      Recent
+      = resource_klass.model_name.human.pluralize
+  %table.hover
+    - resource_klass.limit(5).order('updated_at DESC').decorate.each do |resource|
+      %tr
+        %td= resource.title
+        %td
+          = link_to backend_resource_url(resource.id), class: 'button--action-pane' do
+            = icon('eye')
+          -# = link_to edit_backend_resource_url(resource.id), class: 'button--action-pane' do
+          -#   = icon('edit')
+
+  = link_to t('integral.actions.view_all'), list_backend_resources_url, class: 'button clear expanded'

data/app/views/integral/backend/shared/cards/_top_post_authors.haml

@@ -1,19 +1,18 @@
 - user_ids = Integral::Post.published.group(:user_id).count.sort_by(&:last).reverse.to_h
 - post_users = Integral::User.where(id: user_ids.keys).decorate.sort_by { |prod| user_ids.keys.index(prod.id) }
 .card
-  .card-section
-    .card-action-title
-      %h2 Top Authors
-    .stat-table
-      .stat-table-heading
-        .stat-table-header Total Authors
-        .stat-table-header-count= user_ids.count
-      %table.unstriped.hover
-        - post_users.each do |record|
-          %tr
-            %td
-              = image_tag record.avatar.url(:thumbnail), alt: record.name, class: 'avatar'
-              = record.name
-            %td
-              %span.badge.secondary= user_ids[record.id]
+  .card-action-title
+    %h2 Top Authors
+  .stat-table
+    .stat-table-heading
+      .stat-table-header Total Authors
+      .stat-table-header-count= user_ids.count
+    %table.unstriped.hover
+      - post_users.each do |record|
+        %tr
+          %td
+            = image_tag record.avatar.url(:thumbnail), alt: record.name, class: 'avatar'
+            = record.name
+          %td
+            %span.badge.secondary= user_ids[record.id]
 

data/app/views/integral/backend/shared/cards/_welcome.haml

@@ -1,29 +1,28 @@
 .card
-  .card-section
-    %h2= t('.title')
-    %p.subtitle= t('.get_started')
-    %hr
-    .grid-x.actions
-      .cell.shrink
-        .grid-y
+  %h2= t('.title')
+  %p.subtitle= t('.get_started')
+  %hr
+  .grid-x.actions
+    .cell.shrink
+      .grid-y
+        .cell.shrink
+          = link_to edit_backend_user_url(current_user) do
+            = icon('edit')
+            = t('integral.actions.edit_profile')
+        - if policy(Integral::Page).manager?
           .cell.shrink
-            = link_to backend_account_url do
-              = icon('edit')
-              = t('integral.actions.edit_profile')
-          - if policy(Integral::Page).manager?
-            .cell.shrink
-              = link_to new_backend_page_url do
-                = icon('plus')
-                = t('integral.actions.new_page')
-      .cell.shrink
-        .grid-y
-          - if policy(Integral::Post).manager? && Integral.blog_enabled?
-            .cell.shrink
-              = link_to new_backend_post_url do
-                = icon('plus')
-                = t('integral.actions.new_post')
+            = link_to new_backend_page_url do
+              = icon('plus')
+              = t('integral.actions.new_page')
+    .cell.shrink
+      .grid-y
+        - if policy(Integral::Post).manager? && Integral.blog_enabled?
           .cell.shrink
-            = link_to root_path do
-              = icon('eye')
-              = t('integral.actions.view_main_site')
+            = link_to new_backend_post_url do
+              = icon('plus')
+              = t('integral.actions.new_post')
+        .cell.shrink
+          = link_to root_path do
+            = icon('eye')
+            = t('integral.actions.view_main_site')