Rename horizontal-scroll to sidescroll

Refs. #3017

app/assets/javascripts/rails_admin/ra.horizontal-scroll-list.coffee → app/assets/javascripts/rails_admin/ra.sidescroll.coffee

@@ -3,10 +3,10 @@
 
  setFrozenColPositions = ->
  $listForm = $('#bulk_form')
- return unless $listForm.is('.ra-horizontal-scroll-list')
+ return unless $listForm.is('.ra-sidescroll')
  $listForm.find('table tr').each (index, tr) ->
  firstPosition = 0
- $(tr).find('.ra-horizontal-scroll-frozen').each (idx, td) ->
+ $(tr).find('.ra-sidescroll-frozen').each (idx, td) ->
  tdLeft = $(td).position().left
  firstPosition = tdLeft if idx == 0
  td.style.left = "#{tdLeft - firstPosition}px"

app/assets/javascripts/rails_admin/rails_admin.js

@@ -15,6 +15,6 @@
 //= require 'rails_admin/ra.i18n'
 //= require 'rails_admin/bootstrap/bootstrap'
 //= require 'rails_admin/ra.widgets'
-//= require 'rails_admin/ra.horizontal-scroll-list'
+//= require 'rails_admin/ra.sidescroll'
 //= require 'rails_admin/ui'
 //= require 'rails_admin/custom/ui'

app/assets/stylesheets/rails_admin/ra.horizontal-scroll-table.scss → app/assets/stylesheets/rails_admin/ra.sidescroll.scss

@@ -1,11 +1,11 @@
-.ra-horizontal-scroll-table {
+.ra-sidescroll-table {
  margin-bottom: 20px;
  overflow-x: auto;
  .table {
  margin-bottom: 0;
  }
 
- .ra-horizontal-scroll-frozen {
+ .ra-sidescroll-frozen {
  position: sticky;
  }
 
@@ -15,14 +15,14 @@
  background-color: $table-bg-default;
  }
  $table-bg-header-sort: #e2eff6 !default;
- .table .ra-horizontal-scroll-frozen {
+ .table .ra-sidescroll-frozen {
  &.headerSortUp, &.headerSortDown {
  background-color: $table-bg-header-sort;
  }
  }
 
  // border-right isn't sticky
- .ra-horizontal-scroll-frozen-last {
+ .ra-sidescroll-frozen-last {
  box-shadow: -1px 0 0 0 $table-border-color inset;
  padding-right: $table-condensed-cell-padding + 1px;
  }

app/assets/stylesheets/rails_admin/rails_admin.scss.erb

@@ -55,7 +55,7 @@
 @import "rails_admin/bootstrap-datetimepicker-build";
 @import "rails_admin/ra.filtering-multiselect";
 @import "rails_admin/ra.widgets";
-@import "rails_admin/ra.horizontal-scroll-table";
+@import "rails_admin/ra.sidescroll";
 @import "rails_admin/jquery.colorpicker";
 
 

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

@@ -71,30 +71,30 @@
  %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", horiz_scroll[:num_frozen_columns] > 0 ? "ra-horizontal-scroll-list" : nil].compact.join(' ') do
+ = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: ["form", horiz_scroll[:num_frozen_columns] > 0 ? "ra-sidescroll" : nil].compact.join(' ') do
  = hidden_field_tag :bulk_action
  - if description.present?
  %p
  %strong= description
 
- .table-wrapper{class: horiz_scroll[:enabled] && 'ra-horizontal-scroll-table'}
+ .table-wrapper{class: horiz_scroll[:enabled] && 'ra-sidescroll-table'}
  %table.table.table-condensed.table-striped
  %thead
  %tr
  - horiz_scroll_i = horiz_scroll[:num_frozen_columns]
  - if checkboxes
- %th.shrink{class: [(horiz_scroll_i -= 1) > -1 && 'ra-horizontal-scroll-frozen', horiz_scroll_i == 0 && 'ra-horizontal-scroll-frozen-last']}
+ %th.shrink{class: [(horiz_scroll_i -= 1) > -1 && 'ra-sidescroll-frozen', horiz_scroll_i == 0 && 'ra-sidescroll-frozen-last']}
  %input.toggle{type: "checkbox"}
  - if horiz_scroll[:enabled]
- %th.last.shrink{class: [(horiz_scroll_i -= 1) > -1 && 'ra-horizontal-scroll-frozen', horiz_scroll_i == 0 && 'ra-horizontal-scroll-frozen-last']}
+ %th.last.shrink{class: [(horiz_scroll_i -= 1) > -1 && 'ra-sidescroll-frozen', horiz_scroll_i == 0 && 'ra-sidescroll-frozen-last']}
  - elsif other_left
  %th.other.left.shrink= "..."
  - 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' ? "headerSortUp" : "headerSortDown" if selected)
- %th{class: [property.sortable && "header pjax", property.sortable && sort_direction, property.css_class, property.type_css_class, (horiz_scroll_i -= 1) > -1 && 'ra-horizontal-scroll-frozen', horiz_scroll_i == 0 && 'ra-horizontal-scroll-frozen-last'], :'data-href' => (property.sortable && sort_location), rel: "tooltip", title: "#{property.hint}"}= capitalize_first_letter(property.label)
+ %th{class: [property.sortable && "header pjax", property.sortable && sort_direction, property.css_class, property.type_css_class, (horiz_scroll_i -= 1) > -1 && 'ra-sidescroll-frozen', horiz_scroll_i == 0 && 'ra-sidescroll-frozen-last'], :'data-href' => (property.sortable && sort_location), rel: "tooltip", title: "#{property.hint}"}= capitalize_first_letter(property.label)
  - unless horiz_scroll[:enabled]
  - if other_right
  %th.other.right.shrink= "..."
@@ -104,17 +104,17 @@
  - horiz_scroll_i = horiz_scroll[:num_frozen_columns]
  %tr{class: "#{@abstract_model.param_key}_row #{@model_config.list.with(object: object).row_css_class}"}
  - if checkboxes
- %td{class: [(horiz_scroll_i -= 1) > -1 && 'ra-horizontal-scroll-frozen', horiz_scroll_i == 0 && 'ra-horizontal-scroll-frozen-last']}= check_box_tag "bulk_ids[]", object.id, false
+ %td{class: [(horiz_scroll_i -= 1) > -1 && 'ra-sidescroll-frozen', horiz_scroll_i == 0 && 'ra-sidescroll-frozen-last']}= check_box_tag "bulk_ids[]", object.id, false
  - td_links = capture do
- %td.last.links{class: [(horiz_scroll_i -= 1) > -1 && 'ra-horizontal-scroll-frozen', horiz_scroll_i == 0 && 'ra-horizontal-scroll-frozen-last']}
+ %td.last.links{class: [(horiz_scroll_i -= 1) > -1 && 'ra-sidescroll-frozen', horiz_scroll_i == 0 && 'ra-sidescroll-frozen-last']}
  %ul.inline.list-inline= menu_for :member, @abstract_model, object, true
  - if horiz_scroll[:enabled]
  = td_links
  - elsif @other_left_link ||= other_left && index_path(params.except('set').merge(params[:set].to_i != 1 ? {set: (params[:set].to_i - 1)} : {}))
  %td.other.left= link_to "...", @other_left_link, class: 'pjax'
  - properties.map{ |property| property.bind(:object, object) }.each do |property|
  - value = property.pretty_value
- %td{class: [property.css_class, property.type_css_class, (horiz_scroll_i -= 1) > -1 && 'ra-horizontal-scroll-frozen', horiz_scroll_i == 0 && 'ra-horizontal-scroll-frozen-last' ], title: strip_tags(value.to_s)}= value
+ %td{class: [property.css_class, property.type_css_class, (horiz_scroll_i -= 1) > -1 && 'ra-sidescroll-frozen', horiz_scroll_i == 0 && 'ra-sidescroll-frozen-last' ], title: strip_tags(value.to_s)}= value
  - unless horiz_scroll[:enabled]
  - if @other_right_link ||= other_right && index_path(params.merge(set: (params[:set].to_i + 1)))
  %td.other.right= link_to "...", @other_right_link, class: 'pjax'

lib/rails_admin/config.rb

@@ -59,8 +59,8 @@ class << self
  # Set the max width of columns in list view before a new set is created
  attr_accessor :total_columns_width
 
- # Enable horizontal-scroll table in list view, ignore total_columns_width
- attr_accessor :horizontal_scroll_list
+ # Enable horizontal-scrolling table in list view, ignore total_columns_width
+ attr_accessor :sidescroll
 
  # set parent controller
  attr_accessor :parent_controller
@@ -288,7 +288,7 @@ def reset
  @excluded_models = []
  @included_models = []
  @total_columns_width = 697
- @horizontal_scroll_list = nil
+ @sidescroll = nil
  @label_methods = [:name, :title]
  @main_app_name = proc { [Rails.application.engine_name.titleize.chomp(' Application'), 'Admin'] }
  @registry = {}

lib/rails_admin/config/sections/list.rb

@@ -40,13 +40,13 @@ class List < RailsAdmin::Config::Sections::Base
  ''
  end
 
- register_instance_option :horizontal_scroll_list do
+ register_instance_option :sidescroll do
  nil
  end
 
  def horizontal_scroll_list_calc
- global_config = RailsAdmin::Config.horizontal_scroll_list
- model_config = horizontal_scroll_list
+ global_config = RailsAdmin::Config.sidescroll
+ model_config = sidescroll
  enabled = model_config == false ? false : (!!model_config || !!global_config)
  if enabled
  num_frozen = model_config[:num_frozen_columns] if model_config.is_a?(Hash)