gCubeSystem
/
uri-resolver
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated HTML page and pom

This commit is contained in:
Francesco Mangiacrapa 2024-05-02 15:42:50 +02:00
parent 3a3ba9b43f
commit d654df3f2f
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -53,7 +53,7 @@
<properties> <properties>
<jersey.version>2.25.1</jersey.version> <jersey.version>2.25.1</jersey.version>
<jackson.version>2.8.8</jackson.version> <jackson.version>2.8.8</jackson.version>
<jackson.version.eclude>2.9</jackson.version.eclude> <jackson.version.eclude>2.12</jackson.version.eclude>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<enunciate.version>2.14.0</enunciate.version> <enunciate.version>2.14.0</enunciate.version>
@ -178,12 +178,16 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- <dependency> --> <!-- due to #27377, remove this after fixed -->
<!-- <groupId>com.fasterxml.jackson.core</groupId> -->
<!-- <artifactId>jackson-databind</artifactId> --> <dependency>
<!-- <version>[${jackson.version.eclude},)</version> --> <groupId>com.fasterxml.jackson.core</groupId>
<!-- <scope>provided</scope> --> <artifactId>jackson-databind</artifactId>
<!-- </dependency> --> <version>[${jackson.version.eclude},)</version>
<scope>provided</scope>
</dependency>
<!-- due to #27377, see above -->
<!-- java melody --> <!-- java melody -->
<dependency> <dependency>

16
src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/Geoportal_HTML_Page.java
View File

@ -86,32 +86,22 @@ public class Geoportal_HTML_Page {
+ " inner_div.innerHTML = error_msg;\n" + " inner_div.innerHTML = error_msg;\n"
+ " }\n" + " }\n"
+ "\n" + "\n"
+ " function setImages() {\n"
+ " console.log(\"json setImages \");\n"
+ " document.getElementById('pic1').src = window.location.href + \"img/icon-globe.gif\";\n"
+ " document.getElementById('pic2').src = window.location.href + \"img/loading-gears.gif\";\n"
+ " }\n"
+ " \n"
+ " function initPage(){\n"
+ " playPDFPoll();\n"
+ " setImages();\n"
+ " }\n"
+ " </script>\n" + " </script>\n"
+ " <title>D4Science Geoportal - Action</title>\n" + " <title>D4Science Geoportal - Action</title>\n"
+ " </head>\n" + " </head>\n"
+ "\n" + "\n"
+ " <body onload=\"initPage()\">"; + " <body onload=\"playPDFPoll()\">";
newHTML += "<img alt=\"D4Science Logo\" src=\"https://services.d4science.org/image/layout_set_logo?img_id=32727\"><br />"; newHTML += "<img alt=\"D4Science Logo\" src=\"https://services.d4science.org/image/layout_set_logo?img_id=32727\"><br />";
newHTML += "<div id=\"content\">"; newHTML += "<div id=\"content\">";
newHTML += "<img id=\"pic1\" alt=\"Geoportal Icon\"><br />"; newHTML += "<img alt=\"Geoportal Icon\" src=\"https://data.d4science.org/shub/E_c2taUnBRRXRpSHF3Y0IzeHQ1K0QzTzlhUzVyT01WbTBFY2hiNWlkb1pVK2x0Z3hzM2VXbVk5VU9ESWMxdnVmcw==\"><br />";
newHTML += "<p id=\"title-geo\">Geoportal</p><br />"; newHTML += "<p id=\"title-geo\">Geoportal</p><br />";
newHTML += "<div id=\"inner-content\">"; newHTML += "<div id=\"inner-content\">";
newHTML += "<p style=\"font-size: 18px;\">" + action + "</p>"; newHTML += "<p style=\"font-size: 18px;\">" + action + "</p>";
if (waiting) { if (waiting) {
newHTML += "<img id=\"pic2\" alt=\"D4Science Geoportal Loading...\"><br />"; newHTML += "<img alt=\"D4Science Geoportal Loading Icon\" src=\"https://data.d4science.org/shub/E_a2Y1N2ZIaUhCVlE5R0JXNjJhVXVsTlNyNVJta2ZKZVFMaG52N2gxZm05VWJOb2RFTVBpa0pyV1hsUlg2WXJSTw==\"><br />";
} }
newHTML += "<br/><p id=\"message\">" + message + "</p>"; newHTML += "<br/><p id=\"message\">" + message + "</p>";