diff --git a/.classpath b/.classpath index 0762a64..a40fe77 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -36,5 +36,5 @@ - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 1cc3e8b..3585b9d 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.0.1-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.0.2-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/pom.xml b/pom.xml index ed07be1..871557e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.admin resource-management - 5.0.1-SNAPSHOT + 5.0.2-SNAPSHOT war gCube Resource Management Portlet @@ -89,12 +89,12 @@ org.gcube.resources.discovery ic-client + provided org.gcube.core common-scope-maps [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided org.gcube.resourcemanagement diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/utils/OpCommands.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/utils/OpCommands.java index 64642c7..55eb2b4 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/utils/OpCommands.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/utils/OpCommands.java @@ -316,17 +316,31 @@ public class OpCommands { } if (location.endsWith("/") || location.endsWith("#")) { //standalone - location = com.google.gwt.user.client.Window.Location.getProtocol() +"//"+ com.google.gwt.user.client.Window.Location.getHost() + - "/runtime-resource?pid=126&lifecycle=0&state=maximized&modes=view&doAsId=10136&refererPlid=10139&authzToken=101334249" - + "&curscope="+StatusHandler.getStatus().getCurrentScope()+res2EditParam; + location = location.substring(0, location.length()-2); } - else { //portal - location += "/../runtime-resource?pid=126&lifecycle=0&state=maximized&modes=view&doAsId=10136&refererPlid=10139&authzToken=101334249" + + location += "/../runtime-resource?pid=126&lifecycle=0&state=maximized&modes=view&doAsId=10136&refererPlid=10139&authzToken=101334249" + "&curscope="+StatusHandler.getStatus().getCurrentScope()+res2EditParam; - } - Window.open(location, "_blank", ""); + + //Window.open(location, "_blank", ""); + openNewWindow("Service Endpoint Editor", location); + } + + /** + * Opens a new windows with a specified URL.. + * + * @param name String with the name of the window. + * @param url String with your URL. + */ + public static void openNewWindow(String name, String url) { + com.google.gwt.user.client.Window.open(url, name.replace(" ", "_"), + "menubar=no," + + "location=false," + + "resizable=yes," + + "scrollbars=yes," + + "status=no," + + "dependent=true"); } - } diff --git a/src/main/webapp/ResourceManagementPortlet.css b/src/main/webapp/ResourceManagementPortlet.css index d7450dd..1c56496 100644 --- a/src/main/webapp/ResourceManagementPortlet.css +++ b/src/main/webapp/ResourceManagementPortlet.css @@ -10,7 +10,7 @@ } .iosItem { - color: #FDFDF6; + color: #444; font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; font-weight: 300;