s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed layout bug in extend data dialog box.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@539 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2010-04-25 02:22:15 +00:00
parent 4247c8e00e
commit fd062bdc2b
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/webapp/scripts/dialogs/extend-data-preview-dialog.js
View File

@ -7,26 +7,26 @@ function ExtendDataPreviewDialog(column, columnIndex, rowIndices, onDone) {
var self = this; var self = this;
var frame = this._frame = DialogSystem.createDialog(); var frame = this._frame = DialogSystem.createDialog();
frame.width("900px").addClass("extend-data-preview-dialog"); frame.width("1000px").addClass("extend-data-preview-dialog");
var header = $('<div></div>').addClass("dialog-header").text("Add Columns from Freebase Based on Column " + column.name).appendTo(frame); var header = $('<div></div>').addClass("dialog-header").text("Add Columns from Freebase Based on Column " + column.name).appendTo(frame);
var body = $('<div></div>').addClass("dialog-body").appendTo(frame); var body = $('<div></div>').addClass("dialog-body").appendTo(frame);
var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame); var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame);
var html = $( var html = $(
'<div class="grid-layout layout-normal layout-full"><table style="height: 600px">' + '<div class="grid-layout layout-normal layout-full"><table rows="4">' +
'<tr>' + '<tr>' +
'<td width="150" height="1">Add Property</td>' + '<td width="300" height="1">Add Property</td>' +
'<td height="1">Preview</td>' + '<td height="1">Preview</td>' +
'</tr>' + '</tr>' +
'<tr>' + '<tr>' +
'<td height="1"><div class="input-container"><input bind="addPropertyInput" /></div></td>' + '<td style="vertical-align: top;" height="1"><div class="input-container"><input bind="addPropertyInput" /></div></td>' +
'<td height="100%" rowspan="3"><div class="preview-container" bind="previewContainer"></div></td>' + '<td style="vertical-align: top;" rowspan="4"><div class="preview-container" bind="previewContainer"></div></td>' +
'</tr>' + '</tr>' +
'<tr>' + '<tr>' +
'<td height="1">Suggested Properties</td>' + '<td height="1">Suggested Properties</td>' +
'</tr>' + '</tr>' +
'<tr>' + '<tr>' +
'<td height="99%"><div class="suggested-property-container" bind="suggestedPropertyContainer"></div></td>' + '<td><div class="suggested-property-container" bind="suggestedPropertyContainer"></div></td>' +
'</tr>' + '</tr>' +
'</table></div>' '</table></div>'
).appendTo(body); ).appendTo(body);
@ -47,6 +47,7 @@ function ExtendDataPreviewDialog(column, columnIndex, rowIndices, onDone) {
}).appendTo(footer); }).appendTo(footer);
var dismissBusy = DialogSystem.showBusy(); var dismissBusy = DialogSystem.showBusy();
ExtendDataPreviewDialog.getAllProperties(column.reconConfig.type.id, function(properties) { ExtendDataPreviewDialog.getAllProperties(column.reconConfig.type.id, function(properties) {
dismissBusy(); dismissBusy();
self._show(properties); self._show(properties);
@ -199,6 +200,11 @@ ExtendDataPreviewDialog.getAllProperties = function(typeID, onDone) {
ExtendDataPreviewDialog.prototype._show = function(properties) { ExtendDataPreviewDialog.prototype._show = function(properties) {
this._level = DialogSystem.showDialog(this._frame); this._level = DialogSystem.showDialog(this._frame);
var n = this._elmts.suggestedPropertyContainer.offset().top +
this._elmts.suggestedPropertyContainer.outerHeight(true) -
this._elmts.addPropertyInput.offset().top;
this._elmts.previewContainer.height(Math.floor(n));
var self = this; var self = this;
var container = this._elmts.suggestedPropertyContainer; var container = this._elmts.suggestedPropertyContainer;
var renderSuggestedProperty = function(property) { var renderSuggestedProperty = function(property) {

3
src/main/webapp/styles/dialogs/extend-data-preview-dialog.css
View File

@ -2,7 +2,7 @@
border: 1px solid #aaa; border: 1px solid #aaa;
padding: 5px; padding: 5px;
overflow: auto; overflow: auto;
height: 100%; height: 400px;
} }
.extend-data-preview-dialog .suggested-property { .extend-data-preview-dialog .suggested-property {
@ -18,7 +18,6 @@
.extend-data-preview-dialog .preview-container { .extend-data-preview-dialog .preview-container {
border: 1px solid #aaa; border: 1px solid #aaa;
overflow: auto; overflow: auto;
height: 100%;
} }
.extend-data-preview-dialog .preview-container table { .extend-data-preview-dialog .preview-container table {