ab_admin 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ed57227cecaa2f87430c9c4d91b091a481d63a7c114f11815475d035d7c0fa
-  data.tar.gz: 3c468bae1894700743f5c78d9c833c57ece9638179174294e6a1ba90dd2cae54
+  metadata.gz: e9ac96fefdb305b914a27a302af787dfd92e1bfa9ec02d6078579f26d1c49f87
+  data.tar.gz: 59026b1d51c0d63026d8655a69e2a536fb52e919e3c3babe2abd74996757dac5
 SHA512:
-  metadata.gz: f172fa06ba23701ba8d0849267642bbe51485951aed25d1f686a342b7b770d5983b0387886cc544c83269e653d026e31cae9fb3b2eacd40c2c5e402b2c032b3d
-  data.tar.gz: c90de19869723ace5d640bfc0b426cbfa7982f1555312dee5b990cf8a523bb09d4468c7fb1fd3297d5181987a892897638e8411690a06474539de0bb42e687fc
+  metadata.gz: 53db71976b5d9bfb9f0647a3c3ab1f536ee14a514d2ed3269fa468b5a94fc3c17588c1542c7c315e9a4c4853e86a7bc0ea4891890a26a4583222bd7e7ceab871
+  data.tar.gz: d19391ed5b4323dd40cbc0df5ccc1728447f4f54c262ebbb0ec01520f6efc8af30e3bf24ee01c3ef5d5b324fb0887368e897a964c850ab63e9870e1686dff935

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

@@ -26,7 +26,7 @@ EditableForm.prototype.saveWithUrlHook = (value) ->
 EditableForm.prototype.saveWithoutUrlHook = EditableForm.prototype.save
 EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook
 
-$(document).on 'admin:init', (e) ->
+window.initInPlaceEditable = ->
   $('.editable').editable
     onblur: 'submit'
     placement: 'bottom'
@@ -50,6 +50,10 @@ $(document).on 'admin:init', (e) ->
         withCredentials: true
       headers:
         Accept: 'application/json'
+
+
+$(document).on 'admin:init', initInPlaceEditable
+
 $ ->
   _.each $('.editable'), (el) ->
     $el = $(el)

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,12 @@ $ ->
       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()
 
   $(document).on 'admin:form_init', 'form', ->
     initEditor()
@@ -58,3 +56,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')

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,9 @@ 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]

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

@@ -7,7 +7,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
@@ -18,9 +18,9 @@
 //= require ab_admin/bootstrap-editable
 //= require ab_admin/bootbox.min
 //= require select2
-//= require fancybox
 //= 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;
@@ -130,6 +129,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 {
@@ -167,16 +167,41 @@ label.control-label.label-reset {
   }
 }
 
-// utility
-.over {
-  overflow: visible !important;
+.js-copy-popup {
+  position: relative;
+  &:before {
+    content: none;
+  }
+  &: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;
+  }
 }
+@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;
 }

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/_form.scss

@@ -78,12 +78,10 @@ input[type="color"],
 }
 
 #search_form {
+  margin: 0;
   .right-label {
     padding: 5px 0 0 130px;
   }
-  #search_cancel {
-    float: right;
-  }
   label {
     margin-top: 5px;
   }
@@ -108,27 +106,21 @@ input[type="color"],
     }
     input {
       float: right;
+      width: 45%;
     }
   }
   .select select {
     width: 100%;
   }
-  .tooltip.left {
-    -moz-transform: translateX(-10px) translateY(-4px);
-    -ms-transform: translateX(-10px) translateY(-4px);
-    -o-transform: translateX(-10px) translateY(-4px);
-    -webkit-transform: translateX(-10px) translateY(-4px);
-    transform: translateX(-10px) translateY(-4px);
-  }
   hr {
     margin: 10px 0;
   }
-  .search-submit-wide {
-    display: block;
-    width: calc(100% + 26px);
-    margin-top: -13px;
-    margin-left: -13px;
-    margin-right: -13px;
+  .search-submit {
+    width: 78%;
+  }
+  .search-cancel {
+    width: 20%;
+    float: right;
   }
 }
 
@@ -201,6 +193,10 @@ textarea.text {
   margin-bottom: 1px;
 }
 
+.popover-title {
+  max-width: 600px;
+}
+
 .auto-submit-checkbox-wrap {
   display: inline-block;
   padding: 2px 4px 2px 6px;
@@ -209,7 +205,7 @@ textarea.text {
     width: auto;
     margin: 0;
     line-height: normal;
-    vertical-align: text-bottom;
+    vertical-align: baseline;
   }
   label {
     margin-bottom: 0;