Re-worked buttons in schema alignment dialog and added change indicator

git-svn-id: http://google-refine.googlecode.com/svn/trunk@1687 7d457c2a-affb-35e4-300a-418c747d4874

extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js

@@ -166,11 +166,13 @@ SchemaAlignment.createNewRootNode = function() {
 
 function SchemaAlignmentDialog(protograph, onDone) {
     this._onDone = onDone;
+    this._hasUnsavedChanges = false;
+    
     this._createDialog();
-    this._reset(protograph);
+    this._reset(protograph, true);
 }
 
-SchemaAlignmentDialog.prototype._reset = function(protograph) {
+SchemaAlignmentDialog.prototype._reset = function(protograph, initial) {
     this._originalProtograph = protograph || { rootNodes: [] };
     this._protograph = cloneDeep(this._originalProtograph); // this is what can be munched on
     
@@ -193,10 +195,11 @@ SchemaAlignmentDialog.prototype._reset = function(protograph) {
         ));
     }
     
-    this.preview();
+    this.preview(initial);
 };
 
 SchemaAlignmentDialog.prototype._save = function(onDone) {
+    var self = this;
     var protograph = this.getJSON();
     
     Refine.postProcess(
@@ -208,7 +211,11 @@ SchemaAlignmentDialog.prototype._save = function(onDone) {
         {   
             onDone: function() {
                 theProject.overlayModels.freebaseProtograph = protograph;
-                onDone();
+                
+                self._elmts.statusIndicator.hide();
+                self._hasUnsavedChanges = false;
+                
+                if (onDone) onDone();
             }
         }
     );
@@ -217,7 +224,7 @@ SchemaAlignmentDialog.prototype._save = function(onDone) {
 SchemaAlignmentDialog.prototype._createDialog = function() {
     var self = this;
     var frame = $(DOM.loadHTML("freebase", "scripts/dialogs/schema-alignment/schema-alignment-dialog.html"));
-    var elmts = DOM.bind(frame);
+    var elmts = this._elmts = DOM.bind(frame);
     
     this._level = DialogSystem.showDialog(frame);
     
@@ -225,8 +232,8 @@ SchemaAlignmentDialog.prototype._createDialog = function() {
         DialogSystem.dismissUntil(self._level - 1);
     };
     
-    elmts.saveAndCloseButton.click(function() {
+    elmts.saveButton.click(function() {
-        self._save(dismiss);
+        self._save();
     });
     elmts.saveAndLoadButton.click(function() {
         self._save(function() {
@@ -237,7 +244,11 @@ SchemaAlignmentDialog.prototype._createDialog = function() {
     elmts.resetButton.click(function() {
         self._reset(null);
     });
-    elmts.cancelButton.click(dismiss);
+    elmts.closeButton.click(function() {
+        if (!self._hasUnsavedChanges || window.confirm("There are unsaved changes. Close anyway?")) {
+            dismiss();
+        }
+    });
     
     $("#schema-alignment-tabs").tabs();
     $("#schema-alignment-tabs-preview-mqllike").css("display", "");
@@ -263,10 +274,14 @@ SchemaAlignmentDialog.prototype.getJSON = function() {
     };
 };
 
-SchemaAlignmentDialog.prototype.preview = function() {
+SchemaAlignmentDialog.prototype.preview = function(initial) {
     var self = this;
     
     this._previewPanes.empty();
+    if (!(initial)) {
+        this._elmts.statusIndicator.show().text("There are unsaved changes.");
+        this._hasUnsavedChanges = true;
+    }
     
     var protograph = this.getJSON();
     $.post(

extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html

@@ -25,12 +25,17 @@
   </div>
   <div class="dialog-footer" bind="dialogFooter"><div class="grid-layout layout-normal layout-full"><table><tr>
     <td>
-      <button class="button" bind="cancelButton">Cancel</button>
       <button class="button" bind="resetButton">Reset</button>
     </td>
     <td style="text-align:right;">
-      <button class="button button-primary" bind="saveAndCloseButton">Save &amp; Close</button>
+      <button class="button button-primary" bind="saveButton">Save</button>
       <button class="button" bind="saveAndLoadButton">Save &amp; Load</button>
     </td>
+    <td style="text-align:center;" width="30%">
+      <span class="schema-alignment-status-indicator" bind="statusIndicator"></span>
+    </td>
+    <td style="text-align:right;" width="1%">
+      <button class="button" bind="closeButton">Close</button>
+    </td>
   </tr></table></div></div>
 </div>

extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js

@@ -265,6 +265,7 @@ SchemaAlignmentDialog.UILink.prototype._showPropertySuggestPopup = function(elmt
     if (suggestions.length > 0) {
         divSearch = $('<div>')
             .addClass("schema-alignment-link-menu-section")
+            .css("margin-bottom", "2em")
             .html('<div>Search for a property or pick one below</div>').appendTo(menu);
         
         var createSuggestion = function(suggestion) {

extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less

@@ -111,6 +111,10 @@ div.schema-alignment-dialog-preview {
     font-size: 9pt;
 }
 
+.schema-alignment-status-indicator {
+    color: #red;
+}
+
 /*--------------------------------------------------
  *  Node dialog
  *--------------------------------------------------
@@ -138,7 +142,6 @@ div.schema-alignment-dialog-preview {
 .schema-alignment-link-menu-section {
     padding: 8px;
     border-bottom: 1px solid #ddd;
-    margin-bottom: 3px;
 }
 
 .schema-alignment-link-menu-section-last {