madmin 1.2.9 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4711c582952084164bfafbad483a4b5cb520ff505f96c0f9a87a7b61732068c
-  data.tar.gz: 3eed3f7cbd6969f14b499c3c51bc91cacf423b9554c590c612000d23ccafea8f
+  metadata.gz: 56db4d11f4d580cf81ae930792f465deefff47373903e5f98503d53314e30eeb
+  data.tar.gz: 7fbf045417bde2b39a4abcf98f86900dd60d3e7e99670139e1fdbec9a1ecf43d
 SHA512:
-  metadata.gz: 3464c6efd9b1561a49c437b8f994616e212d88ba0ec37eebbdac78cccaa0f700ef28bb5c90c20133eea98dfbc71cd7f008b8db38e055602bacc7a7bddcafb0e8
-  data.tar.gz: dff80cd6e7c84008618f61381ec0551519305f6ab8434d0742a85f37e50202740a5d146beb27989308426f8bd7ffd218fb86bf0903074bb4d89ec2238b55dbf2
+  metadata.gz: 047cd4d1eceabc2328638b13ee9cb59225b563bd396c02887e89b6a4f6aae3fab5ce38252e7d35981feb1e6cbd76bbc5058c3d9fe686577705a4c48720a9903c
+  data.tar.gz: 96340f347076e77f481482fd1f34fcac7fcb4d3bd22d62ba22957ac58f14375e5641cb8dac30fff8f9c0ac963d1be5e220df3c721666978b4341ec958953094c

data/app/views/madmin/application/_javascript.html.erb

@@ -2,6 +2,37 @@
 <%= stylesheet_link_tag "https://unpkg.com/flatpickr/dist/flatpickr.min.css", "data-turbo-track": "reload" %>
 <%= stylesheet_link_tag "https://unpkg.com/trix/dist/trix.css", "data-turbo-track": "reload" %>
 <%= stylesheet_link_tag "https://unpkg.com/tom-select/dist/css/tom-select.min.css", "data-turbo-track": "reload" %>
+<style type="text/tailwindcss">
+.pagy {
+  @apply isolate inline-flex rounded-md;
+
+  a:first-child {
+    @apply rounded-l-md;
+  }
+  a:last-child {
+    @apply rounded-r-md;
+  }
+
+  a {
+    @apply relative -ml-px inline-flex items-center bg-white px-3 py-2 text-sm font-semibold text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-100 focus:z-10;
+
+    &:not([href]) {
+      @apply text-gray-300 cursor-default;
+    }
+
+    &.current {
+      @apply text-white bg-blue-500 ring-blue-500;
+    }
+  }
+
+  label {
+    @apply inline-block whitespace-nowrap bg-gray-200 rounded-lg px-3 py-0.5;
+    input {
+      @apply bg-gray-100 border-none rounded-md;
+    }
+  }
+}
+</style>
 
 <script type="importmap" data-turbo-track="reload">
   {

data/app/views/madmin/application/edit.html.erb

@@ -1,7 +1,7 @@
 <h1 class="text-xl mb-4">
-  <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-indigo-500" %>
+  <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-blue-500" %>
   /
-  <strong>Edit <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-indigo-500" %></strong>
+  <strong>Edit <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-blue-500" %></strong>
 </h1>
 
 <%= render partial: "form", locals: { record: @record, resource: resource } %>

data/app/views/madmin/application/index.html.erb

@@ -4,7 +4,7 @@
   <div class="flex-grow flex md:justify-end gap-4">
     <form class="flex items-center gap-2 relative">
       <%= hidden_field_tag :page, params[:page], value: 1, class: "hidden" %>
-      <%= search_field_tag :q, params[:q], placeholder: "Search", class: "rounded-full px-4 focus:bg-white focus:border-indigo-500" %>
+      <%= search_field_tag :q, params[:q], placeholder: "Search", class: "rounded-full px-4 focus:bg-white focus:border-blue-500" %>
       <%= link_to clear_search_params, class: "absolute top-1/2 right-3 text-gray-500 bg-white transform -translate-y-1/2" do %>
         <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
           <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" />
@@ -51,12 +51,12 @@
           <% end %>
 
           <td class="px-4 py-2 text-center">
-            <%= link_to "View", resource.show_path(record), class: "text-indigo-500" %>
-            <%= link_to "Edit", resource.edit_path(record), class: "text-indigo-500" %>
+            <%= link_to "View", resource.show_path(record), class: "text-blue-500" %>
+            <%= link_to "Edit", resource.edit_path(record), class: "text-blue-500" %>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
 </div>
-<%== render(partial: 'madmin/pagy/nav', locals: { pagy: @pagy }) if @pagy.pages > 1 %>
+<%== pagy_nav @pagy %>

data/app/views/madmin/application/new.html.erb

@@ -1,5 +1,5 @@
 <h1 class="text-xl mb-4">
-  <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-indigo-500" %>
+  <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-blue-500" %>
   /
   <strong>New <%= resource.friendly_name %></strong>
 </h1>

data/app/views/madmin/application/show.html.erb

@@ -1,8 +1,8 @@
 <div class="md:flex items-center justify-between mb-4">
   <h1 class="text-xl">
-    <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-indigo-500" %>
+    <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-blue-500" %>
     /
-    <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-indigo-500 font-bold" %>
+    <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-blue-500 font-bold" %>
   </h1>
 
   <div class="flex gap-2 items-center px-4">

data/app/views/madmin/fields/attachment/_show.html.erb

@@ -4,6 +4,6 @@
       <%= image_tag main_app.url_for(attachment), class: "max-h-32" %>
     <% end %>
   <% else %>
-    <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank, class: "text-indigo-500 underline" %>
+    <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank, class: "text-blue-500 underline" %>
   <% end %>
 <% end %>

data/app/views/madmin/fields/attachments/_show.html.erb

@@ -5,7 +5,7 @@
         <%= image_tag main_app.url_for(attachment), class: "max-h-32" %>
       <% end %>
     <% else %>
-      <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank, class: "text-indigo-500 underline" %>
+      <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank, class: "text-blue-500 underline" %>
     <% end %>
   <% end %>
 <% end %>

data/app/views/madmin/fields/belongs_to/_show.html.erb

@@ -1,3 +1,3 @@
 <% if (object = field.value(record)) %>
-  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-indigo-500 underline" %>
+  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-blue-500 underline" %>
 <% end %>

data/app/views/madmin/fields/decimal/_form.html.erb

@@ -1,4 +1,4 @@
 <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
-<%= form.number_field field.attribute_name, step: :any, class: "form-input" %>
+<%= form.number_field field.attribute_name, step: :any, class: "flex-grow form-input" %>

data/app/views/madmin/fields/file/_form.html.erb

@@ -1,4 +1,4 @@
 <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
-<%= form.file_field field.attribute_name, class: "form-input" %>
+<%= form.file_field field.attribute_name, class: "flex-grow form-input" %>

data/app/views/madmin/fields/file/_show.html.erb

@@ -1,6 +1,6 @@
 <% value = field.value(record) %>
 <% if value.respond_to?(:url) %>
-  <%= link_to value.url, value.url, target: :_blank, class: "text-indigo-500 underline" %>
+  <%= link_to value.url, value.url, target: :_blank, class: "text-blue-500 underline" %>
 <% else %>
   <%= value %>
 <% end %>

data/app/views/madmin/fields/float/_form.html.erb

@@ -1,4 +1,4 @@
 <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
-<%= form.number_field field.attribute_name, step: :any, class: "form-input" %>
+<%= form.number_field field.attribute_name, step: :any, class: "flex-grow form-input" %>

data/app/views/madmin/fields/has_many/_show.html.erb

@@ -1,5 +1,5 @@
 <% field.value(record).each do |object| %>
   <div>
-    <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-indigo-500 underline" %>
+    <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-blue-500 underline" %>
   </div>
 <% end %>

data/app/views/madmin/fields/integer/_form.html.erb

@@ -1,4 +1,4 @@
 <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
-<%= form.number_field field.attribute_name, class: "form-input" %>
+<%= form.number_field field.attribute_name, class: "flex-grow form-input" %>

data/app/views/madmin/fields/integer/_index.html.erb

@@ -1,5 +1,5 @@
 <% if field.attribute_name == :id %>
-  <%= link_to field.value(record), resource.show_path(record), class: "text-indigo-500 underline" %>
+  <%= link_to field.value(record), resource.show_path(record), class: "text-blue-500 underline" %>
 <% else %>
   <%= field.value(record) %>
 <% end %>

data/app/views/madmin/fields/json/_form.html.erb

@@ -1,4 +1,4 @@
 <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
-<%= form.text_area field.attribute_name, class: "form-input" %>
+<%= form.text_area field.attribute_name, class: "flex-grow form-input" %>

data/app/views/madmin/fields/nested_has_many/_show.html.erb

@@ -1,5 +1,5 @@
 <% field.value(record).each do |object| %>
   <div>
-    <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-indigo-500 underline" %>
+    <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-blue-500 underline" %>
   </div>
 <% end %>

data/app/views/madmin/fields/password/_form.html.erb

@@ -1,4 +1,4 @@
 <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
-<%= form.password_field field.attribute_name, class: "form-input" %>
+<%= form.password_field field.attribute_name, class: "flex-grow form-input" %>

data/app/views/madmin/fields/polymorphic/_show.html.erb

@@ -1,3 +1,3 @@
 <% if (object = field.value(record)) %>
-  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-indigo-500 underline" %>
+  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-blue-500 underline" %>
 <% end %>

data/app/views/madmin/fields/rich_text/_form.html.erb

@@ -2,5 +2,5 @@
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
 <div class="flex-1">
-  <%= form.rich_text_area field.attribute_name, class: "form-input block" %>
+  <%= form.rich_text_area field.attribute_name, class: "flex-grow form-input block" %>
 </div>

data/app/views/madmin/fields/string/_form.html.erb

@@ -1,4 +1,4 @@
 <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
-<%= form.text_field field.attribute_name, class: "form-input" %>
+<%= form.text_field field.attribute_name, class: "flex-grow form-input" %>

data/app/views/madmin/fields/text/_form.html.erb

@@ -1,4 +1,4 @@
 <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
-<%= form.text_area field.attribute_name, class: "form-input" %>
+<%= form.text_area field.attribute_name, class: "flex-grow form-input" %>

data/lib/generators/madmin/field/templates/_form.html.erb

@@ -1,4 +1,4 @@
 <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
   <%= render "madmin/shared/label", form: form, field: field %>
 </div>
-<%= form.text_field field.attribute_name, class: "form-input" %>
+<%= form.text_field field.attribute_name, class: "flex-grow form-input" %>

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "1.2.9"
+  VERSION = "1.2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.11
 platform: ruby
 authors:
 - Chris Oliver
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-28 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,7 +134,6 @@ files:
 - app/views/madmin/fields/time/_form.html.erb
 - app/views/madmin/fields/time/_index.html.erb
 - app/views/madmin/fields/time/_show.html.erb
-- app/views/madmin/pagy/_nav.html.erb
 - app/views/madmin/shared/_label.html.erb
 - lib/generators/madmin/field/field_generator.rb
 - lib/generators/madmin/field/templates/_form.html.erb

data/app/views/madmin/pagy/_nav.html.erb

@@ -1,20 +0,0 @@
-<%#
-  This template is i18n-ready: if you don't use i18n, then you can replace the pagy_t
-  calls with the actual strings ("&lsaquo; Prev", "Next &rsaquo;", "&hellip;").
-  The link variable is set to a proc that returns the link tag.
-  Usage: link.call( page_number [, text [, extra_attributes_string ]])
--%>
-<% link = pagy_link_proc(pagy) -%>
-<%#                            -%><nav aria-label="pager" class="space-x-1 px-2 py-1" role="navigation">
-<% if pagy.prev                -%>  <span><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="text-white bg-indigo-500 rounded-2xl px-3 py-1.5"') %></span>
-<% else                        -%>  <span class="text-gray-400 bg-gray-100 rounded-2xl px-3 py-1.5 cursor-not-allowed"><%== pagy_t('pagy.nav.prev') %></span>
-<% end                         -%>
-<% pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36] -%>
-<%   if    item.is_a?(Integer) -%>  <span><%== link.call(item, item, 'class="text-gray-400 rounded-full px-2.5 py-1.5 hover:bg-indigo-200 hover:text-indigo-500"') %></span>
-<%   elsif item.is_a?(String)  -%>  <span class="text-indigo-500 font-semibold px-2.5 py-1.5"><%= item %></span>
-<%   elsif item == :gap        -%>  <span class="text-gray-400 text-xl px-1.5 py-1.5"><%== pagy_t('pagy.nav.gap') %></span>
-<%   end                       -%>
-<% end                         -%>
-<% if pagy.next                -%>  <span><%== link.call(pagy.next, pagy_t('pagy.nav.next'), 'aria-label="next" class="text-white bg-indigo-500 rounded-2xl px-3 py-1.5"') %></span>
-<% else                        -%>  <span class="text-gray-400 bg-gray-100 rounded-2xl px-3 py-1.5 cursor-not-allowed"><%== pagy_t('pagy.nav.next') %></span>
-<% end                         -%>