From b7338e13f2cc42b997cf067072c8405183702611 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Thu, 18 Mar 2010 00:35:34 +0000 Subject: [PATCH] Tweaked column header menu dropdown icon. git-svn-id: http://google-refine.googlecode.com/svn/trunk@317 7d457c2a-affb-35e4-300a-418c747d4874 --- src/graphics/menu-dropdown.psd | Bin 155373 -> 179650 bytes src/main/webapp/images/menu-dropdown.png | Bin 1027 -> 1055 bytes .../views/data-table-column-header-ui.js | 40 ++++++++++-------- .../webapp/scripts/views/data-table-view.js | 16 +++++-- src/main/webapp/styles/project/browsing.css | 3 +- .../webapp/styles/views/data-table-view.css | 39 ++++++++++++++--- 6 files changed, 70 insertions(+), 28 deletions(-) diff --git a/src/graphics/menu-dropdown.psd b/src/graphics/menu-dropdown.psd index 0e718d7cac933d6ee31a174b709a65ce912b2c41..dd685d4fe9ce03252ed5f86817c0562e6aad09a2 100644 GIT binary patch delta 10074 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 Z7y#PN$-Pnq+I#>2002ovPDHLkV1nnb<^uo# diff --git a/src/main/webapp/scripts/views/data-table-column-header-ui.js b/src/main/webapp/scripts/views/data-table-column-header-ui.js index 1beb26fa2..313f33c9e 100644 --- a/src/main/webapp/scripts/views/data-table-column-header-ui.js +++ b/src/main/webapp/scripts/views/data-table-column-header-ui.js @@ -9,19 +9,23 @@ function DataTableColumnHeaderUI(dataTableView, column, columnIndex, td) { DataTableColumnHeaderUI.prototype._render = function() { var self = this; - var td = this._td; - var headerTable = document.createElement("table"); - $(headerTable).addClass("column-header-layout").attr("cellspacing", "0").attr("cellpadding", "0").attr("width", "100%").appendTo(td); + var html = $( + '' + + '' + + '' + + '' + + '' + + '
' + + ' ' + + '
' + + '
' + ).appendTo(this._td); - var headerTableRow = headerTable.insertRow(0); - var headerLeft = headerTableRow.insertCell(0); - var headerRight = headerTableRow.insertCell(1); + var elmts = DOM.bind(html); - $('').html(this._column.name).appendTo(headerLeft); - - $(headerRight).attr("width", "1%"); - $('').addClass("column-header-menu").appendTo(headerRight).click(function() { + elmts.nameContainer.text(this._column.name); + elmts.dropdownMenu.click(function() { self._createMenuForColumnHeader(this); }); @@ -31,20 +35,20 @@ DataTableColumnHeaderUI.prototype._render = function() { var newPercent = Math.ceil(100 * stats.newTopics / stats.nonBlanks); var matchPercent = Math.ceil(100 * stats.matchedTopics / stats.nonBlanks); var unreconciledPercent = Math.ceil(100 * (stats.nonBlanks - stats.matchedTopics - stats.newTopics) / stats.nonBlanks); + var title = matchPercent + "% matched, " + newPercent + "% new, " + unreconciledPercent + "% to be reconciled"; var whole = $('
') - .height("3px") - .css("background", "#333") - .css("position", "relative") - .attr("title", matchPercent + "% matched, " + newPercent + "% new, " + unreconciledPercent + "% to be reconciled") - .width("100%") - .appendTo(td); + .addClass("column-header-recon-stats-bar") + .attr("title", title) + .appendTo(elmts.reconStatsContainer.show()); - $('
').height("100%").css("background", "white").css("position", "absolute") + $('
') + .addClass("column-header-recon-stats-blanks") .width(Math.round((stats.newTopics + stats.matchedTopics) * 100 / stats.nonBlanks) + "%") .appendTo(whole); - $('
').height("100%").css("background", "#6d6").css("position", "absolute") + $('
') + .addClass("column-header-recon-stats-matched") .width(Math.round(stats.matchedTopics * 100 / stats.nonBlanks) + "%") .appendTo(whole); } diff --git a/src/main/webapp/scripts/views/data-table-view.js b/src/main/webapp/scripts/views/data-table-view.js index 2de459844..13264442d 100644 --- a/src/main/webapp/scripts/views/data-table-view.js +++ b/src/main/webapp/scripts/views/data-table-view.js @@ -188,10 +188,18 @@ DataTableView.prototype.render = function() { */ var trHead = table.insertRow(table.rows.length); - - var tdHeadIndex = trHead.insertCell(trHead.cells.length); - $(tdHeadIndex).attr("colspan", "2").addClass("column-header"); - $('').addClass("column-header-menu").appendTo(tdHeadIndex).click(function() { + DOM.bind( + $(trHead.insertCell(trHead.cells.length)) + .attr("colspan", "2") + .addClass("column-header") + .html( + '' + + '' + + '
 ' + + ' ' + + '
' + ) + ).dropdownMenu.click(function() { self._createMenuForAllColumns(this); }); diff --git a/src/main/webapp/styles/project/browsing.css b/src/main/webapp/styles/project/browsing.css index f7b6900aa..5ed1fdc24 100644 --- a/src/main/webapp/styles/project/browsing.css +++ b/src/main/webapp/styles/project/browsing.css @@ -31,6 +31,7 @@ li.facet-container { border: 1px solid #ccc; border-bottom: 0px; padding: 3px 5px; + padding-right: 2px; background: #eee; font-weight: bold; cursor: move; @@ -111,7 +112,7 @@ a.facet-choice-edit:hover { img.facet-choice-link { text-align: baseline; cursor: pointer; - margin: 0 2px; + margin-left: 2px; float: right; } diff --git a/src/main/webapp/styles/views/data-table-view.css b/src/main/webapp/styles/views/data-table-view.css index 83887b24a..e1eae5e12 100644 --- a/src/main/webapp/styles/views/data-table-view.css +++ b/src/main/webapp/styles/views/data-table-view.css @@ -40,16 +40,45 @@ table.data-table td.column-header { font-weight: bold; } +table.column-header-layout { + border-collapse: collapse; + width: 100%; +} table.column-header-layout td { padding: 0px; font-weight: bold; } - -img.column-header-menu { - position: relative; - top: -5px; - left: 5px; +a.column-header-menu { + display: block; + margin-left: 5px; + width: 19px; + height: 19px; + background-image: url(../../images/menu-dropdown.png); + background-repeat: no-repeat; + background-position: 0px 0px; } +a.column-header-menu:hover { + background-position: -19px 0px; +} +.column-header-recon-stats-bar { + margin-top: 5px; + height: 3px; + max-height: 3px; + background: #333; + position: relative; + width: 100%; +} +.column-header-recon-stats-blanks { + position: absolute; + height: 100%; + background: white; +} +.column-header-recon-stats-matched { + position: absolute; + height: 100%; + background: #6d6; +} + .viewPanel-summary { }