From 19d7dcb1ec451d437aa7c27a63803da985ff989f Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Wed, 13 Sep 2017 15:22:29 +0100
Subject: [PATCH] Bld

Former-commit-id: 9f827ea900697c11ec3b530e0cf729df2055e961 [formerly 8dbf0650c653c56aad94d80d695ace366c26f1a7]
Former-commit-id: 2dce6de4882c80d0a7af471576bc44d2e40d1bde
---
 bld/Release/PackageLayout/www/index.html |  8 +++++++-
 bld/Release/PackageLayout/www/js/app.js  | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/bld/Release/PackageLayout/www/index.html b/bld/Release/PackageLayout/www/index.html
index 684a55b3..b079b456 100644
--- a/bld/Release/PackageLayout/www/index.html
+++ b/bld/Release/PackageLayout/www/index.html
@@ -275,12 +275,18 @@
                         <p>This application needs a ZIM archive to work. You can get one from the <a href="#downloads">download links panel</a>.</p>
                     </div>
                     <div id="openLocalFiles" style="display: none;">
-                        <div class="row">
+                        <div id="UWPInstructions" class="row">
                             <p>
                                 If you have a single (unsplit) ZIM archive, use the <b>first</b> button.<br />
                                 For a split archive (.zimaa, .zimab, etc.) or multiple archives, use the <b>second</b> button.
                             </p>
                         </div>
+                        <div id="instructions" class="row" style="display:none;">
+                            <p>
+                                Please choose the location of your ZIM archive.<br />
+                                For a split archive (.zimaa, .zimab, etc.) you must select <b>all</b> the split parts.
+                            </p>
+                        </div>
                         <div class="row">
                             <div class="col-xs-6">
                                 <input type="button" class="btn btn-primary" value="Select single archive" id="archiveFile" accept=".zim" />
diff --git a/bld/Release/PackageLayout/www/js/app.js b/bld/Release/PackageLayout/www/js/app.js
index 4f6caa8b..179d91a9 100644
--- a/bld/Release/PackageLayout/www/js/app.js
+++ b/bld/Release/PackageLayout/www/js/app.js
@@ -429,6 +429,15 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
             if (params.localStorage && !params.pickedFolder && !params.pickedFile) {
                 params.pickedFolder = params.localStorage;
             }
+            if (typeof Windows === 'undefined') {
+                //If not UWP, display legacy File Select
+                document.getElementById('archiveFile').style.display = "none";
+                document.getElementById('archiveFiles').style.display = "none";
+                document.getElementById('UWPInstructions').style.display = "none";
+                document.getElementById('instructions').style.display = "inline";
+                document.getElementById('archiveFilesLegacy').style.display = "inline";
+                $('#archiveFilesLegacy').on('change', setLocalArchiveFromFileSelect)
+            }
             return false;
         });
         $('#btnAbout').on('click', function (e) {
@@ -1124,6 +1133,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
          */
         function displayFileSelect() {
             $('#openLocalFiles').show();
+            if (typeof Windows === 'undefined') {
+                //If not UWP, display legacy File Select
+                $('#btnConfigure').click();
+            }
             //TODO - check if this is necessary or if it causes the archiveList change event to fire 
             //Make archive list combo box fit the number of files
             //var comboArchiveList = document.getElementById('archiveList');
@@ -1221,7 +1234,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
      * Sets the localArchive from the File selects populated by user
      */
     function setLocalArchiveFromFileSelect() {
-        setLocalArchiveFromFileList(document.getElementById('archiveFiles').files);
+        setLocalArchiveFromFileList(document.getElementById('archiveFilesLegacy').files);
     }
 
     /**