slash_admin 1.5 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66c021626154a42a86fbd5227ac9e5af5ae42bb8a908c0a0a3683dd6d7cb6f47
-  data.tar.gz: 8f8df399ea649c9d498221eac54d5216970d826d4626e6c6d96d3c01af37279f
+  metadata.gz: e05ff7dc688e9ce000ccc9b495ef50d15f426c793cc269e12a694f37cb3ee703
+  data.tar.gz: 97854cf7acee2e53de6edbc6aea3515d738c74d87073d83668b2a529cf221b88
 SHA512:
-  metadata.gz: 3a38afabe3fa6ebbf1178dea5f832a162d591ca9060202ed58d0c77dab48466ecffe666d4d8c130b61bf9421af862b89b50005ff6e710acc4038edd5816d66d6
-  data.tar.gz: 16cd83d5a57c4cfcc62b5d1a4e91993c2dba2fdffb3e1ea0d73f7dfe6f414a5f1108a332afaabd9ebe3d49ffb80f6a9a7553ca96e34aa4ca50187afe893fc5c1
+  metadata.gz: 5ccb114e9576d12d79fcf1e5ccbc35813046aec881098dc8aa796960715a37a4e0c3d1bc583c733484661ccc2f4650d1b6c0f94a42a8be06e1edcd3c62ebbe69
+  data.tar.gz: ddadcfcc2fae1e85525e34a338c6a93e4a169517ff4d5b9e0e6f76f5acf8d387d6a3f67a41681d1a8f944ffde55937f0322783330f8aea49b90fa8a74933b6a0

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;
   }
@@ -480,11 +479,9 @@ p[data-f-id="pbf"] {
 
   .badge {
     font-size: 11px;
-    font-weight: 300;
     height: 18px;
     color: #fff;
     padding: 3px 6px;
-    border-radius: 12px;
     text-shadow: none;
     text-align: center;
     vertical-align: middle;
@@ -567,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;
@@ -762,6 +763,7 @@ p[data-f-id="pbf"] {
             > a.nav-link {
               color: $textColorHover;
               font-weight: bold;
+              background-color: $border;
             }
 
             &::after {
@@ -1238,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/base/_filters.html.erb

@@ -60,6 +60,13 @@
             <% else %>
               <td>&nbsp;</td>
             <% end %>
+        <% elsif attr.is_a?(Hash) && attr[:filter].present? %>
+            <td>
+              <% case attr[:filter] %>
+              <% when :text, :string %>
+                <input type="text" name="filters[<%= attr.keys.first %>]" value="<%= params[:filters][attr.keys.first] rescue nil %>" class="form-control form-control-sm"/>
+              <% end %>
+            </td>
         <% else %>
           <td>&nbsp;</td>
         <% end %>

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"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: 1.5.5
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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.