sufia 7.2.0 → 7.3.0.rc1

data/app/assets/javascripts/sufia/select_work_type.es6

@@ -0,0 +1,38 @@
+export default class SelectWorkType {
+  /**
+   * Initializes the class in the context of an individual table element
+   * @param {jQuery} element the table element that this class represents
+   */
+  constructor(element) {
+      this.$element = element;
+      this.target = element.data('target')
+      this.modal = $(this.target);
+      this.form = this.modal.find('form.new-work-select')
+
+      // launch the modal.
+      element.on('click', (e) => { 
+          e.preventDefault();
+          this.modal.modal();
+          // ensure the type is set for the last clicked element
+          this.type = element.data('create-type')
+          // add custom routing logic when the modal is shown
+          this.form.on('submit', this.routingLogic.bind(this));
+      });
+
+      // remove the routing logic when the modal is hidden
+      this.modal.on('hide.bs.modal', (e) => {
+          this.form.unbind('submit')
+      });
+  }
+
+  // when the form is submitted route to the correct location
+  routingLogic(e) {
+      e.preventDefault();
+      // get the destination from the data attribute of the selected radio button
+      window.location.href = this.destination()
+  }
+
+  destination() {
+      return this.form.find('input[type="radio"]:checked').data(this.type)
+  }
+}

data/app/assets/javascripts/sufia/workflow_actions_affix.js

@@ -0,0 +1,14 @@
+Blacklight.onLoad(function() {
+  if ($('.workflow-actions').length) {
+    $(document).on('scroll', function() {
+      var workflowDiv = $('#workflow_controls');
+      var workflowDivPos = $('.workflow-actions').offset().top + $('#workflow_controls').height();
+      workflowDiv.removeClass('workflow-affix');
+      if(workflowDivPos > ($(window).scrollTop() + $(window).height())){
+        workflowDiv.addClass('workflow-affix');
+      } else {
+        workflowDiv.removeClass('workflow-affix');
+      }
+    });
+  }
+});

data/app/assets/stylesheets/sufia/_dashboard.scss

@@ -11,15 +11,12 @@
   }
 }
 
-.heading-tile {
-  border: 0;
-}
-
 .heading-row {
   border: 0;
 }
 
-#content-header .heading-row:nth-child(2) {
+.heading-tile {
+  border: 0;
   padding-top: .5em;
   a:link,
   a:visited {
@@ -37,31 +34,30 @@
     transition-duration: .35s;
     transition-timing-function: ease-out;
   }
-}
-
-div.heading-tile .glyphicon {
-  background: $icon-background-color;
-  color: $icon-font-color;
-  display: block;
-  width: 2em;
-  height: 2em;
-  line-height: 1.75em;
-  margin: 0 auto;
-  border-radius: 50%;
-  border: 2px solid $icon-border-color;
-  overflow: hidden;
-  transition-property: background-color, color;
-  transition-duration: .35s;
-  transition-timing-function: ease-out;
-}
+  .glyphicon {
+    background: $icon-background-color;
+    color: $icon-font-color;
+    display: block;
+    width: 2em;
+    height: 2em;
+    line-height: 1.75em;
+    margin: 0 auto;
+    border-radius: 50%;
+    border: 2px solid $icon-border-color;
+    overflow: hidden;
+    transition-property: background-color, color;
+    transition-duration: .35s;
+    transition-timing-function: ease-out;
+  }
 
-div.heading-tile:hover .glyphicon {
-  background-color: $icon-background-color-hover;
-  border-color: $icon-border-color-hover;
-  color: $icon-font-color-hover;
-  transition-property: background-color, color;
-  transition-duration: .35s;
-  transition-timing-function: ease-out;
+  &:hover .glyphicon {
+    background-color: $icon-background-color-hover;
+    border-color: $icon-border-color-hover;
+    color: $icon-font-color-hover;
+    transition-property: background-color, color;
+    transition-duration: .35s;
+    transition-timing-function: ease-out;
+  }
 }
 
 .panel-body h4 {
@@ -120,3 +116,28 @@ div.heading-tile:hover .glyphicon {
     margin-top: $padding-small-vertical;
   }
 }
+
+// submenu items
+ul.collapse > li > a,
+ul.collapsing > li > a {
+  padding-left: 40px;
+}
+
+.collapse-toggle {
+  margin-bottom: 0;
+
+  &::after {
+    content: "❯";
+    float: right;
+    transform: rotate(90deg);
+  }
+
+  &.collapsed {
+    border-bottom: 0;
+
+    &::after {
+      transform: rotate(0deg);
+      transition: transform 0.1s ease;
+    }
+  }
+}

data/app/assets/stylesheets/sufia/_footer.scss

@@ -0,0 +1,30 @@
+// Styles below keep footer at bottom of viewport
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  margin-bottom: $footer-height + $footer-top-margin;
+}
+
+.site-footer {
+  margin-top: $footer-top-margin;
+  padding: 10px;
+
+  // Styles below keep footer at bottom of viewport
+  position: absolute;
+  bottom: 0;
+  height: $footer-height;
+  width: 100%;
+}
+
+@media (max-width: $screen-sm) {
+  // make more room in the footer for mobile devices
+  body {
+    margin-bottom: 2 * $footer-height + $footer-top-margin;
+  }
+  .site-footer {
+    height: 2 * $footer-height;
+  }
+}

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

@@ -4,12 +4,11 @@
 
 #masthead {
   z-index: $zindex-navbar + 1;
-  margin-bottom: 0;
-  margin-top: 0;
 }
 
-.navbar + .navbar {
-  margin-top: 0;
+.navbar + .navbar,
+.navbar + .image-masthead {
+  margin-top: -1 * $navbar-margin-bottom;
 }
 
 .searchbar-right {

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

@@ -42,14 +42,16 @@
     background-color: $navbar-transparent-bg;
     margin-bottom: 0;
 
-    li > a {
-      color: $navbar-transparent-link-color;
-      text-transform: uppercase;
-
-      &:hover,
-      &:focus {
-        background-color: $navbar-transparent-link-hover-bg;
-        color: $navbar-transparent-link-hover-color;
+    .navbar-nav {
+      a {
+        color: $navbar-transparent-link-color;
+        text-transform: uppercase;
+
+        &:hover,
+        &:focus {
+          background-color: $navbar-transparent-link-hover-bg;
+          color: $navbar-transparent-link-hover-color;
+        }
       }
     }
 

data/app/assets/stylesheets/sufia/_select_work_type.scss

@@ -0,0 +1,43 @@
+.select-worktype:first-child {
+  border-top: none;
+}
+.select-worktype {
+  border-top: 1px solid $table-border-color;
+  padding: 10px;
+  
+  label {
+    margin: 0;
+    width: 100%;
+  }
+
+  input[type="radio"] {
+    float: left;
+    position: relative;
+    width: 10%;
+  }
+
+  .select-work-icon {
+    float: left;
+    font-size: 400%;
+    line-height: 1;
+    position: relative;
+    text-align: center;
+    width: 20%;
+
+    .fa {
+      vertical-align: top
+    }
+  }
+  .select-work-description {
+    float: left;
+    position: relative;
+    width: 70%;
+  }
+
+  h3 {
+    margin-top: 0;
+  }
+}
+.new-work-select {
+  clear: both;
+}

data/app/assets/stylesheets/sufia/_sufia.scss

@@ -1,13 +1,15 @@
 @import 'hydra-editor/multi_value_fields';
 @import 'curation_concerns/modules/forms';
 @import 'curation_concerns/modules/file_manager';
+@import 'curation_concerns/positioning';
 @import 'sufia/variables', 'sufia/file_sets', 'sufia/settings', 'sufia/header',
         'sufia/styles', 'sufia/file-listing', 'sufia/browse_everything_overrides',
         'sufia/nestable', 'sufia/collections', 'sufia/batch-edit', 'sufia/dashboard',
         'sufia/home-page', 'sufia/featured', 'sufia/usage-stats', 'sufia/catalog',
         'sufia/buttons', 'sufia/tinymce', 'sufia/proxy-rights', 'sufia/file-show',
         'sufia/work-show', 'sufia/modal', 'sufia/form', 'sufia/form-progress',
-        'sufia/fixedsticky', 'sufia/file_upload', 'sufia/representative-media';
+        'sufia/fixedsticky', 'sufia/file_upload', 'sufia/representative-media',
+        'sufia/footer', 'sufia/select_work_type';
 @import 'sharing_buttons';
 
 /* This class is to workaround an issue in which Bootstrap requires a div to display a tooltip
@@ -23,3 +25,4 @@
   display: inline-block;
 }
 
+

data/app/assets/stylesheets/sufia/_variables.scss

@@ -12,3 +12,6 @@ $navbar-transparent-link-active-bg: rgba(255, 255, 255, 0.2) !default;
 $title-height: 75px !default;
 $marketing-text-color: $gray-darker !important;
 $marketing-text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.1) !important;
+
+$footer-top-margin: 3 * $padding-small-vertical !default;
+$footer-height: 118px !default;

data/app/assets/stylesheets/sufia/admin.scss

@@ -1,203 +1,100 @@
-@import 'widgets';
-
-$sidebar-background-color: #5f5f5f !default;
-$sidebar-separator-color: #555 !default;
-$sidebar-link-color: #ffffff !default;
-$sidebar-icon-color: #ffffff !default;
-$sidebar-hover-background-color: #7f7f7f !default;
-$sidebar-hover-icon-color: #eee !default;
-
-$breadcrumb-background-color: #e8e8e8 !default;
-$breadcrumb-link-color: #8d8678 !default;
-
-$header-background-color: black !default;
-$header-text-color: #f7f7f7 !default;
-$header-logo-color: #ffffff !default;
-$header-height: 35px !default;
+@import 'bootstrap/variables';
+$tab-margin: 44px !default;
 $title-text-color: #4e4a42 !default;
-$content-background-color: #f5f5f5 !default;
-
-
-.page-title {
-  float: left;
-  padding: 5px 10px;
-  width: 100%;
-
-  h1 {
-    color: $title-text-color;
-    float: left;
-    font-size: 26px;
-    line-height: 30px;
-    margin: 0;
-    margin-bottom: 15px;
-    padding: 0;
-
-    > .fa {
-      margin-left: 6px;
-      margin-right: 6px;
-    }
-  }
+$tab-active-accent-color: $brand-primary !default;
+$admin-sidebar-background-color: #808080 !default;
+$admin-sidebar-link-color: #ffffff !default;
+$admin-sidebar-link-hover-color: #000000 !default;
+$admin-content-background-color: #f0f0f0 !default;
+$admin-vertical-padding: 10px !default;
+
+.tabs {
+  margin-top: $tab-margin;
+  position: relative;
 }
 
-.panel {
-  float: left;
-  width: 100%;
-
-  .panel-heading,
-  .panel-footer,
-  .panel-body {
-    float: left;
-    width: 100%;
-  }
-
-  .panel-title {
-    color: $title-text-color;
-    display: block;
-    float: left;
-    font-size: 16px;
-    font-weight: 400;
-    line-height: 30px;
-  }
+.nav-tabs {
+  border-bottom: 0;
+  margin-bottom: 0;
+  margin-top: -$tab-margin;
+  padding: 0 5px;
 }
 
-.admin-set-members {
-  h3 {
-    font-size: 16px;
-    font-weight: 400;
-    margin: 0;
-  }
+.nav-tabs > li > a {
+  border-top: 2px solid transparent;
 }
 
-.title-button {
-  margin-right: 15px;
-  margin-top: 10px;
-  width: auto;
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover {
+  border-top: 2px solid $tab-active-accent-color;
 }
 
-.page-container {
-  width: 100%;
-  float: left;
-  min-height: 100%;
-  position: relative;
-  background: $sidebar-background-color;
+body {
+  background-color: $admin-sidebar-background-color;
 }
 
-.page-container .page-sidebar {
-  width: 300px;
+/* This is needed in Chrome for the admin/admin_sets edit view to render the participants tab
+ * Without this the contents of that tab flow off the right-hand side of the screen
+ * (The other containers on that page have `float: left` except for the fieldset.)
+ */
+fieldset {
   float: left;
-  position: relative;
-  z-index: 3;
 }
 
-.page-sidebar {
-  color: #ddd;
+#content-wrapper {
+  padding-bottom: 0;
 }
 
-.page-container .page-content {
-  min-height: 100%;
-  height: 100vh;
-  margin-left: 300px;
-  background: $content-background-color;
-  position: relative;
+.main-content {
+  padding-top: $admin-vertical-padding;
+  padding-bottom: $admin-vertical-padding;
+  background-color: $admin-content-background-color;
 }
 
-.page-container .page-content .page-content-wrap {
-  float: left;
-  width: 100%;
-}
-
-.page-content-wrap > .row {
-  margin-left: 0px;
-  margin-right: 0px;
-}
+.sidebar {
+  padding-bottom: $admin-vertical-padding;
+  padding-top: $admin-vertical-padding;
 
-.breadcrumb {
-  float: left;
-  background: $breadcrumb-background-color;
-  margin-bottom: 10px;
-  padding: 6px 15px 7px;
-  width: 100%;
+  a {
+    color: $admin-sidebar-link-color;
+  }
 
-  li,
-  li a {
-    color: $breadcrumb-link-color;
-    font-size: 11px;
-    text-decoration: none;
+  a:hover {
+    color: $admin-sidebar-link-hover-color;
   }
 }
 
-.x-navigation {
-  width: 100%;
-  padding: 0px;
-  margin: 0px;
-  float: left;
-  list-style: none;
-  display: block;
-  background: $sidebar-background-color;
+.navbar {
+  margin-bottom: 0;
 }
 
-.x-navigation li {
+.panel {
+  border: 0;
   float: left;
-  display: block;
   width: 100%;
-  padding: 0px;
-  margin: 0px;
-  position: relative;
-}
-
-.x-navigation li > a {
-  display: block;
-  width: 100%;
-  line-height: 19px;
-  color: $sidebar-link-color;
-  font-size: 13px;
-  font-weight: 400;
-  text-decoration: none;
-  padding: 15px 10px 15px 15px;
-  border-bottom: 1px solid $sidebar-separator-color;
-}
-
-.x-navigation li > a .fa {
-  color: $sidebar-icon-color;
-  margin-right: 10px;
-  transition: color 200ms ease;
-}
-
-.x-navigation li > a:hover {
-  background: $sidebar-hover-background-color;
-  transition: all 200ms ease;
-}
-
-.x-navigation li > a:hover .fa {
-  color: $sidebar-hover-icon-color;
-}
-
-.x-navigation > li.xn-logo > a:first-child {
-  background: $header-background-color;
-  font-size: 18px;
-  padding: 8px;
-  color: $header-logo-color;
-  height: $header-height;
-  text-align: center;
-}
 
-.x-navigation.x-navigation-horizontal {
-  height: $header-height;
-  background: $header-background-color;
-  border-color: $header-background-color;
-}
+  .panel-heading,
+  .panel-footer,
+  .panel-body {
+    float: left;
+    width: 100%;
+  }
 
-.x-navigation.x-navigation-horizontal li {
-  position: relative;
+  .panel-title {
+    color: $title-text-color;
+    display: block;
+    float: left;
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 30px;
+  }
 }
 
-.x-navigation.x-navigation-horizontal > li {
-  width: auto;
+.panel.panel-default.labels {
+  border-top: 1px solid $panel-default-border;
+  margin-bottom: 0;
 }
 
-.x-navigation.x-navigation-horizontal > li > a {
-  padding: 10px;
-  border-bottom: 0px;
-  line-height: 20px;
-  color: $header-text-color;
+.spacer {
+  margin-bottom: 5px;
 }