activeadmin 0.4.4 → 0.5.0.pre

data/lib/active_admin/views/pages/base.rb

@@ -12,21 +12,21 @@ module ActiveAdmin
 
         private
 
-
         def add_classes_to_body
           @body.add_class(params[:action])
           @body.add_class(params[:controller].gsub('/', '_'))
+          @body.add_class("active_admin")
           @body.add_class("logged_in")
           @body.add_class(active_admin_namespace.name.to_s + "_namespace")
         end
 
         def build_active_admin_head
           within @head do
-            meta :"http-equiv" => "Content-type", :content => "text/html; charset=utf-8"
-            insert_tag Arbre::HTML::Title, [title, active_admin_application.site_title].join(" | ")
+            insert_tag Arbre::HTML::Title, [title, render_or_call_method_or_proc_on(self, active_admin_application.site_title)].join(" | ")
             active_admin_application.stylesheets.each do |style|
               text_node(stylesheet_link_tag(style.path, style.options).html_safe)
             end
+
             active_admin_application.javascripts.each do |path|
               script :src => javascript_path(path), :type => "text/javascript"
             end
@@ -46,52 +46,13 @@ module ActiveAdmin
         end
 
         def build_header
-          div :id => "header" do
-            render view_factory.header
-          end
+          insert_tag view_factory.header, active_admin_namespace, current_menu
         end
 
         def build_title_bar
-          div :id => "title_bar" do
-            build_titlebar_left
-            build_titlebar_right
-          end
-        end
-        
-        def build_titlebar_left
-          div :id => "titlebar_left" do
-            build_breadcrumb
-            build_title_tag
-          end
-        end
-        
-        def build_titlebar_right
-          div :id => "titlebar_right" do
-            build_action_items
-          end
-        end
-
-        def build_breadcrumb(separator = "/")
-          links = breadcrumb_links
-          return if links.empty?
-          span :class => "breadcrumb" do
-            links.each do |link|
-              text_node link
-              span(separator, :class => "breadcrumb_sep")
-            end
-          end
+          insert_tag view_factory.title_bar, title, action_items_for_action
         end
 
-        def build_title_tag
-          h2(title, :id => 'page_title')
-        end
-
-        def build_action_items
-          if active_admin_config && active_admin_config.action_items?
-            items = active_admin_config.action_items_for(params[:action], self)
-            insert_tag view_factory.action_items, items
-          end
-        end
 
         def build_page_content
           build_flash_messages
@@ -132,7 +93,6 @@ module ActiveAdmin
           set_ivar_on_view "@page_title", title
         end
 
-
         # Returns the sidebar sections to render for the current action
         def sidebar_sections_for_action
           if active_admin_config && active_admin_config.sidebar_sections?
@@ -142,6 +102,14 @@ module ActiveAdmin
           end
         end
 
+        def action_items_for_action
+          if active_admin_config && active_admin_config.action_items?
+            active_admin_config.action_items_for(params[:action], self)
+          else
+            []
+          end
+        end
+
         # Renders the sidebar
         def build_sidebar
           div :id => "sidebar" do
@@ -157,9 +125,7 @@ module ActiveAdmin
 
         # Renders the content for the footer
         def build_footer
-          div :id => "footer" do
-            para "Powered by #{link_to("Active Admin", "http://www.activeadmin.info")} #{ActiveAdmin::VERSION}".html_safe
-          end
+          insert_tag view_factory.footer
         end
 
       end

data/lib/active_admin/views/pages/form.rb

@@ -6,7 +6,7 @@ module ActiveAdmin
 
         def title
           I18n.t("active_admin.#{params[:action]}_model",
-                 :model => active_admin_config.resource_name)
+                 :model => active_admin_config.resource_label)
         end
 
         def form_presenter
@@ -30,7 +30,7 @@ module ActiveAdmin
         def default_form_options
           {
             :url => default_form_path,
-            :as => active_admin_config.underscored_resource_name
+            :as => active_admin_config.resource_name.singular
           }
         end
 
@@ -41,7 +41,7 @@ module ActiveAdmin
         def default_form_config
           ActiveAdmin::PagePresenter.new do |f|
             f.inputs
-            f.buttons
+            f.actions
           end
         end
       end

data/lib/active_admin/views/pages/index.rb

@@ -1,3 +1,5 @@
+require 'active_admin/helpers/collection'
+
 module ActiveAdmin
   module Views
     module Pages
@@ -5,7 +7,11 @@ module ActiveAdmin
       class Index < Base
 
         def title
-          active_admin_config.plural_resource_name
+          if config[:title].is_a? String
+            config[:title]
+          else
+            active_admin_config.plural_resource_label
+          end
         end
 
         def config
@@ -15,12 +21,33 @@ module ActiveAdmin
         # Render's the index configuration that was set in the
         # controller. Defaults to rendering the ActiveAdmin::Pages::Index::Table
         def main_content
-          build_scopes
+          wrap_with_batch_action_form do
+            build_table_tools
+            build_collection
+          end
+        end
+
+        protected
+
+        def wrap_with_batch_action_form(&block)
+          if active_admin_config.batch_actions.any?
+            batch_action_form(&block)
+          else
+            block.call
+          end
+        end
+
+        include ::ActiveAdmin::Helpers::Collection
+
+        def items_in_collection?
+          !collection_is_empty?
+        end
 
+        def build_collection
           if items_in_collection?
             render_index
           else
-            if params[:q]
+            if params[:q] || params[:scope]
               render_empty_results
             else
               render_blank_slate
@@ -28,19 +55,6 @@ module ActiveAdmin
           end
         end
 
-        protected
-
-        def items_in_collection?
-          # Remove the order clause before limiting to 1. This ensures that
-          # any referenced columns in the order will not try to be accessed.
-          #
-          # When we call #exists?, the query's select statement is changed to "1".
-          #
-          # If we don't reorder, there may be some columns referenced in the order
-          # clause that requires the original select.
-          collection.reorder("").limit(1).exists?
-        end
-
         # TODO: Refactor to new HTML DSL
         def build_download_format_links(formats = [:csv, :xml, :json])
           links = formats.collect do |format|
@@ -49,22 +63,40 @@ module ActiveAdmin
           text_node [I18n.t('active_admin.download'), links].flatten.join("&nbsp;").html_safe
         end
 
+        def build_table_tools
+          div :class => "table_tools" do
+            build_batch_actions_selector
+            build_scopes
+          end
+        end
+
+        def build_batch_actions_selector
+          if active_admin_config.batch_actions.any?
+            insert_tag view_factory.batch_action_selector, active_admin_config.batch_actions
+          end
+        end
+
         def build_scopes
           if active_admin_config.scopes.any?
             scope_options = {
               :scope_count => config[:scope_count].nil? ? true : config[:scope_count]
             }
 
-            div :class => "table_tools" do
-              scopes_renderer active_admin_config.scopes, scope_options
-            end
+            scopes_renderer active_admin_config.scopes, scope_options
           end
         end
 
         # Creates a default configuration for the resource class. This is a table
         # with each column displayed as well as all the default actions
         def default_index_config
-          @default_index_config ||= ::ActiveAdmin::PagePresenter.new(:as => :table)
+          @default_index_config ||= ::ActiveAdmin::PagePresenter.new(:as => :table) do |display|
+            selectable_column
+            id_column
+            resource_class.content_columns.each do |col|
+              column col.name.to_sym
+            end
+            default_actions
+          end
         end
 
         # Returns the actual class for renderering the main content on the index
@@ -81,7 +113,7 @@ module ActiveAdmin
         end
         
         def render_blank_slate
-          blank_slate_content = I18n.t("active_admin.blank_slate.content", :resource_name => active_admin_config.plural_resource_name)
+          blank_slate_content = I18n.t("active_admin.blank_slate.content", :resource_name => active_admin_config.plural_resource_label)
           if controller.action_methods.include?('new')
             blank_slate_content += " " + link_to(I18n.t("active_admin.blank_slate.link"), new_resource_path)
           end
@@ -89,7 +121,7 @@ module ActiveAdmin
         end
         
         def render_empty_results
-          empty_results_content = I18n.t("active_admin.pagination.empty", :model => active_admin_config.resource_name.pluralize)
+          empty_results_content = I18n.t("active_admin.pagination.empty", :model => active_admin_config.plural_resource_label)
           insert_tag(view_factory.blank_slate, empty_results_content)
         end
         
@@ -98,8 +130,8 @@ module ActiveAdmin
           paginator      = config[:paginator].nil?      ? true : config[:paginator]
           download_links = config[:download_links].nil? ? true : config[:download_links]
           
-          paginated_collection(collection, :entry_name     => active_admin_config.resource_name,
-                                           :entries_name   => active_admin_config.plural_resource_name,
+          paginated_collection(collection, :entry_name     => active_admin_config.resource_label,
+                                           :entries_name   => active_admin_config.plural_resource_label,
                                            :download_links => download_links,
                                            :paginator      => paginator) do
             div :class => 'index_content' do

data/lib/active_admin/views/pages/layout.rb

@@ -13,8 +13,8 @@ module ActiveAdmin
         # Render the content_for(:layout) into the main content area
         def main_content
           content_for_layout = content_for(:layout)
-          if content_for_layout.is_a?(Arbre::HTML::Element)
-            current_dom_context.add_child content_for_layout.children
+          if content_for_layout.is_a?(Arbre::Element)
+            current_arbre_element.add_child content_for_layout.children
           else
             text_node content_for_layout
           end

data/lib/active_admin/views/pages/page.rb

@@ -4,9 +4,7 @@ module ActiveAdmin
       class Page < Base
 
         def main_content
-          page_presenter = active_admin_config.get_page_presenter(:index)
-
-          if page_presenter && page_presenter.block
+          if page_presenter.block
             instance_exec &page_presenter.block
           else
             nil
@@ -15,8 +13,16 @@ module ActiveAdmin
 
         protected
 
+        def page_presenter
+          active_admin_config.get_page_presenter(:index) || ActiveAdmin::PagePresenter.new
+        end
+
         def title
-          active_admin_config.name
+          if page_presenter[:title]
+            render_or_call_method_or_proc_on self, page_presenter[:title]
+          else
+            active_admin_config.name
+          end
         end
       end
     end

data/lib/active_admin/views/pages/show.rb

@@ -4,15 +4,12 @@ module ActiveAdmin
       class Show < Base
 
         def config
-          active_admin_config.get_page_presenter(:show) || ::ActiveAdmin::PagePresenter.new
+          active_admin_config.get_page_presenter(:show) || super
         end
 
         def title
-          case config[:title]
-          when Symbol, Proc
-            call_method_or_proc_on(resource, config[:title])
-          when String
-            config[:title]
+          if config[:title]
+            render_or_call_method_or_proc_on(resource, config[:title])
           else
             default_title
           end
@@ -28,7 +25,7 @@ module ActiveAdmin
         end
 
         def attributes_table(*args, &block)
-          panel(I18n.t('active_admin.details', :model => active_admin_config.resource_name)) do
+          panel(I18n.t('active_admin.details', :model => active_admin_config.resource_label)) do
             attributes_table_for resource, *args, &block
           end
         end
@@ -36,7 +33,13 @@ module ActiveAdmin
         protected
 
         def default_title
-          "#{active_admin_config.resource_name} ##{resource.id}"
+          title = display_name(resource)
+
+          if title.nil? || title.empty? || title == resource.to_s
+            title = "#{active_admin_config.resource_label} ##{resource.id}"
+          end
+
+          title
         end
 
         module DefaultMainContent

data/lib/active_admin/views/tabbed_navigation.rb

@@ -46,10 +46,10 @@ module ActiveAdmin
 
           if item.children.any?
             li_element.add_class "has_nested"
-            text_node link_to(item.name, link_path)
+            text_node link_to(item.label, link_path)
             render_nested_menu(item)
           else
-            link_to item.name, link_path
+            link_to item.label, link_path
           end
         end
       end
@@ -79,7 +79,7 @@ module ActiveAdmin
 
       # Returns true if the menu item name is @current_tab (set in controller)
       def current?(menu_item)
-        assigns[:current_tab].split("/").include?(menu_item.name) unless assigns[:current_tab].blank?
+        assigns[:current_tab] == menu_item || menu_item.children.include?(assigns[:current_tab])
       end
 
       # Returns an Array of items to display

data/lib/active_admin/views/title_bar.rb

@@ -0,0 +1,50 @@
+module ActiveAdmin
+  module Views
+    class TitleBar < Component
+
+      def build(title, action_items)
+        super(:id => "title_bar")
+        @title = title
+        @action_items = action_items
+
+        build_titlebar_left
+        build_titlebar_right
+      end
+
+      private
+
+      def build_titlebar_left
+        div :id => "titlebar_left" do
+          build_breadcrumb
+          build_title_tag
+        end
+      end
+
+      def build_titlebar_right
+        div :id => "titlebar_right" do
+          build_action_items
+        end
+      end
+
+      def build_breadcrumb(separator = "/")
+        links = breadcrumb_links
+        return if links.empty?
+        span :class => "breadcrumb" do
+          links.each do |link|
+            text_node link
+            span(separator, :class => "breadcrumb_sep")
+          end
+        end
+      end
+
+      def build_title_tag
+        h2(@title, :id => 'page_title')
+      end
+
+      def build_action_items
+        insert_tag(view_factory.action_items, @action_items) if @action_items.any?
+      end
+
+    end
+  end
+end

data/lib/active_admin/views/utility_nav.rb

@@ -0,0 +1,41 @@
+module ActiveAdmin
+  module Views
+    class UtilityNav < Component
+      def tag_name
+        "p"
+      end
+
+      def build(namespace)
+        super(:id => "utility_nav", :class => "header-item")
+        @namespace = namespace
+
+        if current_active_admin_user?
+          build_current_user
+          build_logout_link
+        end
+      end
+
+      private
+
+      def build_current_user
+        span display_name(current_active_admin_user), :class => "current_user"
+      end
+
+      def build_logout_link
+        if @namespace.logout_link_path
+          text_node helpers.link_to(I18n.t('active_admin.logout'), active_admin_logout_path, :method => logout_method)
+        end
+      end
+
+      # Returns the logout path from the application settings
+      def active_admin_logout_path
+        helpers.render_or_call_method_or_proc_on(self, @namespace.logout_link_path)
+      end
+
+      def logout_method
+        @namespace.logout_link_method || :get
+      end
+
+    end
+  end
+end