ab_admin 0.1.2 → 0.2.0

data/lib/ab_admin/models/asset.rb

@@ -67,7 +67,38 @@ module AbAdmin
 
       def main!
         self.class.update_all('is_main=0', ['assetable_type=? AND assetable_id=? AND type=?', assetable_type, assetable_id, type])
-        update_column(:is_main, true) and self
+        update_column(:is_main, true)
+        refresh_assetable
+        self
+      end
+
+      def rotate!
+        rename!
+        self.rotate_degrees = 90
+        save!
+        refresh_assetable
+        self
+      end
+
+      def rename!
+        rename
+        save!
+      end
+
+      def rename
+        file = data.file
+        path = data.path
+        ext = File.extname(path)
+        new_path = File.join(File.dirname(path), "#{File.basename(path).chomp(ext)}_#{rand(99)}#{ext}")
+        new_file = ::CarrierWave::SanitizedFile.new file.move_to(new_path)
+        data.cache!(new_file)
+      end
+
+      def refresh_assetable
+        return unless assetable.try(:persisted?)
+        assetable.touch
+        assetable.tire.update_index if assetable.respond_to?(:tire)
+        true
       end
 
       def full_url(*args)

data/lib/ab_admin/models/attachment_file.rb

@@ -21,7 +21,7 @@ module AbAdmin
       end
 
       def human_date
-        I18n.l(created_at, :format => "%d %B %Y")
+        I18n.l(created_at, :format => '%d %B %Y')
       end
 
       def as_json(options={})

data/lib/ab_admin/models/locator.rb

@@ -3,6 +3,13 @@ module AbAdmin
     module Locator
       extend ActiveSupport::Concern
 
+      included do
+        extend ActiveModel::Naming
+        extend ActiveRecord::Translation
+        class_attribute :base_class
+        self.base_class = self
+      end
+
       module ClassMethods
         def find_files
           Dir[Rails.root.join('config', 'locales', '*.yml')]

data/lib/ab_admin/models/settings.rb

@@ -3,6 +3,13 @@ module AbAdmin
     module Settings
       extend ActiveSupport::Concern
 
+      included do
+        extend ActiveModel::Naming
+        extend ActiveRecord::Translation
+        class_attribute :base_class
+        self.base_class = self
+      end
+
       module ClassMethods
         def load
           configatron.configure_from_hash instance.all

data/lib/ab_admin/models/structure.rb

@@ -21,6 +21,10 @@ module AbAdmin
         scope :with_position, proc {|position_type| where(:position => position_type.id).order('lft DESC') }
       end
 
+      def redirect?
+        kind == StructureType.redirect.id
+      end
+
     end
   end
 end

data/lib/ab_admin/utils.rb

@@ -109,7 +109,7 @@ module AbAdmin
 
     def pretty_data(object)
       case object
-        when String, Integer
+        when String, Integer, BigDecimal, Float
           object
         when TrueClass
           '+'
@@ -120,7 +120,7 @@ module AbAdmin
         when NilClass
           ''
         else
-          AbAdmin.safe_display_name(object)
+          AbAdmin.safe_display_name(object) || object
       end
     end
 

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -55,7 +55,7 @@ module AbAdmin
 
       def layout_css
         css = []
-        css << 'content_with_sidebar' if settings[:sidebar]
+        css << 'content_with_sidebar' if settings[:sidebar] || content_for?(:sidebar)
         css << 'well' if settings[:well]
         css << "#{settings[:index_view]}_view"
         css
@@ -75,7 +75,7 @@ module AbAdmin
 
       def admin_pretty_data(object)
         case object
-          when String, Integer
+          when String, Integer, BigDecimal, Float
             object
           when TrueClass, FalseClass
             color_bool(object)
@@ -86,7 +86,7 @@ module AbAdmin
           when ActiveRecord::Base
             admin_show_link(object)
           else
-            AbAdmin.safe_display_name(object)
+            AbAdmin.safe_display_name(object) || object
         end
       end
 

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -68,7 +68,7 @@ module AbAdmin
               link_to icon('eye-open', true), path, :class => 'btn btn-small btn-inverse', :title => t('admin.actions.preview.link'), :target => '_blank'
             end
           when AbAdmin::Config::ActionItem
-            instance_exec(&action.data) if action.for_context?(self)
+            instance_exec(item, &action.data) if action.for_context?(self)
           else
             meth = "#{resource_instance_name}_short_action_link"
             send(meth, action, item) if respond_to? meth

data/lib/ab_admin/views/form_builder.rb

@@ -24,12 +24,12 @@ module AbAdmin
         case options[:as]
           when :uploader
             title = options[:title] || I18n.t("admin.#{attribute_name}", :default => object.class.han(attribute_name))
-            return template.input_set(title) { attach_file_field(attribute_name, options = {}) }
+            return template.input_set(title) { attach_file_field(attribute_name, options) }
           when :map
             title = options[:title] || I18n.t("admin.#{attribute_name}", :default => object.class.han(attribute_name))
             prefix = options[:prefix] || object.class.model_name.singular
             data_fields = [:lat, :lon, :zoom].map { |attr| hidden_field(attr) }.join.html_safe
-            return template.input_set(title) { data_fields + geo_input(prefix) }
+            return template.input_set(title) { data_fields + geo_input(prefix, options[:js_options]) }
         end
 
         attribute_name = "#{attribute_name}_#{options[:locale]}" if options[:locale]
@@ -59,17 +59,23 @@ module AbAdmin
         template.render 'admin/shared/save_buttons'
       end
 
-      def geo_input(prefix, &block)
-        template.content_tag :div, :class => 'geo_input' do
-          ''.tap do |out|
-            out << template.javascript_include_tag("//maps.googleapis.com/maps/api/js?sensor=false&libraries=places&language=#{I18n.locale}")
-            out << template.label_tag(:geo_autocomplete, I18n.t('admin.geo_autocomplete'))
-            out << template.text_field_tag("#{prefix}_geo_autocomplete")
-            out.concat(capture(&block)) if block_given?
-            out << template.content_tag(:div, '', :class => 'admin_map', :id => "#{prefix}_map")
-            out << template.init_js("initGeoInput(#{prefix.inspect})")
-          end.html_safe
-        end
+      def geo_input(prefix, js_options={}, &block)
+        input_name = "#{prefix}_geo_ac"
+        js = %Q[$("##{prefix}_geo_input").geoInput(#{js_options.to_json})]
+        <<-HTML.html_safe
+        <script src="//maps.googleapis.com/maps/api/js?sensor=false&libraries=places&language=#{I18n.locale}" type="text/javascript"></script>
+        <div class="geo_input" id="#{prefix}_geo_input">
+          <div class="control-group">
+            <label class="control-label" for="#{input_name}">#{I18n.t('admin.geo_autocomplete')}</label>
+            <div class="controls">
+              <input type="text" name="#{input_name}" id="#{input_name}" class="geo_ac string">
+            </div>
+          </div>
+          #{template.capture(&block) if block_given?}
+          <div class="controls"><div id="#{prefix}_map" class="admin_map thumbnail"></div></div>
+          #{template.init_js(js)}
+        </div>
+        HTML
       end
 
       def attach_file_field(attribute_name, options = {})
@@ -100,8 +106,7 @@ module AbAdmin
           script_options['allowedExtensions'] ||= %w(pdf doc docx xls xlsx ppt pptx zip rar csv jpg jpeg gif png)
           script_options['template_id'] = '#fileupload_ftmpl'
           options[:asset_render_template] = 'file'
-        end
-        if options[:video]
+        elsif options[:video]
           script_options['allowedExtensions'] ||= %w(mp4 flv)
           script_options['template_id'] = '#fileupload_vtmpl'
           options[:asset_render_template] = 'video_file'
@@ -111,39 +116,37 @@ module AbAdmin
         script_options['element'] ||= element_id
         script_options['sizeLimit'] = max_size.megabytes.to_i
 
-        label ||= if object && object.class.respond_to?(:human_attribute_name)
-                    object.class.human_attribute_name(attribute_name)
-                  end
-
         locals = {
-            :element_id => element_id,
-            :file_title => (options[:file_title] || "JPEG, GIF, PNG or TIFF"),
-            :file_max_size => max_size,
-            :label => (label || attribute_name.to_s.humanize),
-            :object => object,
-            :attribute_name => attribute_name,
-            :assets => [value].flatten.delete_if { |v| v.nil? || v.new_record? },
-            :script_options => script_options.inspect.gsub('=>', ':'),
-            :multiple => script_options['multiple'],
-            :asset_klass => params[:klass],
-            :asset_render_template => (options[:asset_render_template] || 'asset'),
-            :container_data => {klass: params[:assetable_type], assoc: params[:method], multiple: script_options['multiple']}
+            element_id: element_id,
+            file_title: (options[:file_title] || script_options['allowedExtensions'].join(', ')),
+            file_max_size: max_size,
+            assets: [value].flatten.delete_if { |v| v.nil? || v.new_record? },
+            multiple: script_options['multiple'],
+            asset_render_template: (options[:asset_render_template] || 'asset'),
+            container_data: {
+                klass: params[:assetable_type],
+                asset: asset_klass.to_s,
+                assoc: params[:method],
+                multiple: script_options['multiple']
+            }
         }
 
-        if options[:file1]
-          container_tmpl = 'fcontainer'
-        elsif options[:container]
-          container_tmpl = options[:container]
-        else
-          container_tmpl = 'container'
-        end
+        locals[:css_class] = ['fileupload', "#{locals[:asset_render_template]}_asset_type"]
+        locals[:css_class] << (script_options['multiple'] ? 'many_assets' : 'one_asset')
+
+        js_opts = [locals[:element_id], template.sort_admin_assets_path(:klass => asset_klass), locals[:multiple]].map(&:inspect).join(', ')
+        locals[:js] = <<-JAVASCRIPT
+          var upl = new qq.FileUploaderInput(#{script_options.to_json});
+          upl._setupDragDrop();
+          new AdminAssets(#{js_opts});
+        JAVASCRIPT
 
         if options[:description]
           opts = [attribute_name, object.class.name, object.id, object.fileupload_guid].map { |i| i.to_s.inspect }.join(', ')
           template.concat javascript_tag("$(function(){new AssetDescription(#{opts})})")
         end
 
-        template.render(:partial => "admin/fileupload/#{container_tmpl}", :locals => locals)
+        template.render(:partial => "admin/fileupload/#{options[:container] || 'container'}", :locals => locals)
       end
 
       protected

data/lib/ab_admin/views/helpers.rb

@@ -54,6 +54,11 @@ module AbAdmin
         %Q[<script type='text/javascript'>$(function(){#{js}})</script>].html_safe
       end
 
+      def image_tag_if(image, options={})
+        return unless image
+        image_tag image, options
+      end
+
       def render_title
         @page_title || I18n.t("page.title")
       end

data/lib/ab_admin/views/manager_helpers.rb

@@ -17,6 +17,16 @@ module AbAdmin
       def show_builder
         manager.show ||= ::AbAdmin::Config::Show.default_for_model(resource_class)
       end
+
+      def action_item_admin_path(name, record=nil)
+        custom_action = manager.custom_action_for(name, self)
+        if custom_action.collection?
+          admin_collection_action_path(:model_name => resource_collection_name, :custom_action => custom_action.name)
+        else
+          record ||= resource
+          admin_member_action_path(:model_name => resource_collection_name, :id => record.id, :custom_action => custom_action.name)
+        end
+      end
     end
   end
 end

data/lib/ab_admin/views/search_form_builder.rb

@@ -15,17 +15,24 @@ module AbAdmin
       def select_field(attr, options={})
         label(attr, options[:label]) + content_tag(:div, :class => 'controls') do
           param = "#{options[:value_attr] || attr}_eq"
-          options[:collection] ||= []
-          if options[:collection].first.try(:respond_to?, :id)
-            opts = options_from_collection_for_select(options[:collection], :id, :title, params[:q][param])
+
+          if options[:collection].is_a?(Proc)
+            collection = options[:collection].call
           else
-            opts = options_for_select(options[:collection], params[:q][param])
+            collection = options[:collection] || []
+          end
+
+          if collection.first.try(:respond_to?, :id)
+            collection.map!{|r| [AbAdmin.display_name(r), r.id] }
           end
+
           options[:html_options] ||= {}
           if options[:fancy] || !options.has_key?(:fancy)
             options[:html_options][:class] = [options[:html_options][:class], 'fancy_select'].join(' ')
           end
-          select_tag("q[#{param}]", opts, options[:html_options].merge(:include_blank => true, :id => "q_#{attr}"))
+
+          html_options = options[:html_options].merge(:include_blank => true, :id => "q_#{attr}")
+          select_tag("q[#{param}]", options_for_select(collection, params[:q][param]), html_options)
         end
       end
 

data/lib/generators/ab_admin/install/install_generator.rb

@@ -21,7 +21,7 @@ module AbAdmin
 
         template('config/logrotate-config', 'config/logrotate-config')
         template('config/nginx.conf', 'config/nginx.conf')
-        template('scripts/unicorn.sh', 'scripts/unicorn.sh')
+        template('script/unicorn.sh', 'script/unicorn.sh')
         template('config/settings.yml', 'config/settings/settings.yml')
         template('config/settings.yml', 'config/settings/settings.local.yml')
         copy_file('config/unicorn_config.rb', 'config/unicorn_config.rb')

data/lib/generators/ab_admin/install/templates/config/admin_menu.rb

@@ -3,8 +3,8 @@ class AdminMenu < AbAdmin::MenuBuilder
     model User
     group :system do
       model Structure
-      model Locator
-      model Settings, :url => edit_admin_settings_path
+      link Locator.model_name.human, '/admin/locators'
+      link Settings.model_name.human, edit_admin_settings_path
     end
   end
 end

data/lib/generators/ab_admin/install/templates/helpers/admin/structures_helper.rb

@@ -13,7 +13,7 @@ module Admin::StructuresHelper
       when StructureType.main
         '#'
       when StructureType.redirect
-        edit_admin_structure_path(item)
+        edit_admin_structure_path(structure)
       when StructureType.group
         '#'
       else

data/lib/generators/ab_admin/install/templates/models/attachment_file.rb

@@ -3,4 +3,6 @@ class AttachmentFile < Asset
 
   sunrise_uploader AttachmentFileUploader
   validates_filesize_of :data, :maximum => 150.megabytes
+
+  self.max_size = 150
 end

data/lib/generators/ab_admin/install/templates/models/locator.rb

@@ -3,7 +3,6 @@ require 'ostruct'
 
 class Locator
   include Singleton
-  extend ActiveModel::Naming
   include AbAdmin::Models::Locator
 
   attr_accessor :files, :data

data/lib/generators/ab_admin/install/templates/models/settings.rb

@@ -2,7 +2,6 @@ require 'configatron'
 
 class Settings
   include Singleton
-  extend ActiveModel::Naming
   include AbAdmin::Models::Settings
 
   attr_accessor :paths, :data

data/lib/generators/ab_admin/install/templates/models/static_page.rb

@@ -10,6 +10,7 @@ class StaticPage < ActiveRecord::Base
 
   enumerated_attribute :static_page_type, :id_attribute => :kind
 
+  fileuploads :pictures, :attachment_files
   translates :title, :content
   attr_accessible *all_translated_attribute_names
 

data/lib/generators/ab_admin/install/templates/uploaders/avatar_uploader.rb

@@ -9,4 +9,8 @@ class AvatarUploader < AbAdmin::CarrierWave::BaseUploader
   def extension_white_list
     %w(jpg jpeg gif png)
   end
+
+  #def move_to_cache
+  #  true
+  #end
 end

data/lib/generators/ab_admin/resource/templates/_search_form.haml.erb

@@ -28,7 +28,7 @@
 -%>
 <% translated_columns.each do |col| -%>
 <% next if [:description].include?(col.to_sym) -%>
-= f.input :translations_<%= col -%>, :label => ha(:<%= col -%>)
+= f.input :<%= col %>
 <% end -%>
 <% model.columns_hash.except('id', 'slug').each do |key, col| -%>
 <%= input_by_col(key, col) %>

data/lib/generators/ab_admin/resource/templates/_search_form.slim.erb

@@ -28,7 +28,7 @@
 -%>
 <% translated_columns.each do |col| -%>
 <% next if [:description].include?(col.to_sym) -%>
-= f.input :translations_<%= col -%>, :label => ha(:<%= col -%>)
+= f.input :<%= col %>
 <% end -%>
 <% model.columns_hash.except('id', 'slug').each do |key, col| -%>
 <%= input_by_col(key, col) %>

data/lib/generators/ab_admin/resource/templates/_table.haml.erb

@@ -11,8 +11,7 @@
         "item.#{attribute}"
     end
   end
-
-%>
+-%>
 %table.table.table-striped.index_table#list
   %thead
     %tr.pjax_links

data/lib/generators/ab_admin/resource/templates/_table.slim.erb

@@ -11,8 +11,7 @@
         "item.#{attribute}"
     end
   end
-
-%>
+-%>
 table.table.table-striped.index_table#list
   thead
     tr.pjax_links