activeadmin 0.5.1 → 0.6.0

data/app/assets/javascripts/active_admin/components/jquery.aa.popover.js.coffee

@@ -27,9 +27,6 @@ window.AA.Popover = class AA.Popover
     @_buildPopover()
     @_bind()
 
-    return @
-
-
   open: ->
     @isOpen = true
     @$popover.fadeIn @options.fadeInDuration

data/app/assets/javascripts/active_admin/components/jquery.aa.table-checkbox-toggler.js.coffee

@@ -5,23 +5,21 @@ window.AA.TableCheckboxToggler = class AA.TableCheckboxToggler extends AA.Checkb
   _bind: ->
     super
 
-    @$container.find("tbody").find("td").bind "click", (e) =>
-      if e.target.type != 'checkbox'
-        @_didClickCell(e.target)
-    
+    @$container.find('tbody td').click (e)=>
+      @_didClickCell(e.target) if e.target.type isnt 'checkbox'
+
   _didChangeCheckbox: (checkbox) ->
     super
-    
-    $row = $(checkbox).parents("tr")
+
+    $row = $(checkbox).parents 'tr'
 
     if checkbox.checked
-      $row.addClass("selected")
+      $row.addClass 'selected'
     else
-      $row.removeClass("selected")
+      $row.removeClass 'selected'
 
   _didClickCell: (cell) ->
-    $(cell).parent("tr").find(':checkbox').click()
-    
-( ( $ ) ->
+    $(cell).parent('tr').find(':checkbox').click()
+
+jQuery ($)->
   $.widget.bridge 'tableCheckboxToggler', AA.TableCheckboxToggler
-)( jQuery )

data/app/assets/javascripts/active_admin/pages/application.js.coffee

@@ -1,13 +1,16 @@
-#
-# Active Admin JS
-#
+# Initializers
+$ ->
+  # jQuery datepickers (also evaluates dynamically added HTML)
+  $(document).on 'focus', '.datepicker:not(.hasDatepicker)', ->
+    $(@).datepicker dateFormat: 'yy-mm-dd'
 
+  # Clear Filters button
+  $('.clear_filters_btn').click ->
+    window.location.search = ''
 
-$ ->
-  # Date picker
-  $(".datepicker").datepicker dateFormat: "yy-mm-dd"
-  $(".clear_filters_btn").click ->
-    window.location.search = ""
-    false
+  # Batch Actions dropdown
+  $('.dropdown_button').popover()
 
-  $(".dropdown_button").popover()
+  # Filter form: don't send any inputs that are empty
+  $('#q_search').submit ->
+    $(@).find(':input').filter(-> @value is '').prop 'disabled', true

data/app/assets/javascripts/active_admin/pages/batch_actions.js.coffee

@@ -5,7 +5,7 @@ jQuery ($) ->
   #
 
   $(document).delegate "#batch_actions_selector li a", "click.rails", ->
-    $("#batch_action").val $(this).attr("data-action")
+    $("#batch_action").val $(@).attr("data-action")
     $("#collection_selection").submit()
 
   #
@@ -14,8 +14,8 @@ jQuery ($) ->
 
   if $("#batch_actions_selector").length && $(":checkbox.toggle_all").length
 
-    if $(".paginated_collection").find("table.index_table").length
-      $(".paginated_collection table").tableCheckboxToggler()
+    if $(".paginated_collection table.index_table").length
+      $(".paginated_collection table.index_table").tableCheckboxToggler()
     else
       $(".paginated_collection").checkboxToggler()
 

data/app/assets/stylesheets/active_admin/_base.css.scss

@@ -27,6 +27,7 @@ body.active_admin {
     @import "active_admin/components/scopes";
     @import "active_admin/components/status_tags";
     @import "active_admin/components/table_tools";
+    @import "active_admin/components/index_list";
     @import "active_admin/pages/dashboard";
     @import "active_admin/pages/logged_out";
     @import "active_admin/structure/footer";

data/app/assets/stylesheets/active_admin/_header.css.scss

@@ -42,7 +42,7 @@
     height: 20px
   }
 
-  ul#tabs {
+  ul.tabs {
     display: inline-block; 
     height: 100%;
     margin: 0; 
@@ -128,10 +128,13 @@
     display: inline-block;
     margin: 0;
     padding: 0;
-    span, a { margin-left: 10px; }
 
     a { text-decoration: none; }
     a:hover { color: #fff; }
+
+    li {
+      display:inline;
+    }
   }
 
 }

data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss

@@ -80,7 +80,7 @@
     position: absolute;
     background-color: white;
     padding: 2px;
-    @include box-shadow(rgba(0,0,0,0.4) 0 1px 3px, lighten($primary-color, 15%) 0px 1px 0px 0px inset);
+    box-shadow: rgba(0,0,0,0.4) 0 1px 3px, lighten($primary-color, 15%) 0px 1px 0px 0px inset;
     background-color: $primary-color;
     @include gradient(lighten($primary-color, 4%), darken($primary-color, 5%));
     border: solid 1px darken($primary-color, 10%);
@@ -93,7 +93,7 @@
       display: block;
       background-color: #FFF;
       border: solid 1px darken($primary-color, 10%);    
-      @include box-shadow(lighten($primary-color, 5%) 0px 1px 0px 0px);    
+      box-shadow: lighten($primary-color, 5%) 0px 1px 0px 0px;    
       border-radius: 3px;
       margin: 0;
       overflow: hidden;

data/app/assets/stylesheets/active_admin/components/_index_list.scss

@@ -0,0 +1,12 @@
+.indexes {
+  float: right;
+
+  li {
+    .count {
+      color: #8e979e;
+      font-weight: normal;
+      font-size: 0.9em;
+      line-height: 10px;
+    }
+  }
+}

data/app/assets/stylesheets/active_admin/components/_popovers.css.scss

@@ -3,7 +3,7 @@
   position: absolute;
   background-color: white;
   padding: 2px;
-  @include box-shadow(rgba(0,0,0,0.4) 0 1px 3px, lighten($primary-color, 15%) 0px 1px 0px 0px inset);
+  box-shadow: rgba(0,0,0,0.4) 0 1px 3px, lighten($primary-color, 15%) 0px 1px 0px 0px inset;
   background-color: $primary-color;
   @include gradient(lighten($primary-color, 4%), darken($primary-color, 5%));
   border: solid 1px darken($primary-color, 10%);
@@ -59,7 +59,7 @@
     display: block;
     background-color: #FFF;
     border: solid 1px darken($primary-color, 10%);    
-    @include box-shadow(lighten($primary-color, 5%) 0px 1px 0px 0px);    
+    box-shadow: lighten($primary-color, 5%) 0px 1px 0px 0px;    
     border-radius: 3px;
     margin: 0;
     overflow: hidden;

data/app/assets/stylesheets/active_admin/components/_table_tools.css.scss

@@ -38,7 +38,7 @@ a.table_tools_button, .table_tools .dropdown_menu_button {
 
     &:active {
       @include border-colors(#d7d7d7, #c8c8c8, #c3c3c3);
-      @include box-shadow(0 1px 1px 0 rgba(0,0,0,0.17) inset );
+      box-shadow: 0 1px 1px 0 rgba(0,0,0,0.17) inset;
       @include gradient(#FFFFFF, #E8E8E8);
     }
   }
@@ -81,7 +81,7 @@ a.table_tools_button, .table_tools .dropdown_menu_button {
 
       a {
         @include gradient(#F0F0F0, #FDFDFD);
-        @include box-shadow(0 1px 1px 0 rgba(0,0,0,0.1) inset);
+        box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1) inset;
         cursor: default;
         
         &:hover {

data/app/assets/stylesheets/active_admin/mixins/_buttons.css.scss

@@ -21,7 +21,7 @@
   @include basic-button;
   @include gradient(lighten($primary-color, 15%), darken($primary-color, 12%));
   @include text-shadow(#000);
-  @include box-shadow(0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0px rgba(255,255,255, 0.2) inset);
+  box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0px rgba(255,255,255, 0.2) inset;
   border: solid 1px #484e53;
   @include border-colors(#616a71, #484e53, #363b3f);
   color: #efefef;
@@ -32,7 +32,7 @@
     }
     
     &:active {
-      @include box-shadow(0 1px 3px rgba(0,0,0,0.40) inset, 0 1px 0 0px #FFF);
+      box-shadow: 0 1px 3px rgba(0,0,0,0.40) inset, 0 1px 0 0px #FFF;
       @include gradient(lighten($primary-color, 8%), darken($primary-color, 17%));
     }
   }
@@ -41,7 +41,7 @@
 @mixin light-button {
   @include basic-button;  
   @include gradient(#FFFFFF, #E7E7E7);
-  @include box-shadow(0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0 rgba(255,255,255, 0.8) inset);
+  box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0 rgba(255,255,255, 0.8) inset;
   border: solid 1px #c7c7c7;
   @include border-colors(#d3d3d3, #c7c7c7, #c2c2c2);
   @include text-shadow;
@@ -53,7 +53,7 @@
     }
 
     &:active {
-      @include box-shadow(0 1px 2px rgba(0,0,0,0.22) inset, 0 1px 0 0px #EEE);
+      box-shadow: 0 1px 2px rgba(0,0,0,0.22) inset, 0 1px 0 0px #EEE;
       @include border-colors(#c2c2c2, #b9b9b9, #b7b7b7);
       @include gradient(#F3F3F3, #D8D8D8);
     }

data/app/assets/stylesheets/active_admin/mixins/_gradients.css.scss

@@ -3,12 +3,13 @@ $secondary-gradient-stop: #dfe1e2 !default;
 
 @mixin gradient($start, $end){ 
   background: $start; 
-  background: -webkit-gradient(linear, left top, left bottom, from($start), to($end)); 
-  background: -moz-linear-gradient(-90deg, $start, $end); 
+  background: -webkit-linear-gradient(-90deg, $start, $end);
+  background: -moz-linear-gradient(-90deg, $start, $end);
+  background: linear-gradient(-90deg, $start, $end);
   // IE 6 & 7
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$start}', endColorstr='#{$end}');
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start)}', endColorstr='#{ie-hex-str($end)}');
   // IE 8
-  -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$start}', endColorstr='#{$end}');
+  -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start)}', endColorstr='#{ie-hex-str($end)}');
 }
 
 @mixin primary-gradient { 

data/app/assets/stylesheets/active_admin/mixins/_sections.css.scss

@@ -3,7 +3,7 @@
   @include text-shadow;
   border: solid 1px #cdcdcd;
   @include border-colors(#e6e6e6, #d4d4d4, #cdcdcd);  
-  @include box-shadow(0 1px 3px rgba(0,0,0,0.12), 0 0 1px #FFF inset);
+  box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 0 1px #FFF inset;
 
   font-size: 1.0em;
   font-weight: bold;

data/app/assets/stylesheets/active_admin/pages/_logged_out.scss

@@ -15,7 +15,7 @@
     @include section-header;
     @include primary-gradient;
     @include text-shadow(#000);
-    @include box-shadow(0 1px 3px rgba(0,0,0,0.3));
+    box-shadow: 0 1px 3px rgba(0,0,0,0.3);
     border: none;
     color: #fff;
     margin: -13px -30px 20px -30px;

data/app/assets/stylesheets/active_admin/print.css.scss

@@ -40,7 +40,7 @@ h3 {
 #header {
   float: left;
 
-  #tabs, #utility_nav {
+  #tabs, .tabs, #utility_nav {
     display: none;
   }
 
@@ -91,7 +91,7 @@ h3 {
       padding: 0;
       margin-bottom: 1em;
 
-      &.scope.selected {
+      &.scope.selected, &.index.selected {
         display: block;
 
         &:before {

data/app/assets/stylesheets/active_admin/structure/_title_bar.scss

@@ -2,7 +2,7 @@
   @include section-header;
   @include clearfix;
   @include box-sizing(border-box);
-  @include box-shadow(0 1px 2px rgba(0, 0, 0, 0.37));
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.37);
   display: table;
   border-bottom-color: #EEE;
   width: 100%;

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

@@ -1,12 +1,14 @@
-<h2>Resend unlock instructions</h2>
-
-<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
-
-  <p><%= f.submit "Resend unlock instructions" %></p>
-<% end %>
-
-<%= render :partial => "active_admin/devise/shared/links" %>
+<div id="login">
+  <h2><%= title "#{render_or_call_method_or_proc_on(self, active_admin_application.site_title)} #{t('active_admin.devise.unlock.title')}" %></h2>
+
+  <%= active_admin_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f|
+    f.inputs do
+      f.input :email
+    end
+    f.actions do
+      f.action :submit, :label => t('active_admin.devise.unlock.submit'), :button_html => { :value => t('active_admin.devise.unlock.submit') }
+    end
+  end %>
+
+<%= render :partial => "active_admin/devise/shared/links" %>
+</div>

data/docs/1-general-configuration.md

@@ -114,3 +114,16 @@ You can also disable comments for a specific resource:
     ActiveAdmin.register Post do
       config.comments = false
     end
+
+## Utility Navigation
+
+The "utility navigation" shown at the top right when logged in by default shows the current user email address and a link to "Log Out".  However, the utility navigation is just like any other menu in the system, so you can provide your own menu to be rendered in place if you like.
+
+    ActiveAdmin.setup do |config|
+      config.namespace :admin do |admin|
+        admin.build_menu :utility_navigation do |menu|
+          menu.add label: "ActiveAdmin.info", url: "http://www.activeadmin.info", html_options: { target: :blank }
+          admin.add_logout_button_to_menu menu # can also pass priority & html_options for link_to to use
+        end
+      end
+    end

data/docs/10-custom-pages.md

@@ -1,8 +1,13 @@
 # Custom Pages
 
-Although it's nice to be able to register resources, sometimes you need a non
-resourceful page in your application. Active Admin supports the generation of
-custom pages using the same familiar syntax available for resources.
+When you need a standalone page on your site, Custom Pages will be there with a familiar syntax to resource registration.
+
+## Available Features
+* main page content
+* menu item
+* sidebars
+* action_items
+* page_actions
 
 ## Create a new Page
 
@@ -15,8 +20,8 @@ Creating a page is a simple as calling the `register_page` method:
     end
 
 In the above example, a new page will be created at `/admin/my_page` with the
-title "My Page" and the content of "Hello World". Anything rendered within the
-`#content` block will be set in the main content area of the page.
+title "My Page" and the content of "Hello World". Anything rendered within
+`content` will be the main content on the page.
 
 ## Page Title & I18n
 
@@ -24,22 +29,8 @@ Coming soon...
 
 ## Customize the Menu
 
-The menu item is available to customize just like in any other resource in
-Active Admin:
-
-    ActiveAdmin.register_page "My Page" do
-      menu :label => "My Menu Item Label", :parent => "Dashboard"
-
-      content do
-        para "Hello World"
-      end
-    end
-
-This configuration will add the page to the menu with the label "My Menu Item
-Label" and will nest it underneath the "Dashboard" link.
-
-To view the full list of available menu options visit ([Resource
-Customization](2-resource-customization.md))
+The menu item is available to customize just like
+[any other resource](2-resource-customization.md#customize-the-menu) in Active Admin.
 
 ## Add a Sidebar Section
 
@@ -59,11 +50,8 @@ in Active Admin:
       end
     end
 
-This configuration creates a sidebar section named "Help" with an unordered list
-in it. 
-
-To view the full list of available sidebar section options visit
-([Sidebars](7-sidebars.md))
+This creates a sidebar section named "Help" containing an unordered list. 
+To view the full customization options, visit [Sidebars](7-sidebars.md).
 
 ## Add an Action Item
 
@@ -80,5 +68,29 @@ Just like other resources, you can add Action Item's to pages:
       end
     end
 
-This configuration adds an action item that links to the root URL of the
-application.
+This adds an action item that links to the root URL of the application.
+
+## Add a Page Action
+
+`page_action` allows you to define controller actions specific to this page,
+and is the functional equivalent of `collection_action`.
+
+    ActiveAdmin.register_page "My Page" do
+
+      page_action :ex, :method => :post do
+        # do stuff here
+        redirect_to admin_my_page_path, :notice => "You did stuff!"
+      end
+      
+      action_item do
+        link_to "Do Stuff", admin_my_page_ex_path, :method => :post
+      end
+      
+      content do
+        para "Hello World"
+      end
+    end
+
+This defines the route `/admin/my_page/ex` which can handle HTTP POST requests.
+
+Clicking on the `action_item` will reload page with the message "You did stuff!"

data/docs/11-decorators.md

@@ -1,8 +1,10 @@
 # Decorators
 
 Active Admin supports the use of decorators for resources. Resources will be
-be decorated for the index and show blocks. The [draper](http://github.com/jcasimir/draper)
-gem is recommended but not required (more on requirements below).
+be decorated for the index and show blocks. The
+[draper](https://github.com/drapergem/draper) gem is recommended but not required 
+(more on requirements below). Note, that Active Admin works out of the box with
+Draper `>= 1.0.0`.
 
 ## Configuration
 
@@ -12,10 +14,10 @@ gem is recommended but not required (more on requirements below).
 
 ## Example Usage
 
-This example uses [draper](http://github.com/jcasimir/draper).
+This example uses [draper](https://github.com/drapergem/draper).
 
     # Gemfile
-    gem 'draper'
+    gem 'draper', '>= 1.0.0'
 
 Assuming a post and a post decorator