releaf-core 0.2.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72b720fc464c5e4f4b54c83e80791b9dcde3332c
-  data.tar.gz: 668b3f6add48d95e695b773eeb29374077a5c653
+  metadata.gz: 686b25340d787121533143bd87420f9435035a4a
+  data.tar.gz: 8707a2a4891e61864d559af87afecce626c53781
 SHA512:
-  metadata.gz: 8ba576bdf55311554de9707e43112e9f0b05cff980c2b96e8aa2f0f42c733d1272e40a28637f5c18327c7624499c7d3d02a2669e1b739a3b2f33c21f748cc191
-  data.tar.gz: ec7b6502510a9cdefb8e00c07855e1d1f910e52f5552b0a79f4814bbd5303f76baf5edd483b3914eed32a8f697244aeb266e6f350e7cf554bb9e9ae332fd5366
+  metadata.gz: 6ab3e015c76c2dc86b56196a40705001501c82b85c297e68888bdbacc42a4c43b496c8f9e8f55946394c662421f7e83252975bda2fbe66251b4821041bf1b1b9
+  data.tar.gz: 6c7fcc068ff6997cd49b382bef85e2b5b5e9213b994b119fd3fb7b0e8fb1f73931b2141544d1e35702638114bf24c28bd6a5be02e1a3a97b80b82f749bd5b43a

data/LICENSE

@@ -1,24 +1,22 @@
 Copyright (c) 2012, CubeSystems <info@cubesystems.lv>
-All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the CubeSystems nor the names of its contributors may
-      be used to endorse or promote products derived from this software without
-      specific prior written permission.
+MIT License
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL CubeSystems BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app/assets/javascripts/releaf/application.js

@@ -6,8 +6,7 @@
 //
 //= require jquery
 //= require jquery-ui
-//= require jquery_ujs
-//= require jquery.cookie
+//= require vanilla-ujs
 //= require ckeditor-jquery
 //= require_tree ./include
 //= require_tree ./3rd_party

data/app/assets/javascripts/releaf/include/field.type_date_or_datetime_or_time.js

@@ -32,18 +32,8 @@ jQuery(document).ready(function()
             }
         };
 
-        block.find('.date-picker').each(function() {
-            var picker = jQuery(this);
-            var opt = options;
-
-            opt.dateFormat = picker.data('date-format') || 'yy-mm-dd';
-            opt.minDate = picker.data('min-date');
-            opt.maxDate = picker.data('max-date');
-
-            picker.datepicker(opt);
-        });
-
-        block.find('.datetime-picker').each(function() {
+        block.find('.date-picker, .datetime-picker, .time-picker').each(function()
+        {
             var picker = jQuery(this);
             var opt = options;
 
@@ -51,18 +41,26 @@ jQuery(document).ready(function()
             opt.pickerTimeFormat = picker.data('time-format') || 'HH:mm';
             opt.minDate = picker.data('min-date');
             opt.maxDate = picker.data('max-date');
+            var yearRange = picker.data('year-range');
+            if (yearRange)
+            {
+                opt.yearRange = yearRange;
+            }
 
-            picker.datetimepicker(opt);
+            if (picker.is('.date-picker'))
+            {
+                picker.datepicker(opt);
+            }
+            else if (picker.is('.datetime-picker'))
+            {
+                picker.datetimepicker(opt);
+            }
+            else if (picker.is('.time-picker'))
+            {
+                picker.timepicker(opt);
+            }
         });
 
-         block.find('.time-picker').each(function() {
-             var picker = jQuery(this);
-             var opt = options;
-
-             opt.pickerTimeFormat = picker.data('time-format') || 'HH:mm';
-
-             picker.timepicker(options);
-         });
     });
 
     body.on('contentloaded', function(e)

data/app/assets/javascripts/releaf/include/field.type_richtext.js

@@ -1,18 +1,29 @@
-/* global CKEDITOR */
-jQuery(function()
-{
-    var body = jQuery('body');
+window.ckeditor_configuration = {
 
-    var ckeditor_config = {
+    default: {
         language: 'en',
         entities_latin: false,
         forcePasteAsPlainText: true,
         height: '400px',
         allowedContent: true,
         format_tags: 'p;h2;h3',
-        toolbar: [['Bold', 'Italic'], ['Format'], ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'], ['Subscript', 'Superscript'], ['NumberedList', 'BulletedList'], ['Image', 'Link', 'Unlink', 'MediaEmbed'], ['Source', 'Maximize', 'ShowBlocks']],
+        toolbar: [
+            ['Bold', 'Italic'],
+            ['Format'],
+            ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
+            ['Subscript', 'Superscript'],
+            ['NumberedList', 'BulletedList'],
+            ['Link', 'Unlink', 'Anchor', 'Image', 'MediaEmbed' ],
+            ['Source', 'Maximize', 'ShowBlocks']],
         extraPlugins: 'mediaembed'
-    };
+    }
+
+};
+
+/* global CKEDITOR */
+jQuery(function()
+{
+    var body = jQuery('body');
 
     CKEDITOR.on('instanceReady', function(e) {
       jQuery(e.editor.element.$).addClass("ckeditor-initialized");
@@ -41,6 +52,19 @@ jQuery(function()
     {
         var textarea = jQuery(this);
 
+        var type = textarea.data('type');
+        if (!type)
+        {
+            type = 'default';
+        }
+
+        if (typeof window.ckeditor_configuration[type] == 'undefined')
+        {
+            return;
+        }
+
+        var config = jQuery.extend(true, {}, window.ckeditor_configuration[type]);
+
         textarea.closest("form").on( 'beforevalidation', function()
         {
             for ( var instance in CKEDITOR.instances )
@@ -52,8 +76,6 @@ jQuery(function()
             }
         });
 
-
-        var config = ckeditor_config;
         config.width = '100%';
         config.height = textarea.outerHeight();
 

data/app/assets/javascripts/releaf/include/localization.js

@@ -89,10 +89,9 @@ jQuery(function()
 
             var triggerOffset  = trigger.offset();
 
-            menu.css
-            ({
+            menu.css({
                 left:  triggerOffset.left + trigger.outerWidth() - menu.outerWidth() ,
-                top :  triggerOffset.top + trigger.outerHeight(),
+                top :  triggerOffset.top + trigger.outerHeight()
             });
 
         });
@@ -135,11 +134,6 @@ jQuery(function()
             var trigger_label = field.find('.localization-switch .trigger .label');
 
             trigger_label.text( locale );
-
-
-            jQuery.cookie( 'releaf.i18n.locale', locale, { path: '/' } );
-
-
         });
 
 
@@ -152,6 +146,7 @@ jQuery(function()
 
             form.find('.field.i18n').trigger('localizationlocaleset', { locale : locale });
 
+            body.trigger( 'settingssave', [ "releaf.i18n.locale", locale ] );
         });
 
 

data/app/assets/javascripts/releaf/include/nested_fields.js

@@ -221,7 +221,7 @@ jQuery( document ).ready(function()
                                     element:   this,
                                     attribute: attrs[i],
                                     old_value: attr,
-                                    new_value: attr.replace(searchPattern, replacePattern),
+                                    new_value: attr.replace(searchPattern, replacePattern)
                                 };
                                 if (params.old_value === params.new_value)
                                 {

data/app/assets/javascripts/releaf/include/remote_validator.js

@@ -31,9 +31,12 @@ var RemoteValidator = function( form )
         v.clicked_button = target;
     });
 
-    v.form.on( 'ajax:beforeSend', function( event, xhr )
+    v.form.on( 'ajax:before', function( event )
     {
+        var xhr = event.detail;
         xhr.validation_id = 'v' + new Date().getTime() + Math.random();
+        xhr.setRequestHeader('Accept', '*/*;q=0.5, application/json');
+
         v.form.attr( 'data-validation-id', xhr.validation_id );
 
         if (v.clicked_button)
@@ -42,8 +45,9 @@ var RemoteValidator = function( form )
         }
     });
 
-    v.form.on('ajax:complete', function( event, xhr )
+    v.form.on( 'ajax:complete', function( event )
     {
+        var xhr = event.detail;
         var json_response;
         var event_params =
         {
@@ -91,7 +95,6 @@ var RemoteValidator = function( form )
                     {
                         var error_object = {
                             message         : error.message,
-                            fullMessage     : error.full_message,
                             errorCode       : error.error_code,
                             fieldName       : fieldName
                         };
@@ -230,7 +233,7 @@ var RemoteValidator = function( form )
             }
 
             error_node.attr('data-validation-id', event_params.validation_id);
-            error_node.text( error.fullMessage );
+            error_node.text( error.message );
 
             if (new_error_node)
             {

data/app/assets/javascripts/releaf/include/sortable.js

@@ -35,7 +35,7 @@ jQuery(document).ready(function()
                 update: function( event, ui )
                 {
                     ui.item.trigger('sortableupdate');
-                },
+                }
             });
 
             list.on('sortablereindex', function()

data/app/assets/javascripts/releaf/include/{profile_settings.js → store_settings.js}

@@ -1,11 +1,10 @@
 jQuery(function(){
-
     var body = jQuery('body');
+    var settings_path = body.data('settings-path');
 
-    var settings_url = jQuery('header .profile').data('settings-url');
     body.on('settingssave', function( event, key_or_settings, value )
     {
-        if (!settings_url)
+        if (!settings_path)
         {
             return;
         }
@@ -17,12 +16,7 @@ jQuery(function(){
             settings[key_or_settings] = value;
         }
 
-        jQuery.ajax
-        ({
-            url:  settings_url,
-            data: { "settings": settings},
-            type: 'POST',
-            dataType: 'json'
-        });
+        LiteAjax.ajax({ url: settings_path, method: 'POST', data:  { "settings": settings}, json: true })
     });
 });
+

data/app/assets/javascripts/releaf/include/toolbox.js

@@ -129,26 +129,22 @@ jQuery(function()
 
             if (openToRight)
             {
-                menu.css
-                ({
+                menu.css({
                     left:  triggerCenterX - 23,
-                    top :  triggerOffset.top  + trigger.outerHeight(),
+                    top :  triggerOffset.top  + trigger.outerHeight()
                 });
-                beak.css(
-                {
+                beak.css({
                     left : 18
                 });
             }
             else
             {
-                menu.css
-                ({
+                menu.css({
                     left:  triggerCenterX - menuWidth + 20,
-                    top :  triggerOffset.top  + trigger.outerHeight(),
+                    top :  triggerOffset.top  + trigger.outerHeight()
                 });
-                beak.css(
-                {
-                    left : menuWidth - 24,
+                beak.css({
+                    left : menuWidth - 24
                 });
             }
 

data/app/assets/stylesheets/releaf/layout/fields.scss

@@ -47,6 +47,7 @@ input.text
 {
     height: steps(3);
     padding: 0 steps(1);
+    -webkit-appearance: textfield;
 }
 
 

data/app/assets/stylesheets/releaf/layout/header.scss

@@ -19,6 +19,7 @@ body > header
     form.sign-out
     {
         display: inline-block;
+        vertical-align: top;
     }
 
     .profile.button,

data/app/assets/stylesheets/releaf/layout/search.scss

@@ -2,6 +2,11 @@ form.search
 {
     text-align: right;
 
+    &.has-extra-search:not(.has-text-search)
+    {
+        clear: left;
+    }
+
     .search-field
     {
         display: inline-block;
@@ -17,6 +22,7 @@ form.search
 
     .text-search
     {
+
         .search-field[data-name="search"]
         {
             position: relative;
@@ -25,6 +31,15 @@ form.search
             {
                 width: steps(18);
                 border-color: $color-border-light;
+
+                &::-webkit-search-decoration,
+                &::-webkit-search-cancel-button,
+                &::-webkit-search-results-button,
+                &::-webkit-search-results-decoration
+                {
+                    display: none;
+                }
+
             }
 
             .button

data/app/builders/releaf/builders/base.rb

@@ -7,13 +7,17 @@ module Releaf::Builders::Base
     :render, :link_to, :flash, :truncate, :radio_button_tag,
     :options_for_select, :action_name, :options_from_collection_for_select,
     :select_tag, :text_field_tag,
-    :image_tag, :jquery_date_format, :cookies, :button_tag, :merge_attributes, to: :template
+    :image_tag, :cookies, :button_tag, :merge_attributes, to: :template
 
-  delegate :layout_settings, :access_control, :controller_scope_name,
-    :feature_available?, :index_url, to: :controller
+  delegate :controller_scope_name, :builder_class,
+    :feature_available?, :index_path, to: :controller
 
   alias_method :button, :releaf_button
 
+  def layout_settings(key)
+    Releaf.application.config.settings_manager.read(controller: controller, key: key)
+  end
+
   def wrapper(content_or_attributes_with_block, attributes = {}, &block)
     if block_given?
       tag(:div, content_or_attributes_with_block, nil, nil, &block)
@@ -26,7 +30,7 @@ module Releaf::Builders::Base
     ERB::Util.html_escape(value)
   end
 
-  def tag(*args, &block)
+  def tag(*args)
     return content_tag(*args) unless block_given?
 
     content_tag(*args) do
@@ -49,7 +53,7 @@ module Releaf::Builders::Base
     template.fa_icon(name)
   end
 
-  def safe_join(&block)
+  def safe_join
     template.safe_join(yield)
   end
 
@@ -72,9 +76,7 @@ module Releaf::Builders::Base
     controller_scope_name
   end
 
-  # calls `#to_text` on resource if resource supports it. Otherwise calls
-  # `#to_s` method
-  def resource_to_text(resource)
-    resource.send(resource.respond_to?(:to_text) ? :to_text : :to_s)
+  def resource_title(resource)
+    Releaf::ResourceBase.title(resource)
   end
 end

data/app/builders/releaf/builders/confirm_destroy_dialog_builder.rb

@@ -4,7 +4,7 @@ class Releaf::Builders::ConfirmDestroyDialogBuilder < Releaf::Builders::ConfirmD
   end
 
   def description_content
-    resource_to_text(resource)
+    resource_title(resource)
   end
 
   def section_header_text
@@ -20,6 +20,6 @@ class Releaf::Builders::ConfirmDestroyDialogBuilder < Releaf::Builders::ConfirmD
   end
 
   def confirm_url
-    url_for( action: 'destroy', id: resource.id, index_url: index_url)
+    url_for( action: 'destroy', id: resource.id, index_path: index_path)
   end
 end

data/app/builders/releaf/builders/confirm_dialog_builder.rb

@@ -44,11 +44,11 @@ class Releaf::Builders::ConfirmDialogBuilder
     button(t("Yes"), "check", class: "danger", type: 'submit')
   end
 
-  def cancel_url
-    index_url
+  def cancel_path
+    index_path
   end
 
   def cancel_button
-    button(t("No"), "ban", class: "secondary", data: {type: 'cancel'}, href: index_url)
+    button(t("No"), "ban", class: "secondary", data: {type: 'cancel'}, href: cancel_path)
   end
 end

data/app/builders/releaf/builders/edit_builder.rb

@@ -7,13 +7,13 @@ class Releaf::Builders::EditBuilder
     form_for(resource, form_options) do |form|
       self.form = form
       safe_join do
-        [index_url_preserver] + section_blocks
+        [index_path_preserver] + section_blocks
       end
     end
   end
 
-  def index_url_preserver
-    hidden_field_tag 'index_url', params[:index_url] if params[:index_url].present?
+  def index_path_preserver
+    hidden_field_tag "index_path", params[:index_path] if params[:index_path].present?
   end
 
   def section_body_blocks
@@ -24,8 +24,54 @@ class Releaf::Builders::EditBuilder
     form.releaf_fields(form.field_names.to_a)
   end
 
+  def form_url
+    url_for(action: form_action, id: resource.id)
+  end
+
+  def form_action
+    resource.new_record? ? 'create' : 'update'
+  end
+
+  def resource_name
+    :resource
+  end
+
+  def form_builder_class
+    builder_class(:form)
+  end
+
   def form_options
-    controller.form_options(action_name, resource, :resource)
+    {
+      builder: form_builder_class,
+      as: resource_name,
+      url: form_url,
+      html: form_attributes
+    }
+  end
+
+  def form_identifier
+    action = !resource.respond_to?(:persisted?) || resource.persisted? ? :edit : :new
+    "#{action}-#{resource_name}"
+  end
+
+  def form_classes
+    classes = [ form_identifier ]
+    classes << "has-error" if resource.errors.any?
+    classes
+  end
+
+  def form_attributes
+    {
+      multipart: true,
+      id: form_identifier,
+      class: form_classes,
+      data: {
+        "remote" => true,
+        "remote-validation" => true,
+        "type" => :json,
+      },
+      novalidate: ""
+    }
   end
 
   def error_notices
@@ -52,7 +98,7 @@ class Releaf::Builders::EditBuilder
   end
 
   def create_another_available?
-    resource.present? && resource.new_record? && controller.feature_available?(:create_another)
+    resource.present? && resource.new_record? && feature_available?(:create_another)
   end
 
   def save_and_create_another_button
@@ -62,5 +108,4 @@ class Releaf::Builders::EditBuilder
   def save_button
     button(t("Save"), "check", class: "primary", data: { type: 'ok', disable: true }, type: "submit")
   end
-
 end

data/app/builders/releaf/builders/form_builder/associated_set_field.rb

@@ -0,0 +1,37 @@
+module Releaf::Builders::FormBuilder::AssociatedSetField
+  def releaf_associated_set_field(name, label: {}, field: {}, options: {}, &block)
+    options = {field: {type: "associated-set"}}.deep_merge(options)
+    content = releaf_associated_set_content(name, options: options)
+    input_wrapper_with_label(name, content, label: label, field: field, options: options, &block)
+  end
+
+  def releaf_associated_set_content(name, options: {})
+    association_options = options[:association]
+    association = object.send(name)
+    key_field = association_options[:field]
+
+    list = []
+
+    association_options[:items].each_pair do|value, label_text|
+      item = association.find_by(key_field => value) || association.build(key_field => value)
+
+      list << fields_for(name, item, relation_name: name, builder: self.class) do |builder|
+        builder.releaf_associated_set_item(association_options, label_text)
+      end
+    end
+
+    safe_join do
+      list
+    end
+  end
+
+  def releaf_associated_set_item(association_options, label_text)
+    wrapper(class: "type-associated-set-item") do
+      [hidden_field(:_destroy, value: object.new_record?, class: "destroy"),
+       check_box(association_options[:field], {class: "keep", name: "keep"}, (object.send(association_options[:field]) if object.persisted?)),
+       label(association_options[:field], label_text),
+       hidden_field(association_options[:field])
+      ]
+    end
+  end
+end