From 71082faa159a726202f5833c19fc3b67b274e859 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 5 Oct 2011 18:51:00 +0000
Subject: [PATCH] LMS-2573 Finished implementing new menu structure
SVN: 23206
---
.../client/web/client/application/Dict.java | 16 +---
.../web/client/application/menu/TopMenu.java | 8 --
.../administration/AdministrationMenu.java | 22 +++--
.../menu/administration/ProjectMenu.java | 47 ----------
.../menu/administration/ScriptMenu.java | 47 ----------
.../TypesMenu.java} | 36 ++++----
.../menu/administration/VocabularyMenu.java | 47 ----------
.../application/menu/dataset/DataSetMenu.java | 90 -------------------
.../menu/experiment/ExperimentMenu.java | 53 -----------
.../application/menu/sample/SampleMenu.java | 57 ------------
.../cisd/openbis/public/common-dictionary.js | 31 +++----
11 files changed, 43 insertions(+), 411 deletions(-)
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ProjectMenu.java
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ScriptMenu.java
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/{material/MaterialMenu.java => administration/TypesMenu.java} (57%)
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/VocabularyMenu.java
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/experiment/ExperimentMenu.java
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/sample/SampleMenu.java
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
index 02b450b85d1..e963a57c2f5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
@@ -672,6 +672,8 @@ public abstract class Dict
public static final String MENU_IMPORT = "menu_import";
+ public static final String MENU_TYPES = "menu_types";
+
//
// Menu Titles
//
@@ -680,22 +682,8 @@ public abstract class Dict
public static final String MENU_AUTHORIZATION = "menu_authorization";
- public static final String MENU_PROJECT = "menu_project";
-
public static final String MENU_PROPERTY_TYPES = "menu_property_types";
- public static final String MENU_VOCABULARY = "menu_vocabulary";
-
- public static final String MENU_SCRIPT = "menu_script";
-
- public static final String MENU_DATA_SET = "menu_data_set";
-
- public static final String MENU_EXPERIMENT = "menu_experiment";
-
- public static final String MENU_MATERIAL = "menu_material";
-
- public static final String MENU_SAMPLE = "menu_sample";
-
public static final String MENU_MODULES = "menu_modules";
public static final String MENU_COMPUTE = "menu_compute";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java
index 3740da7fd8c..89900296123 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java
@@ -22,11 +22,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewConte
import ch.systemsx.cisd.openbis.generic.client.web.client.application.SearchWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.administration.AdministrationMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.dataset.DataSetMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.experiment.ExperimentMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.material.MaterialMenu;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.modules.ModulesMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.sample.SampleMenu;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.top.BrowseMenu;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.top.ImportMenu;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.top.NewMenu;
@@ -120,10 +116,6 @@ public class TopMenu extends LayoutContainer
toolBar.add(new BrowseMenu(viewContext, componentProvider));
toolBar.add(new NewMenu(viewContext, componentProvider));
toolBar.add(new ImportMenu(viewContext, componentProvider));
- toolBar.add(new ExperimentMenu(viewContext, componentProvider));
- toolBar.add(new SampleMenu(viewContext, componentProvider));
- toolBar.add(new DataSetMenu(viewContext, componentProvider));
- toolBar.add(new MaterialMenu(viewContext, componentProvider));
toolBar.add(new AdministrationMenu(viewContext, componentProvider));
toolBar.add(new ModulesMenu(viewContext, viewContext.getClientPluginFactoryProvider()));
toolBar.add(new FillToolItem());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AdministrationMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AdministrationMenu.java
index c446ead8c9a..9071cb2b4d2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AdministrationMenu.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AdministrationMenu.java
@@ -16,11 +16,6 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.administration;
-import com.extjs.gxt.ui.client.event.BaseEvent;
-import com.extjs.gxt.ui.client.event.Events;
-import com.extjs.gxt.ui.client.event.Listener;
-import com.extjs.gxt.ui.client.widget.menu.Menu;
-
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
@@ -29,6 +24,11 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMe
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenuItem;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
+import com.extjs.gxt.ui.client.event.BaseEvent;
+import com.extjs.gxt.ui.client.event.Events;
+import com.extjs.gxt.ui.client.event.Listener;
+import com.extjs.gxt.ui.client.widget.menu.Menu;
+
/**
* Administration top menu.
*
@@ -44,15 +44,13 @@ public class AdministrationMenu extends TopMenuItem
Menu submenu = new Menu();
submenu.add(new ActionMenu(TopMenu.ActionMenuKind.ADMINISTRATION_MENU_MANAGE_GROUPS,
messageProvider, componentProvider.getGroupBrowser()));
- submenu.add(new ProjectMenu(messageProvider, componentProvider));
- submenu.add(new VocabularyMenu(messageProvider, componentProvider));
+ submenu.add(new ActionMenu(TopMenu.ActionMenuKind.VOCABULARY_MENU_BROWSE, messageProvider,
+ componentProvider.getVocabularyBrowser()));
+ submenu.add(new TypesMenu(messageProvider, componentProvider));
submenu.add(new PropertyTypesMenu(messageProvider, componentProvider));
- submenu.add(new ScriptMenu(messageProvider, componentProvider));
+ submenu.add(new ActionMenu(TopMenu.ActionMenuKind.SCRIPT_MENU_BROWSE, messageProvider,
+ componentProvider.getScriptBrowser()));
submenu.add(new AuthorizationMenu(messageProvider, componentProvider));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_FILE_FORMATS,
- messageProvider, componentProvider.getFileFormatTypeBrowser()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.GENERAL_IMPORT_MENU, messageProvider,
- componentProvider.createGeneralImport()));
if (viewContext.isLoggingEnabled())
{
submenu.add(new ActionMenu(TopMenu.ActionMenuKind.LOGGING_CONSOLE, messageProvider,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ProjectMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ProjectMenu.java
deleted file mode 100644
index 1193f86ee44..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ProjectMenu.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2009 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.administration;
-
-import com.extjs.gxt.ui.client.widget.menu.Menu;
-import com.extjs.gxt.ui.client.widget.menu.MenuItem;
-
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
-
-/**
- * Project top submenu.
- *
- * @author Piotr Buczek
- */
-public class ProjectMenu extends MenuItem
-{
-
- public ProjectMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
- {
- super(messageProvider.getMessage(Dict.MENU_PROJECT));
-
- Menu menu = new Menu();
- menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROJECT_MENU_BROWSE, messageProvider,
- componentProvider.getProjectBrowser()));
- menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROJECT_MENU_NEW, messageProvider,
- componentProvider.getProjectRegistration()));
- setSubMenu(menu);
- }
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ScriptMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ScriptMenu.java
deleted file mode 100644
index bf12a54506b..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ScriptMenu.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2009 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.administration;
-
-import com.extjs.gxt.ui.client.widget.menu.Menu;
-import com.extjs.gxt.ui.client.widget.menu.MenuItem;
-
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
-
-/**
- * Script top submenu.
- *
- * @author Piotr Buczek
- */
-public class ScriptMenu extends MenuItem
-{
-
- public ScriptMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
- {
- super(messageProvider.getMessage(Dict.MENU_SCRIPT));
-
- Menu menu = new Menu();
- menu.add(new ActionMenu(TopMenu.ActionMenuKind.SCRIPT_MENU_BROWSE, messageProvider,
- componentProvider.getScriptBrowser()));
- menu.add(new ActionMenu(TopMenu.ActionMenuKind.SCRIPT_MENU_NEW, messageProvider,
- componentProvider.getScriptRegistration(null)));
- setSubMenu(menu);
- }
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/material/MaterialMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/TypesMenu.java
similarity index 57%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/material/MaterialMenu.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/TypesMenu.java
index 543852c79b0..ba90da53d2a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/material/MaterialMenu.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/TypesMenu.java
@@ -14,39 +14,41 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.material;
-
-import com.extjs.gxt.ui.client.widget.menu.Menu;
+package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.administration;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenuItem;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
+import com.extjs.gxt.ui.client.widget.menu.Menu;
+import com.extjs.gxt.ui.client.widget.menu.MenuItem;
+
/**
- * Material top menu.
+ * Types menu for managing entity types.
*
- * @author Piotr Buczek
+ * @author Chandrasekhar Ramakrishnan
*/
-public class MaterialMenu extends TopMenuItem
+public class TypesMenu extends MenuItem
{
- public MaterialMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
+ public TypesMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
{
- super(messageProvider.getMessage(Dict.MENU_MATERIAL));
+ super(messageProvider.getMessage(Dict.MENU_TYPES));
Menu submenu = new Menu();
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.MATERIAL_MENU_BROWSE, messageProvider,
- componentProvider.getMaterialBrowser()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.MATERIAL_MENU_IMPORT, messageProvider,
- componentProvider.getMaterialBatchRegistration()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.MATERIAL_MENU_MASS_UPDATE, messageProvider,
- componentProvider.getMaterialBatchUpdate()));
+ submenu.add(new ActionMenu(TopMenu.ActionMenuKind.EXPERIMENT_MENU_TYPES, messageProvider,
+ componentProvider.getExperimentTypeBrowser()));
+ submenu.add(new ActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_TYPES, messageProvider,
+ componentProvider.getSampleTypeBrowser()));
+ submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_TYPES, messageProvider,
+ componentProvider.getDataSetTypeBrowser()));
submenu.add(new ActionMenu(TopMenu.ActionMenuKind.MATERIAL_MENU_TYPES, messageProvider,
componentProvider.getMaterialTypeBrowser()));
- setMenu(submenu);
- }
+ submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_FILE_FORMATS,
+ messageProvider, componentProvider.getFileFormatTypeBrowser()));
+ setSubMenu(submenu);
+ }
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/VocabularyMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/VocabularyMenu.java
deleted file mode 100644
index d165367b047..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/VocabularyMenu.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2009 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.administration;
-
-import com.extjs.gxt.ui.client.widget.menu.Menu;
-import com.extjs.gxt.ui.client.widget.menu.MenuItem;
-
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
-
-/**
- * Vocabulary top submenu.
- *
- * @author Piotr Buczek
- */
-public class VocabularyMenu extends MenuItem
-{
-
- public VocabularyMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
- {
- super(messageProvider.getMessage(Dict.MENU_VOCABULARY));
-
- Menu menu = new Menu();
- menu.add(new ActionMenu(TopMenu.ActionMenuKind.VOCABULARY_MENU_BROWSE, messageProvider,
- componentProvider.getVocabularyBrowser()));
- menu.add(new ActionMenu(TopMenu.ActionMenuKind.VOCABULARY_MENU_NEW, messageProvider,
- componentProvider.getVocabularyRegistration()));
- setSubMenu(menu);
- }
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
deleted file mode 100644
index 03639f58106..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2009 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.dataset;
-
-import com.extjs.gxt.ui.client.event.MenuEvent;
-import com.extjs.gxt.ui.client.event.SelectionListener;
-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;
-import com.google.gwt.user.client.Window;
-
-import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
-import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenuItem;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
-import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ApplicationInfo;
-import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
-import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
-
-/**
- * Data Set top menu.
- *
- * @author Piotr Buczek
- */
-public class DataSetMenu extends TopMenuItem
-{
-
- public DataSetMenu(final IViewContext<ICommonClientServiceAsync> viewContext,
- ComponentProvider componentProvider)
- {
- super(viewContext.getMessage(Dict.MENU_DATA_SET));
-
- Menu submenu = new Menu();
- IMessageProvider messageProvider = viewContext;
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_SEARCH, messageProvider,
- componentProvider.getDataSetSearch()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_TYPES, messageProvider,
- componentProvider.getDataSetTypeBrowser()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_MASS_UPDATE,
- messageProvider, componentProvider.getDataSetBatchUpdate()));
- ApplicationInfo applicationInfo = viewContext.getModel().getApplicationInfo();
- boolean cifexConfigured =
- StringUtils.isNotBlank(applicationInfo.getCifexRecipient())
- && StringUtils.isNotBlank(applicationInfo.getCifexURL());
- if (cifexConfigured)
- {
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_UPLOAD,
- messageProvider, componentProvider.getDataSetUploadTab(null)));
- }
-
- SelectionListener<? extends MenuEvent> listener = new SelectionListener<MenuEvent>()
- {
- @Override
- public void componentSelected(MenuEvent ce)
- {
- final URLMethodWithParameters urlParams =
- new URLMethodWithParameters("/openbis/openbis/"
- + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH);
- String sessionToken = viewContext.getModel().getSessionContext().getSessionID();
- urlParams.addParameter("session", sessionToken);
- urlParams.addParameter(BasicConstant.SERVER_URL_PARAMETER,
- GWT.getHostPageBaseURL());
- Window.open(urlParams.toString(), "_blank",
- "resizable=yes,scrollbars=yes,dependent=yes");
- }
- };
- submenu.add(new MenuItem(TopMenu.ActionMenuKind.DATA_SET_MENU_UPLOAD_CLIENT
- .getMenuText(messageProvider), listener));
- setMenu(submenu);
- }
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/experiment/ExperimentMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/experiment/ExperimentMenu.java
deleted file mode 100644
index 3cb307838d5..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/experiment/ExperimentMenu.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2009 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.experiment;
-
-import com.extjs.gxt.ui.client.widget.menu.Menu;
-
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenuItem;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
-
-/**
- * Experiment top menu.
- *
- * @author Piotr Buczek
- */
-public class ExperimentMenu extends TopMenuItem
-{
- public ExperimentMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
- {
- super(messageProvider.getMessage(Dict.MENU_EXPERIMENT));
-
- Menu submenu = new Menu();
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.EXPERIMENT_MENU_BROWSE, messageProvider,
- componentProvider.getExperimentBrowser()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.EXPERIMENT_MENU_NEW, messageProvider,
- componentProvider.getExperimentRegistration()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.EXPERIMENT_MENU_IMPORT, messageProvider,
- componentProvider.getExperimentBatchRegistration()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.EXPERIMENT_MENU_MASS_UPDATE, messageProvider,
- componentProvider.getExperimentBatchUpdate()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.EXPERIMENT_MENU_TYPES, messageProvider,
- componentProvider.getExperimentTypeBrowser()));
- setMenu(submenu);
- }
-
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/sample/SampleMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/sample/SampleMenu.java
deleted file mode 100644
index 2abd8fe50ea..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/sample/SampleMenu.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2009 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.sample;
-
-import com.extjs.gxt.ui.client.widget.menu.Menu;
-
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenuItem;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
-
-/**
- * Sample top menu.
- *
- * @author Piotr Buczek
- */
-public class SampleMenu extends TopMenuItem
-{
-
- public SampleMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
- {
- super(messageProvider.getMessage(Dict.MENU_SAMPLE));
-
- setId(TopMenu.ID + "_SAMPLE");
- Menu submenu = new Menu();
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_SEARCH, messageProvider,
- componentProvider.getSampleSearch()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_BROWSE, messageProvider,
- componentProvider.getSampleBrowser()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_NEW, messageProvider,
- componentProvider.getSampleRegistration()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_IMPORT, messageProvider,
- componentProvider.getSampleBatchRegistration()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_MASS_UPDATE, messageProvider,
- componentProvider.getSampleBatchUpdate()));
- submenu.add(new ActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_TYPES, messageProvider,
- componentProvider.getSampleTypeBrowser()));
- setMenu(submenu);
- }
-
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
index e8ba6b9b693..4b01e057828 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
@@ -378,6 +378,7 @@ var common = {
menu_browse: "Browse",
menu_new: "New",
menu_import: "Import",
+ menu_types: "Types",
//
// Menu Titles
@@ -393,41 +394,36 @@ var common = {
TRASH: "Trash",
LOGGING_CONSOLE: "Logging Console",
- menu_data_set: "Data Set",
DATA_SET_MENU_SEARCH: "Data Set Search",
- DATA_SET_MENU_TYPES: "Types",
+ DATA_SET_MENU_TYPES: "Data Set Types",
DATA_SET_MENU_FILE_FORMATS: "File Types",
DATA_SET_MENU_UPLOAD: "Data Sets (via CIFEX)",
DATA_SET_MENU_UPLOAD_CLIENT: "Data Sets",
- DATA_SET_MENU_MASS_UPDATE: "Data Set Metadata",
+ DATA_SET_MENU_MASS_UPDATE: "Data Set Metadata Update",
data_set_batch_update: "Data Set Metadata",
- menu_experiment: "Experiment",
EXPERIMENT_MENU_BROWSE: "Experiments",
EXPERIMENT_MENU_NEW: "Experiment",
EXPERIMENT_MENU_IMPORT: "Experiment Metadata",
- EXPERIMENT_MENU_MASS_UPDATE: "Experiment Metadata Update",
- EXPERIMENT_MENU_TYPES: "Types",
+ EXPERIMENT_MENU_MASS_UPDATE: "Experiment Metadata Updates",
+ EXPERIMENT_MENU_TYPES: "Experiment Types",
- menu_material: "Material",
MATERIAL_MENU_BROWSE: "Materials",
MATERIAL_MENU_IMPORT: "Material Metadata",
- MATERIAL_MENU_MASS_UPDATE: "Material Metadata Update",
- MATERIAL_MENU_TYPES: "Types",
+ MATERIAL_MENU_MASS_UPDATE: "Material Metadata Updates",
+ MATERIAL_MENU_TYPES: "Material Types",
- menu_sample: "Sample",
SAMPLE_MENU_SEARCH: "Sample Search",
SAMPLE_MENU_BROWSE: "Samples",
SAMPLE_MENU_NEW: "Sample",
SAMPLE_MENU_IMPORT: "Sample Metadata",
- SAMPLE_MENU_MASS_UPDATE: "Sample Metadata Update",
- SAMPLE_MENU_TYPES: "Types",
+ SAMPLE_MENU_MASS_UPDATE: "Sample Metadata Updates",
+ SAMPLE_MENU_TYPES: "Sample Types",
- menu_project: "Project",
PROJECT_MENU_BROWSE: "Projects",
PROJECT_MENU_NEW: "Project",
- menu_property_types: "Property Type",
+ menu_property_types: "Metadata",
PROPERTY_TYPES_MENU_BROWSE_PROPERTY_TYPES: "Browse Property Types",
PROPERTY_TYPES_MENU_BROWSE_ASSIGNMENTS: "Browse Assignments",
PROPERTY_TYPES_MENU_NEW_PROPERTY_TYPES: "New Property Type",
@@ -436,12 +432,9 @@ var common = {
PROPERTY_TYPES_MENU_ASSIGN_TO_MATERIAL_TYPE: "Assign To Material Type",
PROPERTY_TYPES_MENU_ASSIGN_TO_DATA_SET_TYPE: "Assign To Data Set Type",
- menu_script: "Script",
- SCRIPT_MENU_BROWSE: "Browse",
- SCRIPT_MENU_NEW: "New",
+ SCRIPT_MENU_BROWSE: "Scripts",
- menu_vocabulary: "Vocabulary",
- VOCABULARY_MENU_BROWSE: "Browse",
+ VOCABULARY_MENU_BROWSE: "Vocabularies",
VOCABULARY_MENU_NEW: "New",
// menu user
--
GitLab