yousty-activeadmin 1.0.4.pre → 1.0.5.pre

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

@@ -0,0 +1,28 @@
+module ActiveAdmin
+  module Views
+    class Tabs < ActiveAdmin::Component
+      builder_method :tabs
+
+      def tab(title, options = {}, &block)
+        title = title.to_s.titleize if title.is_a? Symbol
+        @menu << build_menu_item(title, options, &block)
+        @tabs_content << build_content_item(title, options, &block)
+      end
+
+      def build(&block)
+        @menu = ul(class: 'nav nav-tabs', role: "tablist")
+        @tabs_content = div(class: 'tab-content')
+      end
+
+      def build_menu_item(title, options, &block)
+        options = options.reverse_merge({})
+        li { link_to title, "##{title.parameterize}", options }
+      end
+
+      def build_content_item(title, options, &block)
+        options = options.reverse_merge(id: title.parameterize)
+        div(options, &block)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module ActiveAdmin
+  module Views
+    class UnsupportedBrowser < Component
+      def build
+        h1 I18n.t("active_admin.unsupported_browser.headline").html_safe
+        para I18n.t("active_admin.unsupported_browser.recommendation").html_safe
+        para I18n.t("active_admin.unsupported_browser.turn_off_compatibility_view").html_safe
+      end
+    end
+  end
+end

data/lib/active_admin/views/footer.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     class Footer < Component
 
       def build
-        super :id => "footer"
+        super id: "footer"
         powered_by_message
       end
 
@@ -11,8 +11,8 @@ module ActiveAdmin
 
       def powered_by_message
         para I18n.t('active_admin.powered_by',
-          :active_admin => link_to("Active Admin", "http://www.activeadmin.info"),
-          :version => ActiveAdmin::VERSION).html_safe
+          active_admin: link_to("Active Admin", "http://www.activeadmin.info"),
+          version: ActiveAdmin::VERSION).html_safe
       end
 
     end

data/lib/active_admin/views/header.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     class Header < Component
 
       def build(namespace, menu)
-        super(:id => "header")
+        super(id: "header")
 
         @namespace = namespace
         @menu = menu
@@ -20,11 +20,11 @@ module ActiveAdmin
       end
 
       def build_global_navigation
-        insert_tag view_factory.global_navigation, @menu, :class => 'header-item tabs'
+        insert_tag view_factory.global_navigation, @menu, class: 'header-item tabs'
       end
 
       def build_utility_navigation
-        insert_tag view_factory.utility_navigation, @utility_menu, :id => "utility_nav", :class => 'header-item tabs'
+        insert_tag view_factory.utility_navigation, @utility_menu, id: "utility_nav", class: 'header-item tabs'
       end
 
     end

data/lib/active_admin/views/index_as_blog.rb

@@ -75,7 +75,7 @@ module ActiveAdmin
 
         # Call the block passed in. This will set the
         # title and body methods
-        instance_eval &page_presenter.block if page_presenter.block
+        instance_exec &page_presenter.block if page_presenter.block
 
         add_class "index"
         build_posts
@@ -113,7 +113,7 @@ module ActiveAdmin
       end
 
       def build_post(post)
-        div :for => post do
+        div for: post do
           resource_selection_cell(post) if active_admin_config.batch_actions.any?
           build_title(post)
           build_body(post)
@@ -123,7 +123,7 @@ module ActiveAdmin
       def build_title(post)
         if @title
           h3 do
-            a(:href => resource_path(post)) do
+            a(href: resource_path(post)) do
              render_method_on_post_or_call_proc post, @title
             end
           end
@@ -136,7 +136,7 @@ module ActiveAdmin
 
       def build_body(post)
         if @body
-          div :class => 'content' do
+          div class: 'content' do
             render_method_on_post_or_call_proc post, @body
           end
         end
@@ -144,8 +144,8 @@ module ActiveAdmin
 
       def render_method_on_post_or_call_proc(post, proc)
         case proc
-        when String,Symbol
-          post.send proc
+        when String, Symbol
+          post.public_send proc
         else
           instance_exec post, &proc
         end

data/lib/active_admin/views/index_as_grid.rb

@@ -46,7 +46,7 @@ module ActiveAdmin
 
       def build_table
         resource_selection_toggle_panel if active_admin_config.batch_actions.any?
-        table :class => "index_grid" do
+        table class: "index_grid" do
           collection.in_groups_of(number_of_columns).each do |group|
             build_row(group)
           end
@@ -62,7 +62,7 @@ module ActiveAdmin
       end
 
       def build_item(item)
-        td :for => item do
+        td for: item do
           instance_exec(item, &@page_presenter.block)
         end
       end

data/lib/active_admin/views/index_as_table.rb

@@ -69,7 +69,7 @@ module ActiveAdmin
     #   selectable_column
     #   column :title
     #   actions do |post|
-    #     link_to "Preview", admin_preview_post_path(post), class: "member_link"
+    #     item "Preview", admin_preview_post_path(post), class: "member_link"
     #   end
     # end
     # ```
@@ -80,7 +80,30 @@ module ActiveAdmin
     # index do
     #   column :title
     #   actions defaults: false do |post|
-    #     link_to "View", admin_post_path(post)
+    #     item "View", admin_post_path(post)
+    #   end
+    # end
+    # ```
+    #
+    # Or append custom action with custom html via arbre:
+    #
+    # ```ruby
+    # index do
+    #   column :title
+    #   actions do |post|
+    #     a link_to "View", admin_post_path(post)
+    #   end
+    # end
+    # ```
+    #
+    # In case you prefer to list actions links in a dropdown menu:
+    #
+    # ```ruby
+    # index do
+    #   selectable_column
+    #   column :title
+    #   actions dropdown: true do |post|
+    #     item "Preview", admin_preview_post_path(post)
     #   end
     # end
     # ```
@@ -113,6 +136,15 @@ module ActiveAdmin
     # end
     # ```
     #
+    # It's also possible to sort by PostgreSQL's hstore column key. You should set `sortable`
+    # option to a `column->'key'` value:
+    #
+    # ```ruby
+    # index do
+    #   column :keywords, sortable: "meta->'keywords'"
+    # end
+    # ```
+    #
     # ## Associated Sorting
     #
     # You're normally able to sort columns alphabetically, but by default you
@@ -150,15 +182,27 @@ module ActiveAdmin
     # end
     # ```
     #
+    # ## Custom row class
+    #
+    # In order to add special class to table rows pass the proc object as a `:row_class` option
+    # of the `index` method.
+    #
+    # ```ruby
+    # index row_class: ->elem { 'active' if elem.active? } do
+    #   # columns
+    # end
+    # ```
+    #
     class IndexAsTable < ActiveAdmin::Component
 
       def build(page_presenter, collection)
         table_options = {
-          :id => "index_table_#{active_admin_config.resource_name.plural}",
-          :sortable => true,
-          :class => "index_table index",
-          :i18n => active_admin_config.resource_class,
-          :paginator => page_presenter[:paginator] != false
+          id: "index_table_#{active_admin_config.resource_name.plural}",
+          sortable: true,
+          class: "index_table index",
+          i18n: active_admin_config.resource_class,
+          paginator: page_presenter[:paginator] != false,
+          row_class: page_presenter[:row_class]
         }
 
         table_for collection, table_options do |t|
@@ -174,11 +218,11 @@ module ActiveAdmin
       def default_table
         proc do
           selectable_column
-          id_column
+          id_column if resource_class.primary_key # View based Models have no primary_key
           resource_class.content_columns.each do |col|
             column col.name.to_sym
           end
-          default_actions
+          actions
         end
       end
 
@@ -195,66 +239,109 @@ module ActiveAdmin
         # Display a column for checkbox
         def selectable_column
           return unless active_admin_config.batch_actions.any?
-          column resource_selection_toggle_cell, class: 'selectable' do |resource|
+          column resource_selection_toggle_cell, class: 'col-selectable', sortable: false do |resource|
             resource_selection_cell resource
           end
         end
 
         # Display a column for the id
         def id_column
-          column(resource_class.human_attribute_name(resource_class.primary_key), :sortable => resource_class.primary_key) do |resource|
-            link_to resource.id, resource_path(resource), :class => "resource_id_link"
+          raise "#{resource_class.name} as no primary_key!" unless resource_class.primary_key
+          column(resource_class.human_attribute_name(resource_class.primary_key), sortable: resource_class.primary_key) do |resource|
+            if controller.action_methods.include?('show')
+              link_to resource.id, resource_path(resource), class: "resource_id_link"
+            else
+              resource.id
+            end
           end
         end
 
+        def default_actions
+          raise '`default_actions` is no longer provided in ActiveAdmin 1.x. Use `actions` instead.'
+        end
+
         # Add links to perform actions.
         #
         # ```ruby
         # # Add default links.
         # actions
         #
+        # # Add default links with a custom column title (empty by default).
+        # actions name: 'A title!'
+        #
         # # Append some actions onto the end of the default actions.
         # actions do |admin_user|
-        #   link_to 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        #   item 'Grant User', grant_user_admin_user_path(admin_user)
+        # end
+        #
+        # # Append some actions onto the end of the default actions using arbre dsl.
+        # actions do |admin_user|
+        #   a link_to 'Grant Admin', grant_admin_admin_user_path(admin_user)
         # end
         #
         # # Custom actions without the defaults.
         # actions defaults: false do |admin_user|
-        #   link_to 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
         # end
-        # ```
         #
+        # # Append some actions onto the end of the default actions displayed in a Dropdown Menu
+        # actions dropdown: true do |admin_user|
+        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        # end
+        #
+        # # Custom actions without the defaults displayed in a Dropdown Menu.
+        # actions defaults: false, dropdown: true, dropdown_name: 'Additional actions' do |admin_user|
+        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
+        # end
+        #
+        # ```
         def actions(options = {}, &block)
-          options = {
-            :name => "",
-            :defaults => true
-          }.merge(options)
-          column options[:name] do |resource|
-            text_node default_actions(resource) if options[:defaults]
-            text_node instance_exec(resource, &block) if block_given?
+          name          = options.delete(:name)     { '' }
+          defaults      = options.delete(:defaults) { true }
+          dropdown      = options.delete(:dropdown) { false }
+          dropdown_name = options.delete(:dropdown_name) { I18n.t 'active_admin.dropdown_actions.button_label', default: 'Actions' }
+
+          options[:class] ||= 'col-actions'
+
+          column name, options do |resource|
+            if dropdown
+              dropdown_menu dropdown_name do
+                defaults(resource) if defaults
+                instance_exec(resource, &block) if block_given?
+              end
+            else
+              table_actions do
+                defaults(resource, css_class: :member_link) if defaults
+                if block_given?
+                  block_result = instance_exec(resource, &block)
+                  text_node block_result unless block_result.is_a? Arbre::Element
+                end
+              end
+            end
           end
         end
 
-        def default_actions(*args)
-          links = proc do |resource|
-            links = ''.html_safe
-            if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
-              links << link_to(I18n.t('active_admin.view'), resource_path(resource), :class => "member_link view_link")
-            end
-            if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
-              links << link_to(I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link")
-            end
-            if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
-              links << link_to(I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation')}, :class => "member_link delete_link")
-            end
-            links
+      private
+
+        def defaults(resource, options = {})
+          if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
+            item I18n.t('active_admin.view'), resource_path(resource), class: "view_link #{options[:css_class]}"
+          end
+          if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
+            item I18n.t('active_admin.edit'), edit_resource_path(resource), class: "edit_link #{options[:css_class]}"
           end
+          if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
+            item I18n.t('active_admin.delete'), resource_path(resource), class: "delete_link #{options[:css_class]}",
+              method: :delete, data: {confirm: I18n.t('active_admin.delete_confirmation')}
+          end
+        end
+
+        class TableActions < ActiveAdmin::Component
+          builder_method :table_actions
 
-          options = args.extract_options!
-          if options.present? || args.empty?
-            actions options
-          else
-            links.call(args.first)
+          def item *args
+            text_node link_to *args
           end
         end
       end # IndexTableFor

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

@@ -14,7 +14,7 @@ module ActiveAdmin
 
         def add_classes_to_body
           @body.add_class(params[:action])
-          @body.add_class(params[:controller].gsub('/', '_'))
+          @body.add_class(params[:controller].tr('/', '_'))
           @body.add_class("active_admin")
           @body.add_class("logged_in")
           @body.add_class(active_admin_namespace.name.to_s + "_namespace")
@@ -22,7 +22,7 @@ module ActiveAdmin
 
         def build_active_admin_head
           within @head do
-            insert_tag Arbre::HTML::Title, [title, render_or_call_method_or_proc_on(self, active_admin_application.site_title)].join(" | ")
+            insert_tag Arbre::HTML::Title, [title, render_or_call_method_or_proc_on(self, active_admin_namespace.site_title)].compact.join(" | ")
             active_admin_application.stylesheets.each do |style, options|
               text_node stylesheet_link_tag(style, options).html_safe
             end
@@ -30,18 +30,19 @@ module ActiveAdmin
             active_admin_application.javascripts.each do |path|
               text_node(javascript_include_tag(path))
             end
-            
-            if active_admin_application.favicon
-              text_node(favicon_link_tag(active_admin_application.favicon))
+
+            if active_admin_namespace.favicon
+              text_node(favicon_link_tag(active_admin_namespace.favicon))
             end
-            
+
             text_node csrf_meta_tag
           end
         end
 
         def build_page
           within @body do
-            div :id => "wrapper" do
+            div id: "wrapper" do
+              build_unsupported_browser
               build_header
               build_title_bar
               build_page_content
@@ -50,6 +51,12 @@ module ActiveAdmin
           end
         end
 
+        def build_unsupported_browser
+          if active_admin_namespace.unsupported_browser_matcher =~ env["HTTP_USER_AGENT"]
+            insert_tag view_factory.unsupported_browser
+          end
+        end
+
         def build_header
           insert_tag view_factory.header, active_admin_namespace, current_menu
         end
@@ -58,35 +65,32 @@ module ActiveAdmin
           insert_tag view_factory.title_bar, title, action_items_for_action
         end
 
-
         def build_page_content
           build_flash_messages
-          div :id => "active_admin_content", :class => (skip_sidebar? ? "without_sidebar" : "with_sidebar") do
+          div id: "active_admin_content", class: (skip_sidebar? ? "without_sidebar" : "with_sidebar") do
             build_main_content_wrapper
             build_sidebar unless skip_sidebar?
           end
         end
 
         def build_flash_messages
-          if active_admin_flash_messages.any?
-            div :class => 'flashes' do
-              active_admin_flash_messages.each do |type, message|
-                div message, :class => "flash flash_#{type}"
-              end
+          div class: 'flashes' do
+            flash_messages.each do |type, message|
+              div message, class: "flash flash_#{type}"
             end
           end
         end
 
         def build_main_content_wrapper
-          div :id => "main_content_wrapper" do
-            div :id => "main_content" do
+          div id: "main_content_wrapper" do
+            div id: "main_content" do
               main_content
             end
           end
         end
 
         def main_content
-          I18n.t('active_admin.main_content', :model => self.class.name).html_safe
+          I18n.t('active_admin.main_content', model: title).html_safe
         end
 
         def title
@@ -117,7 +121,7 @@ module ActiveAdmin
 
         # Renders the sidebar
         def build_sidebar
-          div :id => "sidebar" do
+          div id: "sidebar" do
             sidebar_sections_for_action.collect do |section|
               sidebar_section(section)
             end