headmin 0.5.3 → 0.5.4

data/app/views/headmin/forms/media/_item.html.erb

@@ -1,26 +1,32 @@
 <%
-  attachment = form.object
-  filename = attachment.blob&.filename&.to_s
-  size = number_to_human_size(attachment.blob&.byte_size || 0)
-  src = nil
-  if attachment.blob
-    src = attachment.image? ? url_for(attachment.variant(resize_to_fill: [100, 100])) : url_for(attachment)
-  end
+  # headmin/forms/media/item
+  #
+  # ==== Required parameters
+  # * +form+ - Form object
+  # * +url+ - URL for the media modal
+  #
+  # ==== Optional parameters
+  # * +sort+ - Allow sorting by dragging items. `active_storage_attachments` must have a position column.
+  # * +width+ - Width of the thumbnail
+  # * +height+ - Height of the thumbnail
+  #
+
+  media_item = Headmin::Form::MediaItemView.new(local_assigns)
 %>
 
-<div class="h-form-file-thumbnail media-drag-sort-handle" title="<%= "#{filename} (#{size})" %>" data-media-target="item">
+<div class="h-form-file-thumbnail media-drag-sort-handle" title="<%= "#{media_item.filename} (#{media_item.size})" %>" data-media-target="item">
   <%= form.hidden_field(:id) %>
   <%= form.hidden_field(:blob_id) %>
-  <%= form.hidden_field(:position, value: attachment.new_record? ? nil : attachment.position) if sort %>
+  <%= form.hidden_field(:position, value: media_item.position_value) if media_item.sort %>
   <%= form.hidden_field(:_destroy) %>
 
-  <a href="<%= url %>" data-turbo-frame="remote_modal" data-media-target="modalButton">
-    <%= render "headmin/thumbnail", src: src, width: 100, height: 100 %>
+  <a href="<%= media_item.url %>" data-turbo-frame="remote_modal" data-media-target="modalButton">
+    <%= render "headmin/thumbnail", media_item.thumbnail_options %>
   </a>
 
   <div class="h-form-file-thumbnail-actions">
     <!-- Edit -->
-    <a href="<%= headmin_media_item_url(id: attachment.blob ? attachment.blob.id : "$1") %>" class="h-form-file-thumbnail-edit" data-turbo-frame="remote_modal" data-media-target="editButton">
+    <a href="<%= headmin_media_item_url(id: media_item.id) %>" class="h-form-file-thumbnail-edit" data-turbo-frame="remote_modal" data-media-target="editButton">
       <%= bootstrap_icon("pencil") %>
     </a>
 

data/app/views/headmin/forms/repeater/_row.html.erb

@@ -7,9 +7,10 @@
 
   draggable = form.object.respond_to?(:position)
   destroyable = form.object.respond_to?(:destroy)
+  class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : "repeater-row list-group-item"
 %>
 
-<div class="repeater-row list-group-item"
+<div class="<%= class_names %>"
      data-repeater-target="row"
      data-row-index="<%= form.options[:child_index] %>"
      data-new-record="<%= form.object.new_record? %>"

data/app/views/headmin/media/_item.html.erb

@@ -11,7 +11,6 @@
 
   <!-- Label -->
   <label for="media-item-<%= blob.id %>">
-    <% src = blob.image? ? url_for(blob.variant(resize_to_fill: [100, 100])) : url_for(blob) %>
-    <%= render "headmin/thumbnail", src: src, width: 100, height: 100 %>
+    <%= render "headmin/thumbnail", file: blob %>
   </label>
 </div>

data/app/views/headmin/media/_media_item_modal.html.erb

@@ -7,8 +7,8 @@
     <div class="modal-body">
       <%= render "headmin/notifications" %>
       <div class="row">
-        <div class="col-3">
-          <%= render "headmin/thumbnail", src: url_for(@blob), width: 100, height: 100 %>
+        <div class="col-4">
+          <%= render "headmin/thumbnail", file: @blob %>
         </div>
         <div class="col-8 d-flex flex-column justify-content-center">
           <p class="small text-secondary m-0">

data/app/views/headmin/table/body/_association.html.erb

@@ -2,10 +2,24 @@
     headmin/table/body/association
     accepts block: no
     parameters:
-      object: (ActiveRecord::Base) Model resource for which an association needs to be called
-      attribute: (string) Name of the association
+      value: (string) Name of the association
 %>
 
 <td>
-  <%= t(".items", count: object.send(attribute).count) %>
+  <% if defined?(url) && url %>
+    <a href="<%= url %>" title="<% t(".open") %>" target=_blank>
+      <% if value.respond_to?(:each) %>
+        <%= value.map { |i| i.to_s }.join(", ") %>
+      <% else %>
+        <%= value.to_s %>
+      <% end %>
+      <%= bootstrap_icon("box-arrow-up-right") %>
+    </a>
+  <% else %>
+    <% if value.respond_to?(:each) %>
+      <%= value.map { |i| i.to_s }.join(", ") %>
+    <% else %>
+      <%= value.to_s %>
+    <% end %>
+  <% end %>
 </td>

data/app/views/headmin/views/devise/shared/_links.html.erb

@@ -1,27 +1,21 @@
 <div class="bg-light mt-5 text-center">
-<%- if controller_name != "sessions" %>
-  <%= link_to t(".sign_in"), new_session_path(resource_name) %><br />
-<% end %>
-
-<%- if devise_mapping.registerable? && controller_name != "registrations" %>
-  <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br />
-<% end %>
+  <%- if controller_name != "sessions" %>
+    <%= link_to t(".sign_in"), new_session_path(resource_name) %><br/>
+  <% end %>
 
-<%- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %>
-  <%= link_to t(".forgot_password"), new_password_path(resource_name) %><br />
-<% end %>
+  <%- if devise_mapping.registerable? && controller_name != "registrations" %>
+    <%= link_to t(".sign_up"), new_registration_path(resource_name) %><br/>
+  <% end %>
 
-<%- if devise_mapping.confirmable? && controller_name != "confirmations" %>
-  <%= link_to t(".confirmation"), new_confirmation_path(resource_name) %><br />
-<% end %>
+  <%- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %>
+    <%= link_to t(".forgot_password"), new_password_path(resource_name) %><br/>
+  <% end %>
 
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %>
-  <%= link_to t(".unlock"), new_unlock_path(resource_name) %><br />
-<% end %>
+  <%- if devise_mapping.confirmable? && controller_name != "confirmations" %>
+    <%= link_to t(".confirmation"), new_confirmation_path(resource_name) %><br/>
+  <% end %>
 
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to t(".omniauth", provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider), method: :post %><br />
+  <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %>
+    <%= link_to t(".unlock"), new_unlock_path(resource_name) %><br/>
   <% end %>
-<% end %>
 </div>

data/config/locales/activerecord/en.yml

@@ -2,6 +2,7 @@ en:
   attributes:
     created_at: Created at
     email: Email
+    filename: Filename
     password: Password
     password_confirmation: Password confirmation
     remember_me: Stay logged in

data/config/locales/activerecord/nl.yml

@@ -2,6 +2,7 @@ nl:
   attributes:
     created_at: Aangemaakt
     email: E-mailadres
+    filename: Bestandsnaam
     password: Wachtwoord
     password_confirmation: Wachtwoord bevestiging
     remember_me: Aangemeld blijven

data/config/locales/headmin/filters/en.yml

@@ -31,8 +31,10 @@ en:
         does_not_match: does not matches with
         is_not_null: is not null
         is_null: is null
+        in: includes
+        not_in: does not include
       values:
         "false": "False"
         "no": "No"
-        "true": "Hello"
+        "true": "True"
         "yes": "Yes"

data/config/locales/headmin/filters/nl.yml

@@ -31,6 +31,8 @@ nl:
         does_not_match: lijkt niet op
         is_not_null: is ingevuld
         is_null: is niet ingevuld
+        in: bevat
+        not_in: bevat niet
       values:
         "false": Onwaar
         "no": Nee

data/config/locales/headmin/media/en.yml

@@ -3,15 +3,15 @@ en:
     media:
       modal:
         close: Close
-        placeholder: Upload your first file to the media library
         limits: "minimum: %{min} en maximum: %{max}"
+        maximum: " of %{count}"
+        placeholder: Upload your first file to the media library
         select: Select
         title:
           one: Select at least 1 file
           other: Select at least %{count} files
         unlimited: unlimited
         upload: Upload new files
-        maximum: " of %{count}"
       media_item_modal:
         close: Close
         dimensions: Dimensions

data/config/locales/headmin/media/nl.yml

@@ -3,8 +3,9 @@ nl:
     media:
       modal:
         close: Sluiten
-        placeholder: Upload je eerste bestand naar de mediabibliotheek
         limits: "minimum: %{min} and maximum: %{max}"
+        maximum: " van %{count}"
+        placeholder: Upload je eerste bestand naar de mediabibliotheek
         select: Selecteer
         title:
           one: Selecteer bestand

data/lib/headmin/version.rb

@@ -1,3 +1,3 @@
 module Headmin
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "headmin",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Admin component library",
   "module": "app/assets/javascripts/headmin.js",
   "main": "app/assets/javascripts/headmin.js",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: headmin
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Jef Vlamings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: closure_tree
@@ -230,7 +230,7 @@ files:
 - app/assets/stylesheets/headmin/vendor/bootstrap/scss/vendor/_rfs.scss
 - app/assets/stylesheets/headmin/vendor/flatpickr.css
 - app/assets/stylesheets/headmin/vendor/redactorx.css
-- app/assets/stylesheets/headmin/vendor/tom-select-bootstrap.css
+- app/assets/stylesheets/headmin/vendor/tom-select-bootstrap.scss
 - app/controllers/concerns/headmin/acts_as_list.rb
 - app/controllers/concerns/headmin/authentication.rb
 - app/controllers/concerns/headmin/filterable.rb
@@ -258,6 +258,8 @@ files:
 - app/models/concerns/headmin/form/wrappable.rb
 - app/models/headmin/.DS_Store
 - app/models/headmin/blocks_view.rb
+- app/models/headmin/filter/association.rb
+- app/models/headmin/filter/association_view.rb
 - app/models/headmin/filter/base.rb
 - app/models/headmin/filter/base_view.rb
 - app/models/headmin/filter/boolean.rb
@@ -279,6 +281,7 @@ files:
 - app/models/headmin/filter/text.rb
 - app/models/headmin/filter/text_view.rb
 - app/models/headmin/filters.rb
+- app/models/headmin/form/association_view.rb
 - app/models/headmin/form/blocks_view.rb
 - app/models/headmin/form/checkbox_view.rb
 - app/models/headmin/form/color_view.rb
@@ -294,6 +297,7 @@ files:
 - app/models/headmin/form/hint_view.rb
 - app/models/headmin/form/input_group_view.rb
 - app/models/headmin/form/label_view.rb
+- app/models/headmin/form/media_item_view.rb
 - app/models/headmin/form/media_view.rb
 - app/models/headmin/form/number_view.rb
 - app/models/headmin/form/password_view.rb
@@ -328,6 +332,7 @@ files:
 - app/views/headmin/dropdown/_item.html.erb
 - app/views/headmin/dropdown/_list.html.erb
 - app/views/headmin/dropdown/_locale.html.erb
+- app/views/headmin/filters/_association.html.erb
 - app/views/headmin/filters/_base.html.erb
 - app/views/headmin/filters/_boolean.html.erb
 - app/views/headmin/filters/_date.html.erb
@@ -342,6 +347,7 @@ files:
 - app/views/headmin/filters/filter/_null_select.html.erb
 - app/views/headmin/filters/filter/_operator.html.erb
 - app/views/headmin/filters/filter/_row.html.erb
+- app/views/headmin/forms/_association.html.erb
 - app/views/headmin/forms/_autocomplete.html.erb
 - app/views/headmin/forms/_blocks.html.erb
 - app/views/headmin/forms/_checkbox.html.erb