BIS-390 / SP-591: Relabeling

SVN: 28901

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java

@@ -220,6 +220,8 @@ public abstract class Dict
 
     public static final String BUTTON_HOME_LABEL = "home_buttonLabel";
 
+    public static final String BUTTON_PROPERTIES_ASSIGNMENTS = "properties_assignments";
+
     //
     // Metaproject chooser
     //
@@ -1378,6 +1380,12 @@ public abstract class Dict
 
     public static final String CUSTOM_IMPORT = "custom_import";
 
+    public static final String ASSIGN_GROUP_EXISTING = "assign_group_existing";
+
+    public static final String ASSIGN_GROUP_NEW = "assign_group_new";
+
+    public static final String ASSIGN_GROUP_PROPERTY = "assign_group_property";
+
     // Material Viewer
 
     public static final String MATERIAL_PROPERTIES_HEADING = "material_properties_heading";

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java

@@ -20,6 +20,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import com.extjs.gxt.ui.client.event.ButtonEvent;
+import com.extjs.gxt.ui.client.event.SelectionListener;
+import com.extjs.gxt.ui.client.widget.Window;
+import com.extjs.gxt.ui.client.widget.button.Button;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
@@ -46,12 +52,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Script;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ScriptType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject;
 
-import com.extjs.gxt.ui.client.event.ButtonEvent;
-import com.extjs.gxt.ui.client.event.SelectionListener;
-import com.extjs.gxt.ui.client.widget.Window;
-import com.extjs.gxt.ui.client.widget.button.Button;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
 /**
  * Abstract grid displaying entity types.
  * 
@@ -85,22 +85,26 @@ abstract public class AbstractEntityTypeGrid<T extends EntityType> extends Typed
 
         final EntityKind entityKind = getEntityKindOrNull();
 
-        Button buttonProperties = createSelectedItemButton("Properties",
-                new ISelectedEntityInvoker<BaseEntityModel<TableModelRowWithObject<T>>>()
-                    {
-                        @Override
-                        public void invoke(
-                                BaseEntityModel<TableModelRowWithObject<T>> selectedItem,
-                                boolean keyPressed)
-                        {
-                            T entityType = selectedItem.getBaseObject().getObjectOrNull();
-                            DispatcherHelper.dispatchNaviEvent(new ComponentProvider(viewContext).getPropertyTypeAssignmentBrowser(entityType));
-                        }
+        Button buttonProperties =
+                createSelectedItemButton(
+                        viewContext.getMessage(Dict.BUTTON_PROPERTIES_ASSIGNMENTS), // "Properties"
+                        new ISelectedEntityInvoker<BaseEntityModel<TableModelRowWithObject<T>>>()
+                            {
+                                @Override
+                                public void invoke(
+                                        BaseEntityModel<TableModelRowWithObject<T>> selectedItem,
+                                        boolean keyPressed)
+                                {
+                                    T entityType = selectedItem.getBaseObject().getObjectOrNull();
+                                    DispatcherHelper.dispatchNaviEvent(new ComponentProvider(
+                                            viewContext)
+                                            .getPropertyTypeAssignmentBrowser(entityType));
+                                }
 
-                    });
+                            });
         buttonProperties.setId("property-types-" + getEntityKindOrNull());
         addButton(buttonProperties);
-        
+
         Button button = new TextToolItem(viewContext.getMessage(Dict.ADD_NEW_TYPE_BUTTON),
                 new SelectionListener<ButtonEvent>()
                     {

openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js

@@ -215,6 +215,8 @@ var common = {
   button_export_all: "Export All",
   button_export_for_update: "Export For Update",
   
+  properties_assignments: "Properties Assignments",
+  
   //
   // LoginWidget
   //
@@ -974,6 +976,12 @@ clear: "Clear",
 progress_uploading: "Uploading",
 progress_processing: "Processing",
 
+//
+// Unclassified
+//
+assign_group_existing: "Existing",
+assign_group_new: "New",
+assign_group_property: "Property",
 
  // LAST LINE: KEEP IT AT THE END
   lastline: "" // we need a line without a comma