slash_admin 1.5.1 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a370ada076f5e75847c03295de614ad55fe75a3cc21aea02bb3643dae2112325
-  data.tar.gz: 263f0df3accd2d6d316bcde3b11c476facd7e724a1c75980ef7ca7d1f358b37f
+  metadata.gz: 75a4d10e9ae3f3459f4f84a212d4cd959af543dfe9313daa264b860f057f93ad
+  data.tar.gz: 220d6763eea19e9eea0b556b092305d7e27b1cc25d075612df92888383f225e7
 SHA512:
-  metadata.gz: d2418b0341f04bf62b210034f09ad73cee0b02e306f2b52ffe8f32327b2f4a607bbd8c356d4b5940cef4f5c3a28bd495c24cb43fe2a9c3d0162c37aec69d9573
-  data.tar.gz: c002bf47c5741ce20fbba8a3d9260708794f4e16a7fb35ca56a847650ccc496254c8fe2440737bf6522c26c8385fca45845461f4d09015a83ce78327530b571e
+  metadata.gz: 68e65e9c493da98d401df31ff689bb752d67d2d4343083473b988ae5a228dbc03969778807e3199de72eb5f5d23c55f8934771020a447b18bc33feafdd424524
+  data.tar.gz: 93556b4c7d5e7078698f1cf30cab0ed0ac8900a5f6bf0d83570244c1c45eebcc814bbeacc5e79473416096018b137ebe63c037682f1ab69b847c9fc9a6a49894

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

@@ -29,7 +29,7 @@ $border-radius: 0.15rem !default;
 
 @import "bootstrap";
 
-@import url("https://use.fontawesome.com/releases/v5.12.1/css/all.css");
+@import url("https://use.fontawesome.com/releases/v5.15.1/css/all.css");
 
 @import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700&subset=all");
 @import url("https://cdnjs.cloudflare.com/ajax/libs/simple-line-icons/2.4.1/css/simple-line-icons.css");
@@ -252,7 +252,6 @@ p[data-f-id="pbf"] {
   }
 
   .tag-boolean {
-    width: 45px;
     text-align: center;
     display: inline-block;
   }
@@ -565,6 +564,10 @@ p[data-f-id="pbf"] {
         padding-left: 8px;
       }
 
+      .dropdown .dropdown-menu a.dropdown-item {
+        color: #7f96ac;
+      }
+
       .nav-item {
         margin: 0;
         padding: 0;
@@ -760,6 +763,7 @@ p[data-f-id="pbf"] {
             > a.nav-link {
               color: $textColorHover;
               font-weight: bold;
+              background-color: $border;
             }
 
             &::after {
@@ -1236,9 +1240,12 @@ p[data-f-id="pbf"] {
   .datatable_wrapper {
     .tag {
       font-size: 13px;
-      padding: 2px 5px;
+      padding: 2px 8px;
       color: #fff;
       text-transform: uppercase;
+      a, a:hover, a:visited, a:active {
+        color: #fff;
+      }
     }
   }
 

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

@@ -19,7 +19,14 @@
         <span class="show-attr-title"><%= @model_class.human_attribute_name(a) %></span>
         <% if @model.send(a).present? %>
           <br/>
-          <img src="<%= @model.send(a) %>" class="img-fluid background-default"/>
+          <% extension = @model.send(a).file.try(:extension).try(:downcase) || @model.send(a).file.try(:format).try(:downcase) || file.try(:file).try(:extension) %>
+          <% if extension.present? %>
+            <% if %w{pdf doc docx xls xlsx ppt pptx}.include?(extension) %>
+            <iframe src="https://docs.google.com/gview?url=<%= @model.send(a) %>&embedded=true" style="width:100%; height:600px;" frameborder="0"></iframe>
+            <% else %>
+              <img src="<%= @model.send(a) %>" class="img-fluid background-default"/>
+            <% end %>
+          <% end %>
         <% end %>
       </div>
     </div>

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

@@ -1,7 +1,7 @@
 <%= 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)),
+  class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? Arel.sql("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)),
   {
     include_blank: true,
   },

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

@@ -1,7 +1,7 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
 <%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.collection_select "#{a.to_s.singularize}_ids",
-class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? "CASE WHEN id IN(#{f.object.send(a).pluck(:id).join(',')}) THEN 1 ELSE 0 END DESC" : "id DESC").limit(20), :id,
+class_name_from_association(f.object, a).constantize.all.order(f.object.send(a).present? ? Arel.sql("CASE WHEN id IN(#{f.object.send(a).pluck(:id).join(',')}) THEN 1 ELSE 0 END DESC") : "id DESC").limit(20), :id,
 object_label(class_name_from_association(f.object, a)),
 {include_blank: true},
 {

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

@@ -2,7 +2,7 @@
 <%= 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),
+                        class_name_from_association.constantize.all.order(f.object.send(a).present? ? Arel.sql("CASE WHEN id = #{f.object.send(a).try(:id)} THEN 1 ELSE 0 END DESC") : "id DESC").limit(20), :id, object_label(a),
                         {
                           include_blank: true,
                         },

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

@@ -10,8 +10,12 @@
     <div class="navbar-nav mr-auto mt-2 mt-lg-0">
     </div>
     <ul class="nav right-nav-fix">
-      <li class="nav-item">
-        <a class="nav-link">
+      <li class="nav-item <%= can?(:update, current_admin) ? 'dropdown' : '' %>">
+        <% if can?(:update, current_admin) %>
+          <a class= "nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown">
+        <% else %>
+          <a class="nav-link">
+        <% end %>
           <% if current_admin.avatar.present? %>
             <img src="<%= current_admin.avatar.url %>" class="rounded-circle"/>
           <% else %>
@@ -19,6 +23,13 @@
           <% end %>
           <span class=""><%= current_admin.login %></span>
         </a>
+        <% if can?(:update, current_admin) %>
+        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+          <a href="<%= edit_slash_admin_admin_path current_admin %>" class="dropdown-item">
+            <i class="fas fa-user-circle"></i> <%= t('slash_admin.view.edit_account') %>
+          </a>
+        </div>
+        <% end %>
       </li>
 
       <li class="nav-item">

data/config/initializers/js_routes.rb

@@ -0,0 +1,3 @@
+JsRoutes.setup do |config|
+  config.namespace = "Routes"
+end

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
         error: Impossible to create '%{model_name}'
         success: Operation successed.
     view:
+      edit_account: Edit my Account
       fill_login_and_password: "Please enter your credentials to proceed."
       administration: Administration
       home: Home

data/config/locales/fr.yml

@@ -13,6 +13,7 @@ fr:
         error: Impossible de trier '%{model_name}'
         success: Opération réussi.
     view:
+      edit_account: Modifier mon Compte
       fill_login_and_password: "Merci d'entrer votre identifiant et mot de passe."
       administration: Administration
       home: Accueil

data/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = "1.5.1"
+  VERSION = "1.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.6
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: http_accept_language
   requirement: !ruby/object:Gem::Requirement
@@ -390,6 +390,7 @@ files:
 - app/views/slash_admin/shared/_new_form_buttons.html.erb
 - app/views/slash_admin/shared/_sub_header.html.erb
 - app/views/slash_admin/shared/_tooltip.html.erb
+- config/initializers/js_routes.rb
 - config/initializers/validators.rb
 - config/locales/en.yml
 - config/locales/fr.yml
@@ -456,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A modern and overridable admin gem, just the rails way.