Skip to content

Commit

Permalink
Merge pull request #175 from kellydesent/homepage-styling
Browse files Browse the repository at this point in the history
styling updates
  • Loading branch information
ericmbernier authored Jan 11, 2018
2 parents 30eac59 + b4ad755 commit d073a61
Show file tree
Hide file tree
Showing 7 changed files with 141 additions and 8 deletions.
16 changes: 13 additions & 3 deletions ckanext/ioos_theme/public/ioos_theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,19 @@ body {
.site-footer {
background: url(img/footer.png) !important;
padding: 56px 0px !important;
font-family: 'Roboto' ,sans-serif;
line-height: 16px;
/* right: 0;
left: 0;
bottom: 0;
position: absolute; */
}

.site-footer h1 {
font-size: 20px !important;
font-weight: 400 !important;
font-family: 'Roboto Slab',Times,serif !important;
}

section.tags {
padding-bottom: 20px;
Expand Down Expand Up @@ -209,9 +216,9 @@ section.browse-graphic img.browse-graphic-img {
[role=main] {
background: -moz-linear-gradient(#ffffff80, #fff), url(img/glider-underwater2.jpg) !important;
background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0.5), rgb(255, 255, 255)), url(img/glider-underwater2.jpg) !important;
background-position: center !important;
background-position: top !important;
background-repeat: no-repeat !important;
background-size: 100% 100% !important;
background-size: 100% 900px !important;
}

html, body {
Expand Down Expand Up @@ -273,5 +280,8 @@ html, body {
.homepage [role="main"] {
padding: 20px 0;
padding-bottom: 20px;
margin-bottom: 96px;
}

.module:last-child {
margin-bottom: 75px !important;
}
2 changes: 2 additions & 0 deletions ckanext/ioos_theme/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
{{ super() }}
<link rel="stylesheet" href="/ioos_theme.css" />
<link rel="shortcut icon" href="/favicon.ico" />
<link href="https://fonts.googleapis.com/css?family=Roboto+Slab" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
{% endblock %}
5 changes: 4 additions & 1 deletion ckanext/ioos_theme/templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,17 @@ <h1 class="footer-title">Our Social Ocean</h1>
<li><a href="https://www.facebook.com/usioosgov">facebook.com/usioosgov</a></li>
<li><a href="https://twitter.com/usioosgov">twitter.com/usioosgov</a></li>
</ul>
{% block footer_lang %}
{% snippet "snippets/language_selector.html" %}
{% endblock %}
</div>
<div class="span4">
<img style="float: left;padding-right: 20px;padding-top: 5px;" src="../img/footer-img.png" alt="footer logo">
<p>U.S. Integrated Ocean Observing System Program</p>
<p>1315 East-West Highway,
2nd Floor
Silver Spring, MD 20910</p>
<a href="tel:301713-3290"> (301) 713-3290</a><br><br>
<a href="tel:301713-3290"> 240-533-9444</a><br><br>
<a class="contact-us" href="mailto:ioos.catalog@noaa.gov" itemprop="email">Contact Us</a>
</div>

Expand Down
81 changes: 81 additions & 0 deletions ckanext/ioos_theme/templates/home/snippets/about_text.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{% trans %}
<p>The IOOS Catalog (<a href="https://data.ioos.us/">https://data.ioos.us/</a>) is an open data portal containing IOOS’ portfolio of oceanographic
observations and forecast products provided by IOOS’ 11 Regional Associations (RAs), functional Data Assembly
Centers (DACs) such as the HF Radar DAC and Glider DAC, and IOOS’ federal partners. The Catalog inventories
all IOOS Data Management (DMAC)-compliant data access service endpoints provided by these entities in a single
metadata repository, for discovery by end users. </p>

<p>The Catalog is populated by ISO 19115 metadata records that describe the observations taken and forecast model
outputs produced by the RAs and DACs using DMAC-recommended standard vocabularies and data formats wherever
possible (netCDF-CF [1], ACDD [2]). The RAs and DACs publish their metadata to web accessible folders, or
OGC CS-W services, and the Catalog harvests metadata from these locations on a daily basis. Because IOOS
data provider metadata is often produced in an automated fashion by software reading native data file attributes
(such as CF attribution in a netCDF file, for example), a daily automated harvest of the ISO XML metadata is
necessary, in order to keep frequently varying information such as dataset time coverage current. </p>

<p>The Catalog provides a searchable user graphical user interface (<a href="https://data.ioos.us/">https://data.ioos.us/</a>)
for interactive data discovery by users, as well as a native API (<a href="https://data.ioos.us/api/3">https://data.ioos.us/api/3</a>)
and OGC CS-W (<a href="https://data.ioos.us/csw?service=CSW&request=GetCapabilities">https://data.ioos.us/csw?service=CSW&request=GetCapabilities</a>) -compatible service
for machine-based access to its inventory of data products. Downstream national IOOS
products such as the IOOS Environmental Sensor Map (<a href="https://sensors.ioos.us">https://sensors.ioos.us</a>) use the Catalog
inventory for real-time sensor observation services to include in its map portal.</p>

<p>The IOOS Catalog is made up of three main components:
<ol>
<li>the Data Catalog (the public user interface, based on CKAN open data catalog software)</li>
<li>the Harvest Registry (an internal site used by data providers to manage metadata harvest sources)</li>
<li>the Service Monitor (service uptime monitoring)</li>
</ol>
</p>

<p>Additional information about the IOOS Catalog and components, including instructions for IOOS
data providers, can be found here: <a href="https://ioos.github.io/catalog">https://ioos.github.io/catalog</a>. </p>

<p>Catalog GitHub Repository: <a href="https://github.com/ioos/catalog">https://github.com/ioos/catalog</a>. For information on project
development timelines, Catalog source code, or to file an issue, please see the GitHub repo. </p>
<br>
<h1 class="page-heading">Frequently Asked Questions</h1>

<p><b>What are the dataset filtering options provided by the IOOS Data Catalog?</b>
<br>
The current faceted filtering options provided by the CKAN software underlying the Data
Catalog are: Location (i.e. geographic bounding box), Organization (e.g. PacIOOS, GLOS, etc),
Tags/keywords (e.g. sea_water_temperature, sea_water_electrical_conductivity), Formats (e.g.
HTML, SOS, OPeNDAP, etc). There is also the option to do a free text search, which will search
indexed metadata fields such as dataset title, abstract, keywords, and others and provide matched datasets.
</p>

<p><b>How can I search for datasets by time window?</b><br>
This is a feature that is not presently available in the CKAN catalog software underlying the IOOS Data Catalog.
The IOOS Catalog project plan calls for working to add this capability in an upcoming release. The release
milestone schedule for the Catalog project is available here: <a href="https://github.com/ioos/catalog/milestones">https://github.com/ioos/catalog/milestones</a>.
</p>

<p><b>I sometimes get different search results from the CS-W service and the Data Catalog. Why is this?</b><br>
The CS-W service is provided by pycsw, a Python-based OGC Catalog Service software. It has its own internal search implementation that sometimes gives different results than CKAN’s embedded search, which is powered by the Apache Solr search indexing software. There is a long-term plan to abstract pycsw’s search implementation to allow external pluggable search implementations (including Solr) to interoperate with pycsw but this functionality is not yet available.
</p>

<p><b>Can I filter search results in the Data Catalog by IOOS data provider or platform operator?</b><br>
No, not at this time, however this is on our road map. With development of standardized metadata profiles to
represent this information in incoming metadata from the IOOS RAs and DACs, the CKAN catalog software could be
extended to provide richer filtering options including concepts such as data provider or platform operator.
For more information on planned work on this, see: <a href="https://github.com/ioos/catalog/milestone/4">https://github.com/ioos/catalog/milestone/4</a>.
</p>

<p><b>How do I identify oceanographic forecast model output datasets in the Catalog versus oceanographic observations?</b><br>
At the moment, there is not a straightforward technique for this. We hope to address this deficiency in the near future.
As part of an upcoming development milestone (<a href="https://github.com/ioos/catalog/milestone/4">https://github.com/ioos/catalog/milestone/4</a>), we will be investigating
enhancements to both the CKAN software as well as developing metadata conventions to better enable our data providers
to tag oceanographic forecast model output in a distinctive way that could then be represented in the Data Catalog
interface to users. Also, the ability to filter data by time coverage should compliment a forecast model tagging
capability to search for data covering present time onward.
</p>
<br>
<p>References:
<br>
[1]. Climate and Forecast Conventions: <a href="http://cfconventions.org/">http://cfconventions.org/</a>
<br>
[2]. Attribute Conventions for Dataset Discovery: <a href="http://wiki.esipfed.org/index.php/Attribute_Convention_for_Data_Discovery">http://wiki.esipfed.org/index.php/Attribute_Convention_for_Data_Discovery</a>
</p>

{% endtrans %}
9 changes: 5 additions & 4 deletions ckanext/ioos_theme/templates/home/snippets/promoted.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
{% else %}
<h1 class="page-heading">{{ _("Welcome to the IOOS Catalog") }}</h1>
<p>
The IOOS Catalog is the master inventory of IOOS DMAC
IOOS’ mission is to produce, integrate, and communicate high quality ocean, coastal and Great Lakes information that meets the safety, economic, and stewardship needs of the Nation. The IOOS Catalog is the master inventory of IOOS
<a href="https://ioos.noaa.gov/data/contribute-data/common-data-formats/">datasets</a>
and
<a href="https://ioos.noaa.gov/data/contribute-data/data-access-services/">data access services</a>.
Search for datasets through the UI, or, for advanced users, an OGC Catalog Service (CS-W) is available
<a href="https://data.ioos.us/csw?service=CSW&request=GetCapabilities">here</a>.
<a href="https://ioos.noaa.gov/data/contribute-data/data-access-services/">data access services</a> provided by our network
of 11 Regional Associations, functional data assembly centers (DACs), and federal partners. Search for datasets below,
and for additional information about the IOOS Catalog, please
<a href="https://data.ioos.us/about">read here</a>.
</p>
{% endif %}
</header>
Expand Down
21 changes: 21 additions & 0 deletions ckanext/ioos_theme/templates/home/snippets/search.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{% set tags = h.get_facet_items_dict('tags', limit=6) %}
{% set placeholder = _('E.g. environment') %}

<div class="module module-search module-narrow module-shallow box">
<form class="module-content search-form" method="get" action="{% url_for controller='package', action='search' %}">
<h3 class="heading">{{ _("Search data") }}</h3>
<div class="search-input control-group search-giant">
<input type="text" class="search" name="q" value="" autocomplete="off" placeholder="{% block search_placeholder %}{{ placeholder }}{% endblock %}" />
<button type="submit">
<i class="icon-search"></i>
<span>{{ _('Search') }}</span>
</button>
</div>
</form>
<div class="tags">
<h3>{{ _('Popular tags') }}</h3>
{% for tag in tags %}
<a class="tag" href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a>
{% endfor %}
</div>
</div>
15 changes: 15 additions & 0 deletions ckanext/ioos_theme/templates/snippets/language_selector.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{% set current_url = request.environ.CKAN_CURRENT_URL %}
{% set current_lang = request.environ.CKAN_LANG %}
<form class="form-inline form-select lang-select" action="{% url_for controller='util', action='redirect' %}" data-module="select-switch" method="POST">
<label for="field-lang-select">{{ _('Language') }}</label>
<br>
<br>
<select id="field-lang-select" name="url" data-module="autocomplete" data-module-dropdown-class="lang-dropdown" data-module-container-class="lang-container">
{% for locale in h.get_available_locales() %}
<option value="{% url_for current_url, locale=locale %}" {% if locale == current_lang %}selected="selected"{% endif %}>
{{ locale.display_name or locale.english_name }}
</option>
{% endfor %}
</select>
<button class="btn js-hide" type="submit">{{ _('Go') }}</button>
</form>

0 comments on commit d073a61

Please sign in to comment.