diff --git a/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-node.js b/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-node.js index 7b1378e66..22b95f4f5 100644 --- a/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-node.js +++ b/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-node.js @@ -290,9 +290,9 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { var self = this; var frame = DialogSystem.createDialog(); - frame.width("800px"); + frame.width("750px"); - var header = $('
').addClass("dialog-header").text("Schema Skeleton Node").appendTo(frame); + var header = $('
').addClass("dialog-header").text("Schema Alignment Skeleton Node").appendTo(frame); var body = $('
').addClass("dialog-body").appendTo(frame); var footer = $('
').addClass("dialog-footer").appendTo(frame); @@ -309,10 +309,10 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { ''; var html = $( - '' + + '
' + '' + '
' + - '' + + '
' + '' + '' + '' + '' + '' + - '
' + '
' + @@ -322,11 +322,11 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { '
' + - '' + + '
' + '' + - '' + + '' + '
' + - '' + + '
' + '' + '' + '' + @@ -336,16 +336,12 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { '' + '' + '' + - '' + - '' + + '' + '' + '' + '' + - '' + - '' + - '' + + '' + '' + - '' + '' + '' + @@ -357,7 +353,7 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { '' + '' + '' + - '' + + '' + '' + '' + @@ -370,17 +366,17 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { '' + '' + '' + - '
The cell\'s content is used ...
If not reconciled, create new topic named by the cell\'s content, and assign it a typeType new topics as
Type:
as a literal value
Language (for text)Text language
Namespace
' + + '
' + '
' + + '
' + '' + '' + - '' + + '' + '' + '' + - '' + + '
' + '' + '' + '' + '' + - '
' + '
' + @@ -429,10 +425,10 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { '
Language
' + + '' + '' + '' + - '' + '' ).appendTo(body); var elmts = DOM.bind(html); @@ -466,7 +462,6 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { elmts.cellAsTopicNodeTypeInput[0].value = typeName; elmts.cellAsTopicNodeTypeInput.data("data.suggest", { "id" : typeID, "name" : typeName }); - elmts.radioNodeTypeCellAsTopicCreate[0].checked = true; elmts.radioNodeTypeCellAsTopic[0].checked = true; } }); @@ -498,11 +493,6 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { .bind("focus", function() { elmts.radioNodeTypeValue[0].checked = true; }) .suggest({ type: "/type/lang" }); - elmts.radioNodeTypeCellAsTopicCreate - .click(function() { - elmts.radioNodeTypeCellAs[0].checked = true; - elmts.radioNodeTypeCellAsTopic[0].checked = true; - }); elmts.cellAsTopicNodeTypeInput .bind("focus", function() { elmts.radioNodeTypeCellAs[0].checked = true; @@ -562,9 +552,6 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { elmts.cellAsKeyInput[0].value = this._node.namespace.name; elmts.cellAsKeyInput.data("data.suggest", this._node.namespace); } - if ("createForNoReconMatch" in this._node) { - elmts.radioNodeTypeCellAsTopicCreate[0].checked = this._node.createForNoReconMatch; - } if ("lang" in this._node) { elmts.valueNodeTypeLanguageInput[0].value = this._node.lang; elmts.valueNodeTypeLanguageInput.data("data.suggest", { id: this._node.lang }); @@ -598,11 +585,10 @@ SchemaAlignmentDialog.UINode.prototype._showNodeConfigDialog = function() { } if (node.nodeType == "cell-as-topic") { - node.createForNoReconMatch = elmts.radioNodeTypeCellAsTopicCreate[0].checked; - var t = elmts.cellAsTopicNodeTypeInput.data("data.suggest"); - if (!(t) && node.createForNoReconMatch) { + if (!(t)) { alert("For creating a new graph node, you need to specify a type for it."); + elmts.cellAsTopicNodeTypeInput.focus(); return null; } node.type = { @@ -695,8 +681,7 @@ SchemaAlignmentDialog.UINode.prototype.getJSON = function() { result = { nodeType: this._node.nodeType, columnNames: this._node.columnNames, - type: "type" in this._node ? cloneDeep(this._node.type) : { "id" : "/common/topic", "name" : "Topic", "cvt" : false }, - createForNoReconMatch: "createForNoReconMatch" in this._node ? this._node.createForNoReconMatch : true + type: "type" in this._node ? cloneDeep(this._node.type) : { "id" : "/common/topic", "name" : "Topic", "cvt" : false } }; getLinks = true; } else if (this._node.nodeType == "cell-as-value") { diff --git a/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less b/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less index 8a905c79e..beca761e3 100644 --- a/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less +++ b/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less @@ -119,7 +119,6 @@ div.schema-alignment-dialog-preview { .schema-align-node-dialog-node-type { padding: 0.25em; background: #ddf; - -moz-border-radius: 0.5em; } .schema-align-node-dialog-node-type input { vertical-align: text-bottom;