Skip to content

Commit

Permalink
aesthetic updates
Browse files Browse the repository at this point in the history
closes #73
closes #74

- moves IIIF box below metadata
- removes GeoBlacklight version from home page
- changes branding/name
- fixes links in navigation bar and footer
  • Loading branch information
rmseifried committed Apr 6, 2023
1 parent b8f91b1 commit d387e5c
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 18 deletions.
5 changes: 2 additions & 3 deletions app/controllers/catalog_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ class CatalogController < ApplicationController
# To move metadata above the map viewer,
# remove the lines deleting and re-adding the :show partial
config.show.display_type_field = 'format'
config.show.partials.delete(:show)
# config.show.partials.delete(:show)
config.show.partials << 'show_default_viewer_container'
config.show.partials << 'show_default_attribute_table'
config.show.partials << 'show_default_viewer_information'
config.show.partials << :show
# config.show.partials << :show

##
# Configure the index document presenter.
Expand Down Expand Up @@ -108,7 +108,6 @@ class CatalogController < ApplicationController
# config.add_facet_field Settings.FIELDS.PUBLISHER, :label => 'Publisher', :limit => 8
config.add_facet_field Settings.FIELDS.PROVIDER, :label => 'Provider', :limit => 8, item_component: Geoblacklight::IconFacetItemComponent
config.add_facet_field Settings.FIELDS.GEOREFERENCED, :label => 'Georeferenced', :limit => 3
# config.add_facet_field Settings.FIELDS.SOURCE, :label => 'Collection', :limit => 8, :show => false
config.add_facet_field Settings.FIELDS.ANNOTATION, :label => 'Annotated', :limit => 8

# GEOBLACKLIGHT APPLICATION FACETS
Expand Down
2 changes: 1 addition & 1 deletion app/views/catalog/_home_text.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<%= content_tag :div, '', id: 'map', aria: { label: t('geoblacklight.map.label') }, data: { map: 'home', 'catalog-path'=> search_catalog_path , 'map-geom' => Settings.HOMEPAGE_MAP_GEOM, basemap: geoblacklight_basemap, leaflet_options: leaflet_options } %>
</div>
</div>
<div id="geoblacklight-version" class='text-right'>
<div id="geoblacklight-version" class='text-right sr-only'>
<%= t('geoblacklight.home.version', version: Geoblacklight::VERSION ) %>
</div>
</div>
4 changes: 2 additions & 2 deletions app/views/shared/_header_navbar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
</div>
<% else %>
<div class='geobl-homepage-masthead jumbotron'>
<div class='d-flex justify-content-center'>
<%= content_tag :h3, t('geoblacklight.home.search_heading'), class: 'text-center' %>
<div class='d-flex justify-content-center', style="padding-bottom: 10px">
<%= content_tag :h2, t('geoblacklight.home.search_heading'), class: 'text-center' %>
</div>
<div class='row justify-content-md-center'>
<div class='col-md-6 col-sm-12'>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_top_navbar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<div class="site-name">
<h1>
<%= link_to 'GeoData', root_url %>
<%= link_to 'UMAP GeoData', root_url %>
</h1>
</div>

Expand Down
10 changes: 5 additions & 5 deletions app/views/shared/_umass_footer.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<%= image_tag('UMass_logo_white.png', alt: 'UMass Amherst', class: 'app-footer-logo', height: '150px') %>
</div>
<div class="col-md-3 mt-4">
<h3 class="h6">GeoData</h3>
<h3 class="h6">UMAP GeoData</h3>
<ul class="list-unstyled">
<li><%= link_to('About', 'https://gis.library.umass.edu/data/geodata/', {class: 'nav-link'}) %></li>
<li><%=link_to('Help', 'https://gis.library.umass.edu/data/geodata/#help', {class: 'nav-link'})%></li>
<li><%=link_to('Contact', 'https://gis.library.umass.edu/learning-gis/consultations/', {class: 'nav-link'})%></li>
<li><%=link_to('Get Help', 'https://gis.library.umass.edu/learning-gis/get-help/', {class: 'nav-link'})%></li>
<li><%=link_to('View on GitHub', 'https://github.com/umass-gis/geoblacklight', {class: 'nav-link'})%></li>
</ul>
</div>
<div class="col-md-4 mt-4">
Expand All @@ -24,13 +24,13 @@
<hr/>
<div class="row">
<div class="col-md-5">
©2021 <a href="https://www.umass.edu/" id="umass--global--footer-home">University of Massachusetts Amherst</a>
© <%= Date.today.year %> <a href="https://www.umass.edu/" id="umass--global--footer-home">University of Massachusetts Amherst</a>
</div>

<div class="col-md-7">
<ul id="footer-campus-links" class="navbar-nav">
<li class="nav-item">
<a class="nav-link first" href="https://www.umass.edu/site-policies" id="umass--global--footer-policies">Site&nbsp;Policies</a>
<a class="nav-link first" href="https://www.umass.edu/gateway/site-policies" id="umass--global--footer-policies">Site&nbsp;Policies</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://www.umass.edu/accessibility/" id="umass--global--footer-accessibility">Accessibility</a>
Expand Down
5 changes: 1 addition & 4 deletions app/views/shared/_user_util_links.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<%=link_to('About', 'https://gis.library.umass.edu/data/geodata/', {class: 'nav-link'})%>
</li>
<li class="nav-item">
<%=link_to('Help', 'https://gis.library.umass.edu/data/geodata/#help', {class: 'nav-link'})%>
</li>
<li class="nav-item">
<%=link_to('Contact', 'https://gis.library.umass.edu/learning-gis/consultations/', {class: 'nav-link'})%>
<%=link_to('Get Help', 'https://gis.library.umass.edu/learning-gis/get-help/', {class: 'nav-link'})%>
</li>
</ul>
2 changes: 1 addition & 1 deletion config/locales/blacklight.en.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
en:
blacklight:
application_name: 'GeoData'
application_name: 'UMAP GeoData'
search:
form:
search:
Expand Down
2 changes: 1 addition & 1 deletion config/locales/geoblacklight.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ en:
export_geotiff_link: 'GeoTIFF'
home:
headline: 'Explore and discover...'
search_heading: 'Find the maps and data you need'
search_heading: 'UMass Amherst Portal for Geospatial Data'
category_heading: 'Find by...'
map_heading: 'Find by location'
institution: 'Institution'
Expand Down

0 comments on commit d387e5c

Please sign in to comment.