trestle 0.8.13 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf56a27669452c89b5d5c46780c9b8761108f199a0947c3ab59b769fef98991
-  data.tar.gz: a4981f671dd0caced318b2baa9435cba7716a6c1b804649f5b9324ecf1bb0172
+  metadata.gz: f3cdfde7b217d044ec9cfa2792d0ce3eb85ee4e36ca9e91da68c45badf94ec9a
+  data.tar.gz: a774edd80c3bacf623615285aff172b042de6cdaf81617149bd9707be5cee767
 SHA512:
-  metadata.gz: 1bd4353bb458f9ab766bdd1491675ee9f2ed3449c381441ba4a8954beda81104505d1f3c98b726a229af11b4cfaf422b43583f72f0f1b4e0d0d0f403a400c654
-  data.tar.gz: fa626e505ecb79fab31abe00d19ba31c260626773b0098bda9f3af51d366d6753850cc20f918de5ed204770f8711f1493b83a0234d35fa3b8e8a86ad8623212e
+  metadata.gz: bf9890c72d39514f4d8133054098d63d4e8fad36bc88c287a58853c77fd814a328538b88d13f30ee9112df6ed31359efcac96cbd0ffc88221cf391350d3859f3
+  data.tar.gz: 670a009ba4de473a84d2b9570bca583d15ae76ea48d90b5fb72b7bc3df08ff9fa64c555aa171539e7cd234cc9ea29f33340569a168d5917d13b9211a969e81ad

data/.babelrc

@@ -0,0 +1,5 @@
+{
+	"presets": [
+		["@babel/preset-env"]
+	]
+}

data/.browserslistrc

@@ -0,0 +1 @@
+> 0.25%

data/.gitattributes

@@ -0,0 +1 @@
+app/assets/bundle/**/* -diff

data/.gitignore

@@ -16,3 +16,4 @@
 /spec/dummy/*.sqlite3-journal
 /spec/dummy/log/*.log
 /spec/dummy/tmp/*
+/node_modules

data/.travis.yml

@@ -12,7 +12,7 @@ gemfile:
   - gemfiles/rails-5.0.gemfile
   - gemfiles/rails-5.1.gemfile
   - gemfiles/rails-5.2.gemfile
-  - gemfiles/rails-edge.gemfile
+  - gemfiles/rails-6.0.gemfile
 
 addons:
   chrome: stable

data/Gemfile

@@ -16,3 +16,5 @@ group :test do
 end
 
 gem 'haml'
+gem 'sassc-rails'
+gem 'sqlite3', '~> 1.4'

data/app/assets/javascripts/trestle/admin.js

@@ -1,24 +1,2 @@
-//= require trestle/jquery
-//= require trestle/jquery_ujs
-//= require trestle/bootstrap
-//= require trestle/bootstrap-confirmation
-//= require trestle/magnific-popup
-//= require trestle/flatpickr
-//= require trestle/select2
-//
-//= require_self
-//
-//= require_tree ./core
-//= require_tree ./components
-//
+//= require trestle/bundle
 //= require trestle/custom
-
-var Trestle = {
-  // Is Turbolinks enabled?
-  turbolinks: typeof(Turbolinks) !== 'undefined' && Turbolinks.supported,
-
-  // Store for i18n translations used within JS
-  i18n: {}
-};
-
-window.Trestle = Trestle;

data/app/assets/stylesheets/trestle/_custom.css

@@ -0,0 +1,6 @@
+/*
+ * This file is left as an extension point for user customization.
+ *
+ * It will be overridden by the similarly named file within
+ * the app/assets folder of the Rails application.
+ */

data/app/assets/stylesheets/trestle/admin.css

@@ -0,0 +1,2 @@
+//= require trestle/bundle
+//= require trestle/icons/_font-awesome

data/app/assets/stylesheets/trestle/custom.css

@@ -0,0 +1 @@
+//= require trestle/_custom

data/app/assets/stylesheets/trestle/icons/_font-awesome.css.erb

@@ -0,0 +1,40 @@
+/*!
+ * Font Awesome Free 5.8.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 400;
+  src: url(<%= asset_path('trestle/fa-regular-400.eot') %>);
+  src: url(<%= asset_path('trestle/fa-regular-400.eot?#iefix') %>) format('embedded-opentype'),
+       url(<%= asset_path('trestle/fa-regular-400.woff2') %>) format('woff2'),
+       url(<%= asset_path('trestle/fa-regular-400.woff') %>) format('woff'),
+       url(<%= asset_path('trestle/fa-regular-400.ttf') %>) format('truetype'),
+       url(<%= asset_path('trestle/fa-regular-400.svg#fontawesome') %>) format('svg');
+}
+
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 900;
+  src: url(<%= asset_path('trestle/fa-solid-900.eot') %>);
+  src: url(<%= asset_path('trestle/fa-solid-900.eot?#iefix') %>) format('embedded-opentype'),
+       url(<%= asset_path('trestle/fa-solid-900.woff2') %>) format('woff2'),
+       url(<%= asset_path('trestle/fa-solid-900.woff') %>) format('woff'),
+       url(<%= asset_path('trestle/fa-solid-900.ttf') %>) format('truetype'),
+       url(<%= asset_path('trestle/fa-solid-900.svg#fontawesome') %>) format('svg');
+}
+
+@font-face {
+  font-family: 'Font Awesome 5 Brands';
+  font-style: normal;
+  font-weight: normal;
+  src: url(<%= asset_path('trestle/fa-brands-400.eot') %>);
+  src: url(<%= asset_path('trestle/fa-brands-400.eot?#iefix') %>) format('embedded-opentype'),
+       url(<%= asset_path('trestle/fa-brands-400.woff2') %>) format('woff2'),
+       url(<%= asset_path('trestle/fa-brands-400.woff') %>) format('woff'),
+       url(<%= asset_path('trestle/fa-brands-400.ttf') %>) format('truetype'),
+       url(<%= asset_path('trestle/fa-brands-400.svg#fontawesome') %>) format('svg');
+}

data/app/helpers/trestle/card_helper.rb

@@ -0,0 +1,23 @@
+module Trestle
+  module CardHelper
+    def card(options={}, &block)
+      content_tag(:div, options.slice(:id, :data).merge(class: ["card", options[:class]].compact)) do
+        safe_join([
+          (content_tag(:div, options[:header], class: "card-header") if options[:header]),
+          content_tag(:div, class: "card-body", &block),
+          (content_tag(:div, options[:footer], class: "card-footer") if options[:footer])
+        ].compact)
+      end
+    end
+
+    def panel(options={}, &block)
+      ActiveSupport::Deprecation.warn("The panel helper is deprecated and will be removed in future versions of Trestle. Please use the card helper instead.")
+      card(options.merge(header: options[:title]), &block)
+    end
+
+    def well(options={}, &block)
+      ActiveSupport::Deprecation.warn("The well helper is deprecated and will be removed in future versions of Trestle. Please use the card helper instead.")
+      card(options, &block)
+    end
+  end
+end

data/app/helpers/trestle/form_helper.rb

@@ -1,5 +1,7 @@
 module Trestle
   module FormHelper
+    IDENTITY_FIELD_ERROR_PROC = Proc.new { |html_tag, instance| html_tag }
+
     def trestle_form_for(instance, options={}, &block)
       options[:builder] ||= Form::Builder
       options[:as] ||= admin.parameter_name
@@ -8,7 +10,9 @@ module Trestle
       options[:data].reverse_merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)
 
       form_for(instance, options) do |f|
-        with_form(f) { yield f }
+        with_identity_field_error_proc do
+          with_form(f) { yield f }
+        end
       end
     end
 
@@ -19,6 +23,15 @@ module Trestle
       @_trestle_form = nil
     end
 
+    def with_identity_field_error_proc
+      original_field_error_proc = ::ActionView::Base.field_error_proc
+      ::ActionView::Base.field_error_proc = IDENTITY_FIELD_ERROR_PROC
+
+      yield if block_given?
+    ensure
+      ::ActionView::Base.field_error_proc = original_field_error_proc
+    end
+
     def form
       @_trestle_form
     end

data/app/helpers/trestle/grid_helper.rb

@@ -4,8 +4,17 @@ module Trestle
       content_tag(:div, class: "row") { yield }
     end
 
-    def col(columns)
-      content_tag(:div, class: columns.map { |breakpoint, span| "col-#{breakpoint}-#{span}" }) { yield }
+    def col(columns=nil, breakpoints={})
+      if columns.is_a?(Hash)
+        breakpoints = columns
+        columns = breakpoints.delete("xs") || breakpoints.delete(:xs)
+      end
+
+      classes = []
+      classes << (columns ? "col-#{columns}" : "col")
+      classes += breakpoints.map { |breakpoint, span| "col-#{breakpoint}-#{span}" }
+
+      content_tag(:div, class: classes) { yield }
     end
 
     def divider

data/app/helpers/trestle/navigation_helper.rb

@@ -1,10 +1,11 @@
 module Trestle
   module NavigationHelper
     def current_navigation_item?(item)
-      return true if current_page?(item.path)
-      return true if defined?(admin) && admin == item.admin
+      current_page?(item.path) || (item.admin && current_admin?(item.admin))
+    end
 
-      false
+    def current_admin?(admin)
+      respond_to?(:admin) && self.admin && self.admin.name == admin.name
     end
   end
 end

data/app/helpers/trestle/status_helper.rb

@@ -1,7 +1,7 @@
 module Trestle
   module StatusHelper
-    def status_tag(label, status=:default, options={})
-      options[:class] ||= ["label", "label-#{status}"]
+    def status_tag(label, status=:primary, options={})
+      options[:class] ||= ["badge", "badge-#{status}"]
       content_tag(:span, label, options)
     end
   end

data/app/views/kaminari/trestle/_first_page.html.erb

@@ -6,6 +6,10 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li<% if current_page.first? %> class="disabled"<% end %>>
-  <%= link_to_unless current_page.first?, content_tag(:span, "&laquo;".html_safe), url, remote: remote %>
+<li class="page-item<% if current_page.first? %> disabled<% end %>">
+  <% if current_page.first? %>
+    <span class="page-link">&laquo;</span>
+  <% else %>
+    <%= link_to content_tag(:span, "&laquo;".html_safe), url, class: "page-link", remote: remote %>
+  <% end %>
 </li>

data/app/views/kaminari/trestle/_gap.html.erb

@@ -5,6 +5,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="gap disabled">
-  <span><%= t('views.pagination.truncate').html_safe %></span>
+<li class="page-item gap disabled">
+  <span class="page-link"><%= t('views.pagination.truncate').html_safe %></span>
 </li>

data/app/views/kaminari/trestle/_last_page.html.erb

@@ -6,6 +6,10 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li<% if current_page.last? %> class="disabled"<% end %>>
-  <%= link_to_unless current_page.last?, content_tag(:span, "&raquo;".html_safe), url, remote: remote %>
+<li class="page-item<% if current_page.last? %> disabled<% end %>">
+  <% if current_page.last? %>
+    <span class="page-link">&raquo;</span>
+  <% else %>
+    <%= link_to content_tag(:span, "&raquo;".html_safe), url, class: "page-link", remote: remote %>
+  <% end %>
 </li>

data/app/views/kaminari/trestle/_page.html.erb

@@ -7,6 +7,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li<% if page.current? %> class="active"<% end %>>
-  <%= link_to_unless page.current?, content_tag(:span, page), url, remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil %>
+<li class="page-item<% if page.current? %> active<% end %>">
+  <%= link_to content_tag(:span, page), url, class: "page-link", remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil %>
 </li>

data/app/views/layouts/trestle/admin.html.erb

@@ -17,10 +17,12 @@
     <%= favicon_link_tag Trestle.config.favicon if Trestle.config.favicon %>
 
     <%= stylesheet_link_tag "trestle/admin", 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/theme", 'data-turbolinks-track': 'reload' if Trestle.config.theme %>
+    <%= stylesheet_link_tag "trestle/custom", 'data-turbolinks-track': 'reload' %>
 
     <%= hook :stylesheets %>
 
-    <%= javascript_include_tag "turbolinks" if Trestle.config.turbolinks %>
+    <%= javascript_include_tag "turbolinks" if Trestle.config.turbolinks rescue nil %>
     <%= javascript_include_tag "trestle/admin", 'data-turbolinks-track': 'reload' %>
 
     <%= javascript_tag nonce: true do %>