ab_admin 0.3.5 → 0.3.6

data/Gemfile

@@ -11,7 +11,7 @@ gem 'devise-encryptable'
 gem 'cancan'
 # for ruby 2.0
 #gem 'inherited_resources', git: 'git://github.com/josevalim/inherited_resources.git'
-gem 'inherited_resources', '~> 1.3.0'
+gem 'inherited_resources', '~> 1.4.0'
 gem 'rack-pjax'
 gem 'configatron'
 
@@ -20,8 +20,8 @@ gem 'has_scope'
 gem 'friendly_id'
 gem 'galetahub-enum_field', require: 'enum_field'
 gem 'awesome_nested_set'
-gem 'sunrise-file-upload', git: 'git://github.com/leschenko/sunrise-file-upload.git', ref: '53da968'
-gem 'globalize3', :git => 'git://github.com/leschenko/globalize3.git', :ref => 'f16ab7f', branch: 'master'
+gem 'globalize3', git: 'git://github.com/leschenko/globalize3.git', branch: 'master', ref: 'f16ab7f'
+gem 'sunrise-file-upload', git: 'git://github.com/leschenko/sunrise-file-upload.git', branch: 'master', ref: '6aad0cf'
 
 gem 'carrierwave'
 gem 'mini_magick'

data/TODO

@@ -1,3 +1,4 @@
 +settings and locales reloading
 form has_many has_one
-add resource history
+add resource history
+extract perms css

data/ab_admin.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rails-i18n'
   gem.add_dependency 'slim'
   gem.add_dependency 'cancan'
-  gem.add_dependency 'inherited_resources', '~> 1.3.0'
+  gem.add_dependency 'inherited_resources', '~> 1.4.0'
   gem.add_dependency 'rack-pjax'
   gem.add_dependency 'ransack'
   gem.add_dependency 'has_scope'
@@ -55,5 +55,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'forgery'
   gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'connection_pool'
-  gem.add_development_dependency 'cucumber-rails'
+  #gem.add_development_dependency 'cucumber-rails'
 end

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

@@ -60,29 +60,9 @@ class window.AdminAssets
 
   initCrop: ->
     if @uploader_el.data('crop') && $.fn.Jcrop
-      @crop = new CroppableImage(@element_id)
+      opts = if _.isObject(@uploader_el.data('crop')) then @uploader_el.data('crop') else {}
+      @crop = new CroppableImage(@element_id, opts)
 
   initFancybox: =>
     $(@query + " a.fancybox").fancybox
       afterShow: => @crop?.fancyboxHandler()
-
-
-#class window.AssetDescription
-#  constructor: (@assoc, @assetable_type, @assetable_id, @guid) ->
-#    @cont = $("[id^='#{@assoc}_']")
-#    @addButton()
-#
-#  addButton: ->
-#    uri = $.param({assoc: @assoc, assetable_type: @assetable_type, assetable_id: @assetable_id, guid: @guid})
-#    url = '/admin/assets/description?' + uri
-#    html = "<button type='button' class='black_button button_description' href='#{url}'>#{I18n.t('admin_js.button_description')}</button>"
-#    @cont.find('.fileupload-button').after(html)
-#    @button = @cont.find('.button_description')
-#    @button.fancybox
-#      onComplete: ->
-#        $cont = $(".locale_tabs.asset_description")
-##        $cont.tabs()
-#        $cont.closest('#fancybox-content').width (i, w) -> w + 10
-#    $('#fancybox-content .button_save, #fancybox-content .button_cancel').live 'click', ->
-#      $.fancybox.close()
-#

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

@@ -1,7 +1,7 @@
 class window.CroppableImage
-  @crop_defaults =
-    aspectRatio: 760 / 350
-    setSelect: [0, 0, 760, 350]
+  @crop_defaults = {}
+#    aspectRatio: 760 / 350
+#    setSelect: [0, 0, 760, 350]
 
   constructor: (@element_id, @options = {}) ->
     @uploader_api = qq.FileUploader.instances[@element_id]

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

@@ -119,18 +119,15 @@ window.codeLatLng = (lat, lng, callback = null) ->
   latlng = new google.maps.LatLng(lat, lng)
   window.geocoder.geocode {latLng: latlng}, (results, status) ->
     if status is google.maps.GeocoderStatus.OK
-#      log results[1]
       results[1]
       callback(results[1]) if callback
     else
       false
 
 window.codeAddress = (address, callback = null) ->
-#  log address
   window.geocoder ||= new google.maps.Geocoder()
   window.geocoder.geocode {address: address}, (results, status) ->
     if status is google.maps.GeocoderStatus.OK
-#      log results
       callback(_.first(results)) if callback
     else
       false
@@ -139,38 +136,3 @@ window.getPlaceComponent = (place, component) ->
   res = _.filter place.address_components, (el) ->
     _.include(el.types, component)
   res[0]
-
-
-
-#  typesByPrefix: ->
-#    if _.include(['region', 'district', 'sub_district'], @options.prefix)
-#      ['(regions)']
-#    else if _.include(['location'], @options.prefix)
-#      ['(cities)']
-#    else
-#      ['geocode']
-
-#  initAutocompleteCustom: (dom_input='geo_autocomplete') ->
-#    input = document.getElementById(dom_input)
-#    opts =
-#      types: ['geocode']
-##      componentRestrictions: {country: 'ru'}
-#    autocomplete = new google.maps.places.Autocomplete(input, opts)
-#    autocomplete.bindTo('bounds', @map)
-#    google.maps.event.addListener autocomplete, 'place_changed', =>
-#      place = autocomplete.getPlace()
-#      @callback.call(this, place) if @callback
-#      return unless place.geometry
-#      pos = place.geometry.location
-#      if place.geometry.viewport
-#        @map.fitBounds(place.geometry.viewport)
-#      else
-#        @map.setCenter(pos)
-#        @map.setZoom(17)
-#
-#      @marker.setPosition(pos)
-#      @setInputs(pos)
-#
-#    $('#'+ dom_input).live "keypress", (e) ->
-#      e.preventDefault() if e.keyCode == 13
-

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

@@ -21,4 +21,5 @@ $(document).on 'admin:init', (e) ->
   return unless window.viewType == 'list'
   $('.editable').editable
     onblur: 'submit'
-    placement: 'bottom'
+    placement: 'bottom'
+    emptytext: I18n.t('admin_js.empty')

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

@@ -3,4 +3,5 @@ window.initNestedFields = (opts={}) ->
     window.locale_tabs?.initHandlers() unless opts.skip_tabs
     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

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

@@ -6,6 +6,7 @@
 #= require ab_admin/core/search_form
 #= require ab_admin/core/pagination
 #= require ab_admin/core/columns_hider
+#= require ab_admin/core/view_layout
 
 $ ->
   if $('#list')[0]
@@ -62,6 +63,7 @@ $ ->
 
   initHotkeys() if window.gon?.hotkeys
 
+
 #    $('form .region_ac').regionAc()
 #    new NestedFieldsAdder
 #      region_ac: true

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

@@ -1,22 +1,22 @@
 $ ->
-  $('.pjax, .pagination a, .pjax_links a').live 'click', (event) ->
-    if event.which > 1 || event.metaKey || event.ctrlKey
+  $(document).on 'click', '.pjax, .pagination a, .pjax_links a', (e) ->
+    if e.which > 1 || e.metaKey || e.ctrlKey
       return
     else if $.support.pjax
-      event.preventDefault()
+      e.preventDefault()
       $.pjax
         container: $(this).data('pjax-container') || '[data-pjax-container]'
         url: $(this).data('href') || $(this).attr('href')
         timeout: 50000
     else if $(this).data('href')
-      event.preventDefault()
+      e.preventDefault()
       window.location = $(this).data('href')
 
   unless gon.test
-    $('.pjax-form').live 'submit', (event) ->
+    $(document).on 'submit', '.pjax-form', (e) ->
       $el = $(this)
       if $.support.pjax
-        event.preventDefault()
+        e.preventDefault()
         $.pjax
           type: $el.attr('method')
           container: $el.data('pjax-container') || '[data-pjax-container]'

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

@@ -3,7 +3,7 @@ window.clonePagination = ->
 
 window.initPopover = ->
   $('.popover').hide()
-  $('a[rel=popover]').popover({trigger: 'hover'})
+  $('a[rel=popover]').popover({trigger: 'hover', html: true})
 
 window.initAcFileds = ->
   for el in $('.ac_field')
@@ -40,7 +40,7 @@ window.inputSetToggle = ->
     $(this).siblings().toggle()
 
 window.flash = (message, type='notice') ->
-  $('#container').prepend $("<div class='alert alert-#{type}'><a class='close' data-dismiss='alert'>×</a>#{message}</div>")
+  $("<div class='alert alert-#{type}'><a class='close' data-dismiss='alert'>×</a>#{message}</div>").insertBefore $('#container')
 
 window.focusInput = (scope=null) ->
   scope ||= $('form.simple_form:first')
@@ -62,9 +62,12 @@ window.initFancySelect = ->
   $('form .fancy_select, form input.token, .without_form.fancy_select').each ->
     $el = $(this)
     return if $el.data('select2')
+    $el.prop('required', null)
     options = _.defaults({}, defaults)
     options.multiple = $el.data('multi') unless _.isUndefined($el.data('multi'))
     options.width = $el[0].style.width || 'resolve'
+    options.escapeMarkup = (m) -> m
+
     if $el.data('tags')
       options.tokenSeparators = [","]
       options.tags = $el.data('tags')
@@ -83,9 +86,6 @@ window.initFancySelect = ->
       if $el.data('selection')
         options.formatSelection = (item) -> fetchTemplate($el.data('selection'))(item)
 
-      if $el.data('image') || $el.data('result') || $el.data('selection')
-        options.escapeMarkup = (m) -> m
-
       options.initSelection = (el, callback) ->
         data = $el.data('pre')
         if $el.data('multi')
@@ -123,11 +123,11 @@ window.initFancySelect = ->
 
             log cond
 
-          data = {q: term, class: $el.data('class'), token: true}
+          data = {q: term, class: $el.data('class'), token: true, page: page}
           _.extend(data, cond)
 
         results: (data, page) ->
-          results: data
+          results: data, more: data.length > 0
 
     $el.select2(options)
 

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

@@ -145,6 +145,10 @@ window.to_f = (val) ->
   val = parseFloat val, 10
   if isNaN(val) then 0.0 else val
 
+window.to_fixed = (val, prec = 2) ->
+  return 0 unless val
+  (parseFloat(val) + 0.0).toFixed(prec)
+
 window.log = (objects...) ->
   window.logging = true
   unless window.gon?.no_log
@@ -162,4 +166,18 @@ window.clone_obj = (obj) ->
   for key of obj
     newInstance[key] = clone_obj obj[key]
 
-  return newInstance
+  return newInstance
+
+
+window.storeData = (key, data) ->
+  if _.isObject(data)
+    str = JSON.stringify(data)
+  else
+    str = '' + data
+  if window.localStorage
+    window.localStorage[key] = str
+  else
+    $.cookie(key, str, {path: '/'})
+
+window.fetchData = (key) ->
+  window.localStorage?[key] or $.cookie(key)

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

@@ -0,0 +1,44 @@
+class window.ViewLayout
+  constructor: ->
+    @wrap = $('#main')
+    @initElements()
+    @css_classes = @control.find('.btn').map(-> $(this).data('css')).get().join(' ')
+    @initHandlers()
+    @restoreMainCss(true)
+    $(document).on 'pjax:end', =>
+      @initElements()
+      @restoreMainCss()
+
+  initElements: ->
+    @control = $('#view_layout')
+    @sidebar_on = $('#toggle_sidebar_on')
+    @sidebar_off = $('#toggle_sidebar_off')
+
+  initHandlers: ->
+    self = this
+    $(document).on 'click', '#toggle_sidebar_off', =>
+      @wrap.addClass('hide_sidebar')
+      @storeMainCss()
+
+    $(document).on 'click', '#toggle_sidebar_on', =>
+      @wrap.removeClass('hide_sidebar')
+      @storeMainCss()
+
+    $(document).on 'click', '#view_layout .btn', ->
+      $el = $(this)
+      $el.toggleClass('active').siblings().removeClass('active')
+      self.wrap.removeClass(self.css_classes).toggleClass($el.data('css'), $el.hasClass('active'))
+      self.storeMainCss()
+
+  storeMainCss: ->
+    storeData('view_layout', @wrap.prop('className'))
+
+  restoreMainCss: (wrap=false) =>
+    css = fetchData('view_layout')
+    if css
+      @wrap.prop('className', css) if wrap
+      @control.find("[data-css='#{css_class}']").addClass('active') for css_class in css.split(' ')
+
+$ ->
+  if $('#list')[0]
+    window.view_layout = new ViewLayout()

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

@@ -17,6 +17,25 @@ $iconWhiteSpritePath: asset-url('glyphicons-halflings-white.png', image);
 @import "ab_admin/components/geo_input";
 @import "ab_admin/components/sortable_tree";
 @import "ab_admin/components/text_styles";
+@import "ab_admin/components/view_layout";
+
+img {
+  max-width: none;
+}
+
+.pagination a {
+  background-color: white;
+}
+
+.breadcrumb {
+  padding: 10px 14px;
+  margin-bottom: 10px;
+}
+
+.well {
+  padding: 15px;
+  margin-bottom: 10px;
+}
 
 .dropdown .caret {
   margin-left: 5px;
@@ -141,4 +160,7 @@ label.control-label.label-reset {
 // utility
 .over {
   overflow: visible !important;
+}
+.clear {
+  clear: both;
 }

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

@@ -17,15 +17,15 @@ html, body {
     float: left;
   }
   .sidebar {
-    width: 260px;
-    margin: 0 0 20px -265px;
+    width: 252px;
+    margin: 0 0 20px -253px;
     float: left;
     &.well {
       width: 220px;
     }
   }
   .content_with_sidebar {
-    margin-right: 280px;
+    margin-right: 260px;
     overflow-x: auto;
   }
   .row-fluid .alert {

data/app/assets/stylesheets/ab_admin/components/_form.css.scss

@@ -52,7 +52,7 @@
     padding: 5px 0 0 130px;
   }
   #search_cancel {
-    margin-left: 35px;
+    float: right;
   }
   label {
     margin-top: 5px;

data/app/assets/stylesheets/ab_admin/components/_navigation.css.scss

@@ -31,6 +31,8 @@
 
 .resource_actions {
   float: left;
+  margin-top: -10px;
+  margin-right: 10px;
   .btn {
     margin-right: 5px;
   }
@@ -58,7 +60,7 @@
   margin-left: -30px;
   .btn-group {
     float: left;
-    margin-left: 15px;
+    margin-left: 10px;
   }
   .btn-group:first-child {
     margin-left: 30px;
@@ -70,6 +72,10 @@
   margin-left: -30%;
 }
 
+#columns_hider_show {
+  margin-left: 10px;
+}
+
 #lang_bar img {
   height: 16px;
   width: 24px;

data/app/assets/stylesheets/ab_admin/components/_table_view.css.scss

@@ -85,3 +85,7 @@ table.index_table {
     margin: 0;
   }
 }
+
+#batch_action_form {
+  margin-bottom: 10px;
+}

data/app/assets/stylesheets/ab_admin/components/_view_layout.css.scss

@@ -0,0 +1,65 @@
+#main {
+  &.main_wide {
+    #container {
+      display: table-row;
+      .wrap_content {
+        display: table-cell;
+        vertical-align: top;
+        float: none;
+      }
+    }
+  }
+  &.main_reverse {
+    .wrap_content {
+      width: auto;
+      margin-left: 260px;
+    }
+    .content_with_sidebar {
+      margin-right: 0;
+    }
+    .sidebar {
+      position: absolute;
+      top: 0;
+      left: 0;
+      margin-left: 5px;
+    }
+    #toggle_sidebar_off {
+      display: block;
+      position: absolute;
+      top: 5px;
+      right: 5px;
+      z-index: 3;
+    }
+    &.hide_sidebar {
+      .wrap_content {
+        position: absolute;
+        left: 16px;
+        z-index: 2;
+        margin-left: 5px;
+      }
+      #toggle_sidebar_off {
+        display: none;
+      }
+      #toggle_sidebar_on {
+        display: block;
+        position: absolute;
+        top: -1px;
+        left: -4px;
+        z-index: 3;
+        height: 100px;
+        padding: 80px 5px 0;
+        width: 15px;
+      }
+    }
+  }
+  #toggle_sidebar_off, #toggle_sidebar_on {
+    display: none;
+  }
+  #view_layout {
+    display: none;
+    float: left;
+  }
+  .table_view #view_layout {
+    display: block;
+  }
+}