diff --git a/app/assets/stylesheets/scholarspace/base/_base.scss b/app/assets/stylesheets/scholarspace/base/_base.scss index 4c3c0b53..9a74f3f1 100644 --- a/app/assets/stylesheets/scholarspace/base/_base.scss +++ b/app/assets/stylesheets/scholarspace/base/_base.scss @@ -67,6 +67,19 @@ html { } } + div.section-gw-white, + div.section-gw-darkblue { + h2.h2-section-header { + font-size: 1.7em; + + &:after { + content:' '; + display: block; + border: 2px solid $gw-buff; + } + } + } + div.section-gw-white { min-height: auto; @@ -107,53 +120,65 @@ html { h2 { color: $gw-white; } - - h2.h2-section-header { - font-size: 1.7em; - - &:after { - content:' '; - display: block; - border: 2px solid $gw-buff; - } - } } textarea { resize: none; } - .gw-btn, .btn-primary { + .btn-base { display: inline-block; - padding: 0.3rem 0.75rem; margin: 0; border-radius: 0.25rem; - border: 2px solid $gw-light-blue !important; - background-color: $gw-light-blue !important; - color: $gw-white; font-size: 1em; font-weight: 200; line-height: 1.5; text-decoration: none; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; text-align: center; - - &:focus { - color: $gw-white !important; - background-color: #005984 !important; - outline: 0; - box-shadow: 0 0 0 0.2rem rgba(3, 60, 90, 0.25); + + &.gw-btn { + padding: 0.3rem 0.75rem; + border: 2px solid $gw-light-blue; + background-color: $gw-light-blue; + color: $gw-white; } - + + &.gw-ghost-btn { + padding: 0.3rem 2rem; + border: 2px solid $gw-dark-blue; + background-color: $gw-white; + color: $gw-dark-blue; + } + + &.btn-home { + width: 14rem; + } + + &.btn-categories { + width: 100%; + margin: 0.2em 0; + padding: 0.3rem 1rem; + border: 2px solid $gw-white; + background-color: $gw-white; + color: $gw-dark-blue; + } + &:disabled { opacity: 0.65; } - &:hover { + &:hover, + &:focus { text-decoration: none; - color: #212529 !important; - border-color: $gw-hover-buff !important; - background-color: $gw-hover-buff !important; + color: $gw-dark-blue !important; + border-color: $gw-hover-buff; + background-color: $gw-hover-buff; + } + + &:focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(3, 60, 90, 0.25); } } @@ -231,4 +256,33 @@ html { color: $gw-white; } } - \ No newline at end of file + +//Log In or Sign Up +.login-container { + padding: 0 3em; + + p { + margin: 0; + } + + label { + margin-bottom: 0; + } + + .field { + margin-bottom: 0.5em; + } + + .actions input[type="submit"] { + @extend .btn-base; + @extend .gw-btn; + } + + input[type="checkbox"] { + margin: 0 0.5em 0 0; + } + + #remember-me { + display: flex; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/scholarspace/base/_variables.scss b/app/assets/stylesheets/scholarspace/base/_variables.scss index 6b750d2c..19c00c26 100644 --- a/app/assets/stylesheets/scholarspace/base/_variables.scss +++ b/app/assets/stylesheets/scholarspace/base/_variables.scss @@ -3,12 +3,11 @@ $gw-light-blue: #28659A; $gw-buff: #AA9868; $gw-hover-buff: #D9D0BB; $gw-hover-orange: #A75523; -$mobile-breakpoint: 768px; +$mobile-breakpoint: 767px; +$mobile-max: 766px; $gw-white: #fff; $gw-dark-grey: #444; $gw-light-grey: #eee; $font-family-sans-serif-fallback: Helvetica, Arial, sans-serif; -$font-family-sans-serif: "Gibson VF", $font-family-sans-serif-fallback; - -$mobile-breakpoint: 767px; \ No newline at end of file +$font-family-sans-serif: "Gibson VF", $font-family-sans-serif-fallback; \ No newline at end of file diff --git a/app/assets/stylesheets/scholarspace/components/_collection.scss b/app/assets/stylesheets/scholarspace/components/_collection.scss index 082ab98b..d0ea5951 100755 --- a/app/assets/stylesheets/scholarspace/components/_collection.scss +++ b/app/assets/stylesheets/scholarspace/components/_collection.scss @@ -49,7 +49,7 @@ width: 100%; border-radius: 0; padding: 0.4rem; - margin-left: 0; + margin-left: 0.3rem; .glyphicon-search::before { font-size: 1rem; diff --git a/app/assets/stylesheets/scholarspace/components/_footer.scss b/app/assets/stylesheets/scholarspace/components/_footer.scss index 164b44a9..45dbd359 100644 --- a/app/assets/stylesheets/scholarspace/components/_footer.scss +++ b/app/assets/stylesheets/scholarspace/components/_footer.scss @@ -2,7 +2,7 @@ footer, .footer { position: absolute; bottom: 0; - height: 17.1rem; + height: 18.9rem; width: 100%; .container { diff --git a/app/assets/stylesheets/scholarspace/components/_header.scss b/app/assets/stylesheets/scholarspace/components/_header.scss index 05c5cda2..ede3cae6 100644 --- a/app/assets/stylesheets/scholarspace/components/_header.scss +++ b/app/assets/stylesheets/scholarspace/components/_header.scss @@ -166,7 +166,7 @@ header { align-items: center; #mobile-title { - font-size: 2.5em; + font-size: 2.1em; font-weight: bold; margin-left: 0.3rem; color: $gw-white; @@ -282,7 +282,7 @@ header { width: 70%; } - @media (min-width: 880px) { + @media (min-width: 895px) { width: 100%; } diff --git a/app/assets/stylesheets/scholarspace/components/_homepage.scss b/app/assets/stylesheets/scholarspace/components/_homepage.scss index 5e53cd23..161298d1 100644 --- a/app/assets/stylesheets/scholarspace/components/_homepage.scss +++ b/app/assets/stylesheets/scholarspace/components/_homepage.scss @@ -1,200 +1,491 @@ // Homepage styling .home-content { + display: flex; + flex-direction: column; + + .content-container { + display: flex; + flex-direction: row; + align-items: center; + margin: 0 1em; + } + + #home-block-1 { + margin-bottom: 1rem; display: flex; flex-direction: column; - - div.col-sm-6 { - width: 100%; - - &:last-child { - order: -1; - margin-bottom: 1em; + align-items: center; + + .content-container { + margin: 0 8em; + + @media (max-width: 3000px) { + margin: 0 1.5em; } } - - .nav { - margin-bottom: 0; + + h1#home-header { + margin-top: 0; + margin-bottom: 0.5em; + color: $gw-light-blue; + font-size: 10.5vw; + font-weight: bold; + line-height: 0.8em; + + @media (min-width: $mobile-breakpoint) { + margin-bottom: 0; + } + + @media (min-width: 1034px) { + margin-top: 0.8rem; + } + + //fix for large screens + @media (min-width: 1650px) { + font-size: 10vw; + } } - - @media (min-width: $mobile-breakpoint) { - flex-direction: row; - - div.col-sm-6 { - &:last-child { - order: 1; - margin-bottom: 0; + + .gw-logo { + height: 10em; + width: auto; + background-color: $gw-dark-blue; + margin: 0 0.5em; + padding: 1em; + + img { + width: auto; + height: 100%; } } - } - } - - .tabs-container { - background-color: $gw-dark-blue; - border-radius: 5px; - padding: 0.5em; - - li a { - background-color: transparent; - color: $gw-light-blue; - text-decoration: underline; - - &:hover { - color: $gw-hover-orange; + + .intro { + margin: 0 0.5em; + padding: 1em; + + p { + margin: 0 0 1.4rem; + } + + .button-container > .btn-home:first-child { + margin-right: 1em; + } } - } - - #homeTabs { - li { - width: 50%; - margin-left: 0; - - a { - color: $gw-white; - background-color: $gw-light-blue; - text-decoration: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; + + @media (max-width: 1019px) { + margin: 1em 0 0; + } + + .content-container { + @media (max-width: $mobile-max) { + flex-direction: column; + + .gw-logo { + margin: 0; + height: 5em; + width: 100%; text-align: center; - - &:hover, &:focus { - background-color: $gw-light-blue; + } + + .intro { + margin: 0em; + padding: 1em; + + h2 { + font-weight: 300; + font-size: 1.3em; + } + + p { + margin: 0 0 0.8rem; } } - - @media (min-width: $mobile-breakpoint) { - width: fit-content; + + .button-container > a { + width: 100%; + margin: 0.2em 0; } } - - li.active a { - color: $gw-dark-grey; - background-color: $gw-white; - } } - - .tab-content { - overflow: hidden; - border-top-right-radius: 0; - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; - margin-bottom: 0 !important; - - #featured_container, #recently_uploaded { - background-color: $gw-white; - padding: 0; - - h3 { - margin-bottom: 0; - } - - p { - margin: 0; - padding: 0.5em; + } + + #home-block-2 { + .content-container { + flex-direction: row; + align-items: flex-start; + + #browse-category, + #recently-uploaded { + width: 50%; + padding: 1.5em; + display: flex; + flex-direction: column; + + .content-container { + height: 21vw; + flex-direction: row; + align-items: center; + justify-content: center; + + #categories-container, + #categories-tooltip { + padding: 2em 0.5em 0.5em 0.5em; + } + + #categories-container { + width: 70%; + text-align: center; + display: flex; + flex-direction: column; + } + + #categories-tooltip { + display: flex; + flex-direction: row; + + #arrow-left { + width: 0; + height: 0; + margin-top: 0; + border-top: 1.2em solid transparent; + border-bottom: 1.2em solid transparent; + border-right: 1.2em solid $gw-hover-buff; + } + + #tooltip-box { + width: 9em; + height: 16em; + display: flex; + align-items: center; + padding: 3em 1.5em; + background-color: $gw-hover-buff; + text-align: center; + color: $gw-dark-blue; + + @media (max-width: 1590px) { + width: 9em; + } + } + } + } + + @media (min-width: 2050px) { + height: 21vw; + } + + @media (max-width: 3000px) { + .content-container { + padding: 0; + margin: 0; + + #categories-container, #categories-tooltip { + padding: 0 0.5em 0.5em 0; + } + } + } + + @media (max-width: 1300px) { + .content-container { + height: 19em; + margin: 0; + + #categories-container, #categories-tooltip { + padding: 1em 0 0 0.5em; + } + } + } } + + #recently-uploaded { + height: 100%; + + #recent_docs { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: baseline; + padding-top: 0.5em; + + .recent-work { + width: 12vw; + margin: 0.5em 0.5em; + display: flex; + align-items: baseline; + min-height: 18.5vw; + + .image-wrapper { + position: relative; + overflow: hidden; + height: 15.5vw; + width: 12vw; + + .recent-thumbnail { + height: 100%; + display: flex; + width: auto; + background-color: $gw-white; + justify-content: center; + } + + a { + color: $gw-white; + img { + transition: transform .5s; + } + + &:hover { + color: $gw-hover-buff; + + img { + transform: scale(1.3); + } + } + + img { + width: 100%; + height: auto; + } + } - #recent_docs, #featured_works { - list-style-type: none; - margin-bottom: 0; + .recent-title { + width: calc(100% + 1px); + height: 50%; + position: absolute; + top: 50%; + transform: translateY(-50%); + display: flex; + align-items: center; + justify-content: center; + background-color: $gw-light-blue; + + .title-wrapper { + -webkit-box-orient: vertical; + display: -webkit-box; + -webkit-line-clamp: 4; + padding: 0 1em; + overflow: hidden; + max-width: 100%; + text-align: center; - .recent-item, .featured-item { - border-top: none; - padding: 1em; - - .recent-label, .featured-label { - font-weight: 400; + h3 { + font-size: 1em; + text-decoration: underline; + --max-lines: 4; + --line-height: 1.2; + max-height: calc(var(--max-lines) * 1em * var(--line-height)); + line-height: var(--line-height); + position: relative; + + &:hover { + color: $gw-hover-buff; + } + } + } + } + } + + .keyword-wrapper { + -webkit-box-orient: vertical; + display: -webkit-box; + -webkit-line-clamp: 2; + overflow: hidden; + max-width: 100%; + + .recent-field { + --max-lines: 2; + --line-height: 1.4; + height: calc(var(--max-lines) * 1em * var(--line-height)); + line-height: var(--line-height); + position: relative; + } + } + + @media (max-width: 1300px) { + width: 14vw; + + .image-wrapper { + position: relative; + overflow: hidden; + height: 18.1vw; + width: 14vw; + + .recent-title { + height: 60%; + } + } + + } + + @media (max-width: 940px) { + width: 26.5vw; + height: 100%; + + .image-wrapper { + position: relative; + overflow: hidden; + height: 35vw; + width: 26.5vw; + + .recent-title { + height: 50%; + } + } + } + } + + @media (max-width: $mobile-max) { + flex-direction: column; + width: 80%; + align-items: center; + + .recent-work { + margin: 2em 0; + display: flex; + flex-direction: column; + align-items: center; + + .image-wrapper { + height: 90.5vw; + width: 70vw; + + .recent-title { + height: 40%; + } + } + } } } - - li:nth-child(even) { - background-color: $gw-light-grey; + + @media (max-width: 1280px) { + height: unset; } } - - #featured_works .dd-item { - padding: 0; - } - - .table { - margin-bottom: 0; + + @media (max-width: 940px) { + flex-direction: column; + + #browse-category, + #recently-uploaded { + width: 100%; + height: unset; + padding: 1.5em 0; + + .content-container { + height: unset; + margin: 0; + flex-direction: row; + + #tooltip-box { + width: 20vw; + } + + @media (max-width:445px) { + #categories-container { + .btn-categories { + padding: 0.3rem 0.3rem; + } + } + + #categories-tooltip { + padding-left: 0; + } + } + } + } } } - - @media (min-width: $mobile-breakpoint) { - border-top-right-radius: 5px; - } - } - } - - .dd-placeholder { - margin-top: 0; - margin-bottom: 0.5rem; - } - - .dd-dragel li, .dd-item { - display: flex; - flex-direction: row; - padding: 0; - margin-bottom: 0.5rem; - - .dd-handle { - position: inherit; - background: $gw-light-blue; - border: none; - border-radius: 0; - height: auto; } - - .panel { - margin: 0; - background: $gw-white; - border: 1px solid $gw-dark-grey; - border-left: none; - border-radius: 0; - height: auto; - width: 100%; - max-width: 100%; - font-size: 1rem; - - h3 { - margin-bottom: 0; - } - - a { - font-size: 1rem; - text-decoration: underline; + + #home-block-3 { + .content-container { + margin: 0; + + #collections-bg { + width: 100%; + height: 10rem; + position: absolute; + background-color: $gw-light-blue; + } + + #collections { + width: 100%; + padding: 1.5em; + margin: 0 1em; + z-index: 20; + + #featured-h2 { + width: 50%; + } + + .content-container { + flex-direction: row; + padding: 2em 0; + justify-content: space-around; + + .home-collections { + width: 70vw; + display: flex; + flex-direction: row; + justify-content: space-around; + + .home-collection { + display: flex; + flex-direction: column; + align-items: center; + + .circle { + width: 11em; + height: 11em; + margin: 1em; + padding: 1.5em; + display: flex; + align-items: center; + text-align: center; + border-radius: 50%; + background-color: $gw-dark-blue; + color: $gw-white; + font-weight: bold; + font-size: 1.5em; + transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out; + + &:hover { + background-color: $gw-hover-buff; + color: $gw-dark-blue; + text-decoration: none; + } + } + } + } + + .btn-coll { + width: 15rem; + margin-bottom: 2.5rem; + } + + @media (max-width: 1280px) { + flex-direction: column; + + .home-collections { + margin-bottom: 1em; + } + } + + @media (max-width: 940px) { + .home-collections { + flex-direction: column; + } + } + } + + @media (max-width: 1280px) { + padding: 1.5em 0; + + #featured-h2 { + width: 100%; + } + } + } } } - } - - #new_featured_work_list .btn { - width: 100%; - max-width: 100%; - border: none; - border-radius: 0; - background-color: $gw-light-blue; - color: $gw-white; - - &:hover { - background-color: $gw-hover-buff; - color: $gw-dark-blue; - } - } - - #publication-content { - h2 { - display: flex; - align-items: center; - } - - img.featured { - margin: 0px 10px 10px 0px; - } - } - - //misc bootstrap overwrite - .nav-pills li.active a, .nav-pills li.active a:hover, .nav-pills li.active a:focus { - color: $gw-dark-grey; - background-color: $gw-white; - } - \ No newline at end of file +} diff --git a/app/assets/stylesheets/scholarspace/components/_search.scss b/app/assets/stylesheets/scholarspace/components/_search.scss index c9c039e7..caaee5d6 100644 --- a/app/assets/stylesheets/scholarspace/components/_search.scss +++ b/app/assets/stylesheets/scholarspace/components/_search.scss @@ -148,6 +148,14 @@ li.document { padding: 1em; + + &.blacklight-collection { + .col-md-2, + .col-md-10, + .collection-counts-wrapper { + display: none; + } + } &:nth-child(odd) { background-color: $gw-light-grey; diff --git a/app/assets/stylesheets/scholarspace/components/_static-page.scss b/app/assets/stylesheets/scholarspace/components/_static-page.scss index ec7d8bda..e6a3b12f 100644 --- a/app/assets/stylesheets/scholarspace/components/_static-page.scss +++ b/app/assets/stylesheets/scholarspace/components/_static-page.scss @@ -3,23 +3,11 @@ .share-header-text { margin-bottom: 0; color: $gw-light-blue; - font-size: 8em; + font-size: 8vw; font-weight: bold; - @media (max-width: 1200px) { - font-size: 7em; - } - - @media (max-width: 991px) { - font-size: 5em; - } - - @media (max-width: 670px) { - font-size: 4em; - } - - @media (max-width: 535px) { - font-size: 2.7em; + @media (min-width: 1786) { + font-size: 6.5em; } } @@ -37,7 +25,7 @@ padding: 2em 1em; } - @media (max-width: $mobile-breakpoint) { + @media (max-width: $mobile-max) { flex-direction: column; .deposit-etd, @@ -51,23 +39,15 @@ .about-header-text { margin-bottom: 0; color: $gw-light-blue; - font-size: 6em; + font-size: 8vw; font-weight: bold; - @media (max-width: 1200px) { - font-size: 5em; - } - - @media (max-width: 991px) { - font-size: 4em; - } - - @media (max-width: 748px) { - font-size: 3em; + @media (min-width: $mobile-breakpoint) { + font-size: 5.7vw; } - @media (max-width: 535px) { - font-size: 2.7em; + @media (min-width: 1666) { + font-size: 5.8em; } } diff --git a/app/controllers/hyrax/homepage_controller_decorator.rb b/app/controllers/hyrax/homepage_controller_decorator.rb new file mode 100644 index 00000000..30ee063c --- /dev/null +++ b/app/controllers/hyrax/homepage_controller_decorator.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true +# OVERRIDE Hyrax v3.6.0 to display 3 rather than 4 recent uploads +module Hyrax + module HomepageControllerDecorator + def recent + # grab any recent documents + (_, @recent_documents) = search_service.search_results do |builder| + builder.rows(3) + builder.merge(sort: sort_field) + end + rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest + @recent_documents = [] + end + end +end + +Hyrax::HomepageController.prepend Hyrax::HomepageControllerDecorator \ No newline at end of file diff --git a/app/views/_controls.html.erb b/app/views/_controls.html.erb index c351cf06..7e68f12f 100644 --- a/app/views/_controls.html.erb +++ b/app/views/_controls.html.erb @@ -27,7 +27,7 @@ - diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb new file mode 100644 index 00000000..8ba65bc8 --- /dev/null +++ b/app/views/devise/passwords/new.html.erb @@ -0,0 +1,18 @@ +
+

Forgot your password?

+ + <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + +
+

<%= f.label :email %>

+

<%= f.email_field :email, autofocus: true, autocomplete: "email" %>

+
+ +
+ <%= f.submit "Send me password reset instructions" %> +
+ <% end %> + + <%= render "devise/shared/links" %> +
\ No newline at end of file diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb new file mode 100644 index 00000000..0c7ffa1c --- /dev/null +++ b/app/views/devise/registrations/new.html.erb @@ -0,0 +1,31 @@ +
+

Sign up

+ + <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + +
+

<%= f.label :email %>

+

<%= f.email_field :email, autofocus: true, autocomplete: "email" %>

+
+ +
+

<%= f.label :password %>

+ <% if @minimum_password_length %> +

(<%= @minimum_password_length %> characters minimum)

+ <% end %> +

<%= f.password_field :password, autocomplete: "new-password" %>

+
+ +
+

<%= f.label :password_confirmation %>

+

<%= f.password_field :password_confirmation, autocomplete: "new-password" %>

+
+ +
+ <%= f.submit "Sign up" %> +
+ <% end %> + + <%= render "devise/shared/links" %> +
\ No newline at end of file diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb new file mode 100644 index 00000000..3f5617e8 --- /dev/null +++ b/app/views/devise/sessions/new.html.erb @@ -0,0 +1,28 @@ +
+

Log in

+ + <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+

<%= f.label :email %>

+

<%= f.email_field :email, autofocus: true, autocomplete: "email" %>

+
+ +
+

<%= f.label :password %>

+

<%= f.password_field :password, autocomplete: "current-password" %>

+
+ + <% if devise_mapping.rememberable? %> +
+

<%= f.check_box :remember_me %>

+

<%= f.label :remember_me %>

+
+ <% end %> + +
+ <%= f.submit "Log in" %> +
+ <% end %> + + <%= render "devise/shared/links" %> +
\ No newline at end of file diff --git a/app/views/hyrax/base/_citations.html.erb b/app/views/hyrax/base/_citations.html.erb index 0ba82a6b..22b1c47c 100644 --- a/app/views/hyrax/base/_citations.html.erb +++ b/app/views/hyrax/base/_citations.html.erb @@ -1,6 +1,6 @@ <% if Hyrax.config.citations? %>
- <%= link_to "Citations", hyrax.citations_work_path(presenter), id: 'citations', class: 'gw-btn' %> + <%= link_to "Citations", hyrax.citations_work_path(presenter), id: 'citations', class: 'btn-base gw-btn' %>
diff --git a/app/views/hyrax/collections/_sort_and_per_page.html.erb b/app/views/hyrax/collections/_sort_and_per_page.html.erb index 192b8d04..f420ad62 100644 --- a/app/views/hyrax/collections/_sort_and_per_page.html.erb +++ b/app/views/hyrax/collections/_sort_and_per_page.html.erb @@ -10,7 +10,7 @@ <%= select_tag(:per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page, h(params[:per_page])), title: t('.number_of_results_to_display_per_page')) %> <% end %> <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %> -   +   <% end %> <% end %> diff --git a/app/views/hyrax/contact_form/new.html.erb b/app/views/hyrax/contact_form/new.html.erb index 487a99c2..931d11b0 100644 --- a/app/views/hyrax/contact_form/new.html.erb +++ b/app/views/hyrax/contact_form/new.html.erb @@ -60,7 +60,7 @@ <% else %> <%= recaptcha_v3(action: 'contact', site_key: ENV['RECAPTCHA_SITE_KEY_V3']) %> <% end %> - <%= f.submit value: t('hyrax.contact_form.button_label'), class: "btn btn-primary" %> + <%= f.submit value: t('hyrax.contact_form.button_label'), class: "btn-base gw-btn" %> <% end %>
\ No newline at end of file diff --git a/app/views/hyrax/file_sets/media_display/_default.html.erb b/app/views/hyrax/file_sets/media_display/_default.html.erb index 330d4886..ebb7a4dd 100644 --- a/app/views/hyrax/file_sets/media_display/_default.html.erb +++ b/app/views/hyrax/file_sets/media_display/_default.html.erb @@ -6,13 +6,13 @@ hyrax.download_path(file_set, :disposition => "attachment"), id: "file_download", data: { label: file_set.id }, - class: "gw-btn", + class: "btn-base gw-btn", target: "_new" %>

<%= link_to t('hyrax.file_set.show.downloadable_content.default_new_tab'), hyrax.download_path(file_set, :disposition => "inline"), id: "file_download", data: { label: file_set.id }, - class: "gw-btn", + class: "btn-base gw-btn", target: "_new" %> <% if (Rails.configuration.respond_to?(:accessibility_url)) && (@presenter.respond_to?(:permanent_url)) %>

<%= link_to t('hyrax.file_set.show.downloadable_content.pdf_new_tab'), hyrax.download_path(file_set, :disposition => "inline"), target: :_blank, id: "file_open", data: { label: file_set.id }, - class: "gw-btn" %> + class: "btn-base gw-btn" %> <% if (Rails.configuration.respond_to?(:accessibility_url)) && (@presenter.respond_to?(:permanent_url)) %>
+
+
+

Browse by Category

+
+ +
+
+
Browse theses and dissertations by GW students
+
+
+
+
+

Recently Uploaded

+
+ <%= render 'recently_uploaded', recent_documents: @recent_documents %> +
+
+
+
+ +<%= javascript_tag do %> + arrow = document.getElementById('arrow-left'); + text = document.getElementById('tooltip-box'); + + etds = document.getElementById('etds'); + journals = document.getElementById('journals'); + articles = document.getElementById('articles'); + posters = document.getElementById('posters'); + presentations = document.getElementById('presentations'); + materials = document.getElementById('materials'); + + etds.addEventListener("mouseover", (event) => { + arrow.style.marginTop = '0'; + text.innerHTML = 'Browse theses and dissertations by GW students'; + }); + journals.addEventListener("mouseover", (event) => { + arrow.style.marginTop = '2.7em'; + text.innerHTML = 'Browse journals published by GW student organizations and other GW-affiliated organizations'; + }); + articles.addEventListener("mouseover", (event) => { + arrow.style.marginTop = '5.5em'; + text.innerHTML = 'Browse individual articles authored by GW faculty, staff, students, and published by GW-affiliated orgnaizations'; + }); + posters.addEventListener("mouseover", (event) => { + arrow.style.marginTop = '8.2em'; + text.innerHTML = 'Browse posters created by GW faculty, staff, and students for various research purposes'; + }); + presentations.addEventListener("mouseover", (event) => { + arrow.style.marginTop = '10.9em'; + text.innerHTML = 'Browse presentations given by GW faculty, staff, and students for conferences and other meetings'; + }); + materials.addEventListener("mouseover", (event) => { + arrow.style.marginTop = '13.6em'; + text.innerHTML = 'Browse digitized and born-digital content from the specialized collections of GW Libraries & Academic Innovation'; + }); +<% end %> \ No newline at end of file diff --git a/app/views/hyrax/homepage/_home_collections.html.erb b/app/views/hyrax/homepage/_home_collections.html.erb new file mode 100644 index 00000000..4ddb8214 --- /dev/null +++ b/app/views/hyrax/homepage/_home_collections.html.erb @@ -0,0 +1,25 @@ +
+
+
+ +
+
\ No newline at end of file diff --git a/app/views/hyrax/homepage/_home_header_block.html.erb b/app/views/hyrax/homepage/_home_header_block.html.erb new file mode 100644 index 00000000..eccd9e18 --- /dev/null +++ b/app/views/hyrax/homepage/_home_header_block.html.erb @@ -0,0 +1,16 @@ +
+

GW ScholarSpace

+
+ +
+

The George Washington University's Institutional Repository

+

As the George Washington University's institutional repository, GW ScholarSpace provides free, public access, broad visibility, and long-term preservation for the research and scholarly works created by GW's faculty, staff, and students, including electronic theses and dissertations (ETDs).

+ +
+
+
\ No newline at end of file diff --git a/app/views/hyrax/homepage/_recent_document.html.erb b/app/views/hyrax/homepage/_recent_document.html.erb index bd487a6f..24dae681 100644 --- a/app/views/hyrax/homepage/_recent_document.html.erb +++ b/app/views/hyrax/homepage/_recent_document.html.erb @@ -1,15 +1,24 @@ -
  • -
    -
    +
    +
    <%= t('hyrax.homepage.recently_uploaded.document.title_label') %> -

    +
    <%= link_to [main_app, recent_document] do %> - <%= render_thumbnail_tag(recent_document, {width: 90, alt:"Preview of #{recent_document.title[0]}"}, {suppress_link: true}) + recent_document.to_s %> +
    + <%= render_thumbnail_tag(recent_document, {alt: "#{recent_document} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) %> +
    +
    +
    +

    + <%= recent_document %> +

    +
    +
    <% end %> -

    -

    - <%= t('hyrax.homepage.recently_uploaded.document.keyword_label') %>: <%= link_to_facet_list(recent_document.keyword, 'keyword', t('hyrax.homepage.recently_uploaded.document.keyword_missing')).html_safe %> -

    -
    +
    +
    +

    + <%= t('hyrax.homepage.recently_uploaded.document.keyword_label') %>: <%= link_to_facet_list(recent_document.keyword, 'keyword', t('hyrax.homepage.recently_uploaded.document.keyword_missing')).html_safe %> +

    +
    -
  • + diff --git a/app/views/hyrax/homepage/_recently_uploaded.html.erb b/app/views/hyrax/homepage/_recently_uploaded.html.erb index 8479e700..dfcb8723 100644 --- a/app/views/hyrax/homepage/_recently_uploaded.html.erb +++ b/app/views/hyrax/homepage/_recently_uploaded.html.erb @@ -3,8 +3,6 @@

    <%= t('.no_public') %>

    <% else %>
    - <%= render partial: "recent_document", collection: recent_documents %> -
    <% end %> diff --git a/app/views/hyrax/homepage/index.html.erb b/app/views/hyrax/homepage/index.html.erb index addb6128..53c6a2ef 100644 --- a/app/views/hyrax/homepage/index.html.erb +++ b/app/views/hyrax/homepage/index.html.erb @@ -1,5 +1,7 @@ <% provide :page_title, application_name %>
    - <%= render 'home_content' %> + <%= render 'home_header_block' %> + <%= render 'home_categories_featured' %> + <%= render 'home_collections' %>
    diff --git a/app/views/hyrax/pages/_form.html.erb b/app/views/hyrax/pages/_form.html.erb index 7efaa257..f36225b8 100644 --- a/app/views/hyrax/pages/_form.html.erb +++ b/app/views/hyrax/pages/_form.html.erb @@ -29,7 +29,7 @@ <% end %> @@ -45,7 +45,7 @@ <% end %> @@ -61,7 +61,7 @@ <% end %> @@ -77,7 +77,7 @@ <% end %> @@ -93,7 +93,7 @@ <% end %> diff --git a/spec/fixtures/content_blocks/about_page.html b/spec/fixtures/content_blocks/about_page.html index 2253e66e..3ea0358f 100644 --- a/spec/fixtures/content_blocks/about_page.html +++ b/spec/fixtures/content_blocks/about_page.html @@ -18,7 +18,7 @@

    What belongs in GW ScholarSpace?

    Appropriate types of works that may be submitted to GW ScholarSpace include, but are not limited to: