integral 1.4.0 → 1.5.0

data/app/views/integral/backend/shared/grid/_form.haml

@@ -0,0 +1,9 @@
+= simple_form_for :grid, url: list_backend_resources_url, method: :get, remote: true, html: { id: :grid_form, 'data-type' => :json } do |f|
+  = hidden_field_tag(:gridview, true)
+  = f.hidden_field(:descending, value: resource_grid.descending, class: 'desc-field')
+  = f.hidden_field(:order, value: resource_grid.order, class: 'order-field')
+  = f.hidden_field(:page, value: grid_options[:page], class: 'page-field')
+
+  %ul.align-right.menu.filters
+    = yield(f)
+

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

@@ -0,0 +1,21 @@
+- options = local_assigns.reverse_merge({ order: true, columns: resource_grid_columns })
+
+= render_data_grid do
+  %table.integral-grid.wice-grid.table-striped.hover
+    %thead
+      %tr
+        - resource_grid.html_columns(*options[:columns]).uniq { |col| col.name }.sort_by{ |item| options[:columns].index item.name }.each do |column|
+          %th{ class: datagrid_column_classes(resource_grid, column) }
+            - if column.supports_order? && options[:order]
+              %button{ data: { sort: column.name, desc: (!resource_grid.descending).to_s }}
+                = column.header
+            - else
+              = column.header
+    %tbody
+      - if resource_grid.assets.any?
+        = render partial: "#{self.controller._prefixes.first}/grid/row_content", collection: resource_grid.assets.decorate, layout: 'integral/backend/shared/grid/row_layout', as: :resource
+      - else
+        = render partial: 'integral/backend/shared/grid/empty'
+
+  = render partial: 'integral/backend/shared/grid/pagination', locals: { records: resource_grid.assets }
+  = icon('spinner', class: 'fa-pulse fa-3x fa-fw load-indicator')

data/app/views/integral/backend/shared/grid/_row_layout.haml

@@ -0,0 +1,8 @@
+%tr.tr--clickable{ data: { href: backend_resource_url(resource), context_menu: "dropdown-pane-actions-page-#{resource.id}" }}
+  = yield
+  %td.actions
+    %button.button--action-pane{ 'data-toggle' => "dropdown-pane-actions-page-#{resource.id}" }
+      = icon('ellipsis-v')
+    .dropdown-pane.dropdown-pane--actions{ id: "dropdown-pane-actions-page-#{resource.id}", data: { dropdown: true, position: :bottom, alignment: :right, close_on_click: 'true' } }
+      %ul.menu.vertical
+        = render partial: "#{self.controller._prefixes.first}/grid/dropdown_actions", locals: { resource: resource }

data/app/views/integral/backend/shared/record_selector/_collection.haml

@@ -2,6 +2,7 @@
   = render partial: 'integral/backend/shared/record_selector/record', locals: { list_item: { image: '', title: '', subtitle: '' }}
 
 - if collection.empty?
+  .grid-x
   %p.text-center.no-records
     = t('integral.backend.tables.no_data_available')
     = image_tag image_path('integral/backend/data-unavailable.png')

data/app/views/integral/backend/shared/record_selector/_modal.haml

@@ -10,18 +10,17 @@
   .modal-content
     .grid-x.grid-padding-x
       .cell.medium-9
-        = form_tag search_path, method: :get, remote: true, format: :json , data: {'type' => 'json'} do
-          .top-bar
-            .top-bar-left
-              .filter.search
-                = text_field_tag :search, '', class: 'search-field', placeholder: 'Search..'
+        .top-bar
+          .top-bar-left
+            = form_tag search_path, method: :get, remote: true, format: :json , data: {'type' => 'json'} do
+              .filter.search= text_field_tag :search, '', class: 'search-field', placeholder: 'Search..'
               = hidden_field_tag :page, '', class: 'page-field', value: 1
 
-            - if defined?(create_modal)
-              .top-bar-right
-                %button.button.create-button{ data: { 'target' => create_modal }}
-                  = icon('cloud-upload')
-                  = t('integral.actions.upload')
+          - if defined?(create_modal)
+            .top-bar-right
+              %button.button.create-button{ data: { 'target' => create_modal }}
+                = icon('cloud-upload')
+                = t('integral.actions.upload')
         .loader.text-center
           = icon('spinner', class: 'fa-pulse fa-3x fa-fw')
           %span.sr-only Loading..

data/app/views/integral/backend/static_pages/dashboard.haml

@@ -3,21 +3,20 @@
 .grid-x
   .cell.large-6
     -# Left Column
-    .grid-x.grid-padding-x
+    .grid-x
       .cell= render_card(:welcome)
       - if Integral.blog_enabled? & Integral::Post.published.last.present?
         .cell.medium-6.flex-container= render_card(:object, { title: t('.recent_post'), record: Integral::Post.published.last })
 
-      .cell.medium-6.flex-container= render_card(:recent_user_activity)
       .cell.medium-6.flex-container= render_card(:object, { title: t('.recent_page'), record: Integral::Page.published.last })
+      .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)
-      .cell= render_card(:at_a_glance, { dataset: dataset_dashboard_atg })
+      .cell= render_card(:at_a_glance)
       .cell
         .card
-          .card-section
-            %h2= t('integral.backend.cards.last_week')
-            = render_line_chart(dataset_dashboard_last_week)
+          %h2= t('integral.backend.cards.last_week')
+          = render_line_chart(dataset_dashboard_last_week)
 

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

@@ -1,58 +1,46 @@
 = 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
+  .grid-x
+    .cell.medium-8.large-9
       .grid-y
-        .cell
-          .card
-            .card-section
-              = f.input :name
-        .cell
-          .card
-            .card-section
-              = f.input :email
+        = f.input :name
+        = f.input :email
         - if policy(current_user).manager?
           .cell
             .card
-              .card-section
-                - roles = Integral::Role.all.map { |role| [role.name, role.id ] }.to_h
-                = hidden_field_tag 'user[role_ids][]'
-                %table.table-striped.centered.js-table--user-roles
-                  %thead
-                    %th Role
-                    %th Reader
-                    %th Contributer
-                    %th Editor
-                    %th Manager
-                  %tbody
-                    - for object_name in ['Page', 'Post', 'List', 'Image', 'User']
-                      %tr
-                        %th= object_name
-                        - for role_type in ['Reader', 'Contributer', 'Editor', 'Manager']
-                          - if roles["#{object_name}#{role_type}"].present?
-                            %td
-                              %span.checkbox
-                                = 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
+              - roles = Integral::Role.all.map { |role| [role.name, role.id ] }.to_h
+              = hidden_field_tag 'user[role_ids][]'
+              %table.table-striped.centered.js-table--user-roles
+                %thead
+                  %th Role
+                  %th Reader
+                  %th Contributer
+                  %th Editor
+                  %th Manager
+                %tbody
+                  - for object_name in ['Page', 'Post', 'List', 'Image', 'User']
+                    %tr
+                      %th= object_name
+                      - for role_type in ['Reader', 'Contributer', 'Editor', 'Manager']
+                        - if roles["#{object_name}#{role_type}"].present?
+                          %td
+                            %span.checkbox
+                              = 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
 
-    .cell.small-12.medium-4.large-3
+    .cell.medium-4.large-3
       .grid-y
+        = f.input :notify_me
         .cell
           .card
-            .card-section
-              %h2= t('integral.records.attributes.avatar')
-              %hr.dark
-              - 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
-          .card
-            .card-section
-              = f.input :locale, collection: Integral::User.available_locales, prompt: t('integral.backend.users.prompts.select_language'), include_blank: false
+            = f.label(:avatar)
+            - if @resource.avatar.present?
+              = image_tag @resource.avatar.url(:medium)
+              = f.input :avatar, as: :string, disabled: true, label: false
+            = f.input :avatar, label: false
+        = f.input :locale, collection: Integral::User.available_locales, prompt: t('integral.backend.users.prompts.select_language'), include_blank: false
 
-    .cell.small-12
-      = f.button :button
+    .cell= f.button :button
 

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,12 +1,12 @@
-.grid-x.grid-padding-x
+.grid-x
   -# Left Column
   .cell.large-6
-    .grid-x.grid-padding-x
-      .cell= render_card(:recent_users)
-      .cell.large-6= render_card(:recent_user_activity)
-      -# .cell= render_card(:at_a_glance, { dataset: dataset_at_a_glance_posts })
+    .grid-x
+      .cell= render_card(:recent_resources)
+      .cell.xlarge-6= render_card(:recent_user_activity)
+      .cell= render_card(:at_a_glance)
 
   -# Right Column
   .cell.large-6
-    .grid-x.grid-padding-x
+    .grid-x
       .cell= render_card(:recent_activity)

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

@@ -1,18 +1,12 @@
 .card.listing
-  .card-section
-    %h2.show-for-small-only= page_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')
+  %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
 
-          %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'
+  = render_resource_grid

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

@@ -20,7 +20,16 @@
                 %p
                   = icon('calendar')
                   = 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
                   - @resource.roles.each do |role|
                     .label= role.label

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

@@ -1,5 +1,5 @@
-= render_posts_as_json_ld(@posts.decorate, title: @resource.title, url: category_path(@resource), description: @resource.description)
+= 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.decorate, cached: true
-  .center= will_paginate @posts, renderer: FoundationPagination::Rails
+  = render partial: @posts, cached: true
+  .center= will_paginate @posts, { renderer: FoundationPagination::Rails, params: { category_path: true } }

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

@@ -6,7 +6,7 @@
           %span
             = "#{t('integral.navigation.tags')}:"
         - @post.tags_on(@post.tag_context).each do |tag|
-          %li= link_to tag.name, tag_url(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')

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

@@ -1,7 +1,7 @@
 .cell.small-3.flex-container
   .card.post-card
     = link_to integral.post_url(post) do
-      = image_tag post.image(:medium), class: 'post-card-image'
+      = image_tag post.image(:medium), class: 'post-card-image', alt: post.title
       .card-section
         %h3= post.title
         %p= post.description

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

@@ -4,5 +4,5 @@
     - most_read_posts.each do |post|
       .cell.small-6.medium-3
         = link_to post do
-          = image_tag post.image(:medium)
+          = image_tag post.image(:medium), alt: post.title
           .inline-articles-title= post.title

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

@@ -2,7 +2,7 @@
   .grid-x.grid-padding-x
     .cell.small-4
       = link_to integral.post_url(post) do
-        = image_tag post.image
+        = 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

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

@@ -9,7 +9,7 @@
           %h1
             = @post.title
             - if user_signed_in?
-              %span.label.entity-status{ class: @post.status }= @post.status
+              %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

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

@@ -1,7 +1,7 @@
 .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?
+      = image_tag image, alt: title, class: 'thumbnail' unless image.empty? #TODO: Should thumbnail be here?
   .cell.small-9.data
     = link_to title, url
     %ul.list-unstyled.piped-list

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

@@ -38,9 +38,28 @@
                   = link_to main_app.root_path, class: 'button clear' do
                     = icon('eye')
                     = t('integral.actions.view_main_site')
+                %li
+                  %button.button-notifications-dropdown{ type: 'button', data: { toggle: 'notifications-dropdown'}}
+                    - if current_user.notifications.unread.any?
+                      = icon('circle')
+                      = icon('bell-o')
+                    - else
+                      = icon('bell-o')
+                  #notifications-dropdown.dropdown-pane.dropdown-pane--notifications{ data: { notifications: true, load_more_url: current_user.multiple_page_notifications? ? notifications_backend_user_url(current_user, page: 2) : '', dropdown: true, hover: 'true', 'hover-pane' => 'true', 'v-offset' => '35', 'hover-delay' => 50 }}
+                    .section.text-center
+                      %span.title
+                        = current_user.notifications.unread.count
+                        Unread
+                      %span.subtitle User Notifications
+                    .section
+                      %ul.menu.vertical.notification-list
+                        = render recent_user_notifications.decorate, cached: true
+                      - if current_user.multiple_page_notifications?
+                        %p.notification-list-loader.js-loader--notifications
+                          = icon('spinner', class: 'fa-pulse fa-fw')
                 %li
                   %button.button.clear.avatar{ type: 'button', data: { toggle: 'profile-dropdown'}}= image_tag(current_user.avatar.url(:thumbnail), class: 'avatar')
-                  #profile-dropdown.dropdown-pane{ data: { dropdown: true, hover: 'true', 'hover-pane'=> 'true', 'v-offset'=> '35', 'hover-delay'=> 50 }}
+                  #profile-dropdown.dropdown-pane.dropdown-pane--profile{ data: { dropdown: true, hover: 'true', 'hover-pane'=> 'true', 'v-offset'=> '35', 'hover-delay'=> 50 }}
                     .section
                       = image_tag(current_user.avatar.url(:thumbnail), class: 'avatar')
                       %span.name= current_user.name
@@ -51,10 +70,10 @@
                           = link_to backend_account_url do
                             = icon('user')
                             %span= t('integral.navigation.profile')
-                        -# %li
-                        -#   = link_to new_backend_post_url do
-                        -#     = icon('history')
-                        -#     %span= t('integral.navigation.activity')
+                        %li
+                          = link_to edit_backend_user_url(current_user.id) do
+                            = icon('cog')
+                            %span= t('integral.actions.edit_profile')
                       %hr
                       = link_to t('integral.actions.log_out'), destroy_user_session_path, method: :delete, class: 'button hollow'
 

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

@@ -1,30 +1 @@
-%ul.menu.vertical
-  - if policy(Integral::Page).create?
-    %li
-      = link_to new_backend_page_url do
-        = icon('file-text-o')
-        %span= t('integral.navigation.page')
-
-  - if policy(Integral::Post).create? && Integral.blog_enabled?
-    %li
-      = link_to new_backend_post_url do
-        = icon('rss')
-        %span= t('integral.navigation.post')
-
-  - if policy(Integral::Image).create?
-    %li
-      = link_to new_backend_img_url do
-        = icon('picture-o')
-        %span= t('integral.navigation.image')
-
-  - if policy(Integral::List).create?
-    %li
-      = link_to new_backend_list_url do
-        = icon('list')
-        %span= t('integral.navigation.list')
-  - if policy(current_user).create?
-    %li
-      = link_to new_backend_user_url do
-        = icon('user')
-        %span= t('integral.navigation.user')
-
+%ul.menu.vertical= render_create_menu