slash_admin 1.4.1 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11e65af2390efad19838b6a296c332d2390f7db2cc19d5e7fb3b194a20764e02
-  data.tar.gz: 6b8d9aeb8534270f7edf23f56a13d8284ed791d3fc08a85a5577adada253e075
+  metadata.gz: 784dbf2f3663366f6eb5c600b4590b3bba191ab63a9b6b71ca1de792abd81650
+  data.tar.gz: '00828e7a32a7f64f0366c7a9a1ab9d2694417a1be14b63e2a06cf099f8d8e2df'
 SHA512:
-  metadata.gz: 3198056fa8a35ae1d9e0005d86b44ef6e382675b63073deeb7974862a73b100cdeadef0ab6cd0f8f7ccf150c11ea0a38e95a42c149f41626393ba318144f33cf
-  data.tar.gz: e7e82ddba2244e1ca4c65d6f39cf8627793182bf36b709adae59f7b385364eeeeed4bee13d1fe2dade6b0edb295bdc1c03181921bae6c6449df84d42bc2da1f7
+  metadata.gz: 6046a425354193760cb8647efd5e2247f07ca2478d961168d43509b6e8323345c61ab04f5a52e238301a1c5ac6895de36dbb7f3e89ebff4f396607d4faa37114
+  data.tar.gz: dc3140cc8e14d89d478b258e68819626aed20065f3180affd5c94f9b1132ab2503e9904635e78ed0dfd2b5a947dc044716603041da97f3720bd8640242f2c1cc

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/fields/_belongs_to.html.erb

@@ -1,11 +1,16 @@
 <%= 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)),
-                        {
-                          include_blank: true,
-                        },
-                        '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? %>
+  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)),
+  {
+    include_blank: true,
+  },
+  {
+    '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?,
+    selected: f.object.send(a).present? ? f.object.send(a).try(:id) : nil,
+  }
+%>

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

@@ -1,11 +1,13 @@
 <%= 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] },
-             {
-               include_blank: true,
-             },
-             '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? %>
+  options_for_select(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] }, f.object.send(a).present? ? f.object.send(a).try(:id) : nil),
+  {
+   include_blank: true,
+  },
+  '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/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/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.4.1"
+  VERSION = "1.5.4"
 end

metadata

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