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.

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

templates explore Fix various UI issues #23

Merged
merged 1 commit into from
Jul 17, 2019
Merged
Changes from all commits
Commits
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
21 changes: 11 additions & 10 deletions cove_oc4ids/templates/cove_oc4ids/explore.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ <h4 class="panel-title">{% trans 'Headlines' %}</h4>
<li><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
{% blocktrans count count=json_data.projects|length %}This file contains <strong>{{count}} project.</strong>{% plural %}This file contains <strong>{{count}} projects.</strong>{% endblocktrans %}
</li>
{% if data_schema_version %}
{% if json_data.version %}
<li><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
{% trans "The schema version specified in the file is" %} <strong>{{data_schema_version}}</strong>.
{% trans "The schema version specified in the file is" %} <strong>{{json_data.version}}</strong>.
</li>
{% endif %}

Expand Down Expand Up @@ -99,16 +99,17 @@ <h4 class="panel-title">
</h4>
</div>
<div id="downloadData" class="collapse in panel-body">
<p>{% trans "Alternative formats for reviewing your data" %}</p>

{% if conversion == 'flatten' %}
<p>We have tried to convert your JSON into a spreadsheet format.</p><p>The results can be seen below.</p>
<p>{% trans "Conversion of your (JSON) data into a spreadsheet format. The results can be seen below" %}.</p>
<ul class="list-unstyled left-space">
<li>
<span class="glyphicon glyphicon-download" aria-hidden="true"></span><a href="{{original_file.url}}">{{JSON}} <small>({{original}})</small></a> <small>{{original_file.size|filesizeformat }}</small>
<span class="glyphicon glyphicon-download" aria-hidden="true"></span> <a href="{{original_file.url}}">{{JSON}} <small>({{original}})</small></a> <small>{{original_file.size|filesizeformat }}</small>
</li>
{% if not conversion_error %}
<li>
<span class="glyphicon glyphicon-download" aria-hidden="true"></span><a href="{{converted_url}}.xlsx">{{xlsx}} <small>({{converted}})</small></a> <small>{{converted_file_size|filesizeformat }}</small>
<span class="glyphicon glyphicon-download" aria-hidden="true"></span> <a href="{{converted_url}}.xlsx">{{xlsx}} <small>({{converted}})</small></a> <small>{{converted_file_size|filesizeformat }}</small>
</li>
{% endif %}
</ul>
Expand All @@ -119,7 +120,7 @@ <h4 class="panel-title">
{% endif %}

{% elif conversion == 'unflatten' %}
<p>We have tried to convert your data into JSON format.</p><p>The results can be seen below.</p>
<p>{% trans "Conversion of your data into JSON format. The results can be seen below" %}.</p>
<ul class="list-unstyled">
<li>
<span class="glyphicon glyphicon-download" aria-hidden="true"></span>
Expand Down Expand Up @@ -173,7 +174,7 @@ <h4 class="panel-title">
<div class="panel panel-danger">
<div id="validation-panel" class="panel-heading pointer" role="region" aria-expanded="true" aria-controls="validationTable" data-toggle="collapse" data-target="#validationTable">
<h4 class="panel-title">
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'Validation Errors' %}
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'Structural Errors' %}
</h4>
</div>
<div id="validationTable" class="collapse in panel-body">
Expand All @@ -184,11 +185,11 @@ <h4 class="panel-title">
<div class="panel panel-success">
<div id="validation-panel" class="panel-heading pointer" role="region" aria-expanded="true" aria-controls="validationTable" data-toggle="collapse" data-target="#validationTable">
<h4 class="panel-title">
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'Validation Errors' %}
<span class="glyphicon glyphicon-collapse-up"></span>{% trans 'Structural Errors' %}
</h4>
</div>
<div id="validationTable" class="collapse in panel-body">
<p>{% trans 'There were no validation errors' %}</p>
<p>{% trans 'There were no structural errors' %}.</p>
</div>
</div>
{% endif %}
Expand Down Expand Up @@ -220,7 +221,7 @@ <h4 class="panel-title">
</h4>
</div>
<div id="additionalFieldsTable" class="collapse in panel-body">
<p>{% trans 'There were no additional fields' %}</p>
<p>{% trans 'There were no additional fields' %}.</p>
</div>
</div>
{% endif %}
Expand Down