ab_admin 0.1.2 → 0.2.0

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

@@ -71,6 +71,13 @@ $.fn.loadSelect = (optionsDataArray) ->
 $.fn.scrollToEl = ->
   $('html, body').animate({scrollTop: $(this).offset().top}, 'slow')
 
+$.fn.toHref = ->
+  $el = $(this)
+  if _.isEmpty($el.data())
+    window.location.href = $el.attr('href')
+  else
+    $el.click()
+
 $.parseQuery = ->
   window.location.search.replace("?", "").parseQuery()
 

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

@@ -19,5 +19,4 @@ $ ->
   initPickers()
 
   $('.simple_form').bind "nested:fieldAdded", =>
-    initPickers()
-    initFancySelect()
+    initPickers()

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

@@ -0,0 +1,28 @@
+//= require i18n
+//= require i18n/translations
+//= require jquery_ujs
+//= require jquery.cookie
+//= require jquery.pjax
+//= require jquery.ui.nestedSortable
+//= require jquery_nested_form
+//= require jquery.hotkeys
+//= require bootstrap
+//= require ab_admin/bootstrap-tab-multi
+//= require ab_admin/bootstrap-datepicker/core
+//= require ab_admin/bootstrap-datepicker/locales/bootstrap-datepicker.ru.js
+//= require ab_admin/bootstrap-timepicker
+//= require bootstrap-wysihtml5
+//= require bootstrap-wysihtml5/locales/ru
+//= require bootstrap-editable-inline
+//= require select2
+//= require fancybox
+//= require jquery.ui.nestedSortable
+//= require ab_admin/components/sortable_tree
+//= require ab_admin/components/google_translate
+//= require ab_admin/components/locator
+//= require ab_admin/components/admin_assets
+//= require ab_admin/components/gmaps
+//= require ab_admin/components/in_place_edit
+
+//= require ab_admin/core/init
+//= require ab_admin/inputs/datetime_input

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

@@ -1,10 +1 @@
-//= require ab_admin/bootstrap-datepicker
-//= require ab_admin/bootstrap-timepicker
-//= require bootstrap-wysihtml5
-//= require bootstrap-editable
-//= require select2
-//= require ab_admin/bootstrap_and_overrides
-//= require ab_admin/fileupload
-
-//q= require jquery.fancybox
-//q= require token_input/token-input-facebook
+//= require ab_admin/main

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

@@ -17,6 +17,10 @@ $iconWhiteSpritePath: asset-url('glyphicons-halflings-white.png', image);
 @import "ab_admin/components/geo_input";
 @import "ab_admin/components/sortable_tree";
 
+.dropdown .caret {
+  margin-left: 5px;
+}
+
 .btn .caret {
   margin-left: 3px;
 }

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

@@ -7,9 +7,12 @@
     float: left;
   }
   .sidebar {
-    width: 220px;
+    width: 260px;
     margin: 0 0 20px -265px;
     float: left;
+    &.well {
+      width: 220px;
+    }
   }
   .content_with_sidebar {
     margin-right: 280px;

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

@@ -92,19 +92,16 @@ textarea.do_wysihtml5 {
   width: 625px;
 }
 
-.fileupload {
-  position: relative;
+textarea {
+  width: auto;
 }
 
-.fileupload-drop-area {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  min-height: 70px;
-  z-index: 2;
-  text-align: center;
-  color: #999;
-  font-size: 26px;
+.fancy_select, input.token {
+  min-width: 220px;
+}
+
+.simple_form {
+  .fancy_select, input.token {
+    min-width: 400px;
+  }
 }

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

@@ -1,19 +1,15 @@
 .admin_map {
   height: 400px;
-  margin-left: 10%;
-  width: 80%;
-  margin-top: 0.6em;
+  width: 800px;
   img {
     max-width: none;
   }
 }
 .geo_input {
-  label {
-    display: inline-block;
-    width: 10%;
-  }
   input {
-    display: inline-block;
-    width: 80% !important;
+    width: 400px;
+    &.geo_ac {
+      width: 800px;
+    }
   }
 }

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

@@ -1,120 +1,86 @@
-.gray-blocks {
+.fileupload {
   overflow: hidden;
-  margin-top: 10px;
-  .fileupload-file img {
-    width: 80px;
-  }
-  .bg-bl {
-    background: #d1e6dc;
-    overflow: hidden;
-  }
-  .gr-title {
-    display: block;
-    color: #5b6569;
-    font-size: 1.1em;
-    padding: 20px 20px 15px 20px;
-  }
-  .galery {
-    display: block;
-    overflow: hidden;
-    .ill {
-      z-index: 3;
-      display: block;
+  position: relative;
+  padding-top: 10px;
+  padding-left: 10px;
+  &.asset_asset_type {
+    .asset {
       float: left;
       overflow: hidden;
-      width: 80px;
-      height: 80px;
-      margin-right: 1px;
-      margin-bottom: 1px;
+      margin: 3px;
       position: relative;
-      .del {
-        display: block;
+      z-index: 3;
+      .del_asset, .main_image, .crop_image, .rotate_image {
         position: absolute;
-        right: 0px;
-        top: 0px;
-        background: image_url("admin/transp_cross.png") no-repeat left top;
-        width: 17px;
-        height: 17px;
         cursor: pointer;
-        z-index: 1;
-        img {
-          width: 17px;
-          height: 17px;
-        }
+        background: rgba(100, 131, 137, 0.6);
+        z-index: 4;
+        padding: 1px 3px;
       }
-      .main_img {
-        cursor: pointer;
-        display: block;
-        height: 17px;
-        width: 17px;
-        text-indent: -2000px;
-        position: absolute;
-        padding: 0 0 0 20px;
-        left: 0;
+      .del_asset {
+        right: 0;
         top: 0;
-        z-index: 1;
       }
-
-      //checkbox on pic
-      .main_img {
-        background: image_url("main_pic.png") no-repeat;
+      .main_image {
+        right: 0;
+        bottom: 0;
       }
-    }
-  }
-  .ill-bl {
-    display: block;
-    overflow: hidden;
-    padding: 0px 20px 0px 20px;
-    border-bottom: solid 1px #e7faed;
-    position: relative;
-    .r-ill {
-      margin-left: -90px;
-      width: 100%;
-      float: right;
-      .r-ill-data {
-        margin-left: 90px;
+      .crop_image {
+        display: none;
+        left: 0;
+        bottom: 0;
+      }
+      .rotate_image {
+        left: 0;
+        bottm: 0;
       }
     }
-    .l-ill {
-      float: left;
-      width: 80px;
-      overflow: hidden;
-    }
-    .file-name {
-      color: #5b6569;
-      font-size: 0.9em;
-      font-weight: bold;
-      display: block;
+    &.one_asset .main_image {
+      display: none;
     }
-    .del {
-      display: block;
-      position: absolute;
-      right: 20px;
-      top: 0px;
-      width: 13px;
-      height: 13px;
-      overflow: hidden;
+  }
+  &.file_asset_type {
+    .asset {
+      margin-bottom: 10px;
+      z-index: 2;
+      position: relative;
+      .del_asset {
+        margin-left: 15px;
+      }
     }
   }
-}
+  .file-name {
+    color: #5b6569;
+    font-size: 0.9em;
+    font-weight: bold;
+  }
+  .file-types {
+    overflow: hidden;
+    padding-top: 10px;
+    padding-left: 5px;
+    z-index: 2;
+  }
+  .fileupload-button {
+    z-index: 3;
+  }
 
-.file-types {
-  display: block;
-  overflow: hidden;
-  padding: 5px 20px;
-}
+  .file-types .type-info {
+    float: right;
+    color: #5b6569;
+    font-size: 0.9em;
+    text-transform: uppercase;
+  }
+  .fileupload-drop-area {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    min-height: 70px;
+    z-index: 1;
+    text-align: center;
+    color: #999;
+    font-size: 18px;
+  }
 
-.file-types .type-info {
-  display: block;
-  float: right;
-  color: #5b6569;
-  font-size: 0.9em;
 }
-.fileupload.file_asset_type {
-  .fileupload-list .asset {
-    width: auto !important;
-    height: auto !important;
-    float: none;
-    margin-bottom: 10px;
-  }
-}

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

@@ -0,0 +1,8 @@
+//= require ab_admin/bootstrap-datepicker
+//= require ab_admin/bootstrap-timepicker
+//= require bootstrap-wysihtml5
+//= require bootstrap-editable
+//= require select2
+//= require fancybox
+//= require ab_admin/bootstrap_and_overrides
+//= require ab_admin/fileupload

data/app/controllers/admin/base_controller.rb

@@ -9,17 +9,17 @@ class Admin::BaseController < ::InheritedResources::Base
   before_filter :authenticate_user!, :require_moderator
   before_filter :add_breadcrumbs, :set_title, :set_user_vars, :unless => :xhr?
 
-  class_attribute :csv_builder, :batch_action_list, :instance_reader => false, :instance_writer => false
+  class_attribute :export_builder, :batch_action_list, :instance_reader => false, :instance_writer => false
   self.batch_action_list = [AbAdmin::Config::BatchAction.new(:destroy, :confirm => I18n.t('admin.delete_confirmation'))]
 
   has_scope :ids, :type => :array
 
   helper_method :admin?, :moderator?
 
-  helper_method :button_scopes, :collection_action?, :action_items, :resource_action_items, :csv_builder,
+  helper_method :button_scopes, :collection_action?, :action_items, :resource_action_items,
                 :preview_resource_path, :get_subject, :settings, :batch_action_list, :tree_node_renderer
 
-  respond_to :json, :only => [:index, :update]
+  respond_to :json
 
   rescue_from ::CanCan::AccessDenied, :with => :render_unauthorized
 
@@ -98,10 +98,6 @@ class Admin::BaseController < ::InheritedResources::Base
     self.class.batch_action_list
   end
 
-  def export_options
-    {:column_names => csv_builder.columns.map(&:name), :column_data => csv_builder.columns.map(&:data), :column_separator => csv_builder.column_separator}
-  end
-
   def self.inherited(base)
     super
     base.class_eval do
@@ -114,12 +110,16 @@ class Admin::BaseController < ::InheritedResources::Base
     {:errors => resource.errors.full_messages.map { |m| "<br/> - #{m}" }.join.html_safe}
   end
 
-  def self.csv(options={}, &block)
-    self.csv_builder = ::AbAdmin::Utils::CSVBuilder.new(options, &block)
+  def self.export(options={}, &block)
+    self.export_builder = ::AbAdmin::Config::Export.new(options, &block)
+  end
+
+  def export_builder
+    self.class.export_builder ||= ::AbAdmin::Config::Export.default_for_model(resource_class)
   end
 
-  def csv_builder
-    self.class.csv_builder ||= ::AbAdmin::Utils::CSVBuilder.default_for_resource(resource_class)
+  def export_options
+    export_builder.render_options
   end
 
   def set_title
@@ -171,8 +171,7 @@ class Admin::BaseController < ::InheritedResources::Base
   def add_breadcrumbs
     @breadcrumbs = []
     if parent?
-      @breadcrumbs << {:name => parent_class.model_name.human(:count => 9),
-                       :url => {:action => :index, :controller => "admin/#{parent_class.model_name.plural}"}}
+      @breadcrumbs << {:name => parent_class.model_name.human(:count => 9), :url => parent_collection_path}
       @breadcrumbs << {:name => AbAdmin.display_name(parent), :url => parent_path}
     end
     @breadcrumbs << {:name => resource_class.model_name.human(:count => 9), :url => collection_path}
@@ -181,6 +180,10 @@ class Admin::BaseController < ::InheritedResources::Base
     end
   end
 
+  def parent_collection_path
+    {:action => :index, :controller => "admin/#{parent_class.model_name.plural}"}
+  end
+
   def tree_node_renderer
     @tree_node_renderer ||= lambda { |r| link_to AbAdmin.display_name(r), resource_path(r), :class => 'tree-item_link' }
   end
@@ -277,7 +280,8 @@ class Admin::BaseController < ::InheritedResources::Base
   end
 
   def get_role
-    return :admin if admin?
+    return [:admin, :moderator] if admin?
+    return [:moderator] if moderator?
     nil
   end
 

data/app/controllers/admin/manager_controller.rb

@@ -8,8 +8,53 @@ class ::Admin::ManagerController < ::Admin::BaseController
 
   helper_method :manager, :admin_partial_name
 
+  def custom_action
+    custom_action = manager.custom_action_for(params[:custom_action], self)
+    if custom_action.options[:method] && custom_action.options[:method] != request.method_symbol
+      raise ActionController::RoutingError.new("AbAdmin custom action for #{params[:custom_action]} not found")
+    end
+    instance_exec(&custom_action.data)
+  end
+
   protected
 
+  def begin_of_association_chain
+    parent
+  end
+
+  def parent
+    return @parent if defined?(@parent)
+    @parent = begin
+      return if !params[:parent_resource] && !params[:parent_id]
+      assoc_name, r_id = params[:parent_resource].singularize.to_sym, params[:parent_id]
+      parent_config = manager.parent_resources.detect { |conf| conf.name == assoc_name }
+      return unless parent_config
+      assoc = resource_class.reflect_on_association(parent_config.name)
+      return unless assoc
+      assoc.klass.find(r_id)
+    end
+  end
+
+  def parent?
+    !!parent
+  end
+
+  def parent_type
+    parent.class.name.underscore.to_sym
+  end
+
+  def parent_class
+    parent.class
+  end
+
+  def parent_path
+    "/admin/#{parent_class.model_name.plural}/#{parent.id}"
+  end
+
+  def parent_collection_path
+    "/admin/#{parent_class.model_name.plural}"
+  end
+
   def tree_node_renderer
     manager.tree_node_renderer || super
   end
@@ -49,16 +94,16 @@ class ::Admin::ManagerController < ::Admin::BaseController
         raise ActionController::RoutingError.new("AbAdmin action #{action_name} for #{resource_class.name} not found")
       end
       manager_instance
-    #rescue NameError
-    #  raise ActionController::RoutingError.new("AbAdmin manager_model for #{resource_class.name} not found")
+    rescue NameError => e
+      raise ActionController::RoutingError.new("AbAdmin manager_model for #{resource_class.name} not found (#{e.message})")
     end
   end
 
   def resource_class
     @model ||= begin
       params[:model_name].singularize.classify.constantize
-    rescue NameError
-      raise ActionController::RoutingError.new("AbAdmin model #{params[:model_name]} not found")
+    rescue NameError => e
+      raise ActionController::RoutingError.new("AbAdmin model #{params[:model_name]} not found (#{e.message})")
     end
   end
 
@@ -98,12 +143,12 @@ class ::Admin::ManagerController < ::Admin::BaseController
 
   def edit_resource_path(record=nil, options={})
     record ||= resource
-    admin_edit_path(options.merge(:model_name => resource_collection_name, :id => record.id))
+    admin_edit_path(options.merge(:model_name => record.class.model_name.plural, :id => record.id))
   end
 
   def resource_path(record=nil, options={})
     record ||= resource
-    admin_show_path(options.merge(:model_name => resource_collection_name, :id => record.id))
+    admin_show_path(options.merge(:model_name => record.class.model_name.plural, :id => record.id))
   end
 
   def self.cancan_resource_class