diff --git a/pom.xml b/pom.xml
index 0960d14..e358af7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,6 @@
com.liferay.portal
portal-service
- 6.0.6
javax.portlet
diff --git a/src/main/java/org/gcube/portal/custom/communitymanager/OrganizationsUtil.java b/src/main/java/org/gcube/portal/custom/communitymanager/OrganizationsUtil.java
index 905e299..18e469c 100644
--- a/src/main/java/org/gcube/portal/custom/communitymanager/OrganizationsUtil.java
+++ b/src/main/java/org/gcube/portal/custom/communitymanager/OrganizationsUtil.java
@@ -227,7 +227,8 @@ public class OrganizationsUtil {
subLayout.setTypeSettings(typeSettings);
//actually update the sub layout
LayoutLocalServiceUtil.updateLayout(subLayout.getGroupId(), subLayout.isPrivateLayout(), subLayout.getLayoutId(), subLayout.getTypeSettings());
- removePortletFrame(subtab, subLayout);
+ if (! subtab.isUseBorder())
+ removePortletFrame(subtab, subLayout);
_log.debug("Added subtab " + subtab.getCaption() + " to layout for parent: " + layout.getName());
}
}
@@ -240,8 +241,8 @@ public class OrganizationsUtil {
//actually update the layout
LayoutLocalServiceUtil.updateLayout(layout.getGroupId(), layout.isPrivateLayout(), layout.getLayoutId(), layout.getTypeSettings());
_log.debug("Added tab " + tab.getCaption() + " to layout for Group: " + siteLayout.getName());
-
- removePortletFrame(tab, layout);
+ if (! tab.isUseBorder())
+ removePortletFrame(tab, layout);
}
return layout.getLayoutId();
}
diff --git a/src/main/java/org/gcube/portal/custom/communitymanager/PortletsIdManager.java b/src/main/java/org/gcube/portal/custom/communitymanager/PortletsIdManager.java
index a4237bf..34bfcc0 100644
--- a/src/main/java/org/gcube/portal/custom/communitymanager/PortletsIdManager.java
+++ b/src/main/java/org/gcube/portal/custom/communitymanager/PortletsIdManager.java
@@ -18,6 +18,10 @@ public final class PortletsIdManager {
*
*/
public static final String GCUBE_USERS_MANAGE = "usersManagement";
+ /**
+ *
+ */
+ public static final String GCUBE_ADD_USERS_MANAGE = "addusers";
/**
*
*/
diff --git a/src/main/java/org/gcube/portal/custom/communitymanager/components/GCUBELayoutTab.java b/src/main/java/org/gcube/portal/custom/communitymanager/components/GCUBELayoutTab.java
index 1bb2b13..77468a8 100644
--- a/src/main/java/org/gcube/portal/custom/communitymanager/components/GCUBELayoutTab.java
+++ b/src/main/java/org/gcube/portal/custom/communitymanager/components/GCUBELayoutTab.java
@@ -26,6 +26,10 @@ public class GCUBELayoutTab {
* the last part of the URL after last slash, autogenerated if not set
*/
String friendlyURL;
+ /**
+ * set to false if you don't want to show the border
+ */
+ boolean useBorder;
/**
* set to true if you don't want to show the tab
*/
@@ -54,6 +58,7 @@ public class GCUBELayoutTab {
this.portlets = portlets;
this.type = type;
this.hidden = false;
+ this.useBorder = false;
}
/**
*
@@ -78,6 +83,19 @@ public class GCUBELayoutTab {
toPass.add(portlet);
this.portlets = toPass;
}
+ /**
+ *
+ * @param caption the tab caption
+ * @param type the type of the layout
+ * @param portlet a single GCUBEPortlet to place in the layout
+ */
+ public GCUBELayoutTab(String caption, GCUBELayoutType type, GCUBEPortlet portlet, boolean useFrame) {
+ this(caption, type, new ArrayList());
+ ArrayList toPass = new ArrayList();
+ toPass.add(portlet);
+ this.portlets = toPass;
+ this.useBorder = useFrame;
+ }
/**
* method to add children tabs
* @param subtab
@@ -171,6 +189,12 @@ public class GCUBELayoutTab {
this.hidden = hidden;
}
+ public boolean isUseBorder() {
+ return useBorder;
+ }
+ public void setUseBorder(boolean useBorder) {
+ this.useBorder = useBorder;
+ }
/**
* create the layout with portlets in it
*