From 9d01f03174c8744c871d8b99e9911d4a5ac11eb0 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 26 Sep 2013 17:09:57 +0000 Subject: [PATCH] new icons for resources, integrated (hybrid) the Service Endpoint Editor, still need test git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@82060 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 4 +- .settings/com.google.gdt.eclipse.core.prefs | 2 +- pom.xml | 68 +++++++++++------ .../client/ResourceManagementPortlet.java | 43 +++++++---- .../client/utils/OpCommands.java | 64 +++++++++++++--- .../resourcedetails/ContextMenuFactory.java | 39 +--------- .../client/widgets/taskbar/TaskbarButton.java | 69 +++++++++--------- .../client/widgets/taskbar/TaskbarItem.java | 5 +- .../client/widgets/taskbar/TaskbarWindow.java | 4 + src/main/webapp/ResourceManagementPortlet.css | 50 +++++++------ .../webapp/conf/resourcemanagement.properties | 4 +- src/main/webapp/images/pattern.gif | Bin 0 -> 1243 bytes .../webapp/images/resource-icons/blue.png | Bin 0 -> 1169 bytes .../webapp/images/resource-icons/green.png | Bin 0 -> 1179 bytes .../webapp/images/resource-icons/orange.png | Bin 0 -> 1167 bytes .../webapp/images/resource-icons/ramarro.png | Bin 0 -> 1175 bytes src/main/webapp/images/resource-icons/red.png | Bin 0 -> 1169 bytes .../webapp/images/resource-icons/violet.png | Bin 0 -> 1179 bytes .../webapp/images/resource-icons/yellow.png | Bin 0 -> 1173 bytes 19 files changed, 201 insertions(+), 151 deletions(-) create mode 100644 src/main/webapp/images/pattern.gif create mode 100644 src/main/webapp/images/resource-icons/blue.png create mode 100644 src/main/webapp/images/resource-icons/green.png create mode 100644 src/main/webapp/images/resource-icons/orange.png create mode 100644 src/main/webapp/images/resource-icons/ramarro.png create mode 100644 src/main/webapp/images/resource-icons/red.png create mode 100644 src/main/webapp/images/resource-icons/violet.png create mode 100644 src/main/webapp/images/resource-icons/yellow.png diff --git a/.classpath b/.classpath index d0c2c7b..0762a64 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 f0bbdc0..1cc3e8b 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.0-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.0.1-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/pom.xml b/pom.xml index b565af2..ed07be1 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.admin resource-management - 5.0.0-SNAPSHOT + 5.0.1-SNAPSHOT war gCube Resource Management Portlet @@ -39,7 +39,17 @@ UTF-8 UTF-8 - + + + + org.gcube.distribution + maven-portal-bom + LATEST + pom + import + + + com.sencha.gxt @@ -77,34 +85,63 @@ rmp-common-library [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + + + org.gcube.resources.discovery + ic-client + + + org.gcube.core + common-scope-maps + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + + + org.gcube.resourcemanagement + resourcemanager-client + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + + + org.gcube.resources + registry-publisher + [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + + + org.gcube.resourcemanagement + ghn-manager-client + [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + + + org.gcube.resourcemanagement + ghnmanager-stubs + provided + org.gcube.applicationsupportlayer aslcore - [3.2.0-SNAPSHOT, 4.0.0-SNAPSHOT) provided org.gcube.portlets.user home-library - [4.3.0-SNAPSHOT, 5.0.0-SNAPSHOT) provided org.gcube.portlets.user home-library-jcr - [1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided org.gcube.applicationsupportlayer accesslogger - [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided org.gcube.portlets.user gcube-widgets - [1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided @@ -116,7 +153,6 @@ org.gcube.portal custom-portal-handler - [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided @@ -157,7 +193,6 @@ net.customware.gwt.dispatch gwt-dispatch - 1.2.0 provided @@ -176,57 +211,48 @@ javax.portlet portlet-api - 2.0 provided commons-lang commons-lang - 2.6 provided org.apache.commons commons-compress - 1.4.1 provided commons-fileupload commons-fileupload - 1.2.1 provided commons-io commons-io - 2.4 provided log4j log4j - 1.2.16 runtime org.slf4j slf4j-log4j12 - 1.6.4 runtime org.slf4j slf4j-api - 1.6.4 runtime com.allen-sauer.gwt.log gwt-log - 3.1.7 provided diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java index a2e65da..ef60e3c 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java @@ -462,22 +462,22 @@ public class ResourceManagementPortlet implements EntryPoint { MenuItem cleanGHN = new MenuItem("Resource Sweeper") { protected void onClick(final ComponentEvent be) { - super.onClick(be); - if (SupportedOperations.SWEEP_GHN.isAllowed(StatusHandler.getStatus().getCredentials())) { - GWT.runAsync(SweeperDialog.class, new RunAsyncCallback() { - @Override - public void onSuccess() { - String currentScope = StatusHandler.getStatus().getCurrentScope(); - new SweeperDialog(currentScope); - } - - public void onFailure(Throwable reason) { - Window.alert("There are networks problem, please check your connection."); - } - }); - } - else - MessageBox.alert("Resource Sweeper", "You are not allowed to execute this operation", null); + super.onClick(be); + if (SupportedOperations.SWEEP_GHN.isAllowed(StatusHandler.getStatus().getCredentials())) { + GWT.runAsync(SweeperDialog.class, new RunAsyncCallback() { + @Override + public void onSuccess() { + String currentScope = StatusHandler.getStatus().getCurrentScope(); + new SweeperDialog(currentScope); + } + + public void onFailure(Throwable reason) { + Window.alert("There are networks problem, please check your connection."); + } + }); + } + else + MessageBox.alert("Resource Sweeper", "You are not allowed to execute this operation", null); }; }; @@ -495,9 +495,20 @@ public class ResourceManagementPortlet implements EntryPoint { OpCommands.doOpenGenericResourceForm(); }; }; + createGR.setIconStyle("genericresource-icon"); createMnu.add(createGR); + // Create Service Endpoint (former Runtime Resource) + MenuItem createSE = new MenuItem("Service Endpoint") { + protected void onClick(final ComponentEvent be) { + super.onClick(be); + OpCommands.doOpenServiceEndpointForm(); + }; + }; + createSE.setIconStyle("runtimeresource-icon"); + createMnu.add(createSE); + // Create activation record from plugins MenuItem createARTM = new MenuItem("Activation Record for Tree Manager") { protected void onClick(final ComponentEvent be) { 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 05ac796..64642c7 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 @@ -34,6 +34,7 @@ import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.event.Listener; import com.extjs.gxt.ui.client.event.MessageBoxEvent; import com.extjs.gxt.ui.client.widget.MessageBox; +import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -88,7 +89,7 @@ public class OpCommands { StatusHandler.getStatus().getCurrentScope(), toSend, OpCallBacks.handleGenericOperation(SupportedOperations.GHN_SHUTDOWN) - ); + ); } catch (Exception e) { ConsoleMessageBroker.error(OpCommands.class, e.getMessage()); MessageBox.info( @@ -117,7 +118,7 @@ public class OpCommands { StatusHandler.getStatus().getCurrentScope(), toSend, OpCallBacks.handleGenericOperation(SupportedOperations.GHN_RESTART) - ); + ); } catch (Exception e) { ConsoleMessageBroker.error(OpCommands.class, e.getMessage()); MessageBox.info( @@ -153,7 +154,7 @@ public class OpCommands { StatusHandler.getStatus().getCurrentScope(), toSend, OpCallBacks.handleGenericOperation(requiredPermissions) - ); + ); } catch (Exception e) { ConsoleMessageBroker.error(OpCommands.class, e.getMessage()); MessageBox.info( @@ -163,6 +164,17 @@ public class OpCommands { } } + /************************************************************* + * SERVICE ENDPOINT + ************************************************************/ + public static final void doOpenServiceEndpointForm() { + if (SupportedOperations.GENERIC_RESOURCE_CREATE.isAllowed(StatusHandler.getStatus().getCredentials())) { + loadServiceEndopointEditor(null); + } else { + MessageBox.alert("Service Endpoint Creation", "You are not allowed to execute this operation", null); + } + } + /************************************************************* * GENERIC RESOURCE @@ -175,6 +187,8 @@ public class OpCommands { } } + + public static final void doCreateGenericResource( final String id, final String name, @@ -200,10 +214,10 @@ public class OpCommands { public void onFailure(final Throwable caught) { MessageBox.alert("Generic Resouce Creation", "Generic Resource Creation failure:
" + - ((caught != null && caught.getMessage() != null) ? - caught.getMessage() : - "See server log for further details."), - null); + ((caught != null && caught.getMessage() != null) ? + caught.getMessage() : + "See server log for further details."), + null); } }); } else { @@ -229,10 +243,10 @@ public class OpCommands { public void onFailure(final Throwable caught) { MessageBox.alert("Generic Resouce Creation", "Generic Resource Creation failure:
" + - ((caught != null && caught.getMessage() != null) ? - caught.getMessage() : - "See server log for further details."), - null); + ((caught != null && caught.getMessage() != null) ? + caught.getMessage() : + "See server log for further details."), + null); } }); } else { @@ -287,4 +301,32 @@ public class OpCommands { }); } } + + + /** + * Redirect to Service Endpoint Editor + * @param idToEdit + */ + public static void loadServiceEndopointEditor(String idToEdit) { + + String location = Window.Location.getHref(); + String res2EditParam = ""; + if (idToEdit != null) { + res2EditParam = "&rid=" + idToEdit; + } + + 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; + } + else { //portal + 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", ""); + } + + + } diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ContextMenuFactory.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ContextMenuFactory.java index e0d651f..13e21be 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ContextMenuFactory.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ContextMenuFactory.java @@ -23,10 +23,8 @@ import org.gcube.portlets.admin.resourcemanagement.client.forms.genericresources import org.gcube.portlets.admin.resourcemanagement.client.remote.ProxyRegistry; import org.gcube.portlets.admin.resourcemanagement.client.utils.Commands; import org.gcube.portlets.admin.resourcemanagement.client.utils.OpCommands; - import org.gcube.portlets.admin.resourcemanagement.client.widgets.console.ConsoleMessageBroker; import org.gcube.portlets.admin.resourcemanagement.client.widgets.registry.UIIdentifiers; - import org.gcube.resourcemanagement.support.client.utils.StatusHandler; import org.gcube.resourcemanagement.support.client.views.ResourceTypeDecorator; import org.gcube.resourcemanagement.support.shared.operations.SupportedOperations; @@ -637,7 +635,7 @@ public class ContextMenuFactory { for (ModelData e : container.getSelection()) { idToEdit = e.get("ID"); } - loadRuntimeResourcePortlet(idToEdit); + OpCommands.loadServiceEndopointEditor(idToEdit); } }; // Checks the permissions on the operation @@ -687,37 +685,6 @@ public class ContextMenuFactory { return delete; } - String location; - /** - * Redirect to Runtime Resource Portlet - * @param idToEdit - */ - public void loadRuntimeResourcePortlet(String idToEdit){ - - getUrl(); - // Window.alert(location); - - 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&rid="+idToEdit+"&authzToken=101334249&curscope="+StatusHandler.getStatus().getCurrentScope(); - //GWT.log("OPEN " + location); - getURL(location); - } - else { //portal - getUrl(); - location += "/../runtime-resource?pid=126&lifecycle=0&state=maximized&modes=view&doAsId=10136&refererPlid=10139&rid="+idToEdit+"&authzToken=101334249&curscope="+StatusHandler.getStatus().getCurrentScope(); - Window.open(location, "_self", ""); - } - - } - - public static native void getURL(String url)/*-{ - $wnd.open(url,'target=_blank') - }-*/; - - /** - * Get URL from browser - */ - public native void getUrl()/*-{ - this.@org.gcube.portlets.admin.resourcemanagement.client.views.resourcedetails.ContextMenuFactory::location = $wnd.location.href; - }-*/; + + } diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarButton.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarButton.java index d8b6c1c..21a042c 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarButton.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarButton.java @@ -20,6 +20,7 @@ import static com.google.gwt.query.client.GQuery.$; import java.util.ArrayList; import org.gcube.portlets.admin.resourcemanagement.client.utils.FWSTranslate; +import org.gcube.resourcemanagement.support.client.views.ResourceTypeDecorator; import com.extjs.gxt.ui.client.core.El; import com.extjs.gxt.ui.client.event.ComponentEvent; @@ -41,13 +42,11 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; * A selectable icon (post-it styled) and text added to the pinned resources (TaskbarWindow). */ public class TaskbarButton extends Component implements IconSupport { - private String type; + private ResourceTypeDecorator type; private String text; private AbstractImagePrototype icon; private El iconEl; - private ArrayList extractedColors = new ArrayList(); - /** * Creates a new shortcut. */ @@ -61,17 +60,28 @@ public class TaskbarButton extends Component implements IconSupport { * @param id the shortcut id * @param text the shortcut text */ - public TaskbarButton(final String id, final String type, final String text) { + public TaskbarButton(final String id, final ResourceTypeDecorator type, final String text) { setId(id); setText(text); this.type = type; + + //for IE + final Timer t2 = new Timer() { + @Override + public void run() { + getElement().getFirstChildElement().getStyle().setOpacity(0.8); + + } + }; //need to make sure the element is attached to the DOM Timer t = new Timer() { @Override public void run() { - $(getElement().getFirstChildElement()).animate("opacity:'0.9'", 500); + $(getElement().getFirstChildElement()).animate("opacity:'0.8'", 500); + t2.schedule(500); } }; + t.schedule(100); } @@ -154,8 +164,8 @@ public class TaskbarButton extends Component implements IconSupport { - final El a = el().createChild("
"); - iconEl = a.createChild(FWSTranslate.getFWSNameFromLabel(type)); + final El a = el().createChild("
"); + iconEl = a.createChild(FWSTranslate.getFWSNameFromLabel(type.toString())); El txt = a.createChild("
"); if (txt != null) { @@ -169,35 +179,24 @@ public class TaskbarButton extends Component implements IconSupport { } } - private String getExaBackgroundColor() { - //pick a random color - int no = Random.nextInt(7); - while (extractedColors.contains(no)) { - no = Random.nextInt(7); - } - extractedColors.add(no); - if (extractedColors.size() > 6) - extractedColors = new ArrayList(); - - switch (no) { - case 0: - return "#bebee4"; - case 1: - return "#CAEBFA"; - case 2: - return "#a8f2b5"; - case 3: - return "#fe99ad"; - case 4: - return "#ffd395"; - case 5: - return "#ffea97"; - case 6: - return "#d4d4d4"; + private String getExaBackgroundColor(ResourceTypeDecorator type) { + switch (type) { + case Collection: + return "#aa84c1"; //violet + case RunningInstance: + return "#8aacd2"; //blue + case GenericResource: + return "#79bd84"; //green + case GHN: + return "#a4d03b"; //ramarro + case RuntimeResource: + return "#e4df00"; //yellow + case Service: + return "#fea500"; //orange + case WSResource: + return "#f6634f"; //red default: - return "#a8f2b5"; + return "#CAEBFA"; //azur } - - } } diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarItem.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarItem.java index bee1a5d..76ea016 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarItem.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarItem.java @@ -16,8 +16,6 @@ package org.gcube.portlets.admin.resourcemanagement.client.widgets.taskbar; -import static com.google.gwt.query.client.GQuery.$; - import org.gcube.portlets.admin.resourcemanagement.client.remote.ProxyRegistry; import org.gcube.portlets.admin.resourcemanagement.client.utils.Callbacks; import org.gcube.portlets.admin.resourcemanagement.client.utils.Commands; @@ -28,7 +26,6 @@ import org.gcube.resourcemanagement.support.shared.util.Configuration; import com.extjs.gxt.ui.client.event.ComponentEvent; import com.extjs.gxt.ui.client.widget.menu.Menu; import com.extjs.gxt.ui.client.widget.menu.MenuItem; -import com.google.gwt.core.client.GWT; /** * @author Massimiliano Assante (ISTI-CNR) @@ -66,7 +63,7 @@ public class TaskbarItem { private void initUI(final String title, final String id,final String buttonIcon) { - this.detachButton = new TaskbarButton("btn" + id, ""+type, title) { + this.detachButton = new TaskbarButton("btn" + id, type, title) { protected void onClick(final com.extjs.gxt.ui.client.event.ComponentEvent ce) { relatedWidget.doMinimize(); } diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarWindow.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarWindow.java index 4eef3a8..e1c4a48 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarWindow.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/widgets/taskbar/TaskbarWindow.java @@ -16,6 +16,8 @@ package org.gcube.portlets.admin.resourcemanagement.client.widgets.taskbar; +import java.util.ArrayList; + import org.gcube.portlets.admin.resourcemanagement.client.widgets.console.ConsoleMessageBroker; import org.gcube.resourcemanagement.support.shared.util.Configuration; @@ -33,6 +35,8 @@ import com.extjs.gxt.ui.client.widget.layout.FitLayout; public class TaskbarWindow extends Window { private TaskbarItem relatedItem = null; private boolean isMinimized = false; + + public static ArrayList extractedColors = new ArrayList(); protected TaskbarWindow(final TaskbarItem relatedItem) { super(); diff --git a/src/main/webapp/ResourceManagementPortlet.css b/src/main/webapp/ResourceManagementPortlet.css index e09fe96..d7450dd 100644 --- a/src/main/webapp/ResourceManagementPortlet.css +++ b/src/main/webapp/ResourceManagementPortlet.css @@ -10,7 +10,7 @@ } .iosItem { - color: #4c68a6; + color: #FDFDF6; font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; font-weight: 300; @@ -20,6 +20,7 @@ margin-top: 10px; padding: 5px; width: 120px; + height: 100px; border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px; @@ -239,33 +240,42 @@ background-image: url(images/icons/about.png) !important; } -.resources-icon { - background-image: url(images/icons/world.png) !important; -} - -.wsresources-icon { - background-image: url(images/icons/ws-resource.png) !important; -} - -.ghn-icon { - background-image: url(images/icons/hostingNode.png) !important; -} - .defaultleaf-icon { background-image: url(images/icons/grid.png) !important; } +.resources-icon { + background-image: url(images/icons/world.png) !important; +} + + + /* RESOURCES */ + .collection-icon { - background-image: url(images/icons/collection2.png) !important; + background-image: url(images/resource-icons/violet.png) !important; +} + +.runninginstance-icon { + background-image: url(images/resource-icons/blue.png) !important; } .genericresource-icon { - background-image: url(images/icons/GenericResource.png) !important; + background-image: url(images/resource-icons/green.png) !important; } -.runtimeresource-icon { - background-image: url(images/icons/serviceEndpoint.png) !important; +.ghn-icon { + background-image: url(images/resource-icons/ramarro.png) !important; } +.runtimeresource-icon { + background-image: url(images/resource-icons/yellow.png) !important; +} +.service-icon { + background-image: url(images/resource-icons/orange.png) !important; +} +.wsresources-icon { + background-image: url(images/resource-icons/red.png) !important; +} + /* END RESOURCES */ .pluginCM-icon { background-image: url(images/icons/pluginCM.png) !important; @@ -283,13 +293,7 @@ background-image: url(images/icons/table_multiple.png) !important; } -.runninginstance-icon { - background-image: url(images/icons/gcoreEndpoint.png) !important; -} -.service-icon { - background-image: url(images/icons/software.png) !important; -} .empty-icon { background-image: url(images/icons/error.png) !important; diff --git a/src/main/webapp/conf/resourcemanagement.properties b/src/main/webapp/conf/resourcemanagement.properties index 88eadbd..1c60db9 100644 --- a/src/main/webapp/conf/resourcemanagement.properties +++ b/src/main/webapp/conf/resourcemanagement.properties @@ -2,7 +2,7 @@ # The user and its credentials # Possible values for credentials: # [USER,ADMIN,DEBUG] -USER_CREDENTIALS = ADMIN +USER_CREDENTIALS = DEBUG # Defines the modality in which the portlet is running # possible values [STANDALONE,PORTAL,NOTDEFINED] @@ -11,7 +11,7 @@ RUNNING_MODE = STANDALONE DEFAULT_USER = massimiliano.assante # The scope that will be used as default -DEFAULT_SCOPE =/gcube/devsec +DEFAULT_SCOPE =/gcube # the target of update notification (if in singleton mode) # mails MUST be separated by ; USERMAIL_TO = m.assante@gmail.com diff --git a/src/main/webapp/images/pattern.gif b/src/main/webapp/images/pattern.gif new file mode 100644 index 0000000000000000000000000000000000000000..1d80567cfde54f50e412888ec8e54a093102fbda GIT binary patch literal 1243 zcmZ?wbhEHb)MU_Pn8?8J_U+qu@813Y|DS<@LGeF#gl~X?OJYePkhZa}C`e4sPAySL zN=?tqvsHS(d%u!GW{Ry+xT&v!Z-H}aMy5wqQEG6NUr2IQcCuxPlD(aRO@&oOZb5Ep zNuokUZcbjYRfVlmVoH8esuhq864qBz04piUwpDTjNhpBqbj~kIRWQ{v&`mZlGf*%y z)H5_TF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=| zef{$Ca=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~> zCgqow*eU^C3h_d20o>TUVm+{T^pf*)^(zt!^bPe4Kwg3=^!3HBG&dKny0|1L72#g2 z1{a4^7NqJ2r55Lx7A2R zz}3~*(b(9<8K&1IKe;qFHLnDwHwB^B8K+)QQpha;+U$~Alv$RV;#QQOs{r=0RVHq? zSmHDfsy79}YRmZE0?5Y^blRt*Nf6tSB!lEh#Q4EXdEx&B@Nn z%t%j5O-W8lOo)$*jfswmj0g`44G9hk4Dk2!_3`%d^l*1`b#Zobbg;LxwXwFcv@ka_ zH8C~g9c?X54RtkD6=fww1$jAH8EGj=32`w|5n&-g0e(JS9&Rp94t6$H7G@?! zVA=4K1z18bFzA2?P}#x2G+~PD@*T6zCbaZ>1+G2Qy}LX1o}u5Zn^P7FZ+XXk{L`PZ zM|&Gz^*y)CdcCye;Qb2`EOisS)jDs4*v(zGc#G803)^C(6gbay9l!B%Yfs$VtJlhA zoT*#>xIpg8o3_gzKiTg0yP|4w<5K$evKimmJ)TaVcH=q6O7oo-;XhXtPv5C2>A~TZ Wd}HOKn-N`^RbH!hc7-r7SOWmwN7Zov literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/resource-icons/blue.png b/src/main/webapp/images/resource-icons/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..395561173d2a96cb83482aff9264c744e2faac06 GIT binary patch literal 1169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L-^Aq1JP;qO z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=Yk%5z&tD&W#tCOptp{uc@g}JM%lcj~Zxv7h* zi@6g_uSMv>2~2MaLa!rEy`ZF!TL84#CABECEH%ZgC_h&L>}9J=+-@<)X&zK> z3U0Sp;MA)Rbc{YIVv!;mCIn19ASOK70y*%6pPC0u?M1+3ZO@fe&%nUQ>gnPbQgJKk z&;S4S%&HBnE`R>~o&NA@yF5=%PeEavLYhl3_oI5&NA?QVmN#Zdy8N_MU~4crf48)I zW^b#e$ce8^Np&mOQl1+!e&koM`~Ld;eo3vMJ@1ocLV@aX*s}Z*QWLe?oj zNoKJe@zOctvr~aNa)D5c!yE2Tydsa8_cz?&>e%YAF0qNLh{@1e;J>ocoqx`I53_$3 z_n9!|MZ@a!qy+*z#>^5YFR~}sFg^P2aK^1AEluGc-x2+Xm5ejC{b!i`Tt;Ctdq*Y5 z685wOw_5A}{oBoI&M?I=Wa*D@hQ`KfOgraY*z&sX{oNlMG=p2`yhmmk b8;1eIzG5$rA|IBkphCja)z4*}Q$iB}Fn5OH literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/resource-icons/green.png b/src/main/webapp/images/resource-icons/green.png new file mode 100644 index 0000000000000000000000000000000000000000..d329ef29642ff609e48b8317bcade8a17e7b2792 GIT binary patch literal 1179 zcmaJ>U2NM_6n4}u?beR98e*gZdT}+L7XQSwZcI}*iBlScLze~-@l?mYX{^pa*tf*# z9@;VqWdaE#1Zxmws)od*X&~(dq&_SN2{GOg9YTyvleQPcV1ue!OStZujt7Dz``&Z) zecw6voKHSInR));fxZI-K^#m^NLjr0_-|(rfBWw?6ug8`DvzeDA}T8mB;uM?fFNxs zGcXGkt@7FxI6@F@q@K&8y!@h|S_Y-~7|Jtj%qEBt(X$nG79vo9GrAcge_Oju0$q!d zuMEnJY$st!pO|;x)O;qV&d;h*jTA@0h$mnH10n@@#tG9EycoHoE8x90vpHH($V%h8 zxo{LCO9CGm+SSF+SO1DdGG)gE%=ExEoG3>#;bprgMI zwQ%^oOTAsL*1DGAmRuSaL;HjM*Pxq6*ggJs&$c+&Gd?u2+a2H5FOO{# zMBq?bis!r^3tNqb*miWWSF67xilL7eDqq#Vt+yY(weQO6g?%?ZAKSVmek}$wk7a`U zpJJaZ z@x#OG%U8c!`sv!(){!%BEvqn{!33l{OSM}mzzUyY+@~6?I zU1-}z99QBj8HqF8Hjt#0^`=nP!K@Fvj$$>Qn^^AZ5ryCwX8JHHOJ_$U(kaqq zR>DSBkmqIJq#MQx~SyxJD=60K=|G1Pq83;2JZgBf1HCOIIX&|Cpu076eZx z=x0IYFEFTH;f*6g690#@^ns~FdqL`JA zZu=ruf}X`>#efj>z=*+nuo`#?IhFlT5o!#`=qm z%j9OY1TxY{&b?E3T(2hs2fSS~SF0ZfgH^U=-kN=+ zA9b%U&VJojIpyU~E`1v9)j(HnxvTR2Qtj2Ap95FCTb-4)Bdf}Cr`^gQ4%G+fyH8W! zTrd2KqLC=uqElz4zBj+gl$LPkgD?URq~&wLh*u>iA^%7wY#i zxZhG>THV;SpQ;y+9Dn7tGje5VWJB41^MM4u-}71TQzf&p=+%0-bEp*JYad=e)kAqy ZfXX}>d$9Rr?N9#~kx7qBtD`5D{{dyShWG#g literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/resource-icons/ramarro.png b/src/main/webapp/images/resource-icons/ramarro.png new file mode 100644 index 0000000000000000000000000000000000000000..ac441531f8734694a8980c1ac7c8797c1cbd3cc8 GIT binary patch literal 1175 zcmaJ>U1$_n6rN<0Xf?8t6zrC^-cAU#ke#0$H=CXAm`!#zy5OX7vo?7Ulli%uoyPg; z%#FJVsWv_|3N1*XkiHbEkEQB^*gz>+K_!t$=z}ko{t(c85f<^ms4?3+F&q2P?ZC{v z=kk5uIrp58IX}>UXwR;kn1-@8`PmYT5rmJ_Gs9?DI>M`#LCGG5Di}6q6GW`LV9V+_L_mRKx+#$5UlvH9 zYXUhGmKe!Sz?^<~%7KGZ{TX#?T#agE_dyUV@L0frNCpMtr0Mbnf!x&P@!mV8Nw5h) z;{y4rs9|XUBrFGlFvSE_rjr4kEX8sMB9TZ32r(=}Ga;G{1=$GCg?NSmTMvn|Ia-!a zi+x+Ua3qj9glwLs^Z7iL=P1h=quFRQ>S=^RL5v8xlO~c2LDOxkDu~ck9oGrjMu~#dW7e)eqe!g(4xVYHRT54SS;m5|+EAjPGrE;eE zQO9(1{X2JBd?!u|D_0-%y~*uv9r|EkW?##bL>PSJ*Pi>q!KbCaeh!4Dub2NgHpX6! zf0b2;Py0vZ)s7v`8Qy;6(@y4ySA`PzBE5Qrnqu)Pl zP)>o3L*o3)*{NCoLwXK;_*>o3%FX!uZ)Ka9Z!Y<7uQl8(&&++j^X_td{oQjTXS+Hs zbUk~zV=h)Az7yih2_P`Od(`@iaw#}p_h@;#xp?hY|6Htf=J?0C6Kk{WflA%#VEpdy i$@z(m8*W=W0gA+XUmjKWF+VMNzlv0{U%cEqdiEcKT8)|j literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/resource-icons/red.png b/src/main/webapp/images/resource-icons/red.png new file mode 100644 index 0000000000000000000000000000000000000000..cbc88dabfd58b13d42ddecc912d78afada460c01 GIT binary patch literal 1169 zcmaJ>U1%It6u#MXH?>$uvB*Xra+#QF!JVJoq?;WxCfS|YbW0{Io288}y0bHPH$yr< z&fIio^I+G4rGX+r6jC4R5BOk_`cSCSQqoddTH2Q)A{No$LxqT>L7@vq$2(~@^}%&u z=H7GpzVDoS&c`g|C&zd1dTtj0V0Z4ISRiY6@a~L|Z}0EELY5vZP2(x6f@_L{z?f#0 z5zHA%6%~-8)!)30h5_iL^x`z0mM3`CGH4~h(4JuvHUPsTo~@{}2*Wa}>ZU-gU0$Z3 zt_jqUL7A2944Tmo&O2yoezK^}&#Ebn8hI5Cdpr>^5LTdP95r3u6R1sHp6r8ThJu?A zJS$L-i<*}6Fk?9g4$^E)We>3M07r9)fn+lIGK{kv%dl~Vi^sSmpNR7;3%4GMWOK9% zUl6lfxkw~XGZ@=E!_;aux|X0Vr^;}tR4UMj$72K$bL%EnyqM|swG>3;s*Y}B-7;aI zsFbZaEKsD<$5$}yZCTUZY7=P~<0&@7(QI&~7EqS|A8HueXcrgIlY0MC*e%v=#1xQg z%{eL=T%|8aW%C&aDcEv~mUXn%#r%wgEqBJUVPc#Mn?$lG3T6WO7iH#ALd~6)knnKqhW+wI^JuEjO@&VUx@v za`ar6Hy}@#*K`_2tld@5$qSH2QTt zx}@!ek;Z`k#qCOEW##FxbEUD=d#>aAI{fB1SWlho{i(|Ke7Icwa`nU|pe4Ghq0U#v zQ;UzDKjr^ybGPz+@Nl_=?u2`8g+5pbmEVAWKXs#dm4O#S<=EnE>Fk3Y z`L&1FHp0)m(9f@|o{7G+({ix9tx-abcxc=U0AFS{H_`z=zhgM7V?4b*Z b(MAXO?6mmKyLU2M}<6n2OT3Dh)Te_E=}13!IFLN zx%$5EoO{kEf0{|Zzje#oTL^;Kni>?cc=fyQ=8gEf_a8^XO9x7hq7kEj%8~_%e#OW` zkkX`an1zxu^~oI=CkQX8=0?$|IK;_@MoBJ)s%R!=6GXhXVoLG^L?92xRh=gv-IynV zs_^885s?wi1T3n9(-s_=PUqz52|1>ay$3yBsUSdGwp0_Th7Mds zDQ`?7p2U^DxPoS`%j))8n{dPEie%C(#kf~$0!8ulP)%D$+b9cP*856fJ2z!QIty)M z(vtDu3IR8j$t5f(A;ZcUMyc7wOwmAwT{KLP7>NK;l2zS}SMj3ArF0ufx(rhSPhtg1 zRTVDQ)x$*CNEe$-bhB(S+}{&TCI@0Y(P%_S3ekZkS1{yB4eF@LRbFxh418*j>3-a2br%n(BQ%8qkYHrwEG=m$*!Jw_Qk%7)Z;&5H&52u zN?n0~H)C(`pY>j!uhnU4r+03<|2_75=IFO}yGg5&F#8$>W8}4iDnf+z2Q+oHRFMIUX({mr4Z?AnkTs%@g-Pz%ImPV>o m=XdJBk59H;cxS(d@N6U&hqLjU;l@Sxcach_g>MGNX8r@!ERNFv literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/resource-icons/yellow.png b/src/main/webapp/images/resource-icons/yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..a2fdb56224e48725fbd71c9b309870a1e62dac79 GIT binary patch literal 1173 zcmaJ>TWr%-74)M!8>Yp{N=HzXY224(lq{PW_F(8ql&p=<1#R3XM0w^l`RFf?R$wgfj@9krX1d9+f z9wc8EmFD9hq8SkQ+_X!iduY(ZxEb$Ozu&(FcxZ;EXb;7BT#TRfdRUqUjfce93@OVd zxWPs)90kc7LOM%Pg+jqy@VYf)jA8VEIRN$Z~8nTXLO$D~1 zkkRreNa9Lgx1i`tvZ~p*CVXL3QP3&IP1`Lsfjs~JP(@innW@ z-VpKNvQ9gd&PEIy3#&a6d%$%l!NYV#*L6lWHUc~b}8&gdrs3MGUK@uyt zWm#eaTYG6AEF_b;n{|vf$gxzCrmu!oJ zCF4UCyWPOH9{SSdBnZcv7#B_z?`IY)E7a0GwUS$~o*jB}_uP)Q+12~^f-IL@S1YZo zg}|rBkJY=<_x=K{3$OC0p4>?eWd}d`CJyedn|Xd_(+?+qSy2g1)gM}=HgE5x>Z9+s zpPG8NTrO9M+b7EN^YQhb4Kr3vXXfM1)1PmjojvgrXgSkL>yA09!#bGx>TzesZpYj^ z^SvHVZR50%C7gj5qq95v7e1W1H*>4nR(W)w z-hJ3nvWO$UzCU{T#rjHLfA#B5OH9ACtY^D_uU0A_SISqPp5Jin=-UVO?9A=0f7{(< qIcmxN$i)kD?@c}J+I;;6;b