').css({
- "left": WDL.Search.formatPercentage(coords[0] / master_width),
- "top": WDL.Search.formatPercentage(Math.max(0, (coords[3] / master_height) - 0.01)),
- "right": WDL.Search.formatPercentage(1.0 - coords[2] / master_width),
- "bottom": WDL.Search.formatPercentage(1.0 - Math.min(1.0, (coords[1] / master_height) + 0.01))
- }).insertAfter($page);
- }
- });
- }
- });
- };
-
- /* commonwealth changes (search add) - taken from WDL.Search */
- this.processTerms = function (text) {
- var terms = [text];
- var mergeterms = $.merge(terms, $.map(terms[0].split(/\s/), function (i) {
- return $.merge(i, $.map(i.split(/b/), $.trim));
- }));
-
- var terms_output = $.grep(mergeterms, function (i) {
- return $.trim(i).length > 0;
- });
- return terms_output;
- };
-
- $currentPage.on("load", $.proxy(function () {
- $currentPage.stop(true, false).fadeTo(100, 1.0);
- $window.scrollTop(0);
- this.checkViewportConstraints();
- }, this));
-
- $nextPage
- .on("load", $.proxy(function () {
- $nextPage.data("dirty", false);
- this.checkViewportConstraints();
- }, this))
- .on("error", function () {
- // TODO: Consider trying a reload?
- $nextPage.data("dirty", false);
- });
- }
-
- function SeadragonView(controller, $container) {
- this.controller = controller;
- this.seadragon = null;
-
- this.getPageCount = function () {
- return 1;
- };
-
- this.onResize = function () {
- $container.css({
- height: $window.height()
- });
- };
-
- /* ***commonwealth changes** */
- this.hide = function () {
- // $("#toggle-seadragon").text(gettext("Zoom"));
- var toggle = $("#toggle-seadragon");
- toggle.attr("title","Zoom");
- toggle.find("i").attr("class", "fa fa-plus");
-
- if (this.seadragon) {
- this.seadragon.close();
- this.seadragon.destroy();
- this.seadragon = null;
- }
-
- $container.hide();
- $window.off("resize", this.onResize);
- };
-
- /* ***commonwealth changes** */
- this.show = function () {
- // $("#toggle-seadragon").text(gettext("Read"));
- var toggle = $("#toggle-seadragon");
- toggle.attr("title","Read");
- toggle.find("i").attr("class", "fa fa-book");
-
- if (this.seadragon) {
- this.seadragon.close();
- this.seadragon.destroy();
- this.seadragon = null;
- }
-
- // We'll work around Internet Explorer < 11's broken height:100% calculation
- // by displaying now to force the height to match the window:
- $container.show();
- this.onResize();
- $window.on("resize", this.onResize);
- this.update();
- };
-
- this.update = function () {
- var dziUrl = this.controller.generateDziUrl(this.controller.currentGroup,
- this.controller.currentIndex);
-
- if (!this.seadragon) {
- this.initializeSeadragon(dziUrl);
- } else {
- this.seadragon.open(dziUrl);
- }
- };
-
- // TODO: find a better way to consolidate this with the page-turner implementation:
-
- this.zoomIn = $.proxy(function () {
- if (!this.seadragon.viewport) {
- return; // IE8
- }
- this.seadragon.viewport.zoomBy(this.seadragon.zoomPerClick / 1.0);
- }, this);
-
- this.zoomOut = $.proxy(function () {
- if (!this.seadragon.viewport) {
- return; // IE8
- }
- this.seadragon.viewport.zoomBy(1.0 / this.seadragon.zoomPerClick);
- }, this);
-
- this.goHome = $.proxy(function () {
- if (!this.seadragon.viewport) {
- return; // IE8
- }
- this.seadragon.viewport.goHome();
- }, this);
-
- this.panViewport = $.proxy(function (direction) {
- if (!this.seadragon.viewport) {
- return; // IE8
- }
-
- var bounds = this.seadragon.viewport.getBounds();
- var delta = new OpenSeadragon.Point();
-
- switch (direction) {
- case "down":
- delta.y = bounds.height * 0.2;
- break;
- case "up":
- delta.y = bounds.height * -0.2;
- break;
- case "left":
- delta.x = bounds.width * -0.2;
- break;
- case "right":
- delta.x = bounds.width * 0.2;
- break;
- }
-
- this.seadragon.viewport.panBy(delta);
- }, this);
-
- this.setRotation = $.proxy(function (degrees) {
- if (!this.seadragon || !this.seadragon.viewport) {
- return;
- }
-
- // Until https://github.com/openseadragon/openseadragon/issues/194 lands we can't support
- // arbitrary rotation:
- this.seadragon.viewport.setRotation(degrees - (degrees % 90));
- });
-
- /* ***commonwealth changes*** */
- this.initializeSeadragon = function (dziUrl) {
- var seadragon = new OpenSeadragon({
- id: $container.attr("id"),
- prefixUrl: this.controller.config.seadragonPrefixUrl,
- navImages: this.controller.config.seadragonNavImages,
- tileSources: dziUrl,
- autoHideControls: false,
- immediateRender: navigator.userAgent.match(/mobile/i),
- showNavigator: true,
- navigatorPosition: 'TOP_RIGHT',
- showNavigationControl: true,
- navigationControlAnchor: OpenSeadragon.ControlAnchor.BOTTOM_RIGHT,
- showFullPageControl: false
- });
-
- this.seadragon = seadragon;
-
- /* ***commonwealth changes*** prefer to use OpenSeadragon options to set controls */
- /*
- var controlAnchor,
- controls = [
- $("
").text(gettext("Zoom In")).addClass("control zoom-in").click(this.zoomIn),
- $("").text(gettext("Zoom Out")).addClass("control zoom-out").click(this.zoomOut),
- $("").text(gettext("Go Home")).addClass("control home").click(this.goHome)
- ];
-
- try {
- controlAnchor = this.controller.config.openSeadragon.controlAnchor;
- } catch (e) {
- controlAnchor = OpenSeadragon.ControlAnchor.BOTTOM_RIGHT;
- }
-
- for (var i=0; i < controls.length; i++) {
- seadragon.addControl(controls[i].get(0), {anchor: controlAnchor});
- }
- */
- // Make UI transitions more obvious by zooming in when the viewer first loads:
- var initialZoom = $.proxy(function () {
- seadragon.removeHandler("open", initialZoom);
- this.zoomIn();
- }, this);
- seadragon.addHandler("open", initialZoom);
-
- seadragon.addHandler("open", $.proxy(function () {
- this.setRotation(this.controller.rotation);
- }, this));
- };
-
- this.onKeydown = function (evt) {
- switch (evt.which) {
- case 187: //
- case 61: // for firefox
- this.zoomIn();
- return false;
- case 189: // -
- case 173: // - on Firefox
- this.zoomOut();
- return false;
- case 72: // h
- case 220: // \
- this.goHome();
- return false;
- case 37: // Left Arrow: pan Left
- this.panViewport('left');
- return false;
- case 39: // Right Arrow: pan Right
- this.panViewport('right');
- return false;
- case 38: // Up Arrow: pan Up
- this.panViewport('up');
- return false;
- case 40: // Down Arrow: pan Down
- this.panViewport('down');
- return false;
- }
- };
-
- this.prefetch = function () {};
- }
-
- function GridView(controller, $container, config) {
- var thumbnailUrls = [],
- // Cache for performance in scroll handler:
- container = $container.get(0);
-
- var gridScrollHandler = $.throttle(50, function () {
- var scrollTop = container.scrollTop,
- scrollBottom = scrollTop + container.offsetHeight,
- thumbnails;
-
- if (container.querySelectorAll) {
- thumbnails = container.querySelectorAll(".placeholder");
- } else {
- thumbnails = container.children;
- }
-
- for (var i = thumbnails.length - 1; i >= 0; i--){
- var thumb = thumbnails[i];
-
- if ((thumb.offsetTop + thumb.offsetHeight) >= scrollTop && thumb.offsetTop <= scrollBottom) {
- var idx = thumb.id.replace(/^index-/, '');
- thumb.style.backgroundImage = "url(" + thumbnailUrls[idx] + ")";
- thumb.className = thumb.className.replace('placeholder', '');
- }
- }
- });
-
- /* *** commonwealth changes *** */
- this.show = function () {
- var seadragon_toggle = $("#toggle-seadragon");
- seadragon_toggle.attr("title","Read");
- seadragon_toggle.find("i").attr("class", "fa fa-book");
-
- var container = $container.empty().get(0);
-
- for (var i=1; i <= controller.maxIndex; i++) {
- var div = document.createElement("div");
- div.id = "index-" + i;
- div.className = "placeholder";
- div.appendChild(document.createTextNode(i));
- thumbnailUrls[i] = controller.generateThumbUrl(controller.currentGroup,
- i);
- div.style.backgroundImage = "url(" + config.placeholderSrc + ")";
- container.appendChild(div);
- }
-
- $container.show();
- this.update();
- };
-
- this.update = function () {
- var $pages = $container.scrollTop(0).children("div"),
- // Note switch from page number to zero-based index:
- $currentPage = $pages.eq(controller.currentIndex - 1);
-
- /* jshint -W101 */
- $container.scrollTop($currentPage.offset().top - ($window.height() / 2) + ($currentPage.height() / 2));
- /* jshint +W101 */
-
- $pages.not($currentPage).filter(".current").removeClass("current");
- $currentPage.addClass("current");
-
- $container.on("scroll", gridScrollHandler);
-
- $container.trigger("scroll");
-
- // this.updateSearch(); // not showing search results in grid view for now
- };
-
- // not showing search results in grid view for now
- /*
- this.updateSearch = function () {
- if (!config.fts || !controller.search || !controller.search.query) {
- return;
- }
-
- var $pages = $container.children();
-
- $pages.filter(".hit").removeClass("hit");
-
- var results = controller.search.results;
- for (var i = 0; i < results.length; i++) {
- var result = results[i];
- if (result[0] == controller.currentGroup) {
- // Note conversion from page numbers to zero-based index:
- $pages.eq(result[1] - 1).addClass("hit");
- }
- }
- };
- */
-
- this.hide = function () {
- $container.off("scroll", gridScrollHandler);
- $container.hide().empty();
- };
-
- this.onResize = function () {
- gridScrollHandler();
- };
-
- function scrollDown() {
- $container.scrollTop($container.scrollTop() + $window.height() / 2);
- }
-
- function scrollUp() {
- $container.scrollTop($container.scrollTop() - $window.height() / 2);
- }
-
- this.onKeydown = function (evt) {
- switch (evt.which) {
- case 32: // Space bar
- if (evt.shiftKey) {
- scrollUp();
- } else {
- scrollDown();
- }
- return false;
- case 74: // j
- case 34: // Page Down
- scrollDown();
- return false;
- case 75: // k
- case 33: // Page Up
- scrollUp();
- return false;
- }
- };
-
- this.prefetch = function () {};
-
- $container.on("click", "div", function () {
- var newPage = this.id.match(/^index-(\d+)/);
- if (newPage) {
- controller.openPageView();
- controller.setIndex(parseInt(newPage[1], 10));
- }
- });
- }
-}(jQuery));
\ No newline at end of file
diff --git a/app/assets/stylesheets/bootstrap-accessibility-plugin/bootstrap-accessibility.css b/app/assets/stylesheets/bootstrap-accessibility-plugin/bootstrap-accessibility.css
deleted file mode 100644
index c8b1b1b1..00000000
--- a/app/assets/stylesheets/bootstrap-accessibility-plugin/bootstrap-accessibility.css
+++ /dev/null
@@ -1,105 +0,0 @@
-.btn:focus{
- outline:dotted 2px #000;
-}
-
-div.active:focus{
- outline:dotted 1px #000;
-}
-
-a:focus{
- outline:dotted 1px #000;
-}
-
-.close:hover,.close:focus{
- outline:dotted 1px #000;
-}
-
-/* hover effect is a bit ugly, so modifying this */
-/* replaced by rule below
-.nav>li>a:hover,.nav>li>a:focus{
- outline:dotted 1px #000;
-}
-*/
-
-.nav>li>a:focus{
- outline: dotted 1px #000;
-}
-
-.carousel-indicators li,.carousel-indicators li.active{
- height:18px;
- width:18px;
- border-width:2px;
- position:relative;
- box-shadow:0px 0px 0px 1px #808080;
- -moz-boxshadow:0px 0px 0px 1px #808080;
- -webkit-boxshadow:0px 0px 0px 1px #808080;
-}
-
-.carousel-indicators.active li{
- background-color:rgba(100,149,253,0.6);
-}
-
-.carousel-indicators.active li.active{
- background-color:white;
-}
-
-.carousel-tablist-highlight{
- display:block;
- position:absolute;
- outline:2px solid transparent;
- background-color:transparent;
- box-shadow:0px 0px 0px 1px transparent;
- -moz-boxshadow:0px 0px 0px 1px transparent;
- -webkit-boxshadow:0px 0px 0px 1px transparent;
-}
-
-.carousel-tablist-highlight.focus{
- outline:2px solid #6495ED;
- background-color:rgba(0,0,0,0.4);
-}
-
-a.carousel-control:focus{
- outline:2px solid #6495ED;
- background-image:linear-gradient(to right, transparent 0px, rgba(0,0,0,0.5) 100%);
- box-shadow:0px 0px 0px 1px #000000;
- -moz-boxshadow:0px 0px 0px 1px #000000;
- -webkit-boxshadow:0px 0px 0px 1px #000000;
-}
-
-.carousel-pause-button{
- position:absolute;
- top:-30em;
- left:-300em;
- display:block;
-}
-
-.carousel-pause-button.focus{
- top:0.5em;
- left:0.5em;
-}
-
-.carousel:hover .carousel-caption,.carousel.contrast .carousel-caption{
- background-color:rgba(0,0,0,0.5);
- z-index:10;
-}
-
-.alert-success{
- color:#2d4821;
-}
-
-.alert-info{
- color:#214c62;
-}
-
-.alert-warning{
- color:#6c4a00;
- background-color:#f9f1c6;
-}
-
-.alert-danger{
- color:#d2322d;
-}
-
-.alert-danger:hover{
- color:#a82824;
-}
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/advanced_search.scss b/app/assets/stylesheets/commonwealth-vlr-engine/advanced_search.scss
index 094c8fec..58916644 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/advanced_search.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/advanced_search.scss
@@ -10,12 +10,32 @@
margin-bottom:5px;
.search_index_select {
- text-align: left;
- width: 120px;
+ @media (max-width: breakpoint-max(xs)) {
+ margin-bottom: 3px;
+ width: 50%;
+ }
+ }
+
+ .advanced-search-input-wrapper {
+ @media (max-width: breakpoint-max(xs)) {
+ padding-left: 0;
+ }
}
#advanced_operators {
- padding-left:32px;
+ padding: 10px 0 0 20px;
+
+ label {
+ padding-right: 20px;
+ }
+
+ @media (max-width: breakpoint-max(md)) {
+ padding-bottom: 20px;
+ }
+ }
+
+ @media (max-width: breakpoint-max(xs)) {
+ margin-bottom: 25px;
}
}
@@ -23,67 +43,76 @@
}
#advanced_search_limits {
- margin-top: 20px;
- padding: 5px 19px 0px 15px;
+ margin: 25px 0 20px 0;
float: left;
width: 95%;
- label.control-label {
+ label.col-form-label {
font-weight: bold;
+ font-size: $font-size-sm;
+ padding-left: 10px;
+ padding-right: 10px;
}
#date_range_limit {
- padding-bottom: 20px;
+ padding-top: 10px;
.input-group {
float:left;
- margin-right: 5px;
label {
- font-weight: normal;
- padding-right: 4px;
- font-size: 12px;
+ font-size: $font-size-sm;
background: none;
border: none;
-
}
input {
- border-bottom-left-radius: 4px;
- border-top-left-radius: 4px;
+ border-bottom-left-radius: $border-radius;
+ border-top-left-radius: $border-radius;
+ padding: 0.375rem 0.4rem;
}
}
}
- .facet_scrollbox_wrapper {
- background-color: #FFFFFF;
+ #advanced_search_facets {
- .facet_limit_scrollbox {
- max-height: 130px;
- min-height: 50px;
- overflow-y: auto;
- -webkit-overflow-scrolling:touch;
+ .form-group {
+ margin-bottom: 2rem;
- ul.facet-values {
+ .facet_scrollbox_wrapper {
+ border-top: $card-border-width solid $card-border-color;
+ border-top-right-radius: $border-radius;
+ border-top-left-radius: $border-radius;
- li {
+ .facet_limit_scrollbox {
+ max-height: 130px;
+ min-height: 50px;
+ overflow-y: auto;
- .facet-checkbox {
+ ul.facet-values {
- input[type="checkbox"] {
- vertical-align: bottom;
- }
+ li {
- }
+ .facet-checkbox {
+
+ input[type="checkbox"] {
+ vertical-align: top;
+ }
- .label-and-count {
- font-size: 12px;
+ }
+
+ .label-and-count {
+ font-size: $font-size-sm;
+
+ .facet-label {
+ text-indent: -5px;
+ padding-bottom: 4px;
+ }
+
+ }
- .facet-label {
- text-indent: -5px;
- padding-bottom: 4px;
}
}
@@ -99,26 +128,21 @@
}
#advanced_search_help {
- @include rounded-corners(8px);
- border: 1px solid $light_gray;
- padding-left: 10px;
- padding-right: 10px;
margin-left: 20px;
opacity: .8;
ul.advanced_help {
- font-size: 12px;
+ font-size: $font-size-xs;
padding-left: 24px;
li {
- padding-bottom:10px;
+ padding-bottom: 10px;
}
}
}
-
}
/* responsive styles */
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/basic_search.scss b/app/assets/stylesheets/commonwealth-vlr-engine/basic_search.scss
index d7d5429b..7b666428 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/basic_search.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/basic_search.scss
@@ -1,52 +1,27 @@
/* styles for basic search (catalog#index with no search params) */
-#basic_search_wrapper {
- margin-top:20px;
+#basic_search_form {
+ margin-top:40px;
- #basic_search_form {
-
- .twitter-typeahead {
- width: 45%;
- margin-right: 4px;
+ #search_field {
+ @media (max-width: breakpoint-max(md)) {
+ width: 100px;
}
- #q_basic {
- @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05));
+ @media (max-width: breakpoint-max(xs)) {
width: 100%;
+ margin-bottom: 5px;
}
-
- #basic_search_indexes {
- text-align: left;
- text-shadow: none;
- width: 110px;
- }
-
}
-}
-
-/* responsive styles */
-
-/* Landscape phone to portrait tablet */
-@media (max-width: 767px) {
-
- #basic_search_wrapper {
-
- #basic_search_form {
-
- #q_basic {
- width: 85%;
- }
-
- #basic_search_indexes, #search {
- margin: 10px 5px 0 0;
- }
+ .blacklight-icons > svg {
+ height: 20px;
+ }
+ .submit-search-text {
+ @media (max-width: breakpoint-max(xs)) {
+ display: none;
}
-
}
}
-
-
-
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/book_viewer.scss b/app/assets/stylesheets/commonwealth-vlr-engine/book_viewer.scss
index c3185492..abdfb92a 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/book_viewer.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/book_viewer.scss
@@ -1,576 +1,46 @@
/* styles for book viewer */
-.wdl-viewer {
- min-width: 320px;
- min-height: 320px;
- height: 100%;
- overflow: hidden;
- background-color: black;
+.universal-viewer {
+ overflow: hidden; // or else we get scrollbars
- * {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- }
-
- .hidden {
- display: none;
- }
-
- #viewer {
- background-color: $viewer_bg;
- height: 100%;
- width: 100%;
- font-size: large;
- text-align: center;
-
- header, footer {
- z-index: 10;
- width: 100%;
- background-color: #262626;
- background-color: rgba(20, 20, 20, 0.75);
-
- > nav {
- display: block;
- // border: 0px solid #369;
-
- > * {
- display: inline-block;
- overflow: hidden;
- font-size: 16px;
-
- &.hidden {
- display: none;
- }
-
- }
-
- }
-
- a {
- color: $bl_link;
- }
-
- button {
- min-width: 1.4em;
- margin: 0 2px;
- }
-
- }
-
- header {
- position: fixed;
- top: 0;
- box-shadow:0 5px 10px rgba(0,0,0,0.45);
-
- > nav {
- border-bottom-width: 2px;
- text-align: center;
- height: 34px;
-
- > h1 {
- //font-weight: bolder;
- max-width: 90%;
- white-space: nowrap;
- text-overflow: ellipsis;
- padding: 7px;
- margin: 0;
-
- a {
- color: $very_light_gray;
- margin-left:5px;
-
- &:hover {
- text-decoration: none;
- color: $bl_link;
- }
-
- }
-
- }
-
- > form {
- margin: 0 auto;
- }
-
- }
-
- }
-
- footer {
- position: fixed;
- bottom: 0;
- height: 34px;
- box-shadow:0 -2px 8px rgba(0,0,0,0.45);
-
- > nav {
- // border-top-width: 2px;
- // padding-top: 1px;
- /* fdSlider polyfill adjustments */
-
- > * {
- height: 28px;
- vertical-align: baseline;
- }
-
- #index, #fd-slider-index {
- display: inline-block;
- width: 240px;
- }
-
- #index {
- height: 28px;
- vertical-align: top;
- margin-top: 4px;
- padding: 0;
-
- &.fd-form-element-hidden {
- display: none;
- height: 0;
- width: 0;
- }
-
- }
-
- .current-index {
- width: 3em;
- height: 22px;
- padding-top:0px;
- color: $bootstrap_text;
- }
-
- #fd-slider-index {
- vertical-align: top;
- height: 28px;
- margin-top: 4px;
- padding: 0;
- }
-
- .controls button {
- margin-top:1px;
-
- &.btn-link {
- color: #F9F9F9;
- }
-
- }
-
- }
-
- .toolbar {
- color: #999999;
- white-space: nowrap;
- -webkit-user-select: none;
- -moz-user-select: none;
- user-select: none;
-
- /*
- a.btn, button {
-
- &:focus {
- outline: none;
- }
-
- }
- */
-
- .index label {
- font-weight: normal;
- }
-
- i {
- font-size: 20px;
- }
-
- #toggle-help {
- margin-top: 0;
-
- i {
- font-size: 22px;
- }
-
- }
-
- .item-detail-nav {
- margin-right: 15px;
- padding-top: 5px;
-
- a:before {
- // content: "←";
- }
-
- }
-
- .page {
- color:#F9F9F9;
-
- &.disabled {
- color: #999999;
- text-decoration: none;
- cursor: default;
- }
-
- &.next:after {
- //content: "→";
- }
-
- &.previous:before {
- //content: "←";
- }
-
- }
-
- #toggle-search {
- color:#F9F9F9;
- }
-
- }
-
- }
-
- #viewport {
- display: table;
- width: 100%;
- height: 100%;
- -webkit-user-select: none;
- -moz-user-select: none;
- user-select: none;
-
- #pages {
- display: table-cell;
- vertical-align: middle;
- padding: 0;
-
- > .page {
- display: inline-block;
- position: relative;
- max-height: 100vh;
- max-width: 100vw;
- margin: 0;
-
- + .page {
- margin-left: 10px;
- }
-
- .highlighted {
- position: absolute;
- z-index: 200;
- opacity: .25;
- background-color: $search_highlight;
- box-shadow: 0 0 4px 2px $search_highlight;
- border-radius: 3px;
- }
-
- }
-
- }
-
- #seadragon {
-
- /* OSd navigator */
- .openseadragon-container > div.openseadragon-canvas + div + div {
- right: 3px !important;
- top: 3px !important;
- }
-
- /* OSd controls */
- .openseadragon-container > div.openseadragon-canvas + div + div + div {
- bottom: 34px !important;
- right: 3px !important;
- border-radius: 5px 5px 0 0;
- background: rgb(17, 17, 17) !important; /* fallback for browsers w/o RGBa support */
- background: rgba(17, 17, 17, 0.4) !important;
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#66111111, endColorstr=#66111111); /* for IE 5.5-7 */
- -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#66111111, endColorstr=#66111111)"; /* for IE8 */
- }
-
- .control {
- width: 35px;
- height: 34px;
- margin: 0;
- margin-bottom: 32px;
- background-repeat: no-repeat;
- overflow: hidden;
- font: 0/0 serif;
- text-shadow: none;
- color: transparent;
- text-decoration: none !important;
- }
-
- }
-
- #grid {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- overflow-x: hidden;
- overflow-y: scroll;
- -webkit-overflow-scrolling: touch;
- // background-color: #111;
- padding: 30px 0px;
-
- div {
- display: inline-block;
- height: 256px;
- width: 256px;
- overflow: hidden;
- line-height: 490px;
- margin: 8px;
- text-align: left;
- color: #737373;
- background-color: transparent;
- background-repeat: no-repeat;
- background-position: center;
- background-size: contain;
-
- &.current {
- outline: solid #336699 2px;
- }
-
- &.placeholder {
- background-size: auto;
- }
-
- }
-
- }
-
- }
-
- }
-
- #help {
- display: none;
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 9999;
- width: 100%;
- height: 100%;
- min-height: 100%;
- min-width: 100%;
- text-align: center;
- color: white;
- background-color: rgba(0, 0, 0, 0.8);
- //font-size: x-large;
-
- > div {
- display: table;
- height: 100%;
- width: 100%;
-
- > div {
- display: table-row;
-
- > div {
- display: table-cell;
- vertical-align: middle;
- }
-
- }
+ #uv-header-navbar {
+ display: block;
+ padding: 10px 15px;
+ margin-bottom: 0;
+ #back_to_item_wrap {
+ float: left;
+ font-size: $font-size-sm;
+ padding-right: 10px;
}
- h2 {
- //font-family: sans-serif;
- color: inherit;
+ #uv-header-title {
+ font-size: $font-size-base;
+ width: max-content;
+ margin-left: auto;
+ margin-right: auto;
+ margin-bottom: 0;
}
-
- i {
- margin-right: 5px;
- }
-
- p, table {
- font-size: 18px;
- max-width: 40em;
- margin: auto;
- color: #ddd;
- }
-
- th, td {
- vertical-align: top;
- padding: 0 1em;
- font-weight: normal;
- }
-
- td {
- text-align: left;
-
- &:lang(ar) {
- text-align: right;
- }
-
- }
-
}
-}
-
-.no-history .wdl-viewer #viewer footer > nav #index, .no-history .wdl-viewer #viewer footer > nav #fd-slider-index {
- display: none;
-}
-
-.no-fullscreen .wdl-viewer {
-
- #viewer footer .toolbar #toggle-fullscreen {
- display: none;
- }
-
- .requires-fullscreen {
- display: none;
- }
-
-}
+ #uv {
-.touch .wdl-viewer {
-
- #viewer #viewport #seadragon .control {
- display: none;
- }
-
- #help .keyboard-controls {
- display: none;
- }
-
-}
-
-.no-rgba .wdl-viewer #help {
- background-color: black;
- filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
- opacity: 0.8;
-}
-
-.no-touch .wdl-viewer #help .touch-controls {
- display: none;
-}
-
-.wdl-viewer #viewer[data-active-view=grid] .requires-rotation, .no-csstransforms .wdl-viewer #viewer[data-active-view=page] .requires-rotation, .no-canvas .wdl-viewer #viewer[data-active-view=seadragon] .requires-rotation, .no-canvas .wdl-viewer #help .requires-rotation, .touch .wdl-viewer .requires-rotation {
- display: none;
-}
-
-
-/* responsive styles */
-
-@media screen and (max-width: 1024px) {
-
- .wdl-viewer #viewer footer > nav #index, .wdl-viewer #viewer footer > nav #fd-slider-index {
- display: none;
- }
-
-}
-
-@media screen and (max-width: 768px) {
-
- .wdl-viewer #viewer {
- font-size: small;
- }
-
- .wdl-viewer #viewer footer > nav #index, .wdl-viewer #viewer footer > nav #fd-slider-index {
- display: none;
- }
-
-}
-
-@media screen and (max-width: 600px) {
-
- .wdl-viewer #viewer #viewport #grid div {
- height: 128px;
- width: 128px;
- line-height: 240px;
- }
-
-}
-
-@media screen and (max-width: 480px) {
-
- .wdl-viewer {
-
- #viewer {
-
- header > nav > *, footer > nav > * {
- font-size: 12px;
- line-height: 18px;
- height: 24px;
- }
-
- header button, footer button {
- padding: 1px;
- //height: 18px;
- font-size: 16px;
- }
-
- footer {
- height: 24px;
-
- > nav {
-
- .current-index {
- // width: 2em;
- }
-
- .max-index, .max-index-label {
- display: none;
- }
-
- .controls button {
- height: 24px;
- margin-top: 0;
- }
-
- a.btn {
- padding:1px;
- }
-
- }
-
- .toolbar .item-detail-nav {
- // display: none;
- margin-right: 5px;
- padding-top: 0;
-
- .page {
- display: none;
- }
-
- }
+ .centerPanel {
+ .title {
+ display: none;
}
- #viewport {
-
- #seadragon {
-
- /* OSd controls */
- .openseadragon-container > div.openseadragon-canvas + div + div + div {
- bottom: 24px !important;
- }
+ .content {
+ .attribution {
+ display: none !important;
}
}
}
- #help {
-
- h2 {
- font-size: 20px;
- }
-
- h3 {
- font-size: 16px;
- }
-
- p, table {
- font-size: 12px;
- }
-
- }
-
}
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/carousel.scss b/app/assets/stylesheets/commonwealth-vlr-engine/carousel.scss
index 503909a2..74b7cb20 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/carousel.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/carousel.scss
@@ -1,96 +1,93 @@
/* customized pretty extensively to look more like Bootstrap 2 carousel */
#carousel_wrapper {
+ height: 235px;
.carousel-indicators {
- bottom: 0;
- padding-bottom: 0;
- margin-bottom: 0;
- right: 10px;
+ margin-left: 2%;
+ margin-right: 2%;
top: 10px;
- left: inherit;
- width: inherit;
+ left: unset;
height: 20px;
li {
- background-color: #FFFFFF;
- opacity:.2;
- -moz-opacity: 0.20;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
+ opacity:.5;
+ -moz-opacity: 0.50;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
height: 10px;
width: 10px;
}
.active {
- height: 10px;
- margin: 1px;
- width: 10px;
- opacity:.6;
- -moz-opacity: 0.60;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+ opacity:.8;
+ -moz-opacity: 0.80;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
}
}
- .carousel-caption {
- padding: 0 0 0 10px;
- bottom: -5px;
- left: 0;
- right: 0;
- background: none repeat scroll 0 0 rgba(0, 0, 0, 0.75);
- text-align: left;
-
- h5 {
- /* font-weight: bold; */
- margin-bottom: 0px;
- margin-top: 5px;
- }
+ .carousel-inner {
- p {
- font-size: 12px;
- font-style: italic;
- }
- }
+ .carousel-item {
+ height: 235px;
- .carousel-control {
- opacity: .2;
- -moz-opacity: 0.20;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
- }
-
-}
+ .carousel-caption {
+ padding: 0 0 0 10px;
+ bottom: -5px;
+ left: 0;
+ right: 0;
+ background: none repeat scroll 0 0 rgba(0, 0, 0, 0.75);
+ text-align: left;
+ h5 {
+ font-size: $font-size-base;
+ margin-bottom: 0px;
+ margin-top: 5px;
-/* responsive styles */
+ @media (min-width: breakpoint-min(md)) and (max-width: breakpoint-max(md)) {
+ font-size: $font-size-sm;
+ }
-@media (max-width: 767px) {
+ }
- #carousel_wrapper .carousel-inner img {
- width:100%;
- }
-
-}
+ p {
+ font-size: $font-size-sm;
+ font-style: italic;
+ margin-bottom: 10px;
-@media (max-width: 480px) {
+ @media (min-width: breakpoint-min(md)) and (max-width: breakpoint-max(md)) {
+ font-size: $font-size-xs;
+ }
- #carousel_wrapper {
- /* display: none; */
+ }
- .carousel-caption {
- /* padding: 1px 0 10px 10px; */
-
- h5 {
- font-size: 12px;
}
- p {
- font-size: 10px;
+ @media (min-width: breakpoint-min(xl)) {
+ height: 288px;
}
+ @media (min-width: breakpoint-min(md)) and (max-width: breakpoint-max(md)) {
+ height: 179px;
+ }
}
}
-}
+ .carousel-control-prev, .carousel-control-next {
+ width: 10%;
+ }
+
+ @media (min-width: breakpoint-min(xl)) {
+ height: 288px;
+ }
+ @media (min-width: breakpoint-min(md)) and (max-width: breakpoint-max(md)) {
+ height: 179px;
+ }
+ @media (max-width: breakpoint-max(md)) {
+ margin-bottom: 25px;
+ }
+
+}
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/cmmnwlth_defaults.scss b/app/assets/stylesheets/commonwealth-vlr-engine/cmmnwlth_defaults.scss
index b121c9c6..16f756dc 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/cmmnwlth_defaults.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/cmmnwlth_defaults.scss
@@ -17,9 +17,8 @@ $bootstrap_text: #333333 !default;
$bl_link: #428BCA !default;
$bl_link_hover: #005580 !default;
-$well_bg_color: #F5F5F5 !default;
-$well_border_color: #E3E3E3 !default;
-$facets_border: #DDDDDD !default;
+$constraints_bg_color: #E2EDFE !default;
+$facets_active_border: #d6e9c6;
$navbarBorder: #D4D4D4 !default;
@@ -34,6 +33,19 @@ $error_border: #eed3d7 !default;
$viewer_bg: #111111 !default;
$search_highlight: yellow !default;
+$font-size-xs: $font-size-base * .8 !default;
+$padding-y-xs: .1rem !default;
+$padding-x-xs: .4rem !default;
+
+$btn-padding-y-xs: $padding-y-xs !default;
+$btn-padding-x-xs: $padding-x-xs !default;
+$btn-font-size-xs: $font-size-xs !default;
+
+$input-padding-y-xs: $padding-y-xs !default;
+$input-padding-x-xs: $padding-x-xs !default;
+$input-font-size-xs: $font-size-xs !default;
+$input-height-xs: add($input-line-height-sm * 1em, add($input-padding-y-xs * 2, $input-height-border, false)) !default;
+
@mixin rounded-corners($radius) {
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
@@ -44,3 +56,10 @@ $search_highlight: yellow !default;
-webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1
box-shadow: $shadow;
}
+
+@mixin card-esque($padding) {
+ border-radius: $card-border-radius;
+ background-color: $card-cap-bg;
+ border: $card-border-width solid $card-border-color;
+ padding: $padding;
+}
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/cmmnwlth_shared.scss b/app/assets/stylesheets/commonwealth-vlr-engine/cmmnwlth_shared.scss
index 432e19a7..3bc05e04 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/cmmnwlth_shared.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/cmmnwlth_shared.scss
@@ -1,18 +1,32 @@
/* shared sitewide styles */
+h1 {
+ font-size: $h2-font-size;
+}
+
+a {
+ color: $bl_link;
+ text-decoration: $link-decoration;
+
+ &:hover {
+ color: $bl_link_hover;
+ text-decoration: $link-hover-decoration;
+ }
+}
+
+// fixed-top navbar for these pages only
body.blacklight-institutions-index, body.blacklight-collections-index, body.blacklight-catalog-index {
#header-navbar {
- top: 0;
- left: 0;
- margin-bottom: 0;
position: fixed;
+ top: 0;
right: 0;
- z-index: 1001; // blacklight-maps leaflet controls have z-index:1000
+ left: 0;
+ z-index: 1030;
}
#main-container {
- padding-top: 100px;
+ margin-top: 100px;
}
}
@@ -54,7 +68,7 @@ body.blacklight-institutions-index, body.blacklight-collections-index, body.blac
span.divider {
color:$light_gray;
- padding: 0 5px;
+ padding: 0 5px 0 10px;
}
}
@@ -76,7 +90,7 @@ body.blacklight-institutions-index, body.blacklight-collections-index, body.blac
#modal-transition {
display: none;
- border-radius: $border-radius-large;
+ border-radius: $border-radius-lg;
background-color: rgba(0,0,0,.1);
height: 100%;
left: 0;
@@ -104,4 +118,51 @@ body.blacklight-institutions-index, body.blacklight-collections-index, body.blac
visibility: hidden;
}
-}
\ No newline at end of file
+}
+
+.btn-xs {
+ @include button-size($btn-padding-y-xs, $btn-padding-x-xs, $btn-font-size-xs, $btn-line-height-sm, $btn-border-radius-sm);
+}
+
+.btn-group-xs > .btn { @extend .btn-xs; }
+
+.btn-xs + .dropdown-toggle-split {
+ padding-right: $btn-padding-x-xs * .75;
+ padding-left: $btn-padding-x-xs * .75;
+}
+
+.form-control-xs {
+ height: $input-height-xs;
+ padding: $input-padding-y-xs $input-padding-x-xs;
+ @include font-size($input-font-size-xs);
+ line-height: $input-line-height-sm;
+ @include border-radius($input-border-radius-sm);
+}
+
+.item_az_links {
+ font-size: $font-size-sm;
+ @include card-esque(9px);
+ margin-bottom: 10px;
+
+ .az_link, .az_nolink, .az_active {
+ padding-left: 7px;
+
+ @media (min-width: breakpoint-min(xl)) {
+ padding-left: 12px;
+ }
+
+ }
+
+ .az_nolink {
+ color: $dark_gray;
+ }
+
+ .az_active {
+ font-weight: bold;
+ }
+
+}
+
+.geo_popup_heading {
+ font-size: $font-size-sm;
+}
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/collections.scss b/app/assets/stylesheets/commonwealth-vlr-engine/collections.scss
index 56ea6bff..ff5f6969 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/collections.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/collections.scss
@@ -2,59 +2,55 @@
/* collections#index */
-.item_az_links {
- margin-bottom: 10px;
+.collections-list {
- .az_link, .az_nolink, .az_active {
- padding-left:7px;
- }
+ #collections_results {
- .az_nolink {
- color:$dark_gray;
- }
+ #sortAndPerPage {
+ @include card-esque(10px);
- .az_active {
- font-weight: bold;
- }
+ #sort-dropdown, .view-type {
+ display: none;
+ }
-}
+ }
-div.collections-list {
+ #saveSearchLink {
+ display: none;
+ }
- /* don't display sort or view-type widgets */
- #sort-dropdown, .view-type {
- display: none;
- }
+ #documents.documents-list {
+ margin-bottom: 30px;
- #documents.documents-list {
- margin-top: 15px;
+ .document {
- .document {
+ .document-thumbnail {
+ min-width: 130px;
- .document-thumbnail {
- min-width: 130px;
+ img {
+ max-height: 130px;
+ max-width: 130px;
+ }
- img {
- max-height: 130px;
- max-width: 130px;
}
}
- .item_index_details {
- font-size: 13px;
- }
-
}
}
+ @media (max-width: breakpoint-max(md)) {
+ flex-direction: column-reverse;
+ }
+
}
/* collections#show */
-h2.collection-title {
- line-height:25px;
+h1.collection-title {
+ line-height: 32px;
+ margin-bottom: 10px;
}
h4.collection-provenance {
@@ -76,8 +72,8 @@ h4.collection-provenance {
#collection_img {
float: left;
- width: 43%;
- margin: 0 1.4em 1.5em 0;
+ width: 33%;
+ margin: 0 23px 20px 0;
img.collection_img_show {
border: 1px solid $light_gray;
@@ -99,330 +95,181 @@ h4.collection-provenance {
}
-}
-
-#collection_search_tools {
- margin-bottom: 1em;
- width:54%;
- float:right;
-
- #collection_search_form {
- padding: 0 3px 0 0;
- float: left;
-
- input {
- width: 175px;
- border-bottom-left-radius: 4px;
- border-top-left-radius: 4px;
- }
-
- .submit-search-text {
- display: none;
- }
-
+ @media (min-width: breakpoint-min(xl)) {
+ width: 27%;
+ padding-right: 32px;
}
- .collection_search_separator {
- display: inline;
- float: left;
- padding: 6px 6px 8px 3px;
- vertical-align: middle;
- color: $dark_gray;
+ @media (max-width: breakpoint-max(md)) {
+ width: 50%;
+ float: none;
+ margin-left: auto;
+ margin-right: auto;
}
-}
-
-
-#collection_desc {
-
- ol,ul {
- display: inline-block;
+ @media (max-width: breakpoint-max(md)) {
+ width: 59%;
}
}
-#series_wrapper {
- /* float:left; */
- clear: left;
- padding-top: 10px;
-
- .panel-default {
- border: none;
- box-shadow: none;
-
- .panel-heading {
- display: none;
- }
-
- #facet-related_item_series_ssim_thumb-list {
- display:block;
+#collection_search_tools {
+ @include card-esque(10px);
+ margin-bottom: 10px;
+ float: right;
+ display: flex;
+ width: 64%;
+ justify-content: center;
- .panel-body {
- padding: 0;
- }
+ .collection_search_separator {
+ display: inline;
+ padding: 6px 15px 8px 15px;
+ vertical-align: middle;
+ color: $dark_gray;
+ @media (max-width: breakpoint-max(md)) {
+ padding: 6px 10px 8px 10px;
}
-
}
- #documents {
-
- .document {
- border: none;
- padding-bottom: 25px;
- margin-bottom: 10px;
-
- .thumbnail {
- border: none;
- height: 127px;
-
- img {
- max-height: 127px;
- }
+ #collection_search_form {
+ padding: 0 3px 0 0;
- .caption {
- padding: 2px 5px;
- font-size: 12px;
- }
+ input {
+ width: 300px;
+ border-bottom-left-radius: 4px;
+ border-top-left-radius: 4px;
+ @media (max-width: breakpoint-max(sm)) {
+ width: 270px;
}
+ }
+ .blacklight-icons > svg {
+ height: 20px;
}
}
-}
-
-#facets div.blacklight-related_item_series_ssim {
- display: none;
-}
-
-#blacklight-collection-map-container {
- clear: left;
- padding-top: 10px;
-
- #blacklight-index-map {
- height: 300px;
+ @media (min-width: breakpoint-min(xl)) {
+ width: 70%;
}
-}
-
-#collection_metadata_wrapper {
- margin-top: 1.5em;
-}
-
-#item_metadata h4 {
- padding-left:1em;
-}
-
-/* collections gallery */
-
-#documents.collections-gallery {
-
- .masonry {
-
- &.document {
- background-color: inherit;
- padding: 5px;
-
- .thumbnail {
- border: 1px solid $dark_gray;
- padding: 0;
- overflow: hidden;
- border-radius: 7px;
- height: 221px;
-
- a {
-
- img {
- border: none;
- height:auto;
- width:auto;
- max-height: 221px;
- position: relative;
- top: 109px; // would rather use 50% but doesn't work in Chrome
- transform: translateY(-50%);
- -webkit-transform: translateY(-50%);
- -ms-transform: translateY(-50%);
- -moz-transform: translateY(-50%);
- }
-
- }
-
- .caption {
- display: block;
- left: 5px;
- right: 5px;
- width: auto;
- bottom: 5px;
- border-bottom-left-radius: 7px;
- border-bottom-right-radius: 7px;
- background: linear-gradient(to bottom, rgba(0,0,0,0) 0%, rgba(0,0,0,0.45) 27%, rgba(0,0,0,0.45) 100%);
-
- h5 {
- font-size:16px;
- margin-bottom: 3px;
- margin-top: 3px;
-
- a:hover {
- text-decoration: none;
- }
-
- }
-
- }
-
- }
-
- }
-
+ @media (max-width: breakpoint-max(md)) {
+ width: 90%;
+ float: none;
+ margin-left: auto;
+ margin-right: auto;
}
-}
-
-
-
-/* responsive styles */
-
-/* Large desktop */
-@media (min-width: 1200px) {
-
- .item_az_links {
-
- .az_link, .az_nolink {
- padding-left:12px;
- }
-
+ @media (max-width: breakpoint-max(md)) {
+ width: 100%;
}
- #collection_search_tools {
- width:54%;
+ @media (max-width: breakpoint-min(sm)) {
+ flex-flow: column;
}
- #series_wrapper {
-
- #documents {
-
- .document {
-
- .thumbnail {
- height: 159px;
-
- img {
- max-height: 159px;
- }
-
- }
-
- }
+}
- }
+#collection_desc {
+ ol, ul {
+ display: inline-block;
}
- #blacklight-collection-map-container {
-
- #blacklight-index-map {
- height: 400px;
- }
-
+ @media (max-width: breakpoint-max(md)) {
+ width: 90%;
+ margin-left: auto;
+ margin-right: auto;
}
- #documents.collections-gallery {
-
- .masonry {
-
- &.document {
-
- .thumbnail {
- height: 271px;
-
- a {
-
- img {
- top: 135px;
- max-height: 271px;
- }
-
- }
-
- }
-
- }
-
- }
-
+ @media (max-width: breakpoint-max(md)) {
+ width: 100%;
}
}
-/* Portrait tablet to landscape and desktop */
-@media (min-width: 768px) and (max-width: 991px) {
-
- .item_az_links {
-
- .az_link, .az_nolink {
- padding-left:1px;
- }
-
- }
+.hosted-collection {
#collection_img {
width: 100%;
- margin: 0 0 1em 0;
}
#collection_search_tools {
- width:97%;
- float:left;
+ float: none;
+ margin-right: auto;
+ margin-left: auto;
+ width: 90%;
+ margin-bottom: 20px;
- #collection_search_form {
+ @media (max-width: breakpoint-max(md)) {
+ width: 100%;
+ }
+ }
- input {
- width: 100%;
- }
+ #collection_desc {
+ float: none;
+ width: 85%;
+ margin-left: auto;
+ margin-right: auto;
+ @media (max-width: breakpoint-max(md)) {
+ width: 100%;
}
-
}
+}
- #series_wrapper {
+#collection_facets_wrapper {
+ margin-top: 30px;
- #documents {
+ #series_wrapper {
- .document {
+ .card {
+ border: none;
- .thumbnail {
- height: 95px;
+ .card-header {
+ display: none;
+ }
- img {
- max-height: 95px;
- }
+ #facet-related_item_series_ssim_thumb-list {
+ display:block;
+ .card-body {
+ padding: 0;
}
}
}
- }
-
- #documents.collections-gallery {
-
- .masonry {
+ #documents {
+ display: flex;
+ flex-flow: row wrap;
- &.document {
+ .document {
+ border: none;
+ margin-bottom: 15px;
.thumbnail {
- height: 166px;
+ border: none;
+
+ img {
+ max-width: 100%;
+ max-height: 127px;
- a {
+ @media (min-width: breakpoint-min(xl)) {
+ max-height: 159px;
+ }
- img {
- top: 82px;
- max-height: 166px;
+ @media (max-width: breakpoint-max(md)) {
+ max-height: 95px;
}
+ }
+ .caption {
+ padding: 2px 5px;
+ font-size: 12px;
}
}
@@ -431,133 +278,43 @@ h4.collection-provenance {
}
- }
-
-}
-
-/* Landscape phone to portrait tablet */
-@media (max-width: 767px) {
-
- .item_az_links {
-
- .az_link, .az_nolink {
- padding-left:2px;
+ @media (max-width: breakpoint-max(md)) {
+ display: none;
}
}
- #collection_img {
- width: 100%;
- margin: 0 0 1em 0;
- float: none;
- }
-
- #collection_search_tools {
- width:97%;
- float:none;
-
- #collection_search_form {
- width:289px;
-
- input {
- width: 100%;
- }
+}
- }
+#facets div.blacklight-related_item_series_ssim {
+ display: none;
+ @media (max-width: breakpoint-max(md)) {
+ display: block;
}
+}
- #series_wrapper {
- display: none;
- }
+#blacklight-collection-map-container {
- .blacklight-collection #facets {
- margin-top: 1em;
+ #blacklight-index-map {
+ height: 300px;
- div.blacklight-related_item_series_ssim {
- display: block;
+ @media (min-width: breakpoint-min(xl)) {
+ height: 400px;
}
-
}
- #documents.collections-gallery {
-
- .masonry {
-
- &.document {
-
- &:before {
- content: "";
- display: block;
- padding-top: 100%;
- }
-
- .thumbnail {
- position: absolute;
- top: 5px;
- left: 5px;
- bottom: 5px;
- right: 5px;
- height: auto;
-
- a {
-
- img {
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%,-50%);
- -webkit-transform: translate(-50%,-50%);
- -ms-transform: translate(-50%,-50%);
- -moz-transform: translate(-50%,-50%);
- max-height: unset;
- }
-
- }
-
- .caption {
- left: 0;
- right: 0;
- bottom: -2px;
-
- h5 {
- font-size:14px;
- }
-
- }
-
- }
-
- }
-
- }
-
+ @media (max-width: breakpoint-min(sm)) {
+ display: none;
}
}
-/* Landscape phones and down */
-@media (max-width: 480px) {
-
- #collection_search_tools {
-
- #collection_search_form {
-
- input {
- width: 100%;
- }
-
- }
-
- #collection_view_all {
- padding-top: 45px;
- }
-
- }
+.collections-sidebar {
+ padding-top: 8px;
- #blacklight-collection-map-container {
- display:none;
+ @media (max-width: breakpoint-max(md)) {
+ order: -1;
+ margin-bottom: 25px;
}
-
}
-
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/facets.scss b/app/assets/stylesheets/commonwealth-vlr-engine/facets.scss
index 55cee783..684458f8 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/facets.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/facets.scss
@@ -2,8 +2,14 @@
body.blacklight-catalog-formats_facet {
- .facet_pagination.top {
- padding: 15px 15px 0;
+ .facet-pagination.top {
+ float: right;
+ padding: 8px 0 0 0;
+ margin-right: 16px;
+
+ @media (max-width: breakpoint-max(xs)) {
+ display: none;
+ }
}
.prev_next_links {
@@ -18,85 +24,102 @@ body.blacklight-catalog-formats_facet {
#facets {
- div.top-panel-heading {
- background-color: #F5F5F5;
- padding: 10px 15px 0;
- border: 1px solid $facets_border;
+ @media (max-width: breakpoint-max(md)) {
+ margin-bottom: 5px;
+ }
- h4 {
- margin-top: 0;
+ .facets-header {
+ color: $card-cap-color;
+ background-color: $card-cap-bg;
+ border: $card-border-width solid $card-border-color;
+ border-top-left-radius: $card-border-radius;
+ border-top-right-radius: $card-border-radius;
+ padding: 0.3rem 0.5rem;
+
+ @media (max-width: breakpoint-max(md)) {
+ border-bottom-left-radius: $card-border-radius;
+ border-bottom-right-radius: $card-border-radius;
}
+ h2.facets-heading {
+ font-size: $h5-font-size;
+ margin-bottom: 0;
+ }
}
- h5 {
- font-size: 14px;
- }
-
- .panel {
+ .card {
border-radius: 0;
margin-bottom: 0;
- margin-top:0;
- border-top:none;
+ margin-top: 0;
+ border-top: none;
&:last-child {
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
+ border-bottom-left-radius: $card-border-radius;
+ border-bottom-right-radius: $card-border-radius;
}
- .panel-body {
+ &.facet-limit-active {
+ border-color: $facets_active_border !important;
+ border-radius: 0;
+
+ .facet-field-heading {
+ border-radius: 0;
+ background-color: $facets_active_border !important;
+ }
+
+ }
+
+ .card-body {
border-top: none;
padding: 5px 15px;
- }
- }
+ .facet-values {
+ font-size: $font-size-xs;
+ line-height: 15px;
+ padding-bottom: .5em;
- li {
- font-size: 13px;
- line-height:15px;
- padding-bottom: .5em;
- }
+ .facet-label {
+ word-break: normal;
+ }
+
+ }
+
+ .more_facets {
+ font-size: $font-size-xs;
+ }
+ }
- .facet-values .facet-label {
- word-break: normal;
}
/* advanced search results facets */
- .advanced_facet_limit ul {
- border-bottom: medium none;
- padding-bottom: 0;
- padding-top: 0;
- margin-bottom: 4px;
- }
+ .advanced_facet_limit {
- .facet_limit .inclusive_or h4 {
- margin-bottom: 0;
- margin-left: 3px;
- font-size: 12px;
+ .card-body {
+ border-top: $card-border-width solid $card-border-color;
+ }
+
+ h5 {
+ font-size: $h6-font-size;
+ }
}
/* blacklight_range_limit */
- .range_limit {
- margin-bottom: 10px;
-
- form.range_limit {
- line-height: 2;
- }
+ div.range_limit {
input.range_begin, input.range_end {
height: 25px;
- padding: 6px;
- width: 46px;
}
input.submit {
height: 25px;
padding: 2px 6px 6px;
- margin-left: 3px;
+ }
+
+ .view_larger {
+ font-size: $font-size-xs;
}
.slider {
- margin-left: 5px;
&.slider-horizontal {
@@ -133,59 +156,6 @@ body.blacklight-catalog-formats_facet {
}
- .distribution {
- margin-left: -8px;
- }
-
- }
-
-}
-
-/* responsive styles */
-
-/* Portrait tablet to landscape and desktop */
-@media (min-width: 768px) and (max-width: 991px) {
-
- #facets {
-
- div.top-panel-heading {
- margin-bottom: 0;
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
- }
-
- /* so facets don't overflow container div */
- .facet-values .facet-label {
- padding-left: 5px;
- padding-right: 2px;
- text-indent: -5px;
- max-width: 105px;
- }
-
}
}
-
-/* Landscape phone to portrait tablet */
-@media (max-width: 767px) {
-
- #sidebar, #facets {
- padding-bottom: 0;
- }
-
- #facets {
-
- div.top-panel-heading {
- padding: 2px 15px;
- margin-bottom: 3px;
-
- h4 {
- margin-top: 10px;
- }
-
- }
-
- }
-
-}
-
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/feedback.scss b/app/assets/stylesheets/commonwealth-vlr-engine/feedback.scss
index d1fe87bb..a449465c 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/feedback.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/feedback.scss
@@ -1,10 +1,24 @@
/* styles for feedback form */
+#contact_content {
+
+ .col-form-label {
+ text-align: right;
+
+ @media (max-width: breakpoint-max(sm)) {
+ text-align: left;
+ }
+
+ }
+
+}
+
#contact_help_text {
+ display: none;
i {
float: left;
- padding: 5px 10px 0px 0px;
+ padding: 5px 10px 0 0;
}
}
\ No newline at end of file
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/folders.scss b/app/assets/stylesheets/commonwealth-vlr-engine/folders.scss
index 6a2fca14..b763d63b 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/folders.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/folders.scss
@@ -66,6 +66,7 @@ body.blacklight-folders, body.blacklight-bookmarks {
}
#public_folders_sidebar {
+ @include card-esque(10px);
margin-top: 42px;
ul {
@@ -97,7 +98,7 @@ body.blacklight-folders, body.blacklight-bookmarks {
color: red;
}
- label.control-label {
+ label.col-form-label {
font-weight: bold;
}
}
@@ -146,9 +147,6 @@ div.folder_show_container {
display: inline;
ul.folderItemToolsList {
- /* @include rounded-corners(0 0 4px 4px); */
- background-color: $well_bg_color;
- border-color: $well_bg_color;
margin:0;
display: inline;
padding-left: 0;
@@ -190,7 +188,7 @@ div.folder_show_container {
}
#documents {
- margin-top: 10px;
+ margin-top: 20px;
/* list view */
&.documents-list {
@@ -198,14 +196,10 @@ div.folder_show_container {
.document {
.documentHeader {
+ flex-direction: row-reverse;
.document-title-heading {
- width: 95%;
- }
-
- .folder_item_checkbox {
- float: right;
- margin-top: 0;
+ flex: 0 0 95%;
}
}
@@ -219,37 +213,6 @@ div.folder_show_container {
.document {
- .thumbnail {
-
- .caption {
-
- .documentHeader {
-
- .folder_item_checkbox {
- float: left;
- margin-top: 10px;
- }
-
- .document-title-heading {
- width: 90%;
- padding-left: 5px;
- }
-
- }
-
- }
-
- }
-
- }
-
- }
-
- /* masonry view */
- .masonry {
-
- &.document {
-
.thumbnail {
.caption {
@@ -257,7 +220,8 @@ div.folder_show_container {
.documentHeader {
.document-title-heading {
- margin-top: 0;
+ flex: 0 0 92%;
+ padding-left: 10px;
}
}
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/header.scss b/app/assets/stylesheets/commonwealth-vlr-engine/header.scss
index aeac221b..aa68c07d 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/header.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/header.scss
@@ -1,339 +1,116 @@
-/* styles for views/shared/header */
+/* styles for views/shared/header_navbar */
#header-navbar {
- min-width: 320px;
- height:92px;
- margin-bottom: 0;
- background-color:#f9f9f9;
- background-image:-moz-linear-gradient(top, #fff, #f2f2f2);
- background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), to(#f2f2f2));
- background-image:-webkit-linear-gradient(top, #fff, #f2f2f2);
- background-image:-o-linear-gradient(top, #fff, #f2f2f2);
- background-image:linear-gradient(to bottom, #fff, #f2f2f2);
- background-repeat:repeat-x;
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFF2F2F2', GradientType=0);
- border-bottom:1px solid #d4d4d4;
- -webkit-box-shadow:0 1px 5px rgba(0,0,0,0.3);
- -moz-box-shadow:0 1px 5px rgba(0,0,0,0.3);
- box-shadow:0 1px 5px rgba(0,0,0,0.3);
-
- .navbar-header {
- height: 5.5em;
- padding-top: 0.5em;
- float: none;
-
- /* The main logo image for the Blacklight instance */
- .navbar-brand {
- width: 205px;
- background:transparent asset_url($header_logo_image) no-repeat top left;
- display: inline-block;
- text-indent: 100%;
- white-space: nowrap;
- overflow: hidden;
- padding-right:0;
- margin-left: 0;
- margin-right:20px;
- padding-left: 0;
- height: 74px;
- }
-
- #user-util-collapse {
- padding-right:0;
-
- #user-util-links {
- font-size: 12px;
- text-align: right;
- height: 42px;
-
- #util-links-nologin, #user-nav-btn {
- display: inline-block;
- vertical-align: super;
- }
-
- #user-nav-btn {
- vertical-align: top;
- padding-top: 6px;
- }
-
- ul.dropdown-menu {
- text-align: left;
- font-size: 12px;
-
- > li > a:hover {
- color:#FFFFFF;
- background-color: #0081C2;
- background-image: linear-gradient(to bottom, #0088CC, #0077B3);
- background-repeat: repeat-x;
- }
-
- }
-
- #header-search {
- display: inline-block;
- padding: 0.4em 0 0 0.7em;
-
- input {
- padding: 0 0 0 4px;
- width: 120px;
- border-bottom-left-radius: 3px;
- border-top-left-radius: 3px;
- height: 20px;
- }
-
- .submit-search-text {
- display: none;
- }
-
- .tt-menu {
- min-width: 120px;
-
- .tt-suggestion {
- font-size: 12px;
- }
-
- }
-
- }
-
- }
-
- }
-
- #nav_collapse_button {
- padding: 7px 8px 4px 5px;
- border-color: #DDDDDD;
-
- .glyphicon-search {
- display: inline-block;
- position: relative;
- -moz-opacity: 0.6;
- opacity: 0.6;
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
- top:0px;
- }
-
- #icon-bar-wrapper {
- display: inline-block;
-
- .icon-bar {
- background-color: #888888;
- }
-
- }
+ border-bottom: 1px solid #d4d4d4;
+ .navbar-logo {
+ @if $header_logo_image {
+ background: transparent $header_logo_image no-repeat top left;
}
- #header_main_nav {
- float: right;
- margin-bottom: 0;
- padding-top: .2em;
+ @if $header_logo_image {
+ // deprecated
+ background: transparent image_url($header_logo_image) no-repeat top left;
}
- .navbar .nav {
- margin: 0;
+ height: 74px;
+ width: 200px;
+ flex: 0 0 200px;
- > li > a {
- padding: 10px 60px 10px 0;
- background-color: inherit;
- color: #777777;
+ @media (max-width: breakpoint-max(sm)) {
+ margin-bottom: 5px;
+ }
+ }
- &:hover {
- color: #333333;
- }
+ #user-nav-collapse {
+ flex-wrap: wrap;
- }
+ #user-util-links {
+ display: flex;
+ font-size: $font-size-xs;
+ width: 100%;
- > li.last_nav > a {
- padding: 10px 0;
+ @media (max-width: breakpoint-max(sm)) {
+ flex-wrap: wrap;
+ margin-top: 20px;
}
- > li.dropdown > a.active {
- background-color: inherit;
- box-shadow: none;
- color: #333333;
- }
+ #util-links-nologin {
+ margin-top: 3px;
- li.dropdown.open > .dropdown-toggle,
- li.dropdown.active > .dropdown-toggle,
- li.dropdown.open.active > .dropdown-toggle {
- background-color: inherit;
- }
-
- li.dropdown .dropdown-menu {
- margin: 0;
- z-index: 1001; /* to cover twitter-typeahead in home page search bar */
-
- > li > a:hover {
- color:#FFFFFF;
- background-color: $dropdown-hover-background;
- background-image: linear-gradient(to bottom, $dropdown-hover-background-gradient-start, $dropdown-hover-background-gradient-end);
- background-repeat: repeat-x;
+ @media (max-width: breakpoint-max(sm)) {
+ width: 100%;
}
-
}
- /* display nav dropdown menus on hover */
- li.dropdown:hover .dropdown-menu {
- display: block;
- }
-
- }
-
- }
-
-}
-
-
-/* styles for expanded nav */
-
-.navbar-collapse.in.collapse, .navbar-collapse.collapsing {
- background-color: #f2f2f2;
- @include rounded-corners(0 0 5px 5px);
- box-shadow: 3px 5px 5px rgba(0, 0, 0, 0.3);
- border-bottom: 1px solid $light_gray;
- border-left: 1px solid $light_gray;
- border-right: 1px solid $light_gray;
- /* float: right; */
- padding-right: 5px !important;
- position: relative;
- left: 7px;
- top: 9px;
- width: 98%;
- z-index: 1001; /* to cover twitter-typeahead in home page search bar */
-}
-
-.navbar-collapse {
-
- .btn {
- padding: 0 6px;
- }
-
- .nav > li {
- float: left;
- }
-
-}
-
-
-/* responsive styles */
+ #user-nav-btn {
+ margin-bottom: 14px;
-/* greater than Portrait tablet (iPad) to landscape and desktop */
-@media (min-width: 768px) and (max-width: 991px) {
+ #user-util-links-list {
- #header-navbar {
-
- .navbar-header {
+ a {
+ padding: 3px 15px;
+ font-size: $font-size-xs;
+ }
- .navbar .nav > li > a {
- padding: 10px 40px 10px 0;
- }
+ }
- .navbar .nav > li.last_nav > a {
- padding: 10px 0;
+ @media (max-width: breakpoint-max(sm)) {
+ margin-right: 160px;
+ z-index: 1001;
+ }
}
- }
-
- }
-
-}
-
-/* Landscape phone to portrait tablet (iPad) */
-@media (max-width: 767px) {
-
- #header-navbar {
-
- .navbar-header {
-
- #user-util-collapse {
-
- #user-util-links {
-
- #header-search {
- float:none;
- width:30%;
-
- input {
- width:100%;
- }
-
- }
+ #header-search {
+ padding-left: 20px;
+ input {
+ width: 120px;
+ @include border-right-radius(0);
}
- }
+ .blacklight-icons {
- .navbar .nav {
+ svg {
+ width: 16px;
+ height: 16px;
+ }
- > li.dropdown > a.active {
- color: #777777;
}
- /* don't display nav dropdown menus on hover */
- li.dropdown:hover .dropdown-menu {
- display: none;
+ @media (max-width: breakpoint-max(sm)) {
+ padding-left: 0;
}
}
}
- }
-
-}
-
-/* Landscape phones and down */
-@media (max-width: 480px) {
-
- #header-navbar {
-
- .navbar-header {
-
- #user-util-collapse {
- width:93%;
-
- #user-util-links {
-
- #util-links-nologin {
- display: block;
- }
-
- #header-search {
- float:none;
- width:43%;
-
- input {
- width:100%;
- }
+ #header_main_nav {
- }
+ li.nav-item {
+ a.nav-link {
+ padding-right: 65px;
}
- #header_main_nav {
- padding-top:13px;
- }
-
- .navbar .nav {
- text-align: right;
-
- > li, li.last_nav {
- float: none;
-
- > a {
- padding: 4px 0;
- }
+ }
- }
+ li.nav-item.last_nav {
+ a.nav-link {
+ padding-right: 5px;
}
}
+ .dropdown-menu {
+ z-index: 1002; /* to cover home page search bar */
+ margin-top: 0;
+ }
+
}
}
}
-
-
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/home.scss b/app/assets/stylesheets/commonwealth-vlr-engine/home.scss
index 6cc13724..7c02e010 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/home.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/home.scss
@@ -1,276 +1,126 @@
/* styles for home page view */
-/* don't show the search icon on home page */
-body.blacklight-home {
-
- #header-navbar .navbar-header #nav_collapse_button {
- padding-left: 8px;
-
- .glyphicon-search {
- display: none;
- }
-
- }
-
-}
-
#content_home {
- padding-top: 13px;
#hero_search {
- @include rounded-corners(5px);
- background-color: #eeeeee;
- text-align: center;
- padding: 0 0 25px 0;
+ padding: 30px 50px;
height: 235px;
- width: 48.5%; /* ARRGH! */
+ margin-bottom: 0;
#hero_search_headline {
- width:78%;
- margin: auto;
- text-align: left;
-
- h2 {
- font-size: 24px;
- line-height: 30px;
- padding: 15px 0 10px 5px;
- }
- }
-
- #hero_search_form {
- padding-top:10px;
-
- div.search_select_wrapper {
- display: inline;
- }
-
- #search_field {
- text-align: left;
- height: 34px;
- margin-right: 3px;
- }
- .twitter-typeahead {
+ h1 {
+ font-size: $h3-font-size;
- input {
- border-bottom-left-radius: 3px;
- border-top-left-radius: 3px;
+ @media (min-width: breakpoint-min(xl)) {
+ font-size: $h2-font-size;
}
+ @media (max-width: breakpoint-max(md)) {
+ font-size: $h4-font-size;
+ }
}
- }
-
- }
-
- #content_home_browse {
- margin-top: 50px;
-
- div.browse_item {
- text-align: center;
-
- a.browse_icon_link {
- color: $dark_gray;
- }
-
- img.browse_img {
- width:120px;
- border: 1px solid $light_gray;
- }
-
- .browse_item_desc {
- font-size: 16px;
- color: $darker_gray;
+ @media (min-width: breakpoint-min(xl)) {
+ margin-top: 25px;
}
}
- }
-
- #content_home_context {
- margin-top: 30px;
-
- #content_home_news li {
- padding-bottom: .5em;
- }
-
- .more-info-link {
- text-align: right;
- padding-right: 1em;
- }
-
-
- }
-
-}
-
-
-
-/* Large desktop */
-@media (min-width: 1200px) {
-
- #content_home {
-
- #hero_search {
- height: 287px;
-
- #hero_search_headline {
- width:81%;
-
- h2 {
- font-size: 31.5px;
- line-height: 35px;
- padding: 30px 0 10px 10px;
- }
+ #hero_search_form {
+ padding-top: 15px;
+ #search_field {
+ display: none;
}
- }
-
- }
-
-}
-
-/* Portrait tablet to landscape and desktop */
-@media (min-width: 768px) and (max-width: 991px) {
+ .search-q {
+ border-top-left-radius: $border-radius !important;
+ border-bottom-left-radius: $border-radius !important;
+ width: 230px;
- #content_home {
-
- #hero_search {
- height: 179px;
+ @media (min-width: breakpoint-min(xl)) {
+ width: 100%;
+ }
- #hero_search_headline {
- width:82%;
+ @media (min-width: breakpoint-min(md)) and (max-width: breakpoint-max(md)) {
+ width: 226px;
+ }
- h2 {
- font-size: 20px;
- line-height: 20px;
- padding: 10px 0 0 7px;
+ @media (max-width: breakpoint-min(md)) {
+ width: 100%;
}
+ }
+ .blacklight-icons > svg {
+ height: 20px;
}
- #hero_search_form {
+ @media (max-width: breakpoint-max(md)) {
- #search_field {
- display:none;
+ .submit-search-text {
+ display: none;
}
- #q {
- border-bottom-left-radius: 4px;
- border-top-left-radius: 4px;
- }
+ }
+ @media (min-width: breakpoint-min(md)) and (max-width: breakpoint-max(md)) {
+ padding-top: 10px;
}
}
- #content_home_browse h4 {
- font-size: 16px;
+ @media (min-width: breakpoint-min(xl)) {
+ height: 288px;
}
- }
-
-}
-
-/* Landscape phone to portrait tablet */
-@media (max-width: 767px) {
+ @media (min-width: breakpoint-min(md)) and (max-width: breakpoint-max(md)) {
+ height: 179px;
+ padding: 15px 20px;
+ }
- #content_home {
+ @media (max-width: breakpoint-min(md)) {
+ padding: 50px;
+ }
- #hero_search {
- margin-bottom: 20px;
- height: auto;
- margin-left: 15px;
- width: 95%;
+ }
- #hero_search_headline {
- width:82%;
- text-align: center;
+ #content_home_browse {
+ margin-top: 50px;
- h2 {
- padding: 25px 0 0 5px;
- }
+ div.browse_item {
+ a.browse_icon_link {
+ color: $dark_gray;
}
- #hero_search_form {
- padding-top: 0;
- width:75%;
- display: inline-block;
-
- div.search_select_wrapper {
- float: left;
- }
-
+ img.browse_img {
+ width:120px;
+ border: 1px solid $light_gray;
+ margin-bottom: 10px;
}
- }
-
- #content_home_browse {
- margin-top: 10px;
-
h4 {
- font-size:24px;
+ font-size: $h5-font-size;
}
- img.media-object {
- width: 70px;
+ .browse_item_desc {
+ color: $darker_gray;
}
}
}
+ #content_home_context {
+ margin-top: 30px;
+ #content_home_news li {
+ padding-bottom: .5em;
+ }
-}
-
-/* Landscape phones and down */
-@media (max-width: 480px) {
-
- #content_home {
-
- #hero_search {
- margin-bottom: 20px;
- padding-bottom: 10px;
- height: auto;
- width: 91%;
-
- #hero_search_headline {
-
- h2 {
- font-size: 16px;
- line-height: 20px;
- padding: 15px 0 0 5px;
- }
-
- }
-
- #hero_search_form {
- padding-top: 0;
-
- form.search-query-form {
- padding-top: 0;
- margin-top:0;
-
- #search_field {
- display:none;
- }
-
- #q {
- border-bottom-left-radius: 4px;
- border-top-left-radius: 4px;
- }
-
- .submit-search-text {
- display: none;
- }
-
- }
-
- }
-
+ .more-info-link {
+ padding-right: 1em;
}
}
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/index.scss b/app/assets/stylesheets/commonwealth-vlr-engine/index.scss
index 934e104c..e564c804 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/index.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/index.scss
@@ -1,102 +1,84 @@
/* styles for index views */
#search_mode_tabs {
- li.active a {
+
+ li > a.active {
font-weight: bold;
}
+
}
#appliedParams {
- padding: 16px 9px;
- #constraintsLinks {
- margin-bottom: 0;
+ .constraints-label {
+ font-size: $font-size-sm;
+ }
+
+ .card-body {
+ padding: 1.25rem .5rem;
+ }
+
+ .applied-filter {
+ margin: 1px 0;
- & > li:first-child {
- padding-left: 4px;
+ .constraint-value, .remove {
+ background-color: $constraints_bg_color;
}
- & > li {
- padding-left: 0px;
- padding-right: 0px;
+ .remove {
+ padding: 0.4rem 0.5rem 0 0.2rem;
}
}
- .appliedFilter {
- z-index: 1;
-
- .constraint-value, .remove {
- background-color: #E2EDFE;
- }
+ #start_over_wrapper {
+ float: right;
+ margin-left: 5px;
- .filterName:after {
- padding-left: 2px;
+ @media (max-width: breakpoint-max(sm)) {
+ display: none;
}
}
}
-h4.suggest {
- font-size: 14px;
+#spell {
+ margin-bottom: 10px;
+
+ h3.suggest {
+ font-size: $font-size-base;
+ }
+
}
#sortAndPerPage {
- @include rounded-corners(3px);
- @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05) inset);
- padding: 9px;
- background-color: #F5F5F5;
- border: 1px solid #E3E3E3;
- margin-bottom: 10px;
- .page_links {
- padding: 6px 6px 6px 0;
+ .page-links {
+ font-size: $font-size-sm;
}
- .search-widgets {
+ .btn {
+ padding: 0.375rem 0.3rem;
+ font-size: $font-size-sm;
- .btn {
- padding: 6px 5px;
+ &.btn-icon {
+ padding: 0.25rem 0;
}
-
- .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
- color:#FFFFFF;
- background-color: $dropdown-hover-background;
- background-image: linear-gradient(to bottom, $dropdown-hover-background-gradient-start, $dropdown-hover-background-gradient-end);
- background-repeat: repeat-x;
- }
-
}
}
-.css-dropdown ul {
- /* make sure dropdowns aren't hidden behind images */
- z-index:1;
-}
-
#documents {
/* generic all-purpose catalog#index stuff */
- .index-title-icon { // icons for collections/institutions
- width: 20px;
- padding-left: 3px;
- display: inline;
- }
-
.document {
.documentHeader {
- .document-title-heading {
- font-weight: bold;
-
- .document-counter {
- display:none;
- }
-
+ .document-counter {
+ display: none;
}
}
@@ -104,8 +86,11 @@ h4.suggest {
img {
border: 1px solid $light_gray;
- &.index-title-icon { // icons for collections/institutions
+ &.index-title-icon {
border: none;
+ padding-left: 3px;
+ display: inline;
+ width: 20px;
}
}
@@ -120,15 +105,34 @@ h4.suggest {
margin-top: 10px;
.document-thumbnail {
- float:left;
- padding: 0 0 0 0;
- min-width: 200px;
+ float: left;
+ padding: 0;
+ min-width: 250px;
+
+ @media (max-width: breakpoint-max(lg)) {
+ min-width: 200px;
+ }
img {
- height:auto;
- width:auto;
- max-height:200px;
- max-width:200px;
+ height: auto;
+ width: auto;
+ max-height: 250px;
+ max-width: 250px;
+
+ @media (max-width: breakpoint-max(lg)) {
+ max-height: 200px;
+ max-width: 200px;
+ }
+
+ @media (max-width: breakpoint-max(sm)) {
+ max-height: 300px;
+ max-width: 300px;
+ }
+
+ //&.index-title-icon {
+ // width: 20px;
+ //}
+
}
}
@@ -138,7 +142,12 @@ h4.suggest {
padding: 0 0 0 20px;
width: 65%;
+ @media (max-width: breakpoint-max(sm)) {
+ width: 100%;
+ }
+
.document-title-heading {
+ font-size: $font-size-base;
margin: 0 0 3px 0;
}
@@ -148,28 +157,28 @@ h4.suggest {
padding: 10px 0 0 20px;
float: left;
width: 65%;
+ font-size: $font-size-sm;
- dt {
- color: $darker_gray;
- width: 80px;
+ @media (max-width: breakpoint-max(sm)) {
+ width: 100%;
}
- dd {
- margin-left: 90px;
+ dt, dd {
color: $darker_gray;
}
}
+ // also applies to collections#index
&.blacklight-collection {
.documentHeader {
- width:60%;
+ width: 60%;
}
.collection_view_all_link {
float:right;
- font-size: 12px;
+ font-size: $font-size-xs;
a {
color: $dark_gray;
@@ -194,49 +203,8 @@ h4.suggest {
}
}
- }
-
- }
-
- }
-
- }
-
- /* gallery view */
- &.gallery {
- display: block;
-
- .document.new_row {
- clear:left;
- }
-
- .document {
- min-height: 200px;
- min-width: 200px;
-
- .thumbnail {
- border: none;
-
- img {
- height:auto;
- width:auto;
- max-height:200px;
-
- &.index-title-icon {
- width: 20px; // ugh, also declared above
- }
-
- }
-
- .caption {
- padding: 0 2px;
-
- .documentHeader {
-
- .document-title-heading {
- line-height: 16px;
- }
-
+ .item_index_details {
+ font-size: $font-size-sm;
}
}
@@ -247,325 +215,56 @@ h4.suggest {
}
- /* masonry view */
- .masonry {
-
- &.document {
- margin:1px 0;
-
- .thumbnail {
- padding: 0 1px;
-
- .caption {
- left: 2px;
- width: 97.5%;
-
- .documentHeader {
-
- .document-title-heading {
- font-weight: normal;
- }
-
- }
-
- }
-
- }
-
- }
-
- }
-
- /* slideshow view */
- .grid {
+ /* gallery view */
+ &.gallery {
.document {
- margin-right: 16px;
- }
-
- }
-
- #slideshow-modal {
-
- .modal-dialog {
-
- .modal-body {
- height: 90%; // for IE <9
- height: 90vh;
-
- #slideshow {
-
- .caption {
-
- a {
- color: white;
-
- &:hover {
- color: $bl_link;
- }
-
- }
-
- }
- }
-
- }
-
- }
-
- }
-
-}
-
-
-div.record-padding {
- width: 100%;
-
- #pagination_links {
- display: block;
- margin-left: auto;
- margin-right: auto;
- }
-
-}
-
-
-#search_tips_list li {
- padding-bottom: 10px;
-}
-
-
-/* responsive styles */
-
-/* Large desktop */
-@media (min-width: 1200px) {
-
- #documents {
-
- /* list view */
- &.documents-list {
-
- .document {
-
- .document-thumbnail {
- min-width: 250px;
-
- img {
- max-height: 250px;
- max-width: 250px;
- }
-
- }
-
- }
-
- }
-
- /* gallery view */
- &.gallery {
-
- .document {
-
- .thumbnail {
-
- img {
- max-height: 250px;
- }
-
- }
+ min-height: 250px;
+ min-width: 250px;
+ margin-bottom: 40px;
+ @media (max-width: breakpoint-max(lg)) {
+ min-height: 200px;
+ min-width: 200px;
}
- }
-
- }
-
-}
-
-/* Portrait tablet to landscape and desktop */
-@media (min-width: 768px) and (max-width: 991px) {
-
- #sortAndPerPage {
-
- .page_links {
- font-size: 12px;
- width: auto;
- padding: 6px 3px 6px 0;
- }
-
- .search-widgets {
-
- .btn {
- padding: 6px 3px;
- font-size: 12px;
- line-height: 1.5;
+ @media (max-width: breakpoint-max(sm)) {
+ min-width: 300px;
}
- }
-
- }
-
- #documents {
-
- /* list view */
- &.documents-list {
-
- .document {
-
- dl.document-metadata {
- padding: 10px 0 0 0;
- font-size: 12px;
- width: 60%;
- }
-
- &.blacklight-collection {
-
- .documentHeader {
- width:50%;
- }
-
- .collection_view_all_link {
- font-size: 11px;
- }
+ .thumbnail {
+ border: none;
- .collection_index_container {
- font-size: 12px;
- width: 56%;
+ img {
+ height: auto;
+ width: auto;
+ max-height: 250px;
+ max-width: 250px;
+
+ @media (max-width: breakpoint-max(lg)) {
+ max-height: 200px;
+ max-width: 200px;
}
- }
-
- }
-
- }
-
- /* gallery view */
- &.gallery {
-
- .document {
- padding: 0;
- min-width: 150px;
-
- .thumbnail {
-
- img {
- max-height: 150px;
+ @media (max-width: breakpoint-max(sm)) {
+ max-height: 300px;
+ max-width: 300px;
}
- }
-
- }
-
- }
-
- /* slideshow view */
- .grid {
-
- .document {
- margin-right: 5px;
- }
-
- }
-
- }
-
-}
-
-/* Landscape phone to portrait tablet */
-@media (max-width: 767px) {
-
- #sortAndPerPage {
-
- .page_links {
- font-size: 12px;
- }
-
- .search-widgets {
-
- .btn {
- padding: 5px 6px;
- font-size: 12px;
- line-height: 1.5;
- }
-
- a.view-type-slideshow, a.view-type-masonry {
- display: none;
- }
-
- a.view-type-gallery {
- border-bottom-right-radius: 4px;
- border-top-right-radius: 4px;
- }
-
- }
-
- }
-
- #documents {
-
- /* list view */
- &.documents-list {
-
- .document {
-
- dl.document-metadata {
- font-size: 12px;
- width: 60%;
-
- dd {
- margin-left: 5px;
+ &.index-title-icon {
+ width: 20px;
}
}
- &.blacklight-collection {
-
- .documentHeader {
- width:53%;
- }
-
- .collection_index_container {
- font-size: 12px;
- width: 55%;
- }
-
+ .document-title-heading {
+ font-size: $font-size-sm;
}
}
}
- /* gallery view */
- &.gallery {
-
- .document.new_row {
- clear:none;
- }
-
- .document.new_row_device {
- clear:left;
- }
-
- }
-
}
-}
-
-/* Landscape phones and down */
-@media (max-width: 480px) {
-
- #sortAndPerPage {
-
- .page_links, .search-widgets {
- float:left !important;
- }
-
- .view-type-group {
- display: none;
- }
-
- }
-
-}
-
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/institutions.scss b/app/assets/stylesheets/commonwealth-vlr-engine/institutions.scss
index 8de535e4..a0656d02 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/institutions.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/institutions.scss
@@ -5,7 +5,8 @@
div.institutions-list {
#sortAndPerPage {
- margin-bottom:0;
+ @include card-esque(10px);
+ margin-bottom: 0;
/* don't display sort widget */
#sort-dropdown {
@@ -14,8 +15,13 @@ div.institutions-list {
}
+ #saveSearchLink {
+ display: none;
+ }
+
#documents {
margin-top: 15px;
+ margin-bottom: 25px;
.blacklight-institution {
margin-bottom: 10px;
@@ -52,20 +58,16 @@ div.institutions-list {
}
-
/* institutions show view */
div.blacklight-institution {
h2 {
- line-height: 25px;
+ margin-bottom: 0;
}
#institution_geolocation {
- padding-bottom: .7em;
- font-size: 16px;
- position: relative;
- top: -5px;
+ padding-bottom: 15px;
color: $dark_gray;
a {
@@ -85,37 +87,71 @@ div.blacklight-institution {
img.institution_img_show {
float: left;
max-width: 25%;
- margin: 0 1.4em 1em 0;
+ margin: 0 20px 20px 0;
border: 1px solid $light_gray;
+
+ @media (max-width: breakpoint-min(sm)) {
+ max-width: 35%;
+ }
}
#institution_search_tools {
- margin-bottom: 1em;
+ @include card-esque(10px);
+ margin-bottom: 20px;
width: 72%;
float: right;
- #institution_search_form {
- padding: 0 3px 0 0;
+ #institution_view_all {
float: left;
+ }
+
+ .institution_search_separator {
+ float: left;
+ padding: 6px 15px 8px 12px;
+ color: $dark_gray;
+
+ @media (max-width: breakpoint-max(md)) {
+ padding-right: 10px;
+ padding-left: 7px;
+ }
+
+ }
+
+ #institution_search_form {
input {
width: 255px;
- border-bottom-left-radius: 4px;
- border-top-left-radius: 4px;
+ border-bottom-left-radius: $border-radius;
+ border-top-left-radius: $border-radius;
+
+ @media (min-width: breakpoint-min(xl)) {
+ width: 290px;
+ }
+
+ @media (max-width: breakpoint-max(md)) {
+ width: 278px;
+ }
+
+ @media (max-width: breakpoint-min(sm)) {
+ width: 270px;
+ }
+
}
- .submit-search-text {
- display: none;
+ .blacklight-icons > svg {
+ height: 20px;
}
}
- .institution_search_separator {
- display: inline;
- float: left;
- padding: 6px 15px 8px 12px;
- vertical-align: middle;
- color: $dark_gray;
+ @media (max-width: breakpoint-max(md)) {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ }
+
+ @media (max-width: breakpoint-min(sm)) {
+ flex-flow: column;
}
}
@@ -131,7 +167,7 @@ div.blacklight-institution {
}
.institution_desc_inline {
- display:inline;
+ display: inline;
margin-bottom: unset;
}
@@ -154,116 +190,106 @@ div.blacklight-institution {
#institution_collections {
width: 100%;
float: left;
- margin-top: 1em;
+ margin-top: 16px;
#collections_count {
- font-size: 14px;
+ font-size: $font-size-sm;
color: $dark_gray;
- vertical-align: top;
+ vertical-align: middle;
}
#documents.collections-gallery {
- margin-top: 0;
- }
-
- }
-
-}
-
-/* Portrait tablet to landscape and desktop */
-
-@media (min-width: 768px) and (max-width: 991px) {
-
- div.blacklight-institution {
- img.institution_img_show {
- max-width: 35%;
- }
-
- #institution_search_tools {
- width:100%;
- }
-
- }
+ .masonry {
+
+ &.document {
+ background-color: inherit;
+ padding: 5px;
+ margin: 0;
+
+ .thumbnail {
+ border: 1px solid $dark_gray;
+ overflow: hidden;
+ border-radius: $border-radius-lg;
+ height: 221px;
+
+ a {
+
+ img { // don't remove commented-out below until further testing
+ margin-left: auto;
+ margin-right: auto;
+ display: block;
+ border: none;
+ // height: auto;
+ // width: auto;
+ max-height: 221px;
+ max-width: 231px;
+ position: relative;
+ top: 109px; // would rather use 50% but doesn't work in Chrome
+ transform: translateY(-50%);
+ -webkit-transform: translateY(-50%);
+ -ms-transform: translateY(-50%);
+ -moz-transform: translateY(-50%);
+
+ @media (min-width: breakpoint-min(xl)) {
+ top: 135px;
+ max-height: 271px;
+ max-width: 275px;
+ }
+
+ @media (max-width: breakpoint-max(md)) {
+ top: 84px;
+ max-height: 170px;
+ max-width: 170px;
+ }
+
+ }
+
+ }
+
+ .caption {
+ display: block;
+ left: 5px;
+ right: 5px;
+ width: auto;
+ bottom: 5px;
+ border-bottom-left-radius: $border-radius-lg;
+ border-bottom-right-radius: $border-radius-lg;
+ background: linear-gradient(to bottom, rgba(0,0,0,0) 0%, rgba(0,0,0,0.45) 27%, rgba(0,0,0,0.45) 100%);
+
+ h3 {
+ font-size: $font-size-base;
+ margin-bottom: 3px;
+ margin-top: 3px;
+
+ a:hover {
+ text-decoration: none;
+ }
+
+ }
+
+ }
+
+ @media (min-width: breakpoint-min(xl)) {
+ height: 271px;
+ }
+
+ @media (max-width: breakpoint-max(md)) {
+ height: 170px;
+ }
+
+ }
-}
-
-/* Landscape phone to portrait tablet */
-
-@media (max-width: 767px) {
-
- /* need this or sidebar covers pagination links */
- body.blacklight-institutions-index #sidebar {
- float: left;
- }
-
- div.blacklight-institution {
-
- #institution_search_tools {
- width:70%;
-
- #institution_search_form {
- padding: 0 3px 7px 0;
- width: 301px;
-
- input {
- width:100%;
}
}
- .institution_search_separator {
- padding: 6px 10px 15px 7px;
- }
-
- }
-
- #institution_collections {
- margin: 2em 0;
- }
-
- #sidebar {
- float:left;
- width: 100%;
- }
-
- }
-
-}
-
-/* Landscape phones and down */
-
-@media (max-width: 480px) {
-
- div.blacklight-institution {
-
- img.institution_img_show {
- max-width: 35%;
}
- #institution_search_tools {
- width:100%;
-
- #institution_search_form {
- padding: 0 1em .5em 0;
- width: 100%;
-
- input {
- width: 100%;
- font-size: 11px;
- }
-
- }
-
+ @media (max-width: breakpoint-max(md)) {
+ margin-bottom: 30px;
}
}
}
-
-
-
-
-
-
-
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/search_inside.scss b/app/assets/stylesheets/commonwealth-vlr-engine/search_inside.scss
index 9f4d9dd5..492d46f8 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/search_inside.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/search_inside.scss
@@ -14,15 +14,20 @@
.ocr-search-form {
.search_q {
- border-radius: 4px 0 0 4px;
+ border-top-left-radius: $border-radius;
+ border-bottom-left-radius: $border-radius;
}
- .submit-search-text {
- display: none;
+ .blacklight-icons > svg {
+ height: 20px;
}
}
+ @media (max-width: breakpoint-max(md)) {
+ width: 75%
+ }
+
}
#zero_results_ocr {
@@ -40,13 +45,15 @@
}
#ocr_search_details {
- width: 100%;
- float: left;
- padding: 4px 9px;
+ @include card-esque(5px 10px);
+ margin-bottom: 20px;
+ display: flex;
+ justify-content: space-between;
+ flex-flow: row wrap;
+ align-items: center;
#ocr_search_terms {
- float: left;
- padding-top: 4px;
+ height: fit-content;
#ocr_search_term {
color: $very_dark_gray;
@@ -55,19 +62,14 @@
}
#sort-dropdown {
- float: right;
+ align-self: end;
+ margin-top: 4px;
button {
padding: 2px 5px;
}
}
- .page_links {
- float: right;
- padding: 4px 15px 0 0;
- border: none;
- }
-
}
#ocr_search_results {
@@ -75,25 +77,23 @@
.ocr_search_result {
margin-bottom: 12px;
- .ocr_defList {
+ .ocr_dl {
dt {
text-align: left;
- width: 72px;
font-weight: normal;
}
dd {
- margin-left: 77px;
.ocr_term_freq {
- font-size: 12px;
+ font-size: $font-size-xs;
color: $very_dark_gray;
display: inline;
}
.ocr_snippets {
- font-size: 13px;
+ font-size: $font-size-sm;
display: inline;
.ocr_snippet {
@@ -113,7 +113,7 @@
a.ocr_snippets_expand {
display: block;
color: $dark_gray;
- font-size: 12px;
+ font-size: $font-size-xs;
margin-top: 2px;
&:hover {
@@ -141,32 +141,6 @@
}
-#ocr_pagination {
-
- #pagination_links {
- margin: 0;
-
- ul.pagination {
- margin: 0;
- }
-
- }
-
+#ocr_modal_footer {
+ justify-content: center;
}
-
-/* Landscape phone to portrait tablet (iPad) */
-@media (max-width: 767px) {
-
- #ocr_search_modal {
-
- #ocr_search_wrapper {
-
- #ocr_search_form_wrapper {
- width: 75%;
- }
-
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/searches.scss b/app/assets/stylesheets/commonwealth-vlr-engine/searches.scss
index 493b8fc1..a509f1e4 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/searches.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/searches.scss
@@ -2,39 +2,39 @@
#searches_content, #search_history_content {
- .filterName {
- padding-right: .2em;
- }
-
-}
-
-#searches_content {
-
h2 {
- margin-bottom:0px;
+ margin-bottom: 0;
}
- #empty_saved_searches {
- margin-top:20px;
+ h3 {
+ font-size: $h5-font-size;
+ margin-top: 15px;
}
.constraint {
- padding-right: .5em;
+ padding-right: 10px;
+ display: block;
+
+ .filter-name {
+ padding-right: 5px;
+ }
}
}
-#search_history_content {
+#searches_content {
- h2 {
- margin-bottom:0px;
+ #empty_saved_searches {
+ @include card-esque(10px);
+ margin-top:20px;
}
- .search_history .filterName, .search_history .filterSeparator {
- color: inherit;
- }
+}
+
+#search_history_content {
#empty_search_history {
+ @include card-esque(10px);
margin-top:20px;
}
@@ -47,9 +47,4 @@
text-align: right;
}
- form {
- margin: 0;
- }
-
}
-
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/show.scss b/app/assets/stylesheets/commonwealth-vlr-engine/show.scss
index bad76793..d943f48f 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/show.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/show.scss
@@ -1,846 +1,470 @@
-/* styles for show view */
+.show-document {
-#flagged_warning {
-
- .modal-dialog {
- margin: 150px auto;
-
- h4.modal-title {
- font-weight: bold;
- }
+ #flagged_warning {
+ #flagged_warning_text {
+ padding: 15px 30px;
- .modal-body {
- font-size:20px;
- padding: 20px 100px;
+ div {
+ margin-bottom: 20px;
+ }
}
-
- }
-
-}
-/*
-.modal-backdrop.in, .no-js #sidebar .modal-backdrop.collapse {
- opacity: 0.86;
-}
-*/
-#previousNextDocument, .pagination-search-widgets {
- @include rounded-corners(3px);
- @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05) inset);
- padding: 0 0 0 7px;
- background-color: #F5F5F5;
- border: 1px solid #E3E3E3;
-}
-
-#item_breadcrumb {
- font-size: 13px;
- color: $light_gray;
-
- a {
- color: $dark_gray;
- }
-
- a:hover {
- color:$bl_link;
- text-decoration: none;
- }
-
- .icon-arrow-right {
- -moz-opacity: 0.17;
- opacity: 0.17;
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=17)";
}
- .item-breadcrumb-separator {
- margin: 0 .5em;
- }
-
-}
-
-#document h1 {
- margin-top:10px;
-}
+ .pagination-search-widgets {
+ padding: 0;
-#multi_img_show_container {
+ .card-body {
+ padding: 5px;
- #page_sequence_wrapper {
- padding: 3px 7px 2px 7px;
- margin-bottom: 15px;
- text-align: left;
-
- #page_sequence {
- color: $dark_gray;
- font-size: 12px;
+ .page-links {
+ padding: 2px 0 0 0;
+ }
- #page_sequence_pagination {
- display: inline;
+ .search-widgets {
float: right;
- a {
- margin-left: 10px;
+ @media (max-width: breakpoint-max(sm)) {
+ float: none;
}
-
}
-
}
- }
-
- #thumbnail_list_wrapper {
- padding: 10px;
- //overflow-y: auto;
- //position: relative;
-
- #thumbnail_list {
- max-height: 600px;
- min-height: 200px;
- overflow-y: auto;
- margin-bottom: 0px;
+ @media (max-width: breakpoint-max(sm)) {
text-align: center;
- -webkit-overflow-scrolling:touch;
- display: block;
- position: relative;
-
- li {
- padding-bottom: 15px;
-
- a {
-
- img {
- border: 1px solid $light_gray;
- max-width: 94%;
- max-height:180px;
- }
-
- }
-
- a.in_viewer {
-
- img {
- border: 2px solid $darker_gray;
- box-shadow: 2px 3px 3px rgba(0, 0, 0, 0.4);
- }
-
- }
-
- }
-
}
}
-}
+ #item_breadcrumb {
+ font-size: $font-size-xs;
+ color: $light_gray;
+ margin-bottom: 10px;
-#multi_img_pane {
- margin-bottom: 20px;
-}
+ a {
+ color: $dark_gray;
-#img_show_container {
- //height: 100%;
- width:100%;
- text-align: center;
- margin-bottom: 1em;
-
- #img_show_canvas {
- display: inline-block;
- position: relative;
- max-width: 100%;
-
- #img_show_zoom_cue {
- position: absolute;
- right: 10px;
- top: 10px;
- color: white;
- border-radius: 20px;
- background-color: rgba(0, 0, 0, .2);
- box-shadow: 0 0 14px -4px #000000;
-
- .img_zoom_icon {
- font-size: 32px;
+ &:hover {
+ color:$bl_link;
+ text-decoration: none;
}
-
- }
-
- #loading {
- position: relative;
- top: 150px;
}
- .img_show {
- border: 1px solid $light_gray;
- width:auto;
- max-width:100%;
- //height: 100%;
- max-height: 600px;
+ .item-breadcrumb-separator {
+ margin: 0 .5em;
+ opacity: 0.17;
}
}
- .carousel-control {
- border: 2px solid #FFFFFF;
- top: 48%;
- opacity: 0.15;
- line-height: 21px;
- font-size: 30px;
- font-weight: bold;
- height: 30px;
- width: 30px;
- left: 5px;
- border-radius: 23px;
- background: none repeat scroll 0 0 #222222;
- padding-right: 1px;
-
- .glyphicon-chevron-left {
- margin-left: -17px;
- margin-top: -14px;
- }
-
- &.right {
- left: auto;
- right: 5px;
- padding-right: 0;
- padding-left: 2px;
- }
-
- // Hover/focus state
- &:hover,
- &:focus {
- opacity: 0.35;
- }
-
- }
-
-}
-
-#img_viewer_modal {
-
- .modal-dialog {
- width:98%;
- margin:10px auto;
-
- .modal-content {
- background-color: $light_gray;
+ #img_show_container {
+ text-align: center;
+ margin-bottom: 1em;
- .modal-header {
- border-bottom: 0;
- padding: 3px 10px;
- text-align: left;
- height: 29px;
- overflow: hidden;
+ #img_show_canvas {
+ display: inline-block;
+ position: relative;
+ max-width: 100%;
- .modal-title {
- font-size: 16px;
- font-weight: bold;
- width: 95%;
+ #img_show_zoom_cue {
+ position: absolute;
+ right: 10px;
+ top: 10px;
+ color: white;
+ border-radius: 20px;
+ background-color: rgba(0, 0, 0, .2);
+ box-shadow: 0 0 14px -4px #000000;
+
+ .img_zoom_icon {
+ font-size: 32px;
}
}
- #img_viewer_osd {
- background-color: $viewer_bg;
- margin: 0 5px;
- padding: 0;
- border: 1px solid $dark_gray;
-
- /* OSd navigator */
- .openseadragon-container > div.openseadragon-canvas + div + div {
- right: 3px !important;
- top: 3px !important;
- }
-
- /* OSd controls */
- .openseadragon-container > div.openseadragon-canvas + div + div + div {
- right: 3px !important;
- padding: 1px 1px 0 !important;
- border-radius: 5px 5px 0 0;
- background: rgb(17, 17, 17) !important; /* fallback for browsers w/o RGBa support */
- background: rgba(17, 17, 17, 0.4) !important;
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#66111111, endColorstr=#66111111); /* for IE 5.5-7 */
- -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#66111111, endColorstr=#66111111)"; /* for IE8 */
- }
-
+ #loading {
+ position: relative;
+ top: 150px;
}
- .modal-footer {
- border-top: 0;
- padding: 2px;
+ .img_show {
+ border: 1px solid $light_gray;
+ width:auto;
+ max-width:100%;
+ max-height: 600px;
}
}
}
-}
-
-#thumbnail_wrapper {
- margin-bottom: 1em;
- float:right;
-
- #thumb_img_show_container {
- text-align: center;
- background-color: $very_light_gray;
- border: 1px solid $well_border_color;
- border-radius: 4px;
- @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05) inset);
- padding: 5px;
-
- .thumb_img_show {
- border: 1px solid $light_gray;
- max-width:100%;
- max-height: 300px;
- }
-
- }
-
- #oai_item_link {
-
- a {
- font-weight: bold;
- color: #222;
- }
-
- a:hover {
- color: $bl_link;
- text-decoration: none;
- }
-
- }
-
- #book_actions_links_wrap {
- bottom: 0px;
- position: absolute;
- width: 88%;
- }
-
- #volumes_wrapper {
- margin: 10px 0 0;
-
- .panel-heading {
- font-weight: bold;
- padding: 10px;
- }
-
- .panel-body {
- padding: 10px 5px;
-
- .nav-list {
-
- li.volume_listing {
- margin-bottom: 10px;
-
- .volume_title {
- font-size: 16px;
- padding: 5px;
- background-color: #eeeeee;
- border-radius: 3px 3px 0 0;
+ #img_viewer_modal {
- &.collapsed {
- background: none;
+ .modal-dialog {
+ max-width: 98%;
+ margin:10px auto;
- &:hover {
- background-color: #eeeeee;
- border-radius: 3px;
- }
+ .modal-content {
- }
+ .modal-header {
+ border-bottom: 0;
+ padding: 3px 10px;
+ text-align: left;
+ height: 29px;
+ overflow: hidden;
+ .modal-title {
+ font-size: $h6-font-size;
+ font-weight: bold;
+ width: 95%;
}
- .volume_details {
- background-color: #eeeeee;
- border-radius: 0 0 3px 3px;
-
- .read_volume_link_wrap {
- margin: 0 0 0 10px;
- padding-top: 10px;
- }
-
- .download_volume_links {
- margin: 10px 0 0 15px;
- padding-bottom: 10px;
-
- ul.volume_downloads {
- list-style-type: none;
- padding-left: 10px;
-
- li {
- padding: 1px 0;
- }
+ }
- }
+ #img_viewer_osd {
+ background-color: $viewer_bg;
+ margin: 0 5px;
+ padding: 0;
+ border: 1px solid $dark_gray;
- }
+ /* OSd navigator */
+ .openseadragon-container > div.openseadragon-canvas + div + div {
+ right: 3px !important;
+ top: 3px !important;
+ }
+ /* OSd controls */
+ .openseadragon-container > div.openseadragon-canvas + div + div + div {
+ right: 3px !important;
+ padding: 1px 1px 0 !important;
+ border-radius: 5px 5px 0 0;
+ background: rgb(17, 17, 17) !important; /* fallback for browsers w/o RGBa support */
+ background: rgba(17, 17, 17, 0.4) !important;
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#66111111, endColorstr=#66111111); /* for IE 5.5-7 */
+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#66111111, endColorstr=#66111111)"; /* for IE8 */
}
}
- }
-
- }
-
- }
-
-}
-
-a.book_viewer_link, a.search_inside_link {
- color: $very_light_gray;
- background: none repeat scroll 0 0 rgba(0, 0, 0, 0.60);
- padding: 0px 5px;
- margin-bottom: 2px;
-}
-
-/* metadata */
-
-#item_metadata {
- float: left;
- width:100%;
- padding: 0 0 1.5em 0;
-
- h3 {
- padding-left:1em;
- }
-
- dl.defList {
- width: 97%;
- margin-bottom: 0px;
-
- dt {
- padding: 2px 0 0;
- width: 144px;
- }
-
- dd {
- padding: 2px 0 0;
- margin-bottom: 3px;
- margin-left: 164px;
-
- .metadata_breadcrumb {
- color: $dark_gray;
- padding: 0 2px;
- }
-
- .uri_metadata_link {
- word-wrap: break-word;
- -ms-word-break: break-all;
- word-break: break-word;
- }
-
- }
-
- }
-
- #metadata_collapse_link_wrap {
- margin-top: 7px;
-
- #metadata_expand_heading {
- font-weight: normal;
- }
-
- }
-
-}
-
-/* download link styles */
-li.download_list_item {
- font-size: 12px;
-
- a {
- padding: 10px 5px 0 0;
- word-wrap: break-word;
- -ms-word-break: break-all;
- word-break: break-word;
- }
-
- .download_info {
- font-size: 10px;
- color: $dark_gray;
- }
-
-}
-
-
-#sidebar {
-
- /* downloads */
- #sidebar-downloads {
-
- .panel-heading {
- padding:10px;
- font-weight: bold;
- }
-
- .panel-body {
- padding:0 10px 10px 10px;
- }
-
- }
-
- div.show-tools {
-
- .panel-heading {
- padding:10px;
- font-weight: bold;
- }
-
- .panel-body {
- padding:10px;
-
- .addthis_toolbox {
- padding-bottom: .5em;
- }
-
- .glyphicon {
- padding-right: 3px;
- }
+ .modal-footer {
+ border-top: 0;
+ padding: 2px;
+ }
- #emailLink, #citeLink {
- padding: 10px 0 0;
}
}
}
-}
-
-
-/* MODS view */
-
-.mods_link_wrapper {
- float: right;
- margin: 0 13px 0 0;
-
- a {
- color:$dark_gray;
- }
-
-}
-
-.mods_xml_display pre {
- margin: 10px;
- padding: 5px;
- word-break: normal;
- font-size: 12px;
- white-space: pre-wrap;
-}
-
-/* more like this / related items */
+ #multi_img_show_container {
-#more_like_this {
- float:left;
+ #page_sequence_wrapper {
+ margin-bottom: 15px;
+ text-align: left;
+ @include card-esque(3px 7px 2px 7px);
- #more_like_this_docs {
+ #page_sequence {
+ color: $dark_gray;
+ font-size: $font-size-xs;
- .more_like_this_document {
+ #page_sequence_pagination {
+ display: inline;
+ float: right;
- .thumbnail {
- border-radius: 0;
- padding:0;
- margin-bottom:0;
- }
+ a {
+ margin-left: 10px;
+ }
- .mlt_title_link {
- position: absolute;
- top: 0;
- font-size: 12px;
- bottom: 0;
- width: 81%;
- padding: 5px;
- background: $dark_gray;
- visibility: hidden;
- color: #FFFFFF;
- opacity:0;
- transition: opacity 0.3s ease;
-
- &:hover {
- text-decoration: none;
}
}
- &:hover .mlt_title_link {
- visibility: visible;
- opacity:.9;
- -moz-opacity: 0.6;
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
- }
-
}
- }
-
- #more_mlt_link_wrapper {
- float: right;
- margin-top: 7px;
-
- a {
- color:$dark_gray;
- }
-
- }
-
-}
-
-/* responsive styles */
-
-/* Large desktop */
-@media (min-width: 1200px) {
-
- #thumbnail_wrapper {
-
- #thumb_img_show_container {
- padding: 10px;
- }
-
- }
-
- #multi_img_show_container {
-
#thumbnail_list_wrapper {
+ @include card-esque(10px);
#thumbnail_list {
- max-height: 800px;
- }
-
- }
-
- }
-
- #img_show_container {
-
- .img_show {
- max-height: 800px;
- }
+ max-height: 600px;
+ min-height: 200px;
+ overflow-y: auto;
+ margin-bottom: 0;
+ text-align: center;
+ -webkit-overflow-scrolling: touch;
+ display: block;
+ position: relative;
+
+ li {
+ padding-bottom: 15px;
+
+ a {
+
+ img {
+ border: 1px solid $light_gray;
+ max-width: 94%;
+ max-height: 180px;
+ }
- }
+ &.in_viewer {
- #more_like_this {
+ img {
+ border: 4px solid $darker_gray;
+ box-shadow: $popover-box-shadow;
+ }
- #more_like_this_docs {
+ }
- .more_like_this_document {
+ }
- .mlt_title_link {
- width: 84%;
}
}
}
- }
-}
-
-/* Portrait tablet to landscape and desktop */
-@media (min-width: 768px) and (max-width: 991px) {
+ #multi_img_pane {
+ margin-bottom: 20px;
- #multi_img_show_container {
+ .carousel-control-icon {
+ font-size: $h5-font-size;
+ font-weight: bold;
+ background-color: $very_dark_gray;
+ border: 2px solid white;
+ opacity: 0.4;
+ height: 30px;
+ width: 30px;
+ line-height: 26px;
- #thumbnail_list_wrapper {
+ &.next_icon {
+ padding-left: 2px;
+ }
- #thumbnail_list {
- max-height: 400px;
}
}
}
- a.book_viewer_link, a.search_inside_link {
- margin-top: 5px;
- }
+ #show_info_wrapper {
+ display: block;
- #img_show_container {
-
- .img_show {
- max-height: 400px;
- }
-
- }
+ #thumbnail_wrapper {
+ float: right;
+ margin-bottom: 1em;
+ //order: 2;
- #more_like_this {
+ #thumb_img_show_container {
+ text-align: center;
+ @include card-esque(5px);
- #more_like_this_docs {
-
- .more_like_this_document {
-
- .mlt_title_link {
- width: 75%;
+ .thumb_img_show {
+ border: 1px solid $light_gray;
+ max-width:100%;
+ max-height: 300px;
}
}
- }
-
- }
+ #oai_item_link {
-}
+ a {
+ font-weight: bold;
+ color: $very_dark_gray;
-/* Landscape phone to portrait tablet */
-@media (max-width: 767px) {
+ &:hover {
+ color: $bl_link;
+ text-decoration: none;
+ }
+ }
- #flagged_warning {
+ }
- h3 {
- font-size: 20px;
- }
+ #book_actions_links_wrap {
+ bottom: 0;
+ position: absolute;
+ width: 88%;
- .modal-dialog {
- margin: 90px auto;
+ a {
+ color: $very_light_gray;
+ background: none repeat scroll 0 0 rgba(0, 0, 0, 0.60);
+ padding: 0 5px;
+ margin-bottom: 2px;
+ }
- .modal-body {
- font-size:16px;
- padding: 20px 20px;
}
}
- }
+ #metadata_mlt_wrapper {
+ float: left;
+ // order: 1;
- #multi_img_pane, #thumb_img_show_container, .blacklight-catalog-show #sidebar {
- float:left;
- }
+ /* metadata */
+ #item_metadata {
+ margin-bottom: 20px;
+ font-size: $font-size-sm;
- #multi_img_pane {
- width: 100%;
- }
+ h3 {
+ font-size: $h4-font-size;
+ }
- #img_show_container {
- min-height: 300px;
- }
+ dl.document-metadata {
- #multi_img_show_container {
+ dt {
+ text-align: right;
+ padding-right: 0;
+ padding-left: 0;
- #thumbnail_list_wrapper {
- display: none;
- }
+ @media (max-width: breakpoint-max(sm)) {
+ text-align: left;
+ padding-left: 15px;
+ }
+ }
- }
+ dd {
- #thumbnail_wrapper {
- float: left;
+ .metadata_breadcrumb {
+ color: $dark_gray;
+ padding: 0 2px;
+ }
- #thumb_img_show_container {
- text-align: left;
- background-color: unset;
- border: none;
- border-radius: 0;
- @include box-shadow(none);
- padding:0;
- width: 100%;
- }
+ .uri_metadata_link {
+ word-wrap: break-word;
+ word-break: break-word;
+ }
- #book_actions_links_wrap {
- text-align: center;
- }
+ }
- #volumes_wrapper {
- float: left;
- }
+ }
- }
+ #metadata_expand_heading {
+ font-weight: normal;
+ }
- a.book_viewer_link, a.search_inside_link {
- margin-top: 5px;
- }
+ #mods_link_wrapper {
+ float: right;
- #img_viewer_modal {
+ a {
+ color:$dark_gray;
+ }
+ }
- .modal-dialog {
+ @media (min-width: breakpoint-min(xl)) {
+ font-size: $font-size-base;
+ }
- .modal-content {
+ }
- .modal-header {
+ #more_like_this {
+ @include card-esque($card-spacer-x);
- .modal-title {
- font-size: 14px;
- font-weight: normal;
- }
+ @media (max-width: breakpoint-max(sm)) {
+ margin-bottom: 20px;
+ }
+ h4 {
+ font-size: $h5-font-size;
}
- }
+ #more_like_this_docs {
- }
+ .more_like_this_document {
+ height: fit-content;
- }
+ img {
+ max-width: 100%;
+ height: auto;
+ display: block;
+ border: 1px solid $lighter_gray;
+ }
- #item_metadata {
- float: left;
- width:100%;
- padding: 0 0 1.5em 0;
+ .mlt_title_link {
+ position: absolute;
+ top: 0;
+ font-size: $font-size-xs;
+ bottom: 0;
+ width: 85%;
+ padding: 5px;
+ background: $dark_gray;
+ visibility: hidden;
+ color: #FFFFFF;
+ opacity: 0;
+ transition: opacity 0.3s ease;
- h3 {
- padding-left:10px;
- }
+ &:hover {
+ text-decoration: none;
+ }
- dl.defList {
- width: 97%;
- padding-left:10px;
+ }
- dd {
- margin-left: 0;
- }
+ &:hover .mlt_title_link {
+ visibility: visible;
+ opacity: .9;
+ }
- }
+ @media (max-width: breakpoint-max(sm)) {
+ margin-bottom: 10px;
+ }
- }
+ }
- #more_like_this {
- width:100%;
+ }
- #more_like_this_docs {
+ #more_mlt_link_wrapper {
+ text-align: right;
+ margin-top: 7px;
- .more_like_this_document {
- float: left;
- margin-bottom: 10px;
+ a {
+ color: $dark_gray;
+ }
- .mlt_title_link {
- width: 91%;
}
}
}
- }
-
-}
-
-/* Landscape phones and down */
-@media (max-width: 480px) {
+ #sidebar {
+ float: left;
+ // order: 3;
- #img_show_container {
- min-height: 200px;
- }
+ div.show-tools {
+ margin-bottom: 20px;
- #previousNextDocument, .pagination-search-widgets {
- font-size:12px;
+ ul.list-group {
+ padding: .5rem 0;
- .page_links {
- float: left;
- }
-
- .search-widgets {
- float: left !important;
+ .list-group-item {
+ border: none;
+ padding: 0.3rem 1.25rem;
+ }
- a {
- font-size:12px;
- padding: 5px 10px;
+ }
}
- }
+ #sidebar-downloads {
+ margin-bottom: 20px;
- }
+ .card-body {
+ padding: .5rem 1.25rem;
- #more_like_this {
+ li.download_list_item {
+ width: 100%;
- #more_like_this_docs {
+ a {
+ padding: 10px 5px 0 0;
+ word-wrap: break-word;
+ word-break: break-word;
+ display: block;
+ line-height: 1rem;
+ font-size: $font-size-sm;
+ }
- .more_like_this_document {
- width:50%;
+ .download_info {
+ font-size: $font-size-xs;
+ color: $dark_gray;
+ }
- .mlt_title_link {
- width: 84%;
+ }
}
}
@@ -850,3 +474,14 @@ li.download_list_item {
}
}
+
+.mods_xml_display pre {
+ padding: 15px;
+ word-break: normal;
+ font-size: $font-size-xs;
+ white-space: pre-wrap;
+}
+
+.citation-content {
+ margin-bottom: 20px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/signin.scss b/app/assets/stylesheets/commonwealth-vlr-engine/signin.scss
index 7c5d6e3e..57dcd641 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/signin.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/signin.scss
@@ -8,6 +8,10 @@
.alt_signin_btn {
padding-right: 1em;
+
+ @media (max-width: breakpoint-max(xs)) {
+ padding-bottom: 10px;
+ }
}
}
@@ -30,6 +34,7 @@
}
#why_log_in {
+ @include card-esque(10px);
margin-top: 42px;
ul {
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/users.scss b/app/assets/stylesheets/commonwealth-vlr-engine/users.scss
index 9f5b46c4..6440ee61 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/users.scss
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/users.scss
@@ -11,6 +11,10 @@
.sidebar-right {
margin-top:30px;
+ #cancel_account {
+ @include card-esque(10px);
+ }
+
ul {
padding-left: 20px;
}
diff --git a/app/assets/stylesheets/commonwealth-vlr-engine/vlr_dependencies.css b/app/assets/stylesheets/commonwealth-vlr-engine/vlr_dependencies.css
index 214c3622..e413e6a7 100644
--- a/app/assets/stylesheets/commonwealth-vlr-engine/vlr_dependencies.css
+++ b/app/assets/stylesheets/commonwealth-vlr-engine/vlr_dependencies.css
@@ -2,9 +2,9 @@
@import 'blacklight_maps';
@import 'blacklight_gallery';
-@import 'bootstrap-accessibility-plugin/bootstrap-accessibility';
@import 'blacklight_advanced_search';
+@import "font-awesome-sprockets";
@import 'font-awesome';
@import 'openseadragon';
-@import 'blacklight_range_limit/blacklight_range_limit';
@import 'slider'; /* blacklight_range_limit */
+@import 'blacklight_range_limit/blacklight_range_limit';
diff --git a/app/assets/stylesheets/ie_fixes.css b/app/assets/stylesheets/ie_fixes.css
deleted file mode 100644
index 1ca22dbd..00000000
--- a/app/assets/stylesheets/ie_fixes.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* fixes for IE8 */
-
-/* can't use fixed navbar or dropdown menus won't work */
-body.blacklight-institutions-index #header-navbar, body.blacklight-collections-index #header-navbar, body.blacklight-catalog-index #header-navbar {
- position: relative;
- z-index: inherit;
-}
-
-body.blacklight-institutions-index #main-containe, body.blacklight-collections-index #main-containe, body.blacklight-catalog-index #main-container {
- padding-top: 10px;
-}
-
-/* helps dropdowns not be so wonky */
-#main-container {
- padding-top: 10px;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/wdl-viewer/fd-slider.min.css b/app/assets/stylesheets/wdl-viewer/fd-slider.min.css
deleted file mode 100644
index ad6a1b2f..00000000
--- a/app/assets/stylesheets/wdl-viewer/fd-slider.min.css
+++ /dev/null
@@ -1,2 +0,0 @@
-/* fd-slider.min.css referencing individual .png images for IE6 and 7 */
-.fd-form-element-hidden{display:none}.fd-slider{width:100%;height:20px;margin:0 0 10px 0}.fd-slider-vertical{width:20px;height:100%;margin:0 10px 10px 0}.fd-slider,.fd-slider-vertical{text-align:center;display:block;position:relative;cursor:pointer;text-decoration:none;border:0 none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.oldie .fd-slider,.oldie .fd-slider-vertical{*background:transparent url("blank.c4aa72cfb29d.gif") repeat}.fd-slider-wrapper{position:absolute;top:0;left:0;width:100%;height:100%}.oldie .fd-slider-vertical .fd-slider-wrapper{*clear:expression(style.height=parentNode.offsetHeight+'px',style.clear='none', 0);}.fd-slider-inner{display:none}.oldie .fd-slider-inner{position:absolute;height:2px;border:1px solid #bbf;background:#bbf;top:4px;bottom:none;left:4px;right:12px;z-index:2;margin:0;padding:0;overflow:hidden;line-height:4px;_right:auto;_width:expression((this.parentNode.offsetWidth - 8)+'px');filter:progid:DXImageTransform.Microsoft.Blur(pixelradius=3.5)}.oldie .fd-slider-vertical .fd-slider-inner{width:2px;height:auto;top:4px;bottom:12px;left:4px;right:auto;_bottom:auto;*clear:expression(style.height=(parentNode.offsetHeight - 8)+'px',style.clear='none',0)}.oldie .fd-slider-focused .fd-slider-inner{display:block}.fd-slider-bar{display:block;position:absolute;top:8px;right:10px;left:10px;z-index:2;height:2px;margin:0;padding:0;overflow:hidden;border:1px solid #bbb;border-bottom:1px solid #aaa;border-right:1px solid #aaa;border:1px solid rgba(187,187,187,.8);border-bottom:1px solid rgba(170,170,170,.8);border-right:1px solid rgba(170,170,170,.8);line-height:4px;background-color:#ddd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ececec),to(#ccc));background-image:-webkit-linear-gradient(top,#ececec,#ccc);background-image:-moz-linear-gradient(top,#ececec,#ccc);background-image:-ms-linear-gradient(top,#ececec,#ccc);background-image:-o-linear-gradient(top,#ececec,#ccc);background-image:linear-gradient(to bottom,#ececec,#ccc);-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.oldie .fd-slider-bar{_left:10px;_right:auto;_width:expression((this.parentNode.offsetWidth - 20)+'px');filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffececec',endColorstr='#ffcccccc')}.fd-slider-vertical .fd-slider-bar{width:2px;top:10px;right:auto;bottom:10px;left:8px;height:auto;background-color:#ddd;background-image:-webkit-gradient(linear,left top,right top,from(#ececec),to(#ccc));background-image:-webkit-linear-gradient(left,#ececec,#ccc);background-image:-moz-linear-gradient(left,#ececec,#ccc);background-image:-ms-linear-gradient(left,#ececec,#ccc);background-image:-o-linear-gradient(left,#ececec,#ccc);background-image:linear-gradient(to right,#ececec,#ccc)}.oldie .fd-slider-vertical .fd-slider-bar{_bottom:auto;*clear:expression(style.height=(parentNode.offsetHeight - 20)+'px',style.clear='none',0);filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#ffececec',endColorstr='#ffcccccc')}.fd-slider-focused .fd-slider-bar{-webkit-box-shadow:0 0 6px rgba(10,130,170,0.7);-moz-box-shadow:0 0 6px rgba(10,130,170,0.7);box-shadow:0 0 6px rgba(10,130,170,0.7);-webkit-animation:fd-pulse 2s infinite;-moz-animation:fd-pulse 2s infinite;-ms-animation:fd-pulse 2s infinite;-o-animation:fd-pulse 2s infinite}.fd-slider-range{display:block;position:absolute;top:9px;left:11px;z-index:3;height:2px;margin:0;padding:0;overflow:hidden;line-height:2px;background-color:#4cc;background-image:-webkit-gradient(linear,left top,right top,from(#6cc),to(#3cf));background-image:-webkit-linear-gradient(left,#6cc,#3cf);background-image:-moz-linear-gradient(left,#6cc,#3cf);background-image:-ms-linear-gradient(left,#6cc,#3cf);background-image:-o-linear-gradient(left,#6cc,#3cf);background-image:linear-gradient(to right,#6cc,#3cf);-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.oldie .fd-slider-range{_left:10px;filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ff66cccc',endColorstr='#ff33ccff')}.fd-slider-vertical .fd-slider-range{height:auto;width:2px;top:auto;right:auto;bottom:11px;left:9px;background-image:-webkit-gradient(linear,left top,left bottom,from(#3cf),to(#6cc));background-image:-webkit-linear-gradient(top,#3cf,#6cc);background-image:-moz-linear-gradient(top,#3cf,#6cc);background-image:-ms-linear-gradient(top,#3cf,#6cc);background-image:-o-linear-gradient(top,#3cf,#6cc);background-image:linear-gradient(to bottom,#3cf,#6cc)}.oldie .fd-slider-vertical .fd-slider-range{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#ff66cccc',endColorstr='#ff33ccff')}.fd-slider-handle{position:absolute;display:block;padding:0;border:0 none;margin:0;z-index:3;top:0;left:0;width:20px;height:20px;outline:0 none;background-color:transparent;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAABQCAYAAAAZQFV3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRDg4NEVDNENDODExRTFCMTZDREIyQTZDMjlDNTQ2IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRDg4NEVENENDODExRTFCMTZDREIyQTZDMjlDNTQ2Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUVEODg0RUE0Q0M4MTFFMUIxNkNEQjJBNkMyOUM1NDYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MUVEODg0RUI0Q0M4MTFFMUIxNkNEQjJBNkMyOUM1NDYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz68iMNZAAAIQElEQVR42uxYW28b1xGes7tckiIp3iRboi6mbollya5DF4VsVWpaw42ABCmaogWSFH3oDyjQoijQP2AUyFOLFshbn4SqsYFabowmdaW4NhDJiKXaUuwotm6UKJK6kKIkipfl7p7OWR3aa5kiVdQoEjQLDM7u2TPfnss3MztDKKXwPC8BnvP1xQeUSnUSvGBwshl8R18Fq70PZOtx44WSn4F89hYkV6/B26ElWuIAyP4+xBKd70311tXV/bzb7+oLOcDaYiWSTSAkR0EfT9P8UDj1j8Rq/Lfw1ukx1NcOnKExs4tDbT6f75e9tc6+c05q90gEtwWRdAoyblG/k4jeVvcr76qKZePi0K9Q5ZF5pvuXLENj6xv1Pvc5n6DJyQJAQgGdjWZCuFQRwTLQ7P/W6PaLb0YBfoNd+YMAq8BR/TIpFCzhDECEgK5SeGafJAJEA0FqO+L7LgL+rhygEwE7FrMFWMqAVvY4CX6I2hoMHYDNg5es60I8Z9xXNiHd2A25PG3WInFPY9BfLRFiwePQS8AKuJEFHWA3Fl1PVOChArPT96Gp5YRDJMSFoExZ1Z8cisQ/sqOBroRnZgydMoBpGLk8mm9uDemdJzs8kkA8FgZKQMSXbFN1ZEiqQGl26eFS4cbwiKFTxvQyMPbhZPb9weHl6bsL4ZymZzRKXSKBADKbtew5+vDB8vKVwb8kPrh029A5yFIMYgO4UNrh1Nl+6H/9PBwPtUMg6DcGRBcTMDM5CzevjsDU2E3smUXZMRO7pOlh40AJoAR56+KvdxgsyiJvd/ebHinlYPlMZYPoezyTHx/a3p6xZSqHcg5fCn9ITC0xPRcvapJnLEoqASQUOczvRdM7WqQjisqfdTOwtA9M5GLhByHzMSJ/r3EghUuB92kcg5pnKHJlK4qdSxV/Lo5Tuatip5zlkjd9zBhITEtjyg5FUdx/iuVeuJQi35lTxZc2QGpkg2tAjbRJ2r9+6KGjb9bbHsqyLOzbV53RhnAwG+NcMpn0vxPVvz2pWn/sc9i6TlcRyzErCDbkZhY94CdpWhhPZO72yvnBXzeI/8RwkeDcZE5Pk0wHIOfz+ao/r6RP3M67ftLhtXb3OInFKyFXGV9xAnZ0qn0ukL2iPfS3mCri2PWfOhwTVqtV4duhC6Yly/F43H0lBa8QW1WnX6TSlqqTRQx1KHRhT/BeJw6BSl0+58mPdoXXmA4/PAOrOEPjQGKxmHtRD4aaqS5G8wRWC0B1YFvyhDXovigOpgWKftZq/0Ys9sh97Nix9SK9zLQRNzY2XEnP8QDJaSReIFTECIpbR83cZaaqUZ1q6GUF3eJnOmauPmUpu7u7FnDrwpqigygKCMimAcRMazZDjYmGY3R1T6eEpRgWUCgUVM/uZlLx1Lp8shFTCC6YFBHZwRi+hAqQ1yhYt7ZSTIdz8LGlFM1JxeXt1iUjC2FPbbMVuzFQ4SzxJX0SU9g3VJzdFm7u0VQszHT4CWtFSynao+JwOBKdCzMfp1w1L6iB5oATQ4nXQowoZwDrBMEpwSCsy4n4Wmv8848dDd4EN0N9b+57gIZ9NjU1JTvU7YmWR7dv5FcWV8NZVUurGrXjXtYiH1mbVnWajUc2XA/GP2rKbNxmOhxQNdsyAy20tbVtz8/Pz21PTV1zfBLfnm/s6rlzpKVxq7q2mg1yb69v16wtRFoj98fbIXsreOrUHNPhTuKpPWTT1TweT66rq2sdN3oaPvts2zf19xm0ngAeqpOHhjRaRRTNba6zszOMYxNMx+TSaDEEPOW+kFvyxMSEc2VlpZqRXVVVm/F1ScrV19dvNTQ0bJ85cyZdU1OjmNwXmAGfu4M1u3Ld1P5XIWA/MP1CRL0vcZ5y4cKFZuTcq6Io9qEYeYqmaTMot5Cb165fv374PGVgYOAckvdntbW1fdjKaOMicpABUuSoMjs7O5pKpX6PoJXzlJ6enrbq6upfIIG/iYA2FtlYIEMww9lin4h9F6anpy04dq1inoKzeQMBe1HJiksTstnsfgrhDy2Rg8FgP5roj/D5nbJ5isVieRk/aNnZ2SHpdFo/4HePNRa/338e2z+UzVMQsAPBBASrRGzCf0jL5yk4o1LLLHnx2ZfPUxAs7na7fThT/iN7MBiuZK0SD5Wtra37CNiJ3COMKgx034+98YwujSLgg4p5SiQSGXW5XCGkTTueNEF5Csj4qqIA8nB+aWnpmTxlP2AGfy0m7Xb7MN7/AEGDgiAQm80GbAuQJjSXywGOCSO5h8Ph8J1D5ylIif5AIHDe6/W2V1VVGXlKJpNJbG5uzkaj0ZFEIvFVnvJ/67H/p6WqWvAd/TpY7V0gWxt5qSoC+ex9SK7egbdD64cNAYLzvakTdXV13+v2u7pCDrC0WInAS1V0HNOKoXDqbmI1fhXeOj2D+nqlUlU9xpHv99Y6u845qeyRGCcfl6pIv5NYva3u0LuqIm1cHPojqkTLhQAJGlvP1vvcnT5Bk3ipipYoVYkDzf7u0e0X+9FcLvPfuZKAVnBUn0QvIPJSFS1TqhLbjvheQsC/lgO0IWCAl6r0Q5Sq/DylSx8EaPkPS1XAU+GypapNT2PQdchS1ValUlUBZqeXoKmliZeqoEypiirhmYh5/0oB5mDk8r18c2ub3nkyUKFUtVa4MXyPp7UHml4exj6cy74/OL48fTcezmnUVKoCU6lqY/nK4Fjig0ufm4P8QSGAlQbq4dTZbuh//WtwPFQPgaCLl6p2YGYyBjev3oOpsU+xJ8Yib6UQIHAq+FCO8tZeDNsoLNFZ5W1uv+mVCwHFgobNRI0C3zO2TPWrEGBc/xZgAJyadcoLu6zuAAAAAElFTkSuQmCC);background-position:0 0;cursor:W-resize;line-height:20px;font-size:10px;-moz-outline:0 none;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.oldie .fd-slider-handle{*background-image:url("fd-slider-sprite.f20141ce1cf3.png");_background-image:none;_filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='fd-handle-normal.png');outline:expression(hideFocus='true')}.fd-slider-handle:focus{outline:0 none;border:0 none;-moz-user-focus:normal}.fd-slider-handle:focus::-moz-focus-inner{border-color:transparent}.fd-slider-focused .fd-slider-handle,.fd-slider-hover .fd-slider-handle,.fd-slider-active .fd-slider-handle{background-position:0 -20px}.oldie .fd-slider-focused .fd-slider-handle,.oldie .fd-slider-hover .fd-slider-handle,.oldie .fd-slider-active .fd-slider-handle{_filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='fd-handle-glow.png')}.fd-slider-vertical .fd-slider-handle{cursor:N-resize}.fd-slider-no-value .fd-slider-handle{background-position:0 -59px}.oldie .fd-slider-no-value .fd-slider-handle{_filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='fd-handle-no-value.png')}body.fd-slider-drag-horizontal,body.fd-slider-drag-horizontal *,body.fd-slider-drag-vertical,body.fd-slider-drag-vertical *{cursor:N-resize!important;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}body.fd-slider-drag-horizontal,body.fd-slider-drag-horizontal *{cursor:W-resize!important}.fd-slider-disabled{opacity:.8;cursor:default}.fd-slider-disabled .fd-slider-handle{cursor:default!important;background-position:0 -40px;opacity:1}.oldie .fd-slider-disabled .fd-slider-handle{_filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true,sizingMethod=crop,src='fd-handle-disabled.png')}.fd-slider-disabled .fd-slider-bar{cursor:auto!important;border:1px solid #888;border-bottom:1px solid #999;border-right:1px solid #999;border:1px solid rgba(136,136,136,.8);border-bottom:1px solid rgba(153,153,153,.8);border-right:1px solid rgba(153,153,153,.8);background-color:#555;background-image:-webkit-gradient(linear,left top,right top,from(#666),to(#333));background-image:-webkit-linear-gradient(left,#666,#333);background-image:-moz-linear-gradient(left,#666,#333);background-image:-ms-linear-gradient(left,#666,#333);background-image:-o-linear-gradient(left,#666,#333);background-image:linear-gradient(to right,#666,#333)}.fd-slider-vertical .fd-slider-disabled .fd-slider-bar{background-image:-webkit-gradient(linear,left top,right bottom,from(#333),to(#666));background-image:-webkit-linear-gradient(top,#333,#666);background-image:-moz-linear-gradient(top,#333,#666);background-image:-ms-linear-gradient(top,#333,#666);background-image:-o-linear-gradient(top,#333,#666);background-image:linear-gradient(to bottom,#333,#666)}.oldie .fd-slider-disabled .fd-slider-bar{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#ff666666',endColorstr='#ff333333')}.oldie .fd-slider-vertical .fd-slider-disabled .fd-slider-bar{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ff666666',endColorstr='#ff333333')}.fd-slider-disabled .fd-slider-range{cursor:auto!important;background-color:#222;background-image:-webkit-gradient(linear,left top,right top,from(#222),to(#000));background-image:-webkit-linear-gradient(left,#222,#000);background-image:-moz-linear-gradient(left,#222,#000);background-image:-ms-linear-gradient(left,#222,#000);background-image:-o-linear-gradient(left,#222,#000);background-image:linear-gradient(to right,#222,#000)}.oldie .fd-slider-disabled .fd-slider-range{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#ff222222',endColorstr='#ff000000')}.fd-slider-vertical .fd-slider-disabled .fd-slider-range{background-image:-webkit-gradient(linear,left top,right bottom,from(#000),to(#222));background-image:-webkit-linear-gradient(top,#000,#222);background-image:-moz-linear-gradient(top,#000,#222);background-image:-ms-linear-gradient(top,#000,#222);background-image:-o-linear-gradient(top,#000,#222);background-image:linear-gradient(to bottom,#000,#222)}.oldie .fd-slider-vertical .fd-slider-disabled .fd-slider-range{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ff222222',endColorstr='#ff000000')}@-webkit-keyframes fd-pulse{0%{box-shadow:0 0 3px rgba(100,130,170,0.55)}20%{box-shadow:0 0 4px rgba(70,130,170,0.6)}40%{box-shadow:0 0 5px rgba(40,130,170,0.65)}60%{box-shadow:0 0 6px rgba(10,130,170,0.7)}80%{box-shadow:0 0 5px rgba(40,130,170,0.65)}100%{box-shadow:0 0 4px rgba(70,130,170,0.6)}}@-moz-keyframes fd-pulse{0%{box-shadow:0 0 3px rgba(100,130,170,0.55)}20%{box-shadow:0 0 4px rgba(70,130,170,0.6)}40%{box-shadow:0 0 5px rgba(40,130,170,0.65)}60%{box-shadow:0 0 6px rgba(10,130,170,0.7)}80%{box-shadow:0 0 5px rgba(40,130,170,0.65)}100%{box-shadow:0 0 4px rgba(70,130,170,0.6)}}@-ms-keyframes fd-pulse{0%{box-shadow:0 0 3px rgba(100,130,170,0.55)}20%{box-shadow:0 0 4px rgba(70,130,170,0.6)}40%{box-shadow:0 0 5px rgba(40,130,170,0.65)}60%{box-shadow:0 0 6px rgba(10,130,170,0.7)}80%{box-shadow:0 0 5px rgba(40,130,170,0.65)}100%{box-shadow:0 0 4px rgba(70,130,170,0.6)}}@-o-keyframes fd-pulse{0%{box-shadow:0 0 3px rgba(100,130,170,0.55)}20%{box-shadow:0 0 4px rgba(70,130,170,0.6)}40%{box-shadow:0 0 5px rgba(40,130,170,0.65)}60%{box-shadow:0 0 6px rgba(10,130,170,0.7)}80%{box-shadow:0 0 5px rgba(40,130,170,0.65)}100%{box-shadow:0 0 4px rgba(70,130,170,0.6)}}
\ No newline at end of file
diff --git a/app/components/blacklight/facet_field_pagination_component.html.erb b/app/components/blacklight/facet_field_pagination_component.html.erb
new file mode 100644
index 00000000..8b175e9a
--- /dev/null
+++ b/app/components/blacklight/facet_field_pagination_component.html.erb
@@ -0,0 +1,22 @@
+<% # needed for bugfix to upstream Blacklight in FacetFieldPaginationComponent#sort_facet_url
+ # remove this file once https://github.com/projectblacklight/blacklight/pull/2425 is merged
+ # and this project is updated to use Blacklight version that includes that PR %>
+
+ <%= @view_context.link_to_previous_page @facet_field.paginator, raw(t('views.pagination.previous')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link', data: { blacklight_modal: "preserve" } do %>
+ <%= content_tag :span, raw(t('views.pagination.previous')), class: 'disabled btn' %>
+ <% end %>
+
+ <%= @view_context.link_to_next_page @facet_field.paginator, raw(t('views.pagination.next')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link', data: { blacklight_modal: "preserve" } do %>
+ <%= content_tag :span, raw(t('views.pagination.next')), class: 'disabled btn' %>
+ <% end %>
+
+
+
+ <% if @facet_field.paginator.sort == 'index' -%>
+ <%= t('blacklight.search.facets.sort.index') %>
+ <%= @view_context.link_to(t('blacklight.search.facets.sort.count'), sort_facet_url('count'), class: "sort_change numeric btn btn-outline-secondary", data: { blacklight_modal: "preserve" }) %>
+ <% elsif @facet_field.paginator.sort == 'count' -%>
+ <%= @view_context.link_to(t('blacklight.search.facets.sort.index'), sort_facet_url('index'), class: "sort_change az btn btn-outline-secondary", data: { blacklight_modal: "preserve" }) %>
+ <%= t('blacklight.search.facets.sort.count') %>
+ <% end -%>
+
diff --git a/app/components/blacklight/facet_field_pagination_component.rb b/app/components/blacklight/facet_field_pagination_component.rb
new file mode 100644
index 00000000..b2a1e447
--- /dev/null
+++ b/app/components/blacklight/facet_field_pagination_component.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# override to fix bug with upstream Blacklight in #sort_facet_url
+# remove this file once https://github.com/projectblacklight/blacklight/pull/2425 is merged
+# and this project is updated to use Blacklight version that includes that PR
+module Blacklight
+ class FacetFieldPaginationComponent < ::ViewComponent::Base
+ def initialize(facet_field:)
+ @facet_field = facet_field
+ end
+
+ def sort_facet_url(sort)
+ @facet_field.paginator.params_for_resort_url(sort, @facet_field.search_state.to_h)
+ end
+
+ def param_name
+ @facet_field.paginator.class.request_keys[:page]
+ end
+ end
+end
diff --git a/app/controllers/blacklight_advanced_search/advanced_controller.rb b/app/controllers/blacklight_advanced_search/advanced_controller.rb
index ae846552..dcc40244 100644
--- a/app/controllers/blacklight_advanced_search/advanced_controller.rb
+++ b/app/controllers/blacklight_advanced_search/advanced_controller.rb
@@ -1,18 +1,17 @@
+# frozen_string_literal: true
+
# Need to sub-class CatalogController so we get all other plugins behavior
# for our own "inside a search context" lookup of facets.
class BlacklightAdvancedSearch::AdvancedController < CatalogController
-
def index
@nav_li_active = 'search'
- unless request.method==:post
- @response = get_advanced_search_facets
- end
+ @response = get_advanced_search_facets unless request.method == :post
end
protected
# Override to use the engine routes
- def search_action_url options = {}
+ def search_action_url(options = {})
blacklight_advanced_search_engine.url_for(options.merge(action: 'index'))
end
@@ -20,11 +19,10 @@ def get_advanced_search_facets
# We want to find the facets available for the current search, but:
# * IGNORING current query (add in facets_for_advanced_search_form filter)
# * IGNORING current advanced search facets (remove add_advanced_search_to_solr filter)
- response, _ = search_results(params) do |search_builder|
+ response, _ = search_service.search_results do |search_builder|
search_builder.except(:add_advanced_search_to_solr).append(:facets_for_advanced_search_form)
end
- return response
+ response
end
-
end
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
deleted file mode 100644
index 44019214..00000000
--- a/app/controllers/bookmarks_controller.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-class BookmarksController < CatalogController
-
- include Blacklight::Bookmarks
-
- before_action :set_solr_http_post, only: [:show]
-
- after_action :unset_solr_http_post, only: [:show]
-
- # LOCAL OVERRIDE to render update.js.erb partial when bookmark created
- def create
- @bookmarks = if params[:bookmarks]
- params[:bookmarks]
- else
- [{ document_id: params[:id], document_type: blacklight_config.document_model.to_s }]
- end
-
- current_or_guest_user.save! unless current_or_guest_user.persisted?
-
- success = @bookmarks.all? do |bookmark|
- current_or_guest_user.bookmarks.where(bookmark).exists? || current_or_guest_user.bookmarks.create(bookmark)
- end
-
- if request.xhr?
- # success ? render(json: { bookmarks: { count: current_or_guest_user.bookmarks.count }}) : render(:text => "", :status => "500")
- success ? render(:update) : render(plain: '', status: '500')
- else
- if @bookmarks.any? && success
- flash[:notice] = I18n.t('blacklight.bookmarks.add.success', :count => @bookmarks.length)
- elsif @bookmarks.any?
- flash[:error] = I18n.t('blacklight.bookmarks.add.failure', :count => @bookmarks.length)
- end
-
- if respond_to? :redirect_back
- redirect_back fallback_location: bookmarks_path
- else
- # Deprecated in Rails 5.0
- redirect_to :back
- end
- end
- end
-
- def folder_item_actions
- redirect_to :action => "index"
- end
-
- private
- def set_solr_http_post
- unless blacklight_config.http_post == :post
- blacklight_config.http_method = :post
- end
- end
-
- def unset_solr_http_post
- blacklight_config.http_method = :get
- end
-
-end
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 0e21403f..3e74dc34 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -1,4 +1,5 @@
+# frozen_string_literal: true
+
class CollectionsController < CatalogController
include CommonwealthVlrEngine::CollectionsControllerBehavior
-
end
diff --git a/app/controllers/commonwealth_vlr_engine/application_controller.rb b/app/controllers/commonwealth_vlr_engine/application_controller.rb
index 5c5aeda2..5a5e685a 100644
--- a/app/controllers/commonwealth_vlr_engine/application_controller.rb
+++ b/app/controllers/commonwealth_vlr_engine/application_controller.rb
@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
class ApplicationController < ActionController::Base
-
protect_from_forgery with: :exception
helper Openseadragon::OpenseadragonHelper
layout 'commonwealth-vlr-engine'
-
end
end
diff --git a/app/controllers/concerns/commonwealth_vlr_engine/collections_controller_behavior.rb b/app/controllers/concerns/commonwealth_vlr_engine/collections_controller_behavior.rb
index 0f7ba773..9f38d896 100644
--- a/app/controllers/concerns/commonwealth_vlr_engine/collections_controller_behavior.rb
+++ b/app/controllers/concerns/commonwealth_vlr_engine/collections_controller_behavior.rb
@@ -1,20 +1,19 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module CollectionsControllerBehavior
extend ActiveSupport::Concern
- ##
# Give CollectionsController access to the CatalogController configuration
include Blacklight::Configurable
- include Blacklight::SearchHelper
included do
copy_blacklight_config_from(CatalogController)
- # remove collection facet and collapse others
- before_action :relation_base_blacklight_config, :only => [:index, :show]
- before_action :add_series_facet, :only => :show
- before_action :collections_limit, :only => :index
- before_action :collections_limit_for_facets, :only => :facet
- before_action :collapse_institution_facet, :only => :index
+ before_action :relation_base_blacklight_config, only: [:index, :show]
+ before_action :add_series_facet, only: :show
+ before_action :collections_limit, only: :index
+ before_action :collections_limit_for_facets, only: :facet
+ before_action :collapse_institution_facet, only: :index
helper_method :search_action_url
helper_method :get_series_image_obj
@@ -22,9 +21,10 @@ module CollectionsControllerBehavior
def index
@nav_li_active = 'explore'
- (@response, @document_list) = search_results(params)
- params[:view] = 'list'
- params[:sort] = 'title_info_primary_ssort asc'
+ params.merge!(view: 'list', sort: 'title_info_primary_ssort asc, date_start_dtsi asc')
+ collection_search_service = search_service_class.new(config: blacklight_config,
+ user_params: params)
+ @response, @document_list = collection_search_service.search_results
respond_to do |format|
format.html
@@ -33,26 +33,30 @@ def index
def show
@nav_li_active = 'explore'
- @show_response, @document = fetch(params[:id])
+
+ # have to define a new search_service here, or we can't inject params[:f] below
+ collection_search_service = search_service_class.new(config: blacklight_config,
+ user_params: params)
+ _show_response, @document = collection_search_service.fetch(params[:id])
@collection_title = @document[blacklight_config.index.title_field.to_sym]
# add params[:f] for proper facet links
- params[:f] = set_collection_facet_params(@collection_title, @document)
+ params.merge!(f: set_collection_facet_params(@collection_title, @document)).permit!
# get the response for the facets representing items in collection
- (@response, @document_list) = search_results({:f => params[:f]})
+ facets_search_service = search_service_class.new(config: blacklight_config,
+ user_params: { f: params[:f] })
+ @response, @document_list = facets_search_service.search_results
# get an image for the collection
if @document[:exemplary_image_ssi]
- @collection_image_pid = @document[:exemplary_image_ssi]
- @collection_image_info = get_collection_image_info(@collection_image_pid,
- @document[:id])
+ @collection_image_info = collection_image_info(@document[:exemplary_image_ssi],
+ @document[:id])
end
respond_to do |format|
format.html
end
-
end
def range_limit
@@ -67,22 +71,26 @@ def search_action_url options = {}
end
# find a representative image/item for a series
- def get_series_image_obj(series_title,collection_title)
+ def get_series_image_obj(series_title, collection_title)
blacklight_config.search_builder_class = CommonwealthFlaggedSearchBuilder # ignore flagged items
- series_doc_list = search_results({f: {'related_item_series_ssim' => series_title,
- blacklight_config.collection_field => collection_title},
- rows: 1})[1]
+ series_params = { f: { blacklight_config.series_field => series_title,
+ blacklight_config.collection_field => collection_title },
+ rows: 1 }
+ series_search_service = search_service_class.new(config: blacklight_config,
+ user_params: series_params)
+ _series_response, series_doc_list = series_search_service.search_results
series_doc_list.first
end
# show series facet
def add_series_facet
- blacklight_config.facet_fields['related_item_series_ssim'].include_in_request = true
+ blacklight_config.facet_fields[blacklight_config.series_field].include_in_request = true
end
# collapse the institution facet, if Institutions supported
def collapse_institution_facet
return unless t('blacklight.home.browse.institutions.enabled')
+
blacklight_config.facet_fields['physical_location_ssim'].collapse = true
end
@@ -91,28 +99,31 @@ def collections_limit
blacklight_config.search_builder_class = CommonwealthCollectionsSearchBuilder
end
- # find object data for facet results
+ # find object data for "more" facet results
# collections#facet can be called within BOTH collections#index and collections#show contexts
# when collections#index, want to limit to collection objects
# when collections#show, should be objects that are child of collection
# so we use the check below, since request.query_parameters['f'] is only added in collections#show
# via set_collection_facet_params
def collections_limit_for_facets
- unless request.query_parameters['f'] && request.query_parameters['f'][blacklight_config.collection_field]
- self.collections_limit
- end
+ return if request.query_parameters['f'] && request.query_parameters['f'][blacklight_config.collection_field]
+
+ collections_limit
end
# find the title and pid for the object representing the collection image
- def get_collection_image_info(image_pid, collection_pid)
- col_img_info = {title: '', pid: collection_pid, access_master: false}
- col_img_file_doc = fetch(image_pid)[1]
+ # @param image_pid [String]
+ # @param collection_pid [String]
+ # @return [Hash]
+ def collection_image_info(image_pid, collection_pid)
+ col_img_info = { image_pid: image_pid, title: '', pid: collection_pid, access_master: false }
+ _col_img_file_resp, col_img_file_doc = search_service.fetch(image_pid)
if col_img_file_doc
col_img_info[:access_master] = true if col_img_file_doc[:is_image_of_ssim]
col_img_field = col_img_file_doc[:is_image_of_ssim].presence || col_img_file_doc[:is_file_of_ssim].presence
if col_img_field
- col_img_obj_pid = col_img_field.first.gsub(/info:fedora\//,'')
- col_img_obj_doc = fetch(col_img_obj_pid)[1]
+ col_img_obj_pid = col_img_field.first.gsub(/info:fedora\//, '')
+ _col_img_obj_resp, col_img_obj_doc = search_service.fetch(col_img_obj_pid)
if col_img_obj_doc
col_img_info[:title] = col_img_obj_doc[blacklight_config.index.title_field.to_sym]
col_img_info[:pid] = col_img_obj_pid
@@ -124,7 +135,7 @@ def get_collection_image_info(image_pid, collection_pid)
# set the correct facet params for facets from the collection
def set_collection_facet_params(collection_title, document)
- facet_params = {blacklight_config.collection_field => [collection_title]}
+ facet_params = { blacklight_config.collection_field => [collection_title] }
facet_params[blacklight_config.institution_field] = document[blacklight_config.institution_field.to_sym] if t('blacklight.home.browse.institutions.enabled')
facet_params
end
diff --git a/app/controllers/concerns/commonwealth_vlr_engine/downloads_controller_behavior.rb b/app/controllers/concerns/commonwealth_vlr_engine/downloads_controller_behavior.rb
index f1821b3c..a670774d 100644
--- a/app/controllers/concerns/commonwealth_vlr_engine/downloads_controller_behavior.rb
+++ b/app/controllers/concerns/commonwealth_vlr_engine/downloads_controller_behavior.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# heavily based on Hydra::Controller::DownloadBehavior
module CommonwealthVlrEngine
module DownloadsControllerBehavior
@@ -19,9 +21,9 @@ module DownloadsControllerBehavior
# render a page/modal with license terms, download links, etc
def show
- @doc_response, @document = fetch(params[:id])
+ @doc_response, @document = search_service.fetch(params[:id])
if @document[:has_model_ssim].include? 'info:fedora/afmodel:Bplmodels_File'
- parent_response, @parent_document = fetch(parent_id(@document))
+ _parent_response, @parent_document = search_service.fetch(parent_id(@document))
@object_profile = JSON.parse(@document['object_profile_ssm'].first)
else
@parent_document = @document
@@ -31,29 +33,29 @@ def show
respond_to do |format|
format.html do
render layout: false if request.xhr?
- end# for users w/o JS
- format.js { render :layout => false } # download modal window
+ end # for users w/o JS
+ format.js { render layout: false } # download modal window
end
end
# initiates the file download
def trigger_download
- response, @solr_document = fetch(params[:id])
- if !@solr_document.to_h.empty? && params[:datastream_id]
- if @solr_document[:has_model_ssim].include? 'info:fedora/afmodel:Bplmodels_File'
- @object_id = parent_id(@solr_document)
- send_content
- elsif @solr_document[:has_model_ssim].include? 'info:fedora/afmodel:Bplmodels_ObjectBase'
- @file_list = get_image_files(params[:id])
- if !@file_list.empty?
- @object_id = params[:id]
- send_zipped_content
- else
- not_found
- end
+ _response, @solr_document = search_service.fetch(params[:id])
+ return unless !@solr_document.to_h.empty? && params[:datastream_id]
+
+ if @solr_document[:has_model_ssim].include? 'info:fedora/afmodel:Bplmodels_File'
+ @object_id = parent_id(@solr_document)
+ send_content
+ elsif @solr_document[:has_model_ssim].include? 'info:fedora/afmodel:Bplmodels_ObjectBase'
+ @file_list = get_image_files(params[:id])
+ if !@file_list.empty?
+ @object_id = params[:id]
+ send_zipped_content
else
not_found
end
+ else
+ not_found
end
end
@@ -80,10 +82,10 @@ def send_content
# send multiple files as a zip archive
def send_zipped_content
files_array = []
- @file_list.each_with_index do |file,index|
- params[:id] = file[:id] # hack this so file_url returns correct value
+ @file_list.each_with_index do |file, index|
+ params[:id] = file[:id] # so file_url returns correct value
@solr_document = file
- files_array << [file_url, "#{(index+1).to_s}_#{file_name_with_extension}"]
+ files_array << [file_url, "#{(index + 1)}_#{file_name_with_extension}"]
end
file_mappings = files_array.lazy.map { |url, path| [open(url), path] }
zipline(file_mappings, "#{file_name}.zip")
@@ -110,8 +112,8 @@ def file_url
end
def file_extension
- if params[:datastream_id] =~ /Master/
- JSON.parse(@solr_document[:object_profile_ssm].first)["objLabel"].split('.')[1]
+ if params[:datastream_id].match?(/Master/)
+ JSON.parse(@solr_document[:object_profile_ssm].first)['objLabel'].split('.')[1]
else
'jpg'
end
@@ -119,7 +121,7 @@ def file_extension
# @return [String] the filename
def file_name
- "#{@object_id.gsub(/:/,'_')}_#{params[:datastream_id]}"
+ "#{@object_id.tr(':', '_')}_#{params[:datastream_id]}"
end
# @return [String] the filename with extension
@@ -129,11 +131,12 @@ def file_name_with_extension
def file_size
return false if params[:datastream_id] == 'accessFull'
- JSON.parse(@solr_document[:object_profile_ssm].first)["datastreams"][params[:datastream_id]]["dsSize"]
+
+ JSON.parse(@solr_document[:object_profile_ssm].first)['datastreams'][params[:datastream_id]]['dsSize']
end
def mime_type
- if params[:datastream_id] =~ /Master/
+ if params[:datastream_id].match?(/Master/)
@solr_document[:mime_type_tesim].first
else
'image/jpeg'
@@ -145,7 +148,7 @@ def prepare_file_headers
response.headers['Content-Type'] = mime_type
response.headers['Content-Length'] ||= file_size.to_s if file_size
# Prevent Rack::ETag from calculating a digest over body
- response.headers['Last-Modified'] = Time.new(@solr_document[:system_modified_dtsi]).utc.strftime("%a, %d %b %Y %T GMT")
+ response.headers['Last-Modified'] = Time.new(@solr_document[:system_modified_dtsi]).utc.strftime('%a, %d %b %Y %T GMT')
self.content_type = mime_type
end
@@ -162,7 +165,7 @@ def send_range
to = file_size.to_i - 1 unless to
length = to - from + 1
response.headers['Content-Range'] = "bytes #{from}-#{to}/#{file_size}"
- response.headers['Content-Length'] = "#{length}"
+ response.headers['Content-Length'] = length.to_s
self.status = 206
prepare_file_headers
stream_body file_stream(file_url, request.headers['HTTP_RANGE'])
@@ -171,7 +174,7 @@ def send_range
private
def parent_id(document)
- document[:is_file_of_ssim].first.gsub(/info:fedora\//,'')
+ document[:is_file_of_ssim].first.gsub(/info:fedora\//, '')
end
def stream_body(iostream)
@@ -181,6 +184,5 @@ def stream_body(iostream)
ensure
response.stream.close
end
-
end
end
diff --git a/app/controllers/concerns/commonwealth_vlr_engine/institutions_controller_behavior.rb b/app/controllers/concerns/commonwealth_vlr_engine/institutions_controller_behavior.rb
index cb5d98ab..44b84206 100644
--- a/app/controllers/concerns/commonwealth_vlr_engine/institutions_controller_behavior.rb
+++ b/app/controllers/concerns/commonwealth_vlr_engine/institutions_controller_behavior.rb
@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module InstitutionsControllerBehavior
extend ActiveSupport::Concern
##
- # Give Bookmarks access to the CatalogController configuration
+ # Give InstitutionsController access to the CatalogController configuration
include Blacklight::Configurable
- include Blacklight::SearchHelper
included do
copy_blacklight_config_from(CatalogController)
before_action :institutions_index_config, :only => [:index]
- # remove collection facet and collapse others
before_action :relation_base_blacklight_config, :only => [:show]
helper_method :search_action_url
@@ -18,10 +18,12 @@ module InstitutionsControllerBehavior
def index
@nav_li_active = 'explore'
- params[:per_page] = params[:per_page].presence || '50'
- (@response, @document_list) = search_results(params)
- params[:view] ||= 'list' # still need this or grid view is invoked
- params[:sort] = 'title_info_primary_ssort asc'
+ params.merge!(view: params[:view].presence || 'list',
+ per_page: params[:per_page].presence || '50',
+ sort: 'title_info_primary_ssort asc, date_start_dtsi asc')
+ institutions_search_service = search_service_class.new(config: blacklight_config,
+ user_params: params)
+ (@response, @document_list) = institutions_search_service.search_results
respond_to do |format|
format.html
@@ -30,26 +32,30 @@ def index
def show
@nav_li_active = 'explore'
- @show_response, @document = fetch(params[:id])
+
+ # have to define a new search_service here, or we can't inject params[:f] below
+ institution_search_service = search_service_class.new(config: blacklight_config,
+ user_params: params)
+ _show_response, @document = institution_search_service.fetch(params[:id])
@institution_title = @document[blacklight_config.index.title_field.to_sym]
# get the response for collection objects
- collex_f_params = {blacklight_config.index.display_type_field => 'Collection',
- 'institution_pid_ssi' => params[:id]}
- @collex_response, @collex_documents = search_results({:f => collex_f_params,
- :rows => 500,
- :sort => 'title_info_primary_ssort asc'})
+ collex_params = { f: { blacklight_config.index.display_type_field => 'Collection',
+ 'institution_pid_ssi' => params[:id] },
+ rows: 500, sort: 'title_info_primary_ssort asc, date_start_dtsi asc' }
+ collex_search_service = search_service_class.new(config: blacklight_config,
+ user_params: collex_params)
+ _collex_response, @collex_documents = collex_search_service.search_results
- # add params[:f] for proper facet links
- params[:f] = {blacklight_config.institution_field => [@institution_title]}
-
- # get the response for the facets representing items in collection
- (@response, @document_list) = search_results({:f => params[:f]})
+ # add params[:f] for proper facet links, get response for items in collection
+ params.merge!(f: { blacklight_config.institution_field => [@institution_title] }).permit!
+ facets_search_service = search_service_class.new(config: blacklight_config,
+ user_params: { f: params[:f] })
+ @response, @document_list = facets_search_service.search_results
respond_to do |format|
format.html
end
-
end
def range_limit
diff --git a/app/controllers/concerns/commonwealth_vlr_engine/pages.rb b/app/controllers/concerns/commonwealth_vlr_engine/pages.rb
new file mode 100644
index 00000000..31541370
--- /dev/null
+++ b/app/controllers/concerns/commonwealth_vlr_engine/pages.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module CommonwealthVlrEngine
+ module Pages
+ extend ActiveSupport::Concern
+
+ def home
+ @carousel_slides = CarouselSlide.where(context: 'root').order(:sequence)
+ render 'pages/home'
+ end
+
+ def about
+ @nav_li_active = 'about'
+ end
+
+ def about_site
+ @nav_li_active = 'about'
+ end
+
+ def explore
+ @nav_li_active = 'explore'
+ end
+ end
+end
diff --git a/app/controllers/downloads_controller.rb b/app/controllers/downloads_controller.rb
index 6ade4107..f0ded832 100644
--- a/app/controllers/downloads_controller.rb
+++ b/app/controllers/downloads_controller.rb
@@ -1,4 +1,5 @@
+# frozen_string_literal: true
+
class DownloadsController < ApplicationController
include CommonwealthVlrEngine::DownloadsControllerBehavior
-
-end
\ No newline at end of file
+end
diff --git a/app/controllers/feedback_controller.rb b/app/controllers/feedback_controller.rb
index ff233763..27476c2d 100644
--- a/app/controllers/feedback_controller.rb
+++ b/app/controllers/feedback_controller.rb
@@ -1,19 +1,17 @@
-# -*- encoding : utf-8 -*-
-class FeedbackController < ApplicationController
+# frozen_string_literal: true
+class FeedbackController < ApplicationController
# http://expressica.com/simple_captcha/
# include SimpleCaptcha::ControllerHelpers
# show the feedback form
def show
- @nav_li_active = 'contact'
- @errors=[]
- if request.post?
- if validate
- Notifier.feedback(params).deliver_now
- redirect_to feedback_complete_path
- end
- end
+ @nav_li_active = 'about'
+ @errors = []
+ return unless request.post? && validate
+
+ Notifier.feedback(params).deliver_now
+ redirect_to feedback_complete_path
end
protected
@@ -21,19 +19,10 @@ def show
# validates the incoming params
# returns either an empty array or an array with error messages
def validate
- unless params[:name] =~ /\w+/
- @errors << t('blacklight.feedback.valid_name')
- end
- unless params[:email] =~ /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
- @errors << t('blacklight.feedback.valid_email')
- end
- unless params[:message] =~ /\w+/
- @errors << t('blacklight.feedback.need_message')
- end
- #unless simple_captcha_valid?
- # @errors << 'Captcha did not match'
- #end
+ @errors << t('blacklight.feedback.valid_name') unless params[:name]&.match?(/\w+/)
+ @errors << t('blacklight.feedback.valid_email') unless params[:email]&.match?(/\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i)
+ @errors << t('blacklight.feedback.need_message') unless params[:message]&.match?(/\w+/)
+ # @errors << 'Captcha did not match' unless simple_captcha_valid?
@errors.empty?
end
-
-end
\ No newline at end of file
+end
diff --git a/app/controllers/folder_items_actions_controller.rb b/app/controllers/folder_items_actions_controller.rb
deleted file mode 100644
index fb113c01..00000000
--- a/app/controllers/folder_items_actions_controller.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# use to share folder item actions (email, cite, delete) between folders and bookmarks
-class FolderItemsActionsController < ApplicationController
-
- def folder_item_actions
- @folder = Bpluser::Folder.find(params[:id]) if params[:origin] == "folders"
- @user = current_or_guest_user
- if params[:selected]
- view_params = params.permit(:sort, :per_page, :view)
- items = params[:selected]
-
- case params[:commit]
- # email
- when t('blacklight.tools.email')
- redirect_to email_solr_document_path(:id => items)
- # cite
- when t('blacklight.tools.citation')
- redirect_to citation_solr_document_path(:id => items)
- # remove
- when t('blacklight.tools.remove')
- if params[:origin] == "folders"
- if @folder.folder_items.where(:document_id => items).delete_all
- flash[:notice] = I18n.t('blacklight.folders.update_items.remove.success')
- else
- flash[:error] = I18n.t('blacklight.folders.update_items.remove.failure')
- end
- redirect_to folder_path(@folder,
- view_params)
- else
- if current_or_guest_user.bookmarks.where(:document_id => items).delete_all
- flash[:notice] = I18n.t('blacklight.folders.update_items.remove.success')
- else
- flash[:error] = I18n.t('blacklight.folders.update_items.remove.failure')
- end
- redirect_to bookmarks_path(view_params)
- end
- # copy
- when /#{t('blacklight.tools.copy_to')}/
- destination = params[:commit].split(t('blacklight.tools.copy_to') + ' ')[1]
- if destination == t('blacklight.bookmarks.title')
- success = items.all? do |item_id|
- current_or_guest_user.bookmarks.create(:document_id => item_id) unless current_or_guest_user.bookmarks.where(:document_id => item_id).exists?
- end
- else
- folder_to_update = current_user.folders.find(destination)
- success = items.all? do |item_id|
- folder_to_update.folder_items.create!(:document_id => item_id) and folder_to_update.touch unless folder_to_update.has_folder_item(item_id)
- end
- end
- redirect_back(fallback_location: root_path)
- if success
- folder_display_name = destination == t('blacklight.bookmarks.title') ? t('blacklight.bookmarks.title') : folder_to_update.title
- flash[:notice] = t('blacklight.folders.update_items.copy.success',
- :folder_name => folder_display_name)
- else
- flash[:error] = t('blacklight.folders.update_items.copy.failure')
- end
- end
-
- else
- redirect_back(fallback_location: root_path)
- flash[:error] = I18n.t('blacklight.folders.update_items.remove.no_items')
- end
-
- end
-
-end
diff --git a/app/controllers/folder_items_controller.rb b/app/controllers/folder_items_controller.rb
deleted file mode 100644
index cec44469..00000000
--- a/app/controllers/folder_items_controller.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-class FolderItemsController < CatalogController
-
- # give controller access to useful BL/Solr methods
- #include Blacklight::Configurable
- #include Blacklight::SearchHelper
-
- before_action :verify_user
-
- def update
- create
- end
-
- def create
- @response, @document = fetch(params[:id])
- if params[:folder_items]
- @folder_items = params[:folder_items]
- else
- @folder_items = [{ :document_id => params[:id], :folder_id => params[:folder_id] }]
- end
-
- success = @folder_items.all? do |f_item|
- folder_to_update = current_user.folders.find(f_item[:folder_id])
- folder_to_update.folder_items.create!(:document_id => f_item[:document_id]) and folder_to_update.touch unless folder_to_update.has_folder_item(f_item[:document_id])
- end
-
- unless request.xhr?
- flash[:notice] = t('blacklight.folder_items.add.success')
- end
-
- respond_to do |format|
- format.html { redirect_back(fallback_location: root_path) }
- format.js
- end
-
- end
-
-
- # Beware, :id is the Solr document_id, not the actual Bookmark id.
- # idempotent, as DELETE is supposed to be.
- # PRETTY SURE THIS METHOD IS NEVER USED!
- def destroy
- @response, @document = fetch(params[:id])
- folder_item = current_user.existing_folder_item_for(params[:id])
-
- # success = (!folder_item) || FolderItem.find(folder_item).destroy
-
- Bpluser::Folder.find(folder_item.folder_id).touch
- Bpluser::FolderItem.find(folder_item.id).destroy
-
- respond_to do |format|
- format.html { redirect_back(fallback_location: root_path) }
- format.js
- end
-
- end
-
- def clear
- @folder = Bpluser::Folder.find(params[:id])
- if current_user.folders.find(@folder.id).folder_items.clear
- @folder.touch
- flash[:notice] = I18n.t('blacklight.folder_items.clear.success')
- else
- flash[:error] = I18n.t('blacklight.folder_items.clear.failure')
- end
- redirect_to :controller => "folders", :action => "show", :id => @folder
- end
-
- # PRETTY SURE THIS METHOD IS NEVER USED!
- def delete_selected
- @folder = Bpluser::Folder.find(params[:id])
- if params[:selected]
- if @folder.folder_items.where(:document_id => params[:selected]).delete_all
- @folder.touch
- flash[:notice] = t('blacklight.folders.update_items.remove.success')
- else
- flash[:error] = t('blacklight.folders.update_items.remove.failure')
- end
- redirect_to :controller => "folders", :action => "show", :id => @folder
- else
- redirect_to :back
- flash[:error] = t('blacklight.folders.update_items.remove.no_items')
- end
- end
-
- protected
- def verify_user
- flash[:notice] = I18n.t('blacklight.folders.need_login') and raise Blacklight::Exceptions::AccessDenied unless current_user
- end
-
-end
diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb
deleted file mode 100644
index dce5131d..00000000
--- a/app/controllers/folders_controller.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-class FoldersController < CatalogController
-
- ##
- # Give Bookmarks access to the CatalogController configuration
- include Blacklight::Configurable
- include Blacklight::SearchHelper
- include Blacklight::TokenBasedUser
-
- copy_blacklight_config_from(CatalogController)
-
- # Blacklight uses #search_action_url to figure out the right URL for
- # the global search box
- def search_action_url options = {}
- search_catalog_url(options.except(:controller, :action))
- end
- helper_method :search_action_url
-
- before_action :verify_user, :except => [:index, :show, :public_list]
- before_action :check_visibility, :only => [:show]
- before_action :correct_user_for_folder, :only => [:update, :destroy]
- before_action :set_solr_http_post, only: [:show]
-
- after_action :unset_solr_http_post, only: [:show]
-
- def index
- flash[:notice] = flash[:notice].html_safe if flash[:notice].present? and flash[:notice] == %Q[Welcome! You're viewing Digital Stacks items using a link from a temporary card. To save these items to a free permanent account, click Sign Up / Log In.]
- if current_or_guest_user
- @folders = current_or_guest_user.folders
- end
- end
-
- def show
- flash[:notice] = flash[:notice].html_safe if flash[:notice].present? and flash[:notice] == %Q[Welcome! You're viewing Digital Stacks items using a link from a temporary card. To save these items to a free permanent account, click
Sign Up / Log In.]
-
- # @folder is set by correct_user_for_folder
- @folder_items = @folder.folder_items
- folder_items_ids = @folder_items.pluck(:document_id)
- params[:sort] ||= 'title_info_primary_ssort asc, date_start_dtsi asc'
- @response, @document_list = fetch(folder_items_ids)
-
- # have to declare this so view uses catalog/index partials
- # uh, maybe not? default templates won't get invoked if below is set
- #@partial_path_templates = ["catalog/%{action_name}_%{index_view_type}_%{format}"]
- end
-
- def new
- @folder = current_user.folders.new
- end
-
- def create
- @folder = current_user.folders.build(folder_params)
- if @folder.save
- flash[:notice] = "Folder created."
- redirect_to :action => "index"
- else
- render :action => "new"
- end
- end
-
- # create a folder in a modal window in the item show view
- #def create_folder_catalog
- # if request.post?
- # unless params[:title].empty?
- # @folder = current_user.folders.build(:title => params[:title], :description => params[:description])
- # if @folder.save
- # flash[:success] = "Folder created; " + t('blacklight.folder_items.add.success')
- # current_user.folders.first.folder_items.create!(:document_id => params['id'].first)
- # redirect_to solr_document_path(params['id']) unless request.xhr?
- # else
- # flash[:error] = t('blacklight.folders.create.error.no_save')
- # end
- # else
- # flash[:error] = t('blacklight.folders.create.error.no_title')
- # end
- # end
-
- # unless !request.xhr? && flash[:success]
- # respond_to do |format|
- # format.js { render :layout => false }
- # format.html { redirect_to :action => "new" }
- # end
- # end
-
- #end
-
- def edit
- @folder = Bpluser::Folder.find(params[:id])
- end
-
- def update
- # @folder is set by correct_user_for_folder
- if @folder.update_attributes(folder_params)
- flash[:notice] = "Folder updated."
- redirect_to @folder
- else
- render :action => "edit"
- end
- end
-
- def destroy
- # @folder is set by correct_user_for_folder
- @folder.destroy
- flash[:notice] = t('blacklight.folders.delete.success')
- redirect_to :action => "index"
- end
-
- # return a list of publicly visible folders that have items
- def public_list
- # TODO create a named scope for this query in Bplmodels::Folder?
- @folders = Bpluser::Folder.includes(:folder_items).where(visibility: 'public').order(updated_at: :desc)
- end
-
- private
-
- def folder_params
- params.require(:folder).permit(:id, :title, :description, :visibility)
- end
-
- def verify_user
- flash[:notice] = t('blacklight.folders.need_login') and raise Blacklight::Exceptions::AccessDenied unless current_user
- end
-
- def check_visibility
- @folder = Bpluser::Folder.find(params[:id])
- if @folder.visibility != 'public'
- correct_user_for_folder
- end
- end
-
- def correct_user_for_folder
- @folder ||= Bpluser::Folder.find(params[:id])
- if current_or_guest_user
- flash[:notice] = t('blacklight.folders.private') and redirect_to root_path unless current_or_guest_user.folders.include?(@folder)
- else
- flash[:notice] = t('blacklight.folders.private') and redirect_to root_path
- end
- end
-
- def set_solr_http_post
- unless blacklight_config.http_post == :post
- blacklight_config.http_method = :post
- end
- end
-
- def unset_solr_http_post
- blacklight_config.http_method = :get
- end
-end
diff --git a/app/controllers/iiif_manifest_controller.rb b/app/controllers/iiif_manifest_controller.rb
index 4df10fc5..c120d55a 100644
--- a/app/controllers/iiif_manifest_controller.rb
+++ b/app/controllers/iiif_manifest_controller.rb
@@ -1,38 +1,38 @@
+# frozen_string_literal: true
+
# use to render new image in multi image viewer in catalog#show
class IiifManifestController < CatalogController
- include CommonwealthVlrEngine::CatalogHelper
+ include CommonwealthVlrEngine::CatalogHelperBehavior
include CommonwealthVlrEngine::IiifManifest
skip_before_action :verify_authenticity_token, only: [:cache_invalidate]
- after_action :set_access_control_headers, only: [:manifest, :canvas, :annotation, :collection]
+ after_action :set_access_control_headers, only: [:manifest, :canvas, :annotation]
def manifest
image_files = get_image_files(params[:id])
if image_files.length > 0
@iiif_manifest = Rails.cache.fetch(params[:id],
{ namespace: cache_namespace, compress: true }) do
- _response, document = fetch(params[:id])
+ _response, document = search_service.fetch(params[:id])
create_iiif_manifest(document, image_files).to_json
end
- render :json => @iiif_manifest
- elsif get_volume_objects(params[:id]).length > 0
- redirect_to iiif_collection_path(params[:id])
+ render json: @iiif_manifest
else
not_found
end
end
def canvas
- _canvas_response, canvas_document = fetch(params[:canvas_object_id])
+ _canvas_response, canvas_document = search_service.fetch(params[:canvas_object_id])
if canvas_document[:is_file_of_ssim]
- _response, document = fetch(params[:id])
+ _response, document = search_service.fetch(params[:id])
image_files = image_file_pids(get_image_files(params[:id]))
if image_files
image_index = Hash[image_files.map.with_index.to_a][params[:canvas_object_id]]
iiif_canvas = canvas_from_id(params[:canvas_object_id],
label_for_canvas(canvas_document, image_index),
document)
- render :json => iiif_canvas.to_json
+ render json: iiif_canvas.to_json
else
not_found
end
@@ -42,21 +42,10 @@ def canvas
end
def annotation
- _response, document = fetch(params[:id])
+ _response, document = search_service.fetch(params[:id])
if image_file_pids(get_image_files(params[:id])).include?(params[:annotation_object_id])
annotation = image_annotation_from_image_id(params[:annotation_object_id], document)
- render :json => annotation.to_json
- else
- not_found
- end
- end
-
- def collection
- _response, document = fetch(params[:id])
- volumes = get_volume_objects(params[:id])
- if volumes.length > 0
- iiif_collection = collection_for_manifests(document, volumes)
- render :json => iiif_collection.to_json
+ render json: annotation.to_json
else
not_found
end
@@ -73,7 +62,7 @@ def cache_invalidate
# to allow apps to load manifest JSON received from a remote server
def set_access_control_headers
- headers['Access-Control-Allow-Origin'] = "*"
+ headers['Access-Control-Allow-Origin'] = '*'
end
def cache_namespace
diff --git a/app/controllers/image_viewer_controller.rb b/app/controllers/image_viewer_controller.rb
index 332aa1be..25b624f8 100644
--- a/app/controllers/image_viewer_controller.rb
+++ b/app/controllers/image_viewer_controller.rb
@@ -1,24 +1,25 @@
+# frozen_string_literal: true
+
# use to render new image in multi image viewer in catalog#show
class ImageViewerController < CatalogController
-
- include CommonwealthVlrEngine::CatalogHelper
+ include CommonwealthVlrEngine::CatalogHelperBehavior
def show
- @response, @document = fetch(params[:id])
+ _response, @document = search_service.fetch(params[:id])
@title = @document[blacklight_config.index.title_field.to_sym]
# @object_files is already set by before_action in CommonwealthVlrEngine::ControllerOverride
@page_sequence = create_img_sequence(image_file_pids(@object_files[:images]), params[:view])
respond_to do |format|
format.js
- format.html { redirect_to solr_document_path(@document.id,
- :view => params[:view]) }
+ format.html { redirect_to solr_document_path(@document.id, view: params[:view]) }
end
end
def book_viewer
- @response, @document = fetch(params[:id])
- @image_files = image_file_pids(get_image_files(params[:id]))
- render(:layout => 'book_viewer')
- end
+ _response, @document = search_service.fetch(params[:id])
-end
\ No newline at end of file
+ respond_to do |format|
+ format.html { render layout: 'book_viewer' }
+ end
+ end
+end
diff --git a/app/controllers/institutions_controller.rb b/app/controllers/institutions_controller.rb
index e11e2ac5..117ec96e 100644
--- a/app/controllers/institutions_controller.rb
+++ b/app/controllers/institutions_controller.rb
@@ -1,4 +1,5 @@
+# frozen_string_literal: true
+
class InstitutionsController < CatalogController
include CommonwealthVlrEngine::InstitutionsControllerBehavior
-
-end
\ No newline at end of file
+end
diff --git a/app/controllers/ocr_search_controller.rb b/app/controllers/ocr_search_controller.rb
index 147fd0ac..a105d7de 100644
--- a/app/controllers/ocr_search_controller.rb
+++ b/app/controllers/ocr_search_controller.rb
@@ -1,33 +1,36 @@
-class OcrSearchController < CatalogController
+# frozen_string_literal: true
+class OcrSearchController < CatalogController
##
# access to the CatalogController configuration
include Blacklight::Configurable
- include Blacklight::SearchHelper
- include CommonwealthVlrEngine::CatalogHelper
+ include CommonwealthVlrEngine::CatalogHelperBehavior
copy_blacklight_config_from(CatalogController)
- before_action :modify_config_for_ocr, :only => [:index]
+ before_action :modify_config_for_ocr, only: [:index]
def index
- @doc_response, @document = fetch(params[:id])
+ @doc_response, @document = search_service.fetch(params[:id])
if params[:ocr_q]
- if !params[:ocr_q].blank?
+ if params[:ocr_q].present?
@image_pid_list = image_file_pids(get_image_files(params[:id]))
- ocr_search_params = {q: params[:ocr_q],
- f: {'is_image_of_ssim' => "info:fedora/#{params[:id]}"}}
+ ocr_search_params = { q: params[:ocr_q],
+ f: { 'is_image_of_ssim' => "info:fedora/#{params[:id]}" } }
ocr_search_params[:page] = params[:page] if params[:page]
ocr_search_params[:sort] = params[:sort] if params[:sort]
# for some reason, have to set :fl here, or gets scrubbed out of ocr_search_params somehow
blacklight_config.default_solr_params[:fl] =
"id,#{blacklight_config.page_num_field},#{termfreq_query(params[:ocr_q])}"
- (@response, @document_list) = search_results(ocr_search_params)
+ ocr_search_service = search_service_class.new(config: blacklight_config,
+ user_params: ocr_search_params,
+ search_builder_class: CommonwealthOcrSearchBuilder)
+ @response, @document_list = ocr_search_service.search_results
else
- (@response, @document_list) = Blacklight::Solr::Response.new(nil,nil), []
+ @response, @document_list = Blacklight::Solr::Response.new(nil, nil), []
end
else
- (@response, @document_list) = {},[]
+ @response, @document_list = {}, []
end
respond_to do |format|
@@ -36,7 +39,7 @@ def index
return render layout: false if request.xhr?
end
# Draw the partial for the ocr search results modal window:
- format.js { render :layout => false }
+ format.js { render layout: false }
end
end
@@ -44,7 +47,6 @@ def index
# modify Solr query/response for OCR searches
def modify_config_for_ocr
- blacklight_config.search_builder_class = CommonwealthOcrSearchBuilder
blacklight_config.sort_fields = {}
blacklight_config.add_sort_field 'score desc, system_create_dtsi asc', label: 'relevance'
blacklight_config.add_sort_field 'system_create_dtsi asc', label: 'page #'
@@ -57,10 +59,10 @@ def modify_config_for_ocr
# create the Solr function query to return term frequency
def termfreq_query(ocr_search_terms)
- search_terms = if ocr_search_terms =~ (/\A"[\s\S]*"\z/) # phrase search
- [ocr_search_terms.gsub(/"/,'')]
- else
- ocr_search_terms.gsub(/"/,'').split(' ')
+ search_terms = if ocr_search_terms.match?(/\A"[\s\S]*"\z/) # phrase search
+ [ocr_search_terms.delete('"')]
+ else
+ ocr_search_terms.delete('"').split(' ')
end
if search_terms.length == 1
"term_freq:termfreq(#{blacklight_config.ocr_search_field},\"#{search_terms.first}\")"
@@ -74,5 +76,4 @@ def termfreq_query(ocr_search_terms)
def start_new_search_session?
false
end
-
end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index b1dda93b..55549093 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,5 +1,5 @@
-class PagesController < ApplicationController
+# frozen_string_literal: true
+class PagesController < ApplicationController
include CommonwealthVlrEngine::Pages
-
-end
\ No newline at end of file
+end
diff --git a/app/controllers/saved_searches_controller.rb b/app/controllers/saved_searches_controller.rb
index cb12e868..415fbd24 100644
--- a/app/controllers/saved_searches_controller.rb
+++ b/app/controllers/saved_searches_controller.rb
@@ -1,10 +1,11 @@
# frozen_string_literal: true
+
class SavedSearchesController < ApplicationController
- include Blacklight::SavedSearches
+ include Bpluser::SavedSearches
helper BlacklightAdvancedSearch::RenderConstraintsOverride
helper BlacklightMaps::RenderConstraintsOverride
helper BlacklightRangeLimit::ViewHelperOverride
helper RangeLimitHelper
- helper CommonwealthVlrEngine::RenderConstraintsOverride
-end
\ No newline at end of file
+ helper CommonwealthVlrEngine::RenderConstraintsHelperBehavior
+end
diff --git a/app/controllers/search_history_controller.rb b/app/controllers/search_history_controller.rb
index 05fcb7ed..251d49af 100644
--- a/app/controllers/search_history_controller.rb
+++ b/app/controllers/search_history_controller.rb
@@ -1,10 +1,10 @@
# frozen_string_literal: true
+
class SearchHistoryController < ApplicationController
include Blacklight::SearchHistory
-
helper BlacklightAdvancedSearch::RenderConstraintsOverride
helper BlacklightMaps::RenderConstraintsOverride
helper BlacklightRangeLimit::ViewHelperOverride
helper RangeLimitHelper
- helper CommonwealthVlrEngine::RenderConstraintsOverride
-end
\ No newline at end of file
+ helper CommonwealthVlrEngine::RenderConstraintsHelperBehavior
+end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
deleted file mode 100644
index 2c11b3ce..00000000
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-
- #https://github.com/plataformatec/devise/issues/2432
-
- # this is the only spot where we allow CSRF, our openid / oauth redirect
- # will not have a CSRF token, however the payload is all validated so its safe
- skip_before_action :verify_authenticity_token
-
- include Bpluser::Users::OmniauthCallbacksController
-end
\ No newline at end of file
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
deleted file mode 100644
index 4df862e0..00000000
--- a/app/controllers/users/registrations_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Users::RegistrationsController < Devise::RegistrationsController
- include Bpluser::Users::RegistrationsController
-end
\ No newline at end of file
diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
deleted file mode 100644
index 4cec4450..00000000
--- a/app/controllers/users/sessions_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Users::SessionsController < Devise::SessionsController
- include Bpluser::Users::SessionsController
-end
\ No newline at end of file
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
deleted file mode 100644
index b5faf855..00000000
--- a/app/controllers/users_controller.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-class UsersController < ApplicationController
-
- before_action :authenticate_user!, :correct_user, :only => [:show]
-
- def show
- @user = User.find(params[:id])
-
- respond_to do |format|
- format.html # show.html.erb.bak
- format.xml { render :xml => @user }
- end
- end
-
- # getting some weird intermittent errors where users are being redirected
- # to '/users' after signup. this is a failsafe last-resort solution
- def index
- redirect_to root_path
- end
-
- protected
-
- def correct_user
- @user = User.find(params[:id])
- redirect_to root_path unless current_user.id == @user.id
- end
-
-end
\ No newline at end of file
diff --git a/app/helpers/blacklight_maps_helper.rb b/app/helpers/blacklight_maps_helper.rb
index 7363ffc0..743c5388 100644
--- a/app/helpers/blacklight_maps_helper.rb
+++ b/app/helpers/blacklight_maps_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module BlacklightMapsHelper
include CommonwealthVlrEngine::VlrBlacklightMapsHelperBehavior
end
\ No newline at end of file
diff --git a/app/helpers/catalog_helper.rb b/app/helpers/catalog_helper.rb
new file mode 100644
index 00000000..5e44f19f
--- /dev/null
+++ b/app/helpers/catalog_helper.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module CatalogHelper
+ include Blacklight::CatalogHelperBehavior
+ include CommonwealthVlrEngine::CatalogHelperBehavior
+end
diff --git a/app/helpers/citation_helper.rb b/app/helpers/citation_helper.rb
index d5c1cb64..f4875fdf 100644
--- a/app/helpers/citation_helper.rb
+++ b/app/helpers/citation_helper.rb
@@ -1,7 +1,7 @@
-# helper methods for rendering citations
+# frozen_string_literal: true
+# helper methods for rendering citations
module CitationHelper
-
# an array of available citation formats
# for each style, there should be a corresponding "render_#{style}_citation" method
def citation_styles
@@ -9,43 +9,43 @@ def citation_styles
end
def render_citations(documents, citation_styles)
+ return if documents.blank?
+
citation_output_for_view = []
citation_styles.each do |style|
citation_output_for_view << content_tag(:h4, t("blacklight.citation.#{style}"))
documents.each do |document|
- citation_output_for_view << content_tag(:div,
- render_citation(document, style).html_safe,
- class: 'citation-content')
+ citation_output_for_view << content_tag(:div, render_citation(document, style).html_safe,
+ class: 'citation-content')
end
end
citation_output_for_view.join("\n").html_safe
end
def render_citation(document, citation_style)
- if citation_styles.include?(citation_style)
- public_send("render_#{citation_style}_citation", document)
- end
+ public_send("render_#{citation_style}_citation",
+ document) if citation_styles.include?(citation_style)
end
def render_mla_citation(document)
citation_output = ''
- citation_output << names_for_citation(document, 'mla').presence.to_s
- citation_output << title_for_citation(document, 'mla')
- citation_output << publishing_data_for_citation(document).presence.to_s
- citation_output << if document[:date_start_tsim]
+ citation_output += names_for_citation(document, 'mla').presence.to_s
+ citation_output += title_for_citation(document, 'mla')
+ citation_output += publishing_data_for_citation(document).presence.to_s
+ citation_output += if document[:date_start_tsim]
date_for_citation(document[:date_start_tsim].first, 'mla')
else
'n.d. '
end
- citation_output << "Web. #{Date.today.strftime('%d %b %Y')}. "
- citation_output << "<#{url_for_citation(document)}>."
- citation_output.gsub(/\.\./,'.')
+ citation_output += "Web. #{Time.zone.today.strftime('%d %b %Y')}. "
+ citation_output += "<#{url_for_citation(document)}>."
+ citation_output.gsub(/\.\./, '.')
end
def render_apa_citation(document)
citation_output = ''
names = names_for_citation(document, 'apa')
- citation_output << names if names
+ citation_output += names if names
title_date_info = []
title_date_info << if document[:date_start_tsim]
date_for_citation(document[:date_start_tsim].first, 'apa')
@@ -54,40 +54,41 @@ def render_apa_citation(document)
end
title_date_info << title_for_citation(document, 'apa')
if document[:genre_basic_ssim]
- title_date_info[1] = title_date_info[1].insert(-3, " [#{genre_for_citation(document[:genre_basic_ssim].first)}]")
+ title_date_info[1] = title_date_info[1].dup.insert(-3, " [#{genre_for_citation(document[:genre_basic_ssim].first)}]")
end
title_date_info.reverse! unless names
- citation_output << title_date_info.join('')
- citation_output << "Retrieved from #{url_for_citation(document)}"
- citation_output.gsub(/\.\./,'.')
+ citation_output += title_date_info.join('')
+ citation_output += "Retrieved from #{url_for_citation(document)}"
+ citation_output.gsub(/\.\./, '.')
end
def render_chicago_citation(document)
citation_output = ''
- citation_output << names_for_citation(document, 'chicago').presence.to_s
- citation_output << title_for_citation(document, 'chicago')
- citation_output << "#{genre_for_citation(document[:genre_basic_ssim].first)}. " if document[:genre_basic_ssim]
- citation_output << publishing_data_for_citation(document).presence.to_s
- citation_output << "#{render_mods_date(document[:date_start_tsim].first)}. " if document[:date_start_tsim]
- citation_output << "
#{t('blacklight.application_name')}, "
- citation_output << "#{url_for_citation(document)} "
- citation_output << "(accessed #{Date.today.strftime('%B %d, %Y')})."
- citation_output.gsub(/\.\./,'.')
+ citation_output += names_for_citation(document, 'chicago').presence.to_s
+ citation_output += title_for_citation(document, 'chicago')
+ citation_output += "#{genre_for_citation(document[:genre_basic_ssim].first)}. " if document[:genre_basic_ssim]
+ citation_output += publishing_data_for_citation(document).presence.to_s
+ citation_output += "#{render_mods_date(document[:date_start_tsim].first)}. " if document[:date_start_tsim]
+ citation_output += "
#{t('blacklight.application_name')}, "
+ citation_output += "#{url_for_citation(document)} "
+ citation_output += "(accessed #{Time.zone.today.strftime('%B %d, %Y')})."
+ citation_output.gsub(/\.\./, '.')
end
# create a list of creator names
def names_for_citation(document, citation_style)
name_and = citation_style == 'apa' ? '&' : 'and'
return unless document[:name_personal_tsim] || document[:name_corporate_tsim] || document[:name_generic_tsim]
+
names = []
if document[:name_personal_tsim] || document[:name_generic_tsim]
non_corp_names = document[:name_personal_tsim].presence.to_a.concat(document[:name_generic_tsim].presence.to_a)
- non_corp_names.map! { |pers_name| pers_name.gsub(/, [[d\.][ca\.][b\.] ]*\d.*/,'') }
+ non_corp_names.map! { |pers_name| pers_name.gsub(/, [[d\.][ca\.][b\.] ]*\d.*/, '') }
# for APA, names should be "Lastname, F." format
if citation_style == 'apa'
non_corp_names = non_corp_names.map do |pers_name|
- if pers_name.match(/\A[\w\-']*, [A-Z]/)
- "#{pers_name.match(/\A[\w\-']*, [A-Z]/).to_s}."
+ if pers_name.match?(/\A[\w\-']*, [A-Z]/)
+ "#{pers_name.match(/\A[\w\-']*, [A-Z]/)}."
else
pers_name
end
@@ -103,15 +104,15 @@ def names_for_citation(document, citation_style)
# if multiple creators, put ', ' between each, but ', and/& ' before last one
name_output = ''
if names.length > 1
- 0.upto names.length-1 do |index|
- if index == names.length-1
- name_output << "#{name_and} #{names[index]}"
+ 0.upto(names.length - 1) do |index|
+ if index == names.length - 1
+ name_output += "#{name_and} #{names[index]}"
else
- name_output << "#{names[index]}, "
+ name_output += "#{names[index]}, "
end
end
else
- name_output << names.first
+ name_output += names.first
end
"#{name_output}. "
end
@@ -119,16 +120,13 @@ def names_for_citation(document, citation_style)
# return the publication info
def publishing_data_for_citation(document)
return unless document[:pubplace_tsim] || document[:publisher_tsim]
+
publishing_output = ''
- publishing_output << document[:pubplace_tsim].first if document[:pubplace_tsim]
- publishing_output << ': ' if document[:pubplace_tsim] && document[:publisher_tsim]
- publishing_output << document[:publisher_tsim].first if document[:publisher_tsim]
- publishing_output.gsub!(/[\[\]]/,'')
- if document[:date_start_tsim]
- "#{publishing_output}, "
- else
- "#{publishing_output}. "
- end
+ publishing_output += document[:pubplace_tsim].first if document[:pubplace_tsim]
+ publishing_output += ': ' if document[:pubplace_tsim] && document[:publisher_tsim]
+ publishing_output += document[:publisher_tsim].first if document[:publisher_tsim]
+ publishing_output.gsub!(/[\[\]]/, '')
+ "#{publishing_output}#{document[:date_start_tsim] ? ',' : '.'} "
end
# return date with formatting
@@ -139,8 +137,8 @@ def date_for_citation(date_start, citation_style)
"#{date_components.reverse.join(' ')}. "
elsif citation_style == 'apa'
apa_date_raw = date_components[0]
- apa_date_raw << ", #{Date::MONTHNAMES[date_components[1].to_i]}" if date_components[1]
- apa_date_raw << " #{date_components[2].to_i.to_s}" if date_components[2]
+ apa_date_raw += ", #{Date::MONTHNAMES[date_components[1].to_i]}" if date_components[1]
+ apa_date_raw += " #{date_components[2].to_i}" if date_components[2]
"(#{apa_date_raw}). "
end
end
@@ -158,7 +156,7 @@ def title_for_citation(document, citation_style)
# return the genre as a singular value
def genre_for_citation(genre)
- genre.gsub(/s\z/,'')
+ genre.gsub(/s\z/, '')
end
# return the URL for the current page
@@ -170,5 +168,4 @@ def url_for_citation(document)
document[:identifier_uri_ss].presence || solr_document_url(document)
end
end
-
end
diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb
index 48aadf07..07dc3e04 100644
--- a/app/helpers/collections_helper.rb
+++ b/app/helpers/collections_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module CollectionsHelper
include CommonwealthVlrEngine::CollectionsHelperBehavior
end
\ No newline at end of file
diff --git a/app/helpers/commonwealth_vlr_engine/application_helper.rb b/app/helpers/commonwealth_vlr_engine/application_helper.rb
index cd5f7e27..1d70dba2 100644
--- a/app/helpers/commonwealth_vlr_engine/application_helper.rb
+++ b/app/helpers/commonwealth_vlr_engine/application_helper.rb
@@ -1,80 +1,59 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module ApplicationHelper
-
# show the display-friendly value for the Format facet
def render_format(value)
case value
when 'Albums (Books)'
- 'Albums/Scrapbooks'
- when 'Drawings'
- 'Drawings/Illustrations'
- when 'Maps'
- 'Maps/Atlases'
- when 'Motion pictures'
- 'Film/Video'
- when 'Music'
- 'Music (recordings)'
- when 'Objects'
- 'Objects/Artifacts'
- when 'Musical notation'
- 'Sheet music'
- when 'Sound recordings'
- 'Audio recordings (nonmusical)'
- when 'Cards'
- 'Postcards/Cards'
- when 'Correspondence'
- 'Letters/Correspondence'
- else
- value
+ 'Albums/Scrapbooks'
+ when 'Drawings'
+ 'Drawings/Illustrations'
+ when 'Maps'
+ 'Maps/Atlases'
+ when 'Motion pictures'
+ 'Film/Video'
+ when 'Music'
+ 'Music (recordings)'
+ when 'Objects'
+ 'Objects/Artifacts'
+ when 'Musical notation'
+ 'Sheet music'
+ when 'Sound recordings'
+ 'Audio recordings (nonmusical)'
+ when 'Cards'
+ 'Postcards/Cards'
+ when 'Correspondence'
+ 'Letters/Correspondence'
+ else
+ value
end
end
- def render_format_index(options={})
+ def render_format_index(options = {})
options[:value].map { |v| render_format(v) }.join('; ')
end
# return the path to the icon for objects with no thumbnail
def render_object_icon_path(format)
- case format
- when 'still image'
- icon = 'image'
- when 'sound recording', 'sound recording-nonmusical', 'sound recording-musical'
- icon = 'audio'
- when 'moving image'
- icon = 'moving-image'
- else
- icon = 'text'
- end
+ icon = case format
+ when 'still image'
+ 'image'
+ when 'sound recording', 'sound recording-nonmusical', 'sound recording-musical'
+ 'audio'
+ when 'moving image'
+ 'moving-image'
+ else
+ 'text'
+ end
"commonwealth-vlr-engine/dc_#{icon}-icon.png"
end
- # render date range constraints from Advanced Search form
- # used by CommonwealthVlrEngine::RenderConstraintsOverride
- # and CommonwealthVlrEngine::SearchHistoryConstraintsHelper
- def date_range_constraints_to_s(params)
- if params[:date_start].blank?
- "before #{params[:date_end]}"
- elsif params[:date_end].blank?
- "after #{params[:date_start]}"
- else
- "#{params[:date_start]}-#{params[:date_end]}"
- end
- end
-
- #from psu scholarsphere
- # TODO: this isn't used anywhere in the app, get rid of it?
- def link_to_field(fieldname, fieldvalue, displayvalue = nil)
- p = {:search_field => fieldname, :q => '"'+fieldvalue+'"'}
- link_url = search_catalog_path(p)
- display = displayvalue.blank? ? fieldvalue: displayvalue
- link_to(display, link_url)
- end
-
def link_to_facet(field_value, field, displayvalue = nil)
if field == 'genre_basic_ssim'
- link_to(render_format(field_value), search_catalog_path(:f => {field => [field_value]}))
+ link_to(render_format(field_value), search_catalog_path(f: { field => [field_value] }))
else
- link_to(displayvalue.presence || field_value, search_catalog_path(:f => {field => [field_value]}))
+ link_to(displayvalue.presence || field_value, search_catalog_path(f: { field => [field_value] }))
end
end
@@ -84,11 +63,11 @@ def link_to_facets(field_values, fields, displayvalue = nil)
fields.each_with_index do |field, index|
facets[field] = [field_values[index]]
end
- link_to(displayvalue.presence || field_values[0], search_catalog_path(:f => facets))
+ link_to(displayvalue.presence || field_values[0], search_catalog_path(f: facets))
end
def link_to_county_facet(field_value, field)
- link_to(field_value + ' County', search_catalog_path(:f => {field => [field_value + ' (county)']}))
+ link_to(field_value + ' County', search_catalog_path(f: { field => [field_value + ' (county)'] }))
end
# returns the direct URL to a datastream in Fedora
@@ -99,8 +78,8 @@ def datastream_disseminator_url pid, datastream_id
# create an image tag from an IIIF image server
def iiif_image_tag(image_pid, options)
image_tag(iiif_image_url(image_pid, options),
- :alt => options[:alt].presence,
- :class => options[:class].presence)
+ alt: options[:alt].presence,
+ class: options[:class].presence)
end
# return the IIIF image url
@@ -115,83 +94,75 @@ def get_image_metadata(image_pid)
iiif_response = Typhoeus::Request.get(IIIF_SERVER['url'] + image_pid + '/info.json')
if iiif_response.response_code == 200 && !iiif_response.response_body.empty?
iiif_info = JSON.parse(iiif_response.body)
- height = iiif_info["height"].to_i
- width = iiif_info["width"].to_i
+ height = iiif_info['height'].to_i
+ width = iiif_info['width'].to_i
aspect_ratio = (width.to_f / height.to_f).to_f
- img_metadata = {height: height, width: width, aspect_ratio: aspect_ratio}
+ img_metadata = { height: height, width: width, aspect_ratio: aspect_ratio }
else
- img_metadata = {height: 0, width: 0, aspect_ratio: 0}
+ img_metadata = { height: 0, width: 0, aspect_ratio: 0 }
end
img_metadata
end
- def insert_opengraph_markup
- if controller_name == 'catalog' && action_name == 'show'
- content_for(:head) do
- render :partial=>'/catalog/opengraph', :locals => {:document => @document}
- end
- end
- end
-
def insert_google_analytics
- if Rails.env.to_s == 'production'
- content_for(:head) do
- render :partial=>'/layouts/google_analytics'
- end
+ return unless Rails.env.to_s == 'production'
+
+ content_for(:head) do
+ render partial: '/layouts/google_analytics'
end
end
# returns a hash with the location of the OpenSeadragon custom images
def osd_nav_images(path_to_directory)
{
- zoomIn: {
- REST: path_to_image("#{path_to_directory}/zoomin_rest.png"),
- GROUP: path_to_image("#{path_to_directory}/zoomin_grouphover.png"),
- HOVER: path_to_image("#{path_to_directory}/zoomin_hover.png"),
- DOWN: path_to_image("#{path_to_directory}/zoomin_pressed.png")
- },
- zoomOut: {
- REST: path_to_image("#{path_to_directory}/zoomout_rest.png"),
- GROUP: path_to_image("#{path_to_directory}/zoomout_grouphover.png"),
- HOVER: path_to_image("#{path_to_directory}/zoomout_hover.png"),
- DOWN: path_to_image("#{path_to_directory}/zoomout_pressed.png")
- },
- home: {
- REST: path_to_image("#{path_to_directory}/home_rest.png"),
- GROUP: path_to_image("#{path_to_directory}/home_grouphover.png"),
- HOVER: path_to_image("#{path_to_directory}/home_hover.png"),
- DOWN: path_to_image("#{path_to_directory}/home_pressed.png")
- },
- fullpage: {
- REST: path_to_image("#{path_to_directory}/fullpage_rest.png"),
- GROUP: path_to_image("#{path_to_directory}/fullpage_grouphover.png"),
- HOVER: path_to_image("#{path_to_directory}/fullpage_hover.png"),
- DOWN: path_to_image("#{path_to_directory}/fullpage_pressed.png")
- },
- rotateleft: {
- REST: path_to_image("#{path_to_directory}/rotateleft_rest.png"),
- GROUP: path_to_image("#{path_to_directory}/rotateleft_grouphover.png"),
- HOVER: path_to_image("#{path_to_directory}/rotateleft_hover.png"),
- DOWN: path_to_image("#{path_to_directory}/rotateleft_pressed.png")
- },
- rotateright: {
- REST: path_to_image("#{path_to_directory}/rotateright_rest.png"),
- GROUP: path_to_image("#{path_to_directory}/rotateright_grouphover.png"),
- HOVER: path_to_image("#{path_to_directory}/rotateright_hover.png"),
- DOWN: path_to_image("#{path_to_directory}/rotateright_pressed.png")
- },
- previous: {
- REST: path_to_image("#{path_to_directory}/previous_rest.png"),
- GROUP: path_to_image("#{path_to_directory}/previous_grouphover.png"),
- HOVER: path_to_image("#{path_to_directory}/previous_hover.png"),
- DOWN: path_to_image("#{path_to_directory}/previous_pressed.png")
- },
- next: {
- REST: path_to_image("#{path_to_directory}/next_rest.png"),
- GROUP: path_to_image("#{path_to_directory}/next_grouphover.png"),
- HOVER: path_to_image("#{path_to_directory}/next_hover.png"),
- DOWN: path_to_image("#{path_to_directory}/next_pressed.png")
- }
+ zoomIn: {
+ REST: path_to_image("#{path_to_directory}/zoomin_rest.png"),
+ GROUP: path_to_image("#{path_to_directory}/zoomin_grouphover.png"),
+ HOVER: path_to_image("#{path_to_directory}/zoomin_hover.png"),
+ DOWN: path_to_image("#{path_to_directory}/zoomin_pressed.png")
+ },
+ zoomOut: {
+ REST: path_to_image("#{path_to_directory}/zoomout_rest.png"),
+ GROUP: path_to_image("#{path_to_directory}/zoomout_grouphover.png"),
+ HOVER: path_to_image("#{path_to_directory}/zoomout_hover.png"),
+ DOWN: path_to_image("#{path_to_directory}/zoomout_pressed.png")
+ },
+ home: {
+ REST: path_to_image("#{path_to_directory}/home_rest.png"),
+ GROUP: path_to_image("#{path_to_directory}/home_grouphover.png"),
+ HOVER: path_to_image("#{path_to_directory}/home_hover.png"),
+ DOWN: path_to_image("#{path_to_directory}/home_pressed.png")
+ },
+ fullpage: {
+ REST: path_to_image("#{path_to_directory}/fullpage_rest.png"),
+ GROUP: path_to_image("#{path_to_directory}/fullpage_grouphover.png"),
+ HOVER: path_to_image("#{path_to_directory}/fullpage_hover.png"),
+ DOWN: path_to_image("#{path_to_directory}/fullpage_pressed.png")
+ },
+ rotateleft: {
+ REST: path_to_image("#{path_to_directory}/rotateleft_rest.png"),
+ GROUP: path_to_image("#{path_to_directory}/rotateleft_grouphover.png"),
+ HOVER: path_to_image("#{path_to_directory}/rotateleft_hover.png"),
+ DOWN: path_to_image("#{path_to_directory}/rotateleft_pressed.png")
+ },
+ rotateright: {
+ REST: path_to_image("#{path_to_directory}/rotateright_rest.png"),
+ GROUP: path_to_image("#{path_to_directory}/rotateright_grouphover.png"),
+ HOVER: path_to_image("#{path_to_directory}/rotateright_hover.png"),
+ DOWN: path_to_image("#{path_to_directory}/rotateright_pressed.png")
+ },
+ previous: {
+ REST: path_to_image("#{path_to_directory}/previous_rest.png"),
+ GROUP: path_to_image("#{path_to_directory}/previous_grouphover.png"),
+ HOVER: path_to_image("#{path_to_directory}/previous_hover.png"),
+ DOWN: path_to_image("#{path_to_directory}/previous_pressed.png")
+ },
+ next: {
+ REST: path_to_image("#{path_to_directory}/next_rest.png"),
+ GROUP: path_to_image("#{path_to_directory}/next_grouphover.png"),
+ HOVER: path_to_image("#{path_to_directory}/next_hover.png"),
+ DOWN: path_to_image("#{path_to_directory}/next_pressed.png")
+ }
}.to_json
end
@@ -199,6 +170,5 @@ def osd_nav_images(path_to_directory)
def render_mobile_icon_tags
render partial: 'shared/mobile_icon_tags'
end
-
end
end
diff --git a/app/helpers/commonwealth_vlr_engine/blacklight_helper.rb b/app/helpers/commonwealth_vlr_engine/blacklight_helper.rb
index b1b335bb..2385aa27 100644
--- a/app/helpers/commonwealth_vlr_engine/blacklight_helper.rb
+++ b/app/helpers/commonwealth_vlr_engine/blacklight_helper.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module BlacklightHelper
include Blacklight::BlacklightHelperBehavior
- # local override to allow using CommonwealthVlrEngine::CatalogHelper#render_title
+ # local override to allow using CommonwealthVlrEngine::CatalogHelperBehavior#render_title
# for catalog#show title heading
- def document_heading document=nil
+ def document_heading(document = nil)
document ||= @document
if document[blacklight_config.index.title_field.to_sym]
render_title(document)
@@ -13,6 +15,21 @@ def document_heading document=nil
end
end
+ # override so we can set custom presenter for JSON API responses
+ def document_presenter_class(document)
+ formats.first == :json ? CommonwealthVlrEngine::JsonIndexPresenter : super
+ end
+
+ def extra_body_classes
+ @extra_body_classes ||= ['blacklight-' + controller_name, 'blacklight-' + [controller_name, controller.action_name].join('-')]
+ # if this is the home page
+ if controller_name == 'pages' && action_name == 'home'
+ @extra_body_classes.push('blacklight-home')
+ else
+ @extra_body_classes
+ end
+ end
+
# local override to use custom #document_heading method (above) for catalog#show title heading
def render_document_heading(*args)
options = args.extract_options!
@@ -20,8 +37,7 @@ def render_document_heading(*args)
tag = options.fetch(:tag, :h4)
document = document || @document
- content_tag(tag, document_heading(document), itemprop: "name")
+ content_tag(tag, document_heading(document), itemprop: 'name')
end
-
end
end
diff --git a/app/helpers/commonwealth_vlr_engine/blacklight_url_helper.rb b/app/helpers/commonwealth_vlr_engine/blacklight_url_helper.rb
index 48f8455d..94dc2ec0 100644
--- a/app/helpers/commonwealth_vlr_engine/blacklight_url_helper.rb
+++ b/app/helpers/commonwealth_vlr_engine/blacklight_url_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module BlacklightUrlHelper
include Blacklight::UrlHelperBehavior
@@ -5,27 +7,33 @@ module BlacklightUrlHelper
# need this method for rss and atom polymorphic_url(url_for_document(document))
# because polymorphic_url appends any action passed in arg hash to route
# so we need to re-route to the correct url
- def show_solr_document_url doc, options
+ def show_solr_document_url(doc, options)
if options[:controller]
case options[:controller]
- when 'collections'
- collection_url doc
- when 'institutions'
- institution_url doc
+ when 'collections'
+ collection_url doc
+ when 'institutions'
+ institution_url doc
end
else
solr_document_url doc, options
end
+ end
+ # we don't track viewing of institutions or collections
+ def session_tracking_path(document, params = {})
+ return if controller_name == 'institutions' || controller_name == 'collections' || controller_name == 'primary_source_sets'
+
+ super
end
# override to route to collections#show and institutions#show where appropriate
# this uses the older BL 5.14 def as the basis, but don't really need to update to BL6.* model
- def url_for_document doc, options = {}
+ def url_for_document(doc, _options = {})
if respond_to?(:blacklight_config) && doc.respond_to?(:[])
display_type = doc[blacklight_config.show.display_type_field].presence
if display_type == 'Collection' || display_type == 'Institution'
- {controller: display_type.downcase.pluralize, action: :show, id: doc}
+ { controller: display_type.downcase.pluralize, action: :show, id: doc }
else
doc
end
@@ -33,6 +41,5 @@ def url_for_document doc, options = {}
doc
end
end
-
end
end
diff --git a/app/helpers/commonwealth_vlr_engine/catalog_helper.rb b/app/helpers/commonwealth_vlr_engine/catalog_helper.rb
deleted file mode 100644
index a4f11d3c..00000000
--- a/app/helpers/commonwealth_vlr_engine/catalog_helper.rb
+++ /dev/null
@@ -1,427 +0,0 @@
-module CommonwealthVlrEngine
- module CatalogHelper
- include Blacklight::CatalogHelperBehavior
-
- # returns the CC license terms code for use in URLs, etc.
- def cc_terms_code(license)
- license.match(/\s[BYNCDSA-]{2,}/).to_s.strip.downcase
- end
-
- # returns a link to a CC license
- def cc_url(license)
- terms_code = cc_terms_code(license)
- "http://creativecommons.org/licenses/#{terms_code}/3.0"
- end
-
- # return the image url for the collection gallery view document
- # size = pixel length of square IIIF-created image
- def collection_gallery_url document, size
- exemplary_image_pid = document[:exemplary_image_ssi]
- if exemplary_image_pid
- if exemplary_image_pid.match(/oai/) ||
- document['exemplary_image_iiif_bsi'] == false
- datastream_disseminator_url(exemplary_image_pid, 'thumbnail300')
- else
- iiif_image_url(exemplary_image_pid, {region: "square", size: "#{size},"})
- end
- else
- collection_icon_path
- end
- end
-
- def collection_icon_path
- 'commonwealth-vlr-engine/dc_collection-icon.png'
- end
-
- def create_thumb_img_element(document, img_class=[])
- image_classes = img_class.class == Array ? img_class.join(' ') : ''
- image_tag(thumbnail_url(document),
- :alt => document[blacklight_config.index.title_field.to_sym],
- :class => image_classes)
- end
-
- # determine whether to render the 'show more' expand/collapse link in catalog#show metadata display
- def expand_metadata_link?(document)
- keys_to_eval = document.keys
- keys_to_eval.delete('identifier_uri_ss')
- return true if !keys_to_eval.grep(/note/).empty? || !keys_to_eval.grep(/identifier/).empty?
- # other fields, roughly in order of how often they appear in metadata records
- other_expand_fields = %w(lang_term_ssim pubplace_tsim local_accession_id_tsim publisher_tsim subject_scale_tsim
- edition_tsim table_of_contents_tsi classification_tsim related_item_isreferencedby_ssm)
- other_expand_fields.each do |field_key|
- return true if keys_to_eval.include? field_key
- end
- false
- end
-
- def extra_body_classes
- @extra_body_classes ||= ['blacklight-' + controller_name, 'blacklight-' + [controller_name, controller.action_name].join('-')]
- # if this is the home page
- if controller_name == 'pages' && action_name =='home'
- @extra_body_classes.push('blacklight-home')
- else
- @extra_body_classes
- end
- end
-
- def has_image_files? files_hash
- files_hash[:images].present?
- end
-
- def has_video_files? files_hash
- files_hash[:video].present?
- end
-
- def image_file_pids images_hash
- image_file_pids = []
- images_hash.each do |image_file|
- image_file_pids << image_file['id']
- end
- image_file_pids
- end
-
- # render collection name as a link in catalog#index list view
- def index_collection_link options={}
- setup_collection_links(options[:document]).join(' / ').html_safe
- end
-
-
- # render the date in the catalog#index list view
- def index_date_value options={}
- render_mods_dates(options[:document]).first
- end
-
- # render institution name as a link in catalog#index list view
- def index_institution_link options={}
- link_to(options[:value].first,
- institution_path(:id => options[:document][:institution_pid_ssi]))
- end
-
- # render the collection/institution icon if necessary
- def index_relation_base_icon document
- if document[blacklight_config.view_config(document_index_view_type).display_type_field]
- display_type = document[blacklight_config.view_config(document_index_view_type).display_type_field].downcase
- if controller_name == 'catalog' && (display_type == 'collection' || display_type == 'institution')
- image_tag("commonwealth-vlr-engine/dc_#{display_type}-icon.png", alt: "#{display_type} icon", class: "index-title-icon #{display_type}-icon")
- else
- ''
- end
- end
- end
-
- # return the URL of an image to display in the catalog#index slideshow view
- def index_slideshow_img_url document
- if document[:exemplary_image_ssi] && !document[blacklight_config.flagged_field.to_sym]
- if document[blacklight_config.index.display_type_field.to_sym] == 'OAIObject' || document[:exemplary_image_ssi].match(/oai/)
- thumbnail_url(document)
- else
- iiif_image_url(document[:exemplary_image_ssi], {:size => ',500'})
- end
- elsif document[:type_of_resource_ssim]
- render_object_icon_path(document[:type_of_resource_ssim].first)
- elsif document[blacklight_config.index.display_type_field.to_sym] == 'Collection'
- collection_icon_path
- elsif document[blacklight_config.index.display_type_field.to_sym] == 'Institution'
- institution_icon_path
- else
- render_object_icon_path(nil)
- end
- end
-
- # determine the 'truncate' length based on catalog#index view type
- def index_title_length
- case params[:view]
- when 'list'
- 170
- when 'masonry'
- 89
- else
- 130
- end
- end
-
- def institution_icon_path
- 'commonwealth-vlr-engine/dc_institution-icon.png'
- end
-
- # link to items starting with a specific letter
- def link_to_az_value(letter, field, search_path, link_class=nil)
- new_params = params.permit!.except(:controller, :action, :q, :page)
- new_params[:q] = "#{field}:#{letter}*"
- link_to(letter,
- self.send(search_path, new_params),
- class: link_class)
- end
-
- def normalize_date(date)
- if date.length == 10
- Date.parse(date).strftime('%B %-d, %Y')
- elsif date.length == 7
- Date.parse(date + '-01').strftime('%B %Y')
- else
- date
- end
- end
-
- # insert an icon and link to CC licenses
- def render_cc_license(license)
- terms_code = cc_terms_code(license)
- link_to(image_tag("//i.creativecommons.org/l/#{terms_code}/3.0/80x15.png",
- :alt => 'CC ' + terms_code.upcase + ' icon',
- :class => 'cc_license_icon'),
- cc_url(license),
- :rel => 'license',
- :id => 'cc_license_link',
- :target => '_blank')
- end
-
- # render metadata for
subjects from GeoJSON
- def render_hiergo_subject(geojson_feature, separator, separator_class=nil)
- output_array = []
- hiergeo_hash = JSON.parse(geojson_feature).symbolize_keys[:properties]
- hiergeo_hash.each_key do |k|
- if k == 'country' && hiergeo_hash[k] == 'United States'
- # display 'United States' only if no other values
- output_array << link_to_facet(hiergeo_hash[k], 'subject_geographic_ssim') if hiergeo_hash.length == 1
- elsif k == 'county'
- output_array << link_to_facet("#{hiergeo_hash[k]} (county)", 'subject_geographic_ssim')
- elsif k == 'island' || k == 'area' || k == 'province' || k == 'territory' || k == 'region'
- output_array << link_to_facet(hiergeo_hash[k], 'subject_geographic_ssim') + " (#{k.to_s})"
- elsif k == 'other'
- place_type = hiergeo_hash[k].scan(/\([a-z\s]*\)/).last
- place_name = hiergeo_hash[k].gsub(/#{place_type}/,'').gsub(/\s\(\)\z/,'')
- output_array << link_to_facet(place_name, 'subject_geographic_ssim') + " #{place_type.to_s}"
- else
- output_array << link_to_facet(hiergeo_hash[k], 'subject_geographic_ssim')
- end
- end
- output_array.join(content_tag(:span, separator, :class => separator_class)).html_safe
- end
-
- def render_item_breadcrumb(document)
- if document[:collection_pid_ssm]
- setup_collection_links(document).sort.join(' / ').html_safe
- end
- end
-
- # render the 'more like this' search link if doc has subjects
- def render_mlt_search_link(document)
- if document[:subject_facet_ssim] || document[:subject_geo_city_ssim] || document[:related_item_host_ssim]
- content_tag :div, id: 'more_mlt_link_wrapper' do
- link_to t('blacklight.more_like_this.more_mlt_link'),
- search_catalog_path(mlt_id: document.id),
- id: 'more_mlt_link'
- end
- end
- end
-
- # returns an array of properly-formatted date values
- def render_mods_dates (document)
- date_values = []
- document[:date_start_tsim].each_with_index do |start_date,index|
- date_type = document[:date_type_ssm] ? document[:date_type_ssm][index] : nil
- date_qualifier = document[:date_start_qualifier_ssm] ? document[:date_start_qualifier_ssm][index] : nil
- date_end = document[:date_end_tsim] ? document[:date_end_tsim][index] : nil
- date_values << render_mods_date(start_date, date_end, date_qualifier, date_type)
- end
- date_values
- end
-
- # returns a properly-formatted date value as a string
- def render_mods_date (date_start, date_end = nil, date_qualifier = nil, date_type = nil)
- prefix = ''
- suffix = ''
- date_start_suffix = ''
- if date_qualifier && date_qualifier != 'nil'
- prefix = date_qualifier == 'approximate' ? '[ca. ' : '['
- suffix = date_qualifier == 'questionable' ? '?]' : ']'
- end
- prefix << '(c) ' if date_type == 'copyrightDate'
- if date_end && date_end != 'nil'
- date_start_suffix = '?' if date_qualifier == 'questionable'
- prefix + normalize_date(date_start) + date_start_suffix + t('blacklight.metadata_display.date_range_connector') + normalize_date(date_end) + suffix
- else
- prefix + normalize_date(date_start) + suffix
- end
- end
-
- # render reuse_allowed_ssi values for facet display
- def render_reuse(value)
- case value
- when 'no restrictions'
- 'No known restrictions'
- when 'creative commons'
- 'Creative Commons license'
- else
- 'See item for details'
- end
- end
-
- # have to override to display non-typical constraints
- # (e.g. coordinates, mlt, range limit, advanced search)
- # need this until:
- # https://github.com/projectblacklight/blacklight_advanced_search/issues/53
- # https://github.com/projectblacklight/blacklight-maps/issues/84
- # https://github.com/projectblacklight/blacklight_range_limit/issues/49
- # are resolved
- def render_search_to_page_title(params)
- # this is ugly, but easiest way to deal with it; too many gems to try and solve it all here
- if params.respond_to?(:permit!)
- params_for_constraints = params.permit!.to_h
- else
- params_for_constraints = params
- end
-
- html_constraints = render_search_to_s(params_for_constraints).gsub(//,' ')
- html_constraints = html_constraints.gsub(/<\/span>[\s]*/,' / ')
- sanitize(html_constraints, :tags=>[])
-
- ## TODO: remove above and uncomment lines below after all issues have been resolved with
- ## blacklight_advanced_search, blacklight_range_limit, and blacklight-maps
- # constraints = [render_search_to_page_title_mlt(params), super(params)]
- # constraints.reject { |item| item.blank? }.join(' / ')
- end
-
- # TODO: uncomment and write spec after issues identified with render_search_to_page_title resolved
- #def render_search_to_page_title_mlt(params)
- # return "".html_safe if params[:mlt_id].blank?
- # "#{t('blacklight.search.filters.label', :label => t('blacklight.more_like_this.constraint_label'))} #{h(params[:mlt_id])}"
- #end
-
- def render_mods_xml_record(document_id)
- mods_xml_file_path = datastream_disseminator_url(document_id, 'descMetadata')
- mods_response = Typhoeus::Request.get(mods_xml_file_path)
- mods_xml_text = REXML::Document.new(mods_response.body)
- end
-
- # output properly formatted title
- # if full = true, include subtitle, parallel title, etc.
- # if full = false, output with volume info, but no subtitle or parallel title
- def render_title(document, full=true)
- title_output = ''
- if document[blacklight_config.index.title_field.to_sym]
- title_output << document[blacklight_config.index.title_field.to_sym]
- if document[:subtitle_tsim] && full
- title_output << " : #{document[:subtitle_tsim].first}"
- end
- if document[:title_info_partnum_tsi]
- title_output << ". #{document[:title_info_partnum_tsi]}"
- end
- if document[:title_info_partname_tsi]
- title_output << ". #{document[:title_info_partname_tsi]}"
- end
- if document[:title_info_primary_trans_tsim] && full
- document[:title_info_primary_trans_tsim].each do |parallel_title|
- title_output << " = #{parallel_title}"
- end
- end
- else
- title_output << document.id
- end
- regex = /[^\.]\.\.[^\.]/ # double periods, but not ellipsis
- title_output.gsub!(/\.\./, '.') if title_output =~ regex
- title_output.squish
- end
-
- # output properly formatted alternative title
- def render_alt_title(document, index)
- alt_title_output = ''
- alt_title_output << document['title_info_alternative_tsim'][index]
- if document['title_info_alternative_subtitle_tsim'] &&
- document['title_info_alternative_subtitle_tsim'][index].present?
- alt_title_output << " : #{document['title_info_alternative_subtitle_tsim'][index]}"
- end
- alt_title_output
- end
-
- def render_volume_title(document)
- vol_title_info = [document[:title_info_partnum_tsi], document[:title_info_partname_tsi]]
- if vol_title_info[0]
- vol_title_info[1] ? vol_title_info[0].capitalize + ': ' + vol_title_info[1] : vol_title_info[0].capitalize
- elsif vol_title_info[1]
- vol_title_info[1].capitalize
- else
- render_title(document, false)
- end
- end
-
- # creates an array of collection links
- # for display on catalog#index list view and catalog#show breadcrumb
- def setup_collection_links(document, link_class=nil)
- coll_hash = {}
- 0.upto document[:collection_pid_ssm].length-1 do |index|
- coll_hash[document[blacklight_config.collection_field.to_sym][index]] = document[:collection_pid_ssm][index]
- end
- coll_links = []
- coll_hash.sort.each do |coll_array|
- coll_links << link_to(coll_array[0],
- collection_path(:id => coll_array[1]),
- :class => link_class.presence)
- end
- coll_links
- end
-
- # create a list of names and roles to be displayed
- def setup_names_roles(document)
- names = []
- roles = []
- multi_role_indices = []
- name_fields = [document[:name_personal_tsim], document[:name_corporate_tsim], document[:name_generic_tsim]]
- role_fields = [document[:name_personal_role_tsim], document[:name_corporate_role_tsim], document[:name_generic_role_tsim]]
- name_fields.each_with_index do |name_field,name_field_index|
- if name_field
- 0.upto name_field.length-1 do |index|
- names << name_field[index]
- if role_fields[name_field_index] && role_fields[name_field_index][index]
- roles << role_fields[name_field_index][index].strip
- else
- roles << 'Creator'
- end
- end
- end
- end
- roles.each_with_index do |role,index|
- if /[\|]{2}/.match(role)
- multi_roles = role.split('||')
- multi_role_name = names[index]
- multi_role_indices << index
- multi_roles.each { |multi_role| roles << multi_role }
- 0.upto multi_roles.length-1 do
- names << multi_role_name
- end
- end
- end
- unless multi_role_indices.empty?
- multi_role_indices.reverse.each do |index|
- names.delete_at(index)
- roles.delete_at(index)
- end
- end
- return names,roles
- end
-
- def should_autofocus_on_search_box?
- (controller.is_a? Blacklight::Catalog and
- action_name == "index" and
- params[:q].to_s.empty? and
- params[:f].to_s.empty?) or
- (controller.is_a? PagesController and action_name == 'home')
- end
-
- # LOCAL OVERRIDE: don't want to pull thumbnail url from Solr
- def thumbnail_url document
- if document[:exemplary_image_ssi] && !document[blacklight_config.flagged_field.to_sym]
- datastream_disseminator_url(document[:exemplary_image_ssi], 'thumbnail300')
- elsif document[:type_of_resource_ssim]
- render_object_icon_path(document[:type_of_resource_ssim].first)
- elsif document[blacklight_config.index.display_type_field.to_sym] == 'Collection'
- collection_icon_path
- elsif document[blacklight_config.index.display_type_field.to_sym] == 'Institution'
- institution_icon_path
- else
- render_object_icon_path(nil)
- end
- end
-
- end
-end
diff --git a/app/helpers/commonwealth_vlr_engine/catalog_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/catalog_helper_behavior.rb
new file mode 100644
index 00000000..675f0407
--- /dev/null
+++ b/app/helpers/commonwealth_vlr_engine/catalog_helper_behavior.rb
@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+module CommonwealthVlrEngine
+ module CatalogHelperBehavior
+ include CommonwealthVlrEngine::SearchHistoryConstraintsHelperBehavior
+ include CommonwealthVlrEngine::RenderConstraintsHelperBehavior
+ include CommonwealthVlrEngine::ImagesHelperBehavior
+ include CommonwealthVlrEngine::LicenseHelperBehavior
+ include CommonwealthVlrEngine::MetadataHelperBehavior
+ include CommonwealthVlrEngine::FlaggedHelperBehavior
+
+ def has_image_files? files_hash
+ files_hash[:images].present?
+ end
+
+ def has_video_files? files_hash
+ files_hash[:video].present?
+ end
+
+ def image_file_pids images_hash
+ image_file_pids = []
+ images_hash.each do |image_file|
+ image_file_pids << image_file['id']
+ end
+ image_file_pids
+ end
+
+ # render collection name as a link in catalog#index list view
+ def index_collection_link(options = {})
+ setup_collection_links(options[:document]).join(' / ').html_safe
+ end
+
+ # render institution name as a link in catalog#index list view
+ def index_institution_link(options = {})
+ link_to(options[:value].first,
+ institution_path(id: options[:document][:institution_pid_ssi]))
+ end
+
+ # determine the 'truncate' length based on catalog#index view type
+ def index_title_length
+ case params[:view]
+ when 'list'
+ 170
+ when 'masonry'
+ 89
+ else
+ 130
+ end
+ end
+
+ def insert_opengraph_markup
+ return unless controller_name == 'catalog' && action_name == 'show'
+
+ content_for(:head) do
+ render partial: '/catalog/opengraph', locals: { document: @document }
+ end
+ end
+
+ # link to items starting with a specific letter
+ def link_to_az_value(letter, field, search_path, link_class = nil)
+ new_params = params.permit!.except(:controller, :action, :q, :page)
+ new_params[:q] = "#{field}:#{letter}*"
+ link_to(letter,
+ self.send(search_path, new_params),
+ class: link_class)
+ end
+
+ def render_item_breadcrumb(document, link_class = nil)
+ setup_collection_links(document, link_class).sort.join(' / ').html_safe if document[:collection_pid_ssm]
+ end
+
+ # render the 'more like this' search link if doc has subjects
+ def render_mlt_search_link(document)
+ return unless document[:subject_facet_ssim] || document[:subject_geo_city_ssim] || document[:related_item_host_ssim]
+
+ content_tag :div, id: 'more_mlt_link_wrapper' do
+ link_to t('blacklight.more_like_this.more_mlt_link'),
+ search_catalog_path(mlt_id: document.id),
+ id: 'more_mlt_link'
+ end
+ end
+
+ # have to override to display non-typical constraints
+ # (e.g. coordinates, mlt, range limit, advanced search)
+ # need this until:
+ # https://github.com/projectblacklight/blacklight_advanced_search/issues/53
+ # https://github.com/projectblacklight/blacklight-maps/issues/84
+ # https://github.com/projectblacklight/blacklight_range_limit/issues/49
+ # are resolved
+ def render_search_to_page_title(params)
+ # this is ugly, but easiest way to deal with it; too many gems to try and solve it all here
+ if params.respond_to?(:permit!)
+ params_for_constraints = params.permit!.to_h
+ else
+ params_for_constraints = params
+ end
+
+ html_constraints = render_search_to_s(params_for_constraints).gsub(//, ' ')
+ html_constraints = html_constraints.gsub(/<\/span>[\s]*/, ' / ')
+ sanitize(html_constraints, tags: [])
+
+ ## TODO: remove above and uncomment lines below after all issues have been resolved with
+ ## blacklight_advanced_search, blacklight_range_limit, and blacklight-maps
+ # constraints = [render_search_to_page_title_mlt(params), super(params)]
+ # constraints.reject { |item| item.blank? }.join(' / ')
+ end
+
+ # TODO: uncomment and write spec after issues identified with render_search_to_page_title resolved
+ # def render_search_to_page_title_mlt(params)
+ # return "".html_safe if params[:mlt_id].blank?
+ # "#{t('blacklight.search.filters.label', :label => t('blacklight.more_like_this.constraint_label'))} #{h
+ # (params[:mlt_id])}"
+ # end
+
+ # creates an array of collection links
+ # for display on catalog#index list view and catalog#show breadcrumb
+ def setup_collection_links(document, link_class = nil)
+ coll_hash = {}
+ 0.upto(document[:collection_pid_ssm].length - 1) do |index|
+ coll_hash[document[blacklight_config.collection_field.to_sym][index]] = document[:collection_pid_ssm][index]
+ end
+ coll_links = []
+ coll_hash.sort.each do |coll_array|
+ coll_links << link_to(coll_array[0],
+ collection_path(id: coll_array[1]),
+ class: link_class.presence)
+ end
+ coll_links
+ end
+ end
+end
diff --git a/app/helpers/commonwealth_vlr_engine/collections_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/collections_helper_behavior.rb
index 7560cd1a..d8dab5ea 100644
--- a/app/helpers/commonwealth_vlr_engine/collections_helper_behavior.rb
+++ b/app/helpers/commonwealth_vlr_engine/collections_helper_behavior.rb
@@ -1,52 +1,67 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module CollectionsHelperBehavior
-
# link to view all items in a collection
- def link_to_all_col_items(col_title, institution_name=nil, link_class)
- facet_params = {blacklight_config.collection_field => [col_title]}
+ def link_to_all_col_items(col_title, institution_name = nil, link_class)
+ facet_params = { blacklight_config.collection_field => [col_title] }
facet_params[blacklight_config.institution_field] = institution_name if institution_name
link_to(t('blacklight.collections.browse.all'),
- search_catalog_path(:f => facet_params),
- :class => link_class)
+ search_catalog_path(f: facet_params),
+ class: link_class)
end
# render the image and caption on collections#show page
- # depends on 2 instance var set by CollectionsControllerBehavior:
- # @collection_image_pid [String] = the collection image id
+ # depends on instance var set by CollectionsControllerBehavior:
# @collection_image_info [Hash] = hash of relevant image parent item info
def render_collection_image(image_tag_class = nil)
- if @collection_image_pid && @collection_image_info
+ if @collection_image_info
image_title = @collection_image_info[:title]
- if @collection_image_pid.match(/oai/) || @collection_image_info[:access_master] == false
- image_url = datastream_disseminator_url(@collection_image_pid, 'thumbnail300')
+ hosted = @collection_image_info[:image_pid].match?(/oai/) ? false : true
+ if !hosted || @collection_image_info[:access_master] == false
+ image_url = datastream_disseminator_url(@collection_image_info[:image_pid], 'thumbnail300')
else
- image_url = collection_image_url(@collection_image_pid)
+ image_url = collection_image_url(@collection_image_info[:image_pid])
end
- render 'collection_image',
- {image_element: image_tag(image_url,
- :alt => image_title,
- :class => image_tag_class),
- image_title: image_title}
+ render partial: 'collection_image',
+ locals: { image_element: image_tag(image_url, alt: image_title,
+ class: image_tag_class),
+ image_title: image_title,
+ hosted: hosted }
else
image_tag(collection_icon_path,
- :alt => @collection_title,
- :class => image_tag_class)
+ alt: @collection_title,
+ class: image_tag_class)
end
end
# the IIIF URL for the image to be displayed on collections#show
- # if the image is too wide or narrow, return a square
- def collection_image_url(image_pid)
+ # preferred dimensions: 1100 width, 450 height
+ def collection_image_url(image_pid, target_width = 1100, target_height = 450)
image_info = get_image_metadata(image_pid)
- aspect = image_info[:aspect_ratio]
- region = (aspect > 1.67 || aspect < 0.33) ? 'square' : 'full'
- iiif_image_url(image_pid, {region: region, size: '600,'})
+ output_aspect = target_width.to_f / target_height.to_f
+ if image_info[:aspect_ratio] > output_aspect
+ top = 0
+ height = image_info[:height]
+ width = (height * output_aspect).round
+ else
+ width = (image_info[:width].to_f * 0.90).round # 90% so we don't get borders
+ reduction_percent = (target_width.to_f / width.to_f).round(3)
+ height = (target_height / reduction_percent).round
+ top = (image_info[:height] - height) / 2
+ end
+ left = (image_info[:width] - width) / 2
+ region = "#{left},#{top},#{width},#{height}"
+ iiif_image_url(image_pid, { region: region, size: "#{target_width}," })
+ end
+
+ def hosted_collection_class(document)
+ document[:id].match?(/oai/) ? 'harvested-collection' : 'hosted-collection'
end
# whether the A-Z link menu should be displayed in collections#index
def should_render_col_az?
false
end
-
end
-end
\ No newline at end of file
+end
diff --git a/app/helpers/commonwealth_vlr_engine/downloads_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/downloads_helper_behavior.rb
index dbc7b2c9..125bfd9a 100644
--- a/app/helpers/commonwealth_vlr_engine/downloads_helper_behavior.rb
+++ b/app/helpers/commonwealth_vlr_engine/downloads_helper_behavior.rb
@@ -1,16 +1,15 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module DownloadsHelperBehavior
-
# create an array of download links
# images/video have to be handled separately since there are multiple sizes
def create_download_links(document, files_hash)
download_links = []
- if has_downloadable_images?(document, files_hash)
- download_links.concat(image_download_links(document, files_hash[:images]))
- end
- if has_downloadable_video?(document, files_hash)
- download_links.concat(video_download_links(document, files_hash[:video]))
- end
+ download_links.concat(image_download_links(document,
+ files_hash[:images])) if has_downloadable_images?(document, files_hash)
+ download_links.concat(video_download_links(document,
+ files_hash[:video])) if has_downloadable_video?(document, files_hash)
download_links.concat(other_download_links(document, files_hash))
download_links
end
@@ -20,15 +19,15 @@ def download_link_class
end
def download_link_options
- { class: download_link_class, rel: 'nofollow', data: { ajax_modal: 'trigger' } }
+ { class: download_link_class, rel: 'nofollow', data: { blacklight_modal: 'trigger' } }
end
- def download_link_title(document, object_profile, datastream_id=nil)
- if !object_profile || (document[:has_model_ssim].include? "info:fedora/afmodel:Bplmodels_ImageFile")
+ def download_link_title(document, object_profile, datastream_id = nil)
+ if !object_profile || (document[:has_model_ssim].include? 'info:fedora/afmodel:Bplmodels_ImageFile')
link_title = t("blacklight.downloads.images.#{datastream_id}")
else
- file_name_ext = object_profile["objLabel"].split('.')
- if document[:identifier_ia_id_ssi] || (document[:active_fedora_model_ssi] == "Bplmodels::EreaderFile")
+ file_name_ext = object_profile['objLabel'].split('.')
+ if document[:identifier_ia_id_ssi] || (document[:active_fedora_model_ssi] == 'Bplmodels::EreaderFile')
link_title = ia_download_title(file_name_ext[1])
else
link_title = file_name_ext[0]
@@ -70,7 +69,7 @@ def image_datastreams(object_profile_json)
image_datastreams = []
stored_datastreams = %w(productionMaster access800 georectifiedMaster)
stored_datastreams.each do |datastream_id|
- image_datastreams << datastream_id unless object_profile_json["datastreams"][datastream_id].blank?
+ image_datastreams << datastream_id if object_profile_json['datastreams'][datastream_id].present?
end
image_datastreams.insert(1, 'accessFull')
end
@@ -78,7 +77,7 @@ def image_datastreams(object_profile_json)
def image_download_links(document, image_files)
if document[:identifier_ia_id_ssi]
[file_download_link(document[:id],
- t("blacklight.downloads.images.accessFull"),
+ t('blacklight.downloads.images.accessFull'),
nil,
'JPEG2000',
download_link_options)]
@@ -136,7 +135,7 @@ def license_allows_download?(document)
document[:license_ssm].to_s =~ /(Creative Commons|No known restrictions)/
end
- def file_download_link(object_pid, link_title, object_profile_json, datastream_id, link_options={})
+ def file_download_link(object_pid, link_title, object_profile_json, datastream_id, link_options = {})
link_to(link_title,
download_path(object_pid, datastream_id: datastream_id),
link_options) + content_tag(:span,
@@ -148,13 +147,12 @@ def file_type_string(datastream_id, object_profile_json)
if object_profile_json
file_type_string = if datastream_id == 'accessFull' || datastream_id == 'access800'
'JPEG'
- elsif object_profile_json["datastreams"][datastream_id]["dsMIME"]
- object_profile_json["datastreams"][datastream_id]["dsMIME"].split('/')[1].upcase
+ elsif object_profile_json['datastreams'][datastream_id]['dsMIME']
+ object_profile_json['datastreams'][datastream_id]['dsMIME'].split('/')[1].upcase
else
- object_profile_json["objLabel"].split('.')[1].upcase
- end
- file_type_string.gsub!(/TIFF/, 'TIF')
- file_type_string << ', multi-file ZIP' if object_profile_json["zip"]
+ object_profile_json['objLabel'].split('.')[1].upcase
+ end.gsub(/TIFF/, 'TIF')
+ file_type_string += ', multi-file ZIP' if object_profile_json['zip']
else
file_type_string = case datastream_id
when 'productionMaster'
@@ -171,36 +169,34 @@ def file_type_string(datastream_id, object_profile_json)
def file_size_string(datastream_id, object_profile_json)
if object_profile_json
if datastream_id == 'accessFull'
- file_size_string = '~' +
- number_to_human_size((object_profile_json["datastreams"]["productionMaster"]["dsSize"] * 0.083969078))
+ number_to_human_size((object_profile_json['datastreams']['productionMaster']['dsSize'] * 0.083969078))
else
- file_size_string = number_to_human_size(object_profile_json["datastreams"][datastream_id]["dsSize"])
- file_size_string.insert(0,'~') if object_profile_json["zip"]
+ number_to_human_size(object_profile_json['datastreams'][datastream_id]['dsSize'])
end
else
- file_size_string = 'multi-file ZIP'
+ 'multi-file ZIP'
end
- file_size_string
end
def public_domain?(document)
pubdom_regex = /[Pp]ublic domain/
(document[:date_end_dtsi] && document[:date_end_dtsi][0..3].to_i < 1923) ||
document[:rights_ssm].to_s =~ pubdom_regex ||
- document[:license_ssm].to_s =~ pubdom_regex
+ document[:license_ssm].to_s =~ pubdom_regex ||
+ document[:rightsstatement_ss] == 'No Copyright - United States'
end
# create a composite object_profile_json object from multiple file objects
# used to display size of ZIP archive
def setup_zip_object_profile(image_files, datastream_id)
datastream_id_to_use = datastream_id == 'accessFull' ? 'productionMaster' : datastream_id
- object_profile = {zip: true,
- objLabel: datastream_id == 'productionMaster' ? '.TIF' : '.JPEG',
- datastreams: {datastream_id_to_use.to_sym => {}}}
+ object_profile = { zip: true,
+ objLabel: datastream_id == 'productionMaster' ? '.TIF' : '.JPEG',
+ datastreams: { datastream_id_to_use.to_sym => {} } }
zip_size = 0
image_files.each do |image_file|
img_object_profile_json = JSON.parse(image_file['object_profile_ssm'].first)
- zip_size += img_object_profile_json["datastreams"][datastream_id_to_use]["dsSize"]
+ zip_size += img_object_profile_json['datastreams'][datastream_id_to_use]['dsSize']
end
# estimate compression, pretty rough
zip_size = case datastream_id
@@ -222,6 +218,5 @@ def url_for_download(document, datastream_id)
trigger_downloads_path(document.id, datastream_id: datastream_id)
end
end
-
end
end
diff --git a/app/helpers/commonwealth_vlr_engine/facets_helper.rb b/app/helpers/commonwealth_vlr_engine/facets_helper.rb
index b0b369f5..bcf47f39 100644
--- a/app/helpers/commonwealth_vlr_engine/facets_helper.rb
+++ b/app/helpers/commonwealth_vlr_engine/facets_helper.rb
@@ -1,4 +1,5 @@
# frozen_string_literal: true
+
module CommonwealthVlrEngine
module FacetsHelper
include Blacklight::FacetsHelperBehavior
@@ -10,13 +11,12 @@ def render_facet_item(facet_field, item)
return if controller.controller_name == 'collections' &&
(controller.action_name == 'index' || controller.action_name == 'facet') &&
item.value == 'Collections'
- if facet_in_params?(facet_field, item.value )
+
+ if facet_in_params?(facet_field, item.value)
render_selected_facet_value(facet_field, item)
else
render_facet_value(facet_field, item)
end
end
-
end
-
-end
\ No newline at end of file
+end
diff --git a/app/helpers/commonwealth_vlr_engine/feedback_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/feedback_helper_behavior.rb
index a3b5ec9e..e64dce75 100644
--- a/app/helpers/commonwealth_vlr_engine/feedback_helper_behavior.rb
+++ b/app/helpers/commonwealth_vlr_engine/feedback_helper_behavior.rb
@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module FeedbackHelperBehavior
-
# returns an array of values for the message type select dropdown
def feedback_type_options
options_for_type_dropdown = []
@@ -9,6 +10,5 @@ def feedback_type_options
end
options_for_type_dropdown
end
-
end
end
\ No newline at end of file
diff --git a/app/helpers/commonwealth_vlr_engine/flagged_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/flagged_helper_behavior.rb
new file mode 100644
index 00000000..6850e94c
--- /dev/null
+++ b/app/helpers/commonwealth_vlr_engine/flagged_helper_behavior.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module CommonwealthVlrEngine
+ module FlaggedHelperBehavior
+ # return the correct name of the institution to link to for OAI objects
+ def show_explicit_warning?(document)
+ document[blacklight_config.flagged_field.to_sym] == 'explicit'
+ end
+
+ # return the correct name of the institution to link to for OAI objects
+ def show_content_warning?(document)
+ document[blacklight_config.flagged_field.to_sym] == 'offensive'
+ end
+ end
+end
diff --git a/app/helpers/commonwealth_vlr_engine/folders_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/folders_helper_behavior.rb
deleted file mode 100644
index d2cfab93..00000000
--- a/app/helpers/commonwealth_vlr_engine/folders_helper_behavior.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module CommonwealthVlrEngine
- module FoldersHelperBehavior
-
- def folder_belongs_to_user
- current_or_guest_user.folders.include? @folder
- end
-
- end
-end
\ No newline at end of file
diff --git a/app/helpers/commonwealth_vlr_engine/image_viewer_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/image_viewer_helper_behavior.rb
deleted file mode 100644
index 3867f47c..00000000
--- a/app/helpers/commonwealth_vlr_engine/image_viewer_helper_behavior.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module CommonwealthVlrEngine
- module ImageViewerHelperBehavior
-
- # return id for the book object, or parent book if @document is a volume
- def book_id(document)
- if document[:is_volume_of_ssim]
- document[:is_volume_of_ssim].first.gsub(/info:fedora\//,'')
- else
- document.id
- end
- end
-
- end
-end
\ No newline at end of file
diff --git a/app/helpers/commonwealth_vlr_engine/images_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/images_helper_behavior.rb
new file mode 100644
index 00000000..530c5882
--- /dev/null
+++ b/app/helpers/commonwealth_vlr_engine/images_helper_behavior.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+# methods related to rendering images, thumbnails, icons, etc.
+module CommonwealthVlrEngine
+ module ImagesHelperBehavior
+ # return the image url for the collection gallery view document
+ # size = pixel length of square IIIF-created image
+ def collection_gallery_url(document, size)
+ exemplary_image_pid = document[:exemplary_image_ssi]
+ if exemplary_image_pid
+ if exemplary_image_pid.match(/oai/) ||
+ document['exemplary_image_iiif_bsi'] == false
+ datastream_disseminator_url(exemplary_image_pid, 'thumbnail300')
+ else
+ iiif_image_url(exemplary_image_pid, { region: 'square', size: "#{size}," })
+ end
+ else
+ collection_icon_path
+ end
+ end
+
+ def collection_icon_path
+ asset_path('commonwealth-vlr-engine/dc_collection-icon.png')
+ end
+
+ def create_thumb_img_element(document, img_class = [])
+ image_classes = img_class.class == Array ? img_class.join(' ') : ''
+ image_tag(thumbnail_url(document),
+ alt: document[blacklight_config.index.title_field.to_sym],
+ class: image_classes)
+ end
+
+ # render the collection/institution icon if necessary
+ def index_relation_base_icon document
+ return unless document[blacklight_config.view_config(document_index_view_type).display_type_field]
+
+ display_type = document[blacklight_config.view_config(document_index_view_type).display_type_field].downcase
+ if controller_name == 'catalog' && (display_type == 'collection' || display_type == 'institution')
+ image_tag("commonwealth-vlr-engine/dc_#{display_type}-icon.png", alt: "#{display_type} icon", class: "index-title-icon #{display_type}-icon")
+ else
+ ''
+ end
+ end
+
+ # return the URL of an image to display in the catalog#index slideshow view
+ def index_slideshow_img_url(document)
+ if document[:exemplary_image_ssi] && document[blacklight_config.flagged_field.to_sym] != 'explicit'
+ if document[blacklight_config.index.display_type_field.to_sym] == 'OAIObject' || document[:exemplary_image_ssi].match(/oai/)
+ thumbnail_url(document)
+ else
+ iiif_image_url(document[:exemplary_image_ssi], { size: ',500' })
+ end
+ elsif document[:type_of_resource_ssim]
+ render_object_icon_path(document[:type_of_resource_ssim].first)
+ elsif document[blacklight_config.index.display_type_field.to_sym] == 'Collection'
+ collection_icon_path
+ elsif document[blacklight_config.index.display_type_field.to_sym] == 'Institution'
+ institution_icon_path
+ else
+ render_object_icon_path(nil)
+ end
+ end
+
+ def institution_icon_path
+ asset_path('commonwealth-vlr-engine/dc_institution-icon.png')
+ end
+
+ # override Blacklight::CatalogHelperBehavior: don't want to pull thumbnail url from Solr
+ def thumbnail_url(document)
+ if document[:exemplary_image_ssi] && document[blacklight_config.flagged_field.to_sym] != 'explicit'
+ datastream_disseminator_url(document[:exemplary_image_ssi], 'thumbnail300')
+ elsif document[:type_of_resource_ssim]
+ render_object_icon_path(document[:type_of_resource_ssim].first)
+ elsif document[blacklight_config.index.display_type_field.to_sym] == 'Collection'
+ collection_icon_path
+ elsif document[blacklight_config.index.display_type_field.to_sym] == 'Institution'
+ institution_icon_path
+ else
+ render_object_icon_path(nil)
+ end
+ end
+ end
+end
diff --git a/app/helpers/commonwealth_vlr_engine/institutions_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/institutions_helper_behavior.rb
index d71b1121..26ca021d 100644
--- a/app/helpers/commonwealth_vlr_engine/institutions_helper_behavior.rb
+++ b/app/helpers/commonwealth_vlr_engine/institutions_helper_behavior.rb
@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module InstitutionsHelperBehavior
-
# link to view all items from an institution
def link_to_all_inst_items(link_class)
link_to(t('blacklight.institutions.browse.all'),
- search_catalog_path(:f => {blacklight_config.institution_field => [@institution_title]}),
- :class => link_class)
+ search_catalog_path(f: { blacklight_config.institution_field => [@institution_title] }),
+ class: link_class)
end
# render the institution description, truncating w/'more' link if more than 2 paragraphs
@@ -13,21 +14,20 @@ def link_to_all_inst_items(link_class)
def render_institution_desc(abstract)
desc_content = []
# double quotes in #delete arg below are correct, DO NOT CHANGE
- abstract.map! { |v| v.delete("\n").delete("\r").gsub(//,'
').split('
') }.flatten!
+ abstract.map! { |v| v.delete("\n").delete("\r").gsub(//, '
').split('
') }.flatten!
desc_content << content_tag(:div,
abstract[0..1].join('
').html_safe,
id: 'institution_desc_static',
class: 'institution_desc institution_desc_inline')
if abstract.length > 2
desc_content << content_tag(:div,
- "#{abstract[2..abstract.length-1].join('
')}".html_safe,
+ abstract[2..(abstract.length - 1)].join('
').html_safe,
id: 'institution_desc_collapse',
class: 'collapse institution_desc')
desc_content << link_to(t('blacklight.institutions.description.more'),
'#institution_desc_collapse',
- data: {toggle: 'collapse'},
- 'aria-expanded' => 'false',
- 'aria-controls' => '#institution_desc_collapse',
+ data: { toggle: 'collapse' },
+ aria: { expanded: 'false', controls: '#institution_desc_collapse' },
class: 'institution_desc_expand js-controls')
end
desc_content.join('').html_safe
@@ -35,13 +35,13 @@ def render_institution_desc(abstract)
# replaces render_document_index in institutions/index partial
# so we can use local index_map_institutions partial for map view
- def render_institutions_index documents = nil, locals = {}
+ def render_institutions_index(documents = nil, locals = {})
documents ||= @document_list
if document_index_view_type.to_s == 'maps'
- render :partial => 'catalog/index_mapview_institutions',
- :locals => {:geojson_features => serialize_geojson(map_facet_values,
- nil,
- {partial: 'institutions/map_institutions_search'})}
+ render partial: 'catalog/index_mapview_institutions',
+ locals: { geojson_features: serialize_geojson(map_facet_values,
+ 'index',
+ { partial: 'institutions/map_institutions_search' }) }
else
render_document_index_with_view(document_index_view_type, documents, locals)
end
@@ -51,6 +51,5 @@ def render_institutions_index documents = nil, locals = {}
def should_render_inst_az?
false
end
-
end
-end
\ No newline at end of file
+end
diff --git a/app/helpers/commonwealth_vlr_engine/layout_helper.rb b/app/helpers/commonwealth_vlr_engine/layout_helper.rb
index 2e5d8d82..171528e2 100644
--- a/app/helpers/commonwealth_vlr_engine/layout_helper.rb
+++ b/app/helpers/commonwealth_vlr_engine/layout_helper.rb
@@ -1,11 +1,9 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module LayoutHelper
include Blacklight::LayoutHelperBehavior
- def main_content_classes
- 'col-sm-9'
- end
-
def show_content_classes
'col-sm-12 show-document'
end
@@ -13,10 +11,5 @@ def show_content_classes
def show_sidebar_classes
'col-sm-4'
end
-
- def sidebar_classes
- 'col-sm-3'
- end
-
end
end
diff --git a/app/helpers/commonwealth_vlr_engine/license_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/license_helper_behavior.rb
new file mode 100644
index 00000000..de9dd2eb
--- /dev/null
+++ b/app/helpers/commonwealth_vlr_engine/license_helper_behavior.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# methods related to rendering license values
+module CommonwealthVlrEngine
+ module LicenseHelperBehavior
+ # returns the CC license terms code for use in URLs, etc.
+ def cc_terms_code(license)
+ license.match(/\s[BYNCDSA-]{2,}/).to_s.strip.downcase
+ end
+
+ # returns a link to a CC license
+ def cc_url(license)
+ terms_code = cc_terms_code(license)
+ "http://creativecommons.org/licenses/#{terms_code}/4.0"
+ end
+
+ # insert an icon and link to CC licenses
+ def render_cc_license(license)
+ terms_code = cc_terms_code(license)
+ link_to(image_tag("//i.creativecommons.org/l/#{terms_code}/4.0/80x15.png",
+ alt: 'CC ' + terms_code.upcase + ' icon',
+ class: 'cc_license_icon'),
+ cc_url(license),
+ rel: 'license',
+ id: 'cc_license_link',
+ target: '_blank')
+ end
+
+ # render reuse_allowed_ssi values for facet display
+ def render_reuse(value)
+ case value
+ when 'no restrictions'
+ 'No known restrictions'
+ when 'creative commons'
+ 'Creative Commons license'
+ else
+ 'See item for details'
+ end
+ end
+ end
+end
diff --git a/app/helpers/commonwealth_vlr_engine/metadata_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/metadata_helper_behavior.rb
new file mode 100644
index 00000000..2b0328f1
--- /dev/null
+++ b/app/helpers/commonwealth_vlr_engine/metadata_helper_behavior.rb
@@ -0,0 +1,168 @@
+# frozen_string_literal: true
+
+# methods related to rendering metadata values
+module CommonwealthVlrEngine
+ module MetadataHelperBehavior
+ # determine whether to render the 'show more' expand/collapse link in catalog#show metadata display
+ def expand_metadata_link?(document)
+ keys_to_eval = document.keys
+ keys_to_eval.delete('identifier_uri_ss')
+ return true if !keys_to_eval.grep(/note/).empty? || !keys_to_eval.grep(/identifier/).empty?
+
+ # other fields, roughly in order of how often they appear in metadata records
+ other_expand_fields = %w(lang_term_ssim pubplace_tsim local_accession_id_tsim publisher_tsim subject_scale_tsim
+ edition_tsim table_of_contents_tsi classification_tsim related_item_isreferencedby_ssm)
+ other_expand_fields.each do |field_key|
+ return true if keys_to_eval.include? field_key
+ end
+ false
+ end
+
+ # render the date in the catalog#index list view
+ def index_date_value(options = {})
+ render_mods_dates(options[:document]).first
+ end
+
+ def normalize_date(date)
+ if date.length == 10
+ Date.parse(date).strftime('%B %-d, %Y')
+ elsif date.length == 7
+ Date.parse(date + '-01').strftime('%B %Y')
+ else
+ date
+ end
+ end
+
+ # render metadata for subjects from GeoJSON
+ def render_hiergo_subject(geojson_feature, separator, separator_class = nil)
+ output_array = []
+ hiergeo_hash = JSON.parse(geojson_feature).symbolize_keys[:properties]
+ hiergeo_hash.each_key do |k|
+ if k == 'country' && hiergeo_hash[k] == 'United States'
+ # display 'United States' only if no other values
+ output_array << link_to_facet(hiergeo_hash[k], 'subject_geographic_ssim') if hiergeo_hash.length == 1
+ elsif k == 'county'
+ output_array << link_to_facet("#{hiergeo_hash[k]} (county)", 'subject_geographic_ssim')
+ elsif k == 'island' || k == 'area' || k == 'province' || k == 'territory' || k == 'region'
+ output_array << link_to_facet(hiergeo_hash[k], 'subject_geographic_ssim') + " (#{k})"
+ elsif k == 'other'
+ place_type = hiergeo_hash[k].scan(/\([a-z\s]*\)/).last
+ place_name = hiergeo_hash[k].gsub(/#{place_type}/, '').gsub(/\s\(\)\z/, '')
+ output_array << link_to_facet(place_name, 'subject_geographic_ssim') + " #{place_type}"
+ else
+ output_array << link_to_facet(hiergeo_hash[k], 'subject_geographic_ssim')
+ end
+ end
+ output_array.join(content_tag(:span, separator, :class => separator_class)).html_safe
+ end
+
+ # returns an array of properly-formatted date values
+ def render_mods_dates (document)
+ date_values = []
+ document[:date_start_tsim].each_with_index do |start_date, index|
+ date_type = document[:date_type_ssm] ? document[:date_type_ssm][index] : nil
+ date_qualifier = document[:date_start_qualifier_ssm] ? document[:date_start_qualifier_ssm][index] : nil
+ date_end = document[:date_end_tsim] ? document[:date_end_tsim][index] : nil
+ date_values << render_mods_date(start_date, date_end, date_qualifier, date_type)
+ end
+ date_values
+ end
+
+ # returns a properly-formatted date value as a string
+ def render_mods_date (date_start, date_end = nil, date_qualifier = nil, date_type = nil)
+ prefix = ''
+ suffix = ''
+ date_start_suffix = ''
+ if date_qualifier && date_qualifier != 'nil'
+ prefix = date_qualifier == 'approximate' ? '[ca. ' : '['
+ suffix = date_qualifier == 'questionable' ? '?]' : ']'
+ end
+ prefix += '(c) ' if date_type == 'copyrightDate'
+ if date_end && date_end != 'nil'
+ date_start_suffix = '?' if date_qualifier == 'questionable'
+ prefix + normalize_date(date_start) + date_start_suffix + t('blacklight.metadata_display.date_range_connector') + normalize_date(date_end) + suffix
+ else
+ prefix + normalize_date(date_start) + suffix
+ end
+ end
+
+ # output properly formatted title
+ # if full = true, include subtitle, parallel title, etc.
+ # if full = false, output with volume info, but no subtitle or parallel title
+ def render_title(document, full = true)
+ title_output = ''
+ if document[blacklight_config.index.title_field.to_sym]
+ title_output += document[blacklight_config.index.title_field.to_sym]
+ title_output += " : #{document[:subtitle_tsim].first}" if document[:subtitle_tsim] && full
+ title_output += ". #{document[:title_info_partnum_tsi]}" if document[:title_info_partnum_tsi]
+ title_output += ". #{document[:title_info_partname_tsi]}" if document[:title_info_partname_tsi]
+ if document[:title_info_primary_trans_tsim] && full
+ document[:title_info_primary_trans_tsim].each do |parallel_title|
+ title_output += " = #{parallel_title}"
+ end
+ end
+ else
+ title_output = document.id
+ end
+ regex = /[^\.]\.\.[^\.]/ # double periods, but not ellipsis
+ title_output.gsub!(/\.\./, '.') if title_output.match?(regex)
+ title_output.squish
+ end
+
+ # output properly formatted alternative title
+ def render_alt_title(document, index)
+ alt_title_output = ''
+ alt_title_output += document['title_info_alternative_tsim'][index]
+ if document['title_info_alternative_subtitle_tsim'] &&
+ document['title_info_alternative_subtitle_tsim'][index].present?
+ alt_title_output += " : #{document['title_info_alternative_subtitle_tsim'][index]}"
+ end
+ alt_title_output
+ end
+
+ def render_mods_xml_record(document_id)
+ mods_xml_file_path = datastream_disseminator_url(document_id, 'descMetadata')
+ mods_response = Typhoeus::Request.get(mods_xml_file_path)
+ REXML::Document.new(mods_response.body)
+ end
+
+ # create a list of names and roles to be displayed
+ def setup_names_roles(document)
+ names = []
+ roles = []
+ multi_role_indices = []
+ name_fields = [document[:name_personal_tsim], document[:name_corporate_tsim], document[:name_generic_tsim]]
+ role_fields = [document[:name_personal_role_tsim], document[:name_corporate_role_tsim], document[:name_generic_role_tsim]]
+ name_fields.each_with_index do |name_field, name_field_index|
+ next unless name_field
+
+ 0.upto(name_field.length - 1) do |index|
+ names << name_field[index]
+ if role_fields[name_field_index] && role_fields[name_field_index][index]
+ roles << role_fields[name_field_index][index].strip
+ else
+ roles << 'Creator'
+ end
+ end
+ end
+ roles.each_with_index do |role, index|
+ next unless role.match?(/[\|]{2}/)
+
+ multi_roles = role.split('||')
+ multi_role_name = names[index]
+ multi_role_indices << index
+ multi_roles.each { |multi_role| roles << multi_role }
+ 0.upto(multi_roles.length - 1) do
+ names << multi_role_name
+ end
+ end
+ unless multi_role_indices.empty?
+ multi_role_indices.reverse_each do |index|
+ names.delete_at(index)
+ roles.delete_at(index)
+ end
+ end
+ [names, roles]
+ end
+ end
+end
diff --git a/app/helpers/commonwealth_vlr_engine/oai_item_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/oai_item_helper_behavior.rb
index ef6fcfd9..64f8d09c 100644
--- a/app/helpers/commonwealth_vlr_engine/oai_item_helper_behavior.rb
+++ b/app/helpers/commonwealth_vlr_engine/oai_item_helper_behavior.rb
@@ -1,28 +1,25 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module OaiItemHelperBehavior
-
# return the correct name of the institution to link to for OAI objects
def oai_inst_name(document)
- if document[blacklight_config.institution_field.to_sym]
- document[blacklight_config.institution_field.to_sym].first
- else
- t('blacklight.oai_objects.default_inst_name')
- end
+ document[blacklight_config.institution_field.to_sym]&.first || t('blacklight.oai_objects.default_inst_name')
end
# return the text for a link to an OAI item
def oai_link_text(document)
if document[:type_of_resource_ssim]
types = document[:type_of_resource_ssim].join(' ')
- if types =~ /text/
+ if types.match?(/text/)
t('blacklight.oai_objects.link_to_item.generic', institution_name: oai_inst_name(document))
- elsif types =~ /carto/
+ elsif types.match?(/carto/)
t('blacklight.oai_objects.link_to_item.map', institution_name: oai_inst_name(document))
- elsif types =~ /sound/
+ elsif types.match?(/sound/)
t('blacklight.oai_objects.link_to_item.sound', institution_name: oai_inst_name(document))
- elsif types =~ /moving/
+ elsif types.match?(/moving/)
t('blacklight.oai_objects.link_to_item.video', institution_name: oai_inst_name(document))
- elsif types =~ /still/
+ elsif types.match?(/still/)
t('blacklight.oai_objects.link_to_item.image', institution_name: oai_inst_name(document))
else
t('blacklight.oai_objects.link_to_item.generic', institution_name: oai_inst_name(document))
@@ -31,6 +28,5 @@ def oai_link_text(document)
t('blacklight.oai_objects.link_to_item.generic', institution_name: oai_inst_name(document))
end
end
-
end
-end
\ No newline at end of file
+end
diff --git a/app/helpers/commonwealth_vlr_engine/ocr_search_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/ocr_search_helper_behavior.rb
index 8e799048..bb0e6b91 100644
--- a/app/helpers/commonwealth_vlr_engine/ocr_search_helper_behavior.rb
+++ b/app/helpers/commonwealth_vlr_engine/ocr_search_helper_behavior.rb
@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module OcrSearchHelperBehavior
-
# return the term frequency as an integer
# if Solr returns 0, change to 1 (most likely phrase search)
def compute_term_freq(term_freq)
- term_freq > 0 ? term_freq : term_freq+1
+ term_freq > 0 ? term_freq : term_freq + 1
end
# determine of the item has text content that can be searched
@@ -15,23 +16,19 @@ def has_searchable_text?(document)
# if current_search_session exists, return query_params['q'], otherwise return nil
# @current_search_session is defined in Blacklight::SearchContext
def ocr_q_params(current_search_session)
- if current_search_session
- current_search_session.query_params['q']
- else
- nil
- end
+ current_search_session ? current_search_session.query_params['q'] : nil
end
# print the ocr snippets. if more than one, separate with
- def render_ocr_snippets options={}
+ def render_ocr_snippets(options = {})
snippets = options[:value]
snippets_content = [content_tag('div',
"... #{snippets.first} ...".html_safe,
class: 'ocr_snippet first_snippet')]
if snippets.length > 1
snippets_content << render(partial: 'ocr_search/snippets_more',
- locals: {snippets: snippets.drop(1),
- counter: options[:counter]})
+ locals: { snippets: snippets.drop(1),
+ counter: options[:counter] })
end
snippets_content.join("\n").html_safe
end
@@ -43,11 +40,11 @@ def render_ocr_snippets options={}
def render_page_link(document, image_pid_list, book_id)
index_of_doc = image_pid_list.index(document.id)
page_num = document[blacklight_config.page_num_field.to_sym]
- link_to page_num ? "Page #{page_num}" : "Image #{index_of_doc+1}",
- "#{book_viewer_path(book_id)}?ocr_q=#{url_encode(params[:ocr_q])}#1/#{index_of_doc+1}",
+ # TODO: UV doesn't seem to allow passing query string, as in "h=#{url_encode(params[:ocr_q])}"
+ link_to page_num ? "Page #{page_num}" : "Image #{index_of_doc + 1}",
+ "#{book_viewer_path(book_id)}#?&cv=#{index_of_doc}",
class: 'book_page_link',
rel: 'nofollow'
end
-
end
end
diff --git a/app/helpers/commonwealth_vlr_engine/pages_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/pages_helper_behavior.rb
index fedd5918..58a1c238 100644
--- a/app/helpers/commonwealth_vlr_engine/pages_helper_behavior.rb
+++ b/app/helpers/commonwealth_vlr_engine/pages_helper_behavior.rb
@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
require 'rss'
module CommonwealthVlrEngine
module PagesHelperBehavior
-
def render_blog_feed(source = t('blacklight.home.context.news.rss_link'))
if source.present?
- feed = Rails.cache.fetch('dc_rss_feed', :expires_in => 60.minutes) do
+ feed = Rails.cache.fetch('dc_rss_feed', expires_in: 60.minutes) do
RSS::Parser.parse(open(source).read, false).items[0..3]
end
end
@@ -15,24 +16,37 @@ def render_blog_feed(source = t('blacklight.home.context.news.rss_link'))
content << content_tag(:li,
link_to(item.title,
item.link,
- :class => 'feed_item_link',
- :target => '_blank'),
- :class => 'feed_item')
+ class: 'feed_item_link',
+ target: '_blank'),
+ class: 'feed_item')
end
- content_tag(:ul, content.join().html_safe, :class => 'feed_items')
+ content_tag(:ul, content.join().html_safe, class: 'feed_items')
else
content_tag(:p,
'Visit ' + link_to(t('blacklight.home.context.news.blog_title'),
t('blacklight.home.context.news.blog_url'),
- :target => '_blank') + ' for the latest updates.')
+ target: '_blank') + ' for the latest updates.')
end
- rescue
+ rescue StandardError
content_tag(:p, 'No news at the moment, please check back later...')
end
+ def middle_feature_columns
+ section_active_count = 0
+ sections = %w(maps collections institutions formats)
+ sections.each do |section|
+ section_active_count += 1 if t("blacklight.home.browse.#{section}.enabled")
+ end
+
+ if section_active_count == 4
+ 'col-sm-6 col-md-6 col-lg-3'
+ else
+ "col-sm-#{12 / section_active_count}"
+ end
+ end
+
def render_about_site_path
about_site_path
end
-
end
end
\ No newline at end of file
diff --git a/app/helpers/commonwealth_vlr_engine/render_constraints_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/render_constraints_helper_behavior.rb
new file mode 100644
index 00000000..c329d581
--- /dev/null
+++ b/app/helpers/commonwealth_vlr_engine/render_constraints_helper_behavior.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+# override methods from Blacklight::RenderConstraintsHelperBehavior
+# (which is included via Blacklight::CatalogHelperBehavior)
+# plus new methods for rendering MLT, Advanced Search, etc
+module CommonwealthVlrEngine
+ module RenderConstraintsHelperBehavior
+ # override so we can inspect for other params, like :mlt_id
+ def query_has_constraints?(params_or_search_state = search_state)
+ search_state = convert_to_search_state(params_or_search_state)
+ has_mlt_parameters?(search_state) || super
+ end
+
+ # return true if :mlt_id is present
+ # @param search_state [Blacklight::SearchState]
+ # @return [Boolean]
+ def has_mlt_parameters?(search_state)
+ search_state.params[:mlt_id].present?
+ end
+
+ # override to deal with A-Z link result display
+ def render_constraint_element(label, value, options = {})
+ if value.match?(/ssort:[A-Z]+\*/)
+ label = t('blacklight.search.constraints.az_search')
+ value = value.match(/[A-Z]+/)[0]
+ end
+ options[:classes] ||= []
+ options[:classes] << 'btn-group-sm'
+ super
+ end
+
+ # override to add methods to show constraints for 'more like this' and advanced search date range
+ def render_constraints(localized_params = params, local_search_state = search_state)
+ params_or_search_state = if localized_params != params
+ localized_params
+ else
+ local_search_state
+ end
+ render_mlt_query(params_or_search_state) + render_advanced_date_query(params_or_search_state) + super
+ end
+
+ # Render the advanced search date query constraints
+ # @param params_or_search_state [Blacklight::SearchState || ActionController::Parameters]
+ # @return [String]
+ def render_advanced_date_query(params_or_search_state = search_state)
+ search_state = convert_to_search_state(params_or_search_state)
+ # So simple don't need a view template, we can just do it here.
+ return ''.html_safe if search_state.params[:date_start].blank? && search_state.params[:date_end].blank?
+
+ render_constraint_element(t('blacklight.advanced_search.constraints.date'),
+ date_range_constraints_to_s(search_state.params),
+ classes: ['date_range'],
+ remove: search_action_path(search_state.params.dup.except!(:date_start, :date_end)))
+ end
+
+ # Render the 'more like this' query constraints
+ # @param params_or_search_state [Blacklight::SearchState || ActionController::Parameters]
+ # @return [String]
+ def render_mlt_query(params_or_search_state = search_state)
+ search_state = convert_to_search_state(params_or_search_state)
+ # So simple don't need a view template, we can just do it here.
+ return ''.html_safe if search_state.params[:mlt_id].blank?
+
+ render_constraint_element(t('blacklight.more_like_this.constraint_label'),
+ search_state.params[:mlt_id],
+ classes: ['mlt'],
+ remove: search_action_path(search_state.params.dup.except!(:mlt_id, :qt)))
+ end
+
+ # render date range constraints from Advanced Search form
+ def date_range_constraints_to_s(params)
+ if params[:date_start].blank?
+ "before #{params[:date_end]}"
+ elsif params[:date_end].blank?
+ "after #{params[:date_start]}"
+ else
+ "#{params[:date_start]}-#{params[:date_end]}"
+ end
+ end
+ end
+end
diff --git a/app/helpers/commonwealth_vlr_engine/search_history_constraints_helper.rb b/app/helpers/commonwealth_vlr_engine/search_history_constraints_helper_behavior.rb
similarity index 71%
rename from app/helpers/commonwealth_vlr_engine/search_history_constraints_helper.rb
rename to app/helpers/commonwealth_vlr_engine/search_history_constraints_helper_behavior.rb
index 44b562a4..51314742 100644
--- a/app/helpers/commonwealth_vlr_engine/search_history_constraints_helper.rb
+++ b/app/helpers/commonwealth_vlr_engine/search_history_constraints_helper_behavior.rb
@@ -1,7 +1,9 @@
-module CommonwealthVlrEngine
- module SearchHistoryConstraintsHelper
- include Blacklight::SearchHistoryConstraintsHelperBehavior
+# frozen_string_literal: true
+# overrides methods from Blacklight::SearchHistoryConstraintsHelperBehavior
+# (which is included via Blacklight::CatalogHelperBehavior)
+module CommonwealthVlrEngine
+ module SearchHistoryConstraintsHelperBehavior
# include render_search_to_s_mlt() in rendered constraints
def render_search_to_s(params)
render_search_to_s_advanced(params) + render_search_to_s_mlt(params) + super
@@ -9,17 +11,18 @@ def render_search_to_s(params)
# render the MLT search query constraint, used on Search History page.
def render_search_to_s_mlt(params)
- return "".html_safe if params[:mlt_id].blank?
+ return ''.html_safe if params[:mlt_id].blank?
+
render_search_to_s_element(t('blacklight.more_like_this.constraint_label'),
render_filter_value(params[:mlt_id]))
end
# render advanced search date constraints, used on SearchHistory, etc.
def render_search_to_s_advanced(params)
- return "".html_safe if params[:date_start].blank? && params[:date_end].blank?
+ return ''.html_safe if params[:date_start].blank? && params[:date_end].blank?
+
render_search_to_s_element(t('blacklight.advanced_search.constraints.date'),
render_filter_value(date_range_constraints_to_s(params)))
end
-
end
end
diff --git a/app/helpers/commonwealth_vlr_engine/vlr_blacklight_maps_helper_behavior.rb b/app/helpers/commonwealth_vlr_engine/vlr_blacklight_maps_helper_behavior.rb
index f33228f4..aa2c4a6f 100644
--- a/app/helpers/commonwealth_vlr_engine/vlr_blacklight_maps_helper_behavior.rb
+++ b/app/helpers/commonwealth_vlr_engine/vlr_blacklight_maps_helper_behavior.rb
@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
module CommonwealthVlrEngine
module VlrBlacklightMapsHelperBehavior
include Blacklight::BlacklightMapsHelperBehavior
# OVERRIDE: convert state abbreviations, deal with complex locations, etc.
# create a link to a location name facet value
- def link_to_placename_field field_value, field, displayvalue = nil, catalogpath = nil
+ def link_to_placename_field(field_value, field, displayvalue = nil, catalogpath = nil)
search_path = catalogpath || 'search_catalog_path'
new_params = params.permit!
field_values = field_value.split(', ')
- if field_values.last.match(/[\.\)]/) # Mass.)
- field_values = [field_values.join(', ')]
- end
+ field_values = [field_values.join(', ')] if field_values.last.match?(/[\.\)]/) # Mass.)
if field_values.length > 2
new_field_values = []
new_field_values[0] = field_value.split(/[,][ \w]*\z/).first
@@ -19,11 +19,11 @@ def link_to_placename_field field_value, field, displayvalue = nil, catalogpath
end
if field_values.length == 2 && field_values.last.length == 2
state_name = Madison.get_name(field_values.last)
- field_values[field_values.length-1] = state_name if state_name
+ field_values[field_values.length - 1] = state_name if state_name
end
field_values.each do |val|
# new_params = new_params.to_hash
- place = val.match(/\(county\)/) ? val : val.gsub(/\s\([a-z]*\)\z/,'')
+ place = val.match?(/\(county\)/) ? val : val.gsub(/\s\([a-z]*\)\z/, '')
unless params[:f] && params[:f][field] && params[:f][field].include?(place)
# have to initialize SearchState with existing params as Hash, not HashWithIndifferentAccess
new_params = Blacklight::SearchState.new(new_params.to_hash,
@@ -32,51 +32,37 @@ def link_to_placename_field field_value, field, displayvalue = nil, catalogpath
end
new_params[:view] = default_document_index_view_type
link_to(displayvalue.presence || field_value,
- self.send(search_path,new_params.except(:id, :spatial_search_type, :coordinates)))
+ self.send(search_path, new_params.except(:id, :spatial_search_type, :coordinates)))
end
- # OVERRIDE: have to call .permit on map-centric params
- # TODO: remove this once blacklight-maps updated for Rails 5 support
- # create a link to a spatial search for a set of point coordinates
- def link_to_point_search point_coordinates
- new_params = params.except(:controller, :action, :view, :id, :spatial_search_type, :coordinates)
- new_params[:spatial_search_type] = "point"
- new_params[:coordinates] = "#{point_coordinates[1]},#{point_coordinates[0]}"
- new_params[:view] = default_document_index_view_type
- link_to(t('blacklight.maps.interactions.point_search'),
- search_catalog_path(new_params.permit(:spatial_search_type, :coordinates)))
+ # return an array of Blacklight::SolrResponse::Facets::FacetItem items
+ def map_facet_values
+ map_facet_field = blacklight_config.view.maps.facet_mode == 'coordinates' ?
+ blacklight_config.view.maps.coordinates_facet_field :
+ blacklight_config.view.maps.geojson_field
+ @response.aggregations[map_facet_field]&.items || []
end
# OVERRIDE: use a static file for catalog#map so page loads faster
# render the map for #index and #map views
def render_index_mapview
- static_geojson_file_loc = "#{Rails.root.to_s}/#{GEOJSON_STATIC_FILE['filepath']}"
- if Rails.env.to_s == 'production' && params[:action] == 'map' && File::exists?(static_geojson_file_loc)
+ static_geojson_file_loc = "#{Rails.root}/#{GEOJSON_STATIC_FILE['filepath']}"
+ if Rails.env.to_s == 'production' && params[:action] == 'map' && File.exist?(static_geojson_file_loc)
geojson_for_map = File.open(static_geojson_file_loc).first
else
geojson_for_map = serialize_geojson(map_facet_values)
end
- render :partial => 'catalog/index_mapview',
- :locals => {:geojson_features => geojson_for_map}
- end
-
- def render_spatial_search_link coordinates
- if coordinates.length == 4
- link_to_bbox_search(coordinates)
- else
- link_to_point_search(coordinates)
- end
+ render partial: 'catalog/index_mapview',
+ locals: { geojson_features: geojson_for_map }
end
# OVERRIDE: allow controller.action name to be passed, allow @controller
# pass the document or facet values to BlacklightMaps::GeojsonExport
- def serialize_geojson(documents, action_name=nil, options={})
+ def serialize_geojson(documents, action_name = nil, options = {})
action = action_name || controller.action_name
cntrllr = @controller || controller
- export = BlacklightMaps::GeojsonExport.new(cntrllr, action, documents, options)
+ export = BlacklightMaps::GeojsonExport.new(cntrllr, action.to_sym, documents, options)
export.to_geojson
end
-
end
-
end
diff --git a/app/helpers/downloads_helper.rb b/app/helpers/downloads_helper.rb
index 8be41c9d..d93818a1 100644
--- a/app/helpers/downloads_helper.rb
+++ b/app/helpers/downloads_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module DownloadsHelper
include CommonwealthVlrEngine::DownloadsHelperBehavior
end
\ No newline at end of file
diff --git a/app/helpers/feedback_helper.rb b/app/helpers/feedback_helper.rb
index 18f2757a..cc1016f3 100644
--- a/app/helpers/feedback_helper.rb
+++ b/app/helpers/feedback_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module FeedbackHelper
include CommonwealthVlrEngine::FeedbackHelperBehavior
end
\ No newline at end of file
diff --git a/app/helpers/folders_helper.rb b/app/helpers/folders_helper.rb
deleted file mode 100644
index ba94306b..00000000
--- a/app/helpers/folders_helper.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module FoldersHelper
- include CommonwealthVlrEngine::FoldersHelperBehavior
-end
\ No newline at end of file
diff --git a/app/helpers/image_viewer_helper.rb b/app/helpers/image_viewer_helper.rb
deleted file mode 100644
index 9dff7d64..00000000
--- a/app/helpers/image_viewer_helper.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module ImageViewerHelper
- include CommonwealthVlrEngine::ImageViewerHelperBehavior
-end
\ No newline at end of file
diff --git a/app/helpers/institutions_helper.rb b/app/helpers/institutions_helper.rb
index 82510abb..d0345782 100644
--- a/app/helpers/institutions_helper.rb
+++ b/app/helpers/institutions_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module InstitutionsHelper
include CommonwealthVlrEngine::InstitutionsHelperBehavior
end
\ No newline at end of file
diff --git a/app/helpers/oai_item_helper.rb b/app/helpers/oai_item_helper.rb
index 9e3a05b3..2d82f113 100644
--- a/app/helpers/oai_item_helper.rb
+++ b/app/helpers/oai_item_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module OaiItemHelper
include CommonwealthVlrEngine::OaiItemHelperBehavior
-end
\ No newline at end of file
+end
diff --git a/app/helpers/ocr_search_helper.rb b/app/helpers/ocr_search_helper.rb
index 96e6f76b..13b43750 100644
--- a/app/helpers/ocr_search_helper.rb
+++ b/app/helpers/ocr_search_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module OcrSearchHelper
include CommonwealthVlrEngine::OcrSearchHelperBehavior
end
\ No newline at end of file
diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb
index a5da55d9..71dbdfc9 100644
--- a/app/helpers/pages_helper.rb
+++ b/app/helpers/pages_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module PagesHelper
include CommonwealthVlrEngine::PagesHelperBehavior
end
\ No newline at end of file
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index edc08583..26148f2d 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
+
class ApplicationMailer < ActionMailer::Base
- #TODO Put some default stuff in here
end
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index bd97d937..d37a9836 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,5 +1,5 @@
-class Notifier < ApplicationMailer
+# frozen_string_literal: true
+class Notifier < ApplicationMailer
include CommonwealthVlrEngine::Notifier
-
end
diff --git a/app/mailers/record_mailer.rb b/app/mailers/record_mailer.rb
index f9e2083e..c5150c03 100644
--- a/app/mailers/record_mailer.rb
+++ b/app/mailers/record_mailer.rb
@@ -1,18 +1,18 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
+
# overriding Blacklight RecordMailer to add :from address in email
# otherwise we get error: ArgumentError (An SMTP From address is required to send a message
class RecordMailer < ApplicationMailer
def email_record(documents, details, url_gen_params)
-
- subject = I18n.t('blacklight.email.text.subject', :count => documents.length, :title => (documents.first.to_semantic_values[:title] rescue 'N/A') )
+ subject = I18n.t('blacklight.email.text.subject', count: documents.length,
+ title: (documents.first.to_semantic_values[:title] rescue 'N/A'))
@documents = documents
@message = details[:message]
@url_gen_params = url_gen_params
- mail(:to => details[:to],
- :from => t('blacklight.email.record_mailer.name') + ' <' + t('blacklight.email.record_mailer.email') + '>',
- :subject => subject)
+ mail(to: details[:to],
+ from: t('blacklight.email.record_mailer.name') + ' <' + t('blacklight.email.record_mailer.email') + '>',
+ subject: subject)
end
-
end
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 10a4cba8..71fbba5b 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ApplicationRecord < ActiveRecord::Base
self.abstract_class = true
end
diff --git a/app/models/carousel_slide.rb b/app/models/carousel_slide.rb
index 122b93bb..05709215 100644
--- a/app/models/carousel_slide.rb
+++ b/app/models/carousel_slide.rb
@@ -1,7 +1,6 @@
-class CarouselSlide < ApplicationRecord
-
- #attr_accessible :context, :image_pid, :institution, :object_pid, :region, :scale, :sequence, :title
-
- #serialize :region, Array
+# frozen_string_literal: true
+class CarouselSlide < ApplicationRecord
+ # attr_accessible :context, :image_pid, :institution, :object_pid, :region, :size, :sequence, :title
+ # serialize :region, Array
end
diff --git a/app/models/concerns/blacklight_iiif_search/annotation_behavior.rb b/app/models/concerns/blacklight_iiif_search/annotation_behavior.rb
new file mode 100644
index 00000000..beab3e16
--- /dev/null
+++ b/app/models/concerns/blacklight_iiif_search/annotation_behavior.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module BlacklightIiifSearch
+ module AnnotationBehavior
+ # include so we can use #datastream_disseminator_url
+ include CommonwealthVlrEngine::ApplicationHelper
+
+ def annotation_id
+ "#{parent_document[:identifier_uri_ss]}/annotation/#{document[:id].split(':')[1]}##{hl_index}"
+ end
+
+ def canvas_uri_for_annotation
+ "#{parent_document[:identifier_uri_ss]}/canvas/#{document[:id].split(':')[1]}" + coordinates
+ end
+
+ # return a string like "#xywh=100,100,250,20"
+ # corresponding to coordinates of query term on image
+ # local implementation expected
+ def coordinates
+ default = '#xywh=0,0,0,0'
+ return default if query.blank?
+
+ coords_json = fetch_and_parse_coords
+ if coords_json && coords_json['words']
+ matches = coords_json['words'].select { |k, _v| k.downcase =~ /#{query.downcase}/ }
+ return default unless matches
+
+ djvu_coords_array = matches.values.flatten(1)[hl_index]
+ return default unless djvu_coords_array
+
+ width = djvu_coords_array[2] - djvu_coords_array[0]
+ height = djvu_coords_array[1] - djvu_coords_array[3]
+ "#xywh=#{djvu_coords_array[0]},#{djvu_coords_array[3]},#{width},#{height}"
+ else
+ default
+ end
+ end
+
+ def fetch_and_parse_coords
+ coords_url = datastream_disseminator_url(document[:id], 'djvuCoords')
+ Rails.cache.fetch("#{document[:id]}_djvuCoords", expires_in: 1.day) do
+ begin
+ JSON.parse(Typhoeus::Request.get(coords_url).body)
+ rescue JSON::ParserError
+ nil
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/concerns/blacklight_iiif_search/search_behavior.rb b/app/models/concerns/blacklight_iiif_search/search_behavior.rb
new file mode 100644
index 00000000..3c900018
--- /dev/null
+++ b/app/models/concerns/blacklight_iiif_search/search_behavior.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module BlacklightIiifSearch
+ module SearchBehavior
+ ##
+ # limit the search to items that have some relationship with the parent object (e.g. pages)
+ # return a hash with:
+ # key: solr field for image/file to object relationship
+ # value: identifier to match
+ def object_relation_solr_params
+ { iiif_config[:object_relation_field] => "info:fedora/#{id}" }
+ end
+ end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
deleted file mode 100644
index 5a5152b2..00000000
--- a/app/models/user.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class User < ApplicationRecord
-
- # Connects this user object to Blacklights Bookmarks.
- include Blacklight::User
-
- # Connects this user object to the BPL omniauth service
- include Bpluser::Concerns::Users
-
- self.table_name = "users"
-
-end
diff --git a/app/presenters/commonwealth_vlr_engine/json_field_presenter.rb b/app/presenters/commonwealth_vlr_engine/json_field_presenter.rb
new file mode 100644
index 00000000..7b1b5bcb
--- /dev/null
+++ b/app/presenters/commonwealth_vlr_engine/json_field_presenter.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module CommonwealthVlrEngine
+ class JsonFieldPresenter < Blacklight::FieldPresenter
+ private
+
+ def retrieve_values
+ document[field_config.field]
+ end
+ end
+end
diff --git a/app/presenters/commonwealth_vlr_engine/json_index_presenter.rb b/app/presenters/commonwealth_vlr_engine/json_index_presenter.rb
new file mode 100644
index 00000000..61aa9bbc
--- /dev/null
+++ b/app/presenters/commonwealth_vlr_engine/json_index_presenter.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module CommonwealthVlrEngine
+ class JsonIndexPresenter < Blacklight::IndexPresenter
+ # override Blacklight::DocumentPresenter needed so we return value as array
+ # since CommonwealthVlrEngine::JsonFieldPresenter#retrieve_values returns String
+ # (app/view/catalog/index.json.builder calls display_type.first)
+ def display_type(base_name = nil, default: nil)
+ [super]
+ end
+
+ private
+
+ # override Blacklight::IndexPresenter so we can return all Solr fields
+ # @return [Hash] all the fields for this index view
+ def fields
+ Hash[document.keys.collect { |k| [k, field_config(k)] } ]
+ end
+
+ # override so we can set custom presenter
+ def field_presenter(field_config, options = {})
+ presenter_class = CommonwealthVlrEngine::JsonFieldPresenter
+ presenter_class.new(view_context, document, field_config, options.merge(field_presenter_options))
+ end
+ end
+end
diff --git a/app/views/advanced/_advanced_search_date.html.erb b/app/views/advanced/_advanced_search_date.html.erb
index af2c0a9a..8c6fb705 100644
--- a/app/views/advanced/_advanced_search_date.html.erb
+++ b/app/views/advanced/_advanced_search_date.html.erb
@@ -1,23 +1,21 @@
-
\ No newline at end of file
diff --git a/app/views/advanced/_advanced_search_facets.html.erb b/app/views/advanced/_advanced_search_facets.html.erb
index 7e4e837a..4b7f49c4 100644
--- a/app/views/advanced/_advanced_search_facets.html.erb
+++ b/app/views/advanced/_advanced_search_facets.html.erb
@@ -1,5 +1,5 @@
\ No newline at end of file
diff --git a/app/views/advanced/_advanced_search_fields.html.erb b/app/views/advanced/_advanced_search_fields.html.erb
index 02d15857..4588b539 100644
--- a/app/views/advanced/_advanced_search_fields.html.erb
+++ b/app/views/advanced/_advanced_search_fields.html.erb
@@ -1,39 +1,33 @@
-<% search_fields_for_advanced_search.take(3).each_with_index do |(key, field_def), index| %>
-