slash_admin 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66e9b9e6805d1fb3ec19320396a23fd20ef8b507454a5db7bdf050cecae62b8
-  data.tar.gz: dca2545beaa1f2eab78ba42d73bed449d20cc375a447e6220673f9402d87a74e
+  metadata.gz: b630d2ae3de110061ec7538dc87dad3adbcc395f1bf1e166d3e3d351e583abe1
+  data.tar.gz: 2b3745532e3152208abd1a454b6b5ad34d429a9527d1ee6f3be84b66ddb82636
 SHA512:
-  metadata.gz: c38c8045cf5f05aaddf69cecf1dd3e9b353301133ef0ff107ad420d314ebf70ed8e90e11d8fd0880264d44a9bd553f8279c4c6b372299ecd56eabebfd6b1fbe4
-  data.tar.gz: 1d653ff1d25dfcf05029ba458ba6f811e5d1ce7fca1198e2cd39df7e222bda029c83405e5c94cd7b24ee53324fbf4b34bd0b23ce5977494ef098ef3c7286f740
+  metadata.gz: 53e00bfbf7c89933d68b9c3a9bd0d08ab4279b30d577ba20f9c36a3f579af0945021b0aa4b79a078834a7ec6ee4c5a78eb9c4257eaedd3281d8390f1045ae61d
+  data.tar.gz: 7367cda7b8e2fc74cd52944c39e83574562a6f70aa26d2beac0f8caf5b0f03d6eeaf1da1b33d53b6fa26608abf9b596342f4c1db01b3101700e27256ce116b9d

data/app/assets/javascripts/slash_admin/application.js

@@ -1,5 +1,5 @@
 //= require js-routes
-//= require i18n
+//= require i18n.js
 //= require i18n/translations
 //= require jquery3
 //= require jquery_ujs
@@ -40,7 +40,7 @@ function init() {
   Pagy.init();
   $('[data-toggle="tooltip"]').tooltip();
 
-  $('.page-sidebar a[href$="#"]').on("click", function(e) {
+  $('.page-sidebar a[href$="#"]').on("click", function (e) {
     e.preventDefault();
   });
 
@@ -51,7 +51,7 @@ function init() {
 
   // Scroll to top
   var offset = 250;
-  $(window).scroll(function() {
+  $(window).scroll(function () {
     if ($(this).scrollTop() > offset) {
       $(".scroll-to-top").fadeIn("slow");
     } else {
@@ -59,22 +59,22 @@ function init() {
     }
   });
 
-  $(".scroll-to-top").click(function(event) {
-    $("html, body").animate({ scrollTop: 0 }, 300);
+  $(".scroll-to-top").click(function (event) {
+    $("html, body").animate({scrollTop: 0}, 300);
   });
 
   // Automatic hide alert
-  window.setTimeout(function() {
+  window.setTimeout(function () {
     $(".alert")
       .fadeTo(500, 0)
-      .slideUp(500, function() {
+      .slideUp(500, function () {
         $(this).remove();
       });
   }, 1500);
 
   // clearForm
-  $.fn.clearForm = function() {
-    return this.each(function() {
+  $.fn.clearForm = function () {
+    return this.each(function () {
       var type = this.type,
         tag = this.tagName.toLowerCase();
       if (tag === "form") return $(":input", this).clearForm();
@@ -86,20 +86,20 @@ function init() {
   };
 
   // CounterUp plugin
-  $("[data-counter='counterup']").each(function() {
+  $("[data-counter='counterup']").each(function () {
     var $this = $(this),
       countTo = $this.attr("data-value");
-    $({ countNum: $this.text() }).animate(
+    $({countNum: $this.text()}).animate(
       {
         countNum: countTo
       },
       {
         duration: 1500,
         easing: "linear",
-        step: function() {
+        step: function () {
           $this.text(Math.floor(this.countNum));
         },
-        complete: function() {
+        complete: function () {
           $this.text(this.countNum);
         }
       }
@@ -113,9 +113,9 @@ function init() {
     .addClass("active");
 
   // BULK ACTIONS
-  $(".toggle-all").on("change", function() {
+  $(".toggle-all").on("change", function () {
     var checked = this.checked;
-    $('.table-data-list tbody input[type="checkbox"]').each(function(
+    $('.table-data-list tbody input[type="checkbox"]').each(function (
       index,
       item
     ) {
@@ -123,14 +123,14 @@ function init() {
     });
   });
 
-  $('.table-data-list input[type="checkbox"]').on("change", function() {
+  $('.table-data-list input[type="checkbox"]').on("change", function () {
     var length = $('.table-data-list tbody input[type="checkbox"]:checked')
       .length;
     $(".batch-current-selected").html(length);
   });
 
   // Delete button protection sweetalert
-  $(".single-delete").on("click", function(e) {
+  $(".single-delete").on("click", function (e) {
     e.preventDefault();
     var target = $(this).attr("href");
     var current = window.location.href;
@@ -148,11 +148,11 @@ function init() {
         closeOnConfirm: false,
         showLoaderOnConfirm: true
       },
-      function() {
+      function () {
         $.ajax({
           url: target,
           method: "DELETE"
-        }).done(function() {
+        }).done(function () {
           window.location.href = current;
         });
       }
@@ -160,14 +160,14 @@ function init() {
   });
 
   // Batch action
-  $(".batch-action").on("click", function(e) {
+  $(".batch-action").on("click", function (e) {
     e.preventDefault();
     var target = $(this).data("action");
     var message = $(this).data("message");
     var current = window.location.href;
     var ids = [];
 
-    $('.table-data-list tbody input[type="checkbox"]:checked').each(function(
+    $('.table-data-list tbody input[type="checkbox"]:checked').each(function (
       index,
       checkbox
     ) {
@@ -188,14 +188,14 @@ function init() {
           closeOnConfirm: false,
           showLoaderOnConfirm: true
         },
-        function() {
+        function () {
           $.ajax({
             url: target,
             method: "post",
             data: {
               ids: ids
             }
-          }).done(function() {
+          }).done(function () {
             window.location.href = current;
           });
         }
@@ -203,29 +203,68 @@ function init() {
     }
   });
 
-  $(".select2-single, .select2-multiple").select2({});
-
-  $(".select2-model-multiple, .select2-model-single").select2({
-    ajax: {
-      url: Routes.slash_admin_remote_select_path({
-        format: "json"
-      }),
-      dataType: "json",
-      data: function (params) {
-        var model = $(this).attr("data-model");
-        var fields = $(this).attr("data-fields");
-        return {
-          model_class: model,
-          q: params.term,
-          fields: fields.split(" "),
-        };
-      },
-      processResults: function (data) {
-        return {
-          results: data
-        };
+
+  $(".select2-single, .select2-multiple").each (function() {
+    let initialPlaceholder = $(this).attr('placeholder');
+    $(this).select2({
+      placeholder: initialPlaceholder,
+      allowClear: true,
+      theme: 'bootstrap4',
+      debug: true,
+    }).on("select2:unselecting", function (e) {
+      $(this).data('state', 'unselected');
+    }).on("select2:open", function (e) {
+      if ($(this).data('state') === 'unselected') {
+        $(this).removeData('state');
+
+        var self = $(this);
+        setTimeout(function () {
+          self.select2('close');
+        }, 1);
       }
-    }
+    });
+  });
+
+  $(".select2-model-multiple, .select2-model-single").each(function() {
+    let initialPlaceholder = $(this).attr('data-placeholder') || I18n.t('slash_admin.view.select');
+
+    $(this).select2({
+      placeholder: initialPlaceholder,
+      allowClear: true,
+      theme: 'bootstrap4',
+      debug: true,
+      ajax: {
+        url: Routes.slash_admin_remote_select_path({
+          format: "json"
+        }),
+        dataType: "json",
+        data: function (params) {
+          var model = $(this).attr("data-model");
+          var fields = $(this).attr("data-fields");
+          return {
+            model_class: model,
+            q: params.term,
+            fields: fields.split(" "),
+          };
+        },
+        processResults: function (data) {
+          return {
+            results: data
+          };
+        }
+      }
+    }).on("select2:unselecting", function (e) {
+      $(this).data('state', 'unselected');
+    }).on("select2:open", function (e) {
+      if ($(this).data('state') === 'unselected') {
+        $(this).removeData('state');
+
+        var self = $(this);
+        setTimeout(function () {
+          self.select2('close');
+        }, 1);
+      }
+    });
   });
 
   $(".bootstrap-datepicker").datepicker({
@@ -254,7 +293,7 @@ function init() {
 
   $(".colorpicker").minicolors();
 
-  $("#reset-filters").on("click", function(e) {
+  $("#reset-filters").on("click", function (e) {
     e.preventDefault();
 
     $("input[name*='filters']").val("");
@@ -266,10 +305,10 @@ function init() {
 
   // Handle create belongs to
   $("#create-belongs-to-form")
-    .on("ajax:success", function(e, data, status, xhr) {
+    .on("ajax:success", function (e, data, status, xhr) {
       $("#create-belongs-to-form").text("Done.");
     })
-    .on("ajax:error", function(e, xhr, status, error) {
+    .on("ajax:error", function (e, xhr, status, error) {
       $("#create-belongs-to-form").text("Failed.");
     });
 }

data/app/assets/stylesheets/slash_admin/application.scss

@@ -15,6 +15,7 @@
  *= require jquery.nestable
  *= require sweetalert
  *= require select2.min
+ *= require select2-bootstrap4
  *= require bootstrap-datepicker.min
  *= require bootstrap-material-datetimepicker
  *= require jquery.tagsinput-revisited.min
@@ -148,42 +149,70 @@ p[data-f-id="pbf"] {
     padding: 8px 10px;
   }
 
-  .select2-results__option[aria-disabled="true"] {
-    background: $textColorHover !important;
+  .input-group-text {
+    background: $input;
+    border-color: $border;
+  }
+
+  .select2-container--bootstrap4 .select2-results__option--highlighted,
+  .select2-container--bootstrap4 .select2-results__option--highlighted.select2-results__option[aria-selected=true] {
+    background-color: $primary;
+    color: white;
+  }
+
+  .select2-container--bootstrap4 .select2-selection__clear {
+    background: $primary;
+    margin-left: 0.5rem;
+
+    &:hover {
+      background: $secondary;
+    }
   }
 
   .select2-container {
     width: 100% !important;
   }
 
+  .select2-dropdown {
+    border-color: $border;
+    background: $input;
+  }
+
+  .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    word-break: break-all;
+    background: white;
+  }
+
   .select2-container .select2-results__option--highlighted,
-  .select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true] {
+  .select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true],
+  .select2-container--bootstrap4 .select2-dropdown .select2-results__option[aria-selected=true] {
     background-color: $primary;
     color: white;
   }
 
-  .select2-container--default.select2-container--focus .select2-selection--multiple,
-  .select2-container--default.select2-container--focus .select2-selection--single {
+  .select2-container--bootstrap4.select2-container--focus .select2-selection--multiple,
+  .select2-container--bootstrap4.select2-container--focus .select2-selection--single {
     border: 1px solid $border;
+    background: $input;
   }
 
-  .select2-container--default .select2-selection--multiple,
-  .select2-container--default .select2-selection--single {
+  .select2-container--bootstrap4 .select2-selection--multiple,
+  .select2-container--bootstrap4 .select2-selection--single {
     border: 1px solid $border;
+    background: $input;
+  }
+
+  .select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(1.25rem + 2px) !important;
     border-radius: 0;
-    height: calc(1.5em + 0.75rem + 2px);
-    padding: 0.375rem 0.75rem;
   }
 
-  .select2-container--default .select2-selection--single .select2-selection__rendered,
-  .select2-container--default .select2-selection--multiple .select2-selection__rendered, {
-    padding: 0;
-    line-height: 21px;
+  .select2-container .select2-search--inline .select2-search__field {
+    background: none;
   }
 
-  .select2-container--default .select2-selection--single .select2-selection__arrow,
-  .select2-container--default .select2-selection--single .select2-selection__arrow {
-    height: 32px;
+  .select2-container--bootstrap4 .select2-search--dropdown .select2-search__field {
+    border-color: $border;
   }
 
   .nested-fields {
@@ -315,6 +344,7 @@ p[data-f-id="pbf"] {
   .form-control {
     transition: all ease 0.6s;
     border: 1px solid $border;
+    background: $input;
 
     &:focus {
       border-color: $primary;
@@ -839,7 +869,7 @@ p[data-f-id="pbf"] {
             display: none;
             padding: 9px 15px;
 
-            tr {
+            tr, a {
               color: $textColor;
               transition: all .6s ease;
               cursor: pointer;
@@ -1055,20 +1085,10 @@ p[data-f-id="pbf"] {
         margin-top: 0.5rem;
       }
 
-      .select2-container--default .select2-selection--multiple,
-      .select2-container--default .select2-selection--single {
-        height: initial;
-        padding: 0 4px;
-      }
-
-      .select2-container--default .select2-selection--single .select2-selection__arrow,
-      .select2-container--default .select2-selection--single .select2-selection__arrow {
-        height: initial;
-      }
-
-      .select2-container--default .select2-selection--single .select2-selection__arrow,
-      .select2-container--default .select2-selection--single .select2-selection__arrow {
-        height: initial;
+      .select2-container--bootstrap4 .select2-selection--single .select2-selection__choice,
+      .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+        display: flex;
+        clear: both;
       }
 
       .form-control {

data/app/assets/stylesheets/slash_admin/colors.scss

@@ -17,4 +17,5 @@ $sidebar: #fefefe;
 $textColor: #afaec3;
 $textColorHover: #15152d;
 
-$border: rgba($textColor, .4);
+$input: #f9faff;
+$border: #e3e9fc;

data/app/views/slash_admin/base/_filters.html.erb

@@ -37,7 +37,7 @@
         <% elsif @belongs_to_fields.include?(attr) || @has_one_fields.include?(attr) %>
             <% if "SlashAdmin::Models::#{attr.to_s.classify.pluralize}Controller".constantize.new.autocomplete_params.present? %>
             <td>
-              <select name="filters[<%= attr %>][]" class="select2-model-multiple form-control-sm" multiple data-model="<%= attr.to_s.classify.constantize.model_name.to_s.underscore %>" data-fields='<%= "SlashAdmin::Models::#{attr.to_s.classify.pluralize}Controller".constantize.new.autocomplete_params.join(' ') %>' placeholder="<%= t('slash_admin.view.select_model', model_name: attr.to_s.classify.constantize.model_name.human.downcase) %>">
+              <select name="filters[<%= attr %>][]" class="select2-model-multiple form-control-sm" multiple data-model="<%= attr.to_s.classify.constantize.model_name.to_s.underscore %>" data-fields='<%= "SlashAdmin::Models::#{attr.to_s.classify.pluralize}Controller".constantize.new.autocomplete_params.join(' ') %>' data-placeholder="<%= t('slash_admin.view.select_model', model_name: attr.to_s.classify.constantize.model_name.human.downcase) %>">
                 <% if params[:filters].present? && params[:filters][attr].present? %>
                   <% params[:filters][attr].each do |value| %>
                     <option value="<%= value %>" selected><%= attr.to_s.classify.constantize.find(value).name %></option>

data/app/views/slash_admin/fields/_belongs_to.html.erb

@@ -1,10 +1,9 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a).present? ? 'required' : ''}" %>
 <%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.collection_select a.to_s + '_id',
-class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? "CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC" : "id DESC").limit(20), :id, object_label(class_name_from_association(f.object, a)),
-{
-  prompt: t('slash_admin.view.select_model', model_name: class_name_from_association(f.object, a).constantize.model_name.human.downcase),
-},
-'data-model': class_name_from_association(f.object, a).constantize.model_name.to_s.underscore,
-'data-fields': "SlashAdmin::Models::#{class_name_from_association(f.object, a).classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
-class: 'form-control select2-model-single', required: required?(f.object, a).present? %>
+                        class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? "CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC" : "id DESC").limit(20), :id, object_label(class_name_from_association(f.object, a)),
+                        {},
+                        'data-placeholder': t('slash_admin.view.select_model', model_name: class_name_from_association(f.object, a).constantize.model_name.human.downcase),
+                        'data-model': class_name_from_association(f.object, a).constantize.model_name.to_s.underscore,
+                        'data-fields': "SlashAdmin::Models::#{class_name_from_association(f.object, a).classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
+                        class: 'form-control select2-model-single', required: required?(f.object, a).present? %>

data/app/views/slash_admin/fields/_has_one.html.erb

@@ -1,10 +1,9 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a).present? ? 'required' : ''}" %>
 <%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.select a.to_s,
-class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? "CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC" : "id DESC").limit(20).collect { |assoc| [assoc.send(object_label(class_name_from_association(f.object, a))), assoc.id] },
-{
-  prompt: t('slash_admin.view.select_model', model_name: class_name_from_association(f.object, a).constantize.model_name.human.downcase),
-},
-'data-model': class_name_from_association(f.object, a).constantize.model_name.to_s.underscore,
-'data-fields': "SlashAdmin::Models::#{class_name_from_association(f.object, a).classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
-class: 'form-control select2-model-single', required: required?(f.object, a).present? %>
+             class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? "CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC" : "id DESC").limit(20).collect { |assoc| [assoc.send(object_label(class_name_from_association(f.object, a))), assoc.id] },
+             {},
+             'data-placeholder': t('slash_admin.view.select_model', model_name: class_name_from_association(f.object, a).constantize.model_name.human.downcase),
+             'data-model': class_name_from_association(f.object, a).constantize.model_name.to_s.underscore,
+             'data-fields': "SlashAdmin::Models::#{class_name_from_association(f.object, a).classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
+             class: 'form-control select2-model-single', required: required?(f.object, a).present? %>

data/app/views/slash_admin/fields/_nested_belongs_to.html.erb

@@ -2,19 +2,18 @@
 <%= render 'slash_admin/shared/tooltip', a: a %>
 <% class_name_from_association = class_name_from_association(f.object, a) %>
 <%= f.collection_select a.to_s + '_id',
-class_name_from_association.constantize.all.order(f.object.send(a).present? ? "CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC" : "id DESC").limit(20), :id, object_label(a),
-{
-  prompt: t('slash_admin.view.select_model', model_name: class_name_from_association.constantize.model_name.human.downcase),
-},
-'data-model': class_name_from_association.constantize.model_name.to_s.underscore,
-'data-fields': "SlashAdmin::Models::#{a.to_s.classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
-class: "form-control select2-model-single #{a.to_s}_id", required: required?(f.object, a).present? %>
+                        class_name_from_association.constantize.all.order(f.object.send(a).present? ? "CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC" : "id DESC").limit(20), :id, object_label(a),
+                        {},
+                        'data-placeholder': t('slash_admin.view.select_model', model_name: class_name_from_association.constantize.model_name.human.downcase),
+                        'data-model': class_name_from_association.constantize.model_name.to_s.underscore,
+                        'data-fields': "SlashAdmin::Models::#{a.to_s.classify.pluralize}Controller".constantize.new.autocomplete_params.join(' '),
+                        class: "form-control select2-model-single #{a.to_s}_id", required: required?(f.object, a).present? %>
 
 <a href="#" class="add-belongs-to" style="font-size: .9em;"><%= t('slash_admin.view.add', model_name: class_name_from_association.constantize.model_name.human.downcase) %></a>
 
 <script type="text/javascript">
-  $(function() {
-    $('.add-belongs-to').on('click', function(e) {
+  $(function () {
+    $('.add-belongs-to').on('click', function (e) {
       e.preventDefault();
       $('.modal-belongs-to').html();
       $('.modal-belongs-to').html("<%= escape_javascript(render 'slash_admin/base/data_belongs_to', f: f, a: a) %>");
@@ -29,29 +28,29 @@ class: "form-control select2-model-single #{a.to_s}_id", required: required?(f.o
       }
 
       $(id)
-      .on('ajax:complete', function(xhr, status) {
-        // console.log(status);
-      })
-      .on('ajax:error', function(xhr, status, err) {
-        console.log(status);
-        console.log(err);
-      })
-      .on("ajax:success", function(xhr, data, status) {
-        if (data.errors) {
-          var errors_html = "";
-          data.errors.map(function(item, index) {
-            errors_html += item + '<br  />';
-          });
-          $('.errors-json').html(errors_html)
-        } else {
-          toastr.success("<%= t('slash_admin.view.create_success', model_name: class_name_from_association(f.object, a).constantize.model_name.human) %>");
-          $(id).trigger("reset");
-          closeModals();
-          var select = $('.<%= a.to_s + '_id' %>')[0];
-          var newOption = new Option(data.name, data.id, false, true);
-          select.prepend(newOption).trigger('change');
-        }
-      });
+        .on('ajax:complete', function (xhr, status) {
+          // console.log(status);
+        })
+        .on('ajax:error', function (xhr, status, err) {
+          console.log(status);
+          console.log(err);
+        })
+        .on("ajax:success", function (xhr, data, status) {
+          if (data.errors) {
+            var errors_html = "";
+            data.errors.map(function (item, index) {
+              errors_html += item + '<br  />';
+            });
+            $('.errors-json').html(errors_html)
+          } else {
+            toastr.success("<%= t('slash_admin.view.create_success', model_name: class_name_from_association(f.object, a).constantize.model_name.human) %>");
+            $(id).trigger("reset");
+            closeModals();
+            var select = $('.<%= a.to_s + '_id' %>')[0];
+            var newOption = new Option(data.name, data.id, false, true);
+            select.prepend(newOption).trigger('change');
+          }
+        });
     });
   });
 </script>

data/app/views/slash_admin/shared/_breadcrumb.html.erb

@@ -19,11 +19,11 @@
         </li>
       <% end %>
       <% if params[:action] == 'new' %>
-        <li class="breadcrumb-item"><%= t('relax_admin.view.new', model_name: @model_class.model_name.human.pluralize.capitalize) %></li>
+        <li class="breadcrumb-item"><%= t('slash_admin.view.new', model_name: @model_class.model_name.human.pluralize.capitalize) %></li>
       <% elsif params[:action] == 'edit' %>
-        <li class="breadcrumb-item"><%= t('relax_admin.view.edit', model_name: @model_class.model_name.human.pluralize.capitalize) %></li>
+        <li class="breadcrumb-item"><%= t('slash_admin.view.edit', model_name: @model_class.model_name.human.pluralize.capitalize) %></li>
       <% elsif params[:action] == 'show' %>
-        <li class="breadcrumb-item"><%= t('relax_admin.view.show', model_name: @model_class.model_name.human.pluralize.capitalize) %></li>
+        <li class="breadcrumb-item"><%= t('slash_admin.view.show', model_name: @model_class.model_name.human.pluralize.capitalize) %></li>
       <% end %>
     </ol>
   </nav>

data/app/views/slash_admin/shared/_menu.html.erb

@@ -28,12 +28,16 @@
                         data-href="<%= sub[:path] %>"
                         data-blank="<%= s[:blank].present? ? 'true' : 'false' %>">
                       <td>
-                        <% if sub[:icon] %>
-                          <i class="<%= sub[:icon] %>"></i>
-                        <% end %>
+                        <a href="<%= sub[:path] %>" class="<%= request.fullpath == sub[:path] ? 'active' : '' %>" target="<%= s[:blank].present? ? '_blank' : '_self' %>">
+                          <% if sub[:icon] %>
+                            <i class="<%= sub[:icon] %>"></i>
+                          <% end %>
+                        </a>
                       </td>
                       <td>
-                        <span class="title"><%= sub[:title] %></span>
+                        <a href="<%= sub[:path] %>" class="<%= request.fullpath == sub[:path] ? 'active' : '' %>" target="<%= s[:blank].present? ? '_blank' : '_self' %>">
+                          <span class="title"><%= sub[:title] %></span>
+                        </a>
                       </td>
                     </tr>
                   <% else %>
@@ -42,12 +46,16 @@
                           data-href="<%= polymorphic_url([:slash_admin, sub[:model]]) %>"
                           data-blank="<%= s[:blank].present? ? 'true' : 'false' %>">
                         <td>
+                          <a class="<%= controller.controller_name == sub[:model].name.split('::').last.tableize ? 'active' : '' %>" href="<%= polymorphic_url([:slash_admin, sub[:model]]) %>" target="<%= s[:blank].present? ? '_blank' : '_self' %>">
                           <% if sub[:icon] %>
                             <i class="<%= sub[:icon] %>"></i>
                           <% end %>
+                          </a>
                         </td>
                         <td>
-                          <span class="title"><%= sub[:model].model_name.human(count: 2) %></span>
+                          <a class="<%= controller.controller_name == sub[:model].name.split('::').last.tableize ? 'active' : '' %>" href="<%= polymorphic_url([:slash_admin, sub[:model]]) %>" target="<%= s[:blank].present? ? 'true' : '_self' %>">
+                            <span class="title"><%= sub[:model].model_name.human(count: 2) %></span>
+                          </a>
                         </td>
                       </tr>
                     <% end %>

data/config/locales/en.yml

@@ -48,6 +48,7 @@ en:
       filter: Filter
       reset: Reset
       select_model: "Select a %{model_name}"
+      select: "Select..."
       list: "%{model_name} list"
       return_to_list: Return to list
       no_image: No image

data/config/locales/fr.yml

@@ -50,6 +50,7 @@ fr:
       filter: Filtrer
       reset: Réinit.
       select_model: "Sélectionner un(e) %{model_name}"
+      select: "Sélectionner..."
       list: "Liste des %{model_name}"
       return_to_list: Retour à la liste
       no_image: Aucune Image

data/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/vendor/assets/stylesheets/select2-bootstrap4.css

@@ -0,0 +1,163 @@
+.select2-container--bootstrap4 .select2-selection--single {
+  height: calc(2.25rem + 2px) !important; }
+  .select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder {
+    color: #757575;
+    line-height: 2.25rem; }
+  .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow {
+    position: absolute;
+    top: 50%;
+    right: 3px;
+    width: 20px; }
+    .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+      top: 60%;
+      border-color: #343a40 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      width: 0;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute; }
+  .select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered {
+    line-height: 2.25rem; }
+
+.select2-search--dropdown .select2-search__field {
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem; }
+
+.select2-results__message {
+  color: #6c757d; }
+
+.select2-container--bootstrap4 .select2-selection--multiple {
+  min-height: calc(2.25rem + 2px) !important; }
+  .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered {
+    -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+    list-style: none;
+    margin: 0;
+    padding: 0 5px;
+    width: 100%; }
+  .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    color: #343a40;
+    border: 1px solid #bdc6d0;
+    border-radius: 0.2rem;
+    padding: 0;
+    padding-right: 5px;
+    cursor: pointer;
+    float: left;
+    margin-top: 0.3em;
+    margin-right: 5px; }
+  .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove {
+    color: #bdc6d0;
+    font-weight: bold;
+    margin-left: 3px;
+    margin-right: 1px;
+    padding-right: 3px;
+    padding-left: 3px;
+    float: left; }
+    .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #343a40; }
+
+.select2-container {
+  display: block; }
+  .select2-container *:focus {
+    outline: 0; }
+
+.input-group .select2-container--bootstrap4 {
+  -webkit-box-flex: 1;
+      -ms-flex-positive: 1;
+          flex-grow: 1; }
+
+.input-group-prepend ~ .select2-container--bootstrap4 .select2-selection {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0; }
+
+.input-group > .select2-container--bootstrap4:not(:last-child) .select2-selection {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--bootstrap4 .select2-selection {
+  background-color: #fff;
+  border: 1px solid #ced4da;
+  border-radius: 0.25rem;
+  -webkit-transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+  transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;
+  width: 100%; }
+  @media screen and (prefers-reduced-motion: reduce) {
+    .select2-container--bootstrap4 .select2-selection {
+      -webkit-transition: none;
+      transition: none; } }
+
+.select2-container--bootstrap4.select2-container--focus .select2-selection {
+  border-color: #80bdff;
+  -webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+          box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); }
+
+.select2-container--bootstrap4.select2-container--focus.select2-container--open .select2-selection {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection, .select2-container--bootstrap4.select2-container--disabled.select2-container--focus .select2-selection {
+  background-color: #e9ecef;
+  cursor: not-allowed;
+  border-color: #ced4da;
+  -webkit-box-shadow: none;
+          box-shadow: none; }
+
+.select2-container--bootstrap4.select2-container--disabled .select2-search__field, .select2-container--bootstrap4.select2-container--disabled.select2-container--focus .select2-search__field {
+  background-color: transparent; }
+
+select.is-invalid ~ .select2-container--bootstrap4 .select2-selection,
+form.was-validated select:invalid ~ .select2-container--bootstrap4 .select2-selection {
+  border-color: #dc3545; }
+
+select.is-valid ~ .select2-container--bootstrap4 .select2-selection,
+form.was-validated select:valid ~ .select2-container--bootstrap4 .select2-selection {
+  border-color: #28a745; }
+
+.select2-container--bootstrap4 .select2-dropdown {
+  border-color: #ced4da;
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+  .select2-container--bootstrap4 .select2-dropdown.select2-dropdown--above {
+    border-top: 1px solid #ced4da;
+    border-top-left-radius: 0.25rem;
+    border-top-right-radius: 0.25rem; }
+  .select2-container--bootstrap4 .select2-dropdown .select2-results__option[aria-selected=true] {
+    background-color: #e9ecef; }
+
+.select2-container--bootstrap4 .select2-results__option--highlighted,
+.select2-container--bootstrap4 .select2-results__option--highlighted.select2-results__option[aria-selected=true] {
+  background-color: #007bff;
+  color: #f8f9fa; }
+
+.select2-container--bootstrap4 .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--bootstrap4 .select2-results > .select2-results__options {
+  max-height: 15em;
+  overflow-y: auto; }
+
+.select2-container--bootstrap4 .select2-results__group {
+  padding: 6px;
+  display: list-item;
+  color: #6c757d; }
+
+.select2-container--bootstrap4 .select2-selection__clear {
+  width: 1.2em;
+  height: 1.2em;
+  line-height: 1.15em;
+  padding-left: 0.3em;
+  margin-top: 0.5em;
+  border-radius: 100%;
+  background-color: #6c757d;
+  color: #f8f9fa;
+  float: right;
+  margin-right: 0.3em; }
+  .select2-container--bootstrap4 .select2-selection__clear:hover {
+    background-color: #343a40; }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -430,6 +430,7 @@ files:
 - vendor/assets/stylesheets/codemirror/theme/relax-seti.css
 - vendor/assets/stylesheets/jquery.nestable.css
 - vendor/assets/stylesheets/jquery.tagsinput-revisited.min.css
+- vendor/assets/stylesheets/select2-bootstrap4.css
 - vendor/assets/stylesheets/select2.min.css
 - vendor/assets/stylesheets/sweetalert.css
 - vendor/assets/stylesheets/toastr.css