hyrax 2.8.0 → 3.0.0.pre.rc2

data/app/assets/javascripts/hyrax/file_manager/save_manager.es6

@@ -24,7 +24,7 @@ export default class SaveManager {
   }
 
   check_button() {
-    if(this.is_changed && this.save_button.text() == "Save") {
+    if(this.is_changed && this.save_button.selector.valueOf("data-action") === "*[data-action='save-actions']") {
       this.save_button.removeClass("disabled")
     } else {
       this.save_button.addClass("disabled")
@@ -41,13 +41,14 @@ export default class SaveManager {
         .fail((element) => { this.push_changed(element) })
       )
     })
-    this.save_button.text("Saving...")
+    var label = this.save_button.text()
+    this.save_button.text(label + " ...")
     this.save_button.addClass("disabled")
-    $.when.apply($, promises).always(() => { this.reset_save_button() })
+    $.when.apply($, promises).always(() => { this.reset_save_button(label) })
   }
   
-  reset_save_button() {
-    this.save_button.text("Save")
+  reset_save_button(label) {
+    this.save_button.text(label)
     this.check_button()
   }
 

data/app/assets/javascripts/hyrax/monkey_patch_turbolinks.js

@@ -0,0 +1,36 @@
+/*
+ * decaffeinate suggestions:
+ * DS102: Remove unnecessary code created because of implicit returns
+ * DS207: Consider shorter variations of null checks
+ * DS208: Avoid top-level this
+ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
+ */
+// Monkey patch Turbolinks to render 401
+// See https://github.com/turbolinks/turbolinks/issues/179
+//     https://github.com/samvera/hyrax/issues/617
+if (typeof Turbolinks !== 'undefined' && Turbolinks !== null) {
+  Turbolinks.HttpRequest.prototype.requestLoaded = function() {
+    return this.endRequest(() => {
+      if ((200 <= this.xhr.status && this.xhr.status < 300) || (this.xhr.status === 401)) {
+        return this.delegate.requestCompletedWithResponse(this.xhr.responseText, this.xhr.getResponseHeader("Turbolinks-Location"));
+      } else {
+        this.failed = true;
+        return this.delegate.requestFailedWithStatusCode(this.xhr.status, this.xhr.responseText);
+      }
+    });
+  };
+
+  // Fixes a back/forward navigation problem with UV and turbolinks
+  // See https://github.com/samvera/hyrax/issues/2964
+  // This is based on https://github.com/turbolinks/turbolinks/issues/219#issuecomment-275838923
+  $(window).on('popstate', event => {
+    this.turbolinks_location = Turbolinks.Location.wrap(window.location);
+    if (Turbolinks.controller.location.requestURL === this.turbolinks_location.requestURL) { return; }
+    if (event.state != null ? event.state.turbolinks : undefined) { return; }
+    if ((this.window_turbolinks = window.history.state != null ? window.history.state.turbolinks : undefined)) {
+      return Turbolinks.controller.historyPoppedToLocationWithRestorationIdentifier(this.turbolinks_location, this.window_turbolinks.restorationIdentifier);
+    } else {
+      return Turbolinks.controller.historyPoppedToLocationWithRestorationIdentifier(this.turbolinks_location, Turbolinks.uuid());
+    }
+  });
+}

data/app/assets/javascripts/hyrax/nav_safety.js

@@ -4,21 +4,39 @@
 // - Add the nav-safety class to the form element.
 
 Blacklight.onLoad(function() {
-  $('.nav-safety-confirm').on('click', function(evt) {
+  $('.nav-safety-confirm').on('show.bs.tab', function(evt) {
+    var previousTab = $(evt.relatedTarget).attr('href')
+    var formId = $(previousTab).find('form').attr('id');
+    if (typeof(formId)==="undefined") {
+      formId = $(previousTab).closest('form').attr('id');
+    }
     var dirtyData = $('#nav-safety-modal[dirtyData=true]');
     if (dirtyData.length > 0) {
       evt.preventDefault();
       evt.stopPropagation();
+      $('#nav-safety-dismiss').data('form_id',formId);
+      $('#nav-safety-dismiss').data('new_tab',$(evt.target).attr('href'));
       $('#nav-safety-modal').modal('show');
     }
   });
-  
+
   $('#nav-safety-dismiss').on('click', function(evt) {
-    // evt.preventDefault();
     nav_safety_off();
-    // $('#nav-safety-change-tab').modal('hide');
+    // Reset form content before navigating away
+    if ($(this).data('form_id')) {
+      formId = '#'+$(this).data('form_id');
+      $(formId)[0].reset();
+    }
+    // Navigate away from active tab to clicked tab
+    window.location = $(this).data('new_tab');
   });
-  
+
+  $('#nav-safety-acknowledge').on('click', function(evt) {
+    // Stay on current tab to allow save
+    $('#nav-safety-modal').modal('hide');
+  });
+
+
   $('form.nav-safety').on('change', function(evt) {
     nav_safety_on();
   });

data/app/assets/javascripts/hyrax/proxy_rights.js

@@ -22,6 +22,14 @@
             if (settings.afterAdd)
               settings.afterAdd(this, cloneElem);
           }
+        },
+        error: function (data) {
+          if (data.responseJSON !== undefined) {
+            errorMsg = data.responseJSON.description;
+            $('#errorMsg').text(errorMsg);
+            $('#proxy-deny-modal').modal('show');
+            return;
+          }
         }
       })
       return false;

data/app/assets/stylesheets/fileupload/jquery.fileupload-ui.scss

@@ -17,23 +17,9 @@
 
 .fileinput-button {
   float: left;
-  margin-right: .50em;
+  margin-right: 0.5em;
   overflow: hidden;
   position: relative;
-
-  input {
-    border-width: 0 0 100px 200px;
-    border: solid transparent;
-    cursor: pointer;
-    direction: ltr;
-    filter: alpha(opacity = 0);
-    margin: 0;
-    opacity: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    -moz-transform: translate(-300px, 0) scale(4);
-  }
 }
 
 // Global progress bar

data/app/assets/stylesheets/hyrax/_collections.scss

@@ -209,11 +209,13 @@ button.branding-banner-remove:hover {
     display: flex;
 
     .thumbnail-wrapper {
-      width: 50px;
+      flex: 0 0 64px;
+      margin-right: 10px;
+      overflow-x: hidden;
 
       > img {
-        height: 30px;
-        width: auto;
+        height: auto;
+        max-width: 64px;
       }
     }
 
@@ -401,22 +403,8 @@ button.branding-banner-remove:hover {
   .section-add-sharing {
     padding-bottom: 40px;
 
-    .form-inline {
-      label {
-        padding-right: 5px;
-        text-align: right;
-        width: 100px;
-      }
-
-      input,
-      select,
-      .select2-container {
-        width: 200px;
-      }
-
-      .btn {
-        width: 75px;
-      }
+    .sharing-row-form {
+      margin-bottom: $padding-large-vertical;
     }
   }
 
@@ -673,7 +661,7 @@ button.branding-banner-remove:hover {
 
 .hyc-bl-results {
 
-  margin: 0 0 2em;
+  margin: 5em 0 2em;
 
   .alert {
     margin: 0;

data/app/assets/stylesheets/hyrax/_featured.scss

@@ -11,6 +11,10 @@ ol#featured_works {
   min-height: 100px;
   padding: 8px;
 
+  &:first-of-type {
+    border-top: 0;
+  }
+
   h3 {
     font-size: 1.1em;
     margin-top: 0;

data/app/assets/stylesheets/hyrax/_file-listing.scss

@@ -97,8 +97,7 @@ h4 .small {
   text-decoration: none;
 }
 
-input.batch_document_selector,
-input.disabled {
+input.batch_document_selector {
   margin: 10px 10px 2px 10px;
   padding: 0px;
 }

data/app/assets/stylesheets/hyrax/_file_sets.scss

@@ -48,3 +48,30 @@ table.files td.preview img {
 .edit_file_set_previous_version {
   margin-top: 3em;
 }
+
+input.versioning-files-input {
+  width: 250px;
+}
+
+div.versioning-files-input {
+  text-align: right;
+}
+
+div.versioning-files-row {
+  border-top: solid 1px #dddddd;
+  padding-top: 10px;
+}
+
+div.versioning-files-progress {
+  margin-top: -25px;
+}
+
+button.versioning-files-remove,
+button.versioning-files-remove:hover {
+  background-color: #ffffff;
+  border-color: #ffffff;
+  color: $brand-danger;
+  font-weight: normal;
+  text-decoration: underline;
+}
+

data/app/assets/stylesheets/hyrax/_forms.scss

@@ -29,8 +29,6 @@ legend small {
   padding-left:1.2em;
 }
 
-.form-group { margin-bottom: 2em; }
-
 .form-group.has-error input,
 .form-group.has-error option,
 .form-group.has-error textarea {

data/app/assets/stylesheets/hyrax/_header.scss

@@ -26,7 +26,7 @@ header > .navbar {
 }
 
 .dropdown-toggle:focus {
-  outline: 2px auto  Highlight; // FireFox
+  outline: 2px auto Highlight; // FireFox
   outline: 5px auto -webkit-focus-ring-color; // Chrome, Safari
   outline: -2px;
 }

data/app/assets/stylesheets/hyrax/_home-page.scss

@@ -54,6 +54,15 @@
           color: $navbar-transparent-link-hover-color;
         }
       }
+      li {
+        background-color: #286090;
+      }
+    }
+
+    @media only screen and (max-width: 767px) {
+      .navbar-nav {
+        margin-left: 10px;
+      }
     }
 
     .active > a {
@@ -69,7 +78,14 @@
 
 .home-content {
   .nav {
-    margin-bottom: 20px;
+    margin-bottom: $padding-large-vertical * 2;
+  }
+
+  // Give some separation between the Works and Collections columns, which stack up vertically on mobile
+  @media screen and (max-width: 640px) {
+    > div {
+      margin-bottom: $padding-large-vertical * 3;
+    }
   }
 }
 
@@ -84,12 +100,12 @@
   }
 }
 
-.home_share_work {
-  margin-bottom: $padding-large-vertical * 2.5;
+.home-share-work {
+  margin-bottom: $padding-large-vertical * 4;
+  margin-top: $padding-large-vertical * 2;
 
-  p {
-    margin: 0.25em auto;
-    width: 40%;
+  .terms-of-use {
+    margin-top: $padding-large-vertical;
   }
 }
 
@@ -109,7 +125,7 @@ div#announcement {
   text-align: center;
   color: white;
   font-size: 1.5em;
-  background-color: $vermilion;
+  background-color: $rufous;
   border: 10px solid white;
   padding-top: 10px;
   border-radius: 15px;

data/app/assets/stylesheets/hyrax/_hyrax.scss

@@ -1,15 +1,15 @@
 @import 'hydra-editor/multi_value_fields';
 @import 'hyrax/variables', 'hyrax/file_sets', 'hyrax/settings', 'hyrax/header',
-        'hyrax/styles', 'hyrax/file-listing', 'hyrax/browse_everything_overrides',
-        'hyrax/nestable', 'hyrax/collections', 'hyrax/collection_types', 'hyrax/batch-edit',
-        'hyrax/home-page', 'hyrax/featured', 'hyrax/usage-stats', 'hyrax/catalog',
-        'hyrax/buttons', 'hyrax/tinymce', 'hyrax/proxy-rights', 'hyrax/file-show',
-        'hyrax/work-show', 'hyrax/modal', 'hyrax/forms', 'hyrax/form',
-        'hyrax/file_manager', 'hyrax/form-progress', 'hyrax/positioning',
-        'hyrax/fixedsticky', 'hyrax/file_upload', 'hyrax/representative-media',
-        'hyrax/footer', 'hyrax/select_work_type', 'hyrax/users', 'hyrax/dashboard',
-        'hyrax/sidebar', 'hyrax/controlled_vocabulary', 'hyrax/accessibility',
-        'hyrax/recent', 'hyrax/viewer', 'hyrax/breadcrumbs';
+  'hyrax/styles', 'hyrax/file-listing', 'hyrax/browse_everything_overrides',
+  'hyrax/nestable', 'hyrax/collections', 'hyrax/collection_types',
+  'hyrax/batch-edit', 'hyrax/home-page', 'hyrax/featured', 'hyrax/usage-stats',
+  'hyrax/catalog', 'hyrax/buttons', 'hyrax/tinymce', 'hyrax/proxy-rights',
+  'hyrax/file-show', 'hyrax/work-show', 'hyrax/modal', 'hyrax/forms',
+  'hyrax/form', 'hyrax/file_manager', 'hyrax/form-progress', 'hyrax/positioning',
+  'hyrax/fixedsticky', 'hyrax/file_upload', 'hyrax/representative-media',
+  'hyrax/footer', 'hyrax/select_work_type', 'hyrax/users', 'hyrax/dashboard',
+  'hyrax/sidebar', 'hyrax/controlled_vocabulary', 'hyrax/accessibility',
+  'hyrax/recent', 'hyrax/viewer', 'hyrax/breadcrumbs';
 @import 'typeahead';
 @import 'sharing_buttons';
 

data/app/assets/stylesheets/hyrax/_login_signup.scss

@@ -0,0 +1,20 @@
+// Login / Sign up styles needed because Devise gem controls the markup
+form.new_user {
+  margin-bottom: 1rem;
+
+  .field {
+    @extend .form-group;
+
+    input[type='email'],
+    input[type='input'],
+    input[type='password'] {
+      @extend .form-control;
+      width: 300px;
+    }
+  }
+
+  input[type='submit'] {
+    @extend .btn;
+    @extend .btn-primary;
+  }
+}

data/app/assets/stylesheets/hyrax/_settings.scss

@@ -4,7 +4,7 @@
 // Some are unique or override other variables from Bootstrap.
 
 $classic-white: #FFF !default;
-$vermilion: #F30 !default;
+$rufous: #a81c07 !default;
 
 // Nav and Search Bar
 $search-bar-margin-top: 0.50em;
@@ -12,7 +12,7 @@ $search-bar-margin-top: 0.50em;
 // Dashboard
 $dashboard-border-color: $gray-lighter !default;
 
-$icon-background-color: $vermilion !default;
+$icon-background-color: $rufous !default;
 $icon-border-color: $classic-white !default;
 $icon-font-color: $classic-white !default;
 $icon-link-color: $gray-light !default;

data/app/assets/stylesheets/hyrax/_styles.scss

@@ -62,3 +62,13 @@ label.disabled {
   align-items: center;
   display: flex;
 }
+
+.navbar-default {
+  .navbar-nav {
+    li {
+      a {
+        color: #666;
+      }
+    }
+  }
+}

data/app/assets/stylesheets/hyrax/_users.scss

@@ -13,3 +13,19 @@
     margin-top: $padding-small-vertical;
   }
 }
+
+.activity-display {
+  max-height: 100%;
+  overflow-y: auto;
+  padding-bottom: 0;
+  position: relative;
+
+  .activity-date {
+    padding-right: 130px;
+  }
+}
+
+.tab-content .activity-display {
+  max-height: 30em;
+  position: absolute;
+}

data/app/assets/stylesheets/hyrax/_viewer.scss

@@ -1,8 +1,19 @@
+// Default for smaller screens, uses mobile panel
 .viewer-wrapper {
-  height: 500px;
+  height: 390px;
 }
 
-.viewer {
+.viewer-wrapper iframe {
   height: 100%;
-  padding: 10px;
+  width: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
 }
+
+// Show various footer, header, left and right panels on larger screens only
+@media only screen and (min-width: 640px) {
+  .viewer-wrapper {
+    height: 640px;
+  }
+}