integral 1.3.0 → 1.4.0

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

@@ -0,0 +1,5 @@
+- if @related_posts.present?
+  %h2.blog-subheading= t('integral.blog.widgets.related_posts')
+  .scroll-container{ 'data-item-width' => 250 }
+    .grid-x.grid-margin-x.scroll-wrapper
+      = render partial: 'integral/posts/card', collection: Integral::PostDecorator.decorate_collection(@related_posts), as: :post

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

@@ -1,7 +1,8 @@
 = 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
+= render layout: 'integral/shared/blog/layout', locals: { title: t('.title') } do
+  - if @latest_post.present?
+    = render partial: 'latest_post', locals: { post: @latest_post }
+  = render partial: @posts.decorate, cached: true
+  = render partial: 'most_read_section' if display_most_read_posts_widget?
+  .center= will_paginate @posts, renderer: FoundationPagination::Rails

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

@@ -1,37 +1,38 @@
 = 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')
-  VIEW ALL BLOG POSTS
-= render layout: 'integral/shared/blog_layout', locals: { title: @post.title, subtitle: @post.header_tags, image: @post.image(:large) } do
-  %p
-    %span.post-date= @post.published_at
-  %article#post-content.wysiwyg-content
-    = @post.body.html_safe
 
-  .share-widget
-    %p
-      %span{ 'data-open' => 'share-modal' }= t('integral.actions.share')
-      = link_to facebook_share_url, target: :blank do
-        = icon('facebook')
-      = link_to twitter_share_url(message: @post.title), target: :blank do
-        = icon('twitter')
-      = link_to linkedin_share_url(message: @post.title), target: :blank do
-        = icon('linkedin')
+= render partial: 'integral/shared/breadcrumbs'
+#blog-wrapper.grid-container
+  .grid-x.grid-padding-x
+    .cell.large-9
+      %article.article
+        %header
+          %h1
+            = @post.title
+            - if user_signed_in?
+              %span.label.entity-status{ class: @post.status }= @post.status
+              %span.small= link_to 'Edit', integral.edit_backend_post_url(@post.id), class: "button medium", data: { 'turbolinks' => 'false' }
+          .grid-x
+            .cell.medium-8
+              .article-author
+                %span= @post.avatar
+                = @post.author.name
+              %ul.list-unstyled.piped-list
+                %li= @post.published_at
+                %li= link_to @post.category.title, category_path(@post.category)
+            .cell.small-4.text-right.show-for-medium
+              %button.button{ 'data-open' => 'share-modal' }
+                = icon('share', class: 'show-for-medium')
+                = t('integral.actions.share')
+        %section.wysiwyg-content.wysiwyg-content--post
+          = @post.body.html_safe
+        = render partial: 'integral/posts/article_footer'
+      .hide-for-large= render partial: 'similar_posts'
 
-  %ul.tag-list.left
-    - @post.tags_on(@post.tag_context).each do |tag|
-      %li.post-tag
-        = link_to tag_url(tag.name) do
-          = tag.name
+    = render partial: 'integral/shared/blog/sidebar'
 
-  - if @related_posts.present?
-    %section.related-posts
-      %h3= t('integral.blog.widgets.related_posts')
-      .grid-x.grid-padding-x
-        - Integral::PostDecorator.decorate_collection(@related_posts).each do |p|
-          .cell.medium-4
-            = link_to integral.post_url(p) do
-              = image_tag p.image(:medium)
-              %h5= p.title
-            %span.subtitle= p.published_at
+.grid-container.show-for-large
+  = render partial: 'similar_posts'
+
+= render partial: 'integral/shared/blog/categories'
+= render partial: 'integral/shared/share_modal'
+= render partial: 'integral/shared/subscribe_modal'

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

@@ -0,0 +1,14 @@
+#subscribe-modal.reveal.text-center{ data: { reveal: '' } }
+  %button.close-button{ data: { close: '' }, aria: { label: "Close modal" }}
+    %span{ aria: { hidden: true } } ×
+
+  %h3= t('integral.blog.widgets.newsletter_signup.title')
+  %hr.modal-topbar
+
+  %p= t('integral.blog.widgets.newsletter_signup.subtitle')
+
+  = simple_form_for Integral::NewsletterSignup.new, url: newsletter_signup_url, validate: true, remote: true, html: { class: 'remote-form', data: { 'remote-form-success-message' => t('integral.blog.widgets.newsletter_signup.success') }} do |f|
+    = f.input :email, placeholder: t('integral.blog.widgets.newsletter_signup.placeholder'), label: false
+    = f.button :submit, t('integral.blog.widgets.newsletter_signup.submit'), class: 'button expanded'
+
+

data/app/views/integral/shared/blog/_categories.haml

@@ -0,0 +1,15 @@
+.grid-container
+  %h2.blog-subheading= t('integral.blog.widgets.categories')
+  .scroll-container{ 'data-item-width' => 250 }
+    .grid-x.grid-margin-x.scroll-wrapper
+      - featured_categories.decorate.each do |category|
+        .cell.medium-3
+          .list-widget
+            .list-widget-image
+              = link_to category_path(category) do
+                = image_tag category.image_url
+                .list-widget-tag= category.title
+            %ul.no-bullet
+              - category.posts(4).each do |post|
+                %li= link_to post.title, integral.post_path(post)
+

data/app/views/integral/shared/blog/_layout.haml

@@ -0,0 +1,9 @@
+= render partial: 'integral/shared/breadcrumbs'
+
+#blog-wrapper.grid-container
+  %h1= title
+  .grid-x.grid-padding-x
+    .cell.large-9{ 'data-post-list' => true }
+      = yield
+    = render partial: 'integral/shared/blog/sidebar'
+= render partial: 'integral/shared/blog/categories'

data/app/views/integral/shared/blog/_sidebar.haml

@@ -0,0 +1,10 @@
+.cell.small-12.large-3
+  - if display_newsletter_signup_widget?
+    = render partial: 'integral/shared/sidebar/newsletter_signup'
+
+  - if display_recent_posts_widget?
+    = render partial: 'integral/shared/sidebar/recent_posts'
+
+  - if display_popular_posts_widget?
+    = render partial: 'integral/shared/sidebar/popular_posts'
+  = render partial: 'integral/shared/sidebar/popular_tags'

data/app/views/integral/shared/gallery/_placeholder.haml

@@ -1,7 +1,7 @@
 #gallery-placeholder.reveal.full.modal--gallery{ data: {reveal: true }}
   %button.close-button{ data: { close: '' }, aria: { label: "Close modal" }}
     %span{ aria: { hidden: true } } ×
-  .content
   .placeholder
     = icon('spinner', class: 'fa-pulse')
     %p Loading..
+  .content

data/app/views/integral/shared/gallery/_slide.haml

@@ -1,5 +1,5 @@
 - if type == 'Integral::Link'
-  .responsive-embed.widescreen
-    %iframe{ src: url, frameborder: '0',  allow: 'autoplay; encrypted-media', allowfullscreen: true }
+  -# Assumes url is a YouTube embed URL i.e -> https://www.youtube.com/embed/mNzvpFcJXU
+  %iframe{ src: "#{url}?enablejsapi=1", frameborder: '0',  allow: 'autoplay; encrypted-media', allowfullscreen: true }
 - else
   = image_tag image

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

@@ -1,6 +1,9 @@
 - if @list.list_items.present?
-  = render_gallery(@list, { html_classes: 'main-swiper'})
-  = render_thumb_gallery(@list, { html_classes: 'thumb-swiper'})
+  - if @list.list_items.count > 1
+    = render_gallery(@list, { html_classes: 'main-swiper'})
+    = render_thumb_gallery(@list, { html_classes: 'thumb-swiper'})
+  - else
+    = Integral::PartialListItemRenderer.new(@list.list_items.first, partial_path: 'integral/shared/gallery/slide').render_item
 - else
   %p.text-center
     Sorry, no media available.

data/app/views/integral/shared/sidebar/_item.haml

@@ -0,0 +1,8 @@
+.grid-x.list-item
+  .cell.small-3.image
+    = link_to url do
+      = image_tag image, class: 'thumbnail' unless image.empty? #TODO: Should thumbnail be here?
+  .cell.small-9.data
+    = link_to title, url
+    %ul.list-unstyled.piped-list
+      %li= subtitle

data/app/views/integral/shared/sidebar/_newsletter_signup.haml

@@ -0,0 +1,7 @@
+.sidebar-widget.newsletter-signup
+  = icon('envelope-open')
+  %h4= t('integral.blog.widgets.newsletter_signup.title')
+  %p= t('integral.blog.widgets.newsletter_signup.subtitle')
+  = simple_form_for Integral::NewsletterSignup.new, url: newsletter_signup_url, validate: true, remote: true, html: { class: 'remote-form', data: { 'remote-form-success-message' => t('integral.blog.widgets.newsletter_signup.success') }} do |f|
+    = f.input :email, placeholder: t('integral.blog.widgets.newsletter_signup.placeholder'), label: false
+    = f.button :submit, t('integral.blog.widgets.newsletter_signup.submit'), class: 'button'

data/app/views/integral/shared/sidebar/_popular_posts.haml

@@ -0,0 +1,7 @@
+- cache [@popular_posts.map(&:id), @popular_posts.maximum(:updated_at)] do
+  .sidebar-widget
+    %h2.sidebar-widget-title= t('integral.blog.widgets.popular_posts')
+    .sidebar-articles
+      -# TODO: Use collection rendering - possibly create a post sidebar item partial?
+      - @popular_posts.decorate.each do |post|
+        = render 'integral/shared/sidebar/item', url: integral.post_url(post), image: post.image(:small), title: post.title, subtitle: t('integral.blog.posted_ago', time: time_ago_in_words(post.published_at))

data/app/views/integral/shared/sidebar/_popular_tags.haml

@@ -0,0 +1,7 @@
+.sidebar-widget
+  %h2.sidebar-widget-title= t('integral.blog.widgets.popular_tags')
+  .sidebar-tags
+    %ul.post-tags
+      - @blog_tags.each do |tag|
+        %li= link_to tag.name, tag_url(tag.name)
+  = link_to 'View All', integral.tags_url, class: 'sidebar-widget-link'

data/app/views/integral/shared/sidebar/_recent_posts.haml

@@ -0,0 +1,7 @@
+- cache [@recent_posts.map(&:id), @recent_posts.maximum(:updated_at)] do
+  .sidebar-widget
+    %h2.sidebar-widget-title= t('integral.blog.widgets.recent_posts')
+    .sidebar-articles
+      -# TODO: Use collection rendering - possibly create a post sidebar item partial?
+      - @recent_posts.decorate.each do |post|
+        = render 'integral/shared/sidebar/item', url: integral.post_url(post), image: post.image(:small), title: post.title, subtitle: t('integral.blog.posted_ago', time: time_ago_in_words(post.published_at))

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

@@ -1,5 +1,5 @@
-= render layout: 'integral/shared/blog_layout', locals: { title: t('.title'), subtitle: t('.subtitle'), image: image_url('integral/posts-hero-banner.jpg')} do
-  %ul.tag-list
+= render layout: 'integral/shared/blog/layout', locals: { title: t('.title') } do
+  %ul.post-tags.text-center
     - @tags.each do |tag|
       %li
         = link_to tag_url(tag.name) do

data/app/views/integral/tags/show.haml

@@ -1,6 +1,3 @@
-= render layout: 'integral/shared/blog_layout', locals: { title: "##{@tag.name}", subtitle: t('.subtitle'), image: image_url('integral/posts-hero-banner.jpg')} do
-  %ul.post-list
-    - @tagged_posts.decorate.each do |post|
-      %li= render partial: 'integral/posts/item', locals: { post: post }
-  = will_paginate @tagged_posts, renderer: FoundationPagination::Rails
-
+= render layout: 'integral/shared/blog/layout', locals: { title: "##{@tag.name}" } do
+  = render partial: @tagged_posts.decorate, cached: true
+  .center= will_paginate @tagged_posts, renderer: FoundationPagination::Rails

data/app/views/layouts/integral/backend.html.haml

@@ -91,3 +91,6 @@
           #content-area
             = render partial: 'integral/backend/shared/breadcrumbs'
             = yield
+    .record-image
+      = render partial: 'integral/backend/shared/image_selector'
+    = render partial: 'integral/backend/shared/activity_modal'

data/app/views/layouts/integral/backend/_main_menu_items.haml

@@ -18,6 +18,10 @@
         %li
           = link_to new_backend_page_url do
             %span= t('integral.actions.create')
+      %li
+        = link_to list_backend_pages_url do
+          %span= t('integral.navigation.listing')
+
 
 - if policy(Integral::Post).index? && Integral.blog_enabled?
   %li
@@ -33,6 +37,9 @@
         %li
           = link_to new_backend_post_url do
             %span= t('integral.actions.create')
+      %li
+        = link_to list_backend_posts_url do
+          %span= t('integral.navigation.listing')
 
 - if policy(Integral::List).index?
   %li
@@ -77,6 +84,9 @@
       %li
         = link_to new_backend_user_url do
           %span= t('integral.actions.create')
+      %li
+        = link_to list_backend_users_url do
+          %span= t('integral.navigation.listing')
 
 - if policy(Integral::Version).manager?
   %li

data/app/views/layouts/integral/frontend.html.haml

@@ -16,19 +16,19 @@
     = render 'layouts/integral/frontend/admin_bar' if user_signed_in?
 
     -# Off Canvas - Mobile Menu
-    #offCanvas.off-canvas.position-left{ 'data-off-canvas' => true }
+    #offCanvas.off-canvas.position-right{ 'data-off-canvas' => true }
       = link_to site_title, root_url, class: 'site-title'
       = render_list(main_menu_list, { html_classes: 'menu vertical'})
 
     -# Off Canvas - Main Content
     .off-canvas-content{ 'data-off-canvas-content' => true }
-      %header
+      %header.body-header
         = render partial: 'layouts/integral/frontend/header'
 
       %main
         = yield
 
-      %footer
+      %footer.body-footer
         = render partial: 'layouts/integral/frontend/footer'
 
     = render partial: 'integral/shared/share_modal'

data/config/locales/en.yml

@@ -4,7 +4,7 @@ en:
       default: "%d %B"
   time:
     formats:
-      default: "%B %d, %Y at %l:%M%P"
+      default: "%b %d %Y, %l:%M %P"
       blog: "%B %d, %Y"
       twelve_hour: "%I:%M %p"
 
@@ -46,6 +46,12 @@ en:
       forward_enquiry:
         subject: Website Enquiry
     actions:
+      tense:
+        past:
+          update: Updated
+          create: Created
+          publish: Published
+          destroy: Deleted
       confirmation:
         deletion: If you delete this item it will be gone forever. Are you sure you want to proceed?
         clone: Are you sure you want to clone this item?
@@ -55,6 +61,8 @@ en:
       add_image: Add Image
       add_image_or_video: Add an image or video
       view_main_site: View main site
+      view_on_site: View on site
+      publish: Publish
       create: Create
       clone: Clone
       save: Save
@@ -66,18 +74,23 @@ en:
       view: View
       view_record: View Record
       view_user: View User
+      view_history: View history
       read_more: Read more..
       reply: Reply
       log_out: Logout
       upload: Upload
-      share: Share this
+      share: Share
       apply: Apply
       select: Select
       copy_url: Copy URL
       copied: Copied
       search: Search
+      subscribe: Subscribe
       confirm: Confirm
       cancel: Cancel
+      view_all: View All
+      view_more: View More
+      open_in_new_tab: Open in new tab
     prompts:
       select_image: Select Image..
       select_type: Select Type..
@@ -91,6 +104,7 @@ en:
       archived: Archived
     records:
       attributes:
+        category: Category
         locale: Language
         image: Image
         featured_image: Featured Image
@@ -135,6 +149,7 @@ en:
       home: Home
       posts: Posts
       post: Post
+      tags: Tags
       pages: Pages
       page: Page
       users: Users
@@ -148,6 +163,7 @@ en:
       log_out: Logout
       my_account: Account & Profile
       settings: Settings
+      listing: Listing
 
     posts:
       index:
@@ -155,6 +171,8 @@ en:
         subtitle: All things Integral
       show:
         subtitle: An interesting read
+        footer:
+          blurb: Have questions about this article, want to provide feedback or contact us for any reason? Get in touch with us today. We'd love to hear from you.
       item:
         read_more: Read More
     tags:
@@ -166,7 +184,9 @@ en:
         subtitle: Related Articles
         description: "All articles tagged %{tag_name} within our blog"
     blog:
+      posted_ago: "Published %{time} ago"
       widgets:
+        most_read: Most Read Articles
         related_posts: Related Posts
         recent_posts: Recent Posts
         popular_posts: Popular Posts
@@ -180,9 +200,27 @@ en:
           submit: Sign Up
           success: Great choice! Stay tuned for some quality content direct to your inbox.
     backend:
+      titles:
+        new: "New %{type_singular}"
+        create: "Create %{type_singular}"
+        edit: "Edit %{type_singular}"
+        update: "Update %{type_singular}"
+        index: "%{type_plural}"
+        list: "%{type_singular} Listing"
+      notifications:
+        clone_success: "%{type} successfully cloned."
+        clone_failure: "%{type} clone failed."
+        creation_success: "%{type} successfully created."
+        creation_failure: "%{type} creation failed."
+        edit_success: "%{type} successfully updated."
+        edit_failure: "%{type} update failed."
+        delete_success: "%{type} successfully deleted."
+        delete_failure: "%{type} deletion failed."
       graphs:
         data_unavailable: Data Unavailable
       cards:
+        your_activity: Your Activity
+        recent_activity: Recent Activity
         at_a_glance: At a glance
         last_week: Last week
       shared:
@@ -227,6 +265,9 @@ en:
       activities:
         index:
           title: Website Activity
+        shared:
+          index:
+            title: "Activities: %{title}"
       lists:
         items:
           type:
@@ -247,15 +288,6 @@ en:
           columns:
             title: 'Title'
             description: 'Description'
-        notification:
-          clone_success: 'List successfully cloned.'
-          clone_failure: 'List clone failed.'
-          creation_success: 'List successfully created.'
-          creation_failure: 'List creation failed.'
-          edit_success: 'List successfully updated.'
-          edit_failure: 'Failed to update list.'
-          delete_success: 'List successfully deleted.'
-          delete_failure: 'Failed to delete list.'
       settings:
         index:
           title: Settings
@@ -296,7 +328,6 @@ en:
             views: 'Views'
             status: 'Status'
         index:
-          title: 'Posts'
           new_post: 'Create post'
           published_count: "%{count} published"
           drafts_count: "%{count} drafted"
@@ -305,22 +336,13 @@ en:
           title: 'Edit Post'
         new:
           title: 'New Post'
-        activities:
-          title: "Activities: %{title}"
-        notification:
-          clone_success: 'Post successfully cloned.'
-          clone_failure: 'Post clone failed.'
-          creation_success: 'Post successfully created.'
-          creation_failure: 'Post creation failed.'
-          edit_success: 'Post successfully updated.'
-          edit_failure: 'Failed to update post.'
-          delete_success: 'Post successfully deleted.'
-          delete_failure: 'Failed to delete post.'
       pages:
         templates:
           default: Default
         prompts:
           choose_template: Choose Template
+        activities:
+          title: Page Activity
         index:
           title: 'Page listing'
           non_available: 'No pages available. Try creating one!'
@@ -333,15 +355,6 @@ en:
             description: 'Description'
             path: 'Path'
             last_updated_at: 'Last updated'
-        notification:
-          clone_success: 'Page successfully cloned.'
-          clone_failure: 'Page clone failed.'
-          creation_success: 'Page successfully created.'
-          creation_failure: 'Page creation failed.'
-          edit_success: 'Page successfully updated.'
-          edit_failure: 'Failed to update page.'
-          delete_success: 'Page successfully deleted.'
-          delete_failure: 'Failed to delete page.'
         edit:
           title: 'Editing page - %{title}'
         new:
@@ -355,15 +368,6 @@ en:
           title: 'Image listing'
           no_images_available: 'No images available. Try uploading some!'
           new_image: 'New image'
-        notification:
-          creation_success: 'Image successfully created.'
-          creation_failure: 'Image creation failed.'
-          edit_success: 'Image successfully updated.'
-          edit_failure: 'Failed to update Image.'
-          delete_success: 'Image successfully deleted.'
-          delete_failure: 'Failed to delete image.'
-        edit:
-          title: 'Editing image - %{name}'
       users:
         available_locales:
           en: English
@@ -371,13 +375,6 @@ en:
         status:
           draft: 'Draft'
           published: 'Published'
-        notification:
-          creation_success: 'User has been invited.'
-          creation_failure: 'User creation failed.'
-          edit_success: 'User successfully updated.'
-          edit_failure: 'Failed to update user.'
-          delete_success: 'User successfully deleted.'
-          delete_failure: 'Failed to delete user.'
         prompts:
           select_language: 'Select language..'
         grid:
@@ -418,7 +415,7 @@ en:
         description: "Summarise the content. This will be displayed in search results and is an important part of on-page SEO. <a target='_blank' href='https://moz.com/learn/seo/meta-description'>Learn More.</a>"
         path: Path to the record, this will be appended onto the website domain to create a URL. Example - /company/privacy-policy
         parent: "You can arrange your pages in hierarchies by selecting a top level page for your other pages. <a target='_blank' href='https://en.wikipedia.org/wiki/Breadcrumb_(navigation)#Websites'>Learn More.</a>"
-        #tag_list: Use key terms to summarise your content and seperate words with '-', i.e. internet-marketing-tips
+        tag_list: Use key terms to summarise your content and seperate words with '-', i.e. internet-marketing-tips
         template: Layout which will be used to render the page.
 
       image:
@@ -489,3 +486,9 @@ en:
         someone_invited_you: "%{name} has invited you to %{url}, you can accept it through the link below."
   ckeditor:
     populate_editor: Populate editor with example content.
+
+  activerecord:
+    models:
+      integral/post:
+        one: Post
+        other: Posts