adminsite 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06c18d1d88578bccb15d3f24022297b7cae33c26
-  data.tar.gz: 2dda15695344d571481cd23d58814fe487d368e7
+  metadata.gz: d94fdef568c79b7bcf4bbd483d17b44459ef266c
+  data.tar.gz: 40eabefb8e62f71f42225bec10e965f994940f62
 SHA512:
-  metadata.gz: d2daf28f2f355c5c56bbbd5b7de46d541f6eb15d68acb0cbd91debd4c0bd247f21e701e18aa116651adc2244545dc8d5bc768bb94ddb0c8e3ebc4ffe146e0d00
-  data.tar.gz: 550493a1d5b4f0b3025e14235a4cb604a9b2aa8e369af220e20c688f49daf29bad060a075916666c6523cc7cc5aafed2debb39378a48143c04888b9b6f92b16a
+  metadata.gz: dc45991fcde7d78b295285661130598397aafd04f14463d296feef9d79e5ba5a7826b66466379f980863cb1090ef62f4f3ea8d5ff2243998d5e2f92557c079b0
+  data.tar.gz: 757cc09d1ae378fa23c9e03d8438e7361301dd5e2c4331867f438034ae7856a2a59a7a4adb937637a29dc2509b7337eda59a3369ab3a4d87cbca14dc967c907e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adminsite (3.1.2)
+    adminsite (3.2.0)
       actionpack-page_caching
       cancancan (~> 1.10)
       codemirror-rails (>= 4.8)

data/app/admin_configs/adminsite/adminsite_page_admin_config.rb

@@ -6,7 +6,7 @@ module Adminsite
         :url,
         :requires_login,
         :cacheable,
-        :page_layout_id,
+        :page_layout,
         :updated_at
       ]
     end

data/app/assets/javascripts/adminsite/admin/filters.js.coffee

@@ -0,0 +1,13 @@
+jQuery(document).on 'page:change', ->
+  close_btns = $('body.adminsite #search_filters ul button').on "click", ->
+      btn = jQuery(this)
+      op = btn.attr('data-filter-op')
+      value = btn.attr('data-filter-value')
+      column = btn.attr('data-filter-column')
+      search_pattern = '&q[' + column + '_' + op + ']=' + value
+      # console.log(column, op, value, search_pattern)
+      current_url = decodeURIComponent(window.location.search)
+      next_url = current_url.replace(search_pattern, '')
+      window.location.search = next_url
+      return
+  return

data/app/assets/javascripts/adminsite/admin/hide_and_show.js.coffee

@@ -9,13 +9,9 @@ Adminsite.selectedRow = (param) ->
   return
 
 Adminsite.showSearchForm = ->
-  $('.search_form form').show()
-  $('.search_form a#show').hide()
-  $('.search_form a#hide').show()
+  $('form.search').show(200)
   return
 
 Adminsite.hideSearchForm = ->
-  $('.search_form form').hide()
-  $('.search_form a#show').show()
-  $('.search_form a#hide').hide()
+  $('form.search').hide(200)
   return

data/app/assets/stylesheets/adminsite/admin/base.scss

@@ -1,6 +1,5 @@
 body.adminsite {
   font: 13px/1.231 sans-serif;
-  *font-size: small;
 
   &, input, select, textarea, button {
     margin: 0;
@@ -22,9 +21,6 @@ body.adminsite {
     &:hover, &:active {
       outline: none;
     }
-    &:hover img {
-      background: #fff;
-    }
   }
   .left {
     float: left;
@@ -60,40 +56,30 @@ body.adminsite {
     margin-bottom: 8px;
   }
   #wrapper {
-    margin-left: 20px;
-    margin-right: 20px;
+    margin: 0 20px;
+    overflow: auto;
   }
   hr {
     border: dashed black;
     border-width: 1px 0 0;
     height: 0;
   }
-  #header {
+  header {
     margin: 0;
-    clear: both;
     padding: 20px;
-    bottom: 40px;
     background-color: #e7e7e7;
     background: -moz-linear-gradient(bottom, #fff, #f0f0f0 17%, #fff 18%, #c0c0c0 19%, #e7e7e7 20%, #e7e7e7);
     background: -webkit-gradient(linear, left bottom, left top, from(#fff), color-stop(17%, #f0f0f0), color-stop(18%, #fff), color-stop(19%, #c0c0c0), color-stop(20%, #e7e7e7), to(#e7e7e7));
     border-top: 6px solid #595959;
-  }
-  #header_left {
-    float: left;
     h2 {
       font-size: 135%;
       margin: 0;
       padding: 0;
     }
-    a:hover img {
-      background: #e7e7e7;
-    }
   }
-  #header_right {
-    float: left;
-    clear: left;
+  #action_bar {
     font-size: 85%;
-    margin-top: 0.2em;
+    margin: 0.2em 20px 1.5em;
     a {
       background-color: rgba(0, 0, 0, 0.2);
       background-repeat: no-repeat;
@@ -101,18 +87,16 @@ body.adminsite {
       border-radius: 4px;
       -moz-border-radius: 4px;
       -webkit-border-radius: 4px;
-      display: block;
-      float: left;
       margin-right: 0.5em;
       padding: 0.2em;
       text-decoration: none;
       &:hover {
         background-color: rgba(0, 0, 0, 0.7);
       }
-      &.add, &.back {
+      &.add, &.back, &.new {
         padding-left: 18px;
       }
-      &.add {
+      &.add, &.new {
         background-image: asset-url('adminsite/admin/add.png');
       }
       &.back {
@@ -120,6 +104,109 @@ body.adminsite {
       }
     }
   }
+  #filters {
+    border: 1px solid #ccc;
+    margin: 0.2em 20px 1.5em;
+    & > div {
+      margin:0;
+    }
+    legend {
+      margin:0;
+      padding: 0 0.3em;
+    }
+    label {
+      display: inline;
+      margin: 0;
+    }
+    ul {
+      display: inline;
+      list-style-type: none;
+      margin: 0;
+      padding: 0;
+      li {
+        display: inline;
+      }
+    }
+    #scopes {
+      margin-bottom: 1em;
+      li {
+        border-left: 1px solid black;
+        padding: 0 0.3em 0 0.5em;
+        &:first-child {
+          border-left: 0;
+          padding-left: 0;
+        }
+        .count {
+          color: #ccc;
+        }
+        a:link, a:visited {
+          text-decoration: none;
+          white-space: nowrap;
+        }
+      }
+    }
+    #search_filters ul {
+      padding: 0 5px 0 0;
+      li {
+        border: 1px solid #ccc;
+        border-radius: 10px 0 0 10px;
+        margin: 0 5px;
+        padding: 3px 3px 3px 10px;
+      }
+      button {
+        background-color: transparent;
+        border: 0;
+        font-weight: bold;
+      }
+    }
+  }
+
+  form.search {
+    position: absolute;
+    top: 240px;
+    left: 110px;
+    border: 1px solid #595959;
+    border-radius: 5px;
+    box-shadow: 5px 5px 5px 0px rgba(0, 0, 17, 0.7);
+    margin: 0 0 15px;
+    .titlebar {
+      background-color: #e7e7e7;
+      border-bottom: 1px solid #e3e3e3;
+      border-radius: 5px 5px 0 0;
+      font-weight: bold;
+      padding: 10px;
+      button {
+        float:right;
+        background-color: transparent;
+        border: none;
+        font-size: 120%;
+        margin-top: -2px;
+      }
+    }
+    .content {
+      background-color: #eee;
+      border-radius: 0 0 5px 5px;
+      padding: 10px;
+    }
+    label {
+      display: inline-block;
+      min-width: 7em;
+    }
+    ul {
+      margin: 0;
+      padding: 0;
+      li {
+        white-space: nowrap;
+        min-width: 100px;
+        max-width: 450px;
+        margin-bottom: 0px;
+        margin-right: 0px;
+        list-style: none;
+        height: 35px;
+      }
+    }
+  }
+
   .clearfix {
     zoom: 1;
     &:before {
@@ -136,21 +223,6 @@ body.adminsite {
       clear: both;
     }
   }
-  #footer {
-    position: fixed;
-    border-top: 1px solid #ddd;
-    border-bottom: 10px solid #f5f5f5;
-    background: #f5f5f5;
-    width: 100%;
-    left: 0;
-    bottom: 0;
-    text-align: center;
-    color: #aaa;
-    font-size: 10px;
-    z-index: 10000;
-    opacity: 0.9;
-    margin-top: 100px;
-  }
   pre {
     background-color: #eee;
     padding: 10px;
@@ -449,15 +521,15 @@ body.adminsite {
     .submit {
       float: right;
     }
-    &#loginform .submit {
-      float: none;
-      text-align: right;
-    }
     p {
       margin-bottom: 24px;
     }
   }
   #loginform {
+    .submit {
+      float: none;
+      text-align: right;
+    }
     #adminsite_admin_user_email, #adminsite_admin_user_password {
       -moz-background-clip: border;
       -moz-background-inline-policy: continuous;
@@ -489,47 +561,13 @@ body.adminsite {
     }
   }
 
-  .search_form {
-    margin-bottom: 20px;
-
-    form > div {
-      background-color: #eee;
-      padding: 5px;
-      border: 1px solid #ccc;
-      border-radius: 5px;
-      overflow: auto;
-      .actions {
-        float: left;
-      }
-    }
-    ul {
-      margin: 9px;
-      padding: 9px;
-      li
-      {
-        min-width: 100px;
-        max-width: 330px;
-        margin-bottom: 20px;
-        margin-right: 40px;
-        list-style: none;
-        float: left;
-        height: 35px;
-      }
-    }
-    .actions {
-      // margin-top: 10px;
-      clear: both;
-      margin: 20px;
-    }
-  }
-
   .select_row {
     width: 12px;
     height: 12px;
     background-color: #cccccc;
   }
 
-  table tr.selected{
+  table tr.selected {
     background-color: #d9e4ec;
     &:nth-child(odd) {background-color: #D1DCE4}
     .select_row {

data/app/controllers/adminsite/admin/resources_controller.rb

@@ -47,10 +47,11 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
   end
 
   def index
-    @q = resources.order(order_params).ransack(params[:q])
+    @q = scope_resources.ransack(params[:q])
     @resources = @q.result.page(params[:page])
     @ransack_params = ransack_params
-    @show_search_form = @ransack_params[:q].try(:except, :s).present?
+    @search_params  = @ransack_params[:q].try(:except, :s)
+    @show_search_form = @search_params.present?
     render :json => @resources if api_call?
   end
 
@@ -79,12 +80,12 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
     @current_admin_menu ||= params[:admin_menu]
   end
 
-  def admin_resource_path(id = nil, action = nil)
+  def admin_resource_path(id = nil, action = nil, options = {})
     path = self.class.remove_namespace(params[:controller], ['adminsite'])
     path = path.gsub('/','_')
     path = path.singularize if (action || id).present? && action.to_s != 'search'
     path = "#{action}_#{path}" if action.present?
-    send("#{path}_path", id, admin_menu: current_admin_menu)
+    send("#{path}_path", id, {admin_menu: current_admin_menu}.merge(options) )
   end
 
   protected
@@ -101,12 +102,12 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
     @resource ||= resources.find(params[:id])
   end
 
-  def resources
-    if filter_scopes.present?
+  def scope_resources
+     if filter_scopes.present?
       eval("resource_class.#{filter_scopes.join('.')}")
     else
       self.class.resource_class.all
-    end
+    end.order(order_params)
   end
 
   def resource_params

data/app/controllers/adminsite/admin_application_controller.rb

@@ -2,7 +2,7 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class Adminsite::AdminApplicationController < ActionController::Base
-  helper :all, "admin/adminsite_application"
+  helper "admin/adminsite_application"
   layout 'adminsite/admin'
 
   before_filter :authenticate_adminsite_admin_user!

data/app/controllers/adminsite/admin_user_sessions_controller.rb

@@ -12,7 +12,7 @@ class Adminsite::AdminUserSessionsController < Devise::SessionsController
   end
 
   def after_sign_in_path_for(resource_or_scope)
-    params[:redirect_to] || session["adminsite_admin_user_return_to"] || admin_dashboard_index_path
+    params[:redirect_to] || session["adminsite_admin_user_return_to"] || admin_dashboard_index_path(admin_menu: 'Dashboard')
   end
 
 

data/app/helpers/admin/adminsite_application_helper.rb

@@ -1,41 +1,5 @@
 module Admin::AdminsiteApplicationHelper
 
-  def column_of_attr(search_attr)
-    return if search_attr.blank?
-    resource_class.columns.each{|c| return c if c.name == search_attr.to_s.downcase }
-    nil
-  end
-
-  def input_type_of_column(column)
-    case
-    when column.sql_type.match(/\Acharacter varying/)
-      return :string
-    when column.sql_type.match(/\Atimestamp/)
-      return :date
-    when column.sql_type.match(/\integer/)
-      return :number
-    else
-      column.sql_type.try(:to_sym)
-    end
-  end
-
-  def ransack_predicate_input_type(input_type)
-    case input_type
-    when :boolean
-      return [:eq]
-    when :text
-      return [:eq, :cont]
-    when :string
-      return [:eq, :cont]
-    when :date
-      return [:lteq, :gteq]
-    when :number
-      return [:eq, :lteq, :gteq]
-    else
-      [:eq]
-    end
-  end
-
   def format_response_value(value, add_td_wrappers = true)
     value = value.url if defined?(PictureUploader) && value.is_a?(PictureUploader)
     response = ''
@@ -57,97 +21,20 @@ module Admin::AdminsiteApplicationHelper
     value.is_a?(String) && value.match(/\A[\/]|\Ahttp[s]*:/)
   end
 
-  def image_extensions
-    %w(.png .gif .jpg .tif)
-  end
-
   def is_image?(path)
     image_extensions.include?( File.extname(path).split('?').first.try(:downcase) )
   end
 
+  def image_extensions
+    %w(.png .gif .jpg .tif)
+  end
+
   def error_messages_for(obj)
     return if obj.errors.blank?
     msgs = obj.errors.full_messages.collect{|msg| "<li>#{ h msg }</li>" }
     raw ['<ul>', msgs, '</ul>'].flatten.join
   end
 
-  def recognize_path(path)
-    return {} if path.try(:strip).blank?
-    begin
-      return Adminsite::Engine.routes.recognize_path(path) # '/admin/profiles'
-      return Rails.application.routes.recognize_path(path)
-    rescue Exception => e
-    end
-  end
-
-  def current_admin_menu
-    @current_admin_menu ||= params[:admin_menu]
-  end
-
-  def menu_item(label, url, child_controller_names = [], klasses = nil, method = nil, admin_menu = label)
-    result = ''
-    child_menus = []
-
-    child_controller_names_authorized = child_controller_names.select do |child_controller_name|
-      controller_class_name = "#{child_controller_name}_controller".classify
-      controller_class = eval("defined?(Adminsite::" + "#{controller_class_name}) ? Adminsite::#{controller_class_name} : Adminsite::Admin::#{controller_class_name}".classify)
-      can?(:read, controller_class.new.authorize_resource_class)
-    end
-
-    if current_url?(url, label) || ( child_controller_active?(child_controller_names) && current_admin_menu == admin_menu)
-      child_controller_names_authorized.each do |child_controller_name|
-        child_menus << content_menu_item(child_controller_name, admin_menu, nil, nil )
-      end
-    end
-    child_menus = child_menus.compact
-
-    if child_controller_names_authorized.count > 0
-      html_options = {method: method}
-      html_options[:title] = current_adminsite_admin_user.email if klasses == 'log_out'
-      link = link_to(label, "#{url}?admin_menu=#{admin_menu}", html_options)
-      result = raw "<li class='#{html_classes(url, nil, klasses, admin_menu, label )}'>#{link}</li>"
-
-      content_for(:content_menu, child_menus.join("\n").html_safe )
-    end
-    result
-  end
-
-  def content_menu_label(url, controller_name)
-    menu_controller = recognize_path(url)[:controller]
-    return controller_name.titlecase if menu_controller.blank?
-    eval("#{menu_controller}_controller".classify).content_menu_label
-  end
-
-  def content_menu_item(controller_name, admin_menu, klasses, method )
-    if controller_name != controller_name.pluralize
-      url = eval("admin_#{controller_name}_index_path")
-    else
-      url = eval("admin_#{controller_name}_path")
-    end
-    link = link_to(content_menu_label(url, controller_name), "#{url}?admin_menu=#{admin_menu}", method: method, )
-    raw "<li class='#{html_classes(url, controller_name, klasses, admin_menu )}'>#{link}</li>"
-  end
-
-  def current_url?(url, label = '')
-    if label.present?
-      return request.fullpath == "#{url}?admin_menu=#{label}"
-    else
-      return request.fullpath == url
-    end
-  end
-
-  def child_controller_active?(child_controller_names)
-    child_controller_names.include?(controller.controller_name)
-  end
-
-  def html_classes(url, controller_name, klasses = nil, admin_menu = '', label = '')
-    result = []
-    result |= [klasses].flatten if klasses.present?
-    result |= ['current'] if current_url?(url, admin_menu)
-    result |= ['active']  if current_admin_menu == label || controller_name == controller.controller_name
-    result.join(' ')
-  end
-
   def label_resource
     @resource.send(resource_admin_config.label_attribute)
   end
@@ -160,41 +47,56 @@ module Admin::AdminsiteApplicationHelper
     label_resource_class.pluralize
   end
 
-  def link_to_back(text, path = admin_resource_path)
-    link_to text, path, :class => 'back'
+  def link_to_back(text = 'Back', path = admin_resource_path)
+    link_to text, path, :class => 'action back'
   end
 
   def link_to_new(text, path = admin_resource_path(nil, :new) )
-    link_to text, path, :class => 'add'
+    link_to text, path, :class => 'action new'
   end
 
-  def link_to_show(resource)
-    link_to image_tag('adminsite/admin/magnifier.png', :size => '16x16'), admin_resource_path(resource.id), target: '_blank'
+  def link_to_show(resource, text = '')
+    link_to h(text) + image_tag('adminsite/admin/magnifier.png', :size => '16x16'), admin_resource_path(resource.id), :class => 'resource_action show'
   end
 
-  def link_to_edit(resource)
-    link_to image_tag('adminsite/admin/pencil.png', :size => '16x16'), admin_resource_path(resource.id, :edit)
+  def link_to_edit(resource, text = '')
+    link_to h(text) + image_tag('adminsite/admin/pencil.png', :size => '16x16'), admin_resource_path(resource.id, :edit), :class => 'resource_action edit' if can?(:edit, resource)
   end
 
   def link_to_destroy(resource)
-    link_to image_tag('adminsite/admin/cross.png', :size => '16x16'), admin_resource_path(resource.id), data: { :confirm => 'Are you sure?'} , :method => :delete
+    link_to image_tag('adminsite/admin/cross.png', :size => '16x16'), admin_resource_path(resource.id), :class => 'resource_action destroy', data: { :confirm => 'Are you sure?'} , :method => :delete if can?(:destroy, resource)
   end
 
   def display_resource_value(resource, attr, add_td_wrappers = true)
     value = nil
     attr.to_s.split('.').each{|a| value = (value || resource).send(a) }
-    value = display_referenced_resource(value) if value.is_a?(ActiveRecord::Base)
-    if value.is_a?(ActiveRecord::Associations::CollectionProxy)
+    value = display_referenced_resource(value, false) if value.is_a?(ActiveRecord::Base)
+    if value.is_a?(ActiveRecord::Associations::CollectionProxy) or value.is_a?(Array)
       value = value.collect do |r|
-        label = Adminsite::AdminConfig::Base.admin_config_of_class(r.class, nil, current_adminsite_admin_user).label_attribute(r)
-        display_resource_value(r, label, false)
+        if r.is_a?(ActiveRecord::Base)
+          display_referenced_resource(r, false)
+        else
+          r
+        end
       end.join(', ')
     end
     format_response_value(value, add_td_wrappers).html_safe
   end
 
-  def display_referenced_resource(resource)
-    link_to resource.title, send("edit_admin_#{resource.class.name.underscore.gsub('/','_')}_path", resource.id, admin_menu: params[:admin_menu])
+  def display_referenced_resource(resource, add_td_wrappers = true)
+    label_attr = Adminsite::AdminConfig::Base.admin_config_of_class(resource.class, nil, current_adminsite_admin_user).label_attribute(resource)
+    label = display_resource_value(resource, label_attr, add_td_wrappers)
+    begin
+      if can?(:edit, resource)
+        link_to label, send("edit_admin_#{resource.class.name.underscore.gsub('/','_')}_path", resource.id, admin_menu: params[:admin_menu])
+      elsif can?(:read, resource)
+        link_to label, send("admin_#{resource.class.name.underscore.gsub('/','_')}_path", resource.id, admin_menu: params[:admin_menu])
+      else
+        label
+      end
+    rescue
+      return label
+    end
   end
 
   def publish_form_input(form, form_input)

data/app/helpers/admin/adminsite_menu_helper.rb

@@ -0,0 +1,80 @@
+module Admin::AdminsiteMenuHelper
+
+  def recognize_path(path)
+    return {} if path.try(:strip).blank?
+    begin
+      return Adminsite::Engine.routes.recognize_path(path) # '/admin/profiles'
+      return Rails.application.routes.recognize_path(path)
+    rescue Exception => e
+    end
+  end
+
+  def current_admin_menu
+    @current_admin_menu ||= params[:admin_menu]
+  end
+
+  def menu_item(label, url, child_controller_names = [], klasses = nil, method = nil, admin_menu = label)
+    result = ''
+    child_menus = []
+
+    child_controller_names_authorized = child_controller_names.select do |child_controller_name|
+      controller_class_name = "#{child_controller_name}_controller".classify
+      controller_class = eval("defined?(Adminsite::" + "#{controller_class_name}) ? Adminsite::#{controller_class_name} : Adminsite::Admin::#{controller_class_name}".classify)
+      can?(:read, controller_class.new.authorize_resource_class)
+    end
+
+    if current_url?(url, label) || ( child_controller_active?(child_controller_names) && current_admin_menu == admin_menu)
+      child_controller_names_authorized.each do |child_controller_name|
+        child_menus << content_menu_item(child_controller_name, admin_menu, nil, nil )
+      end
+    end
+    child_menus = child_menus.compact
+
+    if child_controller_names_authorized.count > 0
+      html_options = {method: method}
+      html_options[:title] = current_adminsite_admin_user.email if klasses == 'log_out'
+      link = link_to(label, "#{url}?admin_menu=#{admin_menu}", html_options)
+      result = raw "<li class='#{html_classes(url, nil, klasses, admin_menu, label )}'>#{link}</li>"
+
+      content_for(:content_menu, child_menus.join("\n").html_safe )
+    end
+    result
+  end
+
+  def content_menu_label(url, controller_name)
+    menu_controller = recognize_path(url)[:controller]
+    return controller_name.titlecase if menu_controller.blank?
+    eval("#{menu_controller}_controller".classify).content_menu_label
+  end
+
+  def content_menu_item(controller_name, admin_menu, klasses, method )
+    if controller_name != controller_name.pluralize
+      url = eval("admin_#{controller_name}_index_path")
+    else
+      url = eval("admin_#{controller_name}_path")
+    end
+    link = link_to(content_menu_label(url, controller_name), "#{url}?admin_menu=#{admin_menu}", method: method, )
+    raw "<li class='#{html_classes(url, controller_name, klasses, admin_menu )}'>#{link}</li>"
+  end
+
+  def current_url?(url, label = '')
+    if label.present?
+      return request.fullpath == "#{url}?admin_menu=#{label}"
+    else
+      return request.fullpath == url
+    end
+  end
+
+  def child_controller_active?(child_controller_names)
+    child_controller_names.include?(controller.controller_name)
+  end
+
+  def html_classes(url, controller_name, klasses = nil, admin_menu = '', label = '')
+    result = []
+    result |= [klasses].flatten if klasses.present?
+    result |= ['current'] if current_url?(url, admin_menu)
+    result |= ['active']  if current_admin_menu == label || controller_name == controller.controller_name
+    result.join(' ')
+  end
+
+end

data/app/helpers/admin/adminsite_search_form_helper.rb

@@ -0,0 +1,39 @@
+module Admin::AdminsiteSearchFormHelper
+
+  def column_of_attr(search_attr)
+    return if search_attr.blank?
+    resource_class.columns.each{|c| return c if c.name == search_attr.to_s.downcase }
+    nil
+  end
+
+  def input_type_of_column(column)
+    case
+    when column.sql_type.match(/\Acharacter varying/)
+      return :string
+    when column.sql_type.match(/\Atimestamp/)
+      return :date
+    when column.sql_type.match(/\integer/)
+      return :number
+    else
+      column.sql_type.try(:to_sym)
+    end
+  end
+
+  def ransack_predicate_input_type(input_type)
+    case input_type
+    when :boolean
+      return [:eq]
+    when :text
+      return [:eq, :cont]
+    when :string
+      return [:eq, :cont]
+    when :date
+      return [:lteq, :gteq]
+    when :number
+      return [:eq, :lteq, :gteq]
+    else
+      [:eq]
+    end
+  end
+
+end

data/app/models/adminsite/ability.rb

@@ -20,6 +20,7 @@ module Adminsite
           # can :read, Adminsite::FileAsset
         end
         can :manage, Adminsite::AdminUserSessionsController
+        can :read, Adminsite::Admin::DashboardController
       end
     end
   end

data/app/views/adminsite/admin/adminsite_page_layouts/index.html.haml

@@ -4,6 +4,6 @@
   - content_for :header_left do
     = "Listing #{label_resource_class_plural}"
   - content_for :header_right do
-    = link_to_new "New #{label_resource_class}", admin_resource_path(nil, 'new')
+    = link_to_new "New #{label_resource_class}"
   There are no page layouts. Go ahead and
   #{link_to 'add the first one', new_admin_adminsite_page_layout_path}.

data/app/views/adminsite/admin/adminsite_pages/index.html.haml

@@ -4,13 +4,13 @@
   - content_for :header_left do
     = "Listing #{label_resource_class_plural}"
   - content_for :header_right do
-    = link_to_new "New #{label_resource_class}", admin_resource_path(nil, 'new')
+    = link_to_new "New #{label_resource_class}"
   There are no pages. Go ahead and
   #{link_to 'add the first one', new_admin_adminsite_page_path}.
 - else
   - content_for :header_left do
     = "Listing #{label_resource_class_plural}"
   - content_for :header_right do
-    = link_to_new "New #{label_resource_class}", admin_resource_path(nil, 'new')
+    = link_to_new "New #{label_resource_class}"
   You should #{link_to 'add a page layout', new_admin_adminsite_page_layout_path}
   before adding your first page.

data/app/views/adminsite/admin/crud/show.html.haml

@@ -1,7 +1,8 @@
 - content_for :header_left do
   = controller_name
 - content_for :header_right do
-  = link_to_back 'Back', url_for(controller: controller_name, action: :index )
+  #show_actions
+    = link_to_back 'Back', url_for(controller: controller_name, action: :index )
 
 - if Rails.env.development?
   please override in '/app/views/adminsite/admin/#{controller_name}/show.html.haml'

data/app/views/adminsite/admin/resources/_filters.html.haml

@@ -0,0 +1,28 @@
+%fieldset#filters
+  %legend Filters
+  #scopes
+    - if resource_admin_config.actions_index.any?
+      %label Predefined filters:
+      %ul
+        - resource_admin_config.scopes.each do |scope|
+          - scope_label = "#{scope.to_s.titlecase} <span class=\"count\">(#{resource_class.send(scope).ransack(params[:q]).result.count})</span>".html_safe
+          - scope_path = "#{admin_resource_path(nil,nil,@ransack_params )}&scope=#{scope}"
+          %li #{link_to scope_label, scope_path}
+  - if resource_admin_config.attributes_search.any?
+    #search_filters
+      %label |
+        Search filters (
+        %a#show{ onclick: "Adminsite.showSearchForm();" }
+          = @search_params.present? ? 'Edit' : 'New'
+        ) |
+      - if @search_params.present?
+        %ul
+          - @search_params.map do |q|
+            - op = q.first.split('_').last
+            - column = q.first.chomp("_#{op}")
+            - value = q.last
+            %li<
+              #{column.gsub('_',' ').capitalize} |
+              #{Ransack::Translate.predicate(op)}: |
+              '#{value}' |
+              %button{type: 'button', "data-filter-column" => column, "data-filter-value" => q.last, "data-filter-op" => op } ×

data/app/views/adminsite/admin/resources/_list.haml

@@ -14,7 +14,7 @@
     - @resources.each do |resource|
       %tr{onclick: 'Adminsite.selectedRow(this);'}
         - if resource_admin_config.actions_placement == :left
-          %td.actions
+          %td.actions.resource_actions
             %ul
               - resource_admin_config.default_member_actions(resource).each do |action|
                 %li= send("link_to_#{action}", resource)
@@ -23,7 +23,7 @@
         - resource_admin_config.attributes_index.each do |attr|
           = display_resource_value(resource, attr)
         - if resource_admin_config.actions_placement == :right
-          %td.actions
+          %td.actions.resource_actions
             %ul
               - resource_admin_config.default_member_actions(resource).each do |action|
                 %li= send("link_to_#{action}", resource)

data/app/views/adminsite/admin/resources/_search_form.html.haml

@@ -1,10 +1,11 @@
 - if resource_admin_config.attributes_search.any?
-  .search_form
-    %a#show{onclick: 'Adminsite.showSearchForm();', style: "#{'display:none' if @show_search_form}"  } Show Filters
-    %a#hide{onclick: 'Adminsite.hideSearchForm();', style: "#{'display:none' unless @show_search_form}" } Hide Filters
-    = search_form_for(@q, :url => admin_resource_path(nil), method: :get, html: { style: "#{'display:none' unless @show_search_form}"} ) do |f|
-      = hidden_field_tag :admin_menu, params[:admin_menu]
-      %div{id: "#{controller_name}-search"}
+  = search_form_for(@q, :url => admin_resource_path(nil), method: :get, html: { class: 'search', style: 'display:none' } ) do |f|
+    = hidden_field_tag :admin_menu, params[:admin_menu]
+    %div{id: "#{controller_name}-search"}
+      .titlebar
+        Filters
+        %button{ type: 'button', onclick: 'Adminsite.hideSearchForm();'} ×
+      .content
         %ul
           - resource_admin_config.attributes_search.each do |search_attr|
             - if (column = column_of_attr(search_attr)).present?
@@ -13,7 +14,7 @@
                 - input_type = input_type_of_column(column)
                 - predicates = ransack_predicate_input_type(input_type)
                 - show_predicate_select = predicates.count > 1
-                - field_value = (@ransack_params[:q] || {})["#{search_attr}_#{p_value}"]
+                - field_value = (@search_params || {})["#{search_attr}_#{p_value}"]
                 = f.label("#{search_attr}")
 
                 - if show_predicate_select

data/app/views/adminsite/admin/resources/edit.haml

@@ -1,8 +1,9 @@
 - content_for :header_left do
   = "Edit #{label_resource_class}: '#{label_resource}'"
-  = link_to_show @resource if resource_admin_config.default_member_actions(@resource).include?(:show)
 - content_for :header_right do
-  = link_to_back 'Back', admin_resource_path
+  #action_bar
+    = link_to_back
+    = link_to_show @resource, 'Show ' if resource_admin_config.default_member_actions(@resource).include?(:show)
 
 = error_messages_for @resource
 

data/app/views/adminsite/admin/resources/index.haml

@@ -2,12 +2,10 @@
   = "Listing #{label_resource_class_plural}"
 - if resource_admin_config.actions_index.any?
   - content_for :header_right do
-    - resource_admin_config.actions_index.each do |action|
-      = send("link_to_#{action}", action.to_s.titlecase)
-    - resource_admin_config.scopes.each do |scope|
-      = link_to "#{scope.to_s.titlecase} (#{resource_class.send(scope).count})", "#{admin_resource_path}&scope=#{scope}"
-
-= render :partial => 'search_form'
-
-= render :partial => 'list'
+    #action_bar
+      - resource_admin_config.actions_index.each do |action|
+        = send("link_to_#{action}", action.to_s.titlecase)
+    = render partial: 'filters'
+    = render partial: 'search_form'
 
+= render partial: 'list'

data/app/views/adminsite/admin/resources/new.haml

@@ -1,7 +1,8 @@
 - content_for :header_left do
   = "New #{label_resource_class}"
 - content_for :header_right do
-  = link_to_back 'Back', admin_resource_path
+  #action_bar
+    = link_to_back
 
 = error_messages_for @resource
 

data/app/views/adminsite/admin/resources/show.haml

@@ -1,8 +1,9 @@
 - content_for :header_left do
   = "Show #{label_resource_class}: '#{label_resource}'"
-  = link_to_edit @resource if resource_admin_config.default_member_actions(@resource).include?(:edit)
 - content_for :header_right do
-  = link_to_back 'Back', admin_resource_path
+  #action_bar
+    = link_to_back
+    = link_to_edit @resource, 'Edit ' if resource_admin_config.default_member_actions(@resource).include?(:edit)
 
 .formtastic
   %table

data/app/views/adminsite/admin_user_sessions/new.html.haml

@@ -4,7 +4,7 @@
       %label
         E-mail:
         %br
-        = f.text_field :email, :type => 'email'
+        = f.text_field :email, :type => 'email', :autofocus => 'autofocus'
     %p
       %label
         Password:

data/app/views/layouts/adminsite/admin.html.haml

@@ -1,10 +1,8 @@
 !!!
-%html{ "lang" => "en" }
+%html{ lang: "en" }
   %head
-    %meta{ "charset" => "utf-8" }
-    %title
-      Administration:
-      = controller.action_name.capitalize
+    %meta{ charset: "utf-8" }
+    %title Administration: #{controller.action_name.capitalize}
     = stylesheet_link_tag 'adminsite'
     = javascript_include_tag 'adminsite'
   %body.adminsite
@@ -20,12 +18,8 @@
         = flash[:error]
         = flash[:alert]
 
-    #header
-      #header_left
-        %h2
-          = yield :header_left
-      #header_right
-        = yield :header_right
-      .clearfix
+    %header
+      %h2= yield :header_left
+    = yield(:header_right)
     #wrapper
       = yield

data/config/locales/da.devise.yaml

@@ -39,8 +39,9 @@ da:
       update_needs_confirmation: "Din konto er blevet opdateret, men vi er nødt til at bekræfte din nye email. Check venligst din mail og klik på bekræftelses linket for at bekræfte din nye email."
       updated: "Din konto er opdateret."
     sessions:
-      signed_in: "Du er nu logget ind."
-      signed_out: "Du er nu logget ud."
+      signed_in: " "
+      signed_out: " "
+      already_signed_out: " "
     unlocks:
       send_instructions: 'Om få minutter vil du modtage en email med instruktioner om genåbning af din konto.'
       send_paranoid_instructions: 'Hvis din e-mail adresse findes i vores database vil du modtage in e-mail med instutioner om hvordan du kan låse din konto op.'

data/config/locales/en.devise.yaml

@@ -41,9 +41,9 @@ en:
       update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
       updated: "Your account has been updated successfully."
     sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
+      signed_in: " "
+      signed_out: " "
+      already_signed_out: " "
     unlocks:
       send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
       send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."

data/lib/adminsite/version.rb

@@ -1,3 +1,3 @@
 module Adminsite
-  VERSION = "3.1.2" unless defined?(Adminsite::VERSION)
+  VERSION = "3.2.0" unless defined?(Adminsite::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminsite
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Robin Wunderlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -273,6 +273,7 @@ files:
 - app/assets/images/adminsite/admin/spinner.gif
 - app/assets/javascripts/adminsite/admin.js.coffee
 - app/assets/javascripts/adminsite/admin/code_editor.js.coffee
+- app/assets/javascripts/adminsite/admin/filters.js.coffee
 - app/assets/javascripts/adminsite/admin/hide_and_show.js.coffee
 - app/assets/javascripts/adminsite/admin/inputs/multi_select_box_input.js.coffee
 - app/assets/stylesheets/adminsite/admin.scss
@@ -293,6 +294,8 @@ files:
 - app/controllers/adminsite/admin_user_sessions_controller.rb
 - app/controllers/adminsite/contents_controller.rb
 - app/helpers/admin/adminsite_application_helper.rb
+- app/helpers/admin/adminsite_menu_helper.rb
+- app/helpers/admin/adminsite_search_form_helper.rb
 - app/helpers/admin_application_helper.rb
 - app/inputs/adminsite/multi_select_box_input.rb
 - app/models/adminsite/ability.rb
@@ -312,6 +315,7 @@ files:
 - app/views/adminsite/admin/crud/index.html.haml
 - app/views/adminsite/admin/crud/show.html.haml
 - app/views/adminsite/admin/iframe/index.haml
+- app/views/adminsite/admin/resources/_filters.html.haml
 - app/views/adminsite/admin/resources/_form.haml
 - app/views/adminsite/admin/resources/_list.haml
 - app/views/adminsite/admin/resources/_search_form.html.haml