development_coding UI integration

WebGde/WebContent/index.html

@@ -131,11 +131,7 @@
 
       <div id="TiffViewerModal">
 
-      <div id="TiffModalHeader">
-
-            <!-- CHANGED: commented out close button, to avoid closing the modal -->
-            <!-- <span class="TiffModalClose">&times;</span> -->
-          </div>
+      
           <div id='prevDivContainer' title="previous">
  			<div id='prevDiv'>
 				<div id="prev"></div>
@@ -145,17 +141,20 @@
         <!-- Modal content -->
         <div class="TiffModalContent">
           <div class="bar">
-            <progress id="progressBar" value="0" max="100" style="width:150px;"></progress>
+            <div class="lds-roller"><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
             <div id="status">&nbsp;</div>
             <h3 id="progress">&nbsp;</h3>
           </div>
+	
+          	<div id="TiffModalHeader">
 
+            <!-- CHANGED: commented out close button, to avoid closing the modal -->
+            <!-- <span class="TiffModalClose">&times;</span> -->
+          </div>
 			
           <div id="TiffModalBody">
           </div>
-          	
-          	<div >
-          </div>
+          
           <div >
           </div>
           <div >

WebGde/WebContent/src/tiffViewer/tiffViewer.js

@@ -116,7 +116,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   TiffViewer_filedetail.style.display = "none";
   TiffViewer_filedetail.textContent = "Filename: ";
   
-  const TiffViewer_pagedetail = document.createElement('p');
+  const TiffViewer_pagedetail = document.createElement('div');
   TiffViewer_pagedetail.id = "TiffViewer_PageCount";
   TiffViewer_pagedetail.style.display = "none";
   TiffViewer_pagedetail.innerHTML = "Page:    ";
@@ -204,13 +204,13 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   
   const TiffViewer_Pbtn = document.createElement("button");
   TiffViewer_Pbtn.id = "TiffViewer_PrevButton";
-  TiffViewer_Pbtn.classList.add("TiffViewer_ButtonClass");
+  TiffViewer_Pbtn.classList.add("multiTiffViewer_ButtonClass");
   TiffViewer_Pbtn.innerHTML = "<";
   TiffViewer_Pbtn.style.display = "none";
   
   const TiffViewer_Nbtn = document.createElement("button");
   TiffViewer_Nbtn.id = "TiffViewer_NextButton";
-  TiffViewer_Nbtn.classList.add("TiffViewer_ButtonClass");
+  TiffViewer_Nbtn.classList.add("multiTiffViewer_ButtonClass");
   TiffViewer_Nbtn.innerHTML = ">";
   TiffViewer_Nbtn.style.display = "none";
   
@@ -238,24 +238,24 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   zoom.classList.add("viewerSizeLabel");
   
   
- 
-  
-  
-  
-  
 
   let ofTotal = JSON.parse(sessionStorage.getItem("dir_files")).length;
   document.getElementById("totalPageValue").innerHTML = Current_page + ' of ' + ofTotal;
 
-	
-  
-	
-
-
 
   //append all content declarations to modal
- 
- 
+ 	
+ 	let multiTiffDiv = document.createElement("div");
+ 	multiTiffDiv.classList.add("multiTiffDiv");
+ 	
+ 	let multiTiffButtonDiv = document.createElement("div");
+ 	multiTiffButtonDiv.classList.add("multiTiffButtonDiv")
+ 	multiTiffButtonDiv.append(TiffViewer_Pbtn);
+ 	multiTiffButtonDiv.append(TiffViewer_Nbtn); 	
+ 	multiTiffDiv.append(TiffViewer_pagedetail);
+    multiTiffDiv.append(multiTiffButtonDiv);
+    
+    
   TiffViewer_Fit.append(FitIcon)  
   TiffViewer_Fscrn.append(FscrnIcon)
   TiffViewer_zoomOut.append(zoomOutIcon)
@@ -267,14 +267,16 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   
   TiffViewer_Header.append(TiffViewer_detailcont);
 
+  TiffViewer_Body.append(multiTiffDiv);
   TiffViewer_Body.append(TiffViewer_filecont);
   TiffViewer_Footer.append(zoom, TiffViewer_btncont);
 
+
   //append Contents to containers
-  TiffViewer_detailcont.append(TiffViewer_filedetail, TiffViewer_pagedetail);
+  TiffViewer_detailcont.append(TiffViewer_filedetail);
   TiffViewer_filecont.appendChild(TiffViewer_scrncont);
   TiffViewer_scrncont.appendChild(TiffViewer_imgcont);
-  TiffViewer_btncont.append(TiffViewer_Fscrn, TiffViewer_Fit, TiffViewer_hflip, TiffViewer_vflip, TiffViewer_Rrotate, TiffViewer_Lrotate, TiffViewer_zoomIn, TiffViewer_zoomOut, TiffViewer_Pbtn, TiffViewer_Nbtn);
+  TiffViewer_btncont.append(TiffViewer_Fscrn, TiffViewer_Fit, TiffViewer_hflip, TiffViewer_vflip, TiffViewer_Rrotate, TiffViewer_Lrotate, TiffViewer_zoomIn, TiffViewer_zoomOut);
 
   //get Content placeholders
   const wrapper = document.querySelector("#TiffViewer_Screen"), header = wrapper.querySelector("#TiffViewer_ImageContainer");
@@ -294,7 +296,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
     var TiffViewer_PageCount = document.getElementById("TiffViewer_PageCount");
     var pageappend = TiffViewer_current + " / " + TiffViewer_pages;
     TiffViewer_PageCount.append(pageappend); //display of page number
-    TiffViewer_PageCount.style.display = "block";
+    TiffViewer_PageCount.style.display = "inline-block";
   }
 
   document.getElementById('TestTIFFDisplay').src = tiff.toCanvas().toDataURL();