RubyGems - integral - Versions diffs - 1.1.0 → 1.2.0 - Mend

integral 1.1.0 → 1.2.0

Files changed (430) hide show

data/app/assets/javascripts/ckeditor/plugins/wordcount/samples/maxParagraphs.html ADDED

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>CKEditor</title>
+    <script src="../../../ckeditor.js"></script>
+	</head>
+	<body>
+		<textarea name="editor1"></textarea>
+		<script>
+      var config = {
+        extraPlugins: 'wordcount',
+        wordcount: {
+          maxParagraphs: 5,
+          showParagraphs: true,
+          showWordCount: false,
+          showRemaining: true
+        },
+        language: 'en'
+      }
+    </script>
+    <script>
+      CKEDITOR.replace( 'editor1' , config);
+    </script>
+	</body>
+</html>

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

@@ -92,24 +92,20 @@ function ready() {
     var dialogName = ev.data.name;
     var dialogDefinition = ev.data.definition;
-    // TODO: Add Info callout
-    if ( dialogName == 'image' ) {
+    if ( dialogName == 'image2' ) {
       var infoTab = dialogDefinition.getContents('info');
-      var advancedTab = dialogDefinition.getContents('advanced');
-      // Remove unhelpful inputs
-      infoTab.remove('txtHeight');
-      infoTab.remove('ratioLock');
-      infoTab.remove('txtBorder');
-      infoTab.remove('txtHSpace');
-      infoTab.remove('txtVSpace');
-      //infoTab.remove('htmlPreview');
-      advancedTab.remove('linkId');
-      advancedTab.remove('cmbLangDir');
-      advancedTab.remove('txtLangCode');
-      advancedTab.remove('txtGenLongDescr');
+      // Remove unused inputs
+      infoTab.remove('height');
+      infoTab.remove('lock');
+      // Do not validate width input
+      infoTab.get('width').validate = function() {
+        return true;
+      }
     }
+    // Remove unused inputs for link
     if ( dialogName == 'link' ) {
       var advancedTab = dialogDefinition.getContents('advanced');
       var targetTab = dialogDefinition.getContents('target');

data/app/assets/javascripts/integral/frontend.js CHANGED

@@ -9,8 +9,6 @@
 //= require toastr
 //= require rails.validations
 //= require rails.validations.simple_form
-//= require integral/support/date_picker/picker
-//= require integral/support/date_picker/picker.date
 //= require integral/support/date_picker
 //= require integral/support/click_to_copy
 //= require integral/support/google_analytics

data/app/assets/javascripts/integral/support/date_picker.coffee CHANGED

@@ -1,38 +1,44 @@
-# Represents Date Picker (PickADate)
+# Represents Date Picker - requires jQuery UI Datepicker - https://jqueryui.com/datepicker/
 class this.DatePicker
+  @getCurrentDate: (element, dateFormat='yy-mm-dd') ->
+    date = null
+    try
+      date = $.datepicker.parseDate( dateFormat, element.value )
+    catch error
+    date
   @initDateRanges: ->
     $('[data-date-picker-end-element]').each (index, dpStartElement) ->
       $dpStartElement = $(dpStartElement)
-      dpStart = $dpStartElement.pickadate('picker')
-      $dpEndElement = $('#' + $dpStartElement.data().datePickerEndElement)
-      dpEnd = $dpEndElement.pickadate('picker')
-      # Check if there’s a “from” or “to” date to start with.
-      if dpStart.get('value')
-        minimumDate = new Date(dpStart.get('select').obj.valueOf() + 86400000)
-        dpEnd.set('min', minimumDate)
-      if dpEnd.get('value')
-        maximumDate = new Date(dpEnd.get('select').obj.valueOf() - 86400000)
-        dpStart.set('max', maximumDate)
-      # When something is selected, update the “from” and “to” limits.
-      dpStart.on 'set', (event) =>
-        if event.select
-          minimumDate = new Date(dpStart.get('select').obj.valueOf() + 86400000)
-          dpEnd.set('min', minimumDate)
+      endSelector = "[id='" + $dpStartElement.data().datePickerEndElement + "']"
+      $dpEndElement = $(endSelector)
-      dpEnd.on 'set', (event) =>
-        if event.select
-          maximumDate = new Date(dpEnd.get('select').obj.valueOf() - 86400000)
-          dpStart.set('max', maximumDate)
-        else if 'clear' of event
-          dpStart.set('max', false)
+      # Passing these options is doesn't seem to be working?
+      dpStart = $dpStartElement.datepicker(
+        firstDay: 1
+        showAnim: ""
+      )
+      dpEnd = $dpEndElement.datepicker(
+        firstDay: 1
+        showAnim: ""
+      )
+      dpStart.datepicker("option", "firstDay", 1)
+      dpEnd.datepicker("option", "firstDay", 1)
+      dpStart.datepicker("option", "showAnim", '')
+      dpEnd.datepicker("option", "showAnim", '')
+      dpStart.on "change", (ev) =>
+        dateMinimum = DatePicker.getCurrentDate(ev.currentTarget)
+        dateMinimum.setDate(dateMinimum.getDate() + 1)
+        dpEnd.datepicker("option", "minDate", dateMinimum)
+      dpEnd.on "change", (ev) =>
+        dateMaximum = DatePicker.getCurrentDate(ev.currentTarget)
+        dateMaximum.setDate(dateMaximum.getDate() - 1)
+        dpStart.datepicker("option", "maxDate", dateMaximum)
   constructor: (selector, opts={}) ->
     @selector = selector
     @opts = opts
-    @_setLanguage()
     @_initializeDatePicker()
   _initializeDatePicker: ->
@@ -43,41 +49,30 @@ class this.DatePicker
       maxRaw = dp[0].max
       minDate = new Date minRaw if minRaw
       maxDate = new Date maxRaw if maxRaw
+      disabledDates = dp.data('disabled-dates')
+      showButtonPanel = if dp.data('date-picker-button-panel') == true then true else false
+      closeText = if dp.data('date-picker-close-text') then dp.data('date-picker-close-text') else 'Close'
-      dp.pickadate
-        min: minDate
-        max: maxDate
-        disable: @getDisabledDates(dp)
-        container: @getContainer(dp)
-        closeOnSelect: true
-        format: "yyyy-mm-dd"
-        onOpen: @opts.onOpen
-        onClose: @opts.onClose
-  getContainer: (dp) ->
-    dp.data('date-picker-container')
-  getDisabledDates: (dp) ->
-    data = dp.data('disabled-dates')
-    return [] if not data
-    dates = []
-    for date in data.split(',')
-      dates.push new Date(date)
+      dp.datepicker
+        dateFormat: "yy-mm-dd"
+        minDate: minDate
+        maxDate: maxDate
+        beforeShow: @opts.onOpen
+        onClose: (dateText, inst) =>
+          if dp.data('date-picker-clear') == true && inst.dpDiv.find('button.clicked').length > 0
+            inst.input.val('')
+            inst.input.change()
+          else
+            @opts.onClose() if @opts.close
+        showButtonPanel: showButtonPanel
+        closeText: closeText
+        # Return false to disable a specific date
+        beforeShowDay: (currentDate) =>
+          return [true] if not disabledDates
-    dates
+          for dateStr in disabledDates.split(',')
+            parsedDate = new Date(dateStr)
-  # TODO: Change this to I18n
-  _setLanguage: ->
-    $.extend($.fn.pickadate.defaults, {
-      monthsFull: [ 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ],
-      monthsShort: [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ],
-      weekdaysFull: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ],
-      weekdaysShort: [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ],
-      weekdaysLetter: [ 'S', 'M', 'T', 'W', 'T', 'F', 'S' ],
-      today: 'Today',
-      clear: 'Clear',
-      close: 'Close',
-      firstDay: 1,
-    })
+            return [false] if (parsedDate.getFullYear() == currentDate.getFullYear() and parsedDate.getDate() == currentDate.getDate() and parsedDate.getMonth() == currentDate.getMonth())
+          [true]

data/app/assets/javascripts/integral/support/grid.coffee CHANGED

@@ -26,6 +26,13 @@ class this.Grid
     @container.on 'change', 'input[type=checkbox][data-filter]', (ev) =>
       @_toggleFilterValue(ev.target.dataset.filter, ev.target.dataset.value)
+    @container.on 'change', 'select[data-filter], input[type=text][data-filter]', (ev) =>
+      filterName = ev.target.dataset.filter
+      filter = @form.find("input[name='#{filterName}']")
+      filter.val(ev.target.value)
+      @_redrawGrid()
     @form.on 'change', 'select[data-filter]', (ev) =>
       @_redrawGrid()
@@ -52,13 +59,13 @@ class this.Grid
         @container.html(data.content)
       @gridCount.text(data.count)
+    @form.on "ajax:complete", (event, data, status, xhr) =>
       @container.removeClass('loading')
       @container.find('[data-grid-container]').removeClass('loading')
-    # @form.on "ajax:complete", (event, data, status, xhr) =>
-    #   console.log 'Complete!'
-    # @form.on "ajax:error", (event, data, status, xhr) =>
-    #   console.log 'Error!'
+    @form.on "ajax:error", (event, data, status, xhr) =>
+      toastr['error']('Unfortunately an error took place. Please try again later.')
   _updateSort: (order, desc)->
     @orderField.val(order)

data/app/assets/javascripts/integral/support/remote_form.coffee CHANGED

@@ -6,26 +6,26 @@ class this.RemoteForm
   constructor: (forms, opts={}) ->
     # 'forms' refers to one or more jquery objects whose target is a 'form' tag
     @forms = forms
-    # @opts = @_mergeDefaultOpts(opts)
+    @opts = @_mergeDefaultOpts(opts)
     @_setupEvents()
   # Create listeners and handlers for form events
   _setupEvents: =>
     # Handle form start
-    @forms.on "ajax:beforeSend", (event, data, status, xhr) =>
-      @_handleBeforeSend(event, data)
+    @forms.on "ajax:beforeSend", (xhr, opts) =>
+      @opts.handleBeforeSend(xhr, opts)
     # Handle form success
     @forms.on "ajax:success", (event, data, status, xhr) =>
-      @_handleSuccess(event, data)
+      @opts.handleSuccess(event, data)
     # Handle form error
     @forms.on "ajax:error", (event, data, status, xhr) =>
-      @_handleError(event, data)
+      @opts.handleError(event, data)
     # Handle form complete
     @forms.on "ajax:complete", (event, data, status, xhr) =>
-      @_handleComplete(event, data)
+      @opts.handleComplete(event, data)
   # What happens before AJAX request is sent
   _handleBeforeSend: (event, data) =>
@@ -81,7 +81,11 @@ class this.RemoteForm
       window.dataLayer.push
         'event' : event
+  _mergeDefaultOpts: (opts) =>
+    default_opts =
+      handleBeforeSend: @_handleBeforeSend
+      handleSuccess: @_handleSuccess
+      handleError: @_handleError
+      handleComplete: @_handleComplete
-  # _mergeDefaultOpts: (opts) =>
-  #   # Some fancy reverse merge goes here
-  #   options =
+    $.extend({}, default_opts, opts)

data/app/assets/stylesheets/integral/frontend.sass CHANGED

@@ -11,7 +11,6 @@ $nprogress-height: 5px
 @import 'nprogress-turbolinks5'
 @import 'integral/support/mixins'
-@import 'integral/support/date-picker'
 @import 'integral/support/scroll-to-top'
 @import 'integral/support/media-query-indicator'
 @import 'integral/support/gallery'

data/app/controllers/integral/application_controller.rb CHANGED

@@ -11,14 +11,15 @@ module Integral
     # Search Engine Optimization
     # before_render :load_meta_tags
-    private
     # Override added as workaround for before_render Rails 5 incompatibility
-    def render(*args, &blk)
+    def render(*args, &block)
       before_render
       super
     end
+    private
     # Actions that should be carried out before rendering
     def before_render
       load_meta_tags

data/app/controllers/integral/backend/activities_controller.rb CHANGED

@@ -3,7 +3,7 @@ module Integral
     # Activity management
     class ActivitiesController < BaseController
       before_action :authorize_with_klass
-      before_action -> { set_grid(Integral::Grids::ActivitiesGrid) }
+      before_action -> { set_grid }
       # POST /grid
       # AJAX grid for activities

data/app/controllers/integral/backend/base_controller.rb CHANGED

@@ -13,28 +13,107 @@ module Integral
         end
       end
-      # Prevent CSRF attacks by raising an exception.
-      protect_from_forgery with: :exception
+      protect_from_forgery with: :exception # Prevent CSRF attacks by raising an exception.
-      layout :layout_by_resource
+      layout :layout_by_resource # Set layout
       before_action :authenticate_user! # User Auth
       before_action :set_locale # User custom locale
       before_action :set_breadcrumbs # Breadcrumbs
-      # Track user activity via paper_trail
-      before_action :set_paper_trail_whodunnit
+      before_action :set_paper_trail_whodunnit # Track user activity via paper_trail
       # User authorization
       include Pundit
       rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
-      private
+      # GET /
+      # Lists all resources
+      def index
+        respond_to do |format|
+          format.html do
+            set_grid
+          end
+          format.json do
+            if params[:gridview].present?
+              set_grid
+              render json: { content: render_to_string(partial: "integral/backend/#{controller_name}/grid", locals: { grid: @grid }) }
+            else
+              respond_to_record_selector
+            end
+          end
+        end
+      end
+      # GET /new
+      # Resource creation screen
+      def new
+        add_breadcrumb I18n.t('integral.navigation.new'), "new_backend_#{controller_name.singularize}_path".to_sym
+        @resource = resource_klass.new
+      end
+      # POST /
+      # Resource creation
+      def create
+        add_breadcrumb I18n.t('integral.navigation.create'), "new_backend_#{controller_name.singularize}_path".to_sym
+        @resource = resource_klass.new(resource_params)
-      def respond_with_activities(breadcrumb_url)
+        yield if block_given?
+        if @resource.save
+          respond_successfully(notification_message('creation_success'), send("edit_backend_#{controller_name.singularize}_path", @resource.id))
+        else
+          respond_failure(notification_message('creation_failure'), :new)
+        end
+      end
+      # GET /:id/edit
+      # Resource edit screen
+      def edit
+        add_breadcrumb I18n.t('integral.navigation.edit'), "edit_backend_#{controller_name.singularize}_path".to_sym
+      end
+      # PUT /:id
+      # Updating a resource
+      def update
+        if @resource.update(resource_params)
+          respond_successfully(notification_message('edit_success'), send("edit_backend_#{controller_name.singularize}_path", @resource.id))
+        else
+          respond_failure(notification_message('edit_failure'), :edit)
+        end
+      end
+      # DELETE /:id
+      def destroy
+        if @resource.destroy
+          respond_successfully(notification_message('delete_success'), send("backend_#{controller_name}_path"))
+        else
+          error_message = @resource.errors.full_messages.to_sentence
+          flash[:error] = "#{notification_message('delete_failure')} - #{error_message}"
+          redirect_to send("backend_#{controller_name}_path")
+        end
+      end
+      # POST /:id/duplicate
+      # Duplicate a resource
+      def duplicate
+        cloned_resource = @resource.dup
+        yield cloned_resource if block_given?
+        if cloned_resource.save
+          respond_successfully(notification_message('clone_success'), send("edit_backend_#{controller_name.singularize}_path", cloned_resource.id))
+        else
+          respond_failure(notification_message('clone_failure'), :edit)
+        end
+      end
+      # GET /:id/activities
+      def activities
         authorize Version
-        add_breadcrumb I18n.t('integral.navigation.edit'), breadcrumb_url
+        add_breadcrumb I18n.t('integral.navigation.edit'), "edit_backend_#{controller_name.singularize}_path".to_sym
         add_breadcrumb I18n.t('integral.navigation.activity')
         @grid = Integral::Grids::ActivitiesGrid.new(activity_grid_options.except('page')) do |scope|
@@ -47,6 +126,18 @@ module Integral
         end
       end
+      # GET /:id/activities/:id
+      def activity
+        authorize Version
+        add_breadcrumb I18n.t('integral.navigation.activity'), "activities_backend_#{controller_name.singularize}_url".to_sym
+        add_breadcrumb I18n.t('integral.actions.view')
+        @activity = resource_version_klass.find(params[:activity_id]).decorate
+      end
+      private
       # Redirect user to integral dashboard after successful login
       def after_sign_in_path_for(_resource)
         integral.backend_dashboard_path
@@ -77,31 +168,28 @@ module Integral
         I18n.locale = current_user.locale if current_user.present?
       end
-      def respond_to_record_selector(klass)
-        records = klass.search(params[:search]).order('updated_at DESC').paginate(page: params[:page])
+      def respond_to_record_selector
+        records = resource_klass.search(params[:search]).order('updated_at DESC').paginate(page: params[:page])
         render json: { content: render_to_string(partial: 'integral/backend/shared/record_selector/collection', locals: { collection: records }) }
       end
-      # def respond_to_record_selector_item(record)
-      #   render json: {
-      #     html: render_to_string('integral/backend/shared/record_selector/record',
-      #                            layout: false,
-      #                            locals: { :list_item => record.to_list_item }) }
-      # end
       def respond_successfully(flash_message, redirect_path)
         flash[:notice] = flash_message
         redirect_to redirect_path
       end
-      def respond_failure(message, record, template)
+      def respond_failure(message, template, record = nil)
+        record = @resource if record.nil?
         error_message = record.errors.full_messages.to_sentence
         flash.now[:error] = "#{message} - #{error_message}"
         render template, status: :unprocessable_entity
       end
-      # Abstract method. Override if providing breadcrumbs
-      def set_breadcrumbs; end
+      def set_breadcrumbs
+        add_breadcrumb I18n.t('integral.navigation.dashboard'), :backend_dashboard_path
+        add_breadcrumb I18n.t("integral.navigation.#{controller_name}"), "backend_#{controller_name}_path".to_sym
+      end
       def stale_record_recovery_action
         flash.now[:error] = 'Overwrite prevented. Another user has changed this record ' \
@@ -109,15 +197,63 @@ module Integral
         render :edit, status: :conflict
       end
-      def notification_message(object_namespace, type_namespace)
+      def notification_message(type_namespace, object_namespace = nil)
+        object_namespace = controller_name if object_namespace.nil?
         I18n.t("integral.backend.#{object_namespace}.notification.#{type_namespace}")
       end
-      def set_grid(grid_klass)
-        @grid = grid_klass.new(grid_options.except('page')) do |scope|
+      def set_grid
+        @grid = resource_grid_klass.new(grid_options.except('page')) do |scope|
           scope.page(grid_options['page']).per_page(25)
         end
       end
+      def resource_klass
+        controller_name.classify.constantize
+      end
+      def resource_grid_klass
+        "Integral::Grids::#{controller_name.classify.pluralize}Grid".constantize
+      end
+      def resource_version_klass
+        "#{resource_klass}Version".constantize
+      end
+      def set_resource
+        @resource = resource_klass.find(params[:id])
+      end
+      def grid_options
+        default_grid_options = { 'order' => 'updated_at',
+                                 'page' => 1,
+                                 'descending' => true }
+        grid_params = params[:grid].present? ? params[:grid].permit(*white_listed_grid_params) : {}
+        grid_params.delete_if { |_k, v| v.empty? }
+        default_grid_options.merge(grid_params)
+      end
+      helper_method :grid_options
+      def activity_grid_options
+        default_grid_options = { 'order' => 'date',
+                                 'page' => 1,
+                                 'descending' => true,
+                                 'item_id' => @resource.id,
+                                 'object' => resource_klass.to_s }
+        grid_params = params[:grid].present? ? params[:grid].permit(*white_listed_grid_params) : {}
+        grid_params.delete_if { |_k, v| v.empty? }
+        default_grid_options.merge(grid_params)
+      end
+      helper_method :activity_grid_options
+      def white_listed_grid_params
+        raise NotImplementedError, 'Specify the accepted grid parameters'
+      end
+      def authorize_with_klass
+        authorize resource_klass
+      end
     end
   end
 end