coalla-cms 0.5.2.4 → 0.6.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDA4NjRkYTA0YTY4ZmMyNzcwZWZjYjc2ZDkxNjkyYTY4YmZjOWExZg==
+    NDE4OTZlZWE2NzIwZjEzZTY1MmVkYjU2MjIxMjdjZTUxNjIzZmY2Yg==
   data.tar.gz: !binary |-
-    ODgzMTI2ZjhjMTY2YmI4ZjE2NjlhYmIzZWIyYzRhNjgwYjUwYzAxMw==
+    YTMzYjQyOTE2NGUzMjEzZTVkNzQ3YTI4N2M4NWZlYmRlYmY3ZTIyMg==
 SHA512:
   metadata.gz: !binary |-
-    NGRlM2ZkMWE3NDRhNWNkYTU1MGY1MWE3ZmUzMGU2M2ZmYTkzMTA1YjIzODNj
-    OGYxYTNiYzQ1MzEzNzMyMzY2ZjkzNzlhN2JkZjZjZDZkNDRjMjAxMjRhZWM0
-    NzVmNWVlODBkNjllMTk2NjZmMzkzMjQyOTZlMzBmYTdlZDYxZDY=
+    MzAxNmMwNDM2ZGVmYzk4NmViYTY0YTNkZWZiNjU4NWFhZjY3Y2E1NmZkNmY0
+    ZmM0NzBkM2JhNzY0NzAzMGJjNzRkNTU3NzU2ZmFiYzFjODQzNjQ2YjMyZGE2
+    YmRlMTAzOTk0ZTBkMjgyMThkNWY2MDgzMjYwNjRmZGU1OTkxZGE=
   data.tar.gz: !binary |-
-    NjIwNDVlYTU0ZThhZGE2NTRjNDI5NjUzNTgxZjA5NWE1YmMzOWIzNjNiMWI5
-    MmM4MWJjNTJjMjkwYTNkN2UzNWMzZDVmOTExNGEyMjhiNDkzNzliNmVlZWI3
-    YWNmZjc3NzQyMTdhYWZlODU3ZDZiZWI2ZWNlM2I3OGFhNTNhNTM=
+    MTBlM2UzNDNjODY1YjMwZTMwZWJmYTZhMjE3MDQ4MGM1ZWU3NGU4N2M3MzBi
+    MjYxZjQ4ZGM5MWU5Yzg5MDU4ZjE5MTA1MThiYjgyZDQzYzlhMzlkYzY4YWQ3
+    YTk1NjY2Mjg4NzE1MDY4OGQzY2U2YjA3OWMwMGE5MDFjOWJiMmE=

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in coalla-cms.gemspec
 gemspec

data/app/assets/javascripts/admin/admin.js

@@ -13,7 +13,6 @@
 //= require jquery
 //= require admin/jquery-migrate.min
 //= require jquery-ui
-//= require jquery-ui/datepicker-ru
 //= require jquery-ui-timepicker-addon
 //= require admin/vendor/jquery-ui-timepicker-addon-ru
 //= require jquery_ujs
@@ -104,31 +103,79 @@ $(function () {
 
     function addDatePickers() {
         $('input[data-calendar-date]').each(function () {
-            $this = $(this);
+            var $this = $(this);
             $this.datepicker(merge_datepicker_options($this));
         });
     }
 
+    CMS.addDatePickers = addDatePickers;
+
     addDatePickers();
 
     function addDateTimePickers() {
         $('input[data-calendar-datetime]').each(function () {
-            $this = $(this);
+            var $this = $(this);
             $this.datetimepicker(merge_datepicker_options($this));
         });
     }
 
+    CMS.addDateTimePickers = addDateTimePickers;
+
     addDateTimePickers();
 
     function addTimePickers() {
         $('input[data-calendar-time]').each(function () {
-            $this = $(this);
+            var $this = $(this);
             $this.timepicker(merge_datepicker_options($this));
         });
     }
 
+    CMS.addTimePickers = addTimePickers;
+
     addTimePickers();
 
+    function addMultiField($container) {
+        var $el;
+
+        if ($container) {
+            $el = $container.find('[data-multi-field]');
+        } else {
+            $el = $('[data-multi-field]');
+        }
+
+        $el.each(function () {
+            var options = {
+                crossDomain: false,
+                preventDuplicates: true,
+                theme: 'bootstrap',
+                showAllOnFocus: $(this).data('show-all-on-focus'),
+                useCache: $(this).data('use-cache')
+            };
+
+            if (CMS.config.language == 'ru') {
+                options.hintText = 'Введите строку для поиска';
+                options.noResultsText = 'Ничего не найдено';
+                options.searchingText = 'Поиск...';
+            }
+
+            var objectUrlName = $(this).data('object-url-name');
+            if (objectUrlName) {
+                var formatter_options = {
+                    tokenFormatter: function (item) {
+                        return "<li><p><a href='" + "/admin/" + objectUrlName + "/" + item['id'] + "/edit'>" + item[this.propertyToSearch] + "</a></p></li>"
+                    }
+                };
+                options = $.extend(options, formatter_options);
+            }
+
+            $(this).tokenInput($(this).data('source'), options);
+        });
+    }
+
+    CMS.addMultiField = addMultiField;
+
+    addMultiField();
+
     $(document).on('click', '.close-popover-form', function () {
         $('.pictograms__button_edit').popover('hide');
         $('.popover').css('display', 'none');
@@ -142,18 +189,83 @@ $(function () {
         $('.popover').css('display', 'none');
     });
 
+    function updateArrowButtons($context) {
+        $context = $context || $('body');
+
+        $context.find('[data-sort-up]').each(function () {
+            var $this = $(this),
+                $prev = $this.closest('.fields_container').prevAll('.fields_container:not(:hidden)').first();
+
+            if ($prev.length == 0) {
+                $this.hide();
+            } else {
+                $this.show();
+            }
+        });
+
+        $context.find('[data-sort-down]').each(function () {
+            var $this = $(this),
+                $next = $this.closest('.fields_container').nextAll('.fields_container:not(:hidden)').first();
+
+            if ($next.length == 0) {
+                $this.hide();
+            } else {
+                $this.show();
+            }
+        });
+
+        $context.find('[data-sort-position]').each(function () {
+            var $this = $(this),
+                $prevAll = $this.closest('.fields_container').prevAll('.fields_container:not(:hidden)');
+
+            $this.html($prevAll.length + 1);
+        });
+    }
+
+    CMS.updateArrowButtons = updateArrowButtons;
+
+    $(document).on('click', '[data-sort-up]', function () {
+        var $current = $(this).closest('.fields_container'),
+            $prev = $current.prevAll('.fields_container:not(:hidden)').first();
+
+
+        $prev.before($current);
+        $('html, body').animate({
+            scrollTop: $current.offset().top - 50
+        }, 300);
+        updateArrowButtons($current.closest('[data-sortable-blocks]'));
+
+        return false;
+    });
+
+    $(document).on('click', '[data-sort-down]', function () {
+        var $current = $(this).closest('.fields_container'),
+            $next = $current.nextAll('.fields_container:not(:hidden)').first();
+
+        $next.after($current);
+        $('html, body').animate({
+            scrollTop: $current.offset().top - 50
+        }, 300);
+        updateArrowButtons($current.closest('[data-sortable-blocks]'));
+
+        return false;
+    });
+
+    updateArrowButtons();
+
     var $form = $('form');
     $form.on('click', '.remove_field', function () {
-        $(this).prev('input[type=hidden]').val('1');
+        $(this).closest('.fields_container').find('input[name*="_destroy"]').val('1');
         $(this).closest('.fields_container').hide();
+        updateArrowButtons($(this).closest('[data-sortable-blocks]'));
         return false;
     });
 
-    $form.on('click', '.add_fields', function () {
+    CMS.addNestedFields = function ($el) {
         var time = new Date().getTime();
-        var regexp = new RegExp($(this).data('id'), 'g');
-        var wrapper = $(this).closest('.nested_buttons');
-        var insertHtml = $( $(this).data('fields').replace(regexp, time) );
+        var regexp = new RegExp($el.data('id'), 'g');
+        var wrapper = $el.closest('.nested_buttons');
+        var insertHtml = $($el.data('fields').replace(regexp, time));
         wrapper.before(insertHtml);
         // fix for Bootstrap 3 dropdown components
         wrapper.removeClass('open');
@@ -164,35 +276,123 @@ $(function () {
         addDatePickers();
         addDateTimePickers();
         addTimePickers();
-        return false;
+        addMultiField(insertHtml);
+        updateArrowButtons(insertHtml.closest('[data-sortable-blocks]'));
+
+        return insertHtml;
+    };
+
+    $form.on('click', '.add_fields', function () {
+        CMS.addNestedFields($(this));
+        return false
     });
 
-    $('[data-multi-field]').each(function () {
-        var options = {
-            crossDomain: false,
-            preventDuplicates: true,
-            theme: 'facebook',
-            showAllOnFocus: $(this).data('show-all-on-focus'),
-            useCache: $(this).data('use-cache')
-        };
+    $('[data-sortable-blocks]').sortable({
+        items: '.fields_container',
+        cancel: 'input,textarea,button,select,option,a',
+        stop: function (e, ui) {
+            var $context = $(e.target);
+            updateArrowButtons($context);
+        }
+    });
+
+    $(document).on('click', '[data-editable-column]', function () {
+        var $this = $(this),
+            url = $this.data('url');
 
-        if (CMS.config.language == 'ru') {
-            options.hintText = 'Введите строку для поиска';
-            options.noResultsText = 'Ничего не найдено';
-            options.searchingText = 'Поиск...';
+        if ($this.data('editable-column-initialized')) {
+            return;
         }
 
-        var objectUrlName = $(this).data('object-url-name');
-        if (objectUrlName) {
-            var formatter_options = {
-                tokenFormatter: function (item) {
-                    return "<li><p><a href='" + "/admin/" + objectUrlName + "/" + item['id'] + "/edit'>" + item[this.propertyToSearch] + "</a></p></li>"
-                }
-            };
-            options = $.extend(options, formatter_options);
+        $.get(url, $this.data(), function (response) {
+            var $form = $(response.form);
+            $this.data('previous-value', $this.html());
+            $this.html($form);
+
+            window.EditableColumnCallbacks = window.EditableColumnCallbacks || [];
+            _.each(window.EditableColumnCallbacks, function (callback) {
+                callback($form);
+            });
+
+            addDatePickers();
+            addDateTimePickers();
+            addTimePickers();
+            addMultiField($form);
+
+            $this.data('editable-column-initialized', true);
+        }).error(function () {
+            console.error('Unable to render edit form for column');
+        });
+
+        return false;
+    });
+
+    $(document).on('ajax:success', '[data-editable-column-form]', function (e, response) {
+        var $editableColumn = $(this).closest('[data-editable-column]');
+
+        $('.alert').closest('.row').remove();
+
+        if (!response.alert) {
+            $editableColumn.html(response.result);
+            $editableColumn.data('previous-value', $editableColumn.html());
+            $editableColumn.data('editable-column-initialized', false);
+            return;
         }
 
-        $(this).tokenInput($(this).data('source'), options);
+        $editableColumn.closest('.table-responsive').before(response.alert)
+        $editableColumn.html($editableColumn.data('previous-value'));
+        $editableColumn.data('editable-column-initialized', false);
+    });
+
+    function cancelEditColumn($el) {
+        var $editableColumn = $el.closest('[data-editable-column]');
+        $editableColumn.html($editableColumn.data('previous-value'));
+        $editableColumn.data('editable-column-initialized', false);
+    }
+
+    $(document).on('click', '[data-editable-column-cancel]', function () {
+        cancelEditColumn($(this));
+
+        return false;
+    });
+
+    $(document).on('ajax:error', '[data-editable-column-form]', function () {
+        cancelEditColumn($(this));
+
+        console.error('Unable to render edit form for column');
+    });
+
+    function showRemoteModal(url) {
+        var $modal = $('body').find('#modal');
+
+        $.get(url, function (response) {
+            var $modalContent = $(response.modal);
+
+            $modal.find('.modal-content').html($modalContent);
+            $modal.modal('show');
+
+            window.RemoteModalCallbacks = window.RemoteModalCallbacks || [];
+            _.each(window.RemoteModalCallbacks, function (callback) {
+                callback($modalContent);
+            });
+
+            addDatePickers();
+            addDateTimePickers();
+            addTimePickers();
+            addMultiField($modalContent);
+
+            return false;
+        });
+    };
+
+    CMS.showRemoteModal = showRemoteModal;
+
+    $(document).on('click', '[data-remote-modal]', function (e) {
+        var $el = $(this);
+
+        showRemoteModal($el.attr('href'));
+
+        return false;
     });
 
     $('.action-bar').stickyBar();
@@ -217,11 +417,10 @@ $(function () {
         return false;
     });
 
-    $('[data-toggle="tooltip"]').tooltip({'trigger':'focus'});
-
+    $('[data-toggle="tooltip"]').tooltip({'trigger': 'focus'});
 });
 
 CKEDITOR.config.extraPlugins = 'slideshow,mediaembed,autogrow';
 CKEDITOR.config.removeButtons = 'About,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,BidiLtr,BidiRtl,Language,Scayt,Smiley,SpellChecker,Templates,Indent,CreateDiv,HorizontalRule,Flash,NewPage,PageBreak,Iframe,Styles,FontSize,Font,TextColor,BGColor,JustifyLeft,JustifyCenter,JustifyRight,JustifyBlock';
 CKEDITOR.config.removePlugins = 'scayt,smiley';
-CKEDITOR.config.language = 'ru';
+CKEDITOR.config.language = CMS.config.language;

data/app/assets/stylesheets/admin/admin.scss

@@ -9,8 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require admin/vendor/bootstrap.min
- *= require admin/vendor/token-input.patched
- *= require admin/vendor/token-input-facebook.patched
+ *= require admin/vendor/token-input-bootstrap
  *= require admin/vendor/jquery.tagsinput
  *= require jquery-ui
  *= require jquery-ui-timepicker-addon