Skip to content

W
web-ui
Commit a91bbd4d by Jorem Magcawas
Options

merge ui latest

parent 683d4fdb
Showing with 165 additions and 46 deletions
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();
......
WebGde/WebContent/style.css
......@@ -220,7 +220,7 @@ main#viewer {
}
.TiffViewer_ButtonClass {
display: inline;
display: inline-block;
height: 26px;
font-size: 13px;
cursor: pointer;
......@@ -229,6 +229,20 @@ main#viewer {
vertical-align: -webkit-baseline-middle;
}
#TiffViewer_PrevButton {
margin-right: 20px;
}
.multiTiffViewer_ButtonClass {
background-color: #000000a1;
border: none;
font-size: 14px;
color: white;
font-weight: 600;
padding: 2px 8px;
}
img.tiffViewerIcons {
transition: all 0.2s ease-out 100ms;
width: 22px;
......@@ -322,24 +336,34 @@ textarea{
resize: none;
}
#MssgBox {
width: 100%;
}
#pauseBtn {
text-align: center;
padding:10px;
color:white;
}
.multiTiffButtonDiv {
display: inline-flex;
position: absolute;
right: 0;
}
#TiffButtonRight{
display: inline-flex;
padding: 2px 16px;
z-index: 1;
position: absolute;
top: 0;
text-align: center;
height: 45px;
flex-wrap: wrap;
align-content: center;
margin-top: -50px;
right: -76px;
padding: 2px 16px;
z-index: 1;
position: absolute;
top: 0;
text-align: center;
height: 45px;
flex-wrap: wrap;
align-content: center;
/* margin-top: -50px; */
right: -9%;
}
.buttonRightClass {
......@@ -630,7 +654,7 @@ vertical-align: middle;
height: calc(100% - 80px);
width: 86%;
position: relative;
display: flex;
display: inline-block;
justify-content: center;
}
......@@ -676,8 +700,11 @@ vertical-align: middle;
#TiffModalHeader {
width: 100%;
padding: 0px 8.05%;
left: -8%;
position: absolute;
height: 50px;
display: block;
display: inline-block;
background-color: #000000a1;
}
......@@ -685,8 +712,9 @@ vertical-align: middle;
margin: auto;
height: 95%;
width: 100%;
position: relative;
display: block;
position: absolute;
display: inline-block;
margin-top: 7%;
overflow: auto;
}
......@@ -695,9 +723,9 @@ vertical-align: middle;
bottom: 0px;
position: fixed;
width: 70%;
left: 0%;
display: block;
background-color: #000000a1;
float: right;
}
#TiffViewer_FileContainer{
......@@ -711,17 +739,107 @@ vertical-align: middle;
margin: auto;
}
.bar {
width: 133px;
position: absolute;
display: flex;
top: 0px;
top: 6%;
right: 42%;
bottom: 0px;
height: 100%;
/* margin: auto; */
align-items: center;
}
div#status {
left: 0;
position: absolute;
}
.lds-roller {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-roller div {
animation: lds-roller 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
transform-origin: 40px 40px;
}
.lds-roller div:after {
content: " ";
display: block;
position: absolute;
width: 7px;
height: 7px;
border-radius: 50%;
background: #000000a1;
margin: -4px 0 0 -4px;
}
.lds-roller div:nth-child(1) {
animation-delay: -0.036s;
}
.lds-roller div:nth-child(1):after {
top: 63px;
left: 63px;
}
.lds-roller div:nth-child(2) {
animation-delay: -0.072s;
}
.lds-roller div:nth-child(2):after {
top: 68px;
left: 56px;
}
.lds-roller div:nth-child(3) {
animation-delay: -0.108s;
}
.lds-roller div:nth-child(3):after {
top: 71px;
left: 48px;
}
.lds-roller div:nth-child(4) {
animation-delay: -0.144s;
}
.lds-roller div:nth-child(4):after {
top: 72px;
left: 40px;
}
.lds-roller div:nth-child(5) {
animation-delay: -0.18s;
}
.lds-roller div:nth-child(5):after {
top: 71px;
left: 32px;
}
.lds-roller div:nth-child(6) {
animation-delay: -0.216s;
}
.lds-roller div:nth-child(6):after {
top: 68px;
left: 24px;
}
.lds-roller div:nth-child(7) {
animation-delay: -0.252s;
}
.lds-roller div:nth-child(7):after {
top: 63px;
left: 17px;
}
.lds-roller div:nth-child(8) {
animation-delay: -0.288s;
}
.lds-roller div:nth-child(8):after {
top: 56px;
left: 12px;
}
@keyframes lds-roller {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
#inputs {
display: flex;
flex-direction: column;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment