activeadmin 0.4.4 → 0.5.0.pre

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

@@ -1,3 +1,5 @@
+require 'active_admin/helpers/collection'
+
 module ActiveAdmin
   module Views
 
@@ -81,38 +83,35 @@ module ActiveAdmin
           link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format))
         end
         div :class => "download_links" do
-		  text_node [I18n.t('active_admin.download'), links].flatten.join(" ").html_safe
+          text_node [I18n.t('active_admin.download'), links].flatten.join(" ").html_safe
         end
       end
 
+      include ::ActiveAdmin::Helpers::Collection
+
       # modified from will_paginate
       def page_entries_info(options = {})
         if options[:entry_name]
           entry_name = options[:entry_name]
-          entries_name = options[:entries_name]
-        elsif collection.empty?
+          entries_name = options[:entries_name] || entry_name.pluralize
+        elsif collection_is_empty?
           entry_name = I18n.translate("active_admin.pagination.entry", :count => 1, :default => 'entry')
           entries_name = I18n.translate("active_admin.pagination.entry", :count => 2, :default => 'entries')
         else
-          begin
-            entry_name = I18n.translate!("activerecord.models.#{collection.first.class.model_name.i18n_key}", :count => 1)
-            entries_name = I18n.translate!("activerecord.models.#{collection.first.class.model_name.i18n_key}", :count => collection.size)
-          rescue I18n::MissingTranslationData
-            entry_name = collection.first.class.name.underscore.sub('_', ' ')
-          end
+          entry_name = I18n.translate("activerecord.models.#{collection.first.class.model_name.i18n_key}", :count => 1, :default => collection.first.class.name.underscore.sub('_', ' '))
+          entries_name = I18n.translate("activerecord.models.#{collection.first.class.model_name.i18n_key}", :count => collection.size, :default => entry_name.pluralize)
         end
-        entries_name = entry_name.pluralize unless entries_name
 
         if collection.num_pages < 2
-          case collection.size
+          case collection_size
           when 0; I18n.t('active_admin.pagination.empty', :model => entries_name)
           when 1; I18n.t('active_admin.pagination.one', :model => entry_name)
           else;   I18n.t('active_admin.pagination.one_page', :model => entries_name, :n => collection.total_count)
           end
         else
-          offset = collection.current_page * collection.size
-          total  = collection.total_count
-          I18n.t('active_admin.pagination.multiple', :model => entries_name, :from => (offset - collection.size + 1), :to => offset > total ? total : offset, :total => total)
+          offset = (collection.current_page - 1) * collection.limit_value
+          total = collection.total_count
+          I18n.t('active_admin.pagination.multiple', :model => entries_name, :from => offset + 1, :to => offset + collection_size, :total => total)
         end
       end
 

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

@@ -0,0 +1,27 @@
+module ActiveAdmin
+  module Views
+
+    class Popover < ActiveAdmin::Component
+      builder_method :popover
+
+      def build(options = {}, &block)
+        options           = options.dup
+        contents_root_tag = options.delete(:contents_root_tag) || :div
+        options[:style]   = "display: none"
+
+        super(options)
+
+        @contents_root = send(contents_root_tag, :class => "popover_contents")
+      end
+
+      def add_child(child)
+        if @contents_root
+          @contents_root << child
+        else
+          super
+        end
+      end
+
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require 'active_admin/helpers/collection'
+
 module ActiveAdmin
   module Views
 
@@ -7,6 +9,8 @@ module ActiveAdmin
       builder_method :scopes_renderer
 
       include ActiveAdmin::ScopeChain
+      include ::ActiveAdmin::Helpers::Collection
+
 
       def default_class_name
         "scopes table_tools_segmented_control"
@@ -28,16 +32,12 @@ module ActiveAdmin
 
       def build_scope(scope, options)
         li :class => classes_for_scope(scope) do
-          begin
-            scope_name = I18n.t!("active_admin.scopes.#{scope.id}")
-          rescue I18n::MissingTranslationData
-            scope_name = scope.name
-          end
+          scope_name = I18n.t("active_admin.scopes.#{scope.id}", :default => scope.name)
 
           a :href => url_for(params.merge(:scope => scope.id, :page => 1)), :class => "table_tools_button" do
             text_node scope_name
             span :class => 'count' do
-              "(" + get_scope_count(scope).to_s + ")"
+              "(#{get_scope_count(scope)})"
             end if options[:scope_count] && scope.show_count
           end
         end
@@ -58,18 +58,13 @@ module ActiveAdmin
       end
 
       def current_filter_search_empty?
-        collection.empty? && params.include?(:q)
+        params.include?(:q) && collection_is_empty?
       end
 
       # Return the count for the scope passed in.
       def get_scope_count(scope)
-        scope_chain(scope, scoping_class).count
+        collection_size(scope_chain(scope, collection_before_scope))
       end
-
-      def scoping_class
-        assigns["before_scope_collection"] || active_admin_config.resource_class
-      end
-
     end
   end
 end

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

@@ -19,7 +19,7 @@ module ActiveAdmin
           rvalue = instance_eval(&@section.block)
           self << rvalue if rvalue.is_a?(String)
         else
-          text_node render(@section.partial_name)
+          render(@section.partial_name)
         end
       end
     end

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

@@ -0,0 +1,55 @@
+module ActiveAdmin
+  module Views
+
+    class SiteTitle < Component
+
+      def tag_name
+        'h1'
+      end
+
+      def build(namespace)
+        super(:id => "site_title")
+        @namespace = namespace
+
+        if site_title_link?
+          text_node site_title_with_link
+        else
+          text_node site_title_content
+        end
+      end
+
+      def site_title_link?
+        @namespace.site_title_link.present?
+      end
+
+      def site_title_image?
+        @namespace.site_title_image.present?
+      end
+
+      private
+
+      def site_title_with_link
+        helpers.link_to(site_title_content, @namespace.site_title_link)
+      end
+
+      def site_title_content
+        if site_title_image?
+          title_image
+        else
+          title_text
+        end
+      end
+
+      def title_text
+        helpers.render_or_call_method_or_proc_on(self, @namespace.site_title)
+      end
+
+      def title_image
+        path = helpers.render_or_call_method_or_proc_on(self, @namespace.site_title_image)
+        helpers.image_tag(path, :id => "site_title_image", :alt => @namespace.site_title)
+      end
+
+    end
+
+  end
+end

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

@@ -9,7 +9,7 @@ module ActiveAdmin
       end
 
       def default_class_name
-        'status'
+        'status_tag'
       end
 
       # @method status_tag(status, type = nil, options = {})
@@ -22,13 +22,13 @@ module ActiveAdmin
       #
       # Examples:
       #   status_tag('In Progress')
-      #   # => <span class='status in_progress'>In Progress</span>
+      #   # => <span class='status_tag in_progress'>In Progress</span>
       #
       #   status_tag('active', :ok)
-      #   # => <span class='status active ok'>Active</span>
+      #   # => <span class='status_tag active ok'>Active</span>
       #
       #   status_tag('active', :ok, :class => 'important', :id => 'status_123', :label => 'on')
-      #   # => <span class='status active ok important' id='status_123'>on</span>
+      #   # => <span class='status_tag active ok important' id='status_123'>on</span>
       # 
       def build(*args)
         options = args.extract_options!

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

@@ -17,11 +17,11 @@ module ActiveAdmin
       end
 
       def column(*args, &block)
-        options = default_options.merge(args.last.is_a?(::Hash) ? args.pop : {})
+        options = default_options.merge(args.extract_options!)
         title = args[0]
         data  = args[1] || args[0]
 
-        col = Column.new(title, data, options, &block)
+        col = Column.new(title, data, @resource_class, options, &block)
         @columns << col
 
         # Build our header item
@@ -72,9 +72,9 @@ module ActiveAdmin
         if current_sort[0] == sort_key
           classes << "sorted-#{current_sort[1]}"
         end
-        
+
         header_class = title.downcase.underscore
-        
+
         classes << header_class
 
         th :class => classes do
@@ -131,17 +131,23 @@ module ActiveAdmin
         attr_accessor :title, :data
 
         def initialize(*args, &block)
-          @options = default_options.merge(args.last.is_a?(::Hash) ? args.pop : {})
+          @options = args.extract_options!
+
           @title = pretty_title args[0]
           @data  = args[1] || args[0]
           @data = block if block
+          @resource_class = args[2]
         end
 
         def sortable?
           if @data.is_a?(Proc)
             [String, Symbol].include?(@options[:sortable].class)
-          else
+          elsif @options.has_key?(:sortable)
             @options[:sortable]
+          elsif @data.respond_to?(:to_sym) && @resource_class
+            !@resource_class.reflect_on_association(@data.to_sym)
+          else
+            true
           end
         end
 
@@ -164,7 +170,8 @@ module ActiveAdmin
         #   # => Sort key will be 'login'
         #
         def sort_key
-          if @options[:sortable] == true || @options[:sortable] == false
+          # If boolean or nil, use the default sort key.
+          if @options[:sortable] == true || @options[:sortable] == false || @options[:sortable].nil?
             @data.to_s
           else
             @options[:sortable].to_s
@@ -175,22 +182,15 @@ module ActiveAdmin
 
         def pretty_title(raw)
           if raw.is_a?(Symbol)
-            if @options[:i18n] && @options[:i18n].respond_to?(:human_attribute_name) && human_name = @options[:i18n].human_attribute_name(raw)
-              raw = human_name
+            if @options[:i18n] && @options[:i18n].respond_to?(:human_attribute_name)
+              raw = @options[:i18n].human_attribute_name(raw, :default => raw.to_s.titleize)
+            else
+              raw.to_s.titleize
             end
-
-            raw.to_s.titleize
           else
             raw
           end
         end
-
-        def default_options
-          {
-            :sortable => true
-          }
-        end
-
       end
     end
   end

data/lib/active_admin/views/dashboard_section_renderer.rb

@@ -11,7 +11,7 @@ module ActiveAdmin
       protected
 
       def title
-        @section.name.to_s.titleize
+        I18n.t("active_admin.sections.#{@section.name.to_s}", :default => @section.name.to_s.titleize)
       end
 
     end

data/lib/active_admin/views/footer.rb

@@ -0,0 +1,18 @@
+module ActiveAdmin
+  module Views
+    class Footer < Component
+
+      def build
+        super :id => "footer"
+        powered_by_message
+      end
+
+      private
+
+      def powered_by_message
+        para "Powered by #{link_to("Active Admin", "http://www.activeadmin.info")} #{ActiveAdmin::VERSION}".html_safe
+      end
+
+    end
+  end
+end

data/lib/active_admin/views/header.rb

@@ -0,0 +1,31 @@
+module ActiveAdmin
+  module Views
+    class Header < Component
+
+      def build(namespace, menu)
+        super(:id => "header")
+
+        @namespace = namespace
+        @menu = menu
+
+        build_site_title
+        build_global_navigation
+        build_utility_navigation
+      end
+
+
+      def build_site_title
+        insert_tag view_factory.site_title, @namespace
+      end
+
+      def build_global_navigation
+        insert_tag view_factory.global_navigation, @menu, :class => 'header-item' 
+      end
+
+      def build_utility_navigation
+        insert_tag view_factory.utility_navigation, @namespace
+      end
+
+    end
+  end
+end

data/lib/active_admin/views/index_as_block.rb

@@ -9,6 +9,7 @@ module ActiveAdmin
     #
     #     index :as => :block do |product|
     #       div :for => product do
+    #         resource_selection_cell product
     #         h2 auto_link(product.title)
     #         div do
     #           simple_format product.description
@@ -19,6 +20,8 @@ module ActiveAdmin
     class IndexAsBlock < ActiveAdmin::Component
 
       def build(page_presenter, collection)
+        add_class "index"
+        resource_selection_toggle_panel
         collection.each do |obj|
           instance_exec(obj, &page_presenter.block)
         end

data/lib/active_admin/views/index_as_blog.rb

@@ -71,6 +71,7 @@ module ActiveAdmin
         # title and body methods
         instance_eval &page_presenter.block if page_presenter.block
 
+        add_class "index"
         build_posts
       end
 
@@ -82,6 +83,7 @@ module ActiveAdmin
         @title
       end
 
+
       # Setter method for the configuration of the body
       #
       def body(method = nil, &block)
@@ -94,6 +96,7 @@ module ActiveAdmin
       private
 
       def build_posts
+        resource_selection_toggle_panel if active_admin_config.batch_actions.any?
         @collection.each do |post|
           build_post(post)
         end
@@ -101,6 +104,7 @@ module ActiveAdmin
 
       def build_post(post)
         div :for => post do
+          resource_selection_cell(post) if active_admin_config.batch_actions.any?
           build_title(post)
           build_body(post)
         end

data/lib/active_admin/views/index_as_grid.rb

@@ -26,6 +26,7 @@ module ActiveAdmin
       def build(page_presenter, collection)
         @page_presenter = page_presenter
         @collection = collection
+        add_class "index"
         build_table
       end
 
@@ -36,6 +37,7 @@ module ActiveAdmin
       protected
 
       def build_table
+        resource_selection_toggle_panel
         table :class => "index_grid" do
           collection.in_groups_of(number_of_columns).each do |group|
             build_row(group)

data/lib/active_admin/views/index_as_table.rb

@@ -13,12 +13,14 @@ module ActiveAdmin
     # column method:
     #
     #     index do
+    #       selectable_column
     #       column :title
     #     end
     #
     # If the default title does not work for you, pass it as the first argument:
     #
     #     index do
+    #       selectable_column
     #       column "My Custom Title", :title
     #     end
     #
@@ -30,6 +32,7 @@ module ActiveAdmin
     # within the context of the view for each of the objects in the collection.
     #
     #     index do
+    #       selectable_column
     #       column "Title" do |post|
     #         link_to post.title, admin_post_path(post)
     #       end
@@ -41,6 +44,7 @@ module ActiveAdmin
     # To setup links to View, Edit and Delete a resource, use the default_actions method:
     #
     #     index do
+    #       selectable_column
     #       column :title
     #       default_actions
     #     end
@@ -48,6 +52,7 @@ module ActiveAdmin
     # Alternatively, you can create a column with custom links:
     #
     #     index do
+    #       selectable_column
     #       column :title
     #       column "Actions" do |post|
     #         link_to "View", admin_post_path(post)
@@ -94,9 +99,9 @@ module ActiveAdmin
 
       def build(page_presenter, collection)
         table_options = {
-          :id => active_admin_config.plural_underscored_resource_name,
+          :id => active_admin_config.resource_name.plural,
           :sortable => true,
-          :class => "index_table",
+          :class => "index_table index",
           :i18n => active_admin_config.resource_class,
           :paginator => page_presenter[:paginator] != false
         }
@@ -127,9 +132,17 @@ module ActiveAdmin
       #
       class IndexTableFor < ::ActiveAdmin::Views::TableFor
 
+        # Display a column for checkbox
+        def selectable_column
+          return unless active_admin_config.batch_actions.any?
+          column( resource_selection_toggle_cell, { :class => "selectable" } ) { |resource| resource_selection_cell( resource ) }
+        end
+
         # Display a column for the id
         def id_column
-          column('ID', :sortable => :id){|resource| link_to resource.id, resource_path(resource), :class => "resource_id_link"}
+          column(resource_class.human_attribute_name(resource_class.primary_key), :sortable => resource_class.primary_key) do |resource| 
+            link_to resource.id, resource_path(resource), :class => "resource_id_link"
+          end
         end
 
         # Adds links to View, Edit and Delete
@@ -140,13 +153,13 @@ module ActiveAdmin
           column options[:name] do |resource|
             links = ''.html_safe
             if controller.action_methods.include?('show')
-              links += link_to I18n.t('active_admin.view'), resource_path(resource), :class => "member_link view_link"
+              links << link_to(I18n.t('active_admin.view'), resource_path(resource), :class => "member_link view_link")
             end
             if controller.action_methods.include?('edit')
-              links += link_to I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link"
+              links << link_to(I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link")
             end
             if controller.action_methods.include?('destroy')
-              links += link_to I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, :confirm => I18n.t('active_admin.delete_confirmation'), :class => "member_link delete_link"
+              links << link_to(I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation')}, :class => "member_link delete_link")
             end
             links
           end