From d0e9dbbd0eeb6b60d3a1afe8f42e36e1aa90fa96 Mon Sep 17 00:00:00 2001
From: Michael Wood <michael.wood@opendataservices.coop>
Date: Mon, 15 Jul 2019 20:40:53 +0100
Subject: [PATCH] templates explore Fix various UI issues

 - Add whitespace between download icon and links
 - Show schema version specified in uploaded data
 - Add full stop to "There were no ..." messages
 - Clarify download purpose and messages
 - Replace Valid* with Structure terminology

Fixes for issue #20
---
 .../templates/cove_oc4ids/explore.html        | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/cove_oc4ids/templates/cove_oc4ids/explore.html b/cove_oc4ids/templates/cove_oc4ids/explore.html
index 9a952c6..954d8c9 100644
--- a/cove_oc4ids/templates/cove_oc4ids/explore.html
+++ b/cove_oc4ids/templates/cove_oc4ids/explore.html
@@ -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 %}
 
@@ -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>
@@ -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>
@@ -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">
@@ -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 %}
@@ -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 %}