trestle 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1f07f2d3328a13c6ac319c7e04b8926a0dc09660
-  data.tar.gz: a8adb65b4c3bd295c5e80397fba9c8968d08febd
+SHA256:
+  metadata.gz: a9c0345d2065a71ba7b11d5044f6cf0db55e08d8a9e0d5d3a83c715bf029f76f
+  data.tar.gz: 8ce2f2a003d051204d1ad0017be70a9fe220ed0e4bf47bc2f3e6234ad751c316
 SHA512:
-  metadata.gz: 9d565ea8bd72cca11c5eb2de1ea72332e8980093e5f4147f598f64958ee82b3f1799de37dc7c2c99b68cbb773821454ee62c5230b4ba55bdc50828e516dc347e
-  data.tar.gz: da2e9069173f7fa34f0af87c392af4b00dc9ea5b9b42eb2e6cb3c2df536065bd9648b5482043260c748e919fa735127d3fafb32537e523fe356da52765d7221a
+  metadata.gz: 8638b5a1c9cd255fde7251ebb44d86f602523d5c6ef383044a033e2239973c6239ff4f7d018d9273fc232805b41bb7a4ad15f83110fd5e95d0cddcdf4c2fbca4
+  data.tar.gz: b4f2bcdb3835d26b81186b790952c602069e4bae7a59cf0791370c455a6488502943f426fc91505595761a6fc1f6b57718bda02a0fff638fdd154c2b7c8b0d7d

data/README.md

@@ -4,10 +4,10 @@
 
 # Trestle
 
-[![RubyGem](https://img.shields.io/gem/v/trestle.svg?style=flat-square&colorB=4065a9)](https://rubygems.org/gems/trestle)
-[![Travis](https://img.shields.io/travis/TrestleAdmin/trestle.svg?style=flat-square)](https://travis-ci.org/TrestleAdmin/trestle)
-[![Code Climate](https://img.shields.io/codeclimate/github/TrestleAdmin/trestle.svg?style=flat-square)](https://codeclimate.com/github/TrestleAdmin/trestle)
-[![Coveralls](https://img.shields.io/coveralls/TrestleAdmin/trestle.svg?style=flat-square)](https://coveralls.io/github/TrestleAdmin/trestle)
+[![RubyGem](https://img.shields.io/gem/v/trestle.svg?style=flat&colorB=4065a9)](https://rubygems.org/gems/trestle)
+[![Travis](https://img.shields.io/travis/TrestleAdmin/trestle.svg?style=flat)](https://travis-ci.org/TrestleAdmin/trestle)
+[![Coveralls](https://img.shields.io/coveralls/TrestleAdmin/trestle.svg?style=flat)](https://coveralls.io/github/TrestleAdmin/trestle)
+[![Code Climate](https://api.codeclimate.com/v1/badges/c529a7a9c500ed81baed/maintainability)](https://codeclimate.com/github/TrestleAdmin/trestle)
 
 > A modern, responsive admin framework for Ruby on Rails
 
@@ -87,12 +87,13 @@ end
 
 The following plugins are currently available:
 
-| Name | Description | GitHub |
+| Name | Description | Links |
 | --- | --- | --- |
-| *trestle-auth* | User authentication plugin | https://github.com/TrestleAdmin/trestle-auth |
-| *trestle-search* | Search plugin | https://github.com/TrestleAdmin/trestle-search |
-| *trestle-tinymce* | TinyMCE (WYSIWYG editor) integration | https://github.com/TrestleAdmin/trestle-tinymce |
-| *trestle-simplemde* | SimpleMDE (Markdown editor) integration | https://github.com/TrestleAdmin/trestle-simplemde |
+| *trestle-auth* | User authentication plugin | [GitHub](https://github.com/TrestleAdmin/trestle-auth) \| [RubyGems](https://rubygems.org/gems/trestle-auth) |
+| *trestle-search* | Search plugin | [GitHub](https://github.com/TrestleAdmin/trestle-search) \| [RubyGems](https://rubygems.org/gems/trestle-search) |
+| *trestle-tinymce* | [TinyMCE](https://www.tinymce.com/) (WYSIWYG editor) integration | [GitHub](https://github.com/TrestleAdmin/trestle-tinymce) \| [RubyGems](https://rubygems.org/gems/trestle-tinymce) |
+| *trestle-simplemde* | [SimpleMDE](https://simplemde.com/) (Markdown editor) integration | [GitHub](https://github.com/TrestleAdmin/trestle-simplemde) \| [RubyGems](https://rubygems.org/gems/trestle-simplemde) |
+| *trestle-sidekiq* | [Sidekiq](http://sidekiq.org/) integration | [GitHub](https://github.com/TrestleAdmin/trestle-sidekiq) \| [RubyGems](https://rubygems.org/gems/trestle-sidekiq) |
 
 
 ## License

data/app/assets/javascripts/trestle/components/_dialog.js

@@ -1,5 +1,11 @@
-Trestle.Dialog = function() {
+Trestle.Dialog = function(options) {
+  options = options || {};
+
   this.el = Trestle.Dialog.getElement();
+
+  if (options.modalClass) {
+    this.el.find('.modal-dialog').addClass(options.modalClass);
+  }
 };
 
 Trestle.Dialog.TEMPLATE =
@@ -31,6 +37,15 @@ Trestle.Dialog.getElement = function() {
   return el;
 };
 
+Trestle.Dialog.showError = function(title, errorText) {
+  var dialog = new Trestle.Dialog({ modalClass: 'modal-lg' });
+
+  dialog.showError(title, $('<pre>').addClass('exception').text(errorText));
+  dialog.show();
+
+  return dialog;
+};
+
 Trestle.Dialog.prototype.load = function(url) {
   var dialog = this;
 
@@ -50,7 +65,12 @@ Trestle.Dialog.prototype.load = function(url) {
       dialog.setContent(content);
     },
     error: function(xhr, status, error) {
-      dialog.showError(error);
+      var errorMessage = Trestle.i18n['trestle.dialog.error'] || 'The request could not be completed.';
+
+      var title = error || errorMessage;
+      var content = $('<p>').text(errorMessage);
+
+      dialog.showError(title, content);
     }
   });
 };
@@ -68,20 +88,18 @@ Trestle.Dialog.prototype.setContent = function(content) {
   $(Trestle).trigger('init', this.el);
 };
 
-Trestle.Dialog.prototype.showError = function(error) {
+Trestle.Dialog.prototype.showError = function(title, content) {
   this.el.addClass('error');
 
   var container = this.el.find('.modal-content').empty();
 
-  var errorMessage = Trestle.i18n['trestle.dialog.error'] || 'The request could not be completed.';
-
   $('<div class="modal-header">')
     .append('<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>')
-    .append('<h4 class="modal-title"></h4>').find('h4').text(error || errorMessage).end()
+    .append('<h4 class="modal-title"></h4>').find('h4').text(title).end()
     .appendTo(container);
 
   $('<div class="modal-body">')
-    .append('<p>').find('p').text(errorMessage).end()
+    .append(content)
     .appendTo(container);
 
   $('<div class="modal-footer">')
@@ -102,6 +120,9 @@ $(document).on('click', '[data-behavior="dialog"]', function(e) {
 
   var url = $(this).data('url') || $(this).attr('href');
 
-  var dialog = new Trestle.Dialog();
+  var dialog = new Trestle.Dialog({
+    modalClass: $(this).data('dialog-class')
+  });
+
   dialog.load(url);
 });

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

@@ -10,15 +10,36 @@ Trestle.init(function(e, root) {
 
   form
     .on('ajax:complete', function(e, xhr, status) {
-      // Find the parent context and replace content
-      var context = $(this).closest('[data-context]');
-      context.html(xhr.responseText);
+      var contentType = xhr.getResponseHeader("Content-Type").split(";")[0];
+
+      if (contentType == "text/html") {
+        if (/<html/i.test(xhr.responseText)) {
+          // Response is a full HTML page, likely an error page. Render within an iframe.
+
+          var context = $(this).closest('[data-context]');
+          var iframe = $("<iframe>").addClass('error-iframe').get(0);
+          context.html(iframe);
 
-      // Initialize replaced elements within the context
-      $(Trestle).trigger('init', context);
+          iframe.contentWindow.document.documentElement.innerHTML = xhr.responseText;
+        } else {
+          // Find the parent context and replace content
+          var context = $(this).closest('[data-context]');
+          context.html(xhr.responseText);
 
-      // Focus the correct tab
-      Trestle.focusActiveTab();
+          // Initialize replaced elements within the context
+          $(Trestle).trigger('init', context);
+
+          // Focus the correct tab
+          Trestle.focusActiveTab();
+        }
+      } else {
+        // Assume an error response
+        var title = xhr.status + " (" + xhr.statusText + ")";
+        Trestle.Dialog.showError(title, xhr.responseText);
+
+        // Reset submit button
+        form.find(':submit').prop('disabled', false).removeClass('loading');
+      }
     })
     .on('ajax:success', function(e, data, status, xhr) {
       var context = $(this).closest('[data-context]');

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

@@ -1,4 +1,6 @@
 Trestle.ready(function() {
+  var body    = $('body');
+  var wrapper = $('.app-wrapper');
   var sidebar = $('.app-sidebar');
 
   // Toggle mobile navigation using menu button
@@ -6,18 +8,18 @@ Trestle.ready(function() {
   sidebar.find('.navbar-toggle').on('click', function(e) {
     e.preventDefault();
 
-    $('.app-wrapper').addClass('animate');
-    $('body').toggleClass('mobile-nav-expanded');
+    wrapper.addClass('animate');
+    body.toggleClass('mobile-nav-expanded');
   });
 
-  $('.app-wrapper').on('transitionend webkitTransitionEnd', function() {
+  wrapper.on('transitionend webkitTransitionEnd', function() {
     $(this).removeClass('animate');
   });
 
 
   // Interacting outside of the sidebar closes the navigation
 
-  $('.app-wrapper').on('click touchstart', function(e) {
+  wrapper.on('click touchstart', function(e) {
     var navExpanded = $('body').hasClass('mobile-nav-expanded');
 
     var clickInHeader = $(e.target).closest('.app-header').length;
@@ -38,14 +40,14 @@ Trestle.ready(function() {
   sidebar.find('.toggle-sidebar').on('click', function(e) {
     e.preventDefault();
 
-    if (sidebar.hasClass('expanded') || sidebar.hasClass('collapsed')) {
-      sidebar.removeClass('expanded').removeClass('collapsed');
+    if (body.hasClass('sidebar-expanded') || body.hasClass('sidebar-collapsed')) {
+      body.removeClass('sidebar-expanded').removeClass('sidebar-collapsed');
       Trestle.cookie.delete("trestle:sidebar");
     } else if ($(document).width() >= 1200) {
-      sidebar.addClass('collapsed');
+      body.addClass('sidebar-collapsed');
       Trestle.cookie.set("trestle:sidebar", "collapsed");
     } else if ($(document).width() >= 768) {
-      sidebar.addClass('expanded');
+      body.addClass('sidebar-expanded');
       Trestle.cookie.set("trestle:sidebar", "expanded");
     }
   });

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

@@ -1,8 +1,9 @@
 Trestle.init(function(e, root) {
   $(root).find("a[data-toggle='tab']").on('shown.bs.tab', function(e) {
     var hash = $(this).attr("href");
+    var withinModal = $(this).closest('.modal').length > 0;
 
-    if (hash.substr(0, 1) == "#") {
+    if (hash.substr(0, 1) == "#" && !withinModal) {
       history.replaceState({ turbolinks: {} }, "", "#!" + hash.substr(1));
     }
   });

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

@@ -1,3 +1,19 @@
 Trestle.init(function(e, root) {
   $(root).find('[data-toggle="tooltip"]').tooltip();
+  $(root).find('[data-toggle="popover"]').popover();
 });
+
+if (!('ontouchstart' in window)) {
+  Trestle.ready(function() {
+    $(document).tooltip({
+      selector:  '.app-nav a',
+      trigger:   'hover',
+      placement: 'right',
+      container: 'body',
+      template:  '<div class="tooltip nav-tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
+      title: function() {
+        return $(this).find('.nav-label').text();
+      }
+    });
+  });
+};

data/app/assets/stylesheets/trestle/components/_modal.scss

@@ -79,6 +79,10 @@
 
 .modal-body {
   @extend .tab-content;
+
+  pre.exception {
+    max-height: 75vh;
+  }
 }
 
 .modal-footer {

data/app/assets/stylesheets/trestle/components/_navigation.scss

@@ -93,6 +93,10 @@
   }
 }
 
+.nav-tooltip {
+  display: none !important;
+}
+
 @mixin collapsed-nav-header {
   height: 0;
   padding: 10px 15px 15px;
@@ -124,6 +128,10 @@
 }
 
 @include tablet {
+  .nav-tooltip {
+    display: block !important;
+  }
+
   .app-nav {
     .nav-label, .nav-badge {
       display: none;
@@ -138,8 +146,10 @@
         display: block;
       }
     }
+  }
 
-    .expanded & {
+  .sidebar-expanded {
+    .app-nav {
       .nav-header a {
         height: auto;
         padding: 5px 20px;
@@ -159,23 +169,33 @@
       .nav-label  { display: inline; }
       .nav-badge  { display: block; }
     }
+
+    .nav-tooltip {
+      display: none !important;
+    }
   }
 }
 
 @include desktop {
-  .collapsed .app-nav {
-    .nav-label, .nav-badge {
-      display: none;
-    }
+  .sidebar-collapsed {
+    .app-nav {
+      .nav-label, .nav-badge {
+        display: none;
+      }
 
-    .nav-header a {
-      @include collapsed-nav-header;
-    }
+      .nav-header a {
+        @include collapsed-nav-header;
+      }
 
-    .collapsed .nav-header a {
-      &::after {
-        display: block;
+      .collapsed .nav-header a {
+        &::after {
+          display: block;
+        }
       }
     }
+
+    .nav-tooltip {
+      display: block !important;
+    }
   }
 }

data/app/assets/stylesheets/trestle/components/_sidebar.scss

@@ -171,7 +171,7 @@
       content: $fa-var-angle-double-right;
     }
 
-    &.expanded {
+    .sidebar-expanded & {
       width: $sidebar-width;
 
       .app-sidebar-header {
@@ -204,7 +204,7 @@
 
 @include desktop {
   .app-sidebar {
-    &.collapsed {
+    .sidebar-collapsed & {
       width: $sidebar-width-collapsed;
 
       .app-sidebar-header {

data/app/assets/stylesheets/trestle/components/_tags.scss

@@ -14,6 +14,15 @@
   }
 }
 
+a.tag {
+  &:hover, &:focus {
+    text-decoration: none;
+    color: white;
+    background: $brand-primary;
+    border-left-color: darken($brand-primary, 10%);
+  }
+}
+
 .tag-select {
   &.select2-selection--multiple {
     .select2-selection__choice {

data/app/assets/stylesheets/trestle/components/_wells.scss

@@ -1,5 +1,5 @@
 .well {
-  padding: 20px;
+  padding: 15px;
 
   box-shadow: none;
   border-radius: 0;
@@ -13,6 +13,14 @@
   }
 }
 
+.well-lg {
+  padding: 24px;
+}
+
+.well-sm {
+  padding: 9px;
+}
+
 .main-content-sidebar .well {
   margin: 0 -20px;
   background: darken($well-bg, 3%);

data/app/assets/stylesheets/trestle/core/_defaults.scss

@@ -31,8 +31,8 @@ $sidebar-toggle-color: rgba(white, 0.5) !default;
 
 $content-header-background: rgba(white, 0.6) !default;
 
-$content-sidebar-width:      275px !default;
-$content-sidebar-background: rgba(black, 0.025);
+$content-sidebar-width:      285px !default;
+$content-sidebar-background: rgba(black, 0.025) !default;
 
 $sidebar-transition-duration: 250ms !default;
 
@@ -65,9 +65,9 @@ $table-bg-accent:    rgba(black, 0.02) !default;
 $table-bg-hover:     rgba(black, 0.04) !default;
 $table-border-color: rgba(black, 0.13) !default;
 
-$well-border: transparent;
+$well-border: transparent !default;
 
-$panel-border-radius: 0;
+$panel-border-radius: 0 !default;
 
 $popover-shadow:  0 3px 6px rgba(black, .175) !default;
 $dropdown-shadow: $popover-shadow !default;

data/app/assets/stylesheets/trestle/core/_layout.scss

@@ -41,6 +41,9 @@ img {
 
 .app-main {
   flex: 1 0 auto;
+
+  display: flex;
+  flex-direction: column;
 }
 
 .app-footer {
@@ -57,6 +60,11 @@ img {
   }
 }
 
+.error-iframe {
+  border: 0;
+  flex: 1;
+}
+
 @include mobile {
   body {
     height: auto;

data/app/assets/stylesheets/trestle/core/_typography.scss

@@ -19,6 +19,45 @@ a {
   border-radius: 10em !important;
 }
 
+.main-content-sidebar {
+  font-size: 13px;
+
+  h1, h2, h3, h4, h5, h6 {
+    color: #666;
+    border-bottom: 1px solid #ddd;
+
+    padding-top: 5px;
+    padding-bottom: 0.5em;
+
+    margin-top: 20px;
+    margin-bottom: 15px;
+  }
+
+  h1 {
+    font-size: 28px;
+  }
+
+  h2 {
+    font-size: 24px;
+  }
+
+  h3 {
+    font-size: 21px;
+  }
+
+  h4 {
+    font-size: 17px;
+  }
+
+  h5 {
+    font-size: 14px;
+  }
+
+  h6 {
+    font-size: 12px;
+  }
+}
+
 @include mobile {
   h1 {
     font-size: $font-size-h1 - 6px;