integral 1.3.0 → 1.4.0

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

@@ -1,4 +1,4 @@
-= render layout: 'integral/backend/shared/grid', locals: { grid: grid, options: { columns: [:date, :user, :action, :object, :instance, :attributes_changed, :actions] }} do
+= render layout: 'integral/backend/shared/grid', locals: { grid: grid, options: { columns: [:date, :user, :action, :object, :instance, :actions] }} do
   - if grid.assets.any?
     - grid.assets.decorate.each do |activity|
       %tr
@@ -15,7 +15,6 @@
         %td
           = link_to activity.item_url do
             = activity.item_title
-        %td= activity.attributes_changed
         %td.actions
           = link_to activity.url do
             = icon('eye')

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

@@ -1,5 +1,5 @@
 = render_data_grid do
-  = render layout: 'integral/backend/shared/grid', locals: { grid: grid, options: { columns: [:date, :user, :action, :attributes_changed, :actions], order: true }} do |grid|
+  = 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
@@ -12,7 +12,8 @@
                   = activity.whodunnit.name
           %td
             %span.label= activity.event
-          %td= activity.attributes_changed
+          -# 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')

data/app/views/integral/backend/activities/shared/{_listing.haml → index.haml}

@@ -1,3 +1,4 @@
+- content_for :title, t('.title', title: @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|

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

@@ -0,0 +1,25 @@
+: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
+      %h2= t('integral.records.attributes.featured_image')
+      .grid-x
+        .cell.medium-6
+          = render partial: 'integral/backend/shared/image_preview', locals: { f:f, image_attr: :image }
+
+    .modal-footer
+      = f.button :button, class: 'button'
+
+

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

@@ -10,7 +10,7 @@
       = icon('list', class: 'identifier')
     .data
       %span.title= formatted_item.title
-      %span.url= CGI.unescape(formatted_item.url)
+      %span.url= formatted_item.url
     .actions
       = icon('edit', class: 'action', 'data-open' => "list-item-modal-#{f.object.id}", class: 'modal-trigger')
 

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

@@ -10,7 +10,7 @@
       = icon('list', class: 'identifier')
     .data
       %span.title= formatted_item.title
-      %span.url= CGI.unescape(formatted_item.url)
+      %span.url= formatted_item.url
     .actions
       = icon('edit', class: 'action', 'data-open' => "list-item-modal-#{f.object.id}", class: 'modal-trigger')
 

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

@@ -16,7 +16,7 @@
             .object-data
               %h5= formatted_item.title
               %span.subtitle= formatted_item.subtitle
-              %span.url= CGI.unescape(formatted_item.url)
+              %span.url= formatted_item.url
             = icon('edit')
           .text-right
             %small

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

@@ -11,7 +11,7 @@
       = icon('list', class: 'identifier')
     .data
       %span.title= formatted_item.title
-      %span.url= CGI.unescape(formatted_item.url)
+      %span.url= formatted_item.url
     .actions
       = icon('edit', 'data-open' => "list-item-modal-#{f.object.id}", class: 'modal-trigger')
 

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

@@ -18,7 +18,7 @@
         .cell
           .card
             .card-section
-              = f.input :body, as: :ckeditor, input_html: { id: 'resource_body_editor', ckeditor: { language: current_user.locale }, data: { 'ckeditor-class' => @resource.template } }
+              = f.input :body, as: :ckeditor, input_html: { value: @resource.editor_body, id: 'resource_body_editor', ckeditor: { language: current_user.locale }, data: { 'ckeditor-class' => @resource.template } }
 
     .cell.small-12.medium-4.large-3
       .grid-y
@@ -47,6 +47,3 @@
 
     .cell.small-12
       = f.button :button
-
-.record-image
-  = render partial: 'integral/backend/shared/image_selector'

data/app/views/integral/backend/pages/_grid.haml

@@ -2,20 +2,45 @@
   = render layout: 'integral/backend/shared/grid', locals: { grid: @grid, options: { columns: [:title, :path, :status, :updated_at, :actions], order: true }} do |grid|
     - if grid.assets.any?
       - grid.assets.decorate.each do |record|
-        %tr
+        %tr.tr--clickable{ data: { href: backend_page_url(record.id), context_menu: "dropdown-pane-actions-page-#{record.id}" }}
           %td= record.title.truncate(30)
           %td= record.path
           %td
             %span.label= t("integral.records.status.#{record.status}")
           %td= l(record.updated_at, format: :long)
           %td.actions
-            = link_to record.path do
-              = icon('eye')
-            - if policy(Integral::Page).update?
-              = link_to edit_backend_page_url(record) do
-                = icon('edit')
-            - if policy(Integral::Page).destroy?
-              = link_to backend_page_url(record), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
-                = icon('remove')
+            %button.button--action-pane{ 'data-toggle' => "dropdown-pane-actions-page-#{record.id}" }
+              = icon('ellipsis-v')
+            .dropdown-pane.dropdown-pane--actions{ id: "dropdown-pane-actions-page-#{record.id}", data: { dropdown: true, position: :bottom, alignment: :right, close_on_click: 'true' } }
+              %ul.menu.vertical
+                - if policy(Integral::Page).update?
+                  %li
+                    = link_to edit_backend_page_url(record.id) do
+                      = icon('edit')
+                      = t('integral.actions.edit')
+                - unless record.archived?
+                  %li
+                    = link_to record.path do
+                      = icon('eye')
+                      = t('integral.actions.view_on_site')
+                %li
+                  = link_to backend_page_url(record.id), target: :blank do
+                    = icon('external-link')
+                    = t('integral.actions.open_in_new_tab')
+                - if policy(Integral::Page).duplicate?
+                  %li
+                    = link_to duplicate_backend_page_url(record.id), method: :post, data: { confirm: t('integral.actions.confirmation.clone') } do
+                      = icon('clone')
+                      = t('integral.actions.clone')
+                - if policy(Integral::Version).manager?
+                  %li
+                    = link_to activities_backend_page_url(record.id) do
+                      = icon('history')
+                      = t('integral.actions.view_history')
+                - if policy(Integral::Page).destroy?
+                  %li
+                    = link_to backend_page_url(record.id), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
+                      = icon('remove')
+                      = t('integral.actions.delete')
     - else
       = render partial: 'integral/backend/shared/empty_grid'

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

@@ -3,9 +3,15 @@
 = content_for :actionbar do
   %ul.menu.horizontal
     %li
-      = link_to @resource.path, class: 'button white' do
-        = icon('eye')
-        = t('integral.actions.view')
+      - if @resource.archived?
+        %button.button.white.disabled{ data: { tooltip: true, click_open: 'false' }, title: 'Archived pages cannot be viewed' }
+          = icon('eye')
+          = t('integral.actions.view_on_site')
+      - else
+        = link_to @resource.path, class: 'button white' do
+          = icon('eye')
+          = t('integral.actions.view_on_site')
+
     - if policy(Integral::Page).duplicate?
       %li
         = link_to duplicate_backend_page_url(@resource.id), class: 'button white', method: :post, data: { confirm: t('integral.actions.confirmation.clone') } do

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

@@ -1,22 +1,12 @@
-.card.listing
-  .card-section
-    %h2.show-for-small-only= t('.title')
-    - if policy(Integral::Page).create?
-      = link_to t('integral.actions.create'), new_backend_page_url, class: 'button hollow show-for-small-only create'
+.grid-x.grid-padding-x
+  -# Left Column
+  .cell.large-6
+    .grid-x.grid-padding-x
+      .cell= render_card(:recent_pages)
+      .cell= render_card(:at_a_glance, { dataset: dataset_at_a_glance_pages })
 
-    .top-bar
-      - if policy(Integral::Page).create?
-        .top-bar-left.hide-for-small-only
-          = link_to t('integral.actions.create'), new_backend_page_url, class: 'button hollow'
-      .top-bar-right
-        = simple_form_for :grid, url: backend_pages_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')
-
-          %ul.align-right.menu.filters
-            %li= f.input :status, collection: Integral::Page.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'
+  -# Right Column
+  .cell.large-6
+    .grid-x.grid-padding-x
+      .cell= render_card(:recent_activity)
+      .cell.large-6= render_card(:recent_user_activity)

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

@@ -0,0 +1,22 @@
+.card.listing
+  .card-section
+    %h2.show-for-small-only= page_title
+    - if policy(Integral::Page).create?
+      = link_to t('integral.actions.create'), new_backend_page_url, class: 'button hollow show-for-small-only create'
+
+    .top-bar
+      - if policy(Integral::Page).create?
+        .top-bar-left.hide-for-small-only
+          = link_to t('integral.actions.create'), new_backend_page_url, class: 'button hollow'
+      .top-bar-right
+        = simple_form_for :grid, url: list_backend_pages_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')
+
+          %ul.align-right.menu.filters
+            %li= f.input :status, collection: Integral::Page.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'

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

@@ -0,0 +1,48 @@
+= content_for :title, @resource.title
+
+.grid-x
+  .cell.large-6
+    -# Left Column
+    .grid-x.grid-padding-x
+      .cell
+        .card
+          .card-section
+            %h2= @resource.title
+            %p.subtitle= @resource.description
+            %hr
+
+            .grid-x.actions
+              .cell.xlarge-8.xxlarge-6
+                .grid-x.small-up-2
+                  - unless @resource.archived?
+                    .cell
+                      = link_to @resource.path do
+                        = icon('eye')
+                        = t('integral.actions.view_on_site')
+                  - if policy(Integral::Page).manager?
+                    .cell
+                      = link_to edit_backend_page_url(@resource.id) do
+                        = icon('edit')
+                        = t('integral.actions.edit')
+                  - if policy(Integral::Page).duplicate?
+                    .cell
+                      = link_to duplicate_backend_page_url(@resource.id), method: :post, data: { confirm: t('integral.actions.confirmation.clone') } do
+                        = icon('clone')
+                        = t('integral.actions.clone')
+                  - if policy(Integral::Page).manager?
+                    .cell
+                      = link_to backend_page_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_page_url(@resource.id) do
+                        = icon('history')
+                        = t('integral.actions.view_history')
+
+      .cell.medium-6.flex-container= render_card(:object, { title: 'Essentials', record: @resource })
+      .cell.medium-6.flex-container= render_card(:recent_user_activity)
+  .cell.large-6
+    -# Right Column
+    .grid-x.grid-padding-x
+      .cell= render_card(:recent_activity)

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

@@ -18,7 +18,7 @@
         .cell
           .card
             .card-section
-              = f.input :body, as: :ckeditor, input_html: { id: 'resource_body_editor', ckeditor: { language: current_user.locale }, data: { 'ckeditor-class' => 'integral-post' } }
+              = f.input :body, as: :ckeditor, input_html: { value: @resource.editor_body, id: 'resource_body_editor', ckeditor: { language: current_user.locale }, data: { 'ckeditor-class' => 'integral-post' } }
 
     .cell.small-12.medium-3
       .grid-y
@@ -31,13 +31,18 @@
                 = f.collection_radio_buttons :status, Integral::Post.statuses.map{ |status| [status.first, I18n.t("integral.records.status.#{status.first}")] }, :first, :last
               %hr.dark
               = f.button :button if f.object.persisted?
+        .cell
+          .card
+            .card-section
+              %h2= t('integral.records.attributes.category')
+              %hr.dark
+              = f.input :category_id, collection: Integral::Category.all.map{ |category| [category.title, category.id] }, label: false
         .cell
           .card.initial-overflow
             .card-section
               %h2= t('integral.records.attributes.tags')
               %hr.dark
-              = f.input :tag_list, label: false, input_html: { value: @resource.tag_list_on(@resource.tag_context).join(','), data: { role: "materialtags", typeahead: Integral::Post.tag_counts.collect(&:name).join(' ') } }
-              %label.small Seperate tags with spaces
+              = f.input :tag_list, label: false, input_html: { value: @resource.tag_list_on(@resource.tag_context).join(','), data: { suggest_tags: true, suggest_tags_typeahead: Integral::Post.tag_counts.collect(&:name).join(' ') } }
         .cell
           .card
             .card-section
@@ -56,6 +61,3 @@
               %p.help-text This is displayed when sharing socially, leave blank to fallback to the featured image.
     .cell.small-12
       = f.button :button
-
-.record-image
-  = render partial: 'integral/backend/shared/image_selector'

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

@@ -2,7 +2,7 @@
   = render layout: 'integral/backend/shared/grid', locals: { grid: @grid, options: { columns: [:title, :user, :status, :view_count, :updated_at, :actions], order: true }} do |grid|
     - if grid.assets.any?
       - grid.assets.decorate.each do |record|
-        %tr
+        %tr.tr--clickable{ data: { href: backend_post_url(record.id), context_menu: "dropdown-pane-actions-post-#{record.id}" }}
           %td= record.title.truncate(30)
           %td
             - if record.user.present?
@@ -15,11 +15,37 @@
           %td= number_with_delimiter(record.view_count)
           %td= l(record.updated_at, format: :long)
           %td.actions
-            = link_to post_url(record) do
-              = icon('eye')
-            = link_to edit_backend_post_url(record) do
-              = icon('edit')
-            = link_to backend_post_url(record), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
-              = icon('remove')
+            %button.button--action-pane{ 'data-toggle' => "dropdown-pane-actions-post-#{record.id}" }
+              = icon('ellipsis-v')
+            .dropdown-pane.dropdown-pane--actions{ id: "dropdown-pane-actions-post-#{record.id}", data: { dropdown: true, position: :bottom, alignment: :right, close_on_click: 'true' } }
+              %ul.menu.vertical
+                - if policy(Integral::Post).manager?
+                  %li
+                    = link_to edit_backend_post_url(record.id) do
+                      = icon('edit')
+                      = t('integral.actions.edit')
+                %li
+                  = link_to post_url(record) do
+                    = icon('eye')
+                    = t('integral.actions.view_on_site')
+                %li
+                  = link_to backend_post_url(record.id), target: :blank do
+                    = icon('external-link')
+                    = t('integral.actions.open_in_new_tab')
+                - if policy(Integral::Post).duplicate?
+                  %li
+                    = link_to duplicate_backend_post_url(record.id), method: :post, data: { confirm: t('integral.actions.confirmation.clone') } do
+                      = icon('clone')
+                      = t('integral.actions.clone')
+                - if policy(Integral::Version).manager?
+                  %li
+                    = link_to activities_backend_post_url(record.id) do
+                      = icon('history')
+                      = t('integral.actions.view_history')
+                - if policy(Integral::Post).manager?
+                  %li
+                    = link_to backend_post_url(record.id), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
+                      = icon('remove')
+                      = t('integral.actions.delete')
     - else
       = render partial: 'integral/backend/shared/empty_grid'

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

@@ -1,20 +1,14 @@
-.card.listing
-  .card-section
-    %h2.show-for-small-only= t('.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: 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')
+.grid-x.grid-padding-x
+  -# Left Column
+  .cell.large-6
+    .grid-x.grid-padding-x
+      .cell= render_card(:recent_posts)
+      .cell= render_card(:categories)
+      .cell= render_card(:at_a_glance, { dataset: dataset_at_a_glance_posts })
 
-          %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'
+  -# Right Column
+  .cell.large-6
+    .grid-x.grid-padding-x
+      .cell= render_card(:recent_activity)
+      .cell.large-6= render_card(:recent_user_activity)
+      .cell.large-6= render_card(:top_post_authors)

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

@@ -0,0 +1,20 @@
+.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')
+
+          %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'