From 47e83a15c1168cfd8ebc7905db853f3db6b3b31b Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 1 Oct 2021 21:52:30 +0200
Subject: import_progress: deal with the situation where items/files are being
 imported but there are none to import

---
 view/js/mod_import_progress.js | 12 +++++++-----
 view/tpl/import_progress.tpl   | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'view')

diff --git a/view/js/mod_import_progress.js b/view/js/mod_import_progress.js
index acfb78de8..7aed56365 100644
--- a/view/js/mod_import_progress.js
+++ b/view/js/mod_import_progress.js
@@ -8,39 +8,41 @@ $(document).ready(function() {
 	}
 
 	function update_progress(data){
+
+		// items
 		if (typeof data.cprogress == 'number') {
 			$('#cprogress-label').html(data.cprogress + '%');
 			$('#cprogress-bar').css('width', data.cprogress + '%');
 
 			if (data.cprogress == 100) {
 				$('#cprogress-resume').addClass('d-none');
-				$('#cprogress-complete').removeClass('d-none');
+				$('#cprogress-completed').removeClass('d-none');
 				$('#cprogress-bar').removeClass('progress-bar-animated');
 			}
 			else if (data.cprogress < 100) {
 				$('#cprogress-resume').removeClass('d-none');
-				$('#cprogress-complete').addClass('d-none');
+				$('#cprogress-completed').addClass('d-none');
 				$('#cprogress-bar').addClass('progress-bar-animated');
 			}
 		}
 		else {
 			$('#cprogress-label').html(data.cprogress);
 			$('#cprogress-bar').css('width', '0%');
-
 		}
 
+		// files
 		if (typeof data.fprogress == 'number') {
 			$('#fprogress-label').html(data.fprogress + '%');
 			$('#fprogress-bar').css('width', data.fprogress + '%');
 
 			if (data.fprogress == 100) {
 				$('#fprogress-resume').addClass('d-none');
-				$('#fprogress-complete').removeClass('d-none');
+				$('#fprogress-completed').removeClass('d-none');
 				$('#fprogress-bar').removeClass('progress-bar-animated');
 			}
 			else if (data.fprogress < 100) {
 				$('#fprogress-resume').removeClass('d-none');
-				$('#fprogress-complete').addClass('d-none');
+				$('#fprogress-completed').addClass('d-none');
 				$('#fprogress-bar').addClass('progress-bar-animated');
 			}
 		}
diff --git a/view/tpl/import_progress.tpl b/view/tpl/import_progress.tpl
index 997adad22..05f6c09e3 100644
--- a/view/tpl/import_progress.tpl
+++ b/view/tpl/import_progress.tpl
@@ -1,42 +1,42 @@
-<h3>Channel clone status: 100%</h3>
+<h3>{{$chtitle_str}}: 100%</h3>
 
 <div>
 	<div class="progress mb-2">
 		<div class="progress-bar progress-bar-striped bg-primary" role="progressbar" style="width: 100%" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
 	</div>
 	<div>
-		<span class="text-muted">Channel cloning completed!</span>
+		<span class="text-muted">{{$chcompleted_str}}</span>
 	</div>
 </div>
 
 <hr>
 
-<h3>Item sync status: <span id="cprogress-label">{{$cprogress_str}}</span></h3>
+<h3>{{$ctitle_str}}: <span id="cprogress-label">{{$cprogress_str}}</span></h3>
 
 <div id="cprogress">
 	<div class="progress mb-2">
 		<div id="cprogress-bar" class="progress-bar progress-bar-striped bg-warning{{if $cprogress < 100}} progress-bar-animated{{/if}}" role="progressbar" style="width: {{$cprogress}}%" aria-valuenow="{{$cprogress}}" aria-valuemin="0" aria-valuemax="100"></div>
 	</div>
 	<div id="cprogress-resume" class="{{if $cprogress == 100}}d-none{{/if}}">
-		<a href="/import_progress/resume_itemsync">[ RESUME ]</a> <span class="text-muted">Only resume if sync stalled!</span>
+		<a href="/import_progress/resume_itemsync" class="text-capitalize">[ {{$resume_str}} ]</a> <span class="text-muted">{{$resume_helper_str}}</span>
 	</div>
-	<div id="cprogress-complete" class="{{if $cprogress < 100}}d-none{{/if}}">
-		<span class="text-muted">Item sync completed!</span>
+	<div id="cprogress-completed" class="{{if $cprogress < 100}}d-none{{/if}}">
+		<span class="text-muted">{{$ccompleted_str}}</span>
 	</div>
 </div>
 
 <hr>
 
-<h3>File sync status: <span id="fprogress-label">{{$fprogress_str}}</span></h3>
+<h3>{{$ftitle_str}}: <span id="fprogress-label">{{$fprogress_str}}</span></h3>
 
 <div id="fprogress">
 	<div  class="progress mb-2">
 		<div id="fprogress-bar" class="progress-bar progress-bar-striped bg-info{{if $fprogress < 100}} progress-bar-animated{{/if}}" role="progressbar" style="width: {{$fprogress}}%" aria-valuenow="{{$fprogress}}" aria-valuemin="0" aria-valuemax="100"></div>
 	</div>
 	<div id="fprogress-resume" class="{{if $fprogress == 100}}d-none{{/if}}">
-		<a href="/import_progress/resume_filesync">[ RESUME ]</a> <span class="text-muted">Only resume if sync stalled!</span>
+		<a href="/import_progress/resume_filesync" class="text-capitalize">[ {{$resume_str}} ]</a> <span class="text-muted">{{$resume_helper_str}}</span>
 	</div>
-	<div id="fprogress-complete" class="{{if $fprogress < 100}}d-none{{/if}}">
-		<span class="text-muted">File sync completed!</span>
+	<div id="fprogress-completed" class="{{if $fprogress < 100}}d-none{{/if}}">
+		<span class="text-muted">{{$fcompleted_str}}</span>
 	</div>
 </div>
-- 
cgit v1.2.3