diff --git a/src/main/java/org/gcube/portlets/user/sbdportlets/AccessConfigurationAction.java b/src/main/java/org/gcube/portlets/user/sbdportlets/AccessConfigurationAction.java index 48b948c..b4eb1fd 100644 --- a/src/main/java/org/gcube/portlets/user/sbdportlets/AccessConfigurationAction.java +++ b/src/main/java/org/gcube/portlets/user/sbdportlets/AccessConfigurationAction.java @@ -25,6 +25,8 @@ public class AccessConfigurationAction extends DefaultConfigurationAction { _log.info("exploratoryName2-Title = " + exploratoryName2Title + " in ConfigurationAction.processAction() saved correctly"); String exploratoryName3Title = prefs.getValue("exploratoryName3-Title", ""); _log.info("exploratoryName3-Title = " + exploratoryName3Title + " in ConfigurationAction.processAction() saved correctly"); + String exploratoryName4Title = prefs.getValue("exploratoryName4-Title", ""); + _log.info("exploratoryName4-Title = " + exploratoryName4Title + " in ConfigurationAction.processAction() saved correctly"); long exploratoryName1DocumentId = Long.parseLong(prefs.getValue("exploratoryName1-DocumentId", "0")); _log.info("exploratoryName1-DocumentId = " + exploratoryName1DocumentId + " in ConfigurationAction.processAction() saved correctly"); @@ -32,13 +34,18 @@ public class AccessConfigurationAction extends DefaultConfigurationAction { _log.info("exploratoryName2-DocumentId = " + exploratoryName2DocumentId + " in ConfigurationAction.processAction() saved correctly"); long exploratoryName3DocumentId = Long.parseLong(prefs.getValue("exploratoryName3-DocumentId", "0")); _log.info("exploratoryName3-DocumentId = " + exploratoryName3DocumentId + " in ConfigurationAction.processAction() saved correctly"); + long exploratoryName4DocumentId = Long.parseLong(prefs.getValue("exploratoryName4-DocumentId", "0")); + _log.info("exploratoryName4-DocumentId = " + exploratoryName4DocumentId + " in ConfigurationAction.processAction() saved correctly"); + String exploratory1Url = prefs.getValue("exploratory1-Url", ""); _log.info("exploratory1-Url = " + exploratory1Url + " in ConfigurationAction.processAction() saved correctly"); String exploratory2Url = prefs.getValue("exploratory2-Url", ""); _log.info("exploratory2-Url = " + exploratory2Url + " in ConfigurationAction.processAction() saved correctly"); String exploratory3Url = prefs.getValue("exploratory3-Url", ""); _log.info("exploratory3-Url = " + exploratory3Url + " in ConfigurationAction.processAction() saved correctly"); + String exploratory4Url = prefs.getValue("exploratory4-Url", ""); + _log.info("exploratory4-Url = " + exploratory4Url + " in ConfigurationAction.processAction() saved correctly"); } diff --git a/src/main/webapp/html/accessexploratory/config.jsp b/src/main/webapp/html/accessexploratory/config.jsp index 500470e..6759d91 100644 --- a/src/main/webapp/html/accessexploratory/config.jsp +++ b/src/main/webapp/html/accessexploratory/config.jsp @@ -11,14 +11,17 @@ Here you can customise the icon to show besides the Exploratory name String exploratoryName1Title = GetterUtil.getString(portletPreferences.getValue("exploratoryName1-Title", StringPool.BLANK)); String exploratoryName2Title = GetterUtil.getString(portletPreferences.getValue("exploratoryName2-Title", StringPool.BLANK)); String exploratoryName3Title = GetterUtil.getString(portletPreferences.getValue("exploratoryName3-Title", StringPool.BLANK)); + String exploratoryName4Title = GetterUtil.getString(portletPreferences.getValue("exploratoryName4-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)); 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 displayName_cfg = ""; @@ -116,6 +119,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 8b5a856..ae52eec 100644 --- a/src/main/webapp/html/accessexploratory/view.jsp +++ b/src/main/webapp/html/accessexploratory/view.jsp @@ -16,6 +16,8 @@ GetterUtil.getString(portletPreferences.getValue("exploratoryName2-Title", StringPool.BLANK))); pageContext.setAttribute("exploratoryName3Title", GetterUtil.getString(portletPreferences.getValue("exploratoryName3-Title", StringPool.BLANK))); + pageContext.setAttribute("exploratoryName4Title", + GetterUtil.getString(portletPreferences.getValue("exploratoryName4-Title", StringPool.BLANK))); long exploratoryName1DocumentId = GetterUtil .getLong(portletPreferences.getValue("exploratoryName1-DocumentId", StringPool.BLANK)); @@ -23,6 +25,8 @@ .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)); String url1 = GetterUtil.getString(portletPreferences.getValue("exploratory1-Url", StringPool.BLANK)); pageContext.setAttribute("exploratory1Url", Utils.getVREFriendlyURL(currentUser, url1)); @@ -32,6 +36,9 @@ String url3 = GetterUtil.getString(portletPreferences.getValue("exploratory3-Url", StringPool.BLANK)); pageContext.setAttribute("exploratory3Url", Utils.getVREFriendlyURL(currentUser, url3)); + + String url4 = GetterUtil.getString(portletPreferences.getValue("exploratory4-Url", StringPool.BLANK)); + pageContext.setAttribute("exploratory4Url", Utils.getVREFriendlyURL(currentUser, url4)); String content1 = ""; if (exploratoryName1DocumentId > 0) { @@ -59,6 +66,14 @@ Node node = document.selectSingleNode("/root/static-content"); content3 = node.getText(); } + String content4 = ""; + if (exploratoryName4DocumentId > 0) { + JournalArticle article = JournalArticleLocalServiceUtil.getArticle(groupId, + "" + exploratoryName4DocumentId); + Document document = SAXReaderUtil.read(article.getContent()); + Node node = document.selectSingleNode("/root/static-content"); + content4 = node.getText(); + } %>
@@ -142,4 +157,32 @@
+
+ + +
+

+ + ${exploratoryName4Title} +

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