coalla-cms 0.4.4.3 → 0.5.1.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzU3MGY1ODZkMTkzODU0ZDk5MzZlN2VhNmQ3NDExMjE2MDcyNjA0Ng==
-  data.tar.gz: !binary |-
-    ODAzZDkxNjU3YTk4ZGY0NGJlYTU2ZjUzYWM1NGM4NDFmNWZlNDg5OA==
+SHA1:
+  metadata.gz: 3ea912539c00f313d59137bee6720ad2b56226c0
+  data.tar.gz: 2b20f789b498be99e49cf3631255f56a3fb5375a
 SHA512:
-  metadata.gz: !binary |-
-    NWI3NzcyNDQ2NjIxYmM1YjBlZTdjYzMxMDk0YTYzNGZjODBmMTFmMjg5Mzk3
-    NzcyMTUwMjhlNjAzNDZmM2ZhYTMwN2VjYzgwOTRjODllZjU5OTE1ODBhM2Fj
-    ZWRlZTcyNGRjMzliZmRjYTc3MTc4YzExNTJiNDNkYmZmNmYwMGI=
-  data.tar.gz: !binary |-
-    NDlhOTliOTNlMDEyOTVmZmMzOGQxZWFjZWUxMjY2YjQ0YWE1YjM4ZGJlNzdk
-    ZmM1MDdmYWEwMTc3MGZlZTExN2Y1NTJkOWRiYjBjZDRhY2MzZDA1YWY1Yjc1
-    OTNlNThiMGI1YmI2ZGIwYWE4N2QwYzA2NTRiM2M3Y2VmNTg1YzI=
+  metadata.gz: f3bd14c67d93811762a1edc5d795bc2751b38621e919cec4414b8b632379276c1d012c64f3feddc829b59a2a10a4989e6c42498d7f60f1a4b9db0413f1e7c75c
+  data.tar.gz: 4de587dbe7011f1a380b9f9a45743fbaab1759a7072e42e4bcda34eb18baac4d66b1983b1a11baafa420e2a8bc122f07af988833d9481dfec38f13c71aa22d5e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coalla-cms (0.4.4.2)
+    coalla-cms (0.5.1.3)
       carrierwave
       ckeditor
       coalla-deploy (~> 0.1)
@@ -12,6 +12,7 @@ PATH
       jquery-timepicker-addon-rails
       jquery-ui-rails
       js-routes
+      meta-tags (~> 2.1.0)
       mini_magick
       rails (~> 4.0)
       railties (~> 4.0)
@@ -19,47 +20,48 @@ PATH
       rmagick
       sanitize
       sass-rails
+      standalone_typograf (~> 3.0.2)
       will_paginate
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
+    arel (6.0.3)
     bcrypt (3.1.10)
     builder (3.2.2)
     carrierwave (0.10.0)
@@ -67,21 +69,26 @@ GEM
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
-    ckeditor (4.1.0)
-      mime-types
+    ckeditor (4.1.6)
+      cocaine
       orm_adapter (~> 0.5.0)
-    coalla-deploy (0.1.10)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    coalla-deploy (0.1.11.2)
       railties (~> 4.0)
       thor (~> 0.18)
-    coffee-rails (4.1.0)
+    cocaine (0.5.8)
+      climate_control (>= 0.0.3, < 1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    crass (1.0.1)
-    devise (3.4.1)
+    coffee-script-source (1.10.0)
+    concurrent-ruby (1.0.0)
+    crass (1.0.2)
+    devise (3.5.6)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -89,99 +96,99 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.5.2)
-    globalid (0.3.3)
+    execjs (2.6.0)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
-    hike (1.2.3)
     i18n (0.7.0)
-    jquery-rails (4.0.3)
+    jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-timepicker-addon-rails (1.4.1)
       railties (>= 3.1)
-    jquery-ui-rails (4.1.2)
-      railties (>= 3.1.0)
-    js-routes (0.9.8)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
+    js-routes (1.2.4)
       railties (>= 3.2)
       sprockets-rails
-    json (1.8.2)
-    loofah (2.0.1)
+    json (1.8.3)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    mini_magick (4.0.4)
-    mini_portile (0.6.2)
-    minitest (5.5.1)
-    multi_json (1.11.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    nokogumbo (1.2.0)
+    meta-tags (2.1.0)
+      actionpack (>= 3.0.0)
+    mime-types (2.99)
+    mini_magick (4.4.0)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogumbo (1.4.7)
       nokogiri
     orm_adapter (0.5.0)
-    rack (1.6.0)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.5)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (10.5.0)
     remotipart (1.2.1)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
-    rmagick (2.13.4)
-    sanitize (3.1.2)
-      crass (~> 1.0.1)
+    responders (2.1.1)
+      railties (>= 4.2.0, < 5.1)
+    rmagick (2.15.4)
+    sanitize (4.0.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
-      nokogumbo (= 1.2.0)
-    sass (3.4.13)
-    sass-rails (5.0.1)
+      nokogumbo (~> 1.4.1)
+    sass (3.4.21)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+      tilt (>= 1.1, < 3)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    standalone_typograf (3.0.2)
+      activesupport
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    warden (1.2.3)
+    warden (1.2.6)
       rack (>= 1.0)
-    will_paginate (3.0.7)
+    will_paginate (3.1.0)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -4,12 +4,12 @@ require 'net/scp'
 require 'fileutils'
 
 task 'build:gem' do
-  host = '5.9.118.111'
+  host = '148.251.43.54'
   user = 'deployer'
   Net::SSH.start(host, user, port: 60000) do |ssh|
     base_dir = "/home/deployer/temp/coalla-gems"
     project_name = 'coalla-cms'
-    git_url = "http://git.coalla.ru/#{project_name}.git"
+    git_url = "git@bitbucket.org:coalla/#{project_name}.git"
     gems_dir = '/var/www/virtual-hosts/gems.coalla.ru'
     output = ssh.exec! <<-SH
       mkdir --parents #{base_dir}

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

@@ -28,109 +28,9 @@
 //= require_self
 //= require admin/custom_admin
 
-function setupWymEditor(wrappedSet) {
-    var upload = wrappedSet.data('upload');
-    var table = wrappedSet.data('table');
-    var hStyles = wrappedSet.data('h');
-    var hideBlockquote = (wrappedSet.data('hide-blockquote') === true);
-    var html = wrappedSet.data('html');
-    var preview = wrappedSet.data('preview');
-
-    var toolsItems = [
-        {'name': 'Bold', 'title': 'Strong', 'css': 'wym_tools_strong'},
-        {'name': 'Italic', 'title': 'Emphasis', 'css': 'wym_tools_emphasis'},
-        {'name': 'InsertOrderedList', 'title': 'Ordered_List', 'css': 'wym_tools_ordered_list'},
-        {'name': 'InsertUnorderedList', 'title': 'Unordered_List', 'css': 'wym_tools_unordered_list'},
-        {'name': 'CreateLink', 'title': 'Link', 'css': 'wym_tools_link'},
-        {'name': 'Paste', 'title': 'Paste_From_Word', 'css': 'wym_tools_paste'},
-        {'name': 'Undo', 'title': 'Undo', 'css': 'wym_tools_undo'},
-        {'name': 'Redo', 'title': 'Redo', 'css': 'wym_tools_redo'}
-    ];
-
-    if (table) {
-        toolsItems.push({'name': 'InsertTable', 'title': 'Table', 'css': 'wym_tools_table'});
-    }
-
-    if (html) {
-        toolsItems.push({'name': 'ToggleHtml', 'title': 'HTML', 'css': 'wym_tools_html'});
-    }
-
-    if (preview) {
-        toolsItems.push({'name': 'Preview', 'title': 'Preview', 'css': 'wym_tools_preview'});
-    }
-
-    var wym_options = {
-        lang: 'ru', rmUnwantedBr: true,
-        jQueryPath: '/assets/jquery.js',
-        toolsItems: toolsItems,
-        logoHtml: "", classesHtml: "", statusHtml: "", containersHtml: "",
-        postInit: function (wym) {
-            if (!hideBlockquote) {
-                var bqClass = 'wym_tools_blockquote';
-                var bqHtml = buttonHtml("Цитата ", bqClass, '/wysiwyg/skins/default/icons.png');
-                $(wym._box).find(wym._options.toolsSelector + wym._options.toolsListSelector).prepend(bqHtml);
-                $(wym._box).find('li.' + bqClass + ' a').click(function () {
-                    wym.container('BLOCKQUOTE');
-                    return(false);
-                });
-            }
-
-//            CURRENTLY DOESNT WORK
-//            if (table) {
-//                var bqClass = 'wym_tools_th';
-//                var bqHtml = buttonHtml("Заголовок таблицы ", bqClass, '/wysiwyg/skins/default/icons.png');
-//                $(wym._box).find(wym._options.toolsSelector + wym._options.toolsListSelector).prepend(bqHtml);
-//                $(wym._box).find('li.' + bqClass + ' a').click(function () {
-//                    wym.container('TH');
-//                    return(false);
-//                });
-//            }
-
-            if (!hStyles) {
-                hStyles = [1, 2, 3, 4, 5, 6];
-            }
-            for (var j = hStyles.length - 1; j >= 0; j--) {
-                (function (c) {
-                    var cls = 'wym_tools_heading' + c;
-                    var html = buttonHtml("Заголовок " + c, cls, '/wysiwyg/skins/default/icons.png');
-                    $(wym._box).find(wym._options.toolsSelector + wym._options.toolsListSelector).prepend(html);
-                    $(wym._box).find('li.' + cls + ' a').click(function () {
-                        wym.container('H' + c);
-                        return(false);
-                    });
-                })(hStyles[j]);
-            }
-
-            var cls = 'wym_tools_paragraph';
-            var html = buttonHtml("Абзац", cls, '/wysiwyg/skins/default/icons.png');
-            $(wym._box).find(wym._options.toolsSelector + wym._options.toolsListSelector).prepend(html);
-            $(wym._box).find('li.' + cls + ' a').click(function () {
-                wym.container('P');
-                return(false);
-            });
-
-            if (upload) {
-                wym.imageupload_init('/article_images', 'image')
-            }
-            $('.wym_buttons').addClass('btn-toolbar').find('li').addClass('btn-group').find('a').addClass('btn');
-        }
-
-    };
-    wrappedSet.wymeditor(wym_options);
-
-    function buttonHtml(title, cls, path_to_icon) {
-        var html = "<li class='" + cls + "'>"
-            + "<a href='#' title='" + title + "' "
-            + " style='background-image:"
-            + " url(" + path_to_icon + ")'>"
-            + title
-            + "</a></li>";
-
-
-        return html;
-    }
-
-}
+var CMS = CMS || {};
+CMS.config = CMS.config || {};
+CMS.config.language = CMS.config.language || 'ru';
 
 function injectNewSliderId(s, id) {
     return s.replace(/NEW_RECORD/g, id);
@@ -138,7 +38,7 @@ function injectNewSliderId(s, id) {
 
 (function ($) {
     $.fn.stickyBar = function () {
-        if (this.length){
+        if (this.length) {
             var $bar = this,
                 barOffsetTop = $bar.offset().top,
                 barOuterHeight = $bar.outerHeight(),
@@ -189,10 +89,6 @@ $(function () {
 
     $('.sortable').sortable();
 
-    $('.wymeditor').each(function () {
-        setupWymEditor($(this));
-    });
-
     function merge_datepicker_options($element) {
         var options = {
             dateFormat: 'yy-mm-dd',
@@ -224,6 +120,15 @@ $(function () {
 
     addDateTimePickers();
 
+    function addTimePickers() {
+        $('input[data-calendar-time]').each(function () {
+            $this = $(this);
+            $this.timepicker(merge_datepicker_options($this));
+        });
+    }
+
+    addTimePickers();
+
     $(document).on('click', '.close-popover-form', function () {
         $('.pictograms__button_edit').popover('hide');
         $('.popover').css('display', 'none');
@@ -254,25 +159,31 @@ $(function () {
         });
         addDatePickers();
         addDateTimePickers();
+        addTimePickers();
         return false
     });
 
     $('[data-multi-field]').each(function () {
-        var options = { crossDomain: false,
+        var options = {
+            crossDomain: false,
             preventDuplicates: true,
-            hintText: 'Введите строку для поиска',
-            noResultsText: 'Ничего не найдено',
-            searchingText: 'Поиск...',
             theme: 'facebook',
             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>"
-            }
+            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);
         }
@@ -283,10 +194,27 @@ $(function () {
     $('.action-bar').stickyBar();
 
     $(document).on('change', '[data-file-upload]', function () {
-        var filename = $(this).val().replace(/.*(\/|\\)/, '');
-        $(this).closest('[data-file-upload-container]').find('[data-file-upload-title]').text(filename);
+        var filename = $(this).val().replace(/.*(\/|\\)/, ''),
+            container = $(this).closest('[data-file-upload-container]');
+
+        container.find('[data-file-upload-title]').text(filename);
+
+        if (filename.length > 0) {
+            container.find('[data-file-remove-flag]').val(0);
+        }
     });
 
+    $(document).on('click', '[data-file-remove-btn]', function () {
+        var container = $(this).closest('[data-file-upload-container]'),
+            title = container.find('[data-file-upload-title]');
+        title.text(title.data('label'));
+        container.find('[data-file-upload]').val('');
+        container.find('[data-file-remove-flag]').val(1);
+        return false;
+    });
+
+    $('[data-toggle="tooltip"]').tooltip({'trigger':'focus'});
+
 });
 
 CKEDITOR.config.extraPlugins = 'slideshow,mediaembed,autogrow';

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

@@ -55,13 +55,4 @@ function PhotoUploader(formTemplate) {
         });
 
     };
-}
-
-$(function () {
-    var addUploadListener = function () {
-        PhotoUploader.addUploadListener();
-    };
-    addUploadListener();
-    window.NestedFormCallbacks = window.NestedFormCallbacks || [];
-    window.NestedFormCallbacks.push(addUploadListener);
-});
+}

data/app/assets/javascripts/admin/vendor/jquery-ui-timepicker-addon-ru.js

@@ -1,40 +1,42 @@
-$(function() {
-    $.datepicker.regional['ru'] = {
-        closeText: 'Закрыть',
-        prevText: '<Пред',
-        nextText: 'След>',
-        currentText: 'Сегодня',
-        monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
-            'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
-        monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
-            'Июл','Авг','Сен','Окт','Ноя','Дек'],
-        dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'],
-        dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'],
-        dayNamesMin: ['Вс','Пн','Вт','Ср','Чт','Пт','Сб'],
-        weekHeader: 'Не',
-        dateFormat: 'dd.mm.yy',
-        firstDay: 1,
-        isRTL: false,
-        showMonthAfterYear: false,
-        yearSuffix: ''
-    };
-    $.datepicker.setDefaults($.datepicker.regional['ru']);
+$(function () {
+    if (CMS.config.language == 'ru') {
+        $.datepicker.regional['ru'] = {
+            closeText: 'Закрыть',
+            prevText: '<Пред',
+            nextText: 'След>',
+            currentText: 'Сегодня',
+            monthNames: ['Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь',
+                'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'],
+            monthNamesShort: ['Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн',
+                'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек'],
+            dayNames: ['воскресенье', 'понедельник', 'вторник', 'среда', 'четверг', 'пятница', 'суббота'],
+            dayNamesShort: ['вск', 'пнд', 'втр', 'срд', 'чтв', 'птн', 'сбт'],
+            dayNamesMin: ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'],
+            weekHeader: 'Не',
+            dateFormat: 'dd.mm.yy',
+            firstDay: 1,
+            isRTL: false,
+            showMonthAfterYear: false,
+            yearSuffix: ''
+        };
+        $.datepicker.setDefaults($.datepicker.regional['ru']);
 
 
-    $.timepicker.regional['ru'] = {
-        timeOnlyTitle: 'Выберите время',
-        timeText: 'Время',
-        hourText: 'Часы',
-        minuteText: 'Минуты',
-        secondText: 'Секунды',
-        millisecText: 'Миллисекунды',
-        timezoneText: 'Часовой пояс',
-        currentText: 'Сейчас',
-        closeText: 'Закрыть',
-        timeFormat: 'HH:mm',
-        amNames: ['AM', 'A'],
-        pmNames: ['PM', 'P'],
-        isRTL: false
-    };
-    $.timepicker.setDefaults($.timepicker.regional['ru']);
+        $.timepicker.regional['ru'] = {
+            timeOnlyTitle: 'Выберите время',
+            timeText: 'Время',
+            hourText: 'Часы',
+            minuteText: 'Минуты',
+            secondText: 'Секунды',
+            millisecText: 'Миллисекунды',
+            timezoneText: 'Часовой пояс',
+            currentText: 'Сейчас',
+            closeText: 'Закрыть',
+            timeFormat: 'HH:mm',
+            amNames: ['AM', 'A'],
+            pmNames: ['PM', 'P'],
+            isRTL: false
+        };
+        $.timepicker.setDefaults($.timepicker.regional['ru']);
+    }
 });

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

@@ -299,4 +299,8 @@ legend { padding-bottom: 10px !important; }
 }
 
 .ui-datepicker {
-  z-index: 9999 !important; }
+  z-index: 9999 !important; }
+
+.control-group{
+  position: relative;
+}

data/app/controllers/admin/image_upload_controller.rb

@@ -3,7 +3,7 @@ module Admin
   class ImageUploadController < BaseController
 
     def upload_image
-      @image = params[:image_class].classify.constantize.new
+      @image = params[:image_class].camelize.constantize.new
       @image.send("#{params[:field]}=", params[:image])
       @image.valid?
       @free_size = params[:free_size] || false