activeadmin 0.4.4 → 0.5.0.pre

data/app/views/active_admin/dashboard/index.html.arb

@@ -1 +1 @@
-render view_factory.dashboard_page
+insert_tag view_factory.dashboard_page

data/app/views/active_admin/devise/passwords/edit.html.erb

@@ -1,16 +1,19 @@
-<h2>Change your password</h2>
+<div id="login">
+  <%= content_tag :h2, t('active_admin.devise.change_password.title') %>
 
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
-  <%= devise_error_messages! %>
-  <%= f.hidden_field :reset_password_token %>
+  <%= active_admin_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+    <%= devise_error_messages! %>
+    <%
+    f.inputs do
+      f.input :password
+      f.input :password_confirmation
+    end %>
+    <%=
+    f.actions do
+      f.action :submit, :label => t('active_admin.devise.change_password.submit'), :button_html => { :value => t('active_admin.devise.change_password.submit') }
+      f.input :reset_password_token, :as => :hidden, :input_html => { :value => resource.reset_password_token }
+    end %>
+  <% end %>
 
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Change my password" %></p>
-<% end %>
-
-<%= render :partial => "active_admin/devise/shared/links" %>
+  <%= render 'active_admin/devise/shared/links' %>
+</div>

data/app/views/active_admin/devise/passwords/new.html.erb

@@ -1,12 +1,12 @@
 <div id="login">
-  <h2>Forgot your password?</h2>
+  <%= content_tag :h2, t('active_admin.devise.reset_password.title') %>
 
-  <%= active_admin_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| 
+  <%= active_admin_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
     f.inputs do
       f.input :email
     end
-    f.buttons do
-      f.commit_button "Reset My Password"
+    f.actions do
+      f.action :submit, :label => t('active_admin.devise.reset_password.submit'), :button_html => { :value => t('active_admin.devise.reset_password.submit') }
     end
   end %>
 

data/app/views/active_admin/devise/sessions/new.html.erb

@@ -1,15 +1,15 @@
 <div id="login">
-  <h2><%= title "#{active_admin_application.site_title} Login" %></h2>
+  <h2><%= title "#{render_or_call_method_or_proc_on(self, active_admin_application.site_title)} #{t('active_admin.devise.login.title')}" %></h2>
 
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
-  <%= active_admin_form_for(resource, :as => resource_name, :url => send(:"#{scope}_session_path"), :html => { :id => "session_new" }) do |f| 
+  <%= active_admin_form_for(resource, :as => resource_name, :url => send(:"#{scope}_session_path"), :html => { :id => "session_new" }) do |f|
     f.inputs do
-      Devise.authentication_keys.each { |key| f.input key, :input_html => {:autofocus => true}}
+      resource.class.authentication_keys.each { |key| f.input key, :input_html => {:autofocus => true}}
       f.input :password
-      f.input :remember_me, :as => :boolean, :if =>  false  #devise_mapping.rememberable? }
+      f.input :remember_me, :label => t('active_admin.devise.login.remember_me'), :as => :boolean, :if =>  false  #devise_mapping.rememberable? }
     end
-    f.buttons do
-      f.commit_button "Login"
+    f.actions do
+      f.action :submit, :label => t('active_admin.devise.login.submit'), :button_html => { :value => t('active_admin.devise.login.submit') }
     end
   end
   %>

data/app/views/active_admin/devise/shared/_links.erb

@@ -1,20 +1,20 @@
 <%- if controller_name != 'sessions' %>
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
-  <%= link_to "Sign in", send(:"new_#{scope}_session_path") %><br />
+  <%= link_to t('active_admin.devise.links.sign_in'), send(:"new_#{scope}_session_path") %><br />
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.sign_up'), new_registration_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.forgot_your_password'), new_password_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.resend_confirmation_instructions'), new_confirmation_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
-<% end -%>
+  <%= link_to t('active_admin.devise.links.resend_unlock_instructions'), new_unlock_path(resource_name) %><br />
+<% end -%>

data/app/views/active_admin/page/index.html.arb

@@ -1 +1 @@
-render active_admin_application.view_factory["page"]
+insert_tag active_admin_application.view_factory["page"]

data/app/views/active_admin/resource/edit.html.arb

@@ -1 +1 @@
-render renderer_for(:edit)
+insert_tag renderer_for(:edit)

data/app/views/active_admin/resource/index.csv.erb

@@ -7,7 +7,7 @@
               CSV
             end
 
-  csv_output = csv_lib.generate do |csv|
+  csv_output = csv_lib.generate(:col_sep => active_admin_config.csv_builder.column_separator || active_admin_application.csv_column_separator) do |csv|
     columns = active_admin_config.csv_builder.columns
     csv << columns.map(&:name)
     collection.each do |resource|

data/app/views/active_admin/resource/index.html.arb

@@ -1 +1 @@
-render renderer_for(:index)
+insert_tag renderer_for(:index)

data/app/views/active_admin/resource/new.html.arb

@@ -1 +1 @@
-render renderer_for(:new)
+insert_tag renderer_for(:new)

data/app/views/active_admin/resource/show.html.arb

@@ -1 +1 @@
-render renderer_for(:show)
+insert_tag renderer_for(:show)

data/app/views/layouts/active_admin.html.arb

@@ -1 +1 @@
-render view_factory.layout
+insert_tag view_factory.layout

data/app/views/layouts/active_admin_logged_out.html.erb

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
  
-  <title><%= [@page_title, active_admin_application.site_title].compact.join(" | ") %></title>
+  <title><%= [@page_title, render_or_call_method_or_proc_on(self, ActiveAdmin.application.site_title)].compact.join(" | ") %></title>
 
   <% ActiveAdmin.application.stylesheets.each do |style| %>
     <%= stylesheet_link_tag style.path, style.options %>
@@ -14,7 +14,7 @@
 
   <%= csrf_meta_tag %>
 </head>
-<body class="logged_out <%= controller.action_name %>">
+<body class="active_admin logged_out <%= controller.action_name %>">
 <div id="wrapper">
 
   <div id="content_wrapper">

data/cucumber.yml

@@ -1,3 +1,3 @@
-default: --format 'progress' --require features/support/env.rb --require features/step_definitions features --tags ~@requires-reloading
+default: --format 'progress' --require features/support/env.rb --require features/step_definitions features --tags ~@requires-reloading --tags ~@wip
 wip: --format 'progress' --require features/support/env.rb --require features/step_definitions features --tags @wip:3 --wip features
 class-reloading: RAILS_ENV=cucumber_with_reloading --format 'progress' --require features/support/env.rb --require features/step_definitions features --tags @requires-reloading

data/docs/0-installation.md

@@ -12,7 +12,6 @@ MetaSearch and sass-rails:
     # Gemfile in Rails >= 3.1
     gem 'activeadmin'
     gem 'sass-rails'
-    gem "meta_search",    '>= 1.1.0.pre'
 
 ## Running the Generator
 
@@ -48,3 +47,13 @@ run the assets generator:
 
 This command makes sure you have all the latest assets and your installation is
 up to date. Each time you upgrade Active Admin, you should run this command.
+
+## will_paginate compatibility
+
+If you use `will_paginate` in your app, you need to configure an initializer for
+Kaminari to avoid conflicts. Put this in `config/initializers/kaminari.rb`
+
+
+    Kaminari.configure do |config|
+      config.page_method_name = :per_page_kaminari
+    end

data/docs/2-resource-customization.md

@@ -35,7 +35,8 @@ the resource from being displayed in the global navigation, pass `false` to the
 
 The menu method accepts a hash with the following options:
 
-* `:label` - The string label to display in the menu
+* `:label` - The string or proc label to display in the menu. If it's a proc, it
+  will be called each time the menu is rendered.
 * `:parent` - The string label of the parent to set for this menu
 * `:if` - A block or a symbol of a method to call to decide if the menu item
   should be displayed
@@ -51,6 +52,13 @@ To change the name of the label in the menu:
 
 By default the menu uses a pluralized version of your resource name.
 
+If you wish to translate your label at runtime, store the label as a proc
+instead of a string. The proc will be called each time the menu is rendered.
+
+    ActiveAdmin.register Post do
+      menu :label => proc{ I18n.t("mypost") }
+    end
+
 ### Drop Down Menus
 
 In many cases, a single level navigation will not be enough for the
@@ -125,3 +133,13 @@ The only requirement is that your method returns an instance of ActiveRecord::Re
       scope_to :current_user, :association_method => :managed_ads
     end
 
+In case you just need to customize the query independently of the current user, you can 
+override the `scoped_collection` method on the controller:
+
+    ActiveAdmin.register Post do
+      controller do
+        def scoped_collection
+          Post.includes(:author)
+        end
+      end
+    end

data/docs/3-index-pages.md

@@ -54,6 +54,29 @@ You can change the filter label by passing a label option:
 
 By default, Active Admin will try to use ActiveModel I18n to determine the label.
 
+Filters can also be disabled for a resource, a namespace or the entire
+application.
+
+To disable for a specific resource:
+
+    ActiveAdmin.register Post do
+      config.filters = false
+    end
+
+To disable for a namespace, in the initializer:
+
+    ActiveAdmin.setup do |config|
+      config.namespace :my_namespace do |my_namespace|
+        my_namespace.filters = false
+      end
+    end
+
+Or to disable for the entire application:
+
+    ActiveAdmin.setup do |config|
+      config.filters = false
+    end
+
 ## Index default sort order
 
 You can define the default sort order for index pages:
@@ -76,3 +99,11 @@ You can also disable pagination:
     ActiveAdmin.register Post do
       config.paginate = false
     end
+
+## Disable CSV, XML and JSON export
+
+You can remove links to download CSV, XML and JSON exports:
+
+    index :download_links => false do
+    end
+

data/docs/4-csv-format.md

@@ -12,3 +12,12 @@ Customizing the CSV format is as simple as customizing the index page.
         column("Author") { |post| post.author.full_name }
       end
     end
+
+You can choose custom separator
+
+    ActiveAdmin.register Post do
+      csv :separator => ';' do
+        column :title
+        column("Author") { |post| post.author.full_name }
+      end
+    end

data/docs/6-show-screens.md

@@ -35,7 +35,7 @@ If you'd like to keep the default active_admin look, you can also use "attribute
       end
     end
 
-You can customize the title of the object in the show screen.  The default is the resouce name and the ID.  You can customize as follows:
+You can customize the title of the object in the show screen.  The default is the resource name and the ID.  You can customize as follows:
     
     show :title => :name do
     end

data/docs/9-batch-actions.md

@@ -0,0 +1,161 @@
+# Index Batch Actions
+
+By default, the index view includes a way to quickly delete records from the listing,
+as well as an API for you to easily create your own "Batch Action" for handling a request to operate
+on multiple records at once.
+
+## Provided Batch Action
+
+The `batch_action` API provides one default batch action for use in your application immediately, for deleting
+multiple records at once.  You are able to disable this action if you desire (see below).
+
+## Creating Your Own Batch Actions
+
+To create your own batch action, use the `batch_action` method.  You are provided an array of record IDs
+to operate on.  The array should contain at least one ID.
+
+    ActiveAdmin.register Post do
+      batch_action :flag do |selection|
+        Post.find(selection).each do |post|
+          post.flag! :hot
+        end
+      end
+    end
+
+### Disabling Batch Actions
+
+You can disable batch actions at the application or namespace level in
+`config/initializers/active_admin.rb`:
+
+    ActiveAdmin.setup do |config|
+
+      # Disable all batch actions
+      config.batch_actions = false
+
+
+      # Or disable for a given namespace
+      config.namespace :admin do |admin|
+        admin.batch_actions = false
+      end
+    end
+
+You can disable batch actions on any given resource using:
+
+    ActiveAdmin.register Post do
+      config.batch_actions = false
+    end
+
+
+### Modifying a Previously Registered Batch Action
+
+If you wanted to modify the behavior of the provided "Delete" batch action, you can override by:
+
+    ActiveAdmin.register Post do
+      batch_action :destroy, :if => proc { can?( :destroy, Post ) } do |selection|
+        redirect_to collection_path, :alert => "Didn't really delete these!"
+      end
+    end
+
+### Removing a Batch Action
+
+You can also remove batch actions by simply passing false as the second parameter:
+
+    ActiveAdmin.register Post do
+      batch_action :destroy, false
+    end
+
+### Conditional Display of Batch Action
+
+You can control whether or not the batch action is available via the `:if` option. Provide a boolean or a proc, which is executed in context of the view.
+
+    ActiveAdmin.register Post do
+      batch_action :flag, :if => proc { false } do |selection|
+        # This action won't ever be displayed
+      end
+    end
+
+### Batch Action Priority in Menu
+
+You can also change the order of batch actions, by providing a value for the :priority param:
+
+    ActiveAdmin.register Post do
+      batch_action :destroy, :priority => 1 do |selection|
+        # Do some deleting in here...
+      end
+    end
+
+### Batch Action I18n of Labels
+
+By default, the name of the batch action will be used to lookup a label for the
+menu. It will lookup in `active_admin.batch_actions.labels.#{your_batch_action_name}`. For
+example:
+
+    ActiveAdmin.register Post do
+      batch_action :publish do |selection|
+        # do some publishing...
+      end
+    end
+
+Can be translated with:
+
+    # config/locales/en.yml
+    en:
+      active_admin:
+        batch_actions:
+          labels:
+            publish: "Publish"
+
+### Batch Action Confirmation   
+
+You can also request that the user confirm the action, before the action is performed:
+
+    ActiveAdmin.register Post do
+      batch_action :destroy, :confirm => "Are you sure you want to delete all of these?" do |selection|
+        # Do some deleting...
+      end
+    end
+
+### Customizing Table Columns
+
+To include the column with checkboxes in after overriding the list of columns for the `index` block in the *Table* listing, use the following helper as seen below:
+
+    ActiveAdmin.register Post do
+
+      batch_action :flag do |selection|
+        Post.find(selection).each { |p| p.flag! }
+        redirect_to collection_path, :notice => "Posts flagged!"
+      end
+
+      index do
+        selectable_column
+        column :title
+        default_actions
+      end
+
+    end
+
+
+### Support for Other Index Types
+
+You can easily use `batch_action` in the other index views, *Grid*, *Block*, and *Blog*; however, these views will require more custom styling to fit your application needs.
+
+    ActiveAdmin.register Post do
+
+      # By default, the "Delete" batch action is provided
+
+      # Index as Grid
+      index as: :grid do |post|
+        resource_selection_cell post
+        h2 auto_link( post )
+      end
+
+      # Index as Blog requires nothing special
+
+      # Index as Block
+      index as: :block do |post|
+        div for: post do
+          resource_selection_cell post
+        end
+      end
+
+    end