integral 1.0.1 → 1.5.0

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/grid/_dropdown_actions.haml

@@ -0,0 +1,17 @@
+- 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(Integral::Version).manager?
+  = link_to t('integral.actions.view_history'), activities_backend_resource_url(resource.id), icon: :history, wrapper: :li
+- if policy(resource_klass).manager?
+  %li
+    - if resource.blocked?
+      = link_to unblock_backend_user_url(resource.id), method: :put, data: { confirm: t('integral.actions.confirmation.unblock') } do
+        = icon('unlock')
+        = t('integral.actions.unblock')
+    - else
+      = link_to block_backend_user_url(resource.id), method: :put, data: { confirm: t('integral.actions.confirmation.block') } do
+        = icon('ban')
+        = t('integral.actions.block')
+- 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/users/grid/_row_content.haml

@@ -0,0 +1,8 @@
+%td
+  = image_tag resource.avatar.url(:thumbnail), class: :avatar
+  = resource.name.truncate(30)
+%td= resource.email
+%td
+  %span.label= t("integral.statuses.#{resource.status}")
+%td= l(resource.updated_at, format: :long)
+

data/app/views/integral/backend/users/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_user_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_user_url, class: 'button hollow'
-      .top-bar-right
-        = simple_form_for :grid, url: backend_users_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-x
+      .cell= render_card(:recent_resources)
+      .cell.xlarge-6= render_card(:recent_user_activity)
+      .cell= render_card(:at_a_glance)
 
-          %ul.align-right.menu.filters
-            %li= f.input :name, placeholder: t('integral.actions.search'), wrapper_html: { class: 'filter search' }, hint: false, label: false
-
-    = render partial: 'grid'
+  -# Right Column
+  .cell.large-6
+    .grid-x
+      .cell= render_card(:recent_activity)

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

@@ -0,0 +1,12 @@
+.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 :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 :name, placeholder: t('integral.actions.search'), wrapper_html: { class: 'filter search' }, hint: false, label: false
+
+  = render_resource_grid

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

@@ -1,36 +1,39 @@
-= 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
+  .cell.medium-6
     .grid-y
       .cell
         .card.profile
           .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))
+                %p
+                  = icon('user')
+                  = t("integral.statuses.#{@resource.status}")
+                %p
+                  - if @resource.notify_me?
+                    = icon('bell')
+                    = 'Notified about everything'
+                  - else
+                    = icon('bell-o')
+                    = 'Notified about only things that have been subscribed too'
                 .roles
-                  - @user.roles.each do |role|
+                  - @resource.roles.each do |role|
                     .label= role.label
-      -# .cell
-      -#   .card
-      -#     .card-section
-      -#       Creates Graph
-  -# .cell.small-12.medium-6
-  -#   .grid-y
-  -#     .cell
-  -#       .card
-  -#         .card-section
-  -#           %h2 Activity
+
+  .cell.medium-6
+    .grid-y
+      .cell= render_card(:recent_activity, { grid: recent_activity_grid(user: @resource.id) })

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

@@ -0,0 +1,5 @@
+= render_posts_as_json_ld(@posts, title: @resource.title, url: category_path(@resource), description: @resource.description)
+
+= render layout: 'integral/shared/blog/layout', locals: { title: @resource.title } do
+  = render partial: @posts, cached: true
+  .center= will_paginate @posts, { renderer: FoundationPagination::Rails, params: { category_path: true } }

data/app/views/integral/pages/_demo.haml

@@ -4,7 +4,7 @@
       .cell.medium-6.large-5
         %h1 A Rails CMS which just works.
         %p Create a website (which does stuff) within minutes powered by Rails 5.
-        = link_to 'GET STARTED', 'https://github.com/yamasolutions/integral', class: 'button', target: :blank
+        = link_to 'DEPLOY NOW', 'https://heroku.com/deploy?template=https://github.com/yamasolutions/integral-sample', class: 'button', target: :blank
         %p
           %small
             = icon('check', class: 'text-primary')
@@ -184,5 +184,5 @@
   .grid-container.text-center
     %h2 A Rails CMS which will knock your socks off
     %p Creating a professional website on Rails has never been easier
-    = link_to 'Get Started', 'https://github.com/yamasolutions/integral', class: 'button white hollow', target: :blank
+    = link_to 'Get Started', 'https://heroku.com/deploy?template=https://github.com/yamasolutions/integral-sample', class: 'button white hollow', target: :blank
 

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

@@ -0,0 +1,17 @@
+%footer.article-footer
+  .grid-x
+    .cell.medium-7
+      %ul.post-tags
+        %li
+          %span
+            = "#{t('integral.navigation.tags')}:"
+        - @post.tags_on(@post.tag_context).each do |tag|
+          %li= link_to tag.name, tag_url(tag.name)
+    .cell.medium-5.article-footer-actions
+      %button.button.secondary{ 'data-open' => 'share-modal' }= t('integral.actions.share')
+      %button.button{ 'data-open' => 'subscribe-modal' }= t('integral.actions.subscribe')
+  %section.grid-x.grid-margin-x
+    .cell.small-2.medium-3.large-2
+      %article.article-footer-image= @post.avatar
+    .cell.small-10.medium-9.large-10
+      %p= t('integral.posts.show.footer.blurb')

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

@@ -0,0 +1,11 @@
+.cell.small-3.flex-container
+  .card.post-card
+    = link_to integral.post_url(post) do
+      = image_tag post.image(:medium), class: 'post-card-image', alt: post.title
+      .card-section
+        %h3= post.title
+        %p= post.description
+        %ul.list-unstyled.piped-list
+          %li= post.published_at
+          -# %li= link_to 'Category', root_url
+          %li= post.category.title

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

@@ -0,0 +1,8 @@
+.latest-post
+  = link_to integral.post_url(post) do
+    = image_tag post.image(:large)
+  %h2.latest-post-title= link_to post.title, integral.post_path(post)
+  %p= post.description
+  %ul.list-unstyled.piped-list
+    %li= post.published_at
+    %li= link_to post.category.title, category_path(post.category)

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

@@ -0,0 +1,8 @@
+.inline-articles{ 'data-most-read-posts' => true}
+  %h2= t('integral.blog.widgets.most_read')
+  .grid-x.grid-padding-x
+    - most_read_posts.each do |post|
+      .cell.small-6.medium-3
+        = link_to post do
+          = image_tag post.image(:medium), alt: post.title
+          .inline-articles-title= post.title

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

@@ -0,0 +1,11 @@
+.horizontal-post
+  .grid-x.grid-padding-x
+    .cell.small-4
+      = link_to integral.post_url(post) do
+        = image_tag post.image, alt: post.title
+    .cell.small-8.horizontal-post-body
+      %h3= link_to post.title, integral.post_url(post)
+      %p.show-for-medium= post.description
+      %ul.list-unstyled.piped-list
+        %li= post.published_at
+        %li= link_to post.category.title, category_path(post.category)

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,6 +1,8 @@
-= 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_posts_as_json_ld(@posts.decorate)
 
+= 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,38 +1,38 @@
-= 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
+= render_post_as_json_ld(@post)
 
-  .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 google_plus_share_url, target: :blank do
-        = icon('google-plus')
-      = 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.draft? ? 'warning' : '' }= @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/_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

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.large.modal--gallery{ data: {reveal: true }}
+#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