SP-104 / BIS-64 and SP-132 / BIS-82 - Registration and edit forms improvements:

- replaced hardcoded texts with dictionary entries
- added unsaved changes info box
- added "*" character to saveUploadButton on a dirty sample registration form

SVN: 26204

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

@@ -80,6 +80,18 @@ public abstract class Dict
 
     public static final String BREADCRUMBS_SEPARATOR = "breadcrumbs_separator";
 
+    //
+    // Form
+    //
+
+    public static final String UNSAVED_FORM_CHANGES_INFO = "unsaved_form_changes_info";
+
+    public static final String SAVE_UNCHANGED_FORM_CONFIRMATION_TITLE =
+            "save_unchanged_form_confirmation_title";
+
+    public static final String SAVE_UNCHANGED_FORM_CONFIRMATION_MSG =
+            "save_unchanged_form_confirmation_msg";
+    
     //
     // Table Modifications
     //

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

@@ -88,6 +88,8 @@ public abstract class AbstractRegistrationForm extends ContentPanel implements
 
     protected InfoBox infoBox;
 
+    protected InfoBox unsavedChangesInfoBox;
+
     protected FormPanelWithSavePoint formPanel;
 
     protected final int labelWidth;
@@ -123,6 +125,7 @@ public abstract class AbstractRegistrationForm extends ContentPanel implements
         setBorders(false);
         setScrollMode(Scroll.AUTO);
         setId(id);
+        add(unsavedChangesInfoBox = createUnsavedChangesInfoBox());
         add(infoBox = createInfoBox());
         add(loadingInfo = createLoadingInfo());
         add(WidgetUtils.inRow(formPanel = createFormPanel(), rightPanel = createAdditionalPanel()));
@@ -144,6 +147,13 @@ public abstract class AbstractRegistrationForm extends ContentPanel implements
         return result;
     }
 
+    private InfoBox createUnsavedChangesInfoBox()
+    {
+        InfoBox info = new InfoBox();
+        info.addStyleName("unsaved-changes-info");
+        return info;
+    }
+
     private final static InfoBox createInfoBox()
     {
         final InfoBox infoBox = new InfoBox();
@@ -164,12 +174,18 @@ public abstract class AbstractRegistrationForm extends ContentPanel implements
 
     protected void updateDirtyCheckAfterChange(boolean isDirty)
     {
-        String message = messageProvider.getMessage(Dict.BUTTON_SAVE);
+        String saveMsg = messageProvider.getMessage(Dict.BUTTON_SAVE);
+        String unsavedChangesMsg = messageProvider.getMessage(Dict.UNSAVED_FORM_CHANGES_INFO);
+
         if (isDirty)
         {
-            message = message + "*";
+            saveButton.setText(saveMsg + "*");
+            unsavedChangesInfoBox.displayInfo(unsavedChangesMsg);
+        } else
+        {
+            saveButton.setText(saveMsg);
+            unsavedChangesInfoBox.reset();
         }
-        saveButton.setText(message);
     }
 
     protected void resetFieldsAfterSave()
@@ -308,7 +324,12 @@ public abstract class AbstractRegistrationForm extends ContentPanel implements
 
     protected void addSaveButtonConfirmationListener()
     {
-        saveButton.addListener(Events.BeforeSelect, new Listener<BaseEvent>()
+        addSaveButtonConfirmationListener(saveButton);
+    }
+
+    protected void addSaveButtonConfirmationListener(final Button button)
+    {
+        button.addListener(Events.BeforeSelect, new Listener<BaseEvent>()
             {
                 @Override
                 public void handleEvent(BaseEvent be)
@@ -316,13 +337,15 @@ public abstract class AbstractRegistrationForm extends ContentPanel implements
                     if (formPanel.isValid() && formPanel.isDirtyForSavePoint() == false)
                     {
                         be.setCancelled(true);
-                        new ConfirmationDialog("Save Confirmation",
-                                "You haven't made any changes. Do you really want to save the form ?")
+                        new ConfirmationDialog(messageProvider
+                                .getMessage(Dict.SAVE_UNCHANGED_FORM_CONFIRMATION_TITLE),
+                                messageProvider
+                                        .getMessage(Dict.SAVE_UNCHANGED_FORM_CONFIRMATION_MSG))
                             {
                                 @Override
                                 protected void onYes()
                                 {
-                                    saveButton.fireEvent(Events.Select);
+                                    button.fireEvent(Events.Select);
                                 }
                             }.show();
                     }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.java

@@ -192,6 +192,7 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
     private Button createSaveAndUploadButton()
     {
         Button button = new Button(viewContext.getMessage(Dict.BUTTON_SAVE_AND_UPLOAD));
+        addSaveButtonConfirmationListener(button);
         button.addSelectionListener(new SelectionListener<ButtonEvent>()
             {
                 @Override
@@ -398,4 +399,20 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
         return parentsArea.tryGetSamples();
     }
 
+    @Override
+    protected void updateDirtyCheckAfterChange(boolean isDirty)
+    {
+        super.updateDirtyCheckAfterChange(isDirty);
+
+        String saveUploadMsg = viewContext.getMessage(Dict.BUTTON_SAVE_AND_UPLOAD);
+
+        if (isDirty)
+        {
+            saveUploadButton.setText(saveUploadMsg + "*");
+        } else
+        {
+            saveUploadButton.setText(saveUploadMsg);
+        }
+    }
+
 }

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

@@ -59,6 +59,15 @@ var common = {
   add_unofficial_vocabulary_term_dialog_title: "Add Ad Hoc Term",
   breadcrumbs_separator: "»",
   storage_confirmation: "Storage Confirmed",
+
+  //
+  // Form
+  // 
+  
+  unsaved_form_changes_info: "You have unsaved changes.",
+  save_unchanged_form_confirmation_title: "Confirm Save",
+  save_unchanged_form_confirmation_msg: "You haven't made any changes. Do you really want to save the form?",
+  
   //
   // Deletion
   // 

openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css

@@ -270,6 +270,10 @@ body,div,td,.default-text {
 	margin-left: 5px;	
 }
 
+.unsaved-changes-info {
+  margin-bottom: 5px;
+}
+
 /*****************************
  * Movie buttons
  *****************************/