RubyGems - headmin - Versions diffs - 0.2.8 → 0.3.4 - Mend

headmin 0.2.8 → 0.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (271) hide show

data/app/services/block_service.rb CHANGED Viewed

@@ -1,72 +1,72 @@
 class BlockService
-  def self.block_names(path:)
-    form_views(path: path).map do |view|
-      view_name(view)
+  class << self
+    def block_names(path:)
+      form_views(path: path).map do |view|
+        view_name(view)
+      end
     end
-  end
-  def self.form_view(name, path:)
-    view_by_name(name, form_view_paths(path))
-  end
+    def form_view(name, path:)
+      view_by_name(name, form_view_paths(path))
+    end
-  def self.frontend_view(name, path:)
-    view_by_name(name, frontend_view_paths(path))
-  end
+    def frontend_view(name, path:)
+      view_by_name(name, frontend_view_paths(path))
+    end
-  def self.frontend_views(path:)
-    views(frontend_view_paths(path))
-  end
+    def frontend_views(path:)
+      views(frontend_view_paths(path))
+    end
-  def self.form_views(path:)
-    views(form_view_paths(path))
-  end
+    def form_views(path:)
+      views(form_view_paths(path))
+    end
-  def self.view_name(view)
-    filename = File.basename(view, '.html.erb')
+    def view_name(view)
+      filename = File.basename(view.split(".")[0])
-    # Removes leading _ if exists
-    filename.sub(/^_/, '')
-  end
+      # Removes leading _ if exists
+      filename.sub(/^_/, "")
+    end
-  private
+    # Looks for a block view by its name.
+    #
+    # It will first search in a specified path and will fallback to the default path
+    # An exception will be raised if the view is nowhere to be found
+    def view_by_name(name, paths)
+      views = views(paths)
+      view = views.find { |view| view.include?("/_#{name}.html.erb") }
-  # Looks for a block view by its name.
-  #
-  # It will first search in a specified path and will fallback to the default path
-  # An exception will be raised if the view is nowhere to be found
-  def self.view_by_name(name, paths)
-    views = views(paths)
-    view = views.find { |view| view.include?("/_#{name}.html.erb") }
+      unless view
+        prefixes = paths.map { |path| path.split("app/views/").last }
+        raise ActionView::MissingTemplate.new(paths, name, prefixes, true, "headmin") unless view
+      end
-    unless view
-      prefixes = paths.map { |path| path.split('app/views/').last }
-      raise ActionView::MissingTemplate.new(paths, name, prefixes, true, "headmin") unless view
+      view
     end
-    view
-  end
-  def self.form_view_paths(path)
-    [app_view_path(path), app_view_path('admin/blocks')].uniq
-  end
+    def form_view_paths(path)
+      [app_view_path(path), app_view_path("admin/blocks")].uniq
+    end
-  def self.frontend_view_paths(path)
-    [app_view_path(path), app_view_path('website/blocks')].uniq
-  end
+    def frontend_view_paths(path)
+      [app_view_path(path), app_view_path("website/blocks")].uniq
+    end
-  def self.app_view_path(path)
-    base_path = 'app/views'
-    [base_path, path].join('/')
-  end
+    def app_view_path(path)
+      base_path = "app/views"
+      [base_path, path].join("/")
+    end
-  def self.views(paths)
-    paths.map { |path| views_in_path(path) }.flatten
-  end
+    def views(paths)
+      paths.map { |path| views_in_path(path) }.flatten
+    end
-  def self.views_in_path(path)
-    files = Dir.glob("#{path}/*")
-    files.map do |file|
-      file.split('app/views/').last
+    def views_in_path(path)
+      files = Dir.glob("#{path}/*")
+      files.map do |file|
+        file.split("app/views/").last
+      end
     end
   end
-end
+end

data/app/views/examples/admin.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= I18n.locale %>">
+<html lang="<%= I18n.locale %>" data-controller="headmin">
 <head>
   <title>Admin</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">

data/app/views/headmin/_blocks.html.erb CHANGED Viewed

@@ -2,8 +2,8 @@
   # headmin/blocks
   #
   # ==== Options
-  # * <tt>blockable</tt> - Object with blocks association
-  # * <tt>path</tt> - Directory where to look for block templates
+  # * +blockable</tt> - Object with blocks association
+  # * +path</tt> - Directory where to look for block templates
   #
   # ==== Examples
   #   Basic version. This will only look for blocks in 'website/blocks'

data/app/views/headmin/_breadcrumbs.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   # headmin/breadcrumbs
   #
   # ==== Options
-  # * <tt>breadcrumbs</tt> - Object with blocks association
+  # * +breadcrumbs</tt> - Object with blocks association
   #
   # ==== Examples
   #   Basic version. This will use the publicly available `breadcrumbs` variable

data/app/views/headmin/_card.html.erb CHANGED Viewed

@@ -1,11 +1,13 @@
+<% warn "[DEPRECATION] `headmin/card` is deprecated. Please use plain Bootstrap markup." %>
 <%
+  # DEPRECATED in 0.3
   # headmin/card
   #
   # ==== Options
-  # * <tt>title</tt> - Title for card
-  # * <tt>description</tt> - Description for card
-  # * <tt>id</tt> - HTML Id Attribute
-  # * <tt>padded</tt> - Set to true if you want to render the block content inside the card-body element
+  # * +title</tt> - Title for card
+  # * +description</tt> - Description for card
+  # * +id</tt> - HTML Id Attribute
+  # * +padded</tt> - Set to true if you want to render the block content inside the card-body element
   #
   # ==== Examples
   #   Basic version.
@@ -38,13 +40,13 @@
       <!-- Render inside body-->
       <% if padded %>
-        <%= yield if block_given? %>
+        <%= yield %>
       <% end %>
     </div>
   <% end %>
   <!-- Render outside body-->
   <% unless padded %>
-    <%= yield if block_given? %>
+    <%= yield %>
   <% end %>
 </div>

data/app/views/headmin/_dropdown.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   # headmin/dropdown
   #
   # ==== Options
-  # * <tt>class</tt> - Custom class names to put on the dropdown
+  # * +class</tt> - Custom class names to put on the dropdown
   #
   # ==== Examples
   #   Basic version

data/app/views/headmin/_filters.html.erb CHANGED Viewed

@@ -2,16 +2,21 @@
   # headmin/filters
   #
   # ==== Options
-  # * <tt>url</tt> - Base url to send filter query to. Defaults to current URL
+  # * +url</tt> - Base url to send filter query to. Defaults to current URL
   #
   # ==== Examples
   #   Basic version
-  #   <%= render "headmin/filters" %#>
+  #   <%= render "headmin/filters" do %#>
+  #     <%= render "headmin/filters/select", name: 'color', options: ['red', 'green', 'blue']  %#>
+  #   <% end %#>
   #
   #   With custom URL
   #   <%= render "headmin/filters", url: admin_polls_path %#>
   action = local_assigns.has_key?(:url) ? url : request.path
+  # Perform yield in order to capture content blocks
+  yield
 %>
 <form action="<%= action %>" data-controller="filters" data-filters-target="form">
@@ -21,14 +26,12 @@
     <%= hidden_field_tag(name.to_sym, value) %>
   <% end %>
-  <%= yield if block_given? %>
-  <div class="d-flex flex-column flex-md-row align-content-start align-items-md-center">
+  <div class="d-flex flex-column flex-md-row align-content-start align-items-md-start">
     <div class="d-flex align-items-center">
       <!-- Search -->
       <div class="h-filters-search d-flex my-1 w-100">
-        <%= content_for :filters_search %>
+        <%= yield :filters_search %>
         <!-- Separator -->
         <% if content_for?(:filters_menu) && content_for?(:filters_search) %>
@@ -60,10 +63,19 @@
     <!-- Filter list -->
     <div class="h-filter-list d-flex ms-md-1 flex-wrap" data-filters-target="list">
-      <%= content_for :filters_buttons %>
+      <%= yield :filters_buttons %>
     </div>
   </div>
   <!-- Filter templates -->
-  <%= content_for :filters_templates %>
+  <%= yield :filters_templates %>
 </form>
+<%
+  # Clears content blocks to make this view reusable
+  content_for(:filters_search, flush: true) { concat(nil) }
+  content_for(:filters_menu, flush: true) { concat(nil) }
+  content_for(:filters_buttons, flush: true) { concat(nil) }
+  content_for(:filters_templates, flush: true) { concat(nil) }
+%>

data/app/views/headmin/_form.html.erb CHANGED Viewed

@@ -2,20 +2,20 @@
   # headmin/form
   #
   # ==== Options
-  # * <tt>model<tt> - A model to infer :url and :scope
-  # * <tt>scope<tt> - The scope to prefix input field names with
-  # * <tt>url<tt> - The URL the form submits to
-  # * <tt>format<tt> - The format of the route the form submits to
-  # * <tt>namespace<tt> - A namespace for your form to ensure uniqueness of id attributes on form elements
-  # * <tt>method<tt> - The method to use when submitting the form
-  # * <tt>authenticity_token<tt> - Authenticity token to use in the form
-  # * <tt>local<tt> - By default form submits are remote and unobtrusive XHRs
-  # * <tt>skip_enforcing_utf8<tt> - If set to true, a hidden input with name utf8 is not output
-  # * <tt>builder<tt> - Override the object used to build the form
-  # * <tt>html<tt> - Other optional HTML attributes for the form tag
-  # * <tt>id<tt> - Optional HTML id attribute
-  # * <tt>class<tt> - Optional HTML class attribute
-  # * <tt>data<tt> - Optional HTML data attributes
+  # * +model+ - A model to infer :url and :scope
+  # * +scope+ - The scope to prefix input field names with
+  # * +url+ - The URL the form submits to
+  # * +format+ - The format of the route the form submits to
+  # * +namespace+ - A namespace for your form to ensure uniqueness of id attributes on form elements
+  # * +method+ - The method to use when submitting the form
+  # * +authenticity_token+ - Authenticity token to use in the form
+  # * +local+ - By default form submits are remote and unobtrusive XHRs
+  # * +skip_enforcing_utf8+ - If set to true, a hidden input with name utf8 is not output
+  # * +builder+ - Override the object used to build the form
+  # * +html+ - Other optional HTML attributes for the form tag
+  # * +id+ - Optional HTML id attribute
+  # * +class+ - Optional HTML class attribute
+  # * +data+ - Optional HTML data attributes
   #
   # === Examples
   #   Basic version

data/app/views/headmin/_heading.html.erb CHANGED Viewed

@@ -9,5 +9,5 @@
 %>
 <div class="h-heading d-flex flex-column flex-md-row align-items-start align-items-md-end justify-content-between">
-  <%= yield if block_given? %>
+  <%= yield %>
 </div>

data/app/views/headmin/_notifications.html.erb CHANGED Viewed

@@ -8,7 +8,7 @@
 <div class="toast-container position-absolute top-0 end-0 p-3">
   <% flash.each do |name, message| %>
-    <div class="toast align-items-center text-white show <%= notification_color(name.to_sym)[:background] %>" role="alert" aria-live="assertive" aria-atomic="true">
+    <div class="toast align-items-center text-white show <%= notification_color(name.to_sym)[:background] %>" role="alert" aria-live="assertive" aria-atomic="true" data-controller="toast">
       <div class="d-flex">
         <div class="toast-body <%= notification_color(name.to_sym)[:text] %>">
           <%= message %>

data/app/views/headmin/_pagination.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   # headmin/notifications
   #
   # ==== Options
-  # * <tt>collection</tt> - Kaminari collection that accepts a method .total_count
+  # * +collection</tt> - Kaminari collection that accepts a method .total_count
   #
   # ==== Examples
   #   Basic version

data/app/views/headmin/_popup.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   # headmin/popup
   #
   # ==== Options
-  # * <tt>id</tt> - Identifier for this popup
+  # * +id</tt> - Identifier for this popup
   #
   # ==== Examples
   #   To trigger this popup create an element with a data attribute like this
@@ -19,8 +19,14 @@
   #   <%= render 'headmin/popup', id: 'popupId' do %#>
   #     <a href="https://example.com" id="link">
   #   <% end %#>
+  data = local_assigns.has_key?(:data) ? data : {}
+  options = {
+    class: ['h-popup', 'closed'],
+    data: data.merge('popup-target': 'popup', 'popup-id': id)
+  }
 %>
-<div class="h-popup closed" data-popup-target="popup" data-popup-id="<%= id %>">
-  <%= yield if block_given? %>
-</div>
+<%= content_tag(:div, options) do %>
+  <%= yield %>
+<% end %>

data/app/views/headmin/_table.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   # headmin/table
   #
   # ==== Options
-  # * <tt>sort_url</tt> - Url to post object ids to in the order of positions
+  # * +sort_url</tt> - Url to post object ids to in the order of positions
   #
   # ==== Examples
   #   <%= render 'headmin/table', sort_url: positions_admin_categories_path do %#>
@@ -20,7 +20,7 @@
            data-table-target="table"
            data-table-url-value="<%= sort_url %>"
            data-table-count-value="<%= total_count %>">
-      <%= yield if block_given? %>
+      <%= yield %>
     </table>
   </div>
 </div>

data/app/views/headmin/_thumbnail.html.erb ADDED Viewed

@@ -0,0 +1,47 @@
+<!--
+<% documentation do %>
+  # Thumbnail
+  Render thumbnails for files. Whenever possible (e.g. images) previews are generated. Icons are used instead for other file types.
+  ```erbx
+  <%= render 'headmin/thumbnail', src: image_path("image.jpg") %>
+  ```
+  ## Parameters
+  | Name         | Required | Type             | Description |
+  | ------------ | -------- | ---------------- | ----------- |
+  | src          | yes      | String           | Source of the file. Can be a local or external URL |
+  | width        | no       | Integer          | Width of the thumbnail in px |
+  | height       | no       | Integer          | Height of the thumbnail in px |
+  ## Examples
+  ### Sizing
+  ```erbx
+  <%= render 'headmin/thumbnail', src: image_path("image.jpg"), width: 300, height: 100 %>
+  ```
+  ### Types
+  ```erbx
+  <%= render 'headmin/thumbnail', src: asset_path("document.pdf"), width: 100, height: 100 %>
+  <%= render 'headmin/thumbnail', src: asset_path("document.docx"), width: 100, height: 100 %>
+  <%= render 'headmin/thumbnail', src: asset_path("spreadsheet.xls"), width: 100, height: 100 %>
+  <%= render 'headmin/thumbnail', src: asset_path("video.mp4"), width: 100, height: 100 %>
+  ```
+  ## References
+  - [Bootstrap](https://getbootstrap.com/docs/5.1/content/images/#image-thumbnails)
+<% end %>
+-->
+<% thumbnail = Headmin::Thumbnail.new(local_assigns) %>
+<div class="<%= thumbnail.class_names %>" style="width: <%= thumbnail.width %>px; height: <%= thumbnail.height %>px;">
+  <% if thumbnail.image? %>
+    <div class="h-thumbnail-bg" style="background-image: url('<%= thumbnail.src %>');"></div>
+  <% else %>
+    <div class="h-thumbnail-bg">
+      <%= bootstrap_icon(thumbnail.icon_name, class: 'h-thumbnail-icon') %>
+    </div>
+  <% end %>
+</div>

data/app/views/headmin/dropdown/_devise.html.erb CHANGED Viewed

@@ -2,8 +2,8 @@
   # headmin/dropdown/devise
   #
   # ==== Options
-  # * <tt>scope</tt> - (symbol) devise scope, i.e. ':users' => current_user
-  # * <tt>class</tt> - Custom class names to put on the dropdown
+  # * +scope</tt> - (symbol) devise scope, i.e. ':users' => current_user
+  # * +class</tt> - Custom class names to put on the dropdown
   #
   # ==== Examples
   #   Basic version

data/app/views/headmin/dropdown/_item.html.erb CHANGED Viewed

@@ -12,7 +12,7 @@
 <% name = local_assigns.has_key?(:name) ? name : '' %>
 <li>
-  <a class="dropdown-item" href="<%= url %>" <%= "data-method=#{method}" if method %>>
+  <a class="dropdown-item" href="<%= url %>" <%= "data-turbo-method=#{method}" if method %>>
     <%= name %>
   </a>
 </li>

data/app/views/headmin/dropdown/_list.html.erb CHANGED Viewed

@@ -2,15 +2,12 @@
   # headmin/dropdown/list
   #
   # ==== Options
-  # * <tt>id</tt> - unique identifier for the dropdown
-  # * <tt>class</tt> - Custom class names to put on the dropdown menu
+  # * +id</tt> - unique identifier for the dropdown
+  # * +class</tt> - Custom class names to put on the dropdown menu
   #
   # ==== Examples
   #   Basic version
-  #   <%= render "headmin/dropdown/devise"  %#>
-  #
-  #   Custom scope
-  #   <%= render "headmin/dropdown/devise", scope: :admins  %#>
+  #   <%= render "headmin/dropdown/list", id: 'dropdown-1'  %#>
   class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : ''
   id = local_assigns.has_key?(:id) ? id : 'dropdown-1'

data/app/views/headmin/filters/_date.html.erb CHANGED Viewed

@@ -2,15 +2,15 @@
   # headmin/filters/date
   #
   # ==== Options
-  # * <tt>name</tt> - Name of the filter parameter
-  # * <tt>label</tt> - Display name
+  # * +name</tt> - Name of the filter parameter
+  # * +label</tt> - Display name
   #
   # ==== Examples
   #   Basic version
   #   <%= render "headmin/filters/date", name: :created_at, label: 'Created at' %#>
-  label = local_assigns.has_key?(:label) ? label : nil
-  name = local_assigns.has_key?(:name) ? name : nil
+  name = local_assigns.has_key?(:name) ? name.to_sym : nil
+  label = local_assigns.has_key?(:label) ? label : name.to_s.humanize
   input_options = {
     placeholder: 'dd/mm/yyyy',
@@ -30,9 +30,6 @@
 <%= content_for :filters_templates do %>
   <%= render 'headmin/filters/filter/template', name: name, label: label do %>
     <div class="input-group">
-      <span class="input-group-text">
-        <%= bootstrap_icon('calendar') %>
-      </span>
       <%= date_field_tag(name, nil, input_options) %>
     </div>
   <% end %>
@@ -43,9 +40,6 @@
     <% value_formatted = Date.parse(params[name]).strftime('%d/%m/%Y') %>
     <%= render 'headmin/filters/filter/button', name: name, label: label, value: value_formatted do %>
       <div class="input-group">
-        <span class="input-group-text">
-          <%= bootstrap_icon('calendar') %>
-        </span>
         <%= date_field_tag(name, params[name], input_options) %>
       </div>
     <% end %>

data/app/views/headmin/filters/_flatpickr.html.erb CHANGED Viewed

@@ -2,15 +2,15 @@
   # headmin/filters/flatpickr
   #
   # ==== Options
-  # * <tt>name</tt> - Name of the filter parameter
-  # * <tt>label</tt> - Display name
+  # * +name</tt> - Name of the filter parameter
+  # * +label</tt> - Display name
   #
   # ==== Examples
   #   Basic version
   #   <%= render "headmin/filters/flatpickr", name: :created_at, label: 'Created at' %#>
-  label = local_assigns.has_key?(:label) ? label : nil
-  name = local_assigns.has_key?(:name) ? name : nil
+  name = local_assigns.has_key?(:name) ? name.to_sym : nil
+  label = local_assigns.has_key?(:label) ? label : name.to_s.humanize
   input_options = {
     placeholder: 'dd/mm/yyyy',
@@ -45,7 +45,7 @@
 <%= content_for :filters_buttons do %>
   <% if filter_param_exists?(name) %>
     <% value_formatted = Date.parse(params[name]).strftime('%d/%m/%Y') %>
-    <%= render 'headmin/filters/filter/button', id: "filter-#{name}", name: name, label: label, value: value_formatted do %>
+    <%= render 'headmin/filters/filter/button', name: name, label: label, value: value_formatted do %>
       <div class="input-group" data-controller="flatpickr">
         <span class="input-group-text">
           <%= bootstrap_icon('calendar') %>

data/app/views/headmin/filters/_search.html.erb CHANGED Viewed

@@ -2,16 +2,16 @@
   # headmin/filters/search
   #
   # ==== Options
-  # * <tt>name</tt> - Name of the filter parameter
-  # * <tt>label</tt> - Name of the resource to be used in the placeholder (search in ...)
-  # * <tt>placeholder</tt> - Placeholder in the search field
+  # * +name</tt> - Name of the filter parameter
+  # * +label</tt> - Name of the resource to be used in the placeholder (search in ...)
+  # * +placeholder</tt> - Placeholder in the search field
   #
   # ==== Examples
   #   Basic version.
   #   <%= render 'headmin/filters/search', name: :search, label: Poll.model_name.human(count: 2) %#>
   name = local_assigns.has_key?(:name) ? name : :search
-  label = local_assigns.has_key?(:label) ? label : nil
+  label = local_assigns.has_key?(:label) ? label : name.to_s.humanize
   placeholder = local_assigns.has_key?(:placeholder) ? placeholder : t('.placeholder', resource: label)
   value = filter_param_exists?(name) ? params[name] : nil
@@ -19,4 +19,4 @@
 <% content_for :filters_search do %>
   <input class="form-control" type="search" placeholder="<%= raw placeholder.capitalize %>" aria-label="Search" name="<%= name %>" value="<%= value %>">
-<% end %>
+<% end %>

data/app/views/headmin/filters/_select.html.erb CHANGED Viewed

@@ -2,16 +2,16 @@
   # headmin/filters/select
   #
   # ==== Options
-  # * <tt>name</tt> - Name of the filter parameter
-  # * <tt>label</tt> - Display name
-  # * <tt>options</tt> - List of options to select from
+  # * +name</tt> - Name of the filter parameter
+  # * +label</tt> - Display name
+  # * +options</tt> - List of options to select from
   #
   # ==== Examples
   #   Basic version
   #   <%= render "headmin/filters/select", name: :poll_type, label: 'Type', options: [["General", "general", "Fun", "fun"]] %#>
-  label = local_assigns.has_key?(:label) ? label : nil
-  name = local_assigns.has_key?(:name) ? name : nil
+  name = local_assigns.has_key?(:name) ? name.to_sym : nil
+  label = local_assigns.has_key?(:label) ? label : name.to_s.humanize
   options = local_assigns.has_key?(:options) ? options : []
   select_options = {
@@ -38,7 +38,7 @@
   <% (params[name] || []).each_with_index do |param, index| %>
     <% selected_option = options.detect { |value, key, config| (key.present? ? key : value) == param } %>
     <% selected_value = selected_option.is_a?(Array) ? selected_option.first : selected_option %>
-    <%= render 'headmin/filters/filter/button', name: name, label: label, value: selected_value, id: "#{name}_#{index}" do %>
+    <%= render 'headmin/filters/filter/button', name: name, label: label, value: selected_value, id: "#{name}_#{index}_#{SecureRandom.hex}" do %>
       <%= select_tag("#{name}[]", options_for_select(options, param), select_options) %>
     <% end %>
   <% end %>

data/app/views/headmin/filters/filter/_button.html.erb CHANGED Viewed

@@ -6,15 +6,16 @@
       label: (string) Display name
       value: (string) Value of the parameter
 %>
-<% id = local_assigns.has_key?(:id) ? id : Time.now.utc.to_i %>
-<% name = local_assigns.has_key?(:name) ? name : nil %>
-<% label = local_assigns.has_key?(:label) ? label : nil %>
+<% id = local_assigns.has_key?(:id) ? id : SecureRandom.hex %>
+<% name = local_assigns.has_key?(:name) ? name.to_sym : nil %>
+<% label = local_assigns.has_key?(:label) ? label : name.to_s.humanize %>
 <% value = local_assigns.has_key?(:value) ? value : nil %>
-<div class="h-filter me-1 my-1" data-filter-name="<%= name %>">
+<div class="h-filter me-1 my-1" data-controller="filter" data-filter-name="<%= name %>">
   <button
     type="button"
     class="h-filter-button btn h-btn-outline-transparent"
+    data-filter-target="button"
     data-popup-target="button"
     data-popup-id="<%= id %>"
     data-action="click->popup#open"
@@ -23,8 +24,7 @@
     <span class="h-filter-remove" data-action="click->filters#remove"><%= bootstrap_icon('x-lg') %></span>
   </button>
-  <%= render 'headmin/popup', id: "#{id}" do %>
-    <%= yield if block_given? %>
+  <%= render 'headmin/popup', id: "#{id}", data: {'filter-target': 'popup'} do %>
+    <%= yield %>
   <% end %>
 </div>

data/app/views/headmin/filters/filter/_template.html.erb CHANGED Viewed

@@ -8,6 +8,6 @@
 <template data-filter-name="<%= name %>" data-filters-target="template">
   <%= render 'headmin/filters/filter/button', name: name, label: label, value: nil, id: 'template_id' do %>
-    <%= yield if block_given? %>
+    <%= yield %>
   <% end %>
 </template>

data/app/views/headmin/forms/_actions.html.erb CHANGED Viewed

@@ -19,7 +19,7 @@
       </dl>
     <% end %>
-    <%= yield if block_given? %>
+    <%= yield %>
     <%= render 'headmin/forms/actions/destroy', form: form %>
     <hr>