activeadmin 0.2.2 → 0.3.0

data/lib/active_admin/sass/active_admin.scss

@@ -0,0 +1,3 @@
+// This file is included when using Rails 3.0
+@import "active_admin/mixins";
+@import "active_admin/base";

data/lib/active_admin/sass/css_loader.rb

@@ -0,0 +1,16 @@
+require 'sass/importers'
+
+# This monkey patches the SASS filesystem importer to work with files
+# that are named *.css.scss. This allows us to be compatible with both
+# Rails 3.0.* and Rails 3.1
+#
+# This should only be loaded in Rails 3.0 apps.
+class Sass::Importers::Filesystem
+
+  # We want to ensure that all *.css.scss files are loaded as scss files
+  def extensions_with_css
+    extensions_without_css.merge('css.scss' => :scss)
+  end
+  alias_method_chain :extensions, :css
+
+end

data/lib/active_admin/sass/helpers.rb

@@ -0,0 +1,45 @@
+require 'sass'
+require 'sass/script/functions'
+require 'sass-rails' if ActiveAdmin::DependencyChecker.rails_3_1?
+
+module ActiveAdmin
+  module Sass
+    module Helpers
+
+      if ActiveAdmin::DependencyChecker.rails_3_1?
+        include ::Sass::Rails::Helpers
+      end
+
+      # Provides a helper in SASS to ensure that the paths to image
+      # assets are always correct across Rails versions.
+      #
+      # Example:
+      #
+      #   background: url(active_admin_image_path('some_image.png')) 0 0 repeat-x;
+      #
+      # Will result in:
+      #
+      #   background: url("/images/active_admin/some_image.png") 0 0 repeat-x;
+      #
+      # Or in Rails 3.1 with asset pipeline enebaled:
+      #
+      #   background: url("/assets/active_admin/some_image.png") 0 0 repeat-x;
+      #
+      # @param [Sass::Script::String] asset the path to the image after */active_admin/
+      #
+      # @return [Sass::Script::String] path to the image
+      #
+      def active_admin_image_path(asset)
+        if ActiveAdmin.use_asset_pipeline?
+          asset_path(::Sass::Script::String.new("active_admin/#{asset.value}"), ::Sass::Script::String.new('image'))
+        else
+          ::Sass::Script::String.new("/images/active_admin/#{asset.value}", true)
+        end
+      end
+
+    end
+  end
+end
+
+# Install for use in Sass
+Sass::Script::Functions.send :include, ActiveAdmin::Sass::Helpers

data/lib/active_admin/scope.rb

@@ -3,15 +3,29 @@ module ActiveAdmin
 
     attr_reader :name, :scope_method, :id, :scope_block
 
+    # Create a Scope
+    #
+    # Examples:
+    #
+    #   Scope.new(:published)
+    #   # => Scope with name 'Published' and scope method :published
+    #
+    #   Scope.new('Published', :public)
+    #   # => Scope with name 'Published' and scope method :public
+    #
+    #   Scope.new('Published') { |articles| articles.where(:published => true) }
+    #   # => Scope with name 'Published' using a block to scope
+    #
     def initialize(name, method = nil, &block)
       @name = name.to_s.titleize
-      @scope_method = method || name.to_sym
+      @scope_method = method
+      # Scope ':all' means no scoping
+      @scope_method ||= name.to_sym unless name.to_sym == :all
       @id = @name.gsub(' ', '').underscore
       if block_given?
         @scope_method = nil
         @scope_block = block
       end
     end
-
   end
 end

data/lib/active_admin/sidebar_section.rb

@@ -0,0 +1,41 @@
+module ActiveAdmin
+
+  class SidebarSection
+    include ActiveAdmin::OptionalDisplay
+
+    attr_accessor :name, :options, :block
+
+    def initialize(name, options = {}, &block)
+      @name, @options, @block = name, options, block
+      normalize_display_options!
+    end
+
+    # The id gets used for the div in the view
+    def id
+      name.to_s.downcase.underscore + '_sidebar_section'
+    end
+
+    def icon?
+      options[:icon]
+    end
+
+    def icon
+      options[:icon] if icon?
+    end
+
+    # The title gets displayed within the section in the view
+    def title
+      begin
+        I18n.t!("active_admin.sidebars.#{name.to_s}")
+      rescue I18n::MissingTranslationData
+        name.to_s.titlecase
+      end
+    end
+
+    # If a block is not passed in, the name of the partial to render
+    def partial_name
+      options[:partial] || "#{name.to_s.downcase.gsub(' ', '_')}_sidebar"
+    end
+  end
+
+end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/active_admin/view_factory.rb

@@ -4,18 +4,20 @@ module ActiveAdmin
   class ViewFactory < AbstractViewFactory
 
     # Register Helper Renderers
-    register  :global_navigation  => ActiveAdmin::Views::TabsRenderer,
+    register  :global_navigation  => ActiveAdmin::Views::TabbedNavigation,
               :action_items       => ActiveAdmin::Views::ActionItems,
               :header             => ActiveAdmin::Views::HeaderRenderer,
               :dashboard_section  => ActiveAdmin::Views::DashboardSection,
-              :index_scopes       => ActiveAdmin::Views::Scopes
+              :index_scopes       => ActiveAdmin::Views::Scopes,
+              :blank_slate        => ActiveAdmin::Views::BlankSlate
 
     # Register All The Pages
     register  :dashboard_page     => ActiveAdmin::Views::Pages::Dashboard,
               :index_page         => ActiveAdmin::Views::Pages::Index,
               :show_page          => ActiveAdmin::Views::Pages::Show,
               :new_page           => ActiveAdmin::Views::Pages::New,
-              :edit_page          => ActiveAdmin::Views::Pages::Edit
+              :edit_page          => ActiveAdmin::Views::Pages::Edit,
+              :layout             => ActiveAdmin::Views::Pages::Layout
 
   end
 end

data/lib/active_admin/view_helpers.rb

@@ -5,6 +5,7 @@ module ActiveAdmin
     Dir[File.expand_path('../view_helpers', __FILE__) + "/*.rb"].each{|f| require f }
 
     include AssignsWithIndifferentAccessHelper
+    include ActiveAdminApplicationHelper
     include RendererHelper
     include AutoLinkHelper
     include BreadcrumbHelper
@@ -12,9 +13,7 @@ module ActiveAdmin
     include IconHelper
     include MethodOrProcHelper
     include SidebarHelper
-    include TableHelper
     include FormHelper
-    include StatusTagHelper
     include FilterFormHelper
     include TitleHelper
     include ViewFactoryHelper

data/lib/active_admin/view_helpers/active_admin_application_helper.rb

@@ -0,0 +1,12 @@
+module ActiveAdmin
+  module ViewHelpers
+    module ActiveAdminApplicationHelper
+
+      # Returns the current Active Admin application instance
+      def active_admin_application
+        ActiveAdmin.application
+      end
+
+    end
+  end
+end

data/lib/active_admin/view_helpers/auto_link_helper.rb

@@ -32,7 +32,8 @@ module ActiveAdmin
         if respond_to?(:active_admin_config) && active_admin_config
           active_admin_config.namespace
         else
-          ActiveAdmin::Namespace.new(ActiveAdmin.default_namespace)
+          # Return a default namespace if none exists
+          active_admin_application.find_or_create_namespace(active_admin_application.default_namespace)
         end
       end
 

data/lib/active_admin/view_helpers/display_helper.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
       def display_name_method_for(resource)
         @@display_name_methods_cache ||= {}
         @@display_name_methods_cache[resource.class] ||= 
-          ActiveAdmin.display_name_methods.find{|method| resource.respond_to? method }
+          active_admin_application.display_name_methods.find{|method| resource.respond_to? method }
       end
 
       # Tries to display an object with as friendly of output

data/lib/active_admin/view_helpers/filter_form_helper.rb

@@ -9,8 +9,9 @@ module ActiveAdmin
         options[:url] ||= collection_path
         options[:html] ||= {}
         options[:html][:method] = :get
+        options[:html][:class] ||= "filter_form"
         options[:as] = :q
-        clear_link = link_to("Clear Filters", "#", :class => "clear_filters_btn")
+        clear_link = link_to(I18n.t('active_admin.clear_filters'), "#", :class => "clear_filters_btn")
         form_for search, options do |f|
           filters.each do |filter_options|
             filter_options = filter_options.dup
@@ -19,8 +20,8 @@ module ActiveAdmin
           end
 
           buttons = content_tag :div, :class => "buttons" do
-            f.submit("Filter") + 
-              clear_link + 
+            f.submit(I18n.t('active_admin.filter')) +
+              clear_link +
               hidden_field_tag("order", params[:order]) +
               hidden_field_tag("scope", params[:scope])
           end
@@ -35,12 +36,13 @@ module ActiveAdmin
   # This form builder defines methods to build filter forms such
   # as the one found in the sidebar of the index page of a standard resource.
   class FilterFormBuilder < FormBuilder
-  
+
     def filter(method, options = {})
       return "" if method.nil? || method == ""
       options[:as] ||= default_filter_type(method)
       return "" unless options[:as]
       field_type = options.delete(:as)
+      options[:label] ||= default_filter_label(method)
       content = with_new_form_buffer do
         send("filter_#{field_type}_input", method, options)
       end
@@ -52,7 +54,7 @@ module ActiveAdmin
     def filter_string_input(method, options = {})
       field_name = "#{method}_contains"
 
-      [ label(field_name, "Search #{method.to_s.titlecase}"),
+      [ label(field_name, I18n.t('active_admin.search_field', :field => options[:label])),
         text_field(field_name)
       ].join("\n").html_safe
     end
@@ -61,9 +63,9 @@ module ActiveAdmin
       gt_field_name = "#{method}_gte"
       lt_field_name = "#{method}_lte"
 
-      [ label(gt_field_name, method.to_s.titlecase),
+      [ label(gt_field_name, options[:label]),
         filter_date_text_field(gt_field_name),
-        " - ",
+        template.content_tag(:span, "-", :class => "seperator"),
         filter_date_text_field(lt_field_name)
       ].join("\n").html_safe
     end
@@ -76,7 +78,7 @@ module ActiveAdmin
     def filter_numeric_input(method, options = {})
       filters = numeric_filters_for_method(method, options.delete(:filters) || default_numeric_filters)
       current_filter = current_numeric_scope(filters)
-      filter_select = @template.select_tag '', @template.options_for_select(filters, current_filter), 
+      filter_select = @template.select_tag '', @template.options_for_select(filters, current_filter),
                                   :onchange => "document.getElementById('#{method}_numeric').name = 'q[' + this.value + ']';"
       filter_input = text_field current_filter, :size => 10, :id => "#{method}_numeric"
 
@@ -86,7 +88,7 @@ module ActiveAdmin
         filter_input
       ].join("\n").html_safe
     end
-    
+
     def numeric_filters_for_method(method, filters)
       filters.collect{|scope| [scope[0], [method,scope[1]].join("_") ] }
     end
@@ -98,7 +100,7 @@ module ActiveAdmin
     end
 
     def default_numeric_filters
-      [['Equal To', 'eq'], ['Greater Than', 'gt'], ['Less Than', 'lt']]
+      [[I18n.t('active_admin.equal_to'), 'eq'], [I18n.t('active_admin.greater_than'), 'gt'], [I18n.t('active_admin.less_than'), 'lt']]
     end
 
     def filter_select_input(method, options = {})
@@ -106,8 +108,8 @@ module ActiveAdmin
       input_name = (generate_association_input_name(method).to_s + "_eq").to_sym
       collection = find_collection_for_column(association_name, options)
 
-      [ label(input_name, method.to_s.titlecase),
-        select(input_name, collection, options.merge(:include_blank => 'Any'))
+      [ label(input_name, options[:label]),
+        select(input_name, collection, options.merge(:include_blank => I18n.t('active_admin.any')))
       ].join("\n").html_safe
     end
 
@@ -123,7 +125,7 @@ module ActiveAdmin
         end.join("\n").html_safe
       end
 
-      [ label(input_name, method.to_s.titlecase),
+      [ label(input_name, options[:label]),
         checkboxes
       ].join("\n").html_safe
     end
@@ -159,6 +161,16 @@ module ActiveAdmin
       end
     end
 
+    # Returns the default label for a given attribute
+    # Will use ActiveModel I18n if possible
+    def default_filter_label(method)
+      if @object.base.respond_to?(:human_attribute_name)
+        @object.base.human_attribute_name(method)
+      else
+        method.to_s.titlecase
+      end
+    end
+
     # Returns the column for an attribute on the object being searched
     # if it exists. Otherwise returns nil
     def column_for(method)
@@ -170,5 +182,5 @@ module ActiveAdmin
       @object.base.reflect_on_association(method) if @object.base.respond_to?(:reflect_on_association)
     end
 
-  end    
+  end
 end

data/lib/active_admin/view_helpers/form_helper.rb

@@ -3,6 +3,7 @@ module ActiveAdmin
     module FormHelper
       
       def active_admin_form_for(resource, options = {}, &block)
+        options = Marshal.load( Marshal.dump(options) )
         options[:builder] ||= ActiveAdmin::FormBuilder
         semantic_form_for resource, options, &block
       end

data/lib/active_admin/view_helpers/view_factory_helper.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     module ViewFactoryHelper
 
       def view_factory
-        ActiveAdmin.view_factory
+        active_admin_application.view_factory
       end
 
     end

data/lib/active_admin/views/components/attributes_table.rb

@@ -35,11 +35,11 @@ module ActiveAdmin
       end
 
       def header_content_for(attr)
-        attr.to_s.titleize
+        @record.class.respond_to?(:human_attribute_name) ? @record.class.human_attribute_name(attr).titleize : attr.to_s.titleize
       end
 
       def empty_value
-        span "Empty", :class => "empty"
+        span I18n.t('active_admin.empty'), :class => "empty"
       end
 
       def content_for(attr_or_proc)

data/lib/active_admin/views/components/blank_slate.rb

@@ -0,0 +1,17 @@
+module ActiveAdmin
+  module Views
+    # Build a Blank Slate
+    class BlankSlate < ActiveAdmin::Component
+      builder_method :blank_slate
+      
+      def default_class_name
+        'blank_slate_container'
+      end
+      
+      def build(content)
+        super(span(content.html_safe, :class => "blank_slate"))
+      end
+      
+    end
+  end
+end

data/lib/active_admin/views/components/columns.rb

@@ -36,9 +36,7 @@ module ActiveAdmin
       end
 
       def to_html
-        html = super
-        p html
-        html.to_s + "<div style=\"clear:both;\"></div>".html_safe
+        super.to_s + "<div style=\"clear:both;\"></div>".html_safe
       end
 
     end

data/lib/active_admin/views/components/paginated_collection.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
     #
     #   paginated_collection collection, :entry_name => "Post" do
     #     div do
-    #       h2 "Inside the 
+    #       h2 "Inside the
     #     end
     #   end
     #
@@ -26,14 +26,14 @@ module ActiveAdmin
 
       # Builds a new paginated collection component
       #
-      # @param [Array] collection  A "paginated" collection from will_paginate
+      # @param [Array] collection  A "paginated" collection from kaminari
       # @param [Hash]  options     These options will be passed on to the page_entries_info
-      #                            method supplied in will_paginate.
+      #                            method.
       #                            Useful keys:
-      #                             :entry_name - The name to dislpay for this resource collection
+      #                             :entry_name - The name to display for this resource collection
       def build(collection, options = {})
         @collection = collection
-        div(page_entries_info(@collection, options), :class => "pagination_information")
+        div(page_entries_info(options).html_safe, :class => "pagination_information")
         @contents = div(:class => "paginated_collection_contents")
         build_pagination_with_formats
         @built = true
@@ -58,15 +58,33 @@ module ActiveAdmin
       end
 
       def build_pagination
-        text_node will_paginate(collection, :previous_label => "Previous", :next_label => "Next")
+        text_node paginate(collection)
       end
 
       # TODO: Refactor to new HTML DSL
       def build_download_format_links(formats = [:csv, :xml, :json])
         links = formats.collect do |format|
-          link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format)) 
+          link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format))
+        end
+        text_node [I18n.t('active_admin.download'), links].flatten.join(" ").html_safe
+      end
+
+      # modified from will_paginate
+      def page_entries_info(options = {})
+        entry_name = options[:entry_name] ||
+          (collection.empty?? 'entry' : collection.first.class.name.underscore.sub('_', ' '))
+
+        if collection.num_pages < 2
+          case collection.size
+          when 0; I18n.t('active_admin.pagination.empty', :model => entry_name.pluralize)
+          when 1; I18n.t('active_admin.pagination.one', :model => entry_name)
+          else;   I18n.t('active_admin.pagination.one_page', :model => entry_name.pluralize, :n => collection.size)
+          end
+        else
+          offset = collection.current_page * active_admin_application.default_per_page
+          total  = collection.total_count
+          I18n.t('active_admin.pagination.multiple', :model => entry_name.pluralize, :from => (offset - active_admin_application.default_per_page + 1), :to => offset > total ? total : offset, :total => total)
         end
-        text_node ["Download:", links].flatten.join("&nbsp;").html_safe
       end
 
     end