gCubeSystem
/
sbd-uploadshare-portlet
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added 5th explroatory 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/sbd-uploadshare-portlet@167864 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2018-06-04 13:03:28 +00:00
parent 8ee023f3bf
commit b27ac6a41c
3 changed files with 84 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/gcube/portlets/user/sbdportlets/AccessConfigurationAction.java
View File

@ -27,7 +27,10 @@ public class AccessConfigurationAction extends DefaultConfigurationAction {
_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");
String exploratoryName5Title = prefs.getValue("exploratoryName5-Title", "");
_log.info("exploratoryName5-Title = " + exploratoryName5Title + " in ConfigurationAction.processAction() saved correctly");
long exploratoryName1DocumentId = Long.parseLong(prefs.getValue("exploratoryName1-DocumentId", "0"));
_log.info("exploratoryName1-DocumentId = " + exploratoryName1DocumentId + " in ConfigurationAction.processAction() saved correctly");
long exploratoryName2DocumentId = Long.parseLong(prefs.getValue("exploratoryName2-DocumentId", "0"));
@ -36,6 +39,8 @@ public class AccessConfigurationAction extends DefaultConfigurationAction {
_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");
long exploratoryName5DocumentId = Long.parseLong(prefs.getValue("exploratoryName5-DocumentId", "0"));
_log.info("exploratoryName4-DocumentId = " + exploratoryName5DocumentId + " in ConfigurationAction.processAction() saved correctly");
String exploratory1Url = prefs.getValue("exploratory1-Url", "");
@ -46,6 +51,8 @@ public class AccessConfigurationAction extends DefaultConfigurationAction {
_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");
String exploratory5Url = prefs.getValue("exploratory5-Url", "");
_log.info("exploratory5-Url = " + exploratory5Url + " in ConfigurationAction.processAction() saved correctly");
}

37
src/main/webapp/html/accessexploratory/config.jsp
View File

@ -12,16 +12,19 @@ Here you can customise the icon to show besides the Exploratory name
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));
String exploratoryName5Title = GetterUtil.getString(portletPreferences.getValue("exploratoryName5-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));
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 displayName_cfg = "";
@ -32,10 +35,11 @@ Here you can customise the icon to show besides the Exploratory name
value="<%=Constants.UPDATE%>" />
<aui:input name="preferences--icondocURL--" type="text"
cssClass="text long-field" showRequiredLabel="true" label="Icon docId"
inlineField="true" inlineLabel="left" placeholder="Relative URL of the image"
inlineField="true" inlineLabel="left"
placeholder="Relative URL of the image"
helpMessage="Relative URL of the image taken from Liferay CMS of the icons"
value="<%=icondocURL%>" required="false">
</aui:input>
<p>Enter the Exploratory in the following:</p>
<!-- Application URL -->
@ -120,7 +124,7 @@ Here you can customise the icon to show besides the Exploratory name
</tr>
</table>
</aui:field-wrapper>
<aui:field-wrapper cssClass="field-group">
<aui:field-wrapper cssClass="field-group">
<table>
<tr>
<td><aui:input name="preferences--exploratoryName4-Title--"
@ -147,6 +151,33 @@ Here you can customise the icon to show besides the Exploratory name
</tr>
</table>
</aui:field-wrapper>
<aui:field-wrapper cssClass="field-group">
<table>
<tr>
<td><aui:input name="preferences--exploratoryName5-Title--"
type="text" cssClass="text long-field" showRequiredLabel="true"
label="Exploratory Name 5" inlineField="true" inlineLabel="left"
placeholder="Exploratory"
helpMessage="Display Name of the Exploratory"
value="<%=exploratoryName5Title%>" required="false" /></td>
<td><aui:input
name="preferences--exploratoryName5-DocumentId--" type="text"
cssClass="text long-field" showRequiredLabel="true"
label="Exploratory Document Id 5" inlineField="true"
inlineLabel="left" placeholder="ID"
helpMessage="ID taken from Liferay CMS in this Site"
value="<%=exploratoryName5DocumentId%>" required="false">
<aui:validator name="digits"></aui:validator>
</aui:input></td>
<td><aui:input name="preferences--exploratory5-Url--"
type="text" cssClass="text long-field" showRequiredLabel="true"
label="URL of the VRE 5" inlineField="true" inlineLabel="left"
placeholder="url" helpMessage="URL" value="<%=exploratory5Url%>"
required="false">
</aui:input></td>
</tr>
</table>
</aui:field-wrapper>
<aui:button-row>
<aui:button type="submit" />
</aui:button-row>

43
src/main/webapp/html/accessexploratory/view.jsp
View File

@ -18,6 +18,8 @@
GetterUtil.getString(portletPreferences.getValue("exploratoryName3-Title", StringPool.BLANK)));
pageContext.setAttribute("exploratoryName4Title",
GetterUtil.getString(portletPreferences.getValue("exploratoryName4-Title", StringPool.BLANK)));
pageContext.setAttribute("exploratoryName5Title",
GetterUtil.getString(portletPreferences.getValue("exploratoryName5-Title", StringPool.BLANK)));
long exploratoryName1DocumentId = GetterUtil
.getLong(portletPreferences.getValue("exploratoryName1-DocumentId", StringPool.BLANK));
@ -27,6 +29,8 @@
.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));
String url1 = GetterUtil.getString(portletPreferences.getValue("exploratory1-Url", StringPool.BLANK));
pageContext.setAttribute("exploratory1Url", Utils.getVREFriendlyURL(currentUser, url1));
@ -39,6 +43,9 @@
String url4 = GetterUtil.getString(portletPreferences.getValue("exploratory4-Url", StringPool.BLANK));
pageContext.setAttribute("exploratory4Url", Utils.getVREFriendlyURL(currentUser, url4));
String url5 = GetterUtil.getString(portletPreferences.getValue("exploratory5-Url", StringPool.BLANK));
pageContext.setAttribute("exploratory5Url", Utils.getVREFriendlyURL(currentUser, url5));
String content1 = "";
if (exploratoryName1DocumentId > 0) {
@ -74,6 +81,14 @@
Node node = document.selectSingleNode("/root/static-content");
content4 = node.getText();
}
String content5 = "";
if (exploratoryName5DocumentId > 0) {
JournalArticle article = JournalArticleLocalServiceUtil.getArticle(groupId,
"" + exploratoryName5DocumentId);
Document document = SAXReaderUtil.read(article.getContent());
Node node = document.selectSingleNode("/root/static-content");
content5 = node.getText();
}
%>
<c:if test="${not empty exploratoryName1Title}">
<div class="asset-abstract">
@ -185,4 +200,32 @@
<div class="asset-metadata"></div>
</div>
</div>
</c:if>
<!-- FIFTH -->
<c:if test="${not empty exploratoryName5Title}">
<div class="asset-abstract">
<h3 class="asset-title">
<a href="${exploratory5Url}"><img alt="" src="${icondocURL}">
${exploratoryName5Title}</a>
</h3>
<div class="asset-content">
<div class="asset-summary" style="margin-left: 25px;">
<span id="asset-summarypre5"> <%
if (content5.length() > 225)
out.println(HtmlUtil.stripHtml(content5.substring(0, 222) + " ..."));
%>
<div>
<a
href="javascript:switchView('#asset-summarypre5', '#asset-summary-5');">Read
More » </a>
</div>
</span>
<div class="asset-more">
<div id="asset-summary-5" class="asset-summary"
style="display: none;"><%=content5%></div>
</div>
</div>
<div class="asset-metadata"></div>
</div>
</div>
</c:if>