From 78befcda50c2f5c650632a4eae569de8162982eb Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Tue, 26 Sep 2023 14:20:19 +0200 Subject: [PATCH] MIR-1241: split the response-mir.xsl file, dynamic facets were split into a separate facets.xsl file; improved usability and customized the code in the mir_results.scss file; added some facets to the solr-config.json file and corresponding messages to messages_*.properties files. --- .../mir-layout/scss/common/mir_results.scss | 896 +++++++++--------- .../config/mir/messages_de.properties | 6 + .../config/mir/messages_en.properties | 6 + .../config/mir/messages_it.properties | 6 + .../config/mir/solr/main/solr-config.json | 11 +- mir-module/src/main/resources/xsl/facets.xsl | 181 ++++ .../main/resources/xsl/response-mir-utils.xsl | 2 +- .../src/main/resources/xsl/response-mir.xsl | 193 +--- 8 files changed, 713 insertions(+), 588 deletions(-) create mode 100644 mir-module/src/main/resources/xsl/facets.xsl diff --git a/mir-layout/src/main/resources/META-INF/resources/mir-layout/scss/common/mir_results.scss b/mir-layout/src/main/resources/META-INF/resources/mir-layout/scss/common/mir_results.scss index 8b643a29cd..48288b6ba5 100644 --- a/mir-layout/src/main/resources/META-INF/resources/mir-layout/scss/common/mir_results.scss +++ b/mir-layout/src/main/resources/META-INF/resources/mir-layout/scss/common/mir_results.scss @@ -12,6 +12,7 @@ $filter_border: #ccc !default; $filter_headline: #999 !default; $filter_hits: #999 !default; $filter: #666 !default; +$hover_darken: 20%; @-webkit-keyframes bouncedelay { 0%, 80%, 100% { -webkit-transform: scale(0.0) } @@ -89,533 +90,554 @@ $filter: #666 !default; float: left; width: 100%; .card-header { + cursor: pointer; .card-title { font-size: 1rem; color: $filter_headline; margin-bottom: 0px; + &:hover { + color: darken($filter_headline, $hover_darken); + } } } .filter { li { - .checkbox { + cursor: pointer; + &:hover * { + background-color: transparent; + } + &:hover { + .custom-checkbox { + label { + .title { + color: darken($filter, $hover_darken); + } + .hits { + color: darken($filter_hits, $hover_darken); + } + } + } + } + .custom-checkbox { margin-top: 0px; margin-bottom: 0px; label { + cursor: pointer; vertical-align: middle; + .hits { + color: $filter_hits; + } + } + } + } + } + &.worldReadableComplete { + li[data-fq^='worldReadableComplete']{ + .title:before{ + display: inline-block; + font: normal normal 900 14px/1 'Font Awesome 5 Free'; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + margin-right: 5px; + } + } + li[data-fq='worldReadableComplete:true'] { + .title { + @extend .text-success; + &:before{ + content: "\f13e"; //fa-unlock-alt } - .hits { - color: $filter_hits; + } + } + li[data-fq='worldReadableComplete:false'] { + .title { + @extend .text-warning; + &:before{ + content: "\f023"; //fa-lock } } } } - &.oa { - li[data-fq^='worldReadableComplete']{ - .title:before{ - display: inline-block; - font: normal normal 900 14px/1 'Font Awesome 5 Free'; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - margin-right: 5px; - } - } - li[data-fq='worldReadableComplete:true'] { - .title { - @extend .text-success; - &:before{ - content: "\f13e"; //fa-unlock-alt - } - } - } - li[data-fq='worldReadableComplete:false'] { - .title { - @extend .text-warning; - &:before{ - content: "\f023"; //fa-lock - } - } - } - } } } .result_list { - #hit_list { - .hit_item { - margin-bottom: 30px; - border-top: 1px solid $light_neutral; - border-radius: 10px; - .hit_counter { - text-align: center; - font-weight: bold; - color: $light_neutral; - border: 1px solid $light_neutral; - border-width: 0 0 0 1px; - border-top-left-radius: 10px; - padding: 1px 0 0 0; - width: 73px; - float: left; - } - .hit_stars { - margin: 0px 0px 5px 15px; - overflow: hidden; - width: 73px; - float: left; - .hit_star { - float:left; - width: 5px; - height: 5px; - background-color: $light_neutral; - margin: 8px 2px 0 2px; - border-radius: 50%; + #hit_list { + .hit_item { + margin-bottom: 30px; + border-top: 1px solid $light_neutral; + border-radius: 10px; + .hit_counter { + text-align: center; + font-weight: bold; + color: $light_neutral; + border: 1px solid $light_neutral; + border-width: 0 0 0 1px; + border-top-left-radius: 10px; + padding: 1px 0 0 0; + width: 73px; + float: left; } - } - .hit_stars_1 .hit_star_1 { - background-color: $dark_neutral; - } - .hit_stars_2 .hit_star_1 { - background-color: $dark_neutral; - } - .hit_stars_2 .hit_star_2 { - background-color: $dark_neutral; - } - .hit_stars_3 .hit_star_1 { - background-color: $dark_neutral; - } - .hit_stars_3 .hit_star_2 { - background-color: $dark_neutral; - } - .hit_stars_3 .hit_star_3 { - background-color: $dark_neutral; - } - .hit_stars_4 .hit_star { - background-color: $dark_neutral; - } - .hit_stars_4 .hit_star_5 { - background-color: $dark_neutral; - } - .hit_stars_5 .hit_star { - background-color: $dark_neutral; - } - .hit_star_1 {} - .hit_star_2 {} - .hit_star_3 {} - .hit_star_4 {} - .hit_star_5 {} - .hit_download_box { - position:relative; - float: left; - width: 73px; - display: none; - } - a .hit_icon { - &:hover { - box-shadow: 1px 1px 4px #999; + .hit_stars { + margin: 0px 0px 5px 15px; + overflow: hidden; + width: 73px; + float: left; + .hit_star { + float:left; + width: 5px; + height: 5px; + background-color: $light_neutral; + margin: 8px 2px 0 2px; + border-radius: 50%; + } } - } - .hit_icon { - height: 100px; - background-color: #EDEDED; - background-position: center center; - background-size: 100% auto; - background-repeat: no-repeat; - border: 1px solid $light_neutral; - border-bottom-left-radius: 25px; - } - .hit_icon_overlay { - position: absolute; - top: 20px; - left: -8px; - width: 50%; - } - .hit_tnd_container { - } - .hit_tnd_content { + .hit_stars_1 .hit_star_1 { + background-color: $dark_neutral; + } + .hit_stars_2 .hit_star_1 { + background-color: $dark_neutral; + } + .hit_stars_2 .hit_star_2 { + background-color: $dark_neutral; + } + .hit_stars_3 .hit_star_1 { + background-color: $dark_neutral; + } + .hit_stars_3 .hit_star_2 { + background-color: $dark_neutral; + } + .hit_stars_3 .hit_star_3 { + background-color: $dark_neutral; + } + .hit_stars_4 .hit_star { + background-color: $dark_neutral; + } + .hit_stars_4 .hit_star_5 { + background-color: $dark_neutral; + } + .hit_stars_5 .hit_star { + background-color: $dark_neutral; + } + .hit_star_1 {} + .hit_star_2 {} + .hit_star_3 {} + .hit_star_4 {} + .hit_star_5 {} + .hit_download_box { + position:relative; + float: left; + width: 73px; + display: none; + } + a .hit_icon { + &:hover { + box-shadow: 1px 1px 4px #999; + } + } + .hit_icon { + height: 100px; + background-color: #EDEDED; + background-position: center center; + background-size: 100% auto; + background-repeat: no-repeat; + border: 1px solid $light_neutral; + border-bottom-left-radius: 25px; + } + .hit_icon_overlay { + position: absolute; + top: 20px; + left: -8px; + width: 50%; + } + .hit_tnd_container { + } + .hit_tnd_content { overflow:hidden; > div { float:left; - &:nth-child(n+1) { - margin-left: 5px; - } + &:nth-child(n+1) { + margin-left: 5px; + } } - } - .hit_date { - color: $dark_neutral; - } - .hit_type { - color: $dark_neutral; - } - .hit_state { - color: $white; - .mir-published { - background-color: $success; } - .mir-submitted, - .mir-new, - .mir-imported { - background-color: $warning; + .hit_date { + color: $dark_neutral; + } + .hit_type { + color: $dark_neutral; } - .mir-review { - background-color: $primary; + .hit_state { + color: $white; + .mir-published { + background-color: $success; + } + .mir-submitted, + .mir-new, + .mir-imported { + background-color: $warning; + } + .mir-review { + background-color: $primary; + } + .mir-blocked { + background-color: $danger; + } + .mir-deleted { + background-color: $secondary; + } + span { + background-color: $secondary; + } } - .mir-blocked { - background-color: $danger; + .hit_title { + font-size: 20px; + margin: 15px 0 5px 0; + border-left: 0px solid $light_neutral; } - .mir-deleted { - background-color: $secondary; + .hit_author { + font-size: 16px; + margin: 0 0 0px 0; } - span { - background-color: $secondary; + .hit_source { + margin-top: 10px; + .label_parent { + color: $dark_neutral; + } } - } - .hit_title { - font-size: 20px; - margin: 15px 0 5px 0; - border-left: 0px solid $light_neutral; - } - .hit_author { - font-size: 16px; - margin: 0 0 0px 0; - } - .hit_source { - margin-top: 10px; - .label_parent { - color: $dark_neutral; + .hit_abstract { + margin: 10px 0 5px 0; } - } - .hit_abstract { - margin: 10px 0 5px 0; - } - .hit_pub_name { - .label_publisher { - color: $dark_neutral; + .hit_pub_name { + .label_publisher { + color: $dark_neutral; + } } - } - .hit_options { - .btn { + .hit_options { + .btn { + margin-right: 0px; + padding: 2px 10px; + background-color: transparent; + border: 1px solid $light_neutral; + border-width: 0px 1px 0px 0px; + border-radius: 0; + border-top-right-radius: 10px; + color: $dark_neutral; + &:hover { + color: $link_color; + background-color: transparent; + } + } + .caret { + margin-left: 6px; + } + .hit_option { + .fas, + .far { + margin-right: 5px; + } + } + } + .single_hit_option { margin-right: 0px; padding: 2px 10px; background-color: transparent; border: 1px solid $light_neutral; border-width: 0px 1px 0px 0px; border-radius: 0; - border-top-right-radius: 10px; - color: $dark_neutral; - &:hover { + border-top-right-radius: 9px; + a:hover { color: $link_color; - background-color: transparent; + text-decoration: none; } - } - .caret { - margin-left: 6px; - } - .hit_option { - .fas, - .far { - margin-right: 5px; + a { + color: $dark_neutral; + .fas, + .far { + margin-right: 5px; + } } } } - .single_hit_option { - margin-right: 0px; - padding: 2px 10px; - background-color: transparent; - border: 1px solid $light_neutral; - border-width: 0px 1px 0px 0px; - border-radius: 0; - border-top-right-radius: 9px; - a:hover { - color: $link_color; - text-decoration: none; - } - a { - color: $dark_neutral; - .fas, - .far { - margin-right: 5px; - } + .hit_item:hover { + border-color: $highlight; + border-bottom-left-radius: 25%; + .hit_counter { + color: $highlight; + border-color: $highlight; + } + .hit_stars_1 .hit_star_1 { + background-color: $highlight; + } + .hit_stars_2 .hit_star_1 { + background-color: $highlight; + } + .hit_stars_2 .hit_star_2 { + background-color: $highlight; + } + .hit_stars_3 .hit_star_1 { + background-color: $highlight; + } + .hit_stars_3 .hit_star_2 { + background-color: $highlight; + } + .hit_stars_3 .hit_star_3 { + background-color: $highlight; + } + .hit_stars_4 .hit_star { + background-color: $highlight; + } + .hit_stars_5 .hit_star { + background-color: $highlight; + } + .hit_icon { + border-left-color: $highlight; + } + .hitmid { + border-color: $highlight; + } + .btn { + border-color: $highlight; + } + .hit_title { + border-color: $link_color; } } } - .hit_item:hover { - border-color: $highlight; - border-bottom-left-radius: 25%; - .hit_counter { - color: $highlight; - border-color: $highlight; - } - .hit_stars_1 .hit_star_1 { - background-color: $highlight; - } - .hit_stars_2 .hit_star_1 { - background-color: $highlight; - } - .hit_stars_2 .hit_star_2 { - background-color: $highlight; - } - .hit_stars_3 .hit_star_1 { - background-color: $highlight; - } - .hit_stars_3 .hit_star_2 { - background-color: $highlight; - } - .hit_stars_3 .hit_star_3 { - background-color: $highlight; - } - .hit_stars_4 .hit_star { - background-color: $highlight; - } - .hit_stars_5 .hit_star { - background-color: $highlight; - } - .hit_icon { - border-left-color: $highlight; - } - .hitmid { - border-color: $highlight; - } - .btn { - border-color: $highlight; - } - .hit_title { - border-color: $link_color; - } + .result_list_end { + height: 20px; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; + border: 1px solid $light_neutral; + border-width: 0 1px 1px 1px; + margin: 0 0 20px 0px; } } - .result_list_end { - height: 20px; - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; - border: 1px solid $light_neutral; - border-width: 0 1px 1px 1px; - margin: 0 0 20px 0px; - } - } } /* file box *****************************************************************/ $file_box_color: $card-bg !default; - .file_box { - border: 0px solid $file_box_color; - border-radius: 0px; - margin-bottom: 30px; - - .filelist-loading { - position: absolute; - width: 100%; - text-align: center; - div { - width: 18px; - height: 18px; - background-color: #333; - border-radius: 100%; - display: inline-block; - -webkit-animation: bouncedelay 1.4s infinite ease-in-out; - animation: bouncedelay 1.4s infinite ease-in-out; - box-shadow: 0 2px 2px 0 rgba(50, 50, 50, 0.2); - /* Prevent first frame from flickering when animation starts */ - -webkit-animation-fill-mode: both; - animation-fill-mode: both; - } - .bounce1 { - -webkit-animation-delay: -0.32s; - animation-delay: -0.32s; - } - .bounce2 { - -webkit-animation-delay: -0.16s; - animation-delay: -0.16s; +.file_box { + border: 0px solid $file_box_color; + border-radius: 0px; + margin-bottom: 30px; + + .filelist-loading { + position: absolute; + width: 100%; + text-align: center; + div { + width: 18px; + height: 18px; + background-color: #333; + border-radius: 100%; + display: inline-block; + -webkit-animation: bouncedelay 1.4s infinite ease-in-out; + animation: bouncedelay 1.4s infinite ease-in-out; + box-shadow: 0 2px 2px 0 rgba(50, 50, 50, 0.2); + /* Prevent first frame from flickering when animation starts */ + -webkit-animation-fill-mode: both; + animation-fill-mode: both; + } + .bounce1 { + -webkit-animation-delay: -0.32s; + animation-delay: -0.32s; + } + .bounce2 { + -webkit-animation-delay: -0.16s; + animation-delay: -0.16s; + } + } + .file_box_breadcrumbs { + padding: 5px 0; + overflow: hidden; + .derivate_folder { + padding-right: 5px; + } + .derivate_folder > a:after { + content: "/"; + padding-left: 5px; + } + } + .header { + .headline { + border-bottom: 1px solid #ddd; + padding: 0px 0 0px 0; + .title { + padding: 0 0 0 0; + .file_toggle { + font-size: 16px; + border: none; + background-color: transparent; + color: #333; + padding: 0; + font-weight: 300; + .set_number { + margin-left: 6px; } } - .file_box_breadcrumbs { - padding: 5px 0; - overflow: hidden; - .derivate_folder { - padding-right: 5px; - } - .derivate_folder > a:after { - content: "/"; - padding-left: 5px; + } + .options { + .btn { + border: 0px solid transparent; + margin-right: 0px; + background-color: transparent; + color: $primary; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + &:hover { + color: $link_color; + background-color: transparent; } } - .header { - .headline { - border-bottom: 1px solid #ddd; - padding: 0px 0 0px 0; - .title { - padding: 0 0 0 0; - .file_toggle { - font-size: 16px; - border: none; - background-color: transparent; - color: #333; - padding: 0; - font-weight: 300; - .set_number { - margin-left: 6px; - } - } - } - .options { - .btn { - border: 0px solid transparent; - margin-right: 0px; - background-color: transparent; - color: $primary; - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - &:hover { - color: $link_color; - background-color: transparent; - } - } - .caret { - margin-left: 6px; - } - .option { - .fas, - .far { - margin-right: 5px; - } - } - } - .title { - float: left; - } + .caret { + margin-left: 6px; + } + .option { + .fas, + .far { + margin-right: 5px; } } - .body { - .table { - margin-bottom: 0; + } + .title { + float: left; + } + } + } + .body { + .table { + margin-bottom: 0; + } + .file_set { + a { + text-decoration: none; + } + &.active_file { + background-color: fade($primary, 5%); + .file_name { + position: relative; + font-weight: bold; + > a::after { + font-family:"Font Awesome 5 Free"; // TODO: Find fontawesome mixing for sass + font-weight: 900; + content: "\f005"; + position: absolute; + right: 0; + top: 0; + margin-top: 5px; + // color: $text-color; TODO: whats the bootstrap 4 default color? } - .file_set { - a { - text-decoration: none; - } - &.active_file { - background-color: fade($primary, 5%); - .file_name { - position: relative; - font-weight: bold; - > a::after { - font-family:"Font Awesome 5 Free"; // TODO: Find fontawesome mixing for sass - font-weight: 900; - content: "\f005"; - position: absolute; - right: 0; - top: 0; - margin-top: 5px; - // color: $text-color; TODO: whats the bootstrap 4 default color? - } - } - } - &.waiting_file { - background-color: fade($primary, 5%); - .file_name { - position: relative; - font-weight: bold; - > a::after { - content: " "; - width: 20px; - height: 20px; - position: absolute; - right: 0; - top: 0; - border-radius: 100%; - margin-top: 5px; - // color: $text-color;TODO: whats the bootstrap 4 default color? - //background-color: $text-color; TODO: whats the bootstrap 4 default color? - animation: sk-scaleout 0.8s infinite ease-in-out; - -webkit-animation: sk-scaleout 0.8s infinite ease-in-out; - } - } - } - - .options { - .btn { - margin-right: 0px; - padding: 2px 10px; - background-color: transparent; - border: 1px solid $light_neutral; - border-width: 0px 0px 0px 0px; - border-radius: 0; - border-top-right-radius: 0px; - color: $dark_neutral; - &:hover { - color: $link_color; - background-color: transparent; - } - } - .caret { - margin-left: 6px; - } - .option { - .fas, - .far { - margin-right: 5px; - } - } - } - .file_date {} - .file_preview {} - .file_name {} - .derivate_folder { - cursor: pointer; - } - .go_back { - padding-left: 140px; - } - .file_urn { - padding-left: 2px; - } - .file_size {} + } + } + &.waiting_file { + background-color: fade($primary, 5%); + .file_name { + position: relative; + font-weight: bold; + > a::after { + content: " "; + width: 20px; + height: 20px; + position: absolute; + right: 0; + top: 0; + border-radius: 100%; + margin-top: 5px; + // color: $text-color;TODO: whats the bootstrap 4 default color? + //background-color: $text-color; TODO: whats the bootstrap 4 default color? + animation: sk-scaleout 0.8s infinite ease-in-out; + -webkit-animation: sk-scaleout 0.8s infinite ease-in-out; } } + } - .file_box_pagination { - .pagination-info, .pagination { - margin: 5px 0; + .options { + .btn { + margin-right: 0px; + padding: 2px 10px; + background-color: transparent; + border: 1px solid $light_neutral; + border-width: 0px 0px 0px 0px; + border-radius: 0; + border-top-right-radius: 0px; + color: $dark_neutral; + &:hover { + color: $link_color; + background-color: transparent; } - - .pagination-info { - // line-height: $line-height-small; // TODO find small text height + } + .caret { + margin-left: 6px; + } + .option { + .fas, + .far { + margin-right: 5px; } } } + .file_date {} + .file_preview {} + .file_name {} + .derivate_folder { + cursor: pointer; + } + .go_back { + padding-left: 140px; + } + .file_urn { + padding-left: 2px; + } + .file_size {} + } + } + + .file_box_pagination { + .pagination-info, .pagination { + margin: 5px 0; + } + + .pagination-info { + // line-height: $line-height-small; // TODO find small text height + } + } +} /* filter *******************************************************************/ .filter { - border-right: 0px solid #ccc; + border-right: 0px solid #ccc; } .filter, .filter > li ul { - list-style:none; - margin:0; - padding:0; + list-style:none; + margin:0; + padding:0; } .filter > li ul { - display:none; + display:none; } .filter > li { - margin:0 0 0px 0; - padding:0 0 0 0; + margin:0 0 0px 0; + padding:0 0 0 0; } .filter > li > ul > li { - margin:0 0 0px 0px; - padding:0 0 0 0; + margin:0 0 0px 0px; + padding:0 0 0 0; } .filter .hits { - color: #ccc; + color: #ccc; } .filter .hits:before { - content: " ("; + content: " ("; } .filter .hits:after { - content: ")"; + content: ")"; } diff --git a/mir-module/src/main/resources/config/mir/messages_de.properties b/mir-module/src/main/resources/config/mir/messages_de.properties index ee18c3c0dc..5c970a36a0 100644 --- a/mir-module/src/main/resources/config/mir/messages_de.properties +++ b/mir-module/src/main/resources/config/mir/messages_de.properties @@ -543,6 +543,12 @@ mir.response.openAccess.facet.true = Dateien frei zug\u00E4nglich mir.response.openAccess.false = Keine frei verf\u00FCgbare Datei angehangen. mir.response.openAccess.true = Frei verf\u00FCgbare Datei angehangen. mir.response.relevance = Relevanz des Treffers in Bezug auf alle Treffer dieser Suche +mir.response.facet.mods.genre.title = Typ +mir.response.facet.derivates.title = Derivate +mir.response.facet.state.title = Status +mir.response.facet.createdby.title = Erstellt von +mir.response.facet.modifiedby.title = Angepasst von +mir.response.facet.mods.author.title = Autor*in mir.results.hitDoesNotExist = Dieser Treffer kann nicht angezeigt werden oder wurde gerade gel\u00F6scht. mir.rights = Lizenz mir.rightsHolder = Rechteinhaber: diff --git a/mir-module/src/main/resources/config/mir/messages_en.properties b/mir-module/src/main/resources/config/mir/messages_en.properties index 5893e73ab7..191e131b10 100644 --- a/mir-module/src/main/resources/config/mir/messages_en.properties +++ b/mir-module/src/main/resources/config/mir/messages_en.properties @@ -532,6 +532,12 @@ mir.response.openAccess.facet.true = Files freely accessible mir.response.openAccess.false = No free available file attached. mir.response.openAccess.true = Free available file attached. mir.response.relevance = Relevance of this hit in relation to all hits of current search +mir.response.facet.mods.genre.title = Type +mir.response.facet.derivates.title = Derivates +mir.response.facet.state.title = State +mir.response.facet.createdby.title = Created by +mir.response.facet.modifiedby.title = Modified by +mir.response.facet.mods.author.title = Author mir.results.hitDoesNotExist = This result can not be displayed or was recently deleted. mir.rights = License mir.rightsHolder = License Holder: diff --git a/mir-module/src/main/resources/config/mir/messages_it.properties b/mir-module/src/main/resources/config/mir/messages_it.properties index 90aeaee382..6672fadb08 100644 --- a/mir-module/src/main/resources/config/mir/messages_it.properties +++ b/mir-module/src/main/resources/config/mir/messages_it.properties @@ -47,5 +47,11 @@ mir.response.button.filter = Filtri mir.response.openAccess.facet.false = file no o protetti mir.response.openAccess.facet.title = Disponibilit\u00E0 mir.response.openAccess.facet.true = File liberamente accessibili +mir.response.facet.mods.genre.title = Tipo +mir.response.facet.derivates.title = Derivati +mir.response.facet.state.title = Stato +mir.response.facet.createdby.title = Creato da +mir.response.facet.modifiedby.title = Modificato da +mir.response.facet.mods.author.title = Autore user.profile.id.orcid = Your ORCID iD diff --git a/mir-module/src/main/resources/config/mir/solr/main/solr-config.json b/mir-module/src/main/resources/config/mir/solr/main/solr-config.json index fc6eae894e..481863e368 100644 --- a/mir-module/src/main/resources/config/mir/solr/main/solr-config.json +++ b/mir-module/src/main/resources/config/mir/solr/main/solr-config.json @@ -190,9 +190,16 @@ }, "appends": { "facet": "true", - "facet.field": "mods.genre", + "facet.field": [ + "mods.genre", + "derivates", + "state", + "createdby", + "modifiedby", + "mods.author" + ], "facet.mincount": "1" } } } -] \ No newline at end of file +] diff --git a/mir-module/src/main/resources/xsl/facets.xsl b/mir-module/src/main/resources/xsl/facets.xsl new file mode 100644 index 0000000000..c28bc3086f --- /dev/null +++ b/mir-module/src/main/resources/xsl/facets.xsl @@ -0,0 +1,181 @@ + + + + + + + + +
+
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + +

+
+ +
+
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  • +
    + + + true + + + +
    +
    • +     +     + +     diff --git a/mir-module/src/main/resources/xsl/response-mir-utils.xsl b/mir-module/src/main/resources/xsl/response-mir-utils.xsl index b3cea856a4..9b006438d5 100644 --- a/mir-module/src/main/resources/xsl/response-mir-utils.xsl +++ b/mir-module/src/main/resources/xsl/response-mir-utils.xsl @@ -393,4 +393,4 @@ - \ No newline at end of file + diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl index 0261e9e402..67e058c12a 100644 --- a/mir-module/src/main/resources/xsl/response-mir.xsl +++ b/mir-module/src/main/resources/xsl/response-mir.xsl @@ -1,21 +1,22 @@ + @@ -57,7 +58,7 @@ - +
    @@ -142,7 +143,7 @@
    @@ -204,7 +205,7 @@
    - +
    @@ -231,40 +232,10 @@
    - -
    -
    -

    - -

    -
    -
    -
      - - - - -
    -
    -
    -     - -
    -
    -

    - -

    -
    -
    -
      - - - - -
    -
    -
    -     + + + + @@ -370,7 +341,7 @@
    - + @@ -393,7 +364,7 @@ - +
    @@ -410,7 +381,7 @@ - +
  • @@ -423,15 +394,15 @@ - - + + - - + + @@ -458,11 +429,11 @@
    • - +
    - +
    @@ -516,7 +487,7 @@ + test="$displayDerivate/str[@name='iviewFile'] or translate(str:tokenize($displayDerivate/str[@name='derivateMaindoc'],'.')[position()=last()],'PDF','pdf') = 'pdf'">
    @@ -528,7 +499,7 @@ ' + select="concat('background-image: url(', $apos, $WebApplicationBaseURL, 'api/iiif/image/v2/thumbnail/', $identifier, '/full/!300,300/0/default.jpg',$apos,')')"/> @@ -568,7 +539,7 @@
    - +
    @@ -663,15 +634,15 @@
    - +

    - - - - - + + + + + @@ -686,7 +657,7 @@

    - + @@ -727,7 +698,7 @@ + select="document(concat('classification:metadata:all:children:','nameIdentifier',':',$nameIdentifierType))/mycoreclass/categories/category[@ID=$nameIdentifierType]" /> @@ -757,7 +728,7 @@
    - +
    aus: @@ -777,7 +748,7 @@
    - +
    @@ -785,7 +756,7 @@
    - +
    @@ -861,7 +832,7 @@ - + @@ -903,7 +874,7 @@ - + @@ -916,80 +887,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • -
    - - - true - - - -
    -
    • -     -     -