diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 902a1647..d4783517 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -132,11 +132,14 @@ Rails/HasManyOrHasOneDependent: Exclude: - 'app/models/endpoint.rb' -# Offense count: 5 +# Offense count: 7 Rails/OutputSafety: Exclude: - 'app/forms/hyrax/forms/admin/appearance.rb' - 'app/helpers/blacklight/catalog_helper_behavior.rb' + - 'app/helpers/hyrax/citations_behaviors/formatters/apa_formatter.rb' + - 'app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb' + - 'app/helpers/hyrax/citations_behaviors/formatters/mla_formatter.rb' # Offense count: 1 # Cop supports --auto-correct. diff --git a/app/assets/images/atla-ir.png b/app/assets/images/atla-ir.png new file mode 100644 index 00000000..9d0ac89a Binary files /dev/null and b/app/assets/images/atla-ir.png differ diff --git a/app/assets/images/collection.png b/app/assets/images/collection.png new file mode 100755 index 00000000..95da3d3a Binary files /dev/null and b/app/assets/images/collection.png differ diff --git a/app/assets/images/default.png b/app/assets/images/default.png new file mode 100755 index 00000000..ef189573 Binary files /dev/null and b/app/assets/images/default.png differ diff --git a/app/assets/images/home-logos/ctschicago.png b/app/assets/images/home-logos/ctschicago.png new file mode 100644 index 00000000..d0daaa6d Binary files /dev/null and b/app/assets/images/home-logos/ctschicago.png differ diff --git a/app/assets/images/home-logos/ost.png b/app/assets/images/home-logos/ost.png new file mode 100644 index 00000000..a9c86a31 Binary files /dev/null and b/app/assets/images/home-logos/ost.png differ diff --git a/app/assets/images/home-logos/rim_atla-wider.png b/app/assets/images/home-logos/rim_atla-wider.png new file mode 100644 index 00000000..a8841617 Binary files /dev/null and b/app/assets/images/home-logos/rim_atla-wider.png differ diff --git a/app/assets/images/home-logos/rim_atla.png b/app/assets/images/home-logos/rim_atla.png new file mode 100644 index 00000000..a2dc5e95 Binary files /dev/null and b/app/assets/images/home-logos/rim_atla.png differ diff --git a/app/assets/images/work.png b/app/assets/images/work.png new file mode 100755 index 00000000..ef189573 Binary files /dev/null and b/app/assets/images/work.png differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c90e7eba..77605f43 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -18,4 +18,5 @@ *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap *= require bootstrap-datepicker *= require_self + *= require atla-overrides */ diff --git a/app/assets/stylesheets/atla-overrides.scss b/app/assets/stylesheets/atla-overrides.scss new file mode 100644 index 00000000..65334831 --- /dev/null +++ b/app/assets/stylesheets/atla-overrides.scss @@ -0,0 +1,190 @@ +html, body.public-facing { + font-family: 'Muli', Helvetica, sans-serif; + font-size:1em; +} + +body {font-size:0.875em;} + +img {max-width:100%;} + +a#skip-to-content{padding:0;} + +/* LANDING PAGE for app */ +/*top nav bar*/ +body.splash-index.public-facing .navbar-inverse { + background-color: #fff; + border-color: #258FCE; +} +body.splash-index.public-facing .navbar-static-top {border-width: 3px 0 0;} + +body.splash-index.public-facing a,body.splash-index.public-facing .navbar-inverse .navbar-nav > li > a, body.splash-index.public-facing .navbar-inverse .navbar-text, body.splash-index.public-facing .navbar-inverse .navbar-brand { + color:#258FCE; + padding:1em; +} +body.splash-index.public-facing .home-logo-grid a {padding:0;} +body.splash-index.public-facing footer a {color:white;} +body.splash-index.public-facing footer.navbar.navbar-inverse.site-footer{ + border:0; + border-bottom:3px solid #258FCE; + background-color:#258FCE; +} + +body.splash-index span.institution_name { + display: none; +} + +body.splash-index .navbar-toggle {background-color:#258FCE;} +body.splash-index .navbar-inverse .navbar-toggle:hover {background-color:#fff;} +body.splash-index .navbar-inverse .navbar-toggle:hover .icon-bar {background-color:#258FCE;} + +/* in page content */ +body.splash-index .row {margin:0;} +body.splash-index #content-wrapper.container {padding-right:0px;padding-left:0px;} + +body.splash-index .home-logo { + margin-bottom:2em; +} + +body.splash-index .right-side{ + text-align:center; +} + +body.splash-index.public-facing h2{ + font-family: 'PT Serif'; + margin:4.5em 0 1em 0; + color:#4d4e4e; + font-size:1.5em; +} + +body.splash-index button.shared-search { + border: none; + color: white; + padding: 1em; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 1em; + /*font-weight:700;*/ + margin: 0 2px 1.25em 2px; + transition-duration: 0.4s; + cursor: pointer; + background-color:#E05C3F;/*#D43D1C*/ + box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.3); + border-radius:3px; +} + +body.splash-index button.shared-search:hover{ + background-color:#D43D1C; + border: 1px solid #E05C3F; +} + +body.splash-index .text-right p{color:#258FCE;} + +body.splash-index.public-facing a:hover, body.public-facing a:focus {color:#ffffff;text-decoration:underline;} + +/* across all tenants */ +.proprietor-accounts .btn-primary a:visited {color:white!important;} + +.public-facing .footer-link a, .public-facing .site-footer a {padding:1em;} +.public-facing .footer-link { + padding: 1em; +} + +footer.navbar.navbar-inverse.site-footer { + border:0; +} + +/* Work show metadata layout */ +.works-show p.work_description {margin-top:1em;} +.works-show dl.work-show {margin-top: 1em;} + +.work-show ul.tabular, .scholarly_show .work-show ul.tabular{padding-inline-start: 0px;} +.work-show dt {padding-bottom:0;} + +/* hide work type on work show pages */ +.works-show .work-type-tag {display:none;} + +.social-media{display:none;} + +/* Collection show layout */ + +.hyc-banner .hyc-title h1, .hyc-banner .hyc-bugs div{ + color:rgb(51, 51, 51); + text-shadow:none; +} + +.hyc-banner .hyc-title .label { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + +.hyc-banner {min-height:95px;} + +.hyc-bugs { + padding: 0 1em 0 2em; + text-align:right; +} + +.hyc-header {margin-bottom:0;} +.hyc-banner .hyc-title h1 {margin-bottom: 0.25em;} +.hyc-description h2 {font-size: 1.5em;} + +.hyc-bl-results {margin:0 0 1em 0;} +.hyc-blacklight.hyc-bl-title {padding: 0;} +.hyc-blacklight.hyc-bl-results {padding-left: 0;} +body.hyrax-collections .hyc-bl-search .col-sm-8 {float: right;} + +/* search resulsts */ +div.facets h3 {font-size: 1em;} + + +/* admin dashboard available works ETD all caps*/ +.dashboard label[for="input-Etd"] {text-transform: uppercase;} + +/* citations style */ +button.btn.btn-default.btn-block.citations-button.center-block {margin-top: 1em;} +.mla-citation, .apa-citation, .chicago-citation { + line-height: 1.25em; + display: inline-block; + width: 100%; + font-size:0.875em; +} +div#collapse-citations{text-align:left;overflow-wrap: break-word;} +div#collapse-citations h4 {font-size:1em;} +div#collapse-citations p {font-size:0.85em;} +button.btn.btn-default.btn-block.citations-button.center-block:hover, button.btn.btn-default.btn-block.citations-button.center-block:focus{ + background-color:#337ab7; + border-color: #204d75; + color:white; +} + + + +@media only screen and (min-width: 768px) { + .hyc-banner .hyc-title h1 {margin-bottom: 0em;} + + body.splash-index .row { + margin-right: -15px; + margin-left: -15px; +} +body.splash-index #content-wrapper.container {padding-right:15px;padding-left:15px;} + + body.splash-index .left-side { + padding-left: 0px; + padding-right: 50px; + } + body.splash-index .right-side { + padding-left: 50px; + padding-right: 10px; + } + body.splash-index button.shared-search {margin: 2em 2px 4px 2px;} + body.splash-index .col-xs-4.col-md-3.footer-link {width: 25%;} + + /* across all tenants * / + + /* banner area search bar */ + .navbar.navbar-static-top .input-group {margin-bottom:0;} + + +} diff --git a/app/assets/stylesheets/themes/shared_repository.scss b/app/assets/stylesheets/themes/shared_repository.scss new file mode 100644 index 00000000..840c29c5 --- /dev/null +++ b/app/assets/stylesheets/themes/shared_repository.scss @@ -0,0 +1,234 @@ +.shared_repository { + + &.public-facing, &.public-facing p {font-family: Muli, Helvetica, Arial, sans-serif!important;} + &.public-facing h1, h2, h3, h4, h5, h6 {font-family: 'PT Serif', serif;} + + img {max-width:100%;} + + &.public-facing a {color:#E05C3F;} + &.public-facing a:hover, &.public-facing a:focus{color:#D43D1C;} + h3.panel-title.facet-field-heading a {color:#333333;} + &.public-facing footer a {color:white;} + &.public-facing footer a:hover, &.public-facing footer a:focus {color:white;} + + div.facets h3 {font-size:1em;} + + .text-success, .facet-values li .selected {color:#E05C3F;} + + /*top admin nav bar*/ + &.public-facing .navbar-inverse { + background-color: #fff; + border-color: #258FCE; + } + + &.public-facing .navbar-static-top {border-width: 3px 0 0px} + + &.public-facing nav.navbar.navbar-default.navbar-static-top{ + border-width:0px; + margin-top:1em; + } + + &.public-facing .navbar-inverse .navbar-nav > li > a, &.public-facing .navbar-inverse .navbar-text, &.public-facing .navbar-inverse .navbar-brand {color:#258FCE;} + + &.public-facing .navbar-inverse .navbar-nav .open .dropdown-menu > li > a, .navbar-inverse .navbar-nav .open .twitter-typeahead .tt-menu > li > a, .twitter-typeahead .navbar-inverse .navbar-nav .open .tt-menu > li > a, &.public-facing .dropdown-header {color:#258FCE;} + + .navbar-inverse .navbar-collapse, .navbar-inverse #facet-panel-collapse, .navbar-inverse .navbar-form{border-color: #175E87;} + + ul#user_utility_links.nav.navbar-nav li {background-color:transparent;} + + /* hide globe icon on linked logo*/ + .image-masthead .glyphicon {display:none;} + + &.public-facing #masthead #logo img { + max-height:125px; + padding-top:.5em; + padding-left:.3em; + } + + &.public-facing .navbar{margin-bottom:0;} + + &.public-facing .navbar + .navbar, .navbar + .image-masthead {margin-top:0;} + + /* removing background banner image */ + .image-masthead .background-container, .container.site-title-container {display:none;} + .image-masthead .background-container-gradient {background:none;} + + /*hamburger menu*/ + &.public-facing button.navbar-toggle.collapsed,&.public-facing .navbar-inverse .navbar-toggle, &.public-facing .navbar-inverse .facets-toggle {background-color:#258FCE;} + + &.public-facing button.navbar-toggle.collapsed:hover{background-color:#175E87;} + + &.public-facing .navbar-inverse .navbar-toggle {border-color: #175E87;} + + &.public-facing .navbar-inverse .navbar-nav > .open > a, &.public-facing .navbar-inverse .navbar-nav > .open > a:hover, &.public-facing .navbar-inverse .navbar-nav > .open > a:focus{background-color: #258FCE;color:white;} + + .navbar-inverse .navbar-nav .open .dropdown-menu .divider, .navbar-inverse .navbar-nav .open .twitter-typeahead .tt-menu .divider, .twitter-typeahead .navbar-inverse .navbar-nav .open .tt-menu .divider{background-color: #175E87;} + + /* mobile stacked menu */ + .navbar-nav {margin:0} + + .image-masthead.row {margin-right:0;margin-left:0;} + + .image-masthead .navbar .navbar-nav {margin-left:0;} + + /* site nav bar on pages not catalog or login*/ + ul.nav.navbar-nav li {background-color:#258FCE;} + + &.public-facing .image-masthead .navbar .active > a, &.public-facing .image-masthead .navbar .active > a:hover, &.public-facing .image-masthead .navbar .active > a:focus {background-color:#175E87;} + &.public-facing .image-masthead .navbar {background-color: rgba(0, 0, 0, 0);} + + /* catalog/login nav bar */ + .navbar-default .navbar-nav li a {color:#eeeeee;text-transform: uppercase;} + .navbar-default {background-color:transparent;} + + &.catalog nav.navbar.navbar-default.navbar-static-top, &.devise-sessions nav.navbar.navbar-default.navbar-static-top{ + margin-bottom:2em; + border-bottom: 1px solid #e7e7e7; + } + + &.catalog .navbar-nav, &.devise-sessions .navbar-nav { + padding-left:1em; + margin-block-end: 0; + } + + &.devise-sessions .navbar-nav#user_utility_links {padding:0;} + + /* homepage page content */ + .container.homepage-container h2{ + font-family: 'PT Serif'; + margin:1.55em 0 0 0; + color:#4d4e4e;/*313133*/ + font-size:1.5em; + text-align:center; + } + + .container.homepage-container .row {margin:0;} + + /* search bar */ + &.hyrax-homepage #search-form-header{ + max-width:600px; + margin: 2em auto 0 auto; + } + /* search bar on other pages */ + .searchbar-right.navbar-right.col-sm-7 { + max-width: 600px; + } + + button.btn.btn-default.dropdown-toggle {display:none;} + + .form-horizontal .control-label, &.splash-index button.btn.btn-default.dropdown-toggle{display:none;} + + #search-field-header { + padding: 25px 12px 20px 12px; + border-top: 2px solid #E3E3E3 !important; + border-bottom: 2px solid #E3E3E3 !important; + border-left: 2px solid #E3E3E3 !important; + border-right: 0px solid transparent !important; + } + button#search-submit-header { + color: #575757; + background-color: #fff !important; + padding: 13px 12px 12px 12px; + border-top: 2px solid #E3E3E3 !important; + border-bottom: 2px solid #E3E3E3 !important; + border-right: 2px solid #E3E3E3 !important; + border-left: 0px solid transparent !important; + border-top-right-radius: 5px; + border-bottom-right-radius:5px; + } + + input::placeholder{font-size:1.5em;} + + .row.home-content {display:none;} + + /* limit width for text in pages for better usability */ + &.public-facing.hyrax-pages #content-wrapper, &.public-facing.hyrax-contact_form #content-wrapper {max-width:800px;} + /* adding space to text area for mobile view */ + &.public-facing.hyrax-pages div#content_block_page.row {margin-left:1em;margin-right:1em;} + + /* footer */ + &.public-facing footer.navbar.navbar-inverse.site-footer{ + border:0; + border-bottom:3px solid #258FCE; + background-color:#258FCE; + } + + /*contact page*/ + &.public-facing .alert-info{ + background-color:rgba(37,143,206, .3); + color:#333; + border-color:#258FCE; + } + &.public-facing .alert{margin-left:0;} + + &.public-facing .btn.btn-primary, &.public-facing .btn-primary.facets-toggle, &.public-facing .field-controls .facets-toggle.add, .field-controls &.public-facing .facets-toggle.add, &.public-facing .field-controls .btn.add, .field-controls &.public-facing .btn.add, &.public-facing .field-controls td.toggle input.add[type=submit], .field-controls td.toggle &.public-facing input.add[type=submit], &.public-facing td.toggle .field-controls input.add[type=submit], td.toggle .field-controls &.public-facing input.add[type=submit], &.public-facing td.toggle input.btn-primary[type=submit], td.toggle &.public-facing input.btn-primary[type=submit], &.public-facing td.toggle input[type=submit].active, td.toggle &.public-facing input[type=submit].active{ + background-color:#E05C3F; + border-color: #E05C3F; + } + + &.hyrax-contact_form .btn.btn-primary{box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.3);} + + /* splash */ + &.public-facing.hyrax-homepage #masthead.navbar {margin-bottom:20px;} + &.hyrax-homepage .navbar-header{display:none;} + + &.hyrax-homepage .home-logo { + margin-bottom:2em; + } + + &.hyrax-homepage .right-side{ + text-align:center; + } + &.hyrax-homepage h2{ + font-family: 'PT Serif'; + margin:3.5em 0 .5em 0; + color:#4d4e4e; + font-size:1.5em; + } + &.hyrax-homepage .splash-browse h2 {margin:2em 0 1em 0;} + &.hyrax-homepage #search-form-header {margin-top:1em;} + &.hyrax-homepage .text-right p{color:#258FCE;} + + @media screen and (min-width:768px){ + + .dropdown-menu .divider, .twitter-typeahead .tt-menu .divider{ + background-color: #e5e5e5;} + + /* site nav bar on pages not catalog or login*/ + .image-masthead .navbar-nav{ + padding-left:1em; + padding-top: 2em; + } + + .image-masthead.row {margin-right:-15px;margin-left:-15px;} + + /* catalog/login nav bar */ + &.catalog .navbar-nav, &.devise-sessions .navbar-nav { + padding-top:2em; + } + &.devise-sessions .navbar-nav#user_utility_links,&.catalog .navbar-nav#user_utility_links {padding:0;} + + #search-form-header{ + margin:0; + } + + /* removing extra space to text area for larger view on pages */ + &.public-facing.hyrax-pages div#content_block_page.row {margin-left:0em;margin-right:0em;} + + &.public-facing .alert{width:83%;} + + /* splash */ + &.hyrax-homepage .left-side { + padding-left: 0px; + padding-right: 50px; + } + &.hyrax-homepage .right-side { + padding-left: 50px; + padding-right: 10px; + } + + &.hyrax-homepage .splash-browse {padding-top:1em;} + + } + +} diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 6f31c1bf..a56f9d87 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -101,6 +101,7 @@ def self.modified_field config.add_index_field 'description_tesim', itemprop: 'description', helper_method: :index_filter config.add_index_field 'creator_tesim', itemprop: 'creator', link_to_search: 'creator_sim' config.add_index_field 'resource_type_tesim', label: 'Resource Type', link_to_search: 'resource_type_sim' + config.add_index_field 'institution_tesim', label: 'Institution', link_to_search: 'institution_sim' # solr fields to be displayed in the show (single result) view # The ordering of the field names is the order of the display @@ -147,7 +148,7 @@ def self.modified_field config.add_show_field 'event_date_tesim', label: 'Event date' config.add_show_field 'official_link_tesim', label: 'Official URL' config.add_show_field 'degree_tesim', label: 'Degree' - config.add_show_field 'level_tesim', label: 'Level' + # config.add_show_field 'level_tesim', label: 'Level' config.add_show_field 'discipline_tesim', label: 'Discipline' config.add_show_field 'degree_graning_institution_tesim', label: 'Degree Granting Institution' config.add_show_field 'advisor_tesim', label: 'Advisor' diff --git a/app/forms/hyrax/etd_form.rb b/app/forms/hyrax/etd_form.rb index 60f9cac5..f59b0180 100644 --- a/app/forms/hyrax/etd_form.rb +++ b/app/forms/hyrax/etd_form.rb @@ -12,7 +12,6 @@ class EtdForm < Hyrax::Forms::WorkForm resource_type institution degree - level discipline degree_granting_institution types @@ -26,7 +25,6 @@ class EtdForm < Hyrax::Forms::WorkForm bibliographic_citation format degree - level discipline degree_granting_institution advisor diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index e1aaea70..077e246a 100644 --- a/app/helpers/accounts_helper.rb +++ b/app/helpers/accounts_helper.rb @@ -1,4 +1,14 @@ # frozen_string_literal: true module AccountsHelper + def host_for(sub_domain) + # rubocop:disable Style/FormatStringToken + default_host = ENV.fetch('HYKU_DEFAULT_HOST', "%{tenant}.#{Account.admin_host}") + default_host.gsub('%{tenant}', sub_domain) + # rubocop:enable Style/FormatStringToken + end + + def full_search_url + main_app.search_catalog_path + end end diff --git a/app/helpers/hyrax/citation_behaviors/common_behavior.rb b/app/helpers/hyrax/citation_behaviors/common_behavior.rb new file mode 100644 index 00000000..3c30e38e --- /dev/null +++ b/app/helpers/hyrax/citation_behaviors/common_behavior.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +module Hyrax + module CitationsBehaviors + module CommonBehavior + def persistent_url(work); end + + def clean_end_punctuation(text) + return text[0, text.length - 1] if text && ([".", ",", ":", ";", "/"].include? text[-1, 1]) + text + end + end + end +end diff --git a/app/helpers/hyrax/citation_behaviors/formatters.rb b/app/helpers/hyrax/citation_behaviors/formatters.rb new file mode 100644 index 00000000..2c7130be --- /dev/null +++ b/app/helpers/hyrax/citation_behaviors/formatters.rb @@ -0,0 +1,30 @@ +# Hyrax Override: Improve Citations Format +# frozen_string_literal: true + +module Hyrax + module CitationsBehaviors + module Formatters + class BaseFormatter + include Hyrax::CitationsBehaviors::CommonBehavior + include Hyrax::CitationsBehaviors::NameBehavior + + attr_reader :view_context + + def initialize(view_context) + @view_context = view_context + end + + # Hyrax Override: Adds new functionality for citations + def add_link_to_original(work) + persistent_url(work).to_s + end + # end + end + + autoload :ApaFormatter, 'hyrax/citations_behaviors/formatters/apa_formatter' + autoload :ChicagoFormatter, 'hyrax/citations_behaviors/formatters/chicago_formatter' + autoload :MlaFormatter, 'hyrax/citations_behaviors/formatters/mla_formatter' + autoload :OpenUrlFormatter, 'hyrax/citations_behaviors/formatters/open_url_formatter' + end + end +end diff --git a/app/helpers/hyrax/citation_behaviors/formatters/apa_formatter.rb b/app/helpers/hyrax/citation_behaviors/formatters/apa_formatter.rb new file mode 100644 index 00000000..cb58a979 --- /dev/null +++ b/app/helpers/hyrax/citation_behaviors/formatters/apa_formatter.rb @@ -0,0 +1,94 @@ +# Hyrax Override: Improve Format of Citations +# frozen_string_literal: true + +module Hyrax + module CitationsBehaviors + module Formatters + class ApaFormatter < BaseFormatter + include Hyrax::CitationsBehaviors::PublicationBehavior + include Hyrax::CitationsBehaviors::TitleBehavior + + def format(work) + text = '' + text += authors_text_for(work) + text += pub_date_text_for(work) + text += add_title_text_for(work) + # Hyrax Override: adds addtl content for citation + text += " #{add_link_to_original(work)}" + # end + text.html_safe # rubocop:disable Rails/OutputSafety + end + + private + + def authors_text_for(work) + # setup formatted author list + authors_list = author_list(work).reject(&:blank?) + author_text = format_authors(authors_list) + if author_text.blank? + author_text + else + "#{author_text} " + end + end + + public + + def format_authors(authors_list = []) + return '' if authors_list.blank? + authors_list = Array.wrap(authors_list).collect(&:strip) + text = '' + text += convert_to_initials(authors_list.first) if authors_list.first + authors_list[1..-1].each do |author| + text += if author == authors_list.last + ", & #{convert_to_initials(author)}" + else + ", #{convert_to_initials(author)}" + end + end + text += "." unless text.end_with?(".") + text + end + + private + + def pub_date_text_for(work) + # Get Pub Date + pub_date = setup_pub_date(work) + format_date(pub_date) + end + + def add_title_text_for(work) + # setup title info + title_info = setup_title_info(work) + format_title(title_info) + end + + def add_publisher_text_for(work) + # Publisher info + pub_info = clean_end_punctuation(setup_pub_info(work)) + if pub_info.blank? + '' + else + pub_info + "." + end + end + + def convert_to_initials(name) + name = name.split(" ") + name.map { |n| n.equal?(name.last) ? n.capitalize : n[0].capitalize }.join(". ") + end + + public + + def format_date(pub_date) + pub_date.blank? ? "" : "(" + pub_date + "). " + end + + def format_title(title_info) + title_info.nil? ? "" : "#{title_info} " + end + end + end + end +end diff --git a/app/helpers/hyrax/citation_behaviors/formatters/chicago_formatter.rb b/app/helpers/hyrax/citation_behaviors/formatters/chicago_formatter.rb new file mode 100644 index 00000000..7390cc89 --- /dev/null +++ b/app/helpers/hyrax/citation_behaviors/formatters/chicago_formatter.rb @@ -0,0 +1,64 @@ +# Hyrax Override: Improve Citations Format +# frozen_string_literal: true + +module Hyrax + module CitationsBehaviors + module Formatters + class ChicagoFormatter < BaseFormatter + include Hyrax::CitationsBehaviors::PublicationBehavior + include Hyrax::CitationsBehaviors::TitleBehavior + def format(work) + text = "" + + # setup formatted author list + authors_list = all_authors(work) + text += format_authors(authors_list) + text = "#{text}" if text.present? + text += format_title(work.to_s) + pub_info = setup_pub_info(work, false) + text += " #{whitewash(pub_info)}." if pub_info.present? + pub_date = setup_pub_date(work) + text += " #{whitewash(pub_date)}." unless pub_date.nil? + text += " #{add_link_to_original(work)}" + # end + + text.html_safe # rubocop:disable Rails/OutputSafety + end + + def format_authors(authors_list = []) + return '' if authors_list.blank? + text = '' + text += authors_list.first if authors_list.first + authors_list[1..6].each_with_index do |author, index| + text += if index + 2 == authors_list.length # we've skipped the first author + ", and #{author}." + else + ", #{author}" + end + end + text += " et al." if authors_list.length > 7 + # if for some reason the first author ended with a comma + text = text.gsub(',,', ',') + text += "." unless text.end_with?(".") + whitewash(text) + end + + def format_date(pub_date); end + + def format_title(title_info) + return "" if title_info.blank? + title_text = chicago_citation_title(title_info) + title_text += '.' unless title_text.end_with?(".") + title_text = whitewash(title_text) + " #{title_text}" + end + + private + + def whitewash(text) + Loofah.fragment(text.to_s).scrub!(:whitewash).to_s + end + end + end + end +end diff --git a/app/helpers/hyrax/citation_behaviors/formatters/mla_formatter.rb b/app/helpers/hyrax/citation_behaviors/formatters/mla_formatter.rb new file mode 100644 index 00000000..14986a96 --- /dev/null +++ b/app/helpers/hyrax/citation_behaviors/formatters/mla_formatter.rb @@ -0,0 +1,75 @@ +# Hyrax Override: Improve Citations Format +# frozen_string_literal: true + +module Hyrax + module CitationsBehaviors + module Formatters + class MlaFormatter < BaseFormatter + include Hyrax::CitationsBehaviors::PublicationBehavior + include Hyrax::CitationsBehaviors::TitleBehavior + + def format(work) + text = '' + + # setup formatted author list + authors = author_list(work).reject(&:blank?) + text += "#{format_authors(authors)}" + # setup title + title_info = setup_title_info(work) + text += format_title(title_info) + + # Hyrax Override: adds contributor + text += " #{work.contributor.join(', ')}." if work.contributor.present? + + # Publication + pub_info = clean_end_punctuation(setup_pub_info(work, true)) + text += "#{pub_info}. " if pub_info.present? + # text += (pub_info + ".") if pub_info.present? + + # Hyrax Override: adds addtl content for citation + # text += add_link_to_original(work) + text += " #{add_link_to_original(work)}" + # end + + text.html_safe # rubocop:disable Rails/OutputSafety + end + + def format_authors(authors_list = []) + return "" if authors_list.blank? + authors_list = Array.wrap(authors_list) + text = concatenate_authors_from(authors_list) + if text.present? + text += "." unless text.end_with?(".") + text += " " + end + text + end + + def concatenate_authors_from(authors_list) + text = '' + text += authors_list.first + if authors_list.length > 1 + if authors_list.length < 4 + authors_list[1...-1].each do |author| + text += ", #{author}" + end + text += ", and #{authors_list.last}" + else + text += ", et al" + end + end + text + end + private :concatenate_authors_from + + def format_date(pub_date) + " #{pub_date.join(', ')}." + end + + def format_title(title_info) + title_info.blank? ? "" : "#{mla_citation_title(title_info)} " + end + end + end + end +end diff --git a/app/helpers/hyrax/citation_behaviors/name_behavior.rb b/app/helpers/hyrax/citation_behaviors/name_behavior.rb new file mode 100644 index 00000000..a0508eca --- /dev/null +++ b/app/helpers/hyrax/citation_behaviors/name_behavior.rb @@ -0,0 +1,53 @@ +# frozen_string_literal: true + +module Hyrax + module CitationsBehaviors + module NameBehavior + include Hyrax::CitationsBehaviors::CommonBehavior + # return all unique authors with end punctuation removed + def author_list(work) + all_authors(work) { |author| clean_end_punctuation(CGI.escapeHTML(author)) } + end + + # return all unique authors of a work or nil if none + def all_authors(work, &block) + authors = work.creator.uniq.compact + block_given? ? authors.map(&block) : authors + end + + def given_name_first(name) + name = clean_end_punctuation(name) + return name unless name.include?(',') + temp_name = name.split(/,\s*/) + temp_name.last + " " + temp_name.first + end + + def surname_first(name) + name = name.join('') if name.is_a? Array + # make sure we handle "Cher" correctly + return name if name.include?(',') + name_segments = name.split(' ') + given_name = name_segments.first + surnames = name_segments[1..-1] + if surnames + "#{surnames.join(' ')}, #{given_name}" + else + given_name + end + end + + def abbreviate_name(name) + abbreviated_name = '' + name = name.join('') if name.is_a? Array + + # make sure we handle "Cher" correctly + return name unless name.include?(' ') || name.include?(',') + name = surname_first(name) + name_segments = name.split(/,\s*/) + abbreviated_name += name_segments.first + abbreviated_name += ", #{name_segments.last.first}" if name_segments[1] + abbreviated_name + "." + end + end + end +end diff --git a/app/helpers/hyrax/citation_behaviors/publication_behavior.rb b/app/helpers/hyrax/citation_behaviors/publication_behavior.rb new file mode 100644 index 00000000..f7811180 --- /dev/null +++ b/app/helpers/hyrax/citation_behaviors/publication_behavior.rb @@ -0,0 +1,48 @@ +# Hyrax Override: Improve Citations Format +# frozen_string_literal: true + +module Hyrax + module CitationsBehaviors + module PublicationBehavior + include Hyrax::CitationsBehaviors::CommonBehavior + def setup_pub_date(work) + first_date = work.date_created.first if work.date_created + if first_date.present? + first_date = CGI.escapeHTML(first_date) + date_value = first_date.gsub(/[^0-9|n\.d\.]/, "")[0, 4] + return nil if date_value.nil? + end + clean_end_punctuation(date_value) if date_value + end + + # @param [Hyrax::WorkShowPresenter] work_presenter + def setup_pub_place(work_presenter) + work_presenter.based_near_label&.first + end + + def setup_pub_publisher(work) + work.publisher&.first + end + + def setup_pub_info(work, include_date = false) + pub_info = "" + + if (place = setup_pub_place(work)) + pub_info += CGI.escapeHTML(place) + end + + if (publisher = setup_pub_publisher(work)) + # Hyrax Override: format was wrong + # ':' should only be added if there is previous info + pub_info += ":" unless pub_info.empty? + pub_info += " #{CGI.escapeHTML(publisher)}" + end + + pub_date = include_date ? setup_pub_date(work) : nil + pub_info += ". #{pub_date}" unless pub_date.nil? + + pub_info.strip.presence + end + end + end +end diff --git a/app/helpers/hyrax/citation_behaviors/title_behavior.rb b/app/helpers/hyrax/citation_behaviors/title_behavior.rb new file mode 100644 index 00000000..d33b8991 --- /dev/null +++ b/app/helpers/hyrax/citation_behaviors/title_behavior.rb @@ -0,0 +1,54 @@ +# frozen_string_literal: true + +module Hyrax + module CitationsBehaviors + module TitleBehavior + include Hyrax::CitationsBehaviors::CommonBehavior + + TITLE_NOCAPS = ["a", "an", "and", "but", "by", "for", "it", "of", "the", "to", "with"].freeze + EXPANDED_NOCAPS = TITLE_NOCAPS + ["about", "across", "before", "without"] + + def chicago_citation_title(title_text) + process_title_parts(title_text) do |w, index| + if (index.zero? && w.casecmp(w).zero?) || (w.length > 1 && w.casecmp(w).zero? && !EXPANDED_NOCAPS.include?(w)) + # the split("-") will handle the capitalization of hyphenated words + w.split("-").map!(&:capitalize).join("-") + else + w + end + end + end + + def mla_citation_title(title_text) + process_title_parts(title_text) do |w| + if TITLE_NOCAPS.include? w + w + else + w.capitalize + end + end + end + + def process_title_parts(title_text, &block) + if block_given? + title_text.split(" ").collect.with_index(&block).join(" ") + else + title_text + end + end + + def setup_title_info(work) + text = '' + title = work.to_s + if title.present? + title = CGI.escapeHTML(title) + title_info = clean_end_punctuation(title.strip) + text += title_info + end + + return nil if text.strip.blank? + clean_end_punctuation(text.strip) + "." + end + end + end +end diff --git a/app/helpers/hyrax/citations_behavior.rb b/app/helpers/hyrax/citations_behavior.rb new file mode 100644 index 00000000..aa3ea963 --- /dev/null +++ b/app/helpers/hyrax/citations_behavior.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +module Hyrax + module CitationsBehavior + include Hyrax::CitationsBehaviors::CommonBehavior + include Hyrax::CitationsBehaviors::Formatters + include Hyrax::CitationsBehaviors::PublicationBehavior + include Hyrax::CitationsBehaviors::NameBehavior + include Hyrax::CitationsBehaviors::TitleBehavior + + def export_as_apa_citation(work) + Hyrax::CitationsBehaviors::Formatters::ApaFormatter.new(self).format(work) + end + + def export_as_chicago_citation(work) + Hyrax::CitationsBehaviors::Formatters::ChicagoFormatter.new(self).format(work) + end + + def export_as_mla_citation(work) + Hyrax::CitationsBehaviors::Formatters::MlaFormatter.new(self).format(work) + end + + # MIME type: 'application/x-openurl-ctx-kev' + def export_as_openurl_ctx_kev(work) + Hyrax::CitationsBehaviors::Formatters::OpenUrlFormatter.new(self).format(work) + end + end +end diff --git a/app/models/etd.rb b/app/models/etd.rb index 6048a78c..94b6197e 100644 --- a/app/models/etd.rb +++ b/app/models/etd.rb @@ -14,7 +14,7 @@ class Etd < ActiveFedora::Base validates :title, presence: { message: 'Your work must have a title.' } validates :creator, presence: { message: 'Your work must have a creator.' } validates :degree, presence: { message: 'Your work must have a degree.' } - validates :level, presence: { message: 'Your work must have a level.' } + # validates :level, presence: { message: 'Your work must have a level.' } validates :discipline, presence: { message: 'Your work must have a discipline.' } validates :degree_granting_institution, presence: { message: 'Your work must have a degree granting institution.' } # rubocop:disable Style/RegexpLiteral @@ -58,9 +58,9 @@ def video_embed? index.as :stored_searchable, :facetable end - property :level, predicate: ::RDF::URI('https://atla.com/terms/level') do |index| - index.as :stored_searchable - end + # property :level, predicate: ::RDF::URI('https://atla.com/terms/level') do |index| + # index.as :stored_searchable + # end property :discipline, predicate: ::RDF::URI('https://atla.com/terms/discipline') do |index| index.as :stored_searchable, :facetable diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb index 1a6c25bd..4bd61d86 100644 --- a/app/models/solr_document.rb +++ b/app/models/solr_document.rb @@ -54,7 +54,7 @@ class SolrDocument attribute :institution, Solr::String, 'institution_tesim' attribute :keyword, Solr::Array, 'keyword_tesim' attribute :language, Solr::Array, 'language_tesim' - attribute :level, Solr::Array, 'level_tesim' + # attribute :level, Solr::Array, 'level_tesim' attribute :license, Solr::Array, 'license_tesim' attribute :official_link, Solr::Array, 'official_link_tesim' attribute :project_name, Solr::Array, 'project_name_tesim' diff --git a/app/presenters/hyrax/etd_presenter.rb b/app/presenters/hyrax/etd_presenter.rb index 605eeebf..0f4cf29b 100644 --- a/app/presenters/hyrax/etd_presenter.rb +++ b/app/presenters/hyrax/etd_presenter.rb @@ -9,7 +9,7 @@ class EtdPresenter < Hyku::WorkShowPresenter :institution, :format, :degree, - :level, + #:level, :discipline, :degree_granting_institution, :advisor, diff --git a/app/presenters/hyrax/file_set_presenter_decorator.rb b/app/presenters/hyrax/file_set_presenter_decorator.rb new file mode 100644 index 00000000..7ed02ba5 --- /dev/null +++ b/app/presenters/hyrax/file_set_presenter_decorator.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +# OVERRIDE Hyrax v3.5.0 to change what appears in the title tags for pages + +module Hyrax + module FileSetPresenterDecorator + def page_title + "#{title.first} | #{I18n.t('hyrax.product_name')} | ID: #{id}" + end + end +end + +Hyrax::FileSetPresenter.prepend(Hyrax::FileSetPresenterDecorator) diff --git a/app/presenters/hyrax/work_show_presenter_decorator.rb b/app/presenters/hyrax/work_show_presenter_decorator.rb new file mode 100644 index 00000000..52aa8407 --- /dev/null +++ b/app/presenters/hyrax/work_show_presenter_decorator.rb @@ -0,0 +1,14 @@ + +# frozen_string_literal: true + +# OVERRIDE Hyrax v3.5.0 to change what appears in the title tags for pages + +module Hyrax + module WorkShowPresenterDecorator + def page_title + "#{title.first} | #{I18n.t('hyrax.product_name')} | ID: #{id}" + end + end +end + +Hyrax::WorkShowPresenter.prepend(Hyrax::WorkShowPresenterDecorator) diff --git a/app/views/_head_tag_extras.html.erb b/app/views/_head_tag_extras.html.erb index d690322c..44caf94e 100644 --- a/app/views/_head_tag_extras.html.erb +++ b/app/views/_head_tag_extras.html.erb @@ -22,3 +22,7 @@ + + + + diff --git a/app/views/hyrax/base/_attribute_rows.html.erb b/app/views/hyrax/base/_attribute_rows.html.erb index 6e9082e6..c6dc70ed 100644 --- a/app/views/hyrax/base/_attribute_rows.html.erb +++ b/app/views/hyrax/base/_attribute_rows.html.erb @@ -35,7 +35,7 @@ <%= presenter.attribute_to_html(:event_date, render_as: :faceted, html_dl: true) %> <%= presenter.attribute_to_html(:official_link, render_as: :faceted, html_dl: true) %> <%= presenter.attribute_to_html(:degree, render_as: :faceted, html_dl: true) %> -<%= presenter.attribute_to_html(:level, render_as: :faceted, html_dl: true) %> + <%= presenter.attribute_to_html(:discipline, render_as: :faceted, html_dl: true) %> <%= presenter.attribute_to_html(:degree_granting_institution, render_as: :faceted, html_dl: true) %> <%= presenter.attribute_to_html(:advisor, render_as: :faceted, html_dl: true) %> diff --git a/app/views/hyrax/base/_citations.html.erb b/app/views/hyrax/base/_citations.html.erb new file mode 100644 index 00000000..7087632f --- /dev/null +++ b/app/views/hyrax/base/_citations.html.erb @@ -0,0 +1,35 @@ + + +
+
+

MLA citation style (9th ed.)

+ <%= export_as_mla_citation(@presenter) %> + <%= request.original_url.sub(/^https?\:\/\/(www.)?/,'') %>. + +

+ +

APA citation style (7th ed.)

+ <%= export_as_apa_citation(@presenter) %> + <%= request.original_url %> + +

+ +

Chicago citation style (CMOS 17, author-date)

+ <%= export_as_chicago_citation(@presenter) %> + <%= request.original_url %>. +

+ +

+ Note: + These citations are programmatically generated and may be incomplete. +

+
\ No newline at end of file diff --git a/app/views/hyrax/collections/show.html.erb b/app/views/hyrax/collections/show.html.erb index 57c10bb1..aac0168d 100644 --- a/app/views/hyrax/collections/show.html.erb +++ b/app/views/hyrax/collections/show.html.erb @@ -4,7 +4,7 @@
- + <% if @presenter.banner_file.present? %>
<% else %> @@ -30,18 +30,7 @@ <% end %>
<% end %> - <% unless @presenter.total_viewable_items.blank? %> -
-
- <%= pluralize(@presenter.total_viewable_items, t('.item_count')) %>
- <% unless @presenter.creator.blank? %> -
Created by: <%= @presenter.creator.first %>
- <% end %> - <% unless @presenter.modified_date.blank? %> -
Last Updated: <%= @presenter.modified_date %>
- <% end %> -
- <% end %> +
@@ -63,8 +52,15 @@
<%# end OVERRIDE %>
+
+ <%= render 'hyrax/collections/media_display', presenter: @presenter %> +
<%= render 'collection_description', presenter: @presenter %> + <% unless collection_search_parameters? %> +

<%= t('hyrax.dashboard.collections.show.metadata_header') %>

+ <%= render 'show_descriptions' %> + <% end %> <% if @presenter.collection_type_is_nestable? && @presenter.total_parent_collections > 0 %>

@@ -75,15 +71,17 @@ <%= render 'show_parent_collections', presenter: @presenter %>

<% end %> - -
-
- <%= render 'hyrax/collections/media_display', presenter: @presenter %> - <% unless collection_search_parameters? %> -

<%= t('hyrax.dashboard.collections.show.metadata_header') %>

- <%= render 'show_descriptions' %> - <% end %>
+ <% unless @presenter.total_viewable_items.blank? %> +
+ <% unless @presenter.creator.blank? %> +
Created by: <%= @presenter.creator.first %>
+ <% end %> + <% unless @presenter.modified_date.blank? %> +
Last Updated: <%= @presenter.modified_date %>
+ <% end %> +
+ <% end %>
diff --git a/app/views/layouts/hyrax.html.erb b/app/views/layouts/hyrax.html.erb index e2ff6913..24bb6516 100644 --- a/app/views/layouts/hyrax.html.erb +++ b/app/views/layouts/hyrax.html.erb @@ -6,6 +6,7 @@ <%= content_for(:head) %> <% content_for(:extra_body_classes, 'public-facing') unless params[:controller].match(/^proprietor/) %> + <% content_for(:extra_body_classes, ' search-only') if current_account && current_account.search_only %> <%= render_gtm_body(request.original_url) %> diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index 6abb7b7b..8e5ff5c3 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,16 +1,55 @@
diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb index 9167e248..29114b75 100644 --- a/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb +++ b/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb @@ -7,4 +7,4 @@ <%= render partial: "themes/cultural_repository/hyrax/homepage/recent_document", collection: recent_documents %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/themes/cultural_repository/layouts/hyrax.html.erb b/app/views/themes/cultural_repository/layouts/hyrax.html.erb index 889f1f02..25c18171 100644 --- a/app/views/themes/cultural_repository/layouts/hyrax.html.erb +++ b/app/views/themes/cultural_repository/layouts/hyrax.html.erb @@ -42,4 +42,4 @@ <%= render '/shared/select_work_type_modal', create_work_presenter: @presenter&.create_work_presenter if @presenter&.draw_select_work_modal? %> <%= render 'shared/ajax_modal' %> - \ No newline at end of file + diff --git a/app/views/themes/shared_repository/hyrax/homepage/_banner_section.html.erb b/app/views/themes/shared_repository/hyrax/homepage/_banner_section.html.erb new file mode 100644 index 00000000..a8e0ec5d --- /dev/null +++ b/app/views/themes/shared_repository/hyrax/homepage/_banner_section.html.erb @@ -0,0 +1,20 @@ +<% if controller_name == 'pages' || + controller_name == 'contact_form' || + controller_name == 'catalog' + %> + +<%end%> + +<% if controller_name == 'homepage' %> + <%= render 'splash/index' %> +<%end%> diff --git a/app/views/themes/shared_repository/layouts/homepage.html.erb b/app/views/themes/shared_repository/layouts/homepage.html.erb new file mode 100644 index 00000000..f847d385 --- /dev/null +++ b/app/views/themes/shared_repository/layouts/homepage.html.erb @@ -0,0 +1,13 @@ +<% # OVERRIDE Hyku 5.0.1 for Atla shared search theme %> +<% content_for(:navbar) do %> + +<%= render "hyrax/homepage/banner_section" if controller_name == 'pages'|| controller_name == 'contact_form' || controller_name == 'catalog' %> + +<% if controller_name == 'homepage' %> + <%= render 'splash/index' %> + <% end %> + + +<%end%> + +<%= render template: 'layouts/hyrax' %> diff --git a/app/views/themes/shared_repository/splash/_index.html.erb b/app/views/themes/shared_repository/splash/_index.html.erb new file mode 100644 index 00000000..c8e011d5 --- /dev/null +++ b/app/views/themes/shared_repository/splash/_index.html.erb @@ -0,0 +1,36 @@ + +
+
+
+
+ <%= image_tag("atla-ir.png", class: "home-logo", alt: "Atla IR Shared Repository") %> +

The Atla Institutional Repository is a collaborative resource featuring the output of Atla Member Libraries and other partners, including faculty and student scholarly research in religion and theology, institutional records such as yearbooks and course catalogs, recordings of sermons and other lectures, and much more.

+

Visit one repository at a time or use the search box to find content from across all participating libraries’ repositories.

+
+
+

Search all repositories

+ <%= render partial: 'catalog/search_form'%> +
+

Browse our partner repositories:

+
+
+ <%= link_to "//#{host_for('rim')}" do %> + <%= image_tag("home-logos/rim_atla.png", class: "tenant-logo", alt: "RIM") %> + <% end %> +
+
+ <%= link_to "//#{host_for('ctschicago')}" do %> + <%= image_tag("home-logos/ctschicago.png", class: "tenant-logo", alt: "CTS") %> + <% end %> +
+
+ <%= link_to "//#{host_for('ost')}" do %> + <%= image_tag("home-logos/ost.png", class: "tenant-logo", alt: "OST") %> + <% end %> +
+
+
+
+
+
+
diff --git a/config/authorities/institutions.yml b/config/authorities/institutions.yml index 1face244..1585f3fd 100644 --- a/config/authorities/institutions.yml +++ b/config/authorities/institutions.yml @@ -5,6 +5,6 @@ terms: - id: Oblate School of Theology term: Oblate School of Theology active: true - - id: Atla - term: Atla + - id: Atla RIM + term: Atla RIM active: true diff --git a/config/authorities/resource_types.yml b/config/authorities/resource_types.yml index 166b0507..03404e42 100644 --- a/config/authorities/resource_types.yml +++ b/config/authorities/resource_types.yml @@ -70,4 +70,6 @@ terms: - id: Technical report term: Technical report - id: Website - term: Website \ No newline at end of file + term: Website + - id: Unknown + term: Unknown diff --git a/config/environments/development.rb b/config/environments/development.rb index 9bafa102..f51b09c2 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -40,7 +40,7 @@ # Debug mode disables concatenation and preprocessing of assets. # This option may cause significant delays in view rendering with a large # number of complex assets. - # config.assets.debug = true + config.assets.debug = true # Suppress logger output for asset requests. config.assets.quiet = true diff --git a/config/home_themes.yml b/config/home_themes.yml index afe726be..76750c18 100644 --- a/config/home_themes.yml +++ b/config/home_themes.yml @@ -30,4 +30,11 @@ neutral_repository: home_page_text: true marketing_text: true name: Neutral Repository - notes: This theme is neutral and is recommended for all types of repositories \ No newline at end of file + notes: This theme is neutral and is recommended for all types of repositories +shared_repository: + banner_image: false + featured_researcher: false + home_page_text: false + marketing_text: false + name: Atla IR Shared Homepage + notes: This theme is only to be used for the Atla IR shared search repository diff --git a/config/initializers/bulkrax.rb b/config/initializers/bulkrax.rb index 8cbb9ddb..7ccb1ec0 100644 --- a/config/initializers/bulkrax.rb +++ b/config/initializers/bulkrax.rb @@ -50,55 +50,55 @@ # config.field_mappings["Bulkrax::OaiDcParser"]["date"] = { from: ["date"], excluded: true } default_field_mapping = { - 'abstract' => { from: ['abstract'] }, - 'access_right' => { from: ['access_rights'] }, - 'additional_rights_info' => { from: ['additional_rights_info'] }, - 'advisor' => { from: ['advisor'] }, - 'alternative_title' => { from: ['alternative_title'] }, - 'bibliographic_citation' => { from: ['bibliographic_citation'] }, + 'abstract' => { from: ['abstract'], split: ';' }, + 'access_right' => { from: ['access_rights'], split: ';' }, + 'additional_rights_info' => { from: ['additional_rights_info'], split: ';' }, + 'advisor' => { from: ['advisor'], split: ';' }, + 'alternative_title' => { from: ['alternative_title'], split: ';' }, + 'bibliographic_citation' => { from: ['bibliographic_citation'], split: ';' }, 'children' => { from: ['children'], related_children_field_mapping: true }, - 'committee_member' => { from: ['committee_member'] }, + 'committee_member' => { from: ['committee_member'], split: ';' }, 'contributor_institutional_relationship' => { from: ['contributor_institutional_relationship'] }, 'contributor_orcid' => { from: ['contributor_orcid'] }, - 'contributor_role' => { from: ['contributor_role'] }, - 'contributor' => { from: ['contributor'] }, - 'creator_institutional_relationship' => { from: ['creator_institutional_relationship'] }, + 'contributor_role' => { from: ['contributor_role'], split: ';' }, + 'contributor' => { from: ['contributor'] , split: ';' }, + 'creator_institutional_relationship' => { from: ['creator_institutional_relationship'], split: ';' }, 'creator_orcid' => { from: ['creator_orcid'] }, - 'creator' => { from: ['creator'] }, + 'creator' => { from: ['creator'] , split: ';' }, 'date_created' => { from: ['date_created'] }, - 'degree_granting_institution' => { from: ['degree_granting_institution'] }, - 'degree' => { from: ['degree'] }, - 'department' => { from: ['department'] }, - 'description' => { from: ['description'] }, - 'discipline' => { from: ['discipline'] }, - 'event_date' => { from: ['event_date'] }, - 'event_location' => { from: ['event_location'] }, - 'event_title' => { from: ['event_title'] }, + 'degree_granting_institution' => { from: ['degree_granting_institution'], split: ';' }, + 'degree' => { from: ['degree'], split: ';' }, + 'department' => { from: ['department'], split: ';' }, + 'description' => { from: ['description'], split: ';' }, + 'discipline' => { from: ['discipline'], split: ';' }, + 'event_date' => { from: ['event_date'], split: ';' }, + 'event_location' => { from: ['event_location'], split: ';' }, + 'event_title' => { from: ['event_title'], split: ';' }, 'extent' => { from: ['extent'] }, - 'format' => { from: ['format'] }, - 'funder_awards' => { from: ['funder_awards'] }, - 'funder_name' => { from: ['funder_name'] }, + 'format' => { from: ['format'], split: ';' }, + 'funder_awards' => { from: ['funder_awards'], split: ';' }, + 'funder_name' => { from: ['funder_name'], split: ';' }, 'identifier' => { from: ['identifier'] }, 'institution' => { from: ['institution'] }, - 'keyword' => { from: ['keyword'] }, + 'keyword' => { from: ['keyword'], split: ';' }, 'label' => { from: ['label'] }, - 'language' => { from: ['language'] }, - 'level' => { from: ['level'] }, + 'language' => { from: ['language'], split: ';' }, + #'level' => { from: ['level'] }, 'license' => { from: ['license'] }, - 'official_link' => { from: ['official_link'] }, + 'official_link' => { from: ['official_link'], split: ';' }, 'parents' => { from: ['parents'], related_parents_field_mapping: true }, - 'project_name' => { from: ['project_name'] }, - 'publisher' => { from: ['publisher'] }, - 'related_url' => { from: ['related_url'] }, + 'project_name' => { from: ['project_name'], split: ';' }, + 'publisher' => { from: ['publisher'], split: ';' }, + 'related_url' => { from: ['related_url'] , split: ';' }, 'resource_type' => { from: ['resource_type'] }, - 'rights_holder' => { from: ['rights_holder'] }, - 'rights_notes' => { from: ['rights_notes'] }, + 'rights_holder' => { from: ['rights_holder'], split: ';' }, + 'rights_notes' => { from: ['rights_notes'], split: ';' }, 'rights_statement' => { from: ['rights_statement'] }, 'source_identifier' => { from: ['source_identifier'], source_identifier: true }, - 'source' => { from: ['source'] }, - 'subject' => { from: ['subject'] }, + 'source' => { from: ['source'], split: ';' }, + 'subject' => { from: ['subject'], split: ';' }, 'title' => { from: ['title'] }, - 'types' => { from: ['types'] }, + 'types' => { from: ['types'], split: ';' }, 'video_embed' => { from: ['video_embed'] }, 'work_url' => { from: ['work_url']}, 'year' => { from: ['year'] }, diff --git a/config/locales/de.yml b/config/locales/de.yml index 1ec1995a..d9b1ac1a 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -113,7 +113,7 @@ de: title: Verwaltung work_types: Verfügbare Arbeitstypen footer: - admin_login: Administratorenlogin + admin_login: Admin proprietor: accounts: nav: Konten diff --git a/config/locales/en.yml b/config/locales/en.yml index c88a1e5a..2c202a17 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -115,7 +115,7 @@ en: title: Administration work_types: Available Work Types footer: - admin_login: Administrator login + admin_login: Admin proprietor: accounts: nav: Accounts diff --git a/config/locales/es.yml b/config/locales/es.yml index 8bbecba9..c91a61bc 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -113,7 +113,7 @@ es: title: Administración work_types: Tipos de trabajo disponibles footer: - admin_login: Acceso del administrador + admin_login: Admin proprietor: accounts: nav: Cuentas diff --git a/config/locales/etd.de.yml b/config/locales/etd.de.yml index 3f537e57..6bb1a057 100644 --- a/config/locales/etd.de.yml +++ b/config/locales/etd.de.yml @@ -16,7 +16,7 @@ de: degree_granting_institution: Institution, die den mit der Arbeit verbundenen Abschluss verleiht. department: Name der Abteilung oder Einheit innerhalb der Institution, die den Abschluss verleiht. discipline: Untersuchungsbereich des intellektuellen Inhalts des Dokuments. Normalerweise ist dies der Name eines Programms oder einer Abteilung. - level: Mit dem Dokument verbundener Bildungsstand. + #level: Mit dem Dokument verbundener Bildungsstand. year: Das Jahr, in dem das Werk erstellt wurde. Dies muss eine vierstellige Jahreszahl sein und mit 19 oder 20 beginnen etd: subject: Wählen Sie Überschriften oder Indexbegriffe, die beschreiben, worum es in der Arbeit geht, aus unserer Themenliste aus. Wenn Ihre Begriffe in der Liste fehlen, verwenden Sie FAST-Betreffüberschriften. Für weitere Religions- und Theologiebegriffe, die unserer Liste hinzugefügt werden sollten, verwenden Sie dieses Formular. diff --git a/config/locales/etd.en.yml b/config/locales/etd.en.yml index 5bea8df5..bf73e366 100644 --- a/config/locales/etd.en.yml +++ b/config/locales/etd.en.yml @@ -11,7 +11,7 @@ en: defaults: year: 'The year in which the work was created. This must be a 4-digit year, and begin with 19 or 20' degree: 'Name of the degree associated with the work as it appears within the work.' - level: 'Level of education associated with the document.' + #level: 'Level of education associated with the document.' discipline: 'Area of study of the intellectual content of the document. Usually this will be the name of a program or department.' degree_granting_institution: 'Institution granting the degree associated with the work.' advisor: 'Name of thesis/dissertation advisor or committee chair.' @@ -22,4 +22,4 @@ en: labels: defaults: bibliographic_citation: 'Bibliographic citation' - date: 'Year' \ No newline at end of file + date: 'Year' diff --git a/config/locales/etd.es.yml b/config/locales/etd.es.yml index 670cf94e..b770f57d 100644 --- a/config/locales/etd.es.yml +++ b/config/locales/etd.es.yml @@ -16,7 +16,7 @@ es: degree_granting_institution: Institución que otorga el título asociado al trabajo. department: Nombre del departamento o unidad dentro de la institución que otorga el título. discipline: Área de estudio del contenido intelectual del documento. Por lo general, este será el nombre de un programa o departamento. - level: Nivel de estudios asociado al documento. + #level: Nivel de estudios asociado al documento. year: El año en que se creó la obra. Debe ser un año de 4 dígitos y comenzar con 19 o 20 etd: subject: Elija encabezados o términos de índice que describan de qué trata el trabajo de nuestra lista de tema. Si sus términos no aparecen en la lista, use encabezados de asunto FAST. Para términos adicionales de religión y teología que deben agregarse a nuestra lista, use este formulario. diff --git a/config/locales/etd.fr.yml b/config/locales/etd.fr.yml index ca16febe..41dfe286 100644 --- a/config/locales/etd.fr.yml +++ b/config/locales/etd.fr.yml @@ -16,7 +16,7 @@ fr: degree_granting_institution: Institution délivrant le diplôme associé au travail. department: Nom du département ou de l'unité au sein de l'établissement délivrant le diplôme. discipline: Domaine d'étude du contenu intellectuel du document. Habituellement, ce sera le nom d'un programme ou d'un département. - level: Niveau d'études associé au document. + #level: Niveau d'études associé au document. year: L'année de création de l'œuvre. Il doit s'agir d'une année à 4 chiffres et commencer par 19 ou 20 etd: subject: Choisissez des titres ou des termes d'index décrivant le sujet du travail dans notre liste de sujet. Si vos termes ne figurent pas dans la liste, utilisez les titres de sujet FAST. Pour des termes religieux et théologiques supplémentaires qui devraient être ajoutés à notre liste, utilisez ce formulaire. diff --git a/config/locales/etd.it.yml b/config/locales/etd.it.yml index b249dc5d..44433862 100644 --- a/config/locales/etd.it.yml +++ b/config/locales/etd.it.yml @@ -16,7 +16,7 @@ it: degree_granting_institution: Istituzione che rilascia il titolo associato al lavoro. department: Nome del dipartimento o dell'unità all'interno dell'istituto che rilascia il titolo. discipline: Area di studio del contenuto intellettuale del documento. Di solito questo sarà il nome di un programma o dipartimento. - level: Livello di istruzione associato al documento. + #level: Livello di istruzione associato al documento. year: L'anno in cui è stata creata l'opera. Deve essere un anno a 4 cifre e iniziare con 19 o 20 etd: subject: Scegli i titoli o i termini dell'indice che descrivono l'argomento dell'opera dal nostro elenco oggetto. Se i tuoi termini non sono presenti nell'elenco, utilizza le intestazioni oggetto FAST. Per ulteriori termini di religione e teologia che dovrebbero essere aggiunti al nostro elenco, utilizza questo modulo. diff --git a/config/locales/etd.pt-.yml b/config/locales/etd.pt-.yml index 1d7a8654..894056b6 100644 --- a/config/locales/etd.pt-.yml +++ b/config/locales/etd.pt-.yml @@ -16,7 +16,7 @@ pt-: degree_granting_institution: Instituição que confere o grau associado ao trabalho. department: Nome do departamento ou unidade dentro da instituição que concede o grau. discipline: Área de estudo do conteúdo intelectual do documento. Normalmente, este será o nome de um programa ou departamento. - level: Grau de escolaridade associado ao documento. + #level: Grau de escolaridade associado ao documento. year: O ano em que a obra foi criada. Este deve ser um ano de 4 dígitos e começar com 19 ou 20 etd: subject: Escolha títulos ou termos de índice que descrevam do que se trata o trabalho em nossa lista de assunto. Se seus termos estiverem faltando na lista, use cabeçalhos de assunto FAST. Para termos adicionais de religião e teologia que devem ser adicionados à nossa lista, use este formulário. diff --git a/config/locales/etd.pt-BR.yml b/config/locales/etd.pt-BR.yml index 33f4b892..fa6055d1 100644 --- a/config/locales/etd.pt-BR.yml +++ b/config/locales/etd.pt-BR.yml @@ -16,7 +16,7 @@ pt-BR: degree_granting_institution: Instituição que confere o grau associado ao trabalho. department: Nome do departamento ou unidade dentro da instituição que concede o grau. discipline: Área de estudo do conteúdo intelectual do documento. Normalmente, este será o nome de um programa ou departamento. - level: Grau de escolaridade associado ao documento. + #level: Grau de escolaridade associado ao documento. year: O ano em que a obra foi criada. Este deve ser um ano de 4 dígitos e começar com 19 ou 20 etd: subject: Escolha títulos ou termos de índice que descrevam do que se trata o trabalho em nossa lista de assunto. Se seus termos estiverem faltando na lista, use cabeçalhos de assunto FAST. Para termos adicionais de religião e teologia que devem ser adicionados à nossa lista, use este formulário. diff --git a/config/locales/etd.zh.yml b/config/locales/etd.zh.yml index bde9e148..dd1eade5 100644 --- a/config/locales/etd.zh.yml +++ b/config/locales/etd.zh.yml @@ -16,7 +16,7 @@ zh: degree_granting_institution: 授予与工作相关的学位的机构。 department: 授予学位的机构内的部门或单位的名称。 discipline: 文档知识内容的研究领域。通常这将是程序或部门的名称。 - level: 与文件相关的教育水平。 + #level: 与文件相关的教育水平。 year: 创作作品的年份。这必须是一个 4 位数的年份，并且以 19 或 20 开头 etd: subject: 从我们的主题列表中选择描述作品内容的标题或索引词。如果列表中缺少您的术语，请使用 FAST 主题词。对于应添加到我们列表中的其他宗教和神学术语，请使用此表格。 diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 6681cf63..1822867d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -113,7 +113,7 @@ fr: title: Administration work_types: Types de travail disponibles footer: - admin_login: Connexion Administrateur + admin_login: Admin proprietor: accounts: nav: Comptes diff --git a/config/locales/generic_work.de.yml b/config/locales/generic_work.de.yml index 567c170b..50d71cdb 100644 --- a/config/locales/generic_work.de.yml +++ b/config/locales/generic_work.de.yml @@ -6,4 +6,4 @@ de: select_type: generic_work: description: 'Arbeitstyp: Generische Arbeit. Wählen Sie diesen Typ für Ihre Arbeit, die Sie hinzufügen möchten, aus, wenn die unten aufgeführten, spezielleren Arbeitstypen nicht für Ihre Arbeit geeignet erscheinen.' - name: Generische Arbeit + name: Allgemeine Arbeit diff --git a/config/locales/generic_work.en.yml b/config/locales/generic_work.en.yml index a47e7e6e..54697566 100644 --- a/config/locales/generic_work.en.yml +++ b/config/locales/generic_work.en.yml @@ -6,4 +6,4 @@ en: select_type: generic_work: description: General purpose work type. Select this if the more specific work types below are not suited to the work you want to add. - name: Generic Work \ No newline at end of file + name: General Work diff --git a/config/locales/generic_work.es.yml b/config/locales/generic_work.es.yml index 5802304d..eed114f2 100644 --- a/config/locales/generic_work.es.yml +++ b/config/locales/generic_work.es.yml @@ -6,4 +6,4 @@ es: select_type: generic_work: description: Tipo de trabajo de propósito general. Seleccione esta opción si los tipos de trabajo más específicos de abajo no son adecuados para el trabajo que desea agregar. - name: Trabajo Genérico + name: Trabajo general diff --git a/config/locales/generic_work.fr.yml b/config/locales/generic_work.fr.yml index 9ccf1f93..89da2d1a 100644 --- a/config/locales/generic_work.fr.yml +++ b/config/locales/generic_work.fr.yml @@ -6,4 +6,4 @@ fr: select_type: generic_work: description: Type de travail à usage général. Sélectionnez cette option si les types de travaux plus spécifiques ci-dessous ne conviennent pas au travail que vous souhaitez ajouter. - name: Œuvres Génériques + name: Travail général diff --git a/config/locales/generic_work.it.yml b/config/locales/generic_work.it.yml index 4b3c604a..2d4aca03 100644 --- a/config/locales/generic_work.it.yml +++ b/config/locales/generic_work.it.yml @@ -6,4 +6,4 @@ it: select_type: generic_work: description: Tipo di opere di tipo generale. Selezionare questa opzione se i tipi di opere più specifici di seguito non sono adatti al opere che si desidera aggiungere. - name: Opere Generiche + name: Opere generale diff --git a/config/locales/generic_work.pt-.yml b/config/locales/generic_work.pt-.yml index 8db92363..3591964a 100644 --- a/config/locales/generic_work.pt-.yml +++ b/config/locales/generic_work.pt-.yml @@ -6,4 +6,4 @@ pt-: select_type: generic_work: description: Tipo de trabalho de uso geral. Selecione esta opção se os tipos de trabalho mais específicos abaixo não forem adequados para o trabalho que você deseja adicionar. - name: Trabalho Genérico + name: Trabalho geral diff --git a/config/locales/generic_work.pt-BR.yml b/config/locales/generic_work.pt-BR.yml index 09b4d3a0..8afcf17d 100644 --- a/config/locales/generic_work.pt-BR.yml +++ b/config/locales/generic_work.pt-BR.yml @@ -6,4 +6,4 @@ pt-BR: select_type: generic_work: description: Tipo de trabalho de propósito geral. Selecione isso se os tipos de trabalho mais específicos abaixo não forem adequados ao trabalho que deseja adicionar. - name: Trabalho Genérico + name: Trabalho geral diff --git a/config/locales/hyrax.de.yml b/config/locales/hyrax.de.yml index 54da1d22..5ef122c5 100644 --- a/config/locales/hyrax.de.yml +++ b/config/locales/hyrax.de.yml @@ -29,7 +29,7 @@ de: identifier: Kennung institution: Institution language: Sprache - level: Eben + #level: Eben license: Lizenz official_link: Offizielle URL project_name: Projektname @@ -516,7 +516,7 @@ de: reporting: Ein Problem melden message_label: Botschaft name_label: Dein Name - notice: Bitte benutzen Sie das Kontaktformular, um Anfragen zu diesem System zu stellen. um ein Problem zu melden, das mit dem System auftritt; Unterstützung bei der Verwendung des Systems anzufordern; oder um allgemeines Feedback zu geben. Weitere Informationen zu diesem System finden Sie auf der Hilfeseite. + notice: Bitte verwenden Sie dieses Formular, um bei Fragen oder Feedback Kontakt zu unserem Repository aufzunehmen. select_type: Wählen Sie einen Problemtyp aus subject_label: Gegenstand type_label: Problemtyp @@ -1147,7 +1147,7 @@ de: license: Lizenz- und Vertriebsinformationen für den Zugriff auf die Sammlung. Wählen Sie aus der bereitgestellten Dropdown-Liste. publisher: Die Person oder Gruppe, die die Sammlung zur Verfügung stellt. Im Allgemeinen ist dies die Institution. related_url: Ein Link zu einer Website oder einem anderen spezifischen Inhalt (Audio, Video, PDF-Dokument), der sich auf die Sammlung bezieht. Ein Beispiel ist die URL eines Forschungsprojekts, von dem die Sammlung abgeleitet wurde. - resource_type: Vordefinierte Kategorien zur Beschreibung der Art des hochgeladenen Inhalts, z. B. "Artikel". oder "Datensatz". Es kann mehr als ein Typ ausgewählt werden. + resource_type: Vordefinierte Kategorien zur Beschreibung der Art oder des Genres der Ressource, z. B. B. „Artikel“. oder „Datensatz“. Es kann mehr als ein Typ ausgewählt werden. subject: Überschriften oder Indexbegriffe, die beschreiben, worum es in der Sammlung geht; Diese müssen einem vorhandenen Wortschatz entsprechen. title: Ein Name zur Identifizierung einer Sammlung. collection_type: @@ -1179,12 +1179,12 @@ de: license: Lizenz- und Vertriebsinformationen für den Zugang zum Werk. Wählen Sie aus der bereitgestellten Dropdown-Liste. publisher: Die Person oder Gruppe, die für die Bereitstellung der ursprünglichen Ressource verantwortlich ist. related_url: Ein Link zu einer Website oder einem anderen spezifischen Inhalt (Audio, Video, PDF-Dokument), der sich auf die Arbeit bezieht. Ein Beispiel ist die URL eines Forschungsprojekts, von dem die Arbeit abgeleitet wurde. - resource_type: Vordefinierte Kategorien zur Beschreibung des hochgeladenen Inhaltstyps, wie „Artikel“ oder „Foto.“ Es kann mehr als ein Ressourcentyp ausgewählt werden. + resource_type: Vordefinierte Kategorien zur Beschreibung der Art oder des Genres der Ressource, z. B. B. „Artikel“. oder „Datensatz“. Es kann mehr als ein Typ ausgewählt werden. rights_notes: Hier können zusätzliche Erläuterungen zu Rechten oder Lizenzen eingefügt werden. rights_statement: Wählen Sie die entsprechende Rechteerklärung aus der Dropdown-Liste aus. Weitere Informationen finden Sie unter https://rightsstatements.org. subject: Überschriften oder Indexbegriffe, die beschreiben, worum es in der Arbeit geht Verwenden Sie ein kontrolliertes Vokabular. title: Ein Name, der bei der Identifizierung eines Werks hilft. - types: Vordefinierte Kategorien zur Beschreibung der Art oder des Genres der Ressource. Es können mehrere Typen ausgewählt werden. + types: Vordefinierte Kategorien zur Beschreibung der Art des hochgeladenen Inhalts. Es können mehrere Typen ausgewählt werden. video_embed: Youtube- oder Vimeo-Iframe-Einbettungscode zum Anzeigen des in die Arbeitsseite eingebetteten Videos. Wenn Sie einen Einbettungslink für ein Video eingeben, muss es sich um eine ordnungsgemäß formatierte URL handeln, die mit „http://“ oder „https://“ beginnt. Es muss außerdem einen gültigen Link zu einem gehosteten Video enthalten, das in einem Iframe angezeigt werden kann.

Beispiele:
https://player.vimeo.com/video/467264493?h=b089de0eab
https://www.youtube.com/embed/ Znf73dsFdC8 generic_work: subject: Überschriften oder Indexbegriffe, die beschreiben, worum es in der Arbeit geht. Verwenden Sie einen kontrollierten Wortschatz. diff --git a/config/locales/hyrax.en.yml b/config/locales/hyrax.en.yml index 59377b4a..54cc3198 100644 --- a/config/locales/hyrax.en.yml +++ b/config/locales/hyrax.en.yml @@ -29,7 +29,7 @@ en: identifier: "Identifier" institution: "Institution" language: "Language" - level: "Level" + #level: "Level" license: "License" official_link: "Official URL" project_name: "Project name" @@ -44,7 +44,7 @@ en: year: "Year" hyrax: - product_name: "Hyku" + product_name: "Atla IR" product_twitter_handle: "@HydraInABox" institution_name: "Institution" institution_name_full: "Institution" @@ -346,7 +346,7 @@ en: background_attribution_html: "" base: citations: - header: "Citations:" + header: "Cite this item" form_child_work_relationships: actions: remove: Remove from this work @@ -409,11 +409,11 @@ en: items: actions: Actions date_uploaded: Date Uploaded - empty: This %{type} has no files associated with it. Click "edit" to add more files. + empty: This work has no files associated with it. Click "edit" to add more files. header: Items thumbnail: Thumbnail title: Title - unauthorized: There are no publicly available items in this %{type}. + unauthorized: There are no publicly available items in this work. visibility: Visibility relationships: empty: This %{type} is not currently in any collections. @@ -532,7 +532,7 @@ en: reporting: Reporting a problem message_label: Message name_label: Your Name - notice: Please use the contact form to submit inquiries about this system; to report a problem you are experiencing with the system; to request assistance using the system; or to provide general feedback. See the Help page for additional information about this system. + notice: Please use this form to contact our repository with any questions or feedback. select_type: Select an Issue Type subject_label: Subject type_label: Issue Type @@ -1154,7 +1154,7 @@ en: license: Licensing and distribution information governing access to the collection. Select from the provided drop-down list. publisher: The person or group making the collection available. Generally this is the institution. related_url: A link to a website or other specific content (audio, video, PDF document) related to the collection. An example is the URL of a research project from which the collection was derived. - resource_type: Pre-defined categories to describe the type of content being uploaded, such as "article" or "dataset." More than one type may be selected. + resource_type: Pre-defined categories to describe the nature or genre of the resource, such as "article" or "photograph." More than one resource type may be selected. subject: Headings or index terms describing what the collection is about; these do need to conform to an existing vocabulary. title: A name to aid in identifying a collection. collection_type: @@ -1186,11 +1186,11 @@ en: license: Licensing and distribution information governing access to the work. Select from the provided drop-down list. publisher: The person or group responsible for making the original resource available. related_url: A link to a website or other specific content (audio, video, PDF document) related to the work. An example is the URL of a research project from which the work was derived. - resource_type: Pre-defined categories to describe the type of content being uploaded, such as "article" or "photograph." More than one resource type may be selected. + resource_type: Pre-defined categories to describe the nature or genre of the resource, such as "article" or "photograph." More than one resource type may be selected. rights_notes: Any additional explanation of rights or licensing may be included here. rights_statement: Select the appropriate rights statement from the dropdown list. See https://rightsstatements.org for more information. title: A name to aid in identifying a work. - types: 'Pre-defined categories to describe the nature or genre of the resource. More than one type may be selected.' + types: 'Pre-defined categories to broadly describe the type of content being uploaded. More than one type may be selected.' video_embed: "Youtube or Vimeo iframe embed code to show video embedded in the work page. If you enter an embed link for a video, it must be a properly formatted url beginning with 'http://' or 'https://'. It also needs to contain a valid link to a hosted video that can appear in an iframe.

Examples:
https://player.vimeo.com/video/467264493?h=b089de0eab
https://www.youtube.com/embed/Znf73dsFdC8" generic_work: subject: Headings or index terms describing what the work is about. Use a controlled vocabulary. @@ -1254,7 +1254,7 @@ en: subject: Subject title: Title types: Type - video_embed: Embedded video + video_embed: Embedded video visibility_after_embargo: then open it up to visibility_after_lease: then restrict it to visibility_during_embargo: Restricted to diff --git a/config/locales/hyrax.es.yml b/config/locales/hyrax.es.yml index 654e5ea4..0433afa0 100644 --- a/config/locales/hyrax.es.yml +++ b/config/locales/hyrax.es.yml @@ -29,7 +29,7 @@ es: identifier: identificador institution: Institución language: Idioma - level: Nivel + #level: Nivel license: Licencia official_link: URL oficial project_name: Nombre del proyecto @@ -517,7 +517,7 @@ es: reporting: Informar un problema message_label: Mensaje name_label: Tu nombre - notice: Utilice el formulario de contacto para enviar consultas sobre este sistema; para informar un problema que tenga con el sistema; para solicitar asistencia con el sistema; o para proporcionar comentarios generales. Consulte la página de Ayuda para obtener información adicional sobre este sistema. + notice: Utilice este formulario para ponerse en contacto con nuestro repositorio con cualquier pregunta o comentario. select_type: Seleccione un tipo de problema subject_label: Tema type_label: Tipo de problema @@ -998,7 +998,7 @@ es: label_short: Mis trabajos q: label: Buscar %{application_name} - placeholder: Ingrese los términos de búsqueda + placeholder: Introduce términos de búsqueda select_type: description: Tipo de trabajo de uso general name: Trabajo @@ -1148,7 +1148,7 @@ es: license: Información sobre licencias y distribución que rige el acceso a la colección. Seleccione de la lista desplegable proporcionada. publisher: La persona o grupo que hace disponible la colección. Generalmente esta es la institución. related_url: Un enlace a un sitio web u otro contenido específico (audio, video, documento PDF) relacionado con la colección. Un ejemplo es la URL de un proyecto de investigación del que se derivó la colección. - resource_type: Categorías predefinidas para describir el tipo de contenido que se está cargando, como "artículo". o "conjunto de datos". Se puede seleccionar más de un tipo. + resource_type: Categorías predefinidas para describir la naturaleza o el género del recurso, como "artículo" o "fotografía". Se puede seleccionar más de un tipo de recurso. subject: Encabezados o términos de índice que describen de qué trata la colección; estos deben ajustarse a un vocabulario existente. title: Un nombre para ayudar a identificar una colección. collection_type: @@ -1180,12 +1180,12 @@ es: license: Información sobre licencias y distribución que rige el acceso a la obra. Seleccione de la lista desplegable proporcionada. publisher: La persona o grupo responsable de poner a disposición el recurso original. related_url: Un enlace a un sitio web u otro contenido específico (audio, video, documento PDF) relacionado con el trabajo. Un ejemplo es la URL de un proyecto de investigación del que se derivó el trabajo. - resource_type: Categorías predefinidas para describir el tipo de contenido que se carga, como "artículo" o "fotografía". Se puede seleccionar más de un tipo de recurso. + resource_type: Categorías predefinidas para describir la naturaleza o el género del recurso, como "artículo" o "fotografía". Se puede seleccionar más de un tipo de recurso. rights_notes: Cualquier explicación adicional de derechos o licencias puede incluirse aquí. rights_statement: Seleccione la declaración de derechos adecuada de la lista desplegable. Consulte https://rightsstatements.org para obtener más información. subject: Encabezados o términos de índice que describen de qué trata el trabajo Use un vocabulario controlado. title: Un nombre para ayudar a identificar una obra. - types: Categorías predefinidas para describir la naturaleza o el género del recurso. Se puede seleccionar más de un tipo. + types: Categorías predefinidas para describir ampliamente el tipo de contenido que se carga. Se puede seleccionar más de un tipo. video_embed: Código de incrustación iframe de Youtube o Vimeo para mostrar el video incrustado en la página de trabajo. Si ingresa un enlace de inserción para un video, debe ser una URL con el formato correcto que comience con 'http://' o 'https://'. También debe contener un enlace válido a un video alojado que pueda aparecer en un iframe.

Ejemplos:
https://player.vimeo.com/video/467264493?h=b089de0eab
https://www.youtube.com/embed/ Znf73dsFdC8 generic_work: subject: Encabezados o términos de índice que describen de qué trata el trabajo. Utiliza un vocabulario controlado. diff --git a/config/locales/hyrax.fr.yml b/config/locales/hyrax.fr.yml index 8aa6daca..fcc104b4 100644 --- a/config/locales/hyrax.fr.yml +++ b/config/locales/hyrax.fr.yml @@ -29,7 +29,7 @@ fr: identifier: Identifiant institution: Institution language: Langue - level: Niveau + #level: Niveau license: Licence official_link: URL officielle project_name: Nom du projet @@ -515,7 +515,7 @@ fr: reporting: Signaler un problème message_label: Message name_label: votre nom - notice: Veuillez utiliser le formulaire de contact pour soumettre des demandes de renseignements sur ce système; pour signaler un problème que vous rencontrez avec le système; demander de l'aide pour utiliser le système; ou pour fournir une rétroaction générale. Consultez la page d'aide pour plus d'informations sur ce système. + notice: Veuillez utiliser ce formulaire pour contacter notre référentiel pour toute question ou commentaire. select_type: Sélectionnez un type de problème subject_label: Matière type_label: type de probleme @@ -1146,7 +1146,7 @@ fr: license: Informations de licence et de distribution régissant l'accès à la collection. Sélectionnez dans la liste déroulante fournie. publisher: La personne ou le groupe qui met la collection à disposition. Il s'agit généralement de l'institution. related_url: Un lien vers un site Web ou tout autre contenu spécifique (audio, vidéo, document PDF) lié à la collection. Un exemple est l'URL d'un projet de recherche dont la collection est dérivée. - resource_type: Catégories prédéfinies pour décrire le type de contenu en cours de téléchargement, telles que & quot; article & quot; ou & quot; ensemble de données. & quot; Plusieurs types peuvent être sélectionnés. + resource_type: Catégories prédéfinies pour décrire la nature ou le genre de la ressource,, telles que & quot; article & quot; ou & quot; ensemble de données. & quot; Plusieurs types peuvent être sélectionnés. subject: En-têtes ou termes d'index décrivant l'objet de la collection; ceux-ci doivent se conformer à un vocabulaire existant. title: Un nom pour aider à identifier une collection. collection_type: @@ -1178,12 +1178,12 @@ fr: license: Informations sur les licences et la distribution régissant l'accès à l'œuvre. Sélectionnez dans la liste déroulante fournie. publisher: La personne ou le groupe responsable de la mise à disposition de la ressource originale. related_url: Un lien vers un site Web ou tout autre contenu spécifique (audio, vidéo, document PDF) lié à l'œuvre. Un exemple est l'URL d'un projet de recherche dont le travail a été dérivé. - resource_type: Catégories prédéfinies pour décrire le type de contenu téléchargé, par exemple "article" ou "photo". Plusieurs types de ressources peuvent être sélectionnés. + resource_type: Catégories prédéfinies pour décrire la nature ou le genre de la ressource,, par exemple "article" ou "photo". Plusieurs types de ressources peuvent être sélectionnés. rights_notes: Toute explication supplémentaire des droits ou des licences peut être incluse ici. rights_statement: Sélectionnez la déclaration de droits appropriée dans la liste déroulante. Consultez https://rightsstatements.org pour plus d'informations. subject: Titres ou termes d'index décrivant le sujet de l'ouvrage. Utilisez un vocabulaire contrôlé. title: Un nom pour aider à identifier une œuvre. - types: Catégories prédéfinies pour décrire la nature ou le genre de la ressource. Plusieurs types peuvent être sélectionnés. + types: Catégories prédéfinies pour décrire globalement le type de contenu téléchargé. Plusieurs types peuvent être sélectionnés. video_embed: Code d'intégration Youtube ou Vimeo iframe pour afficher la vidéo intégrée dans la page de travail. Si vous saisissez un lien d'intégration pour une vidéo, il doit s'agir d'une URL correctement formatée commençant par « http:// » ou « https:// ». Il doit également contenir un lien valide vers une vidéo hébergée pouvant apparaître dans une iframe.

Exemples :
https://player.vimeo.com/video/467264493?h=b089de0eab
https://www.youtube.com/embed/ Znf73dsFdC8 generic_work: subject: Titres ou termes d'index décrivant le sujet de l'œuvre. Utilisez un vocabulaire contrôlé. diff --git a/config/locales/hyrax.it.yml b/config/locales/hyrax.it.yml index e3fceec9..69f9707f 100644 --- a/config/locales/hyrax.it.yml +++ b/config/locales/hyrax.it.yml @@ -29,7 +29,7 @@ it: identifier: Identificatore institution: Istituzione language: Lingua - level: Livello + #level: Livello license: Licenza official_link: URL ufficiale project_name: Nome del progetto @@ -517,7 +517,7 @@ it: reporting: Segnala un problema message_label: Messaggio name_label: Il tuo nome - notice: Si prega di utilizzare il modulo di contatto per inviare richieste su questo sistema; per segnalare un problema riscontrato con il sistema; richiedere assistenza utilizzando il sistema; o per fornire un feedback generale. Vedere la pagina di aiuto per ulteriori informazioni su questo sistema. + notice: Si prega di utilizzare questo modulo per contattare il nostro repository con qualsiasi domanda o feedback. select_type: Seleziona un tipo di problema subject_label: Soggetto type_label: tipo di problema @@ -1148,7 +1148,7 @@ it: license: Informazioni su licenza e distribuzione che regolano l'accesso alla raccolta. Selezionare dall'elenco a discesa fornito. publisher: La persona o il gruppo che rende disponibile la raccolta. Generalmente questa è l'istituzione. related_url: Un collegamento a un sito Web o ad altri contenuti specifici (audio, video, documento PDF) relativi alla raccolta. Un esempio è l'URL di un progetto di ricerca da cui è stata derivata la raccolta. - resource_type: Categorie predefinite per descrivere il tipo di contenuto da caricare, come "articolo" o & quot; set di dati. & quot; È possibile selezionare più di un tipo. + resource_type: Categorie predefinite per descrivere la natura o il genere della risorsa, come "articolo" o "set di dati." È possibile selezionare più di un tipo. subject: Intestazioni o termini indicativi che descrivono la raccolta; questi devono conformarsi a un vocabolario esistente. title: Un nome per aiutare a identificare una collezione. collection_type: @@ -1180,12 +1180,12 @@ it: license: Informazioni su licenze e distribuzione che regolano l'accesso all'opera. Selezionare dall'elenco a discesa fornito. publisher: La persona o il gruppo responsabile della messa a disposizione della risorsa originale. related_url: Un collegamento a un sito Web o ad altri contenuti specifici (audio, video, documento PDF) relativi all'opera. Un esempio è l'URL di un progetto di ricerca da cui deriva il lavoro. - resource_type: Categorie predefinite per descrivere il tipo di contenuto caricato, ad esempio "articolo" o "fotografia". È possibile selezionare più di un tipo di risorsa. + resource_type: Categorie predefinite per descrivere la natura o il genere della risorsa, ad esempio "articolo" o "fotografia". È possibile selezionare più di un tipo di risorsa. rights_notes: Qualsiasi spiegazione aggiuntiva sui diritti o sulla licenza può essere inclusa qui. rights_statement: Seleziona la dichiarazione dei diritti appropriata dall'elenco a discesa. Per ulteriori informazioni, consulta https://rightsstatements.org. subject: Intestazioni o termini di indice che descrivono l'argomento dell'opera. Utilizzare un vocabolario controllato. title: Un nome per aiutare a identificare un'opera. - types: Categorie predefinite per descrivere la natura o il genere della risorsa. È possibile selezionare più di un tipo. + types: Categorie predefinite per descrivere ampiamente il tipo di contenuto caricato. È possibile selezionare più di un tipo. video_embed: Codice di incorporamento iframe Youtube o Vimeo per mostrare il video incorporato nella pagina di lavoro. Se inserisci un link di incorporamento per un video, deve essere un URL formattato correttamente che inizia con "http://" o "https://". Deve inoltre contenere un collegamento valido a un video ospitato che può essere visualizzato in un iframe.

Esempi:
https://player.vimeo.com/video/467264493?h=b089de0eab
https://www.youtube.com/embed/ Znf73dsFdC8 generic_work: subject: Intestazioni o termini di indice che descrivono l'argomento del lavoro. Usa un vocabolario controllato. diff --git a/config/locales/hyrax.pt-.yml b/config/locales/hyrax.pt-.yml index 0e5e73c1..b2c8fe4d 100644 --- a/config/locales/hyrax.pt-.yml +++ b/config/locales/hyrax.pt-.yml @@ -21,7 +21,7 @@ pt-: identifier: identificador institution: Instituição language: Linguagem - level: Nível + #level: Nível license: Licença publisher: Editor resource_type: Tipo de recurso @@ -505,7 +505,7 @@ pt-: reporting: Relatando um problema message_label: Mensagem name_label: Seu nome - notice: Por favor, use o formulário de contato para enviar perguntas sobre este sistema; para relatar um problema que você está enfrentando com o sistema; solicitar auxílio utilizando o sistema; ou para fornecer feedback geral. Consulte a página de Ajuda para obter informações adicionais sobre este sistema. + notice: Por favor, use este formulário para entrar em contato com nosso repositório com qualquer dúvida ou feedback. select_type: Selecione um tipo de problema subject_label: Assunto type_label: Tipo de problema @@ -986,7 +986,7 @@ pt-: label_short: Meus trabalhos q: label: Pesquisar %{application_name} - placeholder: Digite os termos de pesquisa + placeholder: Entre os termos da pesquisas select_type: description: Tipo de trabalho de uso geral name: Trabalhar @@ -1136,7 +1136,7 @@ pt-: license: Informações de licenciamento e distribuição que regem o acesso à coleção. Selecione na lista suspensa fornecida. publisher: A pessoa ou grupo que disponibiliza a coleção. Geralmente esta é a instituição. related_url: Um link para um site ou outro conteúdo específico (áudio, vídeo, documento PDF) relacionado à coleção. Um exemplo é a URL de um projeto de pesquisa do qual a coleção foi derivada. - resource_type: Categorias predefinidas para descrever o tipo de conteúdo que está sendo carregado, como "artigo" ou "conjunto de dados" Mais de um tipo pode ser selecionado. + resource_type: Categorias predefinidas para descrever a natureza ou gênero do recurso, como "artigo" ou "conjunto de dados" Mais de um tipo pode ser selecionado. subject: Títulos ou termos de índice que descrevem sobre o que é a coleção; estes precisam estar em conformidade com um vocabulário existente. title: Um nome para ajudar na identificação de uma coleção. collection_type: @@ -1168,11 +1168,11 @@ pt-: license: Informações sobre licenciamento e distribuição que regem o acesso à obra. Selecione na lista suspensa fornecida. publisher: A pessoa ou grupo responsável por disponibilizar o recurso original. related_url: Um link para um site ou outro conteúdo específico (áudio, vídeo, documento PDF) relacionado ao trabalho. Um exemplo é a URL de um projeto de pesquisa do qual o trabalho foi derivado. - resource_type: Categorias predefinidas para descrever o tipo de conteúdo que está sendo carregado, como "artigo" ou "fotografia". Mais de um tipo de recurso pode ser selecionado. + resource_type: Categorias predefinidas para descrever a natureza ou gênero do recurso, como "artigo" ou "fotografia". Mais de um tipo de recurso pode ser selecionado. rights_notes: Qualquer explicação adicional de direitos ou licenciamento pode ser incluída aqui. rights_statement: Selecione a declaração de direitos apropriada na lista suspensa. Consulte https://rightsstatements.org para obter mais informações. title: Um nome para ajudar na identificação de uma obra. - types: Categorias predefinidas para descrever a natureza ou gênero do recurso. Mais de um tipo pode ser selecionado. + types: Categorias predefinidas para descrever amplamente o tipo de conteúdo que está sendo carregado. Mais de um tipo pode ser selecionado. video_embed: Código de incorporação do iframe do Youtube ou Vimeo para mostrar o vídeo incorporado na página de trabalho. Se você inserir um link de incorporação para um vídeo, ele deve ser um URL formatado corretamente começando com 'http://' ou 'https://'. Ele também precisa conter um link válido para um vídeo hospedado que pode aparecer em um iframe.

Exemplos:
https://player.vimeo.com/video/467264493?h=b089de0eab
https://www.youtube.com/embed/ Znf73dsFdC8 generic_work: subject: Títulos ou termos de índice que descrevem o assunto do trabalho. Use um vocabulário controlado. diff --git a/config/locales/hyrax.pt-BR.yml b/config/locales/hyrax.pt-BR.yml index 368a713d..1ba3a4e9 100644 --- a/config/locales/hyrax.pt-BR.yml +++ b/config/locales/hyrax.pt-BR.yml @@ -29,7 +29,7 @@ pt-BR: identifier: identificador institution: Instituição language: Linguagem - level: Nível + #level: Nível license: Licença official_link: URL oficial project_name: Nome do Projeto @@ -517,7 +517,7 @@ pt-BR: reporting: Relatar um problema message_label: mensagem name_label: Seu nome - notice: Por favor, use o formulário de contato para enviar perguntas sobre este sistema; relatar um problema que está ocorrendo com o sistema; solicitar assistência usando o sistema; ou para fornecer feedback geral. Consulte a página de Ajuda para obter informações adicionais sobre este sistema. + notice: Por favor, use este formulário para entrar em contato com nosso repositório com qualquer dúvida ou feedback. select_type: Selecione um tipo de problema subject_label: Sujeito type_label: Tipo de problema @@ -998,7 +998,7 @@ pt-BR: label_short: Meus trabalhos q: label: Pesquisar %{application_name} - placeholder: Digite os termos de pesquisa + placeholder: Entre os termos da pesquisa select_type: description: Tipo de trabalho de uso geral name: Trabalhos @@ -1148,7 +1148,7 @@ pt-BR: license: Informações de licenciamento e distribuição que regem o acesso à coleção. Selecione na lista suspensa fornecida. publisher: A pessoa ou grupo que disponibiliza a coleção. Geralmente esta é a instituição. related_url: Um link para um site ou outro conteúdo específico (áudio, vídeo, documento PDF) relacionado à coleção. Um exemplo é o URL de um projeto de pesquisa do qual a coleção foi derivada. - resource_type: Categorias predefinidas para descrever o tipo de conteúdo que está sendo carregado, como "artigo" ou "conjunto de dados". Mais de um tipo pode ser selecionado. + resource_type: Categorias predefinidas para descrever a natureza ou gênero do recurso, como "artigo" ou "conjunto de dados". Mais de um tipo pode ser selecionado. subject: Cabeçalhos ou termos do índice que descrevem o que é a coleção; estes precisam estar em conformidade com um vocabulário existente. title: Um nome para ajudar na identificação de uma coleção. collection_type: @@ -1180,12 +1180,12 @@ pt-BR: license: Informações de licenciamento e distribuição que regem o acesso à obra. Selecione na lista suspensa fornecida. publisher: A pessoa ou grupo responsável por disponibilizar o recurso original. related_url: Um link para um site ou outro conteúdo específico (áudio, vídeo, documento PDF) relacionado ao trabalho. Um exemplo é a URL de um projeto de pesquisa do qual o trabalho foi derivado. - resource_type: categorias predefinidas para descrever o tipo de conteúdo que está sendo carregado, como "artigo" ou "fotografia". Mais de um tipo de recurso pode ser selecionado. + resource_type: Categorias predefinidas para descrever a natureza ou gênero do recurso, como "artigo" ou "fotografia". Mais de um tipo de recurso pode ser selecionado. rights_notes: Qualquer explicação adicional sobre direitos ou licenciamento pode ser incluída aqui. rights_statement: Selecione a declaração de direitos apropriada na lista suspensa. Consulte https://rightsstatements.org para obter mais informações subject: Títulos ou termos de índice que descrevem o assunto do trabalho. Use um vocabulário controlado. title: Um nome para ajudar na identificação de um trabalho. - types: Categorias predefinidas para descrever a natureza ou gênero do recurso. Mais de um tipo pode ser selecionado. + types: Categorias predefinidas para descrever amplamente o tipo de conteúdo que está sendo carregado. Mais de um tipo pode ser selecionado. video_embed: Código de incorporação do iframe do Youtube ou Vimeo para mostrar o vídeo incorporado na página de trabalho. Se você inserir um link de incorporação para um vídeo, ele deve ser um URL formatado corretamente começando com 'http://' ou 'https://'. Ele também precisa conter um link válido para um vídeo hospedado que pode aparecer em um iframe.

Exemplos:
https://player.vimeo.com/video/467264493?h=b089de0eab
https://www.youtube.com/embed/ Znf73dsFdC8 generic_work: subject: Títulos ou termos de índice que descrevem o assunto do trabalho. Use um vocabulário controlado. diff --git a/config/locales/hyrax.zh.yml b/config/locales/hyrax.zh.yml index 3c030896..3f8d6ca8 100644 --- a/config/locales/hyrax.zh.yml +++ b/config/locales/hyrax.zh.yml @@ -30,7 +30,7 @@ zh: identifier: 标识符 institution: 机构 language: 语言 - level: 等级 + #level: 等级 license: 执照 livense: 执照 official_link: 官方网址 diff --git a/config/locales/it.yml b/config/locales/it.yml index b9906c87..1a48b87a 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -113,7 +113,7 @@ it: title: Amministrazione work_types: Tipi di lavoro disponibili footer: - admin_login: Accesso amministratore + admin_login: Ammin proprietor: accounts: nav: conti diff --git a/config/locales/pt-.yml b/config/locales/pt-.yml index 90241992..56b4b943 100644 --- a/config/locales/pt-.yml +++ b/config/locales/pt-.yml @@ -113,7 +113,7 @@ pt-: title: Administração work_types: Tipos de trabalho disponíveis footer: - admin_login: Login do administrador + admin_login: Admin proprietor: accounts: nav: contas diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 813e649c..8fa0147e 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -113,7 +113,7 @@ pt-BR: title: Administração work_types: Tipos de trabalho disponíveis footer: - admin_login: Login do administrador + admin_login: Admin proprietor: accounts: nav: Contas diff --git a/config/show_themes.yml b/config/show_themes.yml index fa0fef53..554e4856 100644 --- a/config/show_themes.yml +++ b/config/show_themes.yml @@ -1,9 +1,9 @@ # These settings are to provide information about your theme -# and should follow the format +# and should follow the format # theme: # name: Theme notes # notes: Notes about the theme you want to display -# +# default_show: name: Default Show Page notes: This is the default Hyku show page. It is recommended for use with cultural repositories. @@ -13,4 +13,6 @@ cultural_show: scholarly_show: name: Scholarly Show Page notes: This text based show page is recommended for institutional repositories. - \ No newline at end of file +shared_show: + name: Atla IR Show Page + notes: This text based show page is for the Alta IR shared search. diff --git a/lib/oai/provider/metadata_format/hyku_dublin_core.rb b/lib/oai/provider/metadata_format/hyku_dublin_core.rb index 19868105..cb1f80b4 100644 --- a/lib/oai/provider/metadata_format/hyku_dublin_core.rb +++ b/lib/oai/provider/metadata_format/hyku_dublin_core.rb @@ -19,7 +19,7 @@ def initialize contributor_role creator creator_institutional_relationship creator_orcid date_created date_modified date_uploaded degree department depositor degree_granting_institution description discipline event_date event_location event_title format funder_name funder_awards - identifier institution keyword language level license official_link owner project_name + identifier institution keyword language license official_link owner project_name publisher related_url resource_type rights_holder rights_notes rights_statement source subject title year ] diff --git a/lib/oai/provider/model_decorator.rb b/lib/oai/provider/model_decorator.rb index d96d4efc..7d3447d6 100644 --- a/lib/oai/provider/model_decorator.rb +++ b/lib/oai/provider/model_decorator.rb @@ -40,7 +40,7 @@ def map_oai_hyku # rubocop:disable Metrics/MethodLength institution: :institution, keyword: :keyword, language: :language, - level: :level, + # level: :level, license: :license, official_link: :official_link, owner: :owner, diff --git a/public/favicon.ico b/public/favicon.ico old mode 100644 new mode 100755 index e69de29b..c90523d3 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/spec/factories/etds.rb b/spec/factories/etds.rb index d65988b1..1f49dd2f 100644 --- a/spec/factories/etds.rb +++ b/spec/factories/etds.rb @@ -11,7 +11,7 @@ creator { ['creator'] } year { '2023' } degree { ['bachelor of arts'] } - level { ['level'] } + # level { ['level'] } discipline { ['discipline'] } degree_granting_institution { ['degree_granting_institution'] } diff --git a/spec/features/create_etd_spec.rb b/spec/features/create_etd_spec.rb index 90fc2361..625fe9d3 100644 --- a/spec/features/create_etd_spec.rb +++ b/spec/features/create_etd_spec.rb @@ -64,7 +64,7 @@ select('Ceremony', from: 'Resource type') select('Oblate School of Theology', from: 'Institution') fill_in('etd_degree', with: 'degree') - fill_in('Level', with: 'level') + # fill_in('Level', with: 'level') fill_in('Discipline', with: 'discipline') fill_in('etd_degree_granting_institution', with: 'degree granting institution') select('Text', from: 'Types') diff --git a/spec/features/splash_spec.rb b/spec/features/splash_spec.rb index b8203179..80fd9048 100644 --- a/spec/features/splash_spec.rb +++ b/spec/features/splash_spec.rb @@ -17,7 +17,7 @@ expect(page).to have_link 'Login to get started', href: main_app.new_user_session_path(locale: 'en') within 'footer' do - expect(page).to have_link 'Administrator login' + expect(page).to have_link 'Admin' end expect(page).to have_content("Hyku v#{Hyku::VERSION}") diff --git a/spec/forms/hyrax/etd_form_spec.rb b/spec/forms/hyrax/etd_form_spec.rb index b16173ef..b0301339 100644 --- a/spec/forms/hyrax/etd_form_spec.rb +++ b/spec/forms/hyrax/etd_form_spec.rb @@ -22,7 +22,7 @@ subject: ['My Subject'], resource_type: ['Ceremony'], degree: ['Degree'], - level: ['Level'], + # level: ['Level'], discipline: ['Discipline'], degree_granting_institution: ['Degree Granting Inst'] } @@ -36,7 +36,7 @@ expect(subject['subject']).to eq ['My Subject'] expect(subject['resource_type']).to eq ['Ceremony'] expect(subject['degree']).to eq ['Degree'] - expect(subject['level']).to eq ['Level'] + # expect(subject['level']).to eq ['Level'] expect(subject['discipline']).to eq ['Discipline'] expect(subject['degree_granting_institution']).to eq ['Degree Granting Inst'] end diff --git a/spec/models/etd_spec.rb b/spec/models/etd_spec.rb index 537d3208..6929840f 100644 --- a/spec/models/etd_spec.rb +++ b/spec/models/etd_spec.rb @@ -18,7 +18,7 @@ subject.subject = ['My Subject'] subject.resource_type = ['Ceremony'] subject.degree = ['Degree'] - subject.level = ['Level'] + # subject.level = ['Level'] subject.discipline = ['Discipline'] subject.degree_granting_institution = ['Degree Granting Inst'] @@ -29,7 +29,7 @@ expect(subject.subject).to eq ['My Subject'] expect(subject.resource_type).to eq ['Ceremony'] expect(subject.degree).to eq ['Degree'] - expect(subject.level).to eq ['Level'] + # expect(subject.level).to eq ['Level'] expect(subject.discipline).to eq ['Discipline'] expect(subject.degree_granting_institution).to eq ['Degree Granting Inst'] end