From 5680caab6d7db576c241014e3fe4138da44a16ea Mon Sep 17 00:00:00 2001 From: Sergii Date: Sat, 28 Jul 2018 11:14:42 -0700 Subject: [PATCH] #33 Display Images - Folders tree - hide decision buttons --- .../src/main/resources/static/js/cmp/sourceBlock.js | 12 +++++++++++- ui/web/src/main/resources/static/js/main.js | 2 +- .../resources/templates/main/importProgress.html | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ui/web/src/main/resources/static/js/cmp/sourceBlock.js b/ui/web/src/main/resources/static/js/cmp/sourceBlock.js index 57e6fcb..fba0533 100644 --- a/ui/web/src/main/resources/static/js/cmp/sourceBlock.js +++ b/ui/web/src/main/resources/static/js/cmp/sourceBlock.js @@ -320,7 +320,17 @@ var SourceBlock = { var fullImageSrc = this.dataObject.filePath+"/"+this.dataObject.fileName; fullImageSrc = encodeURIComponent(fullImageSrc).replace(/%2F/g, "/"); // var fullImagePic = "/pics/"+this.dataObject.filePath+"/"+this.dataObject.fileName; - this.matchingImageAnch.attr("href", "/srcs/"+fullImageSrc); + var hrefPicture = ""; + if (this.dataObject.grade === "GALLERY") { + hrefPicture = "/pics/"+fullImageSrc; + } + if (this.dataObject.grade === "IMPORT") { + hrefPicture = "/srcs/"+fullImageSrc; + } + if (this.dataObject.grade === "SOURCE") { + hrefPicture = "/srcs/"+fullImageSrc; + } + this.matchingImageAnch.attr("href", hrefPicture); this.matchingImageAnch.attr("title", this.dataObject.label); // this.status.text(this.dataObject.status); // this.fileName.text(this.dataObject.fileName); diff --git a/ui/web/src/main/resources/static/js/main.js b/ui/web/src/main/resources/static/js/main.js index 5fa3590..74a59eb 100644 --- a/ui/web/src/main/resources/static/js/main.js +++ b/ui/web/src/main/resources/static/js/main.js @@ -3,7 +3,7 @@ var GalleryManager = { init: function () { GalleryManager.viewSwitcher = initViewSwitcher("#sourceViewSwitcher"); GalleryManager.sourceList = SourceList.init({ - showDecisionBlock: true, + showDecisionBlock: false, sourceDataProvider: "/sources/uni", breadcrumb: "#breadcrumblist", gallery: '#slideshow', diff --git a/ui/web/src/main/resources/templates/main/importProgress.html b/ui/web/src/main/resources/templates/main/importProgress.html index c92dcb3..b56525b 100644 --- a/ui/web/src/main/resources/templates/main/importProgress.html +++ b/ui/web/src/main/resources/templates/main/importProgress.html @@ -92,7 +92,7 @@
-
+