diff --git a/app/assets/images/footer/elevation_map_mpls.acorn b/app/assets/images/footer/elevation_map_mpls.acorn new file mode 100644 index 000000000..8cac0ef16 Binary files /dev/null and b/app/assets/images/footer/elevation_map_mpls.acorn differ diff --git a/app/assets/images/footer/elevation_map_mpls.png b/app/assets/images/footer/elevation_map_mpls.png new file mode 100644 index 000000000..752032590 Binary files /dev/null and b/app/assets/images/footer/elevation_map_mpls.png differ diff --git a/app/assets/images/footer/elevation_map_mpls_blueish.png b/app/assets/images/footer/elevation_map_mpls_blueish.png new file mode 100644 index 000000000..a24906cf9 Binary files /dev/null and b/app/assets/images/footer/elevation_map_mpls_blueish.png differ diff --git a/app/assets/images/footer/elevation_map_mpls_blueish_8.png b/app/assets/images/footer/elevation_map_mpls_blueish_8.png new file mode 100644 index 000000000..28657f67f Binary files /dev/null and b/app/assets/images/footer/elevation_map_mpls_blueish_8.png differ diff --git a/app/assets/images/footer/notes.txt b/app/assets/images/footer/notes.txt new file mode 100644 index 000000000..c60ddda5a --- /dev/null +++ b/app/assets/images/footer/notes.txt @@ -0,0 +1,2 @@ +Elevation map mpls: +https://geodev.btaa.org/catalog/p16022coll289:22 \ No newline at end of file diff --git a/app/assets/images/gin-white.png b/app/assets/images/gin-white.png index 635258c4e..d4df6410d 100644 Binary files a/app/assets/images/gin-white.png and b/app/assets/images/gin-white.png differ diff --git a/app/assets/javascripts/geoportal/modules/home.js b/app/assets/javascripts/geoportal/modules/home.js index eed15b47f..f072732ba 100644 --- a/app/assets/javascripts/geoportal/modules/home.js +++ b/app/assets/javascripts/geoportal/modules/home.js @@ -6,7 +6,8 @@ Blacklight.onLoad(function() { console.log('Map: Home') - geoblacklight.map.setZoom(2); + // geoblacklight.map.setZoom(3); + geoblacklight.map.setView(new L.LatLng(20.737, -64.990), 3); geoblacklight.map.addControl(L.control.geosearch({ baseUrl: '/', dynamic: false, diff --git a/app/assets/stylesheets/geoportal/_footer.scss b/app/assets/stylesheets/geoportal/_footer.scss index 151e693e2..46ff74cb7 100644 --- a/app/assets/stylesheets/geoportal/_footer.scss +++ b/app/assets/stylesheets/geoportal/_footer.scss @@ -3,36 +3,48 @@ $white: #FFFFFF; // 100% $gray: #CCCCCC; // 80% $black: #000000; // 0% $btaa-blue: #005E8E; +$btaa-blue-dark: #003c5b; $radius: 4px; +// Sass link color variables +$link-color: $white; +$hover-color: darken($link-color, 20%); +$visited-color: lighten($link-color, 20%); section#footer-app { color:$white; - padding-top:1rem; padding-bottom:1rem; background-color: $btaa-blue; - a { - color:$white; - } - ul { - margin-bottom:0rem; - } - img { - width: 20px; - height: 20px; - } -} - -footer { - background-color:$gray; - padding-top:2rem; - padding-bottom:2rem; + border-top: 1rem solid $btaa-blue-dark; + border-bottom: 0.5rem solid $btaa-blue-dark; + background-image: asset_url('footer/elevation_map_mpls_blueish.png'); + background-repeat: no-repeat; + background-attachment: fixed; + background-position: center; + // Link styling a { - color: $black; + color: $link-color; + text-decoration: none; + + &:hover{ + color: $hover-color; + border-bottom: 1px solid $hover-color; + } + + &:visited{ + color: $visited-color; + border-color: $visited-color; + } } -} + + #footer-title { + padding-top:1.5rem; -#university-libraries { - border:4px solid $white; + a { + &:hover { + border-bottom: none; + } + } + } } diff --git a/app/assets/stylesheets/geoportal/_homepage.scss b/app/assets/stylesheets/geoportal/_homepage.scss index 238e1572d..44419e075 100644 --- a/app/assets/stylesheets/geoportal/_homepage.scss +++ b/app/assets/stylesheets/geoportal/_homepage.scss @@ -5,6 +5,10 @@ $black: #000000; // 0% $btaa-blue: #005E8E; $radius: 4px; +html { + background-color: $btaa-blue; +} + #survey-button { position: fixed; bottom:2rem; @@ -22,8 +26,13 @@ main.homepage { padding-left:15px; padding-right:15px; + &.container-fluid { + margin-top:0rem; + } + #home-content { - margin-top:5.5rem; + margin-top:0rem; + h2 { margin-top:1rem; } @@ -31,9 +40,8 @@ main.homepage { #wrapper-map { div#map-container { - position:fixed; - top:5.5rem; height: 100%; + width: 100%; padding:0px; div#map { diff --git a/app/assets/stylesheets/geoportal/_navbar.scss b/app/assets/stylesheets/geoportal/_navbar.scss index d84229322..b0fd3c93c 100644 --- a/app/assets/stylesheets/geoportal/_navbar.scss +++ b/app/assets/stylesheets/geoportal/_navbar.scss @@ -5,12 +5,23 @@ $black: #000000; // 0% $btaa-blue: #005E8E; $radius: 4px; +// Sass link color variables +$link-color: $white; +$hover-color: darken($link-color, 20%); +$visited-color: lighten($link-color, 20%); -div#cic-header-navbar { +div#b1g-header-navbar { margin-bottom:0; background-color: darken($btaa-blue, 10%); padding-left:0.5rem; padding-right:0.5rem; + + a#btaa-logo { + &:hover { + border-bottom: none !important; + text-decoration: none !important; + } + } } #header-navbar { @@ -29,9 +40,21 @@ div#cic-header-navbar { div#application-header { background-color:$btaa-blue; + // Link styling a { - color:$white !important; - } + color: $link-color; + text-decoration: none; + + &:hover{ + color: $hover-color; + border-bottom: 1px solid $hover-color; + } + + &:visited{ + color: $visited-color; + border-color: $visited-color; + } + } .navbar-brand { margin-top: -1rem; @@ -40,12 +63,21 @@ div#application-header { background:none; overflow:visible; text-indent:0; - border:none; height: 50px; margin-left:1rem; - } - .navbar-brand:hover { - color: $white !important; + border:none !important; + text-decoration: none !important; + + &:hover { + color: $white !important; + text-decoration: none !important; + } + + &:visited { + color: $visited-color !important; + text-decoration: none !important; + border: none !important; + } } span.icon-bar { @@ -71,10 +103,4 @@ form.search-query-form { font-size: 32px; } } - - main { - #home-content { - margin-top: 3rem !important; - } - } } diff --git a/app/assets/stylesheets/geoportal/_results.scss b/app/assets/stylesheets/geoportal/_results.scss index b4a0f81a4..668c5a867 100644 --- a/app/assets/stylesheets/geoportal/_results.scss +++ b/app/assets/stylesheets/geoportal/_results.scss @@ -6,13 +6,19 @@ } } -// a11y active pagination page link -.page-link { - text-decoration: underline; -} +.page-links a, a.page-link { + + color: #005E8E; -.page-links a { - text-decoration: underline; + &:hover { + color: #005E8E !important; + border-color: #dee2e6 !important; + } + + &:visited { + color: #005E8E !important; + border-color: #dee2e6 !important; + } } .page-item.active .page-link { diff --git a/app/assets/stylesheets/geoportal/_todo.scss b/app/assets/stylesheets/geoportal/_todo.scss index a1b2e92f2..1d9bf08aa 100644 --- a/app/assets/stylesheets/geoportal/_todo.scss +++ b/app/assets/stylesheets/geoportal/_todo.scss @@ -5,9 +5,42 @@ $black: #000000; // 0% $btaa-blue: #005E8E; $radius: 4px; -// link -a { text-decoration: underline; } +// link color variables +$link-color: $btaa-blue; +$hover-color: darken($link-color, 20%); +$visited-color: lighten($link-color, 15%); + +// link styling +a { + color: $link-color; + text-decoration: none; + + &:hover{ + color: $hover-color; + } + + &:visited{ + color: $visited-color; + border-color: $visited-color; + } +} a.btn { text-decoration: none; } +a.btn.btn-primary { + color: $white; + background-color: $btaa-blue; + border-color: $btaa-blue; + + + &:hover { + color: $white; + background-color: #003c5b; + border-color: #006fa8; + } + + &:visited { + color: $white; + } +} a.navbar-brand { text-decoration: none; } #geoportal-about { diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb index 0c93da8ba..6881077a1 100644 --- a/app/views/_user_util_links.html.erb +++ b/app/views/_user_util_links.html.erb @@ -3,7 +3,7 @@
  • <%= action %>
    • <% end %>
  • <%=link_to('About', 'https://gin.btaa.org', {class: 'nav-link'})%>
    • -
  • <%=link_to('News', 'https://geobtaa.blogspot.com/', {class: 'nav-link'})%>
    • +
  • <%=link_to('Collection Stories', 'https://geobtaa.blogspot.com/', {class: 'nav-link'})%>
  • <%=link_to('Help', 'https://gin.btaa.org/guides/', {class: 'nav-link'})%>
  • <%=link_to('Feedback', '/feedback', {class: 'nav-link'})%>
    • diff --git a/app/views/catalog/_home_text.html.erb b/app/views/catalog/_home_text.html.erb index a8beddcff..e90548dc8 100644 --- a/app/views/catalog/_home_text.html.erb +++ b/app/views/catalog/_home_text.html.erb @@ -77,11 +77,6 @@
    -

    - <%= link_to "https://gin.btaa.org" do %> - <%= image_tag('gin-cropped.png', {alt: "Big Ten Academic Alliance Logo", height: '80px'}) %> - <% end %> -

    The Big Ten Academic Alliance Geoportal provides discoverability and facilitates access to geospatial resources. The resources in the portal are selected and curated by librarians and geospatial specialists at fifteen research institutions in the Big Ten Academic Alliance.

    The resources include GIS datasets, web services, and digitized historical maps. Learn more about the research institutions involved and the sources of the geospatial records.

    @@ -96,7 +91,7 @@

    -
    +
    diff --git a/app/views/layouts/blacklight/base.html.erb b/app/views/layouts/blacklight/base.html.erb index 2fb207e7c..364063565 100644 --- a/app/views/layouts/blacklight/base.html.erb +++ b/app/views/layouts/blacklight/base.html.erb @@ -55,6 +55,9 @@ <% if homepage? %> <%= render :partial=>'shared/flash_msg', layout: 'shared/flash_messages' %> <%= render 'home' %> + <% else %>
    <%= content_for(:container_header) %> @@ -68,10 +71,6 @@ - -
    - <%= render :partial => 'shared/footer_umn' %> -
    <% end %> <%= render partial: 'shared/modal' %> diff --git a/app/views/shared/_footer_app.html.haml b/app/views/shared/_footer_app.html.haml index 985efddff..3531280fb 100644 --- a/app/views/shared/_footer_app.html.haml +++ b/app/views/shared/_footer_app.html.haml @@ -1,16 +1,91 @@ %div.container-fluid %div.row - %div.col-xs-12.col-lg-12 - %h3 Big Ten Academic Alliance Geoportal - %ul.list-horizontal + %div#footer-title.col-xs-12.col-lg-12 + = link_to "https://gin.btaa.org" do + = image_tag('gin-white.png', {alt: "Big Ten Academic Alliance Logo", height: '80px'}) + + %div.col-xs-12.col-lg-6 + + %h3.mt-3 About & Help + %ul.list-unstyled + %li + = link_to "About Us", "https://gin.btaa.org/about/about-us/" + %li + = link_to "Program Updates", "https://gin.btaa.org/updates" + %li + = link_to "Contact Us", "https://geo.btaa.org/feedback" + %li + = link_to "Help Guides", "https://gin.btaa.org/guides/" + %li + = link_to "Tutorials", "https://gin.btaa.org/tutorials" + + %h3.mt-3 Policies + %ul.list-unstyled + %li + = link_to "Harmful Language Statement", "https://gin.btaa.org/policies/harmful-language" + %li + = link_to "Privacy Statement", "https://btaa.org/privacy" + %li + = link_to "Collection Development", "https://gin.btaa.org/policies/collection-development" + + %h3.mt-3 Sponsors + %ul.list-unstyled + %li + = link_to "Big Ten Academic Alliance", "https://btaa.org/" + %li + = link_to "BTAA Geospatial Information Network", "https://gin.btaa.org/" + %li + = link_to "University of Minnesota Libraries", "https://lib.umn.edu/" + + %div.col-xs-12.col-lg-6 + %h3.mt-3 BTAA Geoportal Collection Stories + %ul.list-unstyled + %li + %strong + = link_to "Using Maps for an Art Exhibition at Ohio State", "https://geobtaa.blogspot.com/2024/10/using-maps-for-art-exhibition-at-ohio.html" + • October 16, 2024 + %li + %strong + = link_to "Negro Motorist Green Book Locations in Detroit", "https://geobtaa.blogspot.com/2024/09/negro-motorist-green-book-locations-in.html" + • September 18, 2024 + %li + %strong + = link_to "Archiving geospatial data at the University of Wisconsin-Madison", "https://geobtaa.blogspot.com/2024/07/archiving-geospatial-data-at-university.html" + • July 18, 2024 + + %p + = link_to "More Collection Stories", "https://geobtaa.blogspot.com/" + + %h4.mt-4 Explore BTAA Member Libraries + %ul.list-unstyled{style: "column-count: 2;"} + %li + = link_to "University of Chicago", "https://www.lib.uchicago.edu/" + %li + = link_to "University of Illinois", "https://www.library.illinois.edu/" + %li + = link_to "Indiana University", "https://libraries.indiana.edu/" + %li + = link_to "University of Iowa", "https://www.lib.uiowa.edu/" + %li + = link_to "University of Maryland", "https://www.lib.umd.edu/" + %li + = link_to "University of Michigan", "https://www.lib.umich.edu/" + %li + = link_to "Michigan State University", "https://lib.msu.edu/" + %li + = link_to "University of Minnesota", "https://www.lib.umn.edu/" + %li + = link_to "University of Nebraska-Lincoln", "https://libraries.unl.edu/" + %li + = link_to "Northwestern University", "https://www.library.northwestern.edu/" %li - = link_to "News & Updates".html_safe, 'https://geobtaa.blogspot.com' + = link_to "The Ohio State University", "https://library.osu.edu/" %li - = link_to "About Us", 'https://gin.btaa.org' + = link_to "Pennsylvania State University", "https://libraries.psu.edu/" %li - %a{href:'https://gin.btaa.org/library/harmful-language/'} Harmful Language Statement + = link_to "Purdue University", "https://www.lib.purdue.edu/" %li - %a{href:'https://geo.btaa.org/feedback'} Contact Project Team + = link_to "Rutgers University", "https://www.libraries.rutgers.edu/" %li - %a{href:'http://www.btaa.org'} Big Ten Academic Alliance Homepage + = link_to "University of Wisconsin-Madison", "https://www.library.wisc.edu/" diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb index f7517e159..0c0cba3fb 100644 --- a/app/views/shared/_header_navbar.html.erb +++ b/app/views/shared/_header_navbar.html.erb @@ -1,9 +1,8 @@ -<%- header_classes = homepage? ? 'fixed-top' : nil %> -
    +