ab_admin 0.8.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ed57227cecaa2f87430c9c4d91b091a481d63a7c114f11815475d035d7c0fa
-  data.tar.gz: 3c468bae1894700743f5c78d9c833c57ece9638179174294e6a1ba90dd2cae54
+  metadata.gz: 6e4cff3af876fcd7ea0ee9a0a340b10ceb31d22c2a3728910692c0048c8f0e6c
+  data.tar.gz: 7c66e65f59261910436f0c4d18cf069e1f94e42cec845c39bb5d7ee07de434e5
 SHA512:
-  metadata.gz: f172fa06ba23701ba8d0849267642bbe51485951aed25d1f686a342b7b770d5983b0387886cc544c83269e653d026e31cae9fb3b2eacd40c2c5e402b2c032b3d
-  data.tar.gz: c90de19869723ace5d640bfc0b426cbfa7982f1555312dee5b990cf8a523bb09d4468c7fb1fd3297d5181987a892897638e8411690a06474539de0bb42e687fc
+  metadata.gz: 0c5926ca259601ec0369db9588748dc3c6b34fca63816ea9ef2adda4a238f45eb26f2f215d2337a38fe7a5061e870e0bdae466dcd46b5f51c7b0f2118e3e9084
+  data.tar.gz: 8ecd6b3078af74eee5d0135eb8fe1764d27f2dbd623c6e0f663d5e9b8e4e808323e968e6c87955e4f4f0c9ad7431743307b364a22a870fda1874b5a3fd9942e3

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+Copyright 2013 Alex Leshchenko
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -4,13 +4,19 @@ Simple and real-life tested Rails::Engine admin interface based on slim, bootstr
 
 ## Installation
 
-To build a new Rails application with AbAdmin, run:
+Add this line to your application's Gemfile:
 
-```bash
-rails new [my_app_name] -m https://raw.githubusercontent.com/leschenko/ab_admin/master/lib/generators/template.rb
-```
+    gem 'simple_slug'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install simple_slug
 
-Or add gems from template [list of gems](https://raw.githubusercontent.com/leschenko/ab_admin/master/lib/generators/template.rb) to an existing application and run generators:
+Run generators
 
 ```bash
 rails generate devise:install

data/app/assets/javascripts/ab_admin/components/admin_assets.js.coffee

@@ -5,13 +5,6 @@
 #= require fileupload/jquery.fileupload-validate
 #= require ab_admin/components/base_assets
 
-#q= require ab_admin/jquery.Jcrop
-#q= require ab_admin/components/croppable_image
-
-#q=require fileupload/jquery.fileupload-image
-#q=require fileupload/jquery.fileupload-audio
-#q=require fileupload/jquery.fileupload-video
-
 class window.AdminAssets extends BaseAssets
   showErrors: (e, data) ->
     errors = _.map(data.files,(file) ->
@@ -20,29 +13,11 @@ class window.AdminAssets extends BaseAssets
 
   initDisabled: ->
     super
-    @initFancybox() if $.fn.fancybox
 
   initHandlers: ->
     super
-    @initFancybox() if $.fn.fancybox
-    @initCrop() if @options.crop
     @initEditMeta() if @options.edit_meta
 
-  initFancybox: =>
-    @list.find("a.fancybox")
-      .click (e) ->
-        e.preventDefault()
-      .fancybox
-        afterShow: =>
-          @crop?.fancyboxHandler()
-        helpers:
-          overlay:
-            locked: false
-
-  initCrop: ->
-    return unless $.fn.Jcrop
-    @crop = new CroppableImage(@el, @options.crop)
-
   initEditMeta: ->
     @el.find('.fileupload-edit-button').show().click =>
       ids = @el.find('.fileupload-list .fileupload-asset').map(-> $(this).data('id')).get()

data/app/assets/javascripts/ab_admin/components/google_translate.js.coffee

@@ -20,8 +20,7 @@ window.translate = (text, element, from, to) ->
 window.google_t = (text, element, from, to) ->
   return '' unless $.trim(text)
   opts = {q: text, from: from, to: to}
-  $.post '/admin/translate', opts, ((data) =>
-    element.inputVal $.unescape(data.text).replace(/%\s{/g, ' %{')), 'json'
+  $.post '/admin/translate', opts, ((data) => element.inputVal $.unescape(data.text)), 'json'
 
 # get value of text field or CKEDITOR area
 $.fn.inputVal = (v = null) ->
@@ -45,13 +44,12 @@ $.fn.inputVal = (v = null) ->
       $el.val()
 
 class window.GoogleLocaleTabs
-  @locales = ['ru', 'en', 'it']
   constructor: ->
-    @locales = GoogleLocaleTabs.locales
+    @locales = $('.locale_tabs:first .nav-tabs a').map(-> $(this).attr('href').replace('#', '') ).get()
     @limit = 10000
     html = '<div class="t_locales">'
     for l in @locales
-      html += "<div class='t_locale t_locale_#{l}'></div>"
+      html += "<div class='t_locale t_locale_#{l}'>#{localeToFlag(l)}</div>"
     html += '</div>'
     @html = $(html)
     $('.locale_tabs:not(".no_translate") .tab-pane').prepend(@html)

data/app/assets/javascripts/ab_admin/components/in_place_edit.js.coffee

@@ -6,7 +6,10 @@ EditableForm.prototype.saveWithUrlHook = (value) ->
       originalUrl.call(@options.scope, params)
     else
       params[@options.model] ||= {}
-      params[@options.model][params.name] = params.value
+      if _.isString(params.value) && params.value.match(/@\d+/)
+        params[@options.model][params.name] = params.value.replace('@', '')
+      else
+        params[@options.model][params.name] = params.value
       params._method = 'PATCH'
       ajax_opts =
         url: originalUrl
@@ -26,30 +29,35 @@ EditableForm.prototype.saveWithUrlHook = (value) ->
 EditableForm.prototype.saveWithoutUrlHook = EditableForm.prototype.save
 EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook
 
-$(document).on 'admin:init', (e) ->
-  $('.editable').editable
-    onblur: 'submit'
-    placement: 'bottom'
-    emptytext: I18n.lookup('admin.js.empty') || 'Empty'
-    error: (response, newValue) ->
-      log response
-      if response.status == 422
-        flash JSON.parse(response.responseText).errors.join(', ')
-      else
-        response.responseText
-    success: (response) ->
-      if response && $(this).data().options?.accept == 'script'
-        $.globalEval(response.responseText)
-    datetimepicker:
-      format: "dd.mm.yyyy hh:ii"
-      autoclose: true
-      todayBtn: true
-      language: I18n.locale
-    ajaxOptions:
-      xhrFields:
-        withCredentials: true
-      headers:
-        Accept: 'application/json'
+window.initInPlaceEditable = ->
+  $('.editable').each ->
+    $el = $(this)
+    $el.editable
+      onblur: 'submit'
+      placement: 'bottom'
+      emptytext: $el.attr('placeholder') || I18n.t('admin.js.empty') || 'Empty'
+      error: (response) ->
+        if response.status == 422
+          Object.entries(response.responseJSON.errors).map((i) -> i.join(': ')).join(', ')
+        else
+          response.responseText
+      success: (response) ->
+        if response && $(this).data().options?.accept == 'script'
+          $.globalEval(response.responseText)
+      datetimepicker:
+        format: "dd.mm.yyyy hh:ii"
+        autoclose: true
+        todayBtn: true
+        language: I18n.locale
+      ajaxOptions:
+        xhrFields:
+          withCredentials: true
+        headers:
+          Accept: 'application/json'
+
+
+$(document).on 'admin:init', initInPlaceEditable
+
 $ ->
   _.each $('.editable'), (el) ->
     $el = $(el)

data/app/assets/javascripts/ab_admin/core/batch_actions.js.coffee

@@ -1,6 +1,6 @@
 $ ->
   if $('#list')[0]
-    input_name = 'by_ids'
+    input_name = 'q[id_in]'
     $(document).on 'click', '#list input.toggle', ->
       checked = $(this).is(":checked")
       $("#list [name='#{input_name}[]']").attr "checked", checked

data/app/assets/javascripts/ab_admin/core/columns_hider.js.coffee

@@ -1,18 +1,36 @@
 class window.ColumnsHider
   constructor: ->
     @store_key = 'cols'
-    @data_el = $('#columns_hider_data')
     @column_names = @columnNames()
     @collection_name = window.location.href.match(/admin\/(\w+)/)?[1]
     return unless @collection_name
     @data = @getData()
-    @initDefaults()
     @initButtons()
     @initHandlers()
     @refreshColumns()
 
-  initDefaults: ->
-    @data
+  initHandlers: ->
+    $(document).on 'pjax:end admin:list_init', =>
+      @initButtons()
+      @refreshColumns()
+
+    $(document).on 'click', '#columns_hider_wrap label', (e) =>
+      e.preventDefault()
+      e.stopPropagation()
+      $input = $(e.currentTarget).find('input')
+      $input.prop('checked', !$input.is(':checked'))
+      colIds = _.map $('#columns_hider_wrap .dropdown-menu input:not(:checked)'), (el) -> parseInt($(el).val())
+      @data[@collection_name] = colIds
+      @refreshColumns()
+      @setData()
+
+  initButtons: ->
+    $menu = $('#columns_hider_wrap .dropdown-menu')
+    $menu.empty()
+    for col, i in @column_names
+      isActive = !_.include(@data[@collection_name], i)
+      html = "<label class='checkbox'><input type='checkbox' #{'checked' if isActive} value='#{i}'>#{col.name}</label>"
+      $menu.append(html)
 
   setData: ->
     res = {}
@@ -33,27 +51,10 @@ class window.ColumnsHider
         data[@collection_name].push(i) if col.disabled
     data
 
-  initButtons: ->
-    @data_el.empty()
-    for col, i in @column_names
-      css_class = if _.include(@data[@collection_name], i) then 'active' else ''
-      html = "<button class='btn btn-primary #{css_class}' data-val='#{i}'>#{col.name}</button>"
-      @data_el.append(html)
-
   columnNames: ->
     _.map $('#list > thead > tr > th'), (el) ->
       $el = $(el)
-      {disabled: $el.hasClass('hide_cell'), name: $.trim($el.text().replace(/[▼▲]/g, ''))}
-
-  initHandlers: ->
-    $('#submit_columns_hider').click =>
-      col_ids = _.map $('#columns_hider_data .active'), (el) -> $(el).data('val')
-      @data[@collection_name] = col_ids
-      $('#columns_hider').modal('hide')
-      @refreshColumns()
-      @setData()
-    $(document).on 'pjax:end admin:list_init', =>
-      @refreshColumns()
+      {disabled: $el.hasClass('hide_cell'), name: $.trim($el.text().replace(/[▼▲]/g, '')) || ' - '}
 
   refreshColumns: ->
     if @data[@collection_name]
@@ -69,4 +70,4 @@ class window.ColumnsHider
     $("#list > thead > tr > th, #list > tbody > tr > td").show()
 
 $ ->
-  window.columns_hider = new ColumnsHider()
+  window.columnsHider = new ColumnsHider()

data/app/assets/javascripts/ab_admin/core/init.js.coffee

@@ -23,14 +23,13 @@ $ ->
       e.preventDefault()
       $(this).closest('tr').remove()
 
-  $(document).on 'admin:init', ->
     $form = $('form.simple_form')
     window.resource_id = $form.data('id')
     $form.trigger('admin:form_init')
 
   $(document).on 'admin:list_init', ->
     initPopover()
-    initTooltip()
+    initInPlaceEditable()
 
   $(document).on 'admin:form_init', 'form', ->
     initEditor()
@@ -58,3 +57,9 @@ $ ->
     $('body').css('background-color', "##{window.fv.bg_color.replace(/^#/, '')}")
 
   initHotkeys() if window.fv?.hotkeys
+
+  clipboard = new Clipboard('.js-copy')
+  clipboard.on 'success', (e) ->
+    $el = $(e.trigger)
+    $el.addClass('js-copy-popup')
+    setTimeout((-> $el.removeClass('js-copy-popup')), 1200)

data/app/assets/javascripts/ab_admin/core/search_form.js.coffee

@@ -4,12 +4,6 @@ $ ->
       $el = $(this)
       $el.next('input').attr('name', "q[#{$el.val()}]")
 
-#    $("#search_form").submit ->
-#      $("#search_form [name$='_at_gteq]']").val (i, v) ->
-#        v + " 00:00" if v
-#      $("#search_form [name$='_at_lteq]']").val (i, v) ->
-#        v + " 23:59" if v
-
-    $('#search_cancel').click (e) ->
+    $('.js-search-cancel').click (e) ->
       e.preventDefault()
       window.location.search = ""

data/app/assets/javascripts/ab_admin/core/ui_utils.js.coffee

@@ -22,16 +22,12 @@ window.initAcFileds = ->
       maxHeight: 400
       width: 220
 
-window.initTooltip = ->
-  $('.js-tooltip').tooltip
-    animation: false
-
 window.initEditor = (baseSelector='form') ->
   return if fv.test
   $("#{baseSelector} .do_wysihtml5").each ->
     $el = $(this)
     return if $el.hasClass('wysihtml5_done')
-    editor = $el.wysihtml5({html: true, locale: 'ru'}).data('wysihtml5').editor
+    editor = $el.wysihtml5({html: true, locale: 'en'}).data('wysihtml5').editor
     resizeIframe = -> editor.composer.iframe.style.height = editor.composer.element.scrollHeight + "px"
     editor.on "load", ->
       if editor.composer
@@ -50,7 +46,7 @@ window.inputBtnClose = ->
     $(this).closest('.close-wrap').remove()
 
 window.flash = (message, type='notice') ->
-  $("<div class='alert alert-#{type}'><a class='close' data-dismiss='alert'>×</a>#{message}</div>").insertBefore $('#container')
+  $("<div class='alert alert-#{type}'><a class='close' data-dismiss='alert'>×</a>#{message}</div>").prependTo $('#flash')
 
 window.focusInput = (scope=null) ->
   scope ||= $('form.simple_form:first')
@@ -89,4 +85,24 @@ window.initNestedFields = (opts={}) ->
     window.initFancySelect() unless opts.skip_fancy
     window.initPickers() unless opts.skip_pickers
     window.initEditor() unless opts.skip_editor
-    opts.callback.call(e) if opts.callback
+    opts.callback.call(e) if opts.callback
+
+window.initCkeditor = (dom_id, options={}) ->
+  if window.CKEDITOR
+    CKEDITOR.replace(dom_id, options) unless CKEDITOR.instances[dom_id]
+  else
+    $.getScript $("##{dom_id}").data('cdnUrl'), ->
+      CKEDITOR.replaceClass = null;
+      CKEDITOR.replace(dom_id, options) unless CKEDITOR.instances[dom_id]
+
+window.lazyInitCkeditor = (dom_id, options={}) ->
+  $el = $("##{dom_id}")
+  $form = $el.closest('form')
+  height = options.height || 200
+  height += if options.toolbar == 'mini' then 34 else 67
+  $el.height(height)
+  callback = (intersectionRatio) ->
+    initCkeditor(dom_id, options) if intersectionRatio
+  window.ckeditorVisibilityObserver = new IntersectionObserver (entries, observer) =>
+    entries.forEach(((entry) => callback(entry.intersectionRatio)), {root: $form[0]})
+  window.ckeditorVisibilityObserver.observe document.getElementById(dom_id)

data/app/assets/javascripts/ab_admin/core/utils.js.coffee

@@ -1,7 +1,7 @@
 window.fv ||= {}
 window.I18n ||= {}
-I18n.locale = window.fv.locale || 'ru'
-window.locale_path = if I18n.locale == 'ru' then '' else "/#{I18n.locale}"
+I18n.locale = window.fv.locale || 'en'
+window.locale_path = if I18n.locale == 'en' then '' else "/#{I18n.locale}"
 
 _.sum = (obj) ->
   return 0  if not $.isArray(obj) or obj.length is 0
@@ -168,3 +168,17 @@ window.storeData = (key, data) ->
 
 window.fetchData = (key) ->
   window.localStorage?[key] or $.cookie(key)
+
+window.localeToFlag = (l) ->
+  l = l.toUpperCase()
+  l = {'JA': 'JP', 'EN': 'GB', 'UK': 'UA'}[l] || l
+  chars = {"A":"🇦","B":"🇧","C":"🇨","D":"🇩","E":"🇪","F":"🇫","G":"🇬","H":"🇭","I":"🇮","J":"🇯","K":"🇰","L":"🇱","M":"🇲","N":"🇳","O":"🇴","P":"🇵","Q":"🇶","R":"🇷","S":"🇸","T":"🇹","U":"🇺","V":"🇻","W":"🇼","X":"🇽","Y":"🇾","Z":"🇿"}
+  l.replace /[A-Z]/g, (m) -> chars[m]
+
+window.I18n ||= {}
+window.I18n.locale = 'en'
+window.I18n.translations ||= {}
+I18n.t = (key) ->
+  keys = key.split('.')
+  keys.unshift(I18n.locale)
+  _.get(I18n.translations, keys)

data/app/assets/javascripts/ab_admin/inputs/datetime_input.js.coffee

@@ -7,6 +7,7 @@ $ ->
       viewSelect: 'month'
       minView: 'day'
       language: I18n.locale
+      weekStart: 1
 
     search_form_options = _.defaults({pickerPosition: "bottom-left datetimepicker-bottom-left-custom"}, base_options)
     search_form_options_gt = _.defaults({initialDate: new Date(new Date().setHours(0,0,0,0))}, search_form_options)

data/app/assets/javascripts/ab_admin/main.js

@@ -1,4 +1,3 @@
-//= require i18n
 //= require i18n/translations
 //= require jquery.min
 //= require jquery_ujs
@@ -7,7 +6,7 @@
 //= require jquery.cookie
 //= require jquery.pjax
 //= require jquery.hotkeys
-//= require bootstrap
+//= require bootstrap_2_3_2/bootstrap
 //= require ab_admin/jquery_nested_form
 //= require ab_admin/bootstrap-tab-multi
 //= require ab_admin/bootstrap-datetimepicker/bootstrap-datetimepicker
@@ -17,10 +16,10 @@
 //= require moment.min
 //= require ab_admin/bootstrap-editable
 //= require ab_admin/bootbox.min
-//= require select2
-//= require fancybox
+//= require select2_3_5_2/select2
 //= require ab_admin/jquery-ui-1.10.3.custom.min
 //= require jquery.ui.nestedSortable
+//= require clipboard.min
 //= require ab_admin/components/sortable_tree
 //= require ab_admin/components/google_translate
 //= require ab_admin/components/locator

data/app/assets/stylesheets/ab_admin/bootstrap_and_overrides.scss

@@ -1,8 +1,8 @@
 $baseFontSize: 13px !default;
 $baseLineHeight: 18px !default;
 
-@import "bootstrap";
-@import "bootstrap-responsive";
+@import "bootstrap_2_3_2/bootstrap";
+@import "bootstrap_2_3_2/bootstrap-responsive";
 @import "ab_admin/components/base";
 @import "ab_admin/components/navigation";
 @import "ab_admin/components/table_view";
@@ -13,11 +13,10 @@ $baseLineHeight: 18px !default;
 @import "ab_admin/components/colored_tabs";
 @import "ab_admin/components/locale_tabs";
 @import "ab_admin/components/translations";
-@import "ab_admin/components/perms";
 @import "ab_admin/components/admin_comments";
 @import "ab_admin/components/geo_input";
 @import "ab_admin/components/view_layout";
-@import "ab_admin/components/columns_hider";
+@import "ab_admin/components/tooltip";
 
 img {
   max-width: none;
@@ -89,6 +88,15 @@ ul.nav li.dropdown:hover ul.dropdown-menu {
   width: auto;
 }
 
+.label a {
+  color: white;
+  font-size: 12px;
+  font-weight: 500;
+  text-decoration: none;
+  border: none;
+  line-height: 1.4;
+}
+
 .label-primary, .badge-primary {
   background-color: #05C;
 }
@@ -130,6 +138,7 @@ label.input_set, label.label-large, .label.label-large {
   font-size: 15px;
   padding: 4px 10px 6px;
   display: block;
+  text-align: center;
 }
 
 label.label-med {
@@ -145,42 +154,79 @@ label.control-label.label-reset {
   text-align: left;
 }
 
-.table tbody {
-  tr.success > td, &.success > tr > td {
-    background-color: #dff0d8;
+.js-copy-popup {
+  position: relative;
+  &:before {
+    content: none;
   }
-
-  tr.error > td, &.error > tr > td {
-    background-color: #f2dede;
+  &:after {
+    background-color: transparent;
+    padding: 0;
+    animation: text-pop-up-top 1s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+    content: 'Copied!';
+    position: absolute;
+    color: #468847;
+    font-size: 14px;
+    left: -5px;
+    top: -5px;
   }
+}
 
-  tr.warning > td, &.warning > tr > td {
-    background-color: #fcf8e3;
+.pulse.badge-important {
+  cursor: pointer;
+  box-shadow: 0 0 0 rgba(185, 74, 72, 0.7);
+  animation: pulse-important 1s infinite;
+}
+.pulse:hover {
+  animation: none;
+}
+@keyframes pulse-important {
+  0% {
+    box-shadow: 0 0 0 0 rgba(185, 74, 72, 0.7);
   }
-
-  tr.muted > td, &.muted > tr > td {
-    background-color: #ededed;
+  70% {
+    box-shadow: 0 0 0 10px rgba(185, 74, 72, 0);
   }
-
-  tr.info > td, &.info > tr > td {
-    background-color: #d9edf7;
+  100% {
+    box-shadow: 0 0 0 0 rgba(185, 74, 72, 0);
   }
 }
 
-// utility
-.over {
-  overflow: visible !important;
+@keyframes text-pop-up-top {
+  0% {
+    transform: translateY(0);
+    transform-origin: 50% 50%;
+  }
+  95% {
+    opacity: 0.9;
+  }
+  100% {
+    transform: translateY(-30px);
+    transform-origin: 50% 50%;
+    opacity: 0;
+  }
 }
+
 .clear {
   clear: both;
 }
-.inline_block {
-  display: inline-block;
-}
-.white-space-nowrap {
+
+.white-space-nowrap, .wsn {
   white-space: nowrap;
 }
 
+.text-pink {
+  color: #F52887;
+}
+
+.text-violet {
+  color: #BA55D3;
+}
+
+.text-turquoise {
+  color: #07d3d3;
+}
+
 @media (max-width: 767px) {
   body, .container-fluid {
     padding: 0;

data/app/assets/stylesheets/ab_admin/components/_base.scss

@@ -21,7 +21,10 @@ html, body {
     margin: 0 0 20px -253px;
     float: left;
     &.well {
-      width: 220px;
+      width: 240px;
+    }
+    &.well-tiny {
+      padding: 5px;
     }
   }
   .content_with_sidebar {
@@ -39,6 +42,23 @@ html, body {
   }
 }
 
+#flash {
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  padding: 15px;
+  opacity: 0.9;
+  min-width: 25%;
+  max-width: 400px;
+  z-index: 5;
+  .alert {
+    margin-bottom: 5px;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+}
+
 #push {
   height: 40px;
 }

data/app/assets/stylesheets/ab_admin/components/_colored_tabs.scss

@@ -25,7 +25,7 @@
     border-top: none;
     padding: 10px;
   }
-  margin: 20px 0;
+  margin: 10px 0;
 }
 
 .colored_tabs {