diff --git a/src/main/java/org/gcube/portlets/user/vremanagement/RequestVRE.java b/src/main/java/org/gcube/portlets/user/vremanagement/RequestVRE.java index c34429c..a80c83e 100644 --- a/src/main/java/org/gcube/portlets/user/vremanagement/RequestVRE.java +++ b/src/main/java/org/gcube/portlets/user/vremanagement/RequestVRE.java @@ -219,7 +219,7 @@ public class RequestVRE extends MVCPortlet { StringBuilder sb = new StringBuilder("Hi, the following VRE was requested by ").append(currentUser.getFullName()) .append(" (").append(currentUser.getEmailAddress()).append(").") .append("\n\n").append("VRE name: ").append(vre_name).append("\n") - .append("\n").append("Manager(s)").append(vreManagerName).append("\n") + .append("\n").append("Manager(s): ").append(vreManagerName).append("\n") .append("\n").append("Abstract:\n").append(theAbstract).append("\n") .append("\n").append("Contact email: ").append(email).append("\n"); @@ -235,7 +235,7 @@ public class RequestVRE extends MVCPortlet { workspace.getWorkspaceMessageManager(). sendMessageToPortalLogins(subject, body, attachmentsList, recipientIds); - _log.info("Sending upload method message notification to: " + recipientIds.toString()); + _log.info("Sending new VRE Request message notification to: " + recipientIds.toString()); NotificationsManager nm = new ApplicationNotificationsManager(new SocialNetworkingSite(request), scope, new SocialNetworkingUser( currentUser.getScreenName(), currentUser.getEmailAddress(), currentUser.getFullName(), "")); Thread thread = new Thread(new MessageNotificationsThread(recipients, messageId, subject, body, nm)); diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml index 6bbf0f5..13678be 100644 --- a/src/main/webapp/WEB-INF/liferay-portlet.xml +++ b/src/main/webapp/WEB-INF/liferay-portlet.xml @@ -57,7 +57,11 @@ request-vre /icon.png + false /css/main.css + + /js/jquery.min.js + /js/main.js diff --git a/src/main/webapp/html/requestvre/view.jsp b/src/main/webapp/html/requestvre/view.jsp index 1e87d40..2216595 100644 --- a/src/main/webapp/html/requestvre/view.jsp +++ b/src/main/webapp/html/requestvre/view.jsp @@ -5,11 +5,12 @@ <%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.kernel.servlet.SessionErrors"%> +<%@page import="com.liferay.portal.model.User"%> - +<% User currentUser = themeDisplay.getUser(); %> <% if (SessionErrors.contains(renderRequest.getPortletSession(), "experiment-form-error")) { %> @@ -75,9 +76,9 @@ label="Abstract, 150 to 250 words" value="" required="true" style="width:90%;" /> - +