From 55ed6100e0d84d265f6615b8977823bded33d20e Mon Sep 17 00:00:00 2001
From: Danny Coates <dannycoates@gmail.com>
Date: Tue, 16 Jan 2018 13:52:09 -0800
Subject: [PATCH] fixes #675. progress on ios

---
 app/templates/download.js | 36 ++++++++++++++++++++----------------
 app/templates/upload.js   | 36 +++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/app/templates/download.js b/app/templates/download.js
index 81be5dda..eca55893 100644
--- a/app/templates/download.js
+++ b/app/templates/download.js
@@ -6,22 +6,26 @@ module.exports = function(state) {
   const transfer = state.transfer;
   const div = html`
   <div id="page-one">
-  <div id="download-progress" class="fadeIn">
-    <div id="dl-title" class="title">${state.translate(
-      'downloadingPageProgress',
-      {
-        filename: state.fileInfo.name,
-        size: bytes(state.fileInfo.size)
-      }
-    )}</div>
-    <div class="description">${state.translate('downloadingPageMessage')}</div>
-    ${progress(transfer.progressRatio)}
-    <div class="upload">
-      <div class="progress-text">${state.translate(
-        transfer.msg,
-        transfer.sizes
-      )}</div>
-    </div>
+    <div id="download">
+      <div id="download-progress" class="fadeIn">
+        <div id="dl-title" class="title">${state.translate(
+          'downloadingPageProgress',
+          {
+            filename: state.fileInfo.name,
+            size: bytes(state.fileInfo.size)
+          }
+        )}</div>
+        <div class="description">${state.translate(
+          'downloadingPageMessage'
+        )}</div>
+        ${progress(transfer.progressRatio)}
+        <div class="upload">
+          <div class="progress-text">${state.translate(
+            transfer.msg,
+            transfer.sizes
+          )}</div>
+        </div>
+      </div>
     </div>
   </div>
   `;
diff --git a/app/templates/upload.js b/app/templates/upload.js
index a2d9edd2..98dc28fe 100644
--- a/app/templates/upload.js
+++ b/app/templates/upload.js
@@ -6,24 +6,26 @@ module.exports = function(state, emit) {
   const transfer = state.transfer;
 
   const div = html`
-  <div id="upload-progress" class="fadeIn">
-    <div class="title" id="upload-filename">${state.translate(
-      'uploadingPageProgress',
-      {
-        filename: transfer.file.name,
-        size: bytes(transfer.file.size)
-      }
-    )}</div>
-    <div class="description"></div>
-    ${progress(transfer.progressRatio)}
-    <div class="upload">
-      <div class="progress-text">${state.translate(
-        transfer.msg,
-        transfer.sizes
+  <div id="download">
+    <div id="upload-progress" class="fadeIn">
+      <div class="title" id="upload-filename">${state.translate(
+        'uploadingPageProgress',
+        {
+          filename: transfer.file.name,
+          size: bytes(transfer.file.size)
+        }
       )}</div>
-      <button id="cancel-upload" title="${state.translate(
-        'uploadingPageCancel'
-      )}" onclick=${cancel}>${state.translate('uploadingPageCancel')}</button>
+      <div class="description"></div>
+      ${progress(transfer.progressRatio)}
+      <div class="upload">
+        <div class="progress-text">${state.translate(
+          transfer.msg,
+          transfer.sizes
+        )}</div>
+        <button id="cancel-upload" title="${state.translate(
+          'uploadingPageCancel'
+        )}" onclick=${cancel}>${state.translate('uploadingPageCancel')}</button>
+      </div>
     </div>
   </div>
   `;