integral 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 79d9ffb78cf456a49d8dc4b6c41ff99bb94d473a
-  data.tar.gz: 7691ba54679f3c1b0dd8e7fadb20f1ff3f22601d
+SHA256:
+  metadata.gz: aa5d76abbcaa10b58279d32f7038fc5adc31d8113ba2937884ed60a680689701
+  data.tar.gz: 65e114fe1f0dd85e0dd278fd72446e145fc7d31c77276f7dad6479212949a38f
 SHA512:
-  metadata.gz: 6852ebaa96f6d6b6e2aaa3aaa61ef02063ba54ce3ebb1740859e94ce229c0c5b2c78a1ab51a610c8faf01d9945c69761f753f36aaecdefa7de9aef611913fc48
-  data.tar.gz: d4a8027d77dc2a8e19fa297c0d0b1146c8aa598023a30efb808d5bfec7cbf0432746814e37587dbedc0e6e852cb2bc921c705b8501bc2627bf7baa47dd3e66e8
+  metadata.gz: 9cb42de152dab184383643cf236b3ab4d9e6e9b7ab37ffd9f32e1f857da7fc22edcef4d24a465b08f29a3e7ad1294a66bf02849351ed68a5184026ac67d0a3e4
+  data.tar.gz: ed0210b62a544aa6826e188d5290f08891a650361ec30cbde1793c9f5daabbb7b28bc162fdf9dce7f7b3acac21b6485f2a540624fb7bdfbd85b7f5c2e3038644

data/README.md

@@ -1,18 +1,19 @@
 [![Gem Version](https://badge.fury.io/rb/integral.svg)][version-website]
 [![Current Build Status](https://img.shields.io/circleci/project/github/yamasolutions/integral/master.svg)][ci-website] [![Inline docs](http://inch-ci.org/github/yamasolutions/integral.svg?branch=master)][docs-website]
 # Integral CMS
-![Integral CMS Features](https://media.giphy.com/media/LwzTKp4PxFpvKfxMJe/giphy.gif)
+![Integral CMS Features](https://integralrails.com/features.gif)
 
 Integral is a CMS for Rails 5+. The aim of Integral is to lower the barrier of entry in creating websites, using Ruby on Rails, with all the bells and whistles that users have now come to expect.
 Out of the box integral provides;
 * Backend features
     * Professional design
+    * Activity tracking
+    * User notifications
     * User authentication & authorization
     * Page & Post management with full WYSWIYG editing
     * Image management (w/ background image processing)
     * List management
     * Settings management
-    * Activity tracking
 * Frontend features
     * Dynamic Pages
     * Integrated Blog
@@ -45,7 +46,7 @@ If you have discovered a security related bug, please do NOT use the GitHub issu
 
 
 ### Looking for help
-If you have any questions please use [StackOverflow](https://stackoverflow.com) instead of the GitHub issue tracker.
+If you have any questions please feel free to use the [GitHub issue tracker][github-issue-tracker].
 
 
 ## Contributing

data/app/assets/javascripts/integral/backend.js

@@ -42,6 +42,54 @@ function ready() {
     window.initialized = true;
   }
 
+  function loadMore(entries) {
+    if (entries[0].intersectionRatio <= 0) {
+      return;
+    }
+    lastNotificationObserver.unobserve(notificationsContainer.find('ul li:last-of-type')[0])
+
+    $.ajax({
+      url: notificationsContainer.data('load-more-url'),
+      success: function(response) {
+        notificationsContainer.find('ul').append(response.content)
+        $('[data-notification-read-url]').each(function( index, notification ) {
+          unreadNotificationObserver.unobserve(notification)
+          unreadNotificationObserver.observe(notification)
+        });
+
+        if (response.load_more_url) {
+          notificationsContainer.data('load-more-url', response.load_more_url)
+          lastNotificationObserver.observe(notificationsContainer.find('ul li:last-of-type')[0])
+        } else {
+          notificationsContainer.find('.js-loader--notifications').hide()
+        }
+      }
+    });
+  }
+
+  function readNotification(entries) {
+    var i;
+    for (i = 0; i < entries.length; i++) {
+      entry = entries[i]
+
+      if (entry.intersectionRatio < .90) {
+        continue;
+      }
+
+      readUrl = entry.target.dataset.notificationReadUrl
+
+      unreadNotificationObserver.unobserve(entry.target)
+      entry.target.removeAttribute('data-notification-read-url')
+
+      $.ajax({
+        url: readUrl,
+        type: 'PUT',
+        success: function(response) {
+        }
+      });
+    }
+  }
+
   $(document).foundation();
   jQuery('input, textarea').characterCounter();
   SlugGenerator.check_for_slugs();
@@ -53,6 +101,37 @@ function ready() {
   new RemoteForm($('.remote-form'));
   Grid.init();
 
+  $("[data-form-subscribe-notifications], [data-form-unsubscribe-notifications]").submit(function( event ) {
+    $(event.target).find('.button').attr('disabled', true)
+  });
+
+  $('[data-form-subscribe-notifications]').on( "ajax:success", function(event, response) {
+    activeForm = $(event.target)
+    activeForm.find('.button').attr('disabled', false)
+    activeForm.addClass('hide')
+    $('[data-form-unsubscribe-notifications]').removeClass('hide')
+    toastr['success']('You have subscribed to notifications.')
+  });
+
+  $('[data-form-unsubscribe-notifications]').on( "ajax:success", function(event, response) {
+    activeForm = $(event.target)
+    activeForm.find('.button').attr('disabled', false)
+    activeForm.addClass('hide')
+    $('[data-form-subscribe-notifications]').removeClass('hide')
+    toastr['success']('You have unsubscribed to notifications.')
+  });
+
+  notificationsContainer = $('[data-notifications]')
+  if (notificationsContainer.data('load-more-url')) {
+    lastNotificationObserver = new IntersectionObserver(loadMore, { root: notificationsContainer[0] });
+    lastNotificationObserver.observe(notificationsContainer.find('ul li:last-of-type')[0])
+  }
+
+  unreadNotificationObserver = new IntersectionObserver(readNotification, { root: notificationsContainer[0], threshold: 0.90 });
+  $('[data-notification-read-url]').each(function( index, notification ) {
+    unreadNotificationObserver.observe(notification)
+  });
+
   // Recent activity 'view more' behaviour
   $("[data-recent-activity]").on("click", function(ev) {
     $button = $(ev.currentTarget);
@@ -89,15 +168,20 @@ function ready() {
     }
   });
 
+  // Initialize foundation components on filter
+  $(".card.listing form").on("ajax:success", function(ev) {
+    $(ev.currentTarget).closest('.card.listing').find('[data-grid] table').foundation();
+  });
+
   // Hijack context menu click for rows which have a URL
-  $("tr[data-href]").on("contextmenu", function(ev) {
+  $('.card.listing').on('contextmenu', 'tr[data-href]', function(ev) {
     $('#' + ev.currentTarget.dataset.contextMenu).foundation('open');
 
     return false;
   });
 
   // Capture clicks on rows which have a URL and visit that URL
-  $("tr[data-href]").on("click", function(ev) {
+  $('.card.listing').on('click', 'tr[data-href]', function(ev) {
     // Do not follow if the click is within a data-toggle
     if (($(ev.target).closest('[data-toggle]').length == 0) && ($(ev.target).closest('[data-dropdown]').length == 0)) {
       document.location = $(ev.currentTarget).data('href');

data/app/assets/javascripts/integral/support/character_counter.js

@@ -12,8 +12,9 @@ jQuery.fn.characterCounter = function(){
 
     var itHasLengthAttribute = $input.attr('maxlength') != undefined;
     var itIsntDisabled = $input.attr('data-character-counter') != 'false';
+    var itIsEnabled = $input.attr('data-character-counter') == 'true';
 
-    if ((itHasLengthAttribute) && (itIsntDisabled)) {
+    if ((itHasLengthAttribute) && (itIsntDisabled) || itIsEnabled) {
       $input.on('input', updateCounter);
       $input.on('focus', updateCounter);
       $input.on('blur', removeCounterElement);
@@ -24,14 +25,18 @@ jQuery.fn.characterCounter = function(){
 };
 
 function updateCounter(){
-  var maxLength     = +$(this).attr('maxlength'),
-  actualLength      = this.value.length,
-  isValidLength     = actualLength <= maxLength;
+  var maxLength = $(this).attr('maxlength');
+  var actualLength = this.value.length;
 
-  $(this).parent().find('span[class="character-counter"]')
-    .html( actualLength + '/' + maxLength);
+  if (maxLength === undefined) {
+    var formattedCount = actualLength;
+  } else {
+    var isValidLength = actualLength <= maxLength;
+    var formattedCount = actualLength + '/' + maxLength;
+    addInputStyle(isValidLength, $(this));
+  }
 
-  addInputStyle(isValidLength, $(this));
+  $(this).parent().find('span[class="character-counter"]').html(formattedCount);
 }
 
 function addCounterElement($input) {
@@ -45,7 +50,7 @@ function addCounterElement($input) {
     .addClass('character-counter')
     .css('float','right')
     .css('font-size','12px')
-    .css('margin-top', '-.5rem')
+    .css('align-self', 'flex-end')
     .css('height', 1);
 
   $input.after($counterElement);

data/app/assets/javascripts/integral/support/list.coffee

@@ -64,6 +64,7 @@ class this.List
     # Initialize new ListItem
     list_item = new ListItem(@, new_item)
     modal.foundation()
+    modal.find('input, textarea').characterCounter()
 
     @_initializeSortable()
     @_calculateListItemPriorities()

data/app/assets/javascripts/integral/support/record_selector.coffee

@@ -81,6 +81,7 @@ class this.RecordSelector
         new_item.find('.subtitle').text(record.subtitle)
         new_item.find('.title').text(record.title)
         new_item.find('.record').trigger('click')
+        @recordsContainer.find('.no-records').hide()
 
     # handle click on record
     @recordsContainer.on 'click', '.record', (e) =>
@@ -99,6 +100,7 @@ class this.RecordSelector
     @recordsContainer.on 'click', '.pagination a', (ev) =>
       ev.preventDefault()
       pageNumber = @getUrlVars(ev.target.href)['page']
+      pageNumber = 1 unless pageNumber?
       @pageField.val(pageNumber)
       @form.submit()
 

data/app/assets/javascripts/integral/support/slug_generator.coffee

@@ -39,6 +39,7 @@ class this.SlugGenerator
     @inputField.change =>
       if @outputField.val() == ''
         @setSlug(@inputField.val())
+        @outputField.change().blur()
 
     @outputField.change =>
       @setSlug(@outputField.val())

data/app/assets/stylesheets/integral/backend.sass

@@ -5,6 +5,8 @@
 @import "integral/support/media-query-indicator"
 @import "integral/backend/materialize-tags"
 @import "integral/backend/modules/timeline"
+@import "integral/backend/modules/dropdown_pane_notifications"
+@import "integral/backend/modules/dropdown_pane_profile"
 @import 'integral/backend/shared'
 @import 'integral/backend/notifications'
 @import 'integral/backend/dashboard-layout'
@@ -23,6 +25,20 @@
       &.ins
         background-color: transparentize($success-color, 0.7)
 
+hr
+  border: solid 0.5px #f4f7fb
+  &.dark
+    border-color: #d4dfef
+    margin: 0.5em 0
+
+.data-unavailable
+  margin: 0 auto
+  display: flex
+  align-items: center
+  //color: #17212b;
+  span
+    margin-right: 2rem
+
 .card
   font-size: 0.9em
   .description
@@ -31,9 +47,7 @@
   .subtitle
     margin: -0.5em 0 -0.25em 0
     color: scale-color($body-font-color, $lightness: 20%)
-  .data-unavailable
-    float: right
-  > .card-section > .actions
+  > .actions
     a
       display: block
       margin-bottom: 1em
@@ -42,26 +56,23 @@
     width: 1.5rem
     text-align: center
 
-  hr
-    border: solid 0.5px #f4f7fb
-    &.dark
-      border-color: #d4dfef
-      margin: 0.5em 0
-  &.object
-    .info-item
-      border-top: solid 0.5px #d4dfef
-      font-size: 0.8em
-      padding: 0.5em 0
-      .attr
-        color: scale-color($body-font-color, $lightness: 10%)
+.card-unpadded.object
+  .info-item
+    border-top: solid 0.5px #d4dfef
+    font-size: 0.8em
+    padding: 0.5em 0
+    .attr
+      color: scale-color($body-font-color, $lightness: 10%)
 
-      .val
-        float: right
-        &.thumb img
-          max-width: 1rem
-          max-height: 1rem
+    .val
+      float: right
+      &.thumb img
+        max-width: 1rem
+        max-height: 1rem
 
-    .button
-      border-radius: 0px 0px 5px
-      font-size: 1em
+  .button
+    border-radius: 0px 0px 5px
+    font-size: 1em
 
+.flex-auto
+  flex: auto

data/app/assets/stylesheets/integral/backend/_foundation_settings.scss

@@ -110,7 +110,7 @@ $breakpoints: (
   small: 0,
   medium: 640px,
   large: 1024px,
-  xlarge: 1200px,
+  xlarge: 1281px,
   xxlarge: 1440px,
 );
 $print-breakpoint: large;
@@ -833,7 +833,7 @@ $has-tip-border-bottom: none;
 $tooltip-background-color: $black;
 $tooltip-color: $white;
 $tooltip-padding: 0.75rem;
-$tooltip-max-width: 10rem;
+$tooltip-max-width: 12rem;
 $tooltip-font-size: $small-font-size;
 $tooltip-pip-width: 0.75rem;
 $tooltip-pip-height: $tooltip-pip-width * 0.866;

data/app/assets/stylesheets/integral/backend/dashboard-layout.scss

@@ -40,10 +40,10 @@
       max-height: 30px;
     }
     background-color: $primary-color;
-    .app-dashboard-open-sidebar .fa {
+    .app-dashboard-open-sidebar i {
       font-size: 1.25em;
     }
-    .fa {
+    i {
       color: $white;
       vertical-align: super;
       line-height: 30px;
@@ -82,6 +82,7 @@
       align-items: center;
       color: $white;
       padding: 1em;
+      background-color: $secondary-color;
       &.is-active {
         background-color: scale-color($secondary-color, $lightness: 10%);
       }
@@ -178,7 +179,7 @@
       transform: rotate(45deg);
       right: 2em;
     }
-    .fa {
+    i {
       width: 1.25em;
       text-align: center;
       margin-right: 0.25em;
@@ -353,65 +354,6 @@
           height: 35px;
         }
       }
-      #profile-dropdown {
-        padding: 0;
-        &:before {
-          content: ' ';
-          width: 2.5em;
-          height: 1.5em;
-          border-radius: 0 0 0.5em 0;
-          background: linear-gradient(-45deg, #1b8ecf 50%, transparent 50%);
-          position: absolute;
-          margin: 0;
-          right: 0.5em;
-          transform: rotate(225deg) skewX(8deg) skewY(8deg);
-        }
-        &:after {
-          content: ' ';
-          position: absolute;
-          right: 0;
-          top: -2.2em;
-          height: 2.2em;
-          width: 70%;
-        }
-        .section {
-          padding: 1.5em 1.2em;
-          &:first-of-type {
-            border-radius: 5px 5px 0 0;
-            background-color: $primary-color;
-            color: $white;
-            .avatar {
-              float: left;
-              margin-right: 1em;
-              width: 60px;
-              height: 60px;
-            }
-            .name {
-              font-size: 1.3em
-            }
-            .email {
-              font-size: 0.85em
-            }
-          }
-          &:last-of-type {
-            .menu a {
-              padding-left: 0;
-              color: $secondary-color;
-              &:hover {
-                color: $primary-color;
-              }
-              i {
-                width: 30px;
-                text-align: center;
-              }
-            }
-            .button {
-              display: inline-block;
-              padding: 0.8em 2em;
-            }
-          }
-        }
-      }
     }
   }
 }
@@ -460,7 +402,7 @@
       .dropdown.menu.vertical > li.opens-right > a::after {
         content: none;
       }
-      .fa {
+      i {
         margin-right: 0;
       }
     }
@@ -492,3 +434,25 @@
     @include shrunk-sidebar()
   }
 }
+
+.button-notifications-dropdown {
+  padding: .5rem;
+  cursor: pointer;
+  position: relative;
+
+  .fa-circle {
+    font-size: 5px;
+    position: absolute;
+    color: $primary-color;
+    top: 0;
+    margin: 0 auto;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+  // &.unread {
+  //   color: $primary-color;
+  // }
+  @include breakpoint(small down) {
+    color: $white;
+  }
+}