trestle 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b62775f02866abaf0937d6a4e0bec5d86a1a31
-  data.tar.gz: 7707fa64f42e4c771721b9c306c143ce2614e18f
+  metadata.gz: f4f02402474a2f77fc6f4af6582e9b68f59274d0
+  data.tar.gz: bb9815ae6b48b970443740c5b111aefef96dcea3
 SHA512:
-  metadata.gz: a7bed2fddf9f950463693e7ec502aaf08439240a27075e61d2fc575381e165da4b0c407406d4a02990524c37ea9ce730a76886bea2c57ebee03b0ab935d34b51
-  data.tar.gz: c0dcd718a1bb3ac020924d09bd99f1658da42c7b53122af829822837a1a0c1631bfc942bb6a274d4301e7de5b4e90d00ad32cb242c30485abf88450ba3186dab
+  metadata.gz: c1593ee4dafcde35f20c312441df49e1b0861b82d87e387b4ed407e60a29758fb24e9efe4274339a1e04c78aac60cb0e85b9c76a425863fc3176d6a1f3afb70a
+  data.tar.gz: 04e575f53c928a249a74aa4cc8ad3477c7cd16fad6ef26874e0d9adf9397bbfe070fd059f74b4c85c25cba599887d84dbf3f5da1fd0cd91d26704c85ef976a1b

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

@@ -0,0 +1,23 @@
+Trestle.ready(function() {
+  // This must be bound to an element beneath document so
+  // that it is fired before any jquery_ujs events.
+  var root = $('body');
+
+  // Ensure it is only initialized once
+  if (root.data('bs.confirmation')) return;
+
+  root.confirmation({
+    rootSelector:   'body',
+    selector:       '[data-toggle="confirm-delete"]',
+    singleton:      true,
+    popout:         true,
+    title:          Trestle.i18n['admin.confirmation.title'],
+    btnOkIcon:      '',
+    btnOkClass:     'btn-danger',
+    btnOkLabel:     Trestle.i18n['admin.confirmation.delete'] || 'Delete',
+    btnCancelIcon:  '',
+    btnCancelClass: 'btn-default',
+    btnCancelLabel: Trestle.i18n['admin.confirmation.cancel'] || 'Cancel',
+    copyAttributes: ''
+  });
+});

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

@@ -0,0 +1,22 @@
+Trestle.ready(function() {
+  $('input[type="date"][data-picker="true"]').flatpickr({
+    allowInput: true,
+    altInput:   true,
+    altFormat:  "m/d/Y",
+  });
+
+  $('input[type="datetime"][data-picker="true"], input[type="datetime-local"][data-picker="true"]').flatpickr({
+    enableTime: true,
+    allowInput: true,
+    altInput:   true,
+    altFormat:  "m/d/Y h:i K",
+  });
+
+  $('input[type="time"][data-picker="true"]').flatpickr({
+    enableTime: true,
+    noCalendar: true,
+    allowInput: true,
+    altInput:   true,
+    altFormat:  "h:i K"
+  });
+});

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

@@ -0,0 +1,11 @@
+// Add error indicators to tabs
+Trestle.ready(function() {
+  $('.tab-pane').each(function() {
+    var errorCount = $(this).find('.has-error').length;
+
+    if (errorCount > 0) {
+      var indicator = $("<span>").addClass('label label-danger label-pill').text(errorCount);
+      $(".nav-tabs a[href='#" + $(this).attr('id') + "']").append(indicator);
+    }
+  });
+});

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

@@ -0,0 +1,6 @@
+// Prevent enter key from submitting the form
+$(document).on('keypress', '.app-main form :input:not(textarea):not([type=submit])', function(e) {
+  if (e.keyCode == 13) {
+    e.preventDefault();
+  }
+});

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

@@ -0,0 +1,27 @@
+Trestle.ready(function() {
+  $('[data-behavior~="zoom"]').magnificPopup({
+    type: 'image',
+    closeOnContentClick: false,
+    closeBtnInside: false,
+    mainClass: 'mfp-with-zoom mfp-img-mobile',
+    zoom: {
+      enabled: true,
+      duration: 150
+    }
+  });
+
+  $('[data-behavior~="gallery"]').magnificPopup({
+    delegate: 'a',
+    type: 'image',
+    closeOnContentClick: false,
+    closeBtnInside: false,
+    mainClass: 'mfp-with-zoom mfp-img-mobile',
+    gallery: {
+      enabled: true
+    },
+    zoom: {
+      enabled: true,
+      duration: 150
+    }
+  });
+});

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

@@ -0,0 +1,11 @@
+Trestle.ready(function() {
+  $('select[data-enable-select2]').each(function() {
+    $(this).select2({
+      theme: 'bootstrap',
+      containerCssClass: ':all:',
+      dropdownCssClass: function(el) {
+        return el[0].className.replace(/\s*form-control\s*/, '');
+      }
+    });
+  });
+});

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

@@ -0,0 +1,52 @@
+Trestle.ready(function() {
+  var sidebar = $('.app-sidebar');
+
+  // Toggle mobile navigation using menu button
+
+  sidebar.find('.navbar-toggle').on('click', function(e) {
+    e.preventDefault();
+
+    $('.app-wrapper').addClass('animate');
+    $('body').toggleClass('mobile-nav-expanded');
+  });
+
+  $('.app-wrapper').on('transitionend webkitTransitionEnd', function() {
+    $(this).removeClass('animate');
+  });
+
+
+  // Interacting outside of the sidebar closes the navigation
+
+  $('.app-wrapper').on('click touchstart', function(e) {
+    var navExpanded = $('body').hasClass('mobile-nav-expanded');
+
+    var clickInHeader = $(e.target).closest('.app-header').length;
+    var clickInSidebar = $(e.target).closest('.app-sidebar').length;
+
+    if (navExpanded && !clickInHeader && !clickInSidebar) {
+      e.stopPropagation();
+      e.preventDefault();
+
+      $('.app-wrapper').addClass('animate');
+      $('body').removeClass('mobile-nav-expanded');
+    }
+  });
+
+
+  // Toggle sidebar expand/collapse
+
+  sidebar.find('.toggle-sidebar').on('click', function(e) {
+    e.preventDefault();
+
+    if (sidebar.hasClass('expanded') || sidebar.hasClass('collapsed')) {
+      sidebar.removeClass('expanded').removeClass('collapsed');
+      document.cookie = "trestle:sidebar=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT";
+    } else if ($(document).width() >= 1200) {
+      sidebar.addClass('collapsed');
+      document.cookie = "trestle:sidebar=collapsed; path=/";
+    } else if ($(document).width() >= 768) {
+      sidebar.addClass('expanded');
+      document.cookie = "trestle:sidebar=expanded; path=/";
+    }
+  });
+});

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

@@ -0,0 +1,21 @@
+$(document).on('click', 'tr[data-url]', function(e) {
+  var row = $(e.currentTarget);
+
+  if (row.data('url') == 'auto') {
+    var url = row.find('td:not(.actions) a:first').attr('href');
+  } else {
+    var url = row.data('url');
+  }
+
+  if (url) {
+    if (e.metaKey || e.ctrlKey) {
+      window.open(url, '_blank');
+    } else {
+      Trestle.visit(url);
+    }
+  }
+});
+
+$(document).on('click', 'tr[data-url] a', function(e) {
+  e.stopPropagation();
+});

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

@@ -0,0 +1,13 @@
+Trestle.ready(function() {
+  $("a[data-toggle='tab']").on('shown.bs.tab', function(e) {
+    var hash = $(this).attr("href");
+
+    if (hash.substr(0, 1) == "#") {
+      history.replaceState({ turbolinks: {} }, "", "#!" + hash.substr(1));
+    }
+  });
+
+  if (location.hash.substr(0, 2) == "#!") {
+    $("a[data-toggle='tab'][href='#" + location.hash.substr(2) + "']").tab("show");
+  }
+});

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

@@ -0,0 +1,3 @@
+Trestle.ready(function() {
+  $('[data-toggle="tooltip"]').tooltip();
+});

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

@@ -0,0 +1,23 @@
+//= 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 trestle/custom
+//= require_tree .
+
+var Trestle = window.Trestle = {};
+
+Trestle.i18n = {};
+
+if (typeof(Turbolinks) !== 'undefined' && Turbolinks.supported) {
+  Trestle.ready = function(callback) { $(document).on('turbolinks:load', callback); };
+  Trestle.visit = function(url) { Turbolinks.visit(url); };
+} else {
+  Trestle.ready = function(callback) { $(callback); };
+  Trestle.visit = function(url) { document.location = url; };
+}

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

@@ -0,0 +1,4 @@
+// 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/components/_table.scss

@@ -77,4 +77,10 @@
     height: 32px;
     vertical-align: middle;
   }
+
+  ul, ol {
+    margin-bottom: 0;
+    padding-left: 0;
+    list-style-position: inside;
+  }
 }

data/app/helpers/trestle/form_helper.rb

@@ -5,7 +5,7 @@ module Trestle
       options[:as] ||= admin.admin_name.singularize
 
       form_for(instance, options) do |f|
-        with_form(f) { yield }
+        with_form(f) { yield f }
       end
     end
 

data/app/helpers/trestle/format_helper.rb

@@ -0,0 +1,48 @@
+module Trestle
+  module FormatHelper
+    def format_value(value, options={})
+      if options.key?(:format)
+        format_value_from_options(value, options)
+      else
+        autoformat_value(value, options)
+      end
+    end
+
+    def format_value_from_options(value, options={})
+      case options[:format]
+      when :currency
+        number_to_currency(value)
+      when :tags
+        safe_join(value.map { |tag| content_tag(:span, tag, class: "tag") })
+      else
+        value
+      end
+    end
+
+    def autoformat_value(value, options={})
+      case value
+      when Array
+        content_tag(:ol, safe_join(value.map { |v| content_tag(:li, autoformat_value(v, options)) }, "\n"))
+      when Time, DateTime
+        timestamp(value)
+      when Date
+        datestamp(value)
+      when TrueClass, FalseClass
+        status_tag(icon("fa fa-check"), :success) if value
+      when NilClass
+        text = options.key?(:blank) ? options[:blank] : I18n.t("admin.format.blank")
+        content_tag(:span, text, class: "blank")
+      when String
+        if value.html_safe? || options[:truncate] == false
+          value
+        else
+          truncate(value, options[:truncate] || {})
+        end
+      when ->(value) { value.respond_to?(:id) }
+        display(value)
+      else
+        value
+      end
+    end
+  end
+end

data/app/helpers/trestle/url_helper.rb

@@ -6,13 +6,7 @@ module Trestle
         content = capture(&block)
       end
 
-      if options.key?(:admin)
-        admin = Trestle.lookup(options.delete(:admin))
-      else
-        admin = admin_for(instance) || self.admin
-      end
-
-      if admin
+      if admin = (options.key?(:admin) ? Trestle.lookup(options.delete(:admin)) : admin_for(instance))
         link_to(content, admin_url_for(instance, admin: admin), options)
       else
         content
@@ -20,7 +14,7 @@ module Trestle
     end
 
     def admin_url_for(instance, options={})
-      admin = Trestle.lookup(options[:admin] || self.admin)
+      admin = options.key?(:admin) ? Trestle.lookup(options[:admin]) : admin_for(instance)
       admin.path(options[:action] || :show, id: admin.to_param(instance)) if admin
     end
 

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

@@ -23,11 +23,11 @@
 
     <script type="text/javascript">
       <% Trestle.config.javascript_i18n_keys.each do |key| %>
-        Trestle.i18n['<%= key %>'] = "<%= escape_javascript(t(key, default: t(key, locale: :en))) %>";
+      Trestle.i18n['<%= key %>'] = "<%= escape_javascript(t(key, default: t(key, locale: :en))) %>";
       <% end %>
 
-      if (Flatpickr.l10ns['<%= I18n.locale %>']) {
-        Flatpickr.localize(Flatpickr.l10ns['<%= I18n.locale %>']);
+      if (flatpickr.l10ns['<%= I18n.locale %>']) {
+        flatpickr.localize(flatpickr.l10ns['<%= I18n.locale %>']);
       }
     </script>
 

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

@@ -1,5 +1,5 @@
 <% content_for(:title, admin.admin_name.titleize) %>
 
 <%= render layout: "layout" do %>
-  To customize this template, please create <code>app/views/<%= admin.controller_path %>/index.html.erb</code>.
+  <p><%= t("trestle.onboarding.no_template", path: "app/views/#{admin.controller_path}/index.html.erb", default: "To customize this template, please create <code>%{path}</code>.").html_safe %></p>
 <% end %>

data/app/views/trestle/dashboard/index.html.erb

@@ -1,5 +1,5 @@
-<% content_for(:title, "Welcome to Trestle") %>
+<% content_for(:title, t("trestle.onboarding.welcome", default: "Welcome to Trestle")) %>
 
 <%= render layout: "layout" do %>
-  <p>To begin, please create an admin within <code>app/admin</code>.</p>
+  <p><%= t("trestle.onboarding.no_admins", default: "To begin, please create an admin within <code>app/admin</code>.").html_safe %></p>
 <% end %>

data/app/views/trestle/resource/_form.html.erb

@@ -1,5 +1,5 @@
 <% if admin.form -%>
   <%= admin.form.render(self, instance) %>
 <% else %>
-  <p>Please define a form block or create a <code>_form.html</code> partial.</p>
+  <p><%= t("trestle.onboarding.no_form", default: "Please define a form block or create a <code>_form.html</code> partial.").html_safe %></p>
 <% end %>

data/app/views/trestle/resource/edit.html.erb

@@ -1,4 +1,4 @@
-<% title = I18n.t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
 
 <% content_for(:title, title) %>
 <% breadcrumb title %>
@@ -13,6 +13,6 @@
   <% end unless admin.readonly? %>
 <% end %>
 
-<%= trestle_form_for instance, url: admin.readonly? ? "#" : admin.path(:update, id: admin.to_param(instance)) do |f| %>
+<%= trestle_form_for instance, url: admin.readonly? ? "#" : admin.path(:update, id: admin.to_param(instance)), method: :patch do |f| %>
   <%= render partial: "form", layout: "layout" %>
 <% end %>

data/app/views/trestle/resource/index.html.erb

@@ -1,4 +1,4 @@
-<% content_for(:title, I18n.t("admin.titles.index", default: "Listing %{pluralized_model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize)) %>
+<% content_for(:title, t("admin.titles.index", default: "Listing %{pluralized_model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize)) %>
 
 <% content_for(:primary_toolbar) do %>
   <%= link_to icon("fa fa-plus"), admin.path(:new), class: "btn btn-default btn-lg" unless admin.readonly? %>

data/app/views/trestle/resource/new.html.erb

@@ -7,6 +7,6 @@
   <%= button_tag t("admin.buttons.save", default: "Save %{model_name}", model_name: admin.model_name), class: "btn btn-success btn-lg" %>
 <% end %>
 
-<%= trestle_form_for instance, url: admin.path do |f| %>
+<%= trestle_form_for instance, url: admin.path, method: :post do |f| %>
   <%= render partial: "form", layout: "layout" %>
 <% end %>

data/app/views/trestle/resource/show.html.erb

@@ -1,4 +1,4 @@
-<% title = I18n.t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
+<% title = t("admin.titles.edit", default: "Editing %{model_name}", model_name: admin.model_name, pluralized_model_name: admin.model_name.pluralize) %>
 
 <% content_for(:title, title) %>
 <% breadcrumb title %>
@@ -13,6 +13,6 @@
   <% end unless admin.readonly? %>
 <% end %>
 
-<%= trestle_form_for instance, url: admin.readonly? ? "#" : admin.path(:update, id: admin.to_param(instance)) do |f| %>
+<%= trestle_form_for instance, url: admin.readonly? ? "#" : admin.path(:update, id: admin.to_param(instance)), method: :patch do |f| %>
   <%= render partial: "form", layout: "layout" %>
 <% end %>

data/app/views/trestle/shared/_sidebar.html.erb

@@ -1,7 +1,7 @@
 <aside class="app-sidebar<%= " #{cookies["trestle:sidebar"]}" if cookies["trestle:sidebar"] %>">
   <header class="app-sidebar-header">
     <button class="navbar-toggle">
-      <span class="sr-only">Toggle navigation</span>
+      <span class="sr-only"><%= t("admin.ui.toggle_navigation", default: "Toggle navigation") %></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
@@ -32,6 +32,8 @@
       <% end %>
     </nav>
 
-    <button class="toggle-sidebar"></button>
+    <button class="toggle-sidebar">
+      <span class="sr-only"><%= t("admin.ui.toggle_sidebar", default: "Toggle sidebar") %></span>
+    </button>
   </div>
 </aside>