trestle 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f74ea1864e543221e224711053214f59d7ebaaa302ae105a566e6105dc8486
-  data.tar.gz: a3fd93cbc5acb0bacd23cc4354a0c6d2875709c20f84222d5c6a461e38b19505
+  metadata.gz: 499a6802f0891311253e5a4999b494715ccdfa8d070bae35827268044fc5a7f8
+  data.tar.gz: 5ac6a1b33a8b33ae636a7c948adc42d73212f6fba90b7ea71953a69b961f4723
 SHA512:
-  metadata.gz: a821671d5f9f3d1fc49ce3bde54890957c0562def8d512f016c8860ad6aa8f39bdbeb38dd821f587819db3e90bb2f239f187d81fdb22dfc28ec2be58b20790d3
-  data.tar.gz: 49fc89e2f174f9988ca56ba168b2b229b72bde4a8de88d2936b8e9712cbe87fa166d52211d11576d6dfe5e2ea0ed3a8f2393b250c2a7424bbf19fbe89c401d30
+  metadata.gz: aef9565030e42e5fe42dd0a0773c65b1eb35a41c743678a1799ae57df99e438f7d61c3cb74b905171ff844134176f9a1c95a21ff917e6e25e072b494d1d776bb
+  data.tar.gz: 4971e16e2e693081c8ed4d20a53bf4ce980261e66c0370c208356eadd41877f411290a8c81f5e0e5a796e5cfa70ff17a2cb5ab7b5b74848e658806d99cb89646

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

@@ -1,3 +1,29 @@
+Trestle.confirmation = {};
+
+Trestle.confirmation.DEFAULTS = {
+  rootSelector:   'body',
+  singleton:      true,
+  popout:         true,
+  title:          Trestle.i18n['admin.confirmation.title'] || 'Are you sure?',
+  btnOkIcon:      '',
+  btnOkClass:     'btn-primary',
+  btnOkLabel:     Trestle.i18n['admin.confirmation.ok'] || 'OK',
+  btnCancelIcon:  '',
+  btnCancelClass: 'btn-default',
+  btnCancelLabel: Trestle.i18n['admin.confirmation.cancel'] || 'Cancel',
+  copyAttributes: ''
+};
+
+Trestle.confirmation.CONFIRM = $.extend({}, Trestle.confirmation.DEFAULTS, {
+  selector: '[data-toggle="confirm"]'
+});
+
+Trestle.confirmation.DELETE = $.extend({}, Trestle.confirmation.DEFAULTS, {
+  selector:   '[data-toggle="confirm-delete"]',
+  btnOkClass: 'btn-danger',
+  btnOkLabel: Trestle.i18n['admin.confirmation.delete'] || 'Delete'
+});
+
 Trestle.ready(function() {
   // This must be bound to an element beneath document so
   // that it is fired before any jquery_ujs events.
@@ -6,18 +32,9 @@ Trestle.ready(function() {
   // 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'] || 'Are you sure?',
-    btnOkIcon:      '',
-    btnOkClass:     'btn-danger',
-    btnOkLabel:     Trestle.i18n['admin.confirmation.delete'] || 'Delete',
-    btnCancelIcon:  '',
-    btnCancelClass: 'btn-default',
-    btnCancelLabel: Trestle.i18n['admin.confirmation.cancel'] || 'Cancel',
-    copyAttributes: ''
-  });
+  // Delete confirmation
+  new $.fn.confirmation.Constructor(root, Trestle.confirmation.DELETE);
+
+  // General confirmation
+  new $.fn.confirmation.Constructor(root, Trestle.confirmation.CONFIRM);
 });

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

@@ -9,13 +9,24 @@ Trestle.init(function(e, root) {
   var form = $(root).find('form[data-behavior="trestle-form"]');
 
   form
+    .on('ajax:send', function(e, xhr) {
+      // Disable submit buttons
+      $(this).find(':submit').prop('disabled', true);
+
+      // Set loading status on button that triggered submission
+      var button = $(this).data('trestle:submitButton');
+      if (button) { $(button).addClass('loading'); }
+    })
     .on('ajax:complete', function(e, xhr, status) {
-      var contentType = xhr.getResponseHeader("Content-Type").split(";")[0];
+      // Reset submit buttons
+      $(this).find(':submit').prop('disabled', false).removeClass('loading');
+      $(this).removeData('trestle:submitButton');
 
-      if (contentType == "text/html") {
+      var contentType = xhr.getResponseHeader("Content-Type");
+
+      if (contentType && contentType.split(";")[0] == "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);
@@ -36,9 +47,6 @@ Trestle.init(function(e, root) {
         // 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) {
@@ -46,6 +54,9 @@ Trestle.init(function(e, root) {
       var location = xhr.getResponseHeader("X-Trestle-Location");
 
       if (location) {
+        // Retain current active tab
+        location = location + document.location.hash;
+
         // Update the URL in the browser and context
         history.replaceState({}, "", location);
         context.data('context', location);
@@ -57,15 +68,8 @@ Trestle.init(function(e, root) {
       }
     });
 
-  // Loading indicator
   form.find(':submit').click(function() {
-    var button = $(this);
-
-    // Delay to ensure form is still submitted
-    setTimeout(function() {
-      if (form[0].checkValidity()) {
-        button.prop('disabled', true).addClass('loading');
-      }
-    }, 1);
+    // Save this as the button that triggered the form
+    $(this).closest('form').data('trestle:submitButton', this);
   });
 });

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

@@ -20,6 +20,6 @@ Trestle.focusActiveTab = function() {
   }
 };
 
-Trestle.ready(function() {
+Trestle.init(function() {
   Trestle.focusActiveTab();
 });

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

@@ -3,6 +3,14 @@
   background-color: transparent;
   font-size: 12px;
 
+  > li + li:before {
+    content: "/";
+
+    @include mobile {
+      padding: 0 2px;
+    }
+  }
+
   .active, .active a {
     font-weight: normal;
     color: $breadcrumb-active-color;
@@ -11,4 +19,8 @@
       text-decoration: none;
     }
   }
+
+  @include mobile {
+    font-size: 11px;
+  }
 }

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

@@ -1,5 +1,72 @@
+@mixin button-child-visible($prefix, $selector) {
+  &.#{$prefix}-visible-xs,
+  &.#{$prefix}-visible-sm,
+  &.#{$prefix}-visible-md,
+  &.#{$prefix}-visible-lg {
+    #{$selector} { display: none; }
+  }
+
+  &.#{$prefix}-visible-xs {
+    @media (max-width: $screen-xs-max) {
+      #{$selector} { display: inline-block; }
+      @content;
+    }
+  }
+
+  &.#{$prefix}-visible-sm {
+    @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+      #{$selector} { display: inline-block; }
+      @content;
+    }
+  }
+
+  &.#{$prefix}-visible-md {
+    @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+      #{$selector} { display: inline-block; }
+      @content;
+    }
+  }
+
+  &.#{$prefix}-visible-lg {
+    @media (min-width: $screen-lg-min) {
+      #{$selector} { display: inline-block; }
+      @content;
+    }
+  }
+}
+
+@mixin button-child-hidden($prefix, $selector) {
+  &.#{$prefix}-hidden-xs {
+    @media (max-width: $screen-xs-max) {
+      #{$selector} { display: none; }
+      @content;
+    }
+  }
+
+  &.#{$prefix}-hidden-sm {
+    @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+      #{$selector} { display: none; }
+      @content;
+    }
+  }
+
+  &.#{$prefix}-hidden-md {
+    @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+      #{$selector} { display: none; }
+      @content;
+    }
+  }
+
+  &.#{$prefix}-hidden-lg {
+    @media (min-width: $screen-lg-min) {
+      #{$selector} { display: none; }
+      @content;
+    }
+  }
+}
+
 .btn {
-  border: none;
+  border-width: 0;
   box-shadow: none;
 
   &.loading {
@@ -10,6 +77,34 @@
       margin-right: 10px;
     }
   }
+
+  > i + .btn-label {
+    margin-left: 5px;
+  }
+
+  &.icon-visible-xs,
+  &.icon-visible-sm,
+  &.icon-visible-md,
+  &.icon-visible-lg {
+    > i + .btn-label {
+      margin-left: 0;
+    }
+  }
+
+  @include button-child-visible('icon', '> i') {
+    > i + .btn-label {
+      margin-left: 5px;
+    }
+  };
+
+  @include button-child-hidden('icon', '> i') {
+    > i + .btn-label {
+      margin-left: 0;
+    }
+  };
+
+  @include button-child-visible('label', '> .btn-label');
+  @include button-child-hidden('label', '> .btn-label');
 }
 
 .btn-delete {
@@ -20,3 +115,9 @@
     background: $btn-danger-bg;
   }
 }
+
+.btn-new-resource {
+  .btn-label {
+    @include sr-only;
+  }
+}

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

@@ -1,38 +1,32 @@
 .content-header {
-  @extend .clearfix;
+  display: flex;
+  justify-content: space-between;
+
   background: $content-header-background;
-  padding: 5px 20px;
+  padding: 20px;
 
   h1 {
     font-weight: 300;
+    margin-top: 0;
   }
 
-  .btn-toolbar {
-    @extend .pull-right;
-    clear: right;
+  .breadcrumb {
+    margin-bottom: 0;
   }
 
-  .primary-toolbar {
-    margin-top: 16px;
+  .content-header-title {
+    margin: 5px 0;
+  }
 
-    .btn {
-      @extend .btn-lg;
-      font-size: 20px;
-      padding: 8px 16px;
-      border-radius: $border-radius-base;
-    }
+  .btn-toolbar {
+    text-align: right;
   }
 
   .secondary-toolbar {
     margin-top: 8px;
 
-    .btn {
-      font-size: 12px;
-      padding: 4px 10px;
-
-      i {
-        font-size: 11px;
-      }
+    @include mobile {
+      margin-top: 6px;
     }
   }
 }
@@ -59,6 +53,20 @@
   min-width: 0;
 }
 
+.main-content-header {
+  margin: -20px -20px 20px !important;
+  padding: $main-content-header-padding;
+  background: $main-content-header-background;
+  border-bottom: $main-content-header-border;
+}
+
+.main-content-footer {
+  margin: 20px -20px -20px !important;
+  padding: $main-content-footer-padding;
+  background: $main-content-footer-background;
+  border-top: $main-content-footer-border;
+}
+
 .main-content,
 .main-content-sidebar,
 .tab-pane {
@@ -84,7 +92,7 @@
 
 @include mobile {
   .content-header {
-    padding: 0 10px;
+    padding: 10px;
   }
 
   .main-content-area {
@@ -105,4 +113,16 @@
   .main-content-sidebar {
     padding: 15px;
   }
+
+  .main-content-header {
+    margin: -15px -15px 15px !important;
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+
+  .main-content-footer {
+    margin: 15px -15px -15px !important;
+    padding-left: 15px;
+    padding-right: 15px;
+  }
 }

data/app/assets/stylesheets/trestle/components/_input-group.scss

@@ -22,8 +22,15 @@
   }
 }
 
-.input-group-addon {
+.input-group-addon,
+.input-group-btn {
   width: auto;
   display: flex;
   align-items: center;
 }
+
+.input-group-btn {
+  > .btn {
+    border-width: 1px;
+  }
+}

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

@@ -86,6 +86,9 @@
 }
 
 .modal-footer {
+  background: $modal-footer-background;
+  border-color: $modal-footer-border-color;
+
   .primary-toolbar {
     float: right;
   }

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

@@ -1,6 +1,4 @@
 .pagination-container {
-  margin-top: 20px;
-  margin-bottom: 20px;
   text-align: right;
 
   p {
@@ -26,7 +24,6 @@
 
 @include mobile {
   .pagination-container {
-    margin-top: 10px;
     text-align: center;
 
     display: flex;

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

@@ -3,9 +3,17 @@
   @extend .nav-pills;
 
   display: flex;
+  flex-wrap: wrap;
 
-  > li + li {
-    margin-left: 4px;
+  margin-top: -4px;
+
+  > li {
+    margin-top: 4px;
+    margin-right: 4px;
+
+    &:last-child {
+      margin-right: 0;
+    }
   }
 
   > li > a {
@@ -14,6 +22,7 @@
 
     font-size: 11px;
     font-weight: normal;
+    white-space: nowrap;
 
     border-radius: 15px;
     padding: 2px 8px;