# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1547199976 -3600
# Node ID 6aa8d90aeee5bd7802a0c1eea30ce24dfedc5556
# Parent  55dacaf139ed1e512090a60078668e40a0eb6301
minor layout modification

diff -r 55dacaf139ed -r 6aa8d90aeee5 NEWS
--- a/NEWS	Thu Jan 10 21:23:31 2019 +0100
+++ b/NEWS	Fri Jan 11 10:46:16 2019 +0100
@@ -5,6 +5,7 @@
 -----------
 
 * Don't consider tags whose group is below 0x0008 in C-FIND SCP
+* Fix issue #21 (DICOM files missing after uploading with Firefox)
 * Fix issue #118 (Wording in Configuration.json regarding SynchronousCMove)
 * Fix issue #124 (GET /studies/ID/media fails for certain dicom file)
 * Fixed Orthanc Explorer on IE and Firefox: Explorer always show "too many results"
diff -r 55dacaf139ed -r 6aa8d90aeee5 OrthancExplorer/explorer.html
--- a/OrthancExplorer/explorer.html	Thu Jan 10 21:23:31 2019 +0100
+++ b/OrthancExplorer/explorer.html	Fri Jan 11 10:46:16 2019 +0100
@@ -172,31 +172,34 @@
     </div>
     <div data-role="content">
       <div>
-        <!-- It's very difficult to style a "file" input so we actually hide it and create a "proxy" button that is forwarding its click to the "file" input -->
+        <!-- It's very difficult to style a "file" input so we
+        actually hide it and create a "proxy" button that is
+        forwarding its click to the "file" input -->
         <input id="fileupload" type="file" name="files[]" data-url="../instances/" style="display:none" multiple>
-        <ul data-role="listview" data-inset="true">
-          <li id="fileupload-proxy" onclick="$('#fileupload').click()" data-icon="arrow-r" data-theme="d"><a href="#">Select
-              files to upload ...</a></li>
-        </ul>
       </div>
       <p>
         <ul data-role="listview" data-inset="true">
+          <li id="fileupload-proxy" onclick="$('#fileupload').click()" data-icon="arrow-r" data-theme="e">
+            <a href="#">Select files to upload ...</a>
+          </li>
           <li data-icon="arrow-r" data-theme="e"><a href="#" id="upload-button">Start the upload</a></li>
           <!--li data-icon="gear" data-theme="e"><a href="#" id="upload-abort" class="ui-disabled">Abort the current upload</a></li-->
-          <li data-icon="delete" data-theme="e"><a href="#" id="upload-clear">Clear the pending uploads</a></li>
+          <li data-icon="delete" data-theme="d"><a href="#" id="upload-clear">Clear the pending uploads</a></li>
         </ul>
         <div id="progress" class="ui-corner-all">
           <span class="bar ui-corner-all"></span>
           <div class="label"></div>
         </div>
       </p>
+      <div class="ui-bar ui-bar-e" id="issue-21-warning">
+        <h3>Warning:</h3> Orthanc issue #21: On Firefox, especially on
+        Linux & OSX systems, files might be missing if using
+        drag-and-drop. Please use the "Select files to upload" button
+        instead, or use the command-line "ImportDicomFiles.py" script.
+      </div>
       <ul id="upload-list" data-role="listview" data-inset="true">
         <li data-role="list-divider">Drag and drop DICOM files here</li>
       </ul>
-      <div class="ui-bar ui-bar-e" id="issue-21-warning">
-        <h3>Warning:</h3> Orthanc issue #21: On Firefox, especially on Linux & OSX systems, files might be missing when
-        using drag-and-drop. Use the "Select files to upload" button instead !
-      </div>
     </div>
   </div>
 
@@ -636,4 +639,4 @@
   </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff -r 55dacaf139ed -r 6aa8d90aeee5 OrthancExplorer/file-upload.js
--- a/OrthancExplorer/file-upload.js	Thu Jan 10 21:23:31 2019 +0100
+++ b/OrthancExplorer/file-upload.js	Fri Jan 11 10:46:16 2019 +0100
@@ -59,11 +59,6 @@
     $("#issue-21-warning").css('display', 'none');
   }
 
-  // alert('WARNING - This page is currently affected by Orthanc issue #21: ' +
-  //       '"DICOM files might be missing after uploading with Mozilla Firefox." ' +
-  //       'Do not use this upload feature for clinical uses, or carefully ' +
-  //       'check that all instances have been properly received by Orthanc. ' +
-  //       'Please use the command-line "ImportDicomFiles.py" script to circumvent this issue.');
   $('#fileupload').fileupload('enable');
 });