From e434dd0a2b3f5b4c22c35a33030f5a62109bd011 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Mon, 13 Nov 2017 14:28:23 -0500
Subject: [PATCH 1/2] make it clear that file upload is complete #4250

---
 src/main/java/Bundle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index a4e3fa63c58..8c3394ad6f5 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -1338,7 +1338,7 @@ file.spss-savEncoding.current=Current Selection:
 file.spss-porExtraLabels=Variable Labels
 file.spss-porExtraLabels.title=Upload an additional text file with extra variable labels.
 file.spss-porExtraLabels.selectToAddBtn=Select File to Add
-file.ingestFailed=Tabular Data Ingest Failed
+file.ingestFailed=Upload Complete. Tabular Data Ingest Failed
 file.explore.twoRavens=TwoRavens
 file.map=Map
 file.mapData=Map Data

From 268c3dcd0ba5552da8209ef71c3b24df5f32a8ff Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 15 Nov 2017 12:54:50 -0500
Subject: [PATCH 2/2] Revised ingest error popover message text. Fixed icon
 spacing issue. [ref #4250]

---
 src/main/java/Bundle.properties                     | 3 ++-
 src/main/webapp/file-download-button-fragment.xhtml | 2 +-
 src/main/webapp/resources/css/structure.css         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index 8c3394ad6f5..ee3dc2cc7c7 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -1338,7 +1338,8 @@ file.spss-savEncoding.current=Current Selection:
 file.spss-porExtraLabels=Variable Labels
 file.spss-porExtraLabels.title=Upload an additional text file with extra variable labels.
 file.spss-porExtraLabels.selectToAddBtn=Select File to Add
-file.ingestFailed=Upload Complete. Tabular Data Ingest Failed
+file.ingestFailed.header=Upload Completed with Errors
+file.ingestFailed.message=Tabular data ingest failed.
 file.explore.twoRavens=TwoRavens
 file.map=Map
 file.mapData=Map Data
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
index 072cb82a603..9d344fb0183 100644
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@ -13,7 +13,7 @@
 
     <ui:fragment rendered="#{fileMetadata.dataFile.ingestProblem and canUpdateDataset}">
         <!-- Ingest Problem - this is the infamous "red triangle" error. As of 4.2, we only want to show it to the owner of the dataset: -->
-        <span class="ingest-warning" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="left" data-html="true" data-title="&lt;span class='text-danger h5'&gt;#{bundle['file.ingestFailed']}&lt;/span&gt;" data-content="&lt;span class='text-danger'&gt;#{fileMetadata.dataFile.ingestReportMessage}&lt;/span&gt;">
+        <span class="ingest-warning" data-toggle="popover" data-container="body" data-trigger="hover" data-placement="left" data-html="true" data-title="&lt;span class='text-danger h5'&gt;#{bundle['file.ingestFailed.header']}&lt;/span&gt;" data-content="&lt;span class='text-danger'&gt;#{bundle['file.ingestFailed.message']} #{fileMetadata.dataFile.ingestReportMessage}&lt;/span&gt;">
             <span class="glyphicon glyphicon-warning-sign text-danger"/>
         </span>
     </ui:fragment>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 12b0c889a4c..de89022d5c6 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -350,7 +350,7 @@ th.col-file-action.text-right {text-align: right;}
 form.btn-form {display:inline-block;}
 .button-block button, .button-block a.btn, .button-block input.btn, .button-block div.btn-group, .button-block span.btn.ui-state-disabled, .button-block .button-container {margin-right:1em;}
 
-.button-block span.ingest-warning {margin-right:.5em;}
+td.col-file-action span.ingest-warning, .button-block span.ingest-warning {margin-left:.5em;}
 
 .btn.btn-default.btn-access {background-color: #fff;background-image:none;}
 .btn.btn-default.btn-access:focus, .btn.btn-default.btn-access:hover,.btn.btn-default.btn-access:active {background-color: #e6e6e6;background-image:none;}