From aadfc311470f32f794265125ea7741e061f20451 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 21 Jan 2019 16:04:43 +0000 Subject: [PATCH] updated to support 6 exploratories git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/sbd-uploadshare-portlet@176715 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../webapp/html/accessexploratory/config.jsp | 31 +++++++++++++ .../webapp/html/accessexploratory/view.jsp | 45 +++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/src/main/webapp/html/accessexploratory/config.jsp b/src/main/webapp/html/accessexploratory/config.jsp index 4035268..aba6c6d 100644 --- a/src/main/webapp/html/accessexploratory/config.jsp +++ b/src/main/webapp/html/accessexploratory/config.jsp @@ -13,18 +13,22 @@ Here you can customise the icon to show besides the Exploratory name String exploratoryName3Title = GetterUtil.getString(portletPreferences.getValue("exploratoryName3-Title", StringPool.BLANK)); String exploratoryName4Title = GetterUtil.getString(portletPreferences.getValue("exploratoryName4-Title", StringPool.BLANK)); String exploratoryName5Title = GetterUtil.getString(portletPreferences.getValue("exploratoryName5-Title", StringPool.BLANK)); + String exploratoryName6Title = GetterUtil.getString(portletPreferences.getValue("exploratoryName6-Title", StringPool.BLANK)); long exploratoryName1DocumentId = GetterUtil.getLong(portletPreferences.getValue("exploratoryName1-DocumentId", StringPool.BLANK)); long exploratoryName2DocumentId = GetterUtil.getLong(portletPreferences.getValue("exploratoryName2-DocumentId", StringPool.BLANK)); long exploratoryName3DocumentId = GetterUtil.getLong(portletPreferences.getValue("exploratoryName3-DocumentId", StringPool.BLANK)); long exploratoryName4DocumentId = GetterUtil.getLong(portletPreferences.getValue("exploratoryName4-DocumentId", StringPool.BLANK)); long exploratoryName5DocumentId = GetterUtil.getLong(portletPreferences.getValue("exploratoryName5-DocumentId", StringPool.BLANK)); + long exploratoryName6DocumentId = GetterUtil.getLong(portletPreferences.getValue("exploratoryName6-DocumentId", StringPool.BLANK)); + String exploratory1Url = GetterUtil.getString(portletPreferences.getValue("exploratory1-Url", StringPool.BLANK)); String exploratory2Url = GetterUtil.getString(portletPreferences.getValue("exploratory2-Url", StringPool.BLANK)); String exploratory3Url = GetterUtil.getString(portletPreferences.getValue("exploratory3-Url", StringPool.BLANK)); String exploratory4Url = GetterUtil.getString(portletPreferences.getValue("exploratory4-Url", StringPool.BLANK)); String exploratory5Url = GetterUtil.getString(portletPreferences.getValue("exploratory5-Url", StringPool.BLANK)); + String exploratory6Url = GetterUtil.getString(portletPreferences.getValue("exploratory6-Url", StringPool.BLANK)); String displayName_cfg = ""; @@ -178,6 +182,33 @@ Here you can customise the icon to show besides the Exploratory name + + + + + + + +
+ + +
+
diff --git a/src/main/webapp/html/accessexploratory/view.jsp b/src/main/webapp/html/accessexploratory/view.jsp index 60ef30f..2c4d88f 100644 --- a/src/main/webapp/html/accessexploratory/view.jsp +++ b/src/main/webapp/html/accessexploratory/view.jsp @@ -20,6 +20,8 @@ GetterUtil.getString(portletPreferences.getValue("exploratoryName4-Title", StringPool.BLANK))); pageContext.setAttribute("exploratoryName5Title", GetterUtil.getString(portletPreferences.getValue("exploratoryName5-Title", StringPool.BLANK))); + pageContext.setAttribute("exploratoryName6Title", + GetterUtil.getString(portletPreferences.getValue("exploratoryName6-Title", StringPool.BLANK))); long exploratoryName1DocumentId = GetterUtil .getLong(portletPreferences.getValue("exploratoryName1-DocumentId", StringPool.BLANK)); @@ -31,6 +33,8 @@ .getLong(portletPreferences.getValue("exploratoryName4-DocumentId", StringPool.BLANK)); long exploratoryName5DocumentId = GetterUtil .getLong(portletPreferences.getValue("exploratoryName5-DocumentId", StringPool.BLANK)); + long exploratoryName6DocumentId = GetterUtil + .getLong(portletPreferences.getValue("exploratoryName6-DocumentId", StringPool.BLANK)); String url1 = GetterUtil.getString(portletPreferences.getValue("exploratory1-Url", StringPool.BLANK)); pageContext.setAttribute("exploratory1Url", Utils.getVREFriendlyURL(currentUser, url1)); @@ -46,6 +50,10 @@ String url5 = GetterUtil.getString(portletPreferences.getValue("exploratory5-Url", StringPool.BLANK)); pageContext.setAttribute("exploratory5Url", Utils.getVREFriendlyURL(currentUser, url5)); + + String url6 = GetterUtil.getString(portletPreferences.getValue("exploratory6-Url", StringPool.BLANK)); + pageContext.setAttribute("exploratory6Url", Utils.getVREFriendlyURL(currentUser, url6)); + String content1 = ""; if (exploratoryName1DocumentId > 0) { @@ -89,6 +97,15 @@ Node node = document.selectSingleNode("/root/static-content"); content5 = node.getText(); } + + String content6 = ""; + if (exploratoryName6DocumentId > 0) { + JournalArticle article = JournalArticleLocalServiceUtil.getArticle(groupId, + "" + exploratoryName6DocumentId); + Document document = SAXReaderUtil.read(article.getContent()); + Node node = document.selectSingleNode("/root/static-content"); + content6 = node.getText(); + } %>
@@ -228,4 +245,32 @@
+
+ + +
+

+ + ${exploratoryName6Title} +

+
+
+ <% + if (content6.length() > 225) + out.println(HtmlUtil.stripHtml(content6.substring(0, 222) + " ...")); + %> + + +
+ +
+
+ +
+
\ No newline at end of file