slash_admin 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1f27f49b9b55f98ce8af943d5c3c9c0a682810da3f9439339215fcbe74f1d0
-  data.tar.gz: 7a81000b24701b380fb4c9cdcccb8d74635ac8b5af99e6fe06b5cc8edba64d46
+  metadata.gz: c5a4c285955a883a0704418cb27fa2837ef8a8fb58745413160846338142e621
+  data.tar.gz: 3ecc92ebafdf31d9fdea0c21f45c7d781e99a7f45cc31955a244870704300f5a
 SHA512:
-  metadata.gz: 648584d064c58d2ba54c656c249ff10f4f4c486e3fd075d69e1c3d022e7a34a1671a4ae21623fffbc9e5e78db021d4a65fd474110ce267c261c2554846e1c6b4
-  data.tar.gz: 7ab8584258a1d35fb28c6283cc11d04015c3373a5e107ddef223d615f2e0f683452f25580b2d259cfd8acfa2374c433fd8a828346c041c55bd41d1db53d88c8c
+  metadata.gz: bb4285ecb2759b358dfe285a67e3a58e9ff6558a32899a49975dfe6fb6083fc12105f59666a4c457dbcc9a1268eac6c79f7450ffa97e7ed93c211fc316ecffc9
+  data.tar.gz: d7ebaf4596b6d463e49c7c4abbad3c59ccb533f95d045b26a229f31424b2cc068ebaa87ec7ba1cfce7a541dc47263256ad11a962094137b0dabc7dac7b62ca05

data/app/controllers/slash_admin/models_controller.rb

@@ -145,7 +145,7 @@ module SlashAdmin
     def after_save_on_update
     end
 
-    # Add tooltip to th list view
+    # Add tooltip to th list view & edit/create view
     # {
     #   attr: 'Value',
     #   title: 'The title of my model',

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

@@ -48,7 +48,7 @@
               <%= @model_class.human_attribute_name(attr) %>
               <% if tooltips.key? attr %>
                 <a href="#" data-toggle="tooltip" data-placement="top" title="<%= tooltips[attr] %>"><i class="fas fa-question-circle"></i></a>
-            <% end %>
+              <% end %>
             </th>
           <% end %>
         <% end %>

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

@@ -6,7 +6,6 @@
   <%= render 'slash_admin/shared/errors_data_new' %>
 
   <% params.each do |a| %>
-    <%# <strong><%= @model_class.type_for_attribute(a).type.to_s </strong> %>
     <%= render 'slash_admin/fields/form_group', f: f, a: a %>
   <% end %>
 

data/app/views/slash_admin/custom_fields/_color.html.erb

@@ -1,2 +1,3 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.text_field a.keys.first, class: 'form-control colorpicker', required: required?(f.object, a) %>

data/app/views/slash_admin/custom_fields/_email.html.erb

@@ -1,2 +1,3 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.email_field a.keys.first, class: 'form-control', required: required?(f.object, a) %>

data/app/views/slash_admin/custom_fields/_google_map.html.erb

@@ -1,4 +1,6 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a).present? ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
+
 <input type="text" class="form-control" id="<%= f.options[:html][:id] %>_search" />
 <script async defer
   src="https://maps.googleapis.com/maps/api/js?key=<%= a[a.keys.first.to_sym][:google_api_key] %>&libraries=places&callback=initMap&language=<%= I18n.locale %>">

data/app/views/slash_admin/custom_fields/_password.html.erb

@@ -1,2 +1,3 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.password_field a.keys.first, class: 'form-control', required: required?(f.object, a) %>

data/app/views/slash_admin/custom_fields/_select.html.erb

@@ -1,4 +1,5 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <% if a[a.keys.first][:multiple].present? && a[a.keys.first][:multiple] == true %>
   <%= f.select(a.keys.first, a[a.keys.first][:choices], { include_blank: a[a.keys.first][:include_blank], required: required?(f.object, a) }, class: 'selectize-multiple', multiple: true) %>
 <% else %>

data/app/views/slash_admin/custom_fields/_tags.html.erb

@@ -1,2 +1,3 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.text_field a.keys.first, class: 'form-control tagsinput tags', required: required?(f.object, a) %>

data/app/views/slash_admin/custom_fields/_timezone.html.erb

@@ -1,2 +1,3 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.select(a.keys.first, ActiveSupport::TimeZone::MAPPING.values, { include_blank: true, required: required?(f.object, a) }, class: 'selectize-single') %>

data/app/views/slash_admin/custom_fields/_wysiwyg.html.erb

@@ -1,2 +1,3 @@
 <%= f.label a.keys.first, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.text_area a.keys.first, class: 'form-control froala-editor', rows: '5', required: required?(f.object, a) %>

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

@@ -1,7 +1,8 @@
 <%= 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/app/views/slash_admin/fields/_boolean.html.erb

@@ -1,2 +1,3 @@
 <%= f.check_box a, class: 'form-control-label' %>
 <%= f.label a %>
+<%= render 'slash_admin/shared/tooltip', a: a %>

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

@@ -1,4 +1,5 @@
 <%= f.label a.to_sym, class: "form-control-label #{required?(f.object, a).present? ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 
 <% if f.object.send(a).is_a? Array %>
   <% multiple_files = true %>

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

@@ -1,2 +1,3 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.text_field a, class: "form-control bootstrap-material-#{@model_class.type_for_attribute(a.to_s).type.to_s}", required: required?(f.object, a) %>

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

@@ -1,2 +1,3 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.number_field a, class: 'form-control', step: '0.01', required: required?(f.object, a) %>

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

@@ -1,4 +1,5 @@
 <%= 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,
 object_label(class_name_from_association(f.object, a)),

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

@@ -1,4 +1,5 @@
 <%= 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] },
 {

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

@@ -1,2 +1,3 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.number_field a, class: 'form-control', step: '1', required: required?(f.object, a) %>

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

@@ -1,4 +1,5 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}"%>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.text_area a, class: "form-control #{'jsonarea_' + f.object.class.to_s + '_' + a.to_s}", required: required?(f.object, a), value: f.object.send(a).to_json %>
 
 <script src="https://rawgithub.com/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
@@ -11,4 +12,4 @@
     gutters: ["CodeMirror-lint-markers"],
     lint: true
   });
-</script>
+</script>

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

@@ -1,5 +1,6 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}"%>
-<%= f.text_area a, class: "form-control #{'jsonarea_' + f.object.class.to_s + '_' + a.to_s}", required: required?(f.object, a) %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
+<%= f.text_area a, class: "form-control #{'jsonarea_' + f.object.class.to_s + '_' + a.to_s}", required: required?(f.object, a), value: f.object.send(a).to_json  %>
 
 <script src="https://rawgithub.com/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
 <script type="text/javascript">
@@ -11,4 +12,4 @@
     gutters: ["CodeMirror-lint-markers"],
     lint: true
   });
-</script>
+</script>

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

@@ -1,4 +1,5 @@
 <%= 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(a),
 {

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

@@ -1,4 +1,5 @@
 <%= f.label a, class: 'form-control-label' %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 
 <%= f.fields_for a do |association_model| %>
   <%= render 'slash_admin/fields/has_many_row', f: association_model, model_ref: a.to_sym %>

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

@@ -1,4 +1,5 @@
 <%= f.label a, class: 'form-control-label label-has-one' %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 
 <% if f.object.send(a).blank? %>
   <% f.object.send("#{a.to_s}=", a.to_s.classify.constantize.new) %>

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

@@ -1,2 +1,3 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.number_field a, class: 'form-control', step: '0.01', required: required?(f.object, a) %>

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

@@ -1,2 +1,3 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.text_field a, class: 'form-control', required: required?(f.object, a) %>

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

@@ -1,2 +1,3 @@
 <%= f.label a, class: "form-control-label #{required?(f.object, a) ? 'required' : ''}" %>
+<%= render 'slash_admin/shared/tooltip', a: a %>
 <%= f.text_area a, class: 'form-control', rows: '5', required: required?(f.object, a) %>

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

@@ -0,0 +1,3 @@
+<% if tooltips.key? a %>
+  <a href="#" data-toggle="tooltip" data-placement="top" title="<%= tooltips[a] %>"><i class="fas fa-question-circle"></i></a>
+<% end %>

data/lib/slash_admin/version.rb

@@ -1,3 +1,3 @@
 module SlashAdmin
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slash_admin
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - KOVACS Nicolas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -392,6 +392,7 @@ files:
 - app/views/slash_admin/shared/_menu.html.erb
 - 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/validators.rb
 - config/locales/en.yml
 - config/locales/fr.yml