rails_admin_ui_index_cards 1.1.10 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009c10844a8c5f969ff4f4527c5653c104bcb68b3edaefa5970cf4257b16ba52'
-  data.tar.gz: 5709608d3b276474997ed91778ada07269852789523eeaa49b4d031ee4e6c808
+  metadata.gz: 0dc238d4841e3a628079ca483bd77a16275506b1337e1db519f8bcd053b4bfe9
+  data.tar.gz: 330729b57fe29dcfe0e1e5837a7b5aca9e7f9524c24af6318b5602de52a8aad3
 SHA512:
-  metadata.gz: 03a03c6242a8bce4cc6fe007831427da909caa721480e8c6064ed142da370638bb3ebcb4f1a0b1696a54062953e86f1c1eb794c65b348c0cd326991201eeab02
-  data.tar.gz: 572ce6a77a16450add400001b097a886336c6c719b26be07b5325b251ede8dcc58b880a48327695b03fd36ad5b5e1e5d47b86211bbb2d06f7de16f7251739918
+  metadata.gz: 3b9fa6edde558d32579b62df44b536e12aa75a9777f564ee2b80e26b754c03f5c467eefaa64920f0afb78b58e7ede3b3c03aeae93218741acf21eff9e7eefd50
+  data.tar.gz: 174b55550f98eb0c89543e13206e1ac79827871c1581eb937a7019bb5d8010e0328c5b613d750428a6d406664c133066202448ef8e75af7a6c417f5ecb9f4e7f

data/app/views/rails_admin/main/_card.html.haml

@@ -3,7 +3,7 @@
     %ul.inline.list-inline.pull-right
       = menu_for :member, @abstract_model, object, true
     %h4.panel-title
-      = check_box_tag "bulk_ids[]", object.id, false
+      = check_box_tag "bulk_ids[]", object.id, false, id: "bulk_ids_#{object.id}"
       %a{:"data-toggle" => "collapse", href: "#object-id-#{object.id}"}
         = (object.resume rescue false || object.display_name rescue false || object.title rescue false || object.name rescue false || object.code rescue false)
   %div{id: "object-id-#{object.id}", class: "panel-collapse collapse"}

data/app/views/rails_admin/main/index.html.haml

@@ -10,79 +10,62 @@
   export_action = nil unless export_action && authorized?(export_action.authorization_key, @abstract_model)
   description = RailsAdmin.config(@abstract_model.model_name).description
   properties = @model_config.list.with(controller: self.controller, view: self, object: @abstract_model.model.new).visible_fields
+  checkboxes = @model_config.list.checkboxes?
+  # columns paginate
+  unless (frozen_columns = @model_config.list.sidescroll_frozen_columns)
+    sets = get_column_sets(properties)
+    properties = sets[params[:set].to_i] || []
+    other_left = ((params[:set].to_i - 1) >= 0) && sets[params[:set].to_i - 1].present?
+    other_right = sets[params[:set].to_i + 1].present?
+  end
 
 - content_for :contextual_tabs do
-  = bulk_menu
+  - if checkboxes
+    = bulk_menu
+  - if filterable_fields.present?
+    %li.dropdown{style: 'float:right'}
+      %a.dropdown-toggle{href: '#', :'data-toggle' => "dropdown"}
+        = t('admin.misc.add_filter')
+        %b.caret
+      %ul.dropdown-menu#filters{style: 'left:auto; right:0;'}
+        - filterable_fields.each do |field|
+          - field_options = case field.type
+          - when :enum
+            - options_for_select(field.with(object: @abstract_model.model.new).enum)
+          - else
+            - ''
+          %li
+            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => (field.try(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
 
 %style
   - properties.select{ |p| p.column_width.present? }.each do |property|
     = "#list th.#{property.css_class} { width: #{property.column_width}px; min-width: #{property.column_width}px; }"
     = "#list td.#{property.css_class} { max-width: #{property.column_width}px; }"
-#list
-  .well.well-sm
-    - if filterable_fields.present? || !@model_config.list.scopes.empty?
-      .dropdown.pull-right{style: "margin-left:0.5em"}
-        %button.btn.btn-primary.dropdown-toggle#dropdownFilters{type: "button", :"data-toggle" => "dropdown", :"aria-haspopup" => "true", :"aria-expanded" => "true"}
-          = t('admin.misc.add_filter')
-          %b.caret
-        %ul.dropdown-menu#filters{:"aria-labelledby" => "dropdownFilters"}
-          - if filterable_fields.present?
-            - filterable_fields.each do |field|
-              - field_options = case field.type
-              - when :enum
-                - options_for_select(field.with(object: @abstract_model.model.new).enum)
-              - else
-                - ''
-              %li
-                %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => (field.try(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
-          - if !@model_config.list.scopes.empty?
-            %li
-              %a{href: '#'}= "--"
-            - @model_config.list.scopes.each_with_index do |scope, index|
-              - scope = '_all' if scope.nil?
-              %li{class: "#{'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0)}"}
-                %a{href: index_path(params.merge(scope: scope, page: nil)), class: 'pjax'}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
-
-    .dropdown.pull-right{style: "margin-left:0.5em"}
-      %button.btn.btn-primary.dropdown-toggle#dropdownOrder{type: "button", :"data-toggle" => "dropdown", :"aria-haspopup" => "true", :"aria-expanded" => "true"}
-        = t('admin.misc.order_by')
-        %b.caret
-      %ul.dropdown-menu{:"aria-labelledby" => "dropdownOrder"}
-        - properties.each do |property|
-          - selected = (sort == property.name.to_s)
-          - if property.sortable
-            - sort_location = index_path params.except('sort_reverse').except('page').merge(sort: property.name).merge(selected && sort_reverse != "true" ? {sort_reverse: "true"} : {})
-            - sort_direction = (sort_reverse == 'true' ? "sort-alpha-asc" : "sort-alpha-desc" if selected)
-          %li
-            %a{href:"#", class: "#{property.sortable && "header pjax" || nil} #{sort_direction if property.sortable && sort_direction} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location), rel: "tooltip", title: "#{property.hint}"}
-              %span{class: "fa fa-#{sort_direction}"}
-              = capitalize_first_letter(property.label)
 
-    -# -# Export filtered
-    -# - if export_action
-    -#   .pull-right{style: "margin-left:0.5em"}
-    -#     %a.btn.btn-primary{href: export_path(params.except('set').except('page'))}
-    -#       = t("admin.export.found")
-    
-    -unless @objects.blank?
-      .pull-right{style: "margin-left:0.5em"}
-        %a.btn.btn-primary#select-all
-          = t("admin.select.toggle")
-
-    = form_tag(index_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do
+#list
+  = form_tag(index_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do
+    .well
+      %span#filters_box{data: {options: ordered_filter_options.to_json}}
+      %hr.filters_box{style: "display:#{ordered_filters.empty? ? 'none' : 'block'}"}
       .input-group
         %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
         %span.input-group-btn
           %button.btn.btn-primary{type: 'submit', :'data-disable-with' => '<i class="icon-white icon-refresh"></i> '.html_safe + t('admin.misc.refresh')}
             %i.icon-white.icon-refresh
+            = t('admin.misc.refresh')
           %button#remove_filter.btn.btn-info{title: "Reset filters"}
             %i.icon-white.icon-remove
-          %a.btn.btn-primary{href: export_path(params.except('set').except('page')), style: "margin-left:0.5em"}
-            %i.icon-white.icon-share
-      %hr.filters_box{style: "display:#{ordered_filters.empty? ? 'none' : 'block'}"}
-      %span#filters_box
+      - if export_action
+        %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'
 
-  = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: "form" do
+  - unless @model_config.list.scopes.empty?
+    %ul.nav.nav-tabs#scope_selector
+      - @model_config.list.scopes.each_with_index do |scope, index|
+        - scope = '_all' if scope.nil?
+        %li{class: "#{'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0)}"}
+          %a{href: index_path(params.merge(scope: scope, page: nil)), class: 'pjax'}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
+
+  = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: ["form", frozen_columns ? 'ra-sidescroll' : nil], data: (frozen_columns ? {ra_sidescroll: frozen_columns} : {}) do
     = hidden_field_tag :bulk_action
     - if description.present?
       %p
@@ -91,21 +74,17 @@
     - @objects.each do |object|
       = render partial: "card", locals: {object: object, properties: properties, sort: sort, sort_reverse: sort_reverse}
 
-    - if @objects.respond_to?(:total_count)
+    - if @model_config.list.limited_pagination
+      .row
+        .col-md-6= paginate(@objects, theme: 'ra-twitter-bootstrap/without_count', total_pages: Float::INFINITY, remote: true)
+
+    - elsif @objects.respond_to?(:total_count)
       - total_count = @objects.total_count.to_i
       .row
         .col-md-6= paginate(@objects, theme: 'ra-twitter-bootstrap', remote: true)
       .row
         .col-md-6= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-default clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size
       .clearfix.total-count= "#{total_count} #{@model_config.pluralize(total_count).downcase}"
+
     - else
       .clearfix.total-count= "#{@objects.size} #{@model_config.pluralize(@objects.size).downcase}"
-
-:javascript
-  jQuery(function($) {
-    #{ordered_filter_string}
-  });
-  $("#select-all").click(_ => $("input[name='bulk_ids[]']").each((index, chkBox) => {
-    console.log(chkBox);
-    $(chkBox).prop('checked', !$(chkBox).is(':checked'));
-  }));

data/lib/rails_admin_ui_index_cards/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminUiIndexCards
-  VERSION = '1.1.10'.freeze
+  VERSION = '1.1.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_ui_index_cards
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.12
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore