activeadmin 0.3.4 → 0.4.0

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

@@ -63,7 +63,7 @@ module ActiveAdmin
         if sortable? && col.sortable?
           build_sortable_header_for(col.title, col.sort_key)
         else
-          th(col.title)
+          th(col.title, :class => (col.data.to_s.downcase.underscore if col.data.is_a?(Symbol)))
         end
       end
 
@@ -72,6 +72,10 @@ 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
           link_to(title, params.merge(:order => "#{sort_key}_#{order_for_sort_key(sort_key)}").except(:page))
@@ -86,7 +90,7 @@ module ActiveAdmin
       end
 
       def build_table_cell(col, item)
-        td do
+        td(:class => (col.data.to_s.downcase if col.data.is_a?(Symbol))) do
           rvalue = call_method_or_proc_on(item, col.data, :exec => false)
           if col.data.is_a?(Symbol)
             rvalue = pretty_format(rvalue)

data/lib/active_admin/views/header_renderer.rb

@@ -11,11 +11,30 @@ module ActiveAdmin
 
       protected
 
+      # Renders the title/branding area for the site
       def title
-        if !active_admin_application.site_title_link || active_admin_application.site_title_link == ""
-          content_tag 'h1', active_admin_application.site_title, :id => 'site_title'
+        if active_admin_namespace.site_title_image.blank?
+         title_text
         else
-          content_tag 'h1', link_to(active_admin_application.site_title, active_admin_application.site_title_link), :id => 'site_title'
+          title_image
+        end
+      end
+      
+      # Renders an image for the site's header/branding area
+      def title_image
+        if !active_admin_namespace.site_title_link.blank?
+          content_tag 'h1', link_to( image_tag(active_admin_namespace.site_title_image, :id => "site_title_image", :alt => active_admin_namespace.site_title), active_admin_namespace.site_title_link ), :id => "site_title" 
+        else
+          content_tag 'h1', image_tag( active_admin_namespace.site_title_image, :id => "site_title_image", :alt => active_admin_namespace.site_title ), :id => "site_title"
+        end
+      end
+      
+      # Renders a the site's header/branding area as a string
+      def title_text
+        if !active_admin_namespace.site_title_link || active_admin_namespace.site_title_link == ""
+          content_tag 'h1', active_admin_namespace.site_title, :id => 'site_title'
+        else
+          content_tag 'h1', link_to(active_admin_namespace.site_title, active_admin_namespace.site_title_link), :id => 'site_title'
         end
       end
 
@@ -24,32 +43,32 @@ module ActiveAdmin
       #
       # It uses the ActiveAdmin.tabs_renderer option
       def global_navigation
-        render view_factory.global_navigation, current_menu
+        render view_factory.global_navigation, current_menu, :class => 'header-item' 
       end
 
       def utility_navigation
-        content_tag 'p', :id => "utility_nav" do
+        content_tag 'p', :id => "utility_nav", :class => 'header-item' do
           if current_active_admin_user?
             html = content_tag(:span, display_name(current_active_admin_user), :class => "current_user")
 
-            if active_admin_application.logout_link_path
-              html << link_to(I18n.t('active_admin.logout'), logout_path, :method => logout_method)
+            if active_admin_namespace.logout_link_path
+              html << link_to(I18n.t('active_admin.logout'), active_admin_logout_path, :method => logout_method)
             end
           end
         end
       end
 
       # Returns the logout path from the application settings
-      def logout_path
-        if active_admin_application.logout_link_path.is_a?(Symbol)
-          send(active_admin_application.logout_link_path)
+      def active_admin_logout_path
+        if active_admin_namespace.logout_link_path.is_a?(Symbol)
+          send(active_admin_namespace.logout_link_path)
         else
-          active_admin_application.logout_link_path
+          active_admin_namespace.logout_link_path
         end
       end
 
       def logout_method
-        active_admin_application.logout_link_method || :get
+        active_admin_namespace.logout_link_method || :get
       end
     end
 

data/lib/active_admin/views/index_as_block.rb

@@ -18,9 +18,9 @@ module ActiveAdmin
     #
     class IndexAsBlock < ActiveAdmin::Component
 
-      def build(page_config, collection)
+      def build(page_presenter, collection)
         collection.each do |obj|
-          instance_exec(obj, &page_config.block)
+          instance_exec(obj, &page_presenter.block)
         end
       end
 

data/lib/active_admin/views/index_as_blog.rb

@@ -63,13 +63,13 @@ module ActiveAdmin
     #
     class IndexAsBlog < ActiveAdmin::Component
 
-      def build(page_config, collection)
-        @page_config = page_config
+      def build(page_presenter, collection)
+        @page_presenter = page_presenter
         @collection = collection
 
         # Call the block passed in. This will set the 
         # title and body methods
-        instance_eval &page_config.block if page_config.block
+        instance_eval &page_presenter.block if page_presenter.block
 
         build_posts
       end

data/lib/active_admin/views/index_as_grid.rb

@@ -23,14 +23,14 @@ module ActiveAdmin
      #
      class IndexAsGrid < ActiveAdmin::Component
 
-      def build(page_config, collection)
-        @page_config = page_config
+      def build(page_presenter, collection)
+        @page_presenter = page_presenter
         @collection = collection
         build_table
       end
 
       def number_of_columns
-        @page_config[:columns] || default_number_of_columns
+        @page_presenter[:columns] || default_number_of_columns
       end
 
       protected
@@ -53,7 +53,7 @@ module ActiveAdmin
 
       def build_item(item)
         td :for => item do
-          instance_exec(item, &@page_config.block)
+          instance_exec(item, &@page_presenter.block)
         end
       end
 

data/lib/active_admin/views/index_as_table.rb

@@ -92,16 +92,16 @@ module ActiveAdmin
     #
     class IndexAsTable < ActiveAdmin::Component
 
-      def build(page_config, collection)
+      def build(page_presenter, collection)
         table_options = {
           :id => active_admin_config.plural_underscored_resource_name,
           :sortable => true,
           :class => "index_table",
-          :i18n => active_admin_config.resource
+          :i18n => active_admin_config.resource_class
         }
 
         table_for collection, table_options do |t|
-          instance_exec(t, &page_config.block)
+          instance_exec(t, &page_presenter.block)
         end
       end
 
@@ -126,9 +126,16 @@ module ActiveAdmin
             :name => ""
           }.merge(options)
           column options[:name] do |resource|
-            links = link_to I18n.t('active_admin.view'), resource_path(resource), :class => "member_link view_link"
-            links += link_to I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link"
-            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 = ''.html_safe
+            if controller.action_methods.include?('show')
+              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"
+            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"
+            end
             links
           end
         end

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

@@ -23,8 +23,8 @@ module ActiveAdmin
           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(" | ")
-            active_admin_application.stylesheets.each do |path|
-              link :href => stylesheet_path(path), :media => "screen", :rel => "stylesheet", :type => "text/css"
+            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"
@@ -86,7 +86,7 @@ module ActiveAdmin
         end
 
         def build_action_items
-          if active_admin_config
+          if active_admin_config && active_admin_config.action_items?
             items = active_admin_config.action_items_for(params[:action])
             insert_tag view_factory.action_items, items
           end
@@ -134,7 +134,7 @@ module ActiveAdmin
 
         # Returns the sidebar sections to render for the current action
         def sidebar_sections_for_action
-          if active_admin_config
+          if active_admin_config && active_admin_config.sidebar_sections?
             active_admin_config.sidebar_sections_for(params[:action])
           else
             []

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

@@ -0,0 +1,49 @@
+module ActiveAdmin
+  module Views
+    module Pages
+
+      class Form < Base
+
+        def title
+          I18n.t("active_admin.#{params[:action]}_model",
+                 :model => active_admin_config.resource_name)
+        end
+
+        def form_presenter
+            active_admin_config.get_page_presenter(:form) || default_form_config
+        end
+
+        def main_content
+          form_options = default_form_options.merge(form_presenter.options)
+
+          if form_options[:partial]
+            render(form_options[:partial])
+          else
+            active_admin_form_for(resource, form_options, &form_presenter.block)
+          end
+        end
+
+        private
+
+        def default_form_options
+          {
+            :url => default_form_path,
+            :as => active_admin_config.underscored_resource_name
+          }
+        end
+
+        def default_form_path
+          resource.persisted? ? resource_path(resource) : collection_path
+        end
+
+        def default_form_config
+          ActiveAdmin::PagePresenter.new do |f|
+            f.inputs
+            f.buttons
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module ActiveAdmin
         end
 
         def config
-          index_config || default_index_config
+          active_admin_config.get_page_presenter(:index) || default_index_config
         end
 
         # Render's the index configuration that was set in the
@@ -29,17 +29,28 @@ module ActiveAdmin
         end
 
         protected
+        
+        
+        # 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))
+          end
+          text_node [I18n.t('active_admin.download'), links].flatten.join(" ").html_safe
+        end
 
         def build_scopes
           if active_admin_config.scopes.any?
-            scopes_renderer active_admin_config.scopes
+            div :class => "table_tools" do
+              scopes_renderer active_admin_config.scopes
+            end
           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::PageConfig.new(:as => :table) do |display|
+          @default_index_config ||= ::ActiveAdmin::PagePresenter.new(:as => :table) do |display|
             id_column
             resource_class.content_columns.each do |col|
               column col.name.to_sym
@@ -49,7 +60,7 @@ module ActiveAdmin
         end
 
         # Returns the actual class for renderering the main content on the index
-        # page. To set this, use the :as option in the page_config block.
+        # page. To set this, use the :as option in the page_presenter block.
         def find_index_renderer_class(symbol_or_class)
           case symbol_or_class
           when Symbol
@@ -62,7 +73,7 @@ module ActiveAdmin
         end
         
         def render_blank_slate
-          blank_slate_content = I18n.t("active_admin.blank_slate.content", :resource_name => active_admin_config.resource_name.pluralize)
+          blank_slate_content = I18n.t("active_admin.blank_slate.content", :resource_name => active_admin_config.plural_resource_name)
           if controller.action_methods.include?('new')
             blank_slate_content += " " + link_to(I18n.t("active_admin.blank_slate.link"), new_resource_path)
           end
@@ -77,7 +88,8 @@ module ActiveAdmin
         def render_index
           renderer_class = find_index_renderer_class(config[:as])
           
-          paginated_collection(collection, :entry_name => active_admin_config.resource_name) do
+          paginated_collection(collection, :entry_name   => active_admin_config.resource_name,
+                                           :entries_name => active_admin_config.plural_resource_name) do
             div :class => 'index_content' do
               insert_tag(renderer_class, config, collection)
             end

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

@@ -0,0 +1,24 @@
+module ActiveAdmin
+  module Views
+    module Pages
+      class Page < Base
+
+        def main_content
+          page_presenter = active_admin_config.get_page_presenter(:index)
+
+          if page_presenter && page_presenter.block
+            instance_exec &page_presenter.block
+          else
+            nil
+          end
+        end
+
+        protected
+
+        def title
+          active_admin_config.name
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module ActiveAdmin
       class Show < Base
 
         def config
-          active_admin_config.page_configs[:show] || ::ActiveAdmin::PageConfig.new
+          active_admin_config.get_page_presenter(:show) || ::ActiveAdmin::PagePresenter.new
         end
 
         def title

data/lib/generators/active_admin/assets/assets_generator.rb

@@ -2,20 +2,38 @@ module ActiveAdmin
   module Generators
     class AssetsGenerator < Rails::Generators::Base
 
+      class_option :bourbon, :type => :boolean, :default => true,
+                   :desc => "Generate Bourbon scss files if using Rails 3.0.x"
+
+      class_option :jquery, :type => :boolean, :default => true,
+                   :desc => "Generate jQuery js files if using Rails 3.0.x"
+
       def self.source_root
         @_active_admin_source_root ||= File.expand_path("../templates", __FILE__)
       end
 
       def install_assets
+        require 'rails'
+        require 'active_admin'
+
         if ActiveAdmin.use_asset_pipeline?
           template '3.1/active_admin.js', 'app/assets/javascripts/active_admin.js'
           template '3.1/active_admin.css.scss', 'app/assets/stylesheets/active_admin.css.scss'
         else
-          template '3.0/active_admin.js', 'public/javascripts/active_admin.js'
+          template '../../../../../app/assets/javascripts/active_admin/application.js', 'public/javascripts/active_admin.js'
           directory '../../../../../app/assets/images/active_admin', 'public/images/active_admin'
+          generate "jquery:install --ui" if options.jquery?
+          install_bourbon if options.bourbon?
         end
       end
 
+      private
+
+      def install_bourbon
+        rake "bourbon:install"
+        create_file "public/stylesheets/sass/_bourbon.scss", '@import "bourbon/bourbon"'
+      end
+
     end
   end
 end

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -7,17 +7,24 @@ ActiveAdmin.setup do |config|
   #
   config.site_title = "<%= Rails.application.class.name.split("::").first.titlecase %>"
 
-  # Set the link url for the title. For example, to take 
+  # Set the link url for the title. For example, to take
   # users to your main site. Defaults to no link.
   #
   # config.site_title_link = "/"
 
+  # Set an optional image to be displayed for the header
+  # instead of a string (overrides :site_title)
+  #
+  # Note: Recommended image height is 21px to properly fit in the header
+  #
+  # config.site_title_image = "/images/logo.png"
+
   # == Default Namespace
   #
   # Set the default namespace each administration resource
-  # will be added to. 
+  # will be added to.
   #
-  # eg: 
+  # eg:
   #   config.default_namespace = :hello_world
   #
   # This will create resources in the HelloWorld module and
@@ -28,11 +35,22 @@ ActiveAdmin.setup do |config|
   #
   # Default:
   # config.default_namespace = :admin
+  #
+  # You can customize the settings for each namespace by using
+  # a namespace block. For example, to change the site title
+  # within a namespace:
+  #
+  #   config.namespace :admin do |admin|
+  #     admin.site_title = "Custom Admin Title"
+  #   end
+  #
+  # This will ONLY change the title for the admin section. Other
+  # namespaces will continue to use the main "site_title" configuration.
 
   # == User Authentication
   #
-  # Active Admin will automatically call an authentication 
-  # method in a before filter of all controller actions to 
+  # Active Admin will automatically call an authentication
+  # method in a before filter of all controller actions to
   # ensure that there is a currently logged in admin user.
   #
   # This setting changes the method which Active Admin calls
@@ -71,20 +89,25 @@ ActiveAdmin.setup do |config|
 
   # == Admin Comments
   #
-  # Admin comments allow you to add comments to any model for admin use
-  #
-  # Admin comments are enabled by default in the default
-  # namespace only. You can turn them on in a namesapce
-  # by adding them to the comments array.
+  # Admin comments allow you to add comments to any model for admin use.
+  # Admin comments are enabled by default.
   #
   # Default:
-  # config.allow_comments_in = [:admin]
+  # config.allow_comments = true
+  #
+  # You can turn them on and off for any given namespace by using a
+  # namespace config block.
+  #
+  # Eg:
+  #   config.namespace :without_comments do |without_comments|
+  #     without_comments.allow_comments = false
+  #   end
 
 
   # == Controller Filters
   #
   # You can add before, after and around filters to all of your
-  # Active Admin resources from here. 
+  # Active Admin resources from here.
   #
   # config.before_filter :do_something_awesome
 
@@ -98,6 +121,9 @@ ActiveAdmin.setup do |config|
   # To load a stylesheet:
   #   config.register_stylesheet 'my_stylesheet.css'
   #
+  # You can provide an options hash for more control, which is passed along to stylesheet_link_tag():
+  #   config.register_stylesheet 'my_print_stylesheet.css', :media => :print
+  #
   # To load a javascript file:
   #   config.register_javascript 'my_javascript.js'
 end