activeadmin 0.2.2 → 0.3.0

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

@@ -16,10 +16,16 @@ module ActiveAdmin
 
       def build_scope(scope)
         span :class => classes_for_scope(scope) do
-          if current_scope?(scope) 
-            em(scope.name)
+          begin
+            scope_name = I18n.t!("active_admin.scopes.#{scope.scope_method}")
+          rescue I18n::MissingTranslationData
+            scope_name = scope.name
+          end
+
+          if current_scope?(scope)
+            em(scope_name)
           else
-            a(scope.name, :href => url_for(params.merge(:scope => scope.id, :page => 1)))
+            a(scope_name, :href => url_for(params.merge(:scope => scope.id, :page => 1)))
           end
           text_node(" ")
           scope_count(scope)
@@ -47,12 +53,11 @@ module ActiveAdmin
         end
       end
 
+      include ActiveAdmin::ScopeChain
+
+      # Return the count for the scope passed in.
       def get_scope_count(scope)
-        if scope.scope_method
-          scoping_class.send(scope.scope_method).count
-        else
-          instance_exec(scoping_class, &scope.scope_block).count
-        end
+        scope_chain(scope, scoping_class).count
       end
 
       def scoping_class

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

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

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

@@ -0,0 +1,55 @@
+module ActiveAdmin
+  module Views
+    # Build a StatusTag
+    class StatusTag < ActiveAdmin::Component
+      builder_method :status_tag
+
+      def tag_name
+        'span'
+      end
+
+      def default_class_name
+        'status'
+      end
+
+      # @method status_tag(status, type = nil, options = {})
+      #
+      # @param [String] status the status to display. One of the span classes will be an underscored version of the status.
+      # @param [Symbol] type type of status. Will become a class of the span. ActiveAdmin provide style for :ok, :warning and :error.
+      # @param [Hash] options such as :class, :id etc
+      #
+      # @return [ActiveAdmin::Views::StatusTag]
+      #
+      # Examples:
+      #   status_tag('In Progress')
+      #   # => <span class='status in_progress'>In Progress</span>
+      #
+      #   status_tag('active', :ok)
+      #   # => <span class='status active ok'>Active</span>
+      #
+      #   status_tag('active', :ok, :class => 'important', :id => 'status_123')
+      #   # => <span class='status active ok important' id='status_123'>Active</span>
+      # 
+      def build(*args)
+        options = args.extract_options!
+        status = args[0]
+        type = args[1]
+        classes = options.delete(:class)
+
+        status = status.titleize if status
+
+        super(status, options)
+
+        add_class(status_to_class(status)) if status
+        add_class(type.to_s) if type
+        add_class(classes) if classes
+      end
+
+      protected
+
+      def status_to_class(status)
+        status.titleize.gsub(/\s/, '').underscore
+      end
+    end
+  end
+end

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

@@ -9,6 +9,7 @@ module ActiveAdmin
 
       def build(collection, options = {})
         @sortable = options.delete(:sortable)
+        @resource_class = options.delete(:i18n)
         @collection = collection
         @columns = []
         build_table
@@ -16,7 +17,11 @@ module ActiveAdmin
       end
 
       def column(*args, &block)
-        col = Column.new(*args, &block)
+        options = default_options.merge(args.last.is_a?(::Hash) ? args.pop : {})
+        title = args[0]
+        data  = args[1] || args[0]
+
+        col = Column.new(title, data, options, &block)
         @columns << col
 
         # Build our header item
@@ -69,7 +74,7 @@ module ActiveAdmin
         end
 
         th :class => classes do
-          link_to(title, request.query_parameters.merge(:order => "#{sort_key}_#{order_for_sort_key(sort_key)}").except(:page))
+          link_to(title, params.merge(:order => "#{sort_key}_#{order_for_sort_key(sort_key)}").except(:page))
         end
       end
 
@@ -102,7 +107,7 @@ module ActiveAdmin
       end
 
       # Returns the order to use for a given sort key
-      # 
+      #
       # Default is to use 'desc'. If the current sort key is
       # 'desc' it will return 'asc'
       def order_for_sort_key(sort_key)
@@ -111,6 +116,12 @@ module ActiveAdmin
         current_order == 'desc' ? 'asc' : 'desc'
       end
 
+      def default_options
+        {
+          :i18n => @resource_class
+        }
+      end
+
       class Column
 
         attr_accessor :title, :data
@@ -142,12 +153,12 @@ module ActiveAdmin
         #   column :username, :sortable => 'other_column_to_sort_on'
         #
         # If you pass a block to be rendered for this column, the column
-        # will not be sortable unless you pass a string to sortable to 
+        # will not be sortable unless you pass a string to sortable to
         # sort the column on:
         #
         #   column('Username', :sortable => 'login'){ @user.pretty_name }
         #   # => Sort key will be 'login'
-        #   
+        #
         def sort_key
           if @options[:sortable] == true || @options[:sortable] == false
             @data.to_s
@@ -159,7 +170,15 @@ module ActiveAdmin
         private
 
         def pretty_title(raw)
-          raw.is_a?(Symbol) ? raw.to_s.titleize : 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
+            end
+
+            raw.to_s.titleize
+          else
+            raw
+          end
         end
 
         def default_options

data/lib/active_admin/views/header_renderer.rb

@@ -12,10 +12,10 @@ module ActiveAdmin
       protected
 
       def title
-        content_tag 'h1', ActiveAdmin.site_title, :id => 'site_title'
+        content_tag 'h1', active_admin_application.site_title, :id => 'site_title'
       end
 
-      # Renders the global navigation returned by 
+      # Renders the global navigation returned by
       # ActiveAdmin::ResourceController#current_menu
       #
       # It uses the ActiveAdmin.tabs_renderer option
@@ -26,11 +26,27 @@ module ActiveAdmin
       def utility_navigation
         content_tag 'p', :id => "utility_nav" do
           if current_active_admin_user?
-            content_tag(:span, display_name(current_active_admin_user), :class => "current_user") +
-              link_to("Logout", "/#{ActiveAdmin.default_namespace}/logout")
+            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)
+            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)
+        else
+          active_admin_application.logout_link_path
+        end
+      end
+
+      def logout_method
+        active_admin_application.logout_link_method || :get
+      end
     end
 
   end

data/lib/active_admin/views/index_as_block.rb

@@ -1,16 +1,21 @@
 module ActiveAdmin
   module Views
 
-    # Simplest rendering possible. Calls the block for each element in the collection.
+    # = Index as a Block
     #
-    # Example:
+    # If you want to fully customize the display of your resources on the index
+    # screen, Index as a Block allows you to render a block of content for each
+    # resource.
     #
-    #   ActiveAdmin.register Post do
-    #     index :as => :block do |post|
-    #       # render the post partial (app/views/admin/posts/_post)
-    #       render 'post', :post => post 
+    #     index :as => :block do |product|
+    #       div :for => product do
+    #         h2 auto_link(product.title)
+    #         div do
+    #           simple_format product.description
+    #         end
+    #       end
     #     end
-    #   end
+    #
     class IndexAsBlock < ActiveAdmin::Component
 
       def build(page_config, collection)

data/lib/active_admin/views/index_as_blog.rb

@@ -1,5 +1,66 @@
 module ActiveAdmin
   module Views
+
+    # = Index as Blog
+    #
+    # Render your index page as a set of posts. The post has two main options:
+    # title and body.
+    #
+    #   index :as => :blog do
+    #     title :my_title # Calls #my_title on each resource
+    #     body  :my_body  # Calls #my_body on each resource
+    #   end
+    #
+    # == Post Title
+    #
+    # The title is the content that will be rendered within a link to the
+    # resource. There are two main ways to set the content for the title
+    #
+    # First, you can pass in a method to be called on your
+    # resource. For example:
+    #
+    #     index :as => :blog do
+    #       title :a_method_to_call
+    #     end
+    #
+    # This will result in the title of the post being the return value of
+    # Resource#a_method_to_call
+    #
+    # Second, you can pass a block to the tile option which will then be
+    # used as the contents fo the title. The resource being rendered
+    # is passed in to the block. For Example:
+    #
+    #     index :as => :blog do
+    #       title do |post|
+    #         span post.title, :class => 'title'
+    #         span post.created_at, :class => 'created_at'
+    #       end
+    #     end
+    #
+    # == Post Body
+    #
+    # The body is rendered underneath the title of each post. The same two
+    # style of options work as the Post Title above.
+    #
+    # Call a method on the resource as the body:
+    #
+    #     index :as => :blog do
+    #       title :my_title
+    #       body :my_body # Return value of #my_body will be the body
+    #     end
+    #
+    # Or, render a block as the body:
+    #
+    #     index :as => :blog do
+    #       title :my_title
+    #       body do |post|
+    #         div truncate(post.title)
+    #         div :class => 'meta' do
+    #           span "Post in #{post.categories.join(', ')}"
+    #         end
+    #       end
+    #     end
+    #
     class IndexAsBlog < ActiveAdmin::Component
 
       def build(page_config, collection)
@@ -14,16 +75,6 @@ module ActiveAdmin
       end
 
       # Setter method for the configuration of the title
-      #
-      #   index :as => :blog do
-      #     title :a_method_to_call #=> Calls #a_method_to_call on the resource
-      #
-      #     # OR
-      #
-      #     title do |post|
-      #       post.a_method_to_call
-      #     end
-      #   end
       def title(method = nil, &block)
         if block_given? || method
           @title = block_given? ? block : method
@@ -33,17 +84,6 @@ module ActiveAdmin
 
       # Setter method for the configuration of the body
       #
-      #   index :as => :blog do
-      #     title :my_title
-      #
-      #     body :a_method_to_call #=> Calls #a_method_to_call on the resource
-      #
-      #     # OR
-      #
-      #     title do |post|
-      #       post.a_method_to_call
-      #     end
-      #   end
       def body(method = nil, &block)
         if block_given? || method
           @body = block_given? ? block : method

data/lib/active_admin/views/index_as_grid.rb

@@ -1,6 +1,27 @@
 module ActiveAdmin
   module Views
-    class IndexAsGrid < ActiveAdmin::Component
+
+     # = Index as a Grid
+     #
+     # Sometimes you want to display the index screen for a set of resources as a grid
+     # (possibly a grid of thumbnail images). To do so, use the :grid option for the
+     # index block.
+     #
+     #     index :as => :grid do |product|
+     #       link_to(image_tag(product.image_path), admin_products_path(product))
+     #     end
+     #
+     # The block is rendered within a cell in the grid once for each resource in the
+     # collection. The resource is passed into the block for you to use in the view.
+     #
+     # You can customize the number of colums that are rendered using the columns
+     # option:
+     #
+     #     index :as => :grid, :columns => 5 do |product|
+     #       link_to(image_tag(product.image_path), admin_products_path(product))
+     #     end
+     #
+     class IndexAsGrid < ActiveAdmin::Component
 
       def build(page_config, collection)
         @page_config = page_config

data/lib/active_admin/views/index_as_table.rb

@@ -1,14 +1,105 @@
 module ActiveAdmin
   module Views
 
+    # = Index as a Table
+    #
+    # By default, the index page is a table with each of the models content columns and links to
+    # show, edit and delete the object. There are many ways to customize what gets
+    # displayed.
+    #
+    # == Defining Columns
+    #
+    # To display an attribute or a method on a resource, simply pass a symbol into the
+    # column method:
+    #
+    #     index do
+    #       column :title
+    #     end
+    #
+    # If the default title does not work for you, pass it as the first argument:
+    #
+    #     index do
+    #       column "My Custom Title", :title
+    #     end
+    #
+    # Sometimes calling methods just isn't enough and you need to write some view
+    # specific code. For example, say we wanted a colum called Title which holds a
+    # link to the posts admin screen.
+    #
+    # The column method accepts a block as an argument which will then be rendered
+    # within the context of the view for each of the objects in the collection.
+    #
+    #     index do
+    #       column "Title" do |post|
+    #         link_to post.title, admin_post_path(post)
+    #       end
+    #     end
+    #
+    # The block gets called once for each resource in the collection. The resource gets passed into
+    # the block as an argument.
+    #
+    # To setup links to View, Edit and Delete a resource, use the default_actions method:
+    #
+    #     index do
+    #       column :title
+    #       default_actions
+    #     end
+    #
+    # Alternatively, you can create a column with custom links:
+    #
+    #     index do
+    #       column :title
+    #       column "Actions" do |post|
+    #         link_to "View", admin_post_path(post)
+    #       end
+    #     end
+    #
+    #
+    # == Sorting
+    #
+    # When a column is generated from an Active Record attribute, the table is
+    # sortable by default. If you are creating a custom column, you may need to give
+    # Active Admin a hint for how to sort the table.
+    #
+    # If a column is defined using a block, you must pass the key to turn on sorting. The key
+    # is the attribute which gets used to sort objects using Active Record.
+    #
+    #     index do
+    #       column "Title", :sortable => :title do |post|
+    #         link_to post.title, admin_post_path(post)
+    #       end
+    #     end
+    #
+    # You can turn off sorting on any column by passing false:
+    #
+    #     index do
+    #       column :title, :sortable => false
+    #     end
+    #
+    # == Showing and Hiding Columns
+    #
+    # The entire index block is rendered within the context of the view, so you can
+    # easily do things that show or hide columns based on the current context.
+    #
+    # For example, if you were using CanCan:
+    #
+    #     index do
+    #       column :title, :sortable => false
+    #       if can? :manage, Post
+    #         column :some_secret_data
+    #       end
+    #     end
+    #
     class IndexAsTable < ActiveAdmin::Component
 
       def build(page_config, collection)
         table_options = {
-          :id => active_admin_config.plural_resource_name.underscore, 
+          :id => active_admin_config.plural_resource_name.underscore,
           :sortable => true,
-          :class => "index_table"
+          :class => "index_table",
+          :i18n => active_admin_config.resource
         }
+
         table_for collection, table_options do |t|
           instance_exec(t, &page_config.block)
         end
@@ -35,9 +126,9 @@ module ActiveAdmin
             :name => ""
           }.merge(options)
           column options[:name] do |resource|
-            links = link_to "View", resource_path(resource), :class => "view_link"
-            links += link_to "Edit", edit_resource_path(resource), :class => "edit_link"
-            links += link_to "Delete", resource_path(resource), :method => :delete, :confirm => "Are you sure you want to delete this?", :class => "delete_link"
+            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
           end
         end
@@ -57,7 +148,7 @@ module ActiveAdmin
         #       post.published? ? 'published' : 'draft'
         #     end
         #   end
-        #   
+        #
         def status_tag(*args, &block)
           col = Column.new(*args, &block)
           data = col.data