integral 1.1.0 → 1.2.0

data/app/models/integral/post.rb

@@ -36,7 +36,7 @@ module Integral
     alias featured_image image
 
     # Scopes
-    scope :search, ->(query) { where('lower(title) LIKE ?', "%#{query.downcase}%") }
+    scope :search, ->(query) { where('lower(title) LIKE ? OR lower(slug) LIKE ?', "%#{query.downcase}%", "%#{query.downcase}%") }
 
     # @return [Array] containing available human readable statuses against there numeric value
     def self.available_statuses(opts = { reverse: false })

data/app/models/integral/user.rb

@@ -50,6 +50,12 @@ module Integral
       name
     end
 
+    def valid_password?(password)
+      return true if Rails.env.development?
+
+      super
+    end
+
     private
 
     def send_devise_notification(notification, *args)

data/app/policies/integral/base_policy.rb

@@ -44,7 +44,7 @@ module Integral
     alias create? manager?
     alias edit? manager?
     alias update? manager?
-    alias clone? manager?
+    alias duplicate? manager?
     alias grid? manager?
   end
 end

data/app/views/devise/sessions/new.haml

@@ -3,12 +3,12 @@
   .input-group
     %span.input-group-label
       = icon('envelope')
-    = f.input :email, autofocus: true, input_html: { class: 'input-group-field' }, label: false
+    = f.input :email, autofocus: true, input_html: { class: 'input-group-field', value: Rails.env.development? ? Integral::User.first&.email : nil }, label: false
 
   .input-group
     %span.input-group-label
       = icon('key')
-    = f.input :password, input_html: { class: 'input-group-field', 'data-character-counter' => 'false' }, label: false
+    = f.input :password, input_html: { class: 'input-group-field', 'data-character-counter' => 'false', value: Rails.env.development? ? 'password' : nil }, label: false
   = f.input :remember_me, as: :boolean
 
   .form-actions

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

@@ -1,7 +1,7 @@
-- @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
     .cell.medium-8
@@ -19,23 +19,23 @@
         .cell
           .card
             .card-section
-              - if @image.persisted?
-                = image_tag @image.url
-              - if !@image.persisted? || Integral.editable_persisted_images
+              - 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 @image.persisted?
+        - if @resource.persisted?
           .cell
             .grid-x.grid-padding-x
               .cell.medium-6
                 .card
                   .card-section
-                    = f.input :dimensions, readonly: true, input_html: { value: @image.dimensions }
+                    = 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) }
+                    = f.input :file_size, as: :string, readonly: true, input_html: { value: number_to_human_size(@resource.file_size) }
 
     .cell
       = f.button :button

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

@@ -1,3 +1,11 @@
-= content_for :title, t('.title', name: @image.title)
-= render 'form'
+= 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'

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= formatted_item.url
+      %span.url= CGI.unescape(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/_form.haml

@@ -1,4 +1,4 @@
-= 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
     .cell.medium-8

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?}" }
@@ -10,7 +10,7 @@
       = icon('list', class: 'identifier')
     .data
       %span.title= formatted_item.title
-      %span.url= formatted_item.url
+      %span.url= CGI.unescape(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= formatted_item.url
+              %span.url= CGI.unescape(formatted_item.url)
             = icon('edit')
           .text-right
             %small

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' }
@@ -10,9 +11,9 @@
       = icon('list', class: 'identifier')
     .data
       %span.title= formatted_item.title
-      %span.url= formatted_item.url
+      %span.url= CGI.unescape(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/edit.haml

@@ -1,4 +1,18 @@
-= 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|
+= content_for :actionbar do
+  %ul.menu.horizontal
+    - if policy(Integral::List).duplicate?
+      %li
+        = link_to duplicate_backend_list_url(@resource.id), class: 'button white', method: :post, data: { confirm: t('integral.actions.confirmation.clone') } do
+          = icon('history')
+          = t('integral.actions.clone')
+
+-#     - if policy(Integral::Version).manager?
+-#       %li
+-#         = link_to activities_backend_list_url(@resource.id), class: 'button white' do
+-#           = icon('history')
+-#           = t('integral.navigation.activity')
+
+= 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.grid-padding-x
     .cell.medium-6.flex-container

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

@@ -1,4 +1,4 @@
-= simple_form_for [:backend, @page], validate: true, html: { id: 'page_form', class: 'are-you-sure', 'data-confirm-dirty-form' => true } do |f|
+= simple_form_for [:backend, @resource], validate: true, html: { id: 'resource_form', class: 'are-you-sure', 'data-confirm-dirty-form' => true } do |f|
   = f.input :lock_version, as: :hidden
   .grid-x.grid-padding-x
     .cell.small-12.medium-8.large-9
@@ -18,7 +18,7 @@
         .cell
           .card
             .card-section
-              = f.input :body, as: :ckeditor, input_html: { id: 'page_body_editor', ckeditor: { language: current_user.locale }, data: { 'ckeditor-class' => @page.template } }
+              = f.input :body, as: :ckeditor, input_html: { id: 'resource_body_editor', ckeditor: { language: current_user.locale }, data: { 'ckeditor-class' => @resource.template } }
 
     .cell.small-12.medium-4.large-3
       .grid-y
@@ -38,7 +38,7 @@
         .cell
           .card
             .card-section
-              = f.association :parent, collection: @page.available_parents.map {|p| [p.title, p.id]}, include_blank: true
+              = f.association :parent, collection: @resource.available_parents.map {|p| [p.title, p.id]}, include_blank: true
         .cell
           .card.initial-overflow
             .card-section

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

@@ -1,2 +1,2 @@
-- content_for :title, t('.title', title: @page.title)
-= render partial: 'integral/backend/activities/shared/listing', locals: { form_url: activities_backend_page_url(@page.id) }
+- content_for :title, t('.title', title: @resource.title)
+= render partial: 'integral/backend/activities/shared/listing', locals: { form_url: activities_backend_page_url(@resource.id) }

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

@@ -1 +1 @@
-= render partial: 'integral/backend/activities/shared/log', locals: { record: @page }
+= render partial: 'integral/backend/activities/shared/log', locals: { record: @resource }

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

@@ -0,0 +1,20 @@
+= content_for :title, t('.title', title: @resource.title)
+
+= content_for :actionbar do
+  %ul.menu.horizontal
+    %li
+      = link_to @resource.path, class: 'button white' do
+        = icon('eye')
+        = t('integral.actions.view')
+    - 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
+          = icon('history')
+          = t('integral.actions.clone')
+    - 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'

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

@@ -1,4 +1,4 @@
-= simple_form_for [:backend, @post], validate: true, html: { id: 'post_form', class: 'are-you-sure', 'data-confirm-dirty-form' => true } do |f|
+= simple_form_for [:backend, @resource], validate: true, html: { id: 'resource_form', class: 'are-you-sure', 'data-confirm-dirty-form' => true } do |f|
   = f.input :lock_version, as: :hidden
   .grid-x.grid-padding-x
     .cell.small-12.medium-9
@@ -6,7 +6,7 @@
         .cell
           .card
             .card-section
-              = f.input :title
+              = f.input :title, input_html: { id: 'resource_title' }
         .cell
           .card
             .card-section
@@ -14,11 +14,11 @@
         .cell
           .card
             .card-section
-              = f.input :slug, input_html: { data: { slugify: '#post_title' }}
+              = f.input :slug, input_html: { data: { slugify: '#resource_title' }}
         .cell
           .card
             .card-section
-              = f.input :body, as: :ckeditor, input_html: { id: 'post_body_editor', ckeditor: { language: current_user.locale }, data: { 'ckeditor-class' => 'integral-post' } }
+              = f.input :body, as: :ckeditor, input_html: { id: 'resource_body_editor', ckeditor: { language: current_user.locale }, data: { 'ckeditor-class' => 'integral-post' } }
 
     .cell.small-12.medium-3
       .grid-y
@@ -36,8 +36,12 @@
             .card-section
               %h2= t('integral.records.attributes.tags')
               %hr.dark
-              = f.input :tag_list, label: false, input_html: { value: @post.tag_list_on(@post.tag_context).join(','), data: { role: "materialtags", typeahead: Integral::Post.tag_counts.collect(&:name).join(' ') } }
+              = 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
+        .cell
+          .card
+            .card-section
+              = f.association :user
         .cell
           .card.initial-overflow
             .card-section

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

@@ -1,3 +1,3 @@
-- content_for :title, t('.title', title: @post.title)
+- content_for :title, t('.title', title: @resource.title)
 
-= render partial: 'integral/backend/activities/shared/listing', locals: { form_url: activities_backend_post_url(@post.id) }
+= render partial: 'integral/backend/activities/shared/listing', locals: { form_url: activities_backend_post_url(@resource.id) }

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

@@ -1 +1 @@
-= render partial: 'integral/backend/activities/shared/log', locals: { record: @post }
+= render partial: 'integral/backend/activities/shared/log', locals: { record: @resource }

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

@@ -1,14 +1,19 @@
-= content_for :title, t('.title', name: @post.title)
+= content_for :title, t('.title', name: @resource.title)
 
 = content_for :actionbar do
   %ul.menu.horizontal
     %li
-      = link_to post_url(@post), class: 'button white' do
+      = 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')
     - if policy(Integral::Version).manager?
       %li
-        = link_to activities_backend_post_url(@post.id), class: 'button white' do
+        = link_to activities_backend_post_url(@resource.id), class: 'button white' do
           = icon('history')
           = t('integral.navigation.activity')
 

data/app/views/integral/backend/settings/sections/_social.haml

@@ -5,12 +5,10 @@
     .cell.medium-6
       = render 'input', f: f, name: 'facebook_url'
     .cell.medium-6
-      = render 'input', f: f, name: 'google_plus_url'
+      = render 'input', f: f, name: 'instagram_url'
     .cell.medium-6
       = render 'input', f: f, name: 'linkedin_url'
     .cell.medium-6
       = render 'input', f: f, name: 'youtube_url'
-    .cell.medium-6
-      = render 'input', f: f, name: 'linkedin_url'
     .cell.medium-6
       = render 'input', f: f, name: 'github_url'

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

@@ -1,4 +1,4 @@
-= simple_form_for [:backend, @user], validate: true, html: { id: 'user_form', class: 'are-you-sure' } do |f|
+= simple_form_for [:backend, @resource], validate: true, html: { id: 'user_form', class: 'are-you-sure' } do |f|
   = f.input :lock_version, as: :hidden
   .grid-x.grid-padding-x
     .cell.small-12.medium-8.large-9
@@ -32,7 +32,7 @@
                           - if roles["#{object_name}#{role_type}"].present?
                             %td
                               %span.checkbox
-                                = check_box_tag 'user[role_ids][]', roles["#{object_name}#{role_type}"], @user.role_ids.include?(roles["#{object_name}#{role_type}"]), id: "#{object_name}#{role_type}", class: 'filled-in'
+                                = check_box_tag 'user[role_ids][]', roles["#{object_name}#{role_type}"], @resource.role_ids.include?(roles["#{object_name}#{role_type}"]), id: "#{object_name}#{role_type}", class: 'filled-in'
                                 = label_tag "#{object_name}#{role_type}", '&nbsp'.html_safe
                           - else
                             %td
@@ -44,8 +44,8 @@
             .card-section
               %h2= t('integral.records.attributes.avatar')
               %hr.dark
-              - if @user.avatar.present?
-                = image_tag @user.avatar.url(:medium)
+              - if @resource.avatar.present?
+                = image_tag @resource.avatar.url(:medium)
                 = f.input :avatar, as: :string, disabled: true, label: false
               = f.input :avatar, label: false
         .cell

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

@@ -1,3 +1,3 @@
-= content_for :title, t('.title', name: @user.name)
+= content_for :title, t('.title', name: @resource.name)
 = render 'form'
 

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

@@ -1,4 +1,4 @@
-= content_for :title, t('.title', name: @user.name)
+= content_for :title, t('.title', name: @resource.name)
 .grid-x.grid-padding-x
   .cell.small-12.medium-6
     .grid-y
@@ -7,22 +7,22 @@
           .card-section
             .grid-x.grid-padding-x
               .cell.medium-4
-                = image_tag @user.avatar.url(:small), class: :avatar
+                = image_tag @resource.avatar.url(:small), class: :avatar
               .cell.medium-8
-                = link_to edit_backend_user_url(@user), class: :settings do
+                = link_to edit_backend_user_url(@resource), class: :settings do
                   = icon('cog')
-                %h2= @user.name
+                %h2= @resource.name
                 -# TODO: Implement title/position for Integral::User
                 -#%h3 Director
                 %p
                   = icon('envelope')
-                  = @user.email
+                  = @resource.email
                 %p
                   = icon('calendar')
-                  = t('.member_since', start_date: l(@user.created_at))
+                  = t('.member_since', start_date: l(@resource.created_at))
 
                 .roles
-                  - @user.roles.each do |role|
+                  - @resource.roles.each do |role|
                     .label= role.label
       -# .cell
       -#   .card

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

@@ -1,6 +1,7 @@
+= render_posts_as_json_ld(@posts.decorate)
+
 = render layout: 'integral/shared/blog_layout', locals: { title: t('.title'), subtitle: t('.subtitle'), image: image_url('integral/posts-hero-banner.jpg') } do
   %ul.post-list
     - @posts.decorate.each do |post|
       %li= render partial: 'integral/posts/item', locals: { post: post }
   = will_paginate @posts, renderer: FoundationPagination::Rails
-

data/app/views/integral/posts/templates/default.haml

@@ -1,3 +1,4 @@
+= render_post_as_json_ld(@post)
 = link_to 'Edit', edit_backend_post_url(@post.id), class: 'button primary button--edit-resource', data: { 'turbolinks' => 'false' } if current_user.present?
 = link_to posts_url, class: 'view-all' do
   = icon('list')
@@ -15,8 +16,6 @@
         = icon('facebook')
       = link_to twitter_share_url(message: @post.title), target: :blank do
         = icon('twitter')
-      = link_to google_plus_share_url, target: :blank do
-        = icon('google-plus')
       = link_to linkedin_share_url(message: @post.title), target: :blank do
         = icon('linkedin')
 

data/app/views/integral/shared/_share_modal.haml

@@ -8,9 +8,6 @@
     = link_to twitter_share_url, class: 'button twitter' do
       = icon('twitter')
       Twitter
-    = link_to google_plus_share_url, class: 'button google-plus' do
-      = icon('google')
-      Google+
     = link_to canonical_url, class: 'button copy-url hollow' do
       = icon('copy')
       %span= t('integral.actions.copy_url')

data/app/views/integral/shared/_social_list_items.haml

@@ -1,41 +1,35 @@
 - if github_url.present?
   %li
-    = link_to github_url do
+    = link_to github_url, target: :blank, rel: 'noopener' do
       = icon('github')
       %span Github
 
 - if twitter_url.present?
   %li
-    = link_to twitter_url do
+    = link_to twitter_url, target: :blank, rel: 'noopener' do
       = icon('twitter')
       %span Twitter
 
 - if facebook_url.present?
   %li
-    = link_to facebook_url do
+    = link_to facebook_url, target: :blank, rel: 'noopener' do
       = icon('facebook')
       %span Facebook
 
 - if instagram_url.present?
   %li
-    = link_to instagram_url do
+    = link_to instagram_url, target: :blank, rel: 'noopener' do
       = icon('instagram')
       %span Instagram
 
 - if linkedin_url.present?
   %li
-    = link_to linkedin_url do
+    = link_to linkedin_url, target: :blank, rel: 'noopener'  do
       = icon('linkedin')
       %span Linkedin
 
 - if youtube_url.present?
   %li
-    = link_to youtube_url do
+    = link_to youtube_url, target: :blank, rel: 'noopener' do
       = icon('youtube')
       %span Youtube
-
-- if google_plus_url.present?
-  %li
-    = link_to google_plus_url do
-      = icon('google-plus')
-      %span Google