integral 1.1.0 → 1.5.1

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, 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
+      %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

@@ -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'
 
@@ -91,3 +110,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/_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

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

@@ -1,91 +1 @@
-%li
-  = link_to backend_dashboard_url do
-    = icon('home')
-    %span= t('integral.navigation.dashboard')
-
-- if policy(Integral::Page).index?
-  %li
-    = link_to backend_pages_url do
-      = icon('file')
-      %span= t('integral.navigation.pages')
-    %ul
-      %li= t('integral.navigation.pages')
-      %li
-        = link_to backend_pages_url do
-          %span= t('integral.navigation.dashboard')
-
-      - if policy(Integral::Page).create?
-        %li
-          = link_to new_backend_page_url do
-            %span= t('integral.actions.create')
-
-- if policy(Integral::Post).index? && Integral.blog_enabled?
-  %li
-    = link_to backend_posts_url do
-      = icon('rss')
-      %span= t('integral.navigation.posts')
-    %ul
-      %li= t('integral.navigation.posts')
-      %li
-        = link_to backend_posts_url do
-          %span= t('integral.navigation.dashboard')
-      - if policy(Integral::Post).create?
-        %li
-          = link_to new_backend_post_url do
-            %span= t('integral.actions.create')
-
-- if policy(Integral::List).index?
-  %li
-    = link_to backend_lists_url do
-      = icon('list')
-      %span= t('integral.navigation.lists')
-    %ul
-      %li= t('integral.navigation.lists')
-      %li
-        = link_to backend_lists_url do
-          %span= t('integral.navigation.dashboard')
-      - if policy(Integral::List).create?
-        %li
-          = link_to new_backend_list_url do
-            %span= t('integral.actions.create')
-
-- if policy(Integral::Image).manager?
-  %li
-    = link_to backend_img_index_url do
-      = icon('picture-o')
-      %span= t('integral.navigation.images')
-    %ul
-      %li= t('integral.navigation.images')
-      %li
-        = link_to backend_img_index_url do
-          %span= t('integral.navigation.dashboard')
-      - if policy(Integral::Image).create?
-        %li
-          = link_to new_backend_img_url do
-            %span= t('integral.actions.create')
-
-- if policy(current_user).manager?
-  %li
-    = link_to backend_users_url do
-      = icon('users')
-      %span=t('integral.navigation.users')
-    %ul
-      %li= t('integral.navigation.users')
-      %li
-        = link_to backend_users_url do
-          %span= t('integral.navigation.dashboard')
-      %li
-        = link_to new_backend_user_url do
-          %span= t('integral.actions.create')
-
-- if policy(Integral::Version).manager?
-  %li
-    = link_to backend_activities_url do
-      = icon('crosshairs')
-      %span=t('integral.navigation.activities')
-
-- if current_user.admin?
-  %li
-    = link_to backend_settings_url do
-      = icon('cog')
-      %span=t('integral.navigation.settings')
+= render_main_menu

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/initializers/devise.rb

@@ -13,7 +13,7 @@ Devise.setup do |config|
   config.mailer_sender = Proc.new { "#{Integral::Settings.website_title} <#{Integral::Settings.contact_email}>" }
 
   # Configure the class responsible to send e-mails.
-  # config.mailer = 'Devise::Mailer'
+  config.mailer = 'Integral::DeviseMailer'
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and

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"
 
@@ -15,6 +15,44 @@ en:
       default: "%A, %d %B %Y"
       long: "%H:%M %d/%m/%Y"
 
+  datetime:
+    distance_in_words:
+      short:
+        half_a_minute: "30s"
+        less_than_x_seconds:
+          one:   "1s"
+          other: "%{count}s"
+        x_seconds:
+          one:   "1s"
+          other: "%{count}s"
+        less_than_x_minutes:
+          one:   "~1m"
+          other: "~%{count}m"
+        x_minutes:
+          one:   "1m"
+          other: "%{count}m"
+        about_x_hours:
+          one:   "~1h"
+          other: "~%{count}h "
+        x_days:
+          one:   "1d"
+          other: "%{count}d"
+        about_x_months:
+          one:   "~1mn"
+          other: "~%{count}mn"
+        x_months:
+          one:   "1mn"
+          other: "%{count}mn"
+        about_x_years:
+          one:   "~1y"
+          other: "~%{count}y"
+        over_x_years:
+          one:   "1y"
+          other: "%{count}y"
+        almost_x_years:
+          one:   "~1y"
+          other: "~%{count}y"
+
   errors:
     generic: Unfortunately there was a problem. Please try again later.
     unauthorized: You are not authorized to perform this action.
@@ -46,14 +84,27 @@ 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?
+        block: Are you sure you want to block this user?
+        unblock: Are you sure you want to unblock this user?
       new_page: Add new page
       new_post: Add new post
       edit_profile: Edit profile
       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
+      block: Block
+      unblock: Unblock
       create: Create
       clone: Clone
       save: Save
@@ -65,22 +116,30 @@ 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..
       unsaved_changes: Changes that you made may not be saved.
+    tooltips:
+      unsubscribe: Unsubscribe from notifications.
+      subscribe: Subscribe to notifications.
     placeholders:
       description: Description
       title: Title
@@ -88,8 +147,12 @@ en:
       draft: Draft
       published: Published
       archived: Archived
+      blocked: Blocked
+      pending: Pending
+      active: Active
     records:
       attributes:
+        category: Category
         locale: Language
         image: Image
         featured_image: Featured Image
@@ -128,12 +191,13 @@ en:
       actions: Actions
       activity: Activity
       activity_log: Activity Log
-      profile: My Profile
+      profile: My profile
       quick_links: Quick Links
       activities: Activities
       home: Home
       posts: Posts
       post: Post
+      tags: Tags
       pages: Pages
       page: Page
       users: Users
@@ -145,8 +209,9 @@ en:
       new: New
       edit: Edit
       log_out: Logout
-      my_account: Account & Profile
+      my_account: Account & profile
       settings: Settings
+      listing: Listing
 
     posts:
       index:
@@ -154,6 +219,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:
@@ -165,7 +232,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
@@ -179,9 +248,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:
@@ -206,11 +293,13 @@ en:
           title: 'Pages'
       roles:
         labels:
-          user_manager: 'User Manager'
-          image_manager: 'Image Manager'
-          page_manager: 'Page Manager'
-          post_manager: 'Post Manager'
-          list_manager: 'List Manager'
+          user_manager: User Manager
+          image_manager: Image Manager
+          page_manager: Page Manager
+          page_reader: Page Reader
+          page_editor: Page Editor
+          post_manager: Post Manager
+          list_manager: List Manager
       record_selector:
         posts:
           record: Post
@@ -224,6 +313,9 @@ en:
       activities:
         index:
           title: Website Activity
+        shared:
+          index:
+            title: "Activities: %{title}"
       lists:
         items:
           type:
@@ -244,14 +336,6 @@ en:
           columns:
             title: 'Title'
             description: 'Description'
-        notification:
-          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
@@ -273,14 +357,14 @@ en:
           google_tag_manager_id: GTM-xxxx
           twitter_url: https://twitter.com/rails
           facebook_url: https://www.facebook.com/groups/railsrocks
-          google_plus_url: https://plus.google.com/communities/101878695540653445908
+          instagram_url: https://www.instagram.com/jerryoftheday
+          github_url: https://github.com/yamasolutions/integral
           linkedin_url: https://www.linkedin.com/in/barackobama/
           youtube_url: https://www.youtube.com/channel/UCUkM9uMpWatT7gVWShgtKFw
-          instagram_url: jerryoftheday
           twitter_handler: rails
           facebook_app_id: 123456789
           homepage_id: 1
-        notification: 
+        notification:
           successful_update: Settings successfully updated.
       posts:
         grid:
@@ -292,7 +376,6 @@ en:
             views: 'Views'
             status: 'Status'
         index:
-          title: 'Posts'
           new_post: 'Create post'
           published_count: "%{count} published"
           drafts_count: "%{count} drafted"
@@ -301,20 +384,13 @@ en:
           title: 'Edit Post'
         new:
           title: 'New Post'
-        activities:
-          title: "Activities: %{title}"
-        notification:
-          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!'
@@ -327,13 +403,6 @@ en:
             description: 'Description'
             path: 'Path'
             last_updated_at: 'Last updated'
-        notification:
-          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:
@@ -347,15 +416,8 @@ 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}'
+          title: Edit Image
       users:
         available_locales:
           en: English
@@ -363,13 +425,6 @@ en:
         status:
           draft: 'Draft'
           published: 'Published'
-        notification:
-          creation_success: 'User has been invited.'
-          creation_failure: 'User already exists.'
-          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:
@@ -410,7 +465,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:
@@ -419,6 +474,8 @@ en:
       list:
         title: This is only used for internal reference.
         description: This is only used for internal reference.
+      user:
+        notify_me: Subscribe to be notified whenever there is a change to any resource. Otherwise be notified about followed resources only.
     inputs:
       file:
         button_label: 'File'
@@ -444,15 +501,18 @@ en:
         html_classes: 'HTML Classes'
       user:
         locale: 'Language'
+      post:
+        user: Author
       settings:
         website_title: Website title
         contact_email: Contact form email address
         google_tag_manager_id: Google Tag Manager ID
         twitter_url: Twitter profile URL
         facebook_url: Facebook profile URL
-        google_plus_url: Google Plus URL
         linkedin_url: LinkedIn profile URL
-        youtube_url: Youtube channel URL
+        youtube_url: YouTube channel URL
+        instagram_url: Instagram URL
+        github_url: GitHub URL
         facebook_app_id: Facebook app ID
         homepage_id: Homepage Page ID
         newsletter_api_key_id: Mailchimp API ID
@@ -465,6 +525,12 @@ en:
         create: 'Invite %{model}'
 
   devise:
+    invitations:
+      edit:
+        title: Set your password
+    failure:
+      user:
+        blocked: User account is no longer active.
     passwords:
       edit:
         title: Change your password
@@ -478,3 +544,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