Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cove_ofds/templates/cove_ofds/explore.html: Update copy #59

Merged
merged 3 commits into from
Nov 24, 2022
Merged

cove_ofds/templates/cove_ofds/explore.html: Update copy #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2f3b57
cove_ofds/templates/cove_ofds/explore.html: Update copy
duncandewhurst Nov 23, 2022
6460a46
cove_ofds/templates/cove_ofds/explore.html: Use title case for panels
duncandewhurst Nov 23, 2022
a609041
tests: Make work again
odscjames Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions cove_ofds/templates/cove_ofds/explore.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h4 class="panel-title">
<div class="panel panel-warning">
<div id="unchecked-data-panel" class="panel-heading pointer" role="region" aria-expanded="true" aria-controls="unchecked-data" data-toggle="collapse" data-target="#unchecked-data">
<h4 class="panel-title">
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'Unchecked data' %}
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'Unchecked Data' %}
</h4>
</div>
<div id="unchecked-data" class="collapse in panel-body">
Expand All @@ -39,16 +39,16 @@ <h4 class="panel-title">
<div class="row">

<div class="panel panel-success">
<div id="download-panel" class="panel-heading pointer" role="region" aria-expanded="true"
aria-controls="downloadData" data-toggle="collapse" data-target="#downloadData">
<div id="conversion-panel" class="panel-heading pointer" role="region" aria-expanded="true"
aria-controls="dataConversion" data-toggle="collapse" data-target="#downloadData">
<h4 class="panel-title">
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'Download Data' %}
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'Data Conversion' %}
</h4>
</div>
<div id="downloadData" class="collapse in panel-body">
<div id="dataConversion" class="collapse in panel-body">

<p>
For more information, see the <a href="https://open-fibre-data-standard.readthedocs.io/en/latest/reference/publication_formats/index.html" target="_blank">publication format reference</a>.
Download the data that you submitted in either its original format or in alternative formats. For more information, see the <a href="https://open-fibre-data-standard.readthedocs.io/en/latest/reference/publication_formats/index.html" target="_blank">publication format reference</a>. If you are investigating an error, you might find the alternative formats easier to use.
</p>

<div class="row">
Expand All @@ -57,7 +57,7 @@ <h4 class="panel-title">

<div class="panel {% if original_format == 'json' %}panel-info{% else %}panel-success{% endif %}">
<div id="download-json-panel" class="panel-heading pointer" role="region" aria-expanded="true"
aria-controls="downloadData" data-toggle="collapse" data-target="#downloadDataJSON">
aria-controls="dataConversion" data-toggle="collapse" data-target="#downloadDataJSON">
<h4 class="panel-title">
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'JSON' %} {% if original_format == 'json' %}{% trans '(original)' %}{% endif %}
</h4>
Expand All @@ -74,6 +74,7 @@ <h4 class="panel-title">
</ul>
{% else %}
{% if can_download_json %}
<p>{% trans 'Your data was successfully converted to JSON format.' %}</p>
<ul class="list-unstyled">
<li>
<span class="glyphicon glyphicon-download" aria-hidden="true"></span>
Expand All @@ -90,7 +91,7 @@ <h4 class="panel-title">

<div class="panel {% if original_format == 'geojson' %}panel-info{% else %}panel-success{% endif %}">
<div id="download-geojson-panel" class="panel-heading pointer" role="region"
aria-expanded="true" aria-controls="downloadData" data-toggle="collapse"
aria-expanded="true" aria-controls="dataConversion" data-toggle="collapse"
data-target="#downloadDataGeoJSON">
<h4 class="panel-title">
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'GeoJSON' %} {% if original_format == 'geojson' %}{% trans '(original)' %}{% endif %}
Expand All @@ -108,14 +109,15 @@ <h4 class="panel-title">
</ul>
{% else %}
{% if can_download_geojson %}
<p>{% trans 'Your data was successfully converted to GeoJSON format.' %}</p>
<ul class="list-unstyled">
<li>
<span class="glyphicon glyphicon-download" aria-hidden="true"></span>
<a href="{{download_geojson_nodes_url}}">{% trans 'Nodes GeoJSON' %} ({{ download_geojson_nodes_size|filesizeformat }})</a>
<a href="{{download_geojson_nodes_url}}">nodes.geojson ({{ download_geojson_nodes_size|filesizeformat }})</a>
</li>
<li>
<span class="glyphicon glyphicon-download" aria-hidden="true"></span>
<a href="{{download_geojson_spans_url}}">{% trans 'Spans GeoJSON' %} ({{ download_geojson_spans_size|filesizeformat }})</a>
<a href="{{download_geojson_spans_url}}">spans.geojson ({{ download_geojson_spans_size|filesizeformat }})</a>
</li>
</ul>
{% endif %}
Expand All @@ -128,7 +130,7 @@ <h4 class="panel-title">

<div class="panel {% if original_format == 'csvs' %}panel-info{% else %}panel-success{% endif %}">
<div id="download-csvs-panel" class="panel-heading pointer" role="region" aria-expanded="true"
aria-controls="downloadData" data-toggle="collapse" data-target="#downloadDataCSVs">
aria-controls="dataConversion" data-toggle="collapse" data-target="#downloadDataCSVs">
<h4 class="panel-title">
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'CSV' %} {% if original_format == 'csvs' %}{% trans '(original)' %}{% endif %}
</h4>
Expand All @@ -145,11 +147,11 @@ <h4 class="panel-title">
</ul>
{% else %}
{% if can_download_csvs %}
<p>Compressed:</p>
<p>{% trans 'Your data was successfully converted to CSV format.' %}</p>
<ul class="list-unstyled">
<li>
<span class="glyphicon glyphicon-download" aria-hidden="true"></span>
<a href="{{download_csvs_zip_url}}">{% trans 'CSV in a ZIP file' %} ({{ download_csvs_zip_size|filesizeformat }})</a>
<a href="{{download_csvs_zip_url}}">data.zip (compressed, {{ download_csvs_zip_size|filesizeformat }})</a>
</li>
</ul>
<p>Uncompressed:</p>
Expand Down Expand Up @@ -187,7 +189,7 @@ <h4 class="panel-title">
</h4>
</div>
<div id="validationTable" class="collapse in panel-body">
<p>{% trans 'The structure and format of your data does not conform to the OFDS schema. You should check your mapping and data pipeline for errors. For more information, see the ' %}<a target="_blank" href="https://open-fibre-data-standard.readthedocs.io/en/latest/reference">{% trans 'reference documentation' %}</a>.</p>
<p>{% trans 'The structure and format of your data does not conform to the OFDS schema. You should check your mapping and data pipeline for errors. ' %}{% if original_format != 'json' %}{% trans 'Your data was converted to JSON format and checked against the OFDS schema. Errors are reported according to their location in the JSON format version of your data. ' %}{% endif %}{% trans 'For more information, see the ' %}<a target="_blank" href="https://open-fibre-data-standard.readthedocs.io/en/latest/reference">{% trans 'reference documentation' %}</a>.</p>
{% include "cove_ofds/jsonschema_validation_panel.html" %}
</div>
</div>
Expand Down Expand Up @@ -220,11 +222,11 @@ <h4 class="panel-title">
</h4>
</div>
<div id="additionalFieldsTable" class="collapse in panel-body">
<p>{% trans 'Your data contains additional fields that are not part of the OFDS schema. You should:' %}</p>
<p>{% trans 'Your data contains additional fields that are not part of the OFDS schema. ' %}{% if original_format != 'json' %}{% trans 'Additional fields are reported according to their location in the JSON format version of your data.' %}{% endif %}{% trans ' You should:' %}</p>
<ul>
<li>{% trans 'Check that additional fields are not the result of typos in field names or other errors in your mapping or data pipeline.' %}</li>
<li>{% trans 'Check whether the data in these fields could be provided by using a field in the OFDS schema.' %}</li>
<li>{% trans 'Document the structure, format and meaning of additional fields in your' %}<a href="https://open-fibre-data-standard.readthedocs.io/en/latest/guidance/publication.html#how-to-write-a-data-user-guide">{% trans 'data user guide' %}</a>.</li>
<li>{% trans 'Document the structure, format and meaning of additional fields in your ' %}<a href="https://open-fibre-data-standard.readthedocs.io/en/latest/guidance/publication.html#how-to-write-a-data-user-guide">{% trans 'data user guide' %}</a>.</li>
</ul>
<p>{% trans 'For more information, see ' %}<a href="https://open-fibre-data-standard.readthedocs.io/en/latest/guidance/publication.html#how-to-add-additional-fields">{% trans 'how to add additional fields' %}</a>.</p>
{% include "libcoveweb2/additional_fields_table.html" %}
Expand Down Expand Up @@ -257,7 +259,7 @@ <h4 class="panel-title">
</div>
<div id="additionalChecksTable" class="collapse in panel-body">
{% if additional_checks_count %}
<p>{% trans 'Your data failed the following additional checks. You should check your mapping and data pipeline for errors.' %}</p>
<p>{% trans 'Your data failed the following additional checks. You should check your mapping and data pipeline for errors.' %}{% if original_format != 'json' %}{% trans ' Failures are reported according to their location in the JSON format version of your data.' %}{% endif %}</p>
{% include "cove_ofds/additional_checks_table.html" %}
{% else %}
<p>{% trans 'Your data passed all additional checks.' %}</p>
Expand Down
2 changes: 1 addition & 1 deletion cove_ofds/tests/test_new_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ def test_new_json(server_url, browser, json_data): # noqa
# This simply waits until we end up on the data page. If we get there, the test passed.
# If we didn't, it will timeout after 30 seconds and error.
WebDriverWait(browser, 30).until(
EC.presence_of_element_located((By.ID, "download-panel"))
EC.presence_of_element_located((By.ID, "conversion-panel"))
)