From 2bd88bd848d660c8019ed845831446a1d4ecff12 Mon Sep 17 00:00:00 2001 From: Stefano Mazzocchi Date: Sat, 24 Apr 2010 06:29:30 +0000 Subject: [PATCH] - still polishing - fixed the scatterfacet not updating its selection area when another facet is removed (there are still issues with the fact that the tint is an absolute position... we need to turn that into relative somehow) git-svn-id: http://google-refine.googlecode.com/svn/trunk@529 7d457c2a-affb-35e4-300a-418c747d4874 --- .../webapp/scripts/facets/scatterplot-facet.js | 4 ++++ src/main/webapp/scripts/project.js | 5 ++--- src/main/webapp/scripts/project/browsing-engine.js | 6 ++++++ src/main/webapp/styles/common.css | 11 ++++++++--- src/main/webapp/styles/jquery-ui-overrides.css | 4 ++-- src/main/webapp/styles/project.css | 14 +++++--------- src/main/webapp/styles/project/browsing.css | 1 + src/main/webapp/styles/views/data-table-view.css | 11 ++++++++--- src/main/webapp/styles/widgets/history.css | 3 ++- 9 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/scripts/facets/scatterplot-facet.js b/src/main/webapp/scripts/facets/scatterplot-facet.js index fc702652b..700658fc6 100644 --- a/src/main/webapp/scripts/facets/scatterplot-facet.js +++ b/src/main/webapp/scripts/facets/scatterplot-facet.js @@ -7,6 +7,10 @@ function ScatterplotFacet(div, config, options) { this._initializedUI = false; } +ScatterplotFacet.prototype.update = function() { + this._plotAreaSelector.update(); +} + ScatterplotFacet.prototype.reset = function() { delete this._config.from_x; delete this._config.from_y; diff --git a/src/main/webapp/scripts/project.js b/src/main/webapp/scripts/project.js index 0ed99cf82..e39f269a7 100644 --- a/src/main/webapp/scripts/project.js +++ b/src/main/webapp/scripts/project.js @@ -75,11 +75,10 @@ function initializeUI(uiState) { '' + theProject.metadata.name + ' project' + '').appendTo(path); - $('current view') + $('') .mouseenter(function() { this.href = Gridworks.getPermanentLink(); - }) - .appendTo($('').appendTo(path)); + }).appendTo(path); var body = $("#body").empty().html( '
' + diff --git a/src/main/webapp/scripts/project/browsing-engine.js b/src/main/webapp/scripts/project/browsing-engine.js index be4389d71..0ad230cb3 100644 --- a/src/main/webapp/scripts/project/browsing-engine.js +++ b/src/main/webapp/scripts/project/browsing-engine.js @@ -177,6 +177,12 @@ BrowsingEngine.prototype.removeFacet = function(facet) { break; } } + + for (var i = 0; i < this._facets.length; i++) { + if (typeof this._facets[i].facet.update == "function") { + this._facets[i].facet.update(); + } + } if (update) { Gridworks.update({ engineChanged: true }); diff --git a/src/main/webapp/styles/common.css b/src/main/webapp/styles/common.css index ed6377c2f..fca85725a 100644 --- a/src/main/webapp/styles/common.css +++ b/src/main/webapp/styles/common.css @@ -181,17 +181,22 @@ img { background: url(../images/path-delimiter.png) no-repeat center right; padding: 18px 20px 20px 10px; } -#path .app-path-section a { +#path a { font-weight: bold; text-decoration: none; color: #333; } -#path a.app-path-section:hover { +#path a:hover { text-decoration: underline; } +#path a.permalink { + padding: 18px 20px 20px 10px; + color: #ff6a00; +} + #footer { - font-size: 80%; + font-size: 85%; padding: 1em 0; color: #666; text-align: center; diff --git a/src/main/webapp/styles/jquery-ui-overrides.css b/src/main/webapp/styles/jquery-ui-overrides.css index f3433847d..ec4baaa73 100644 --- a/src/main/webapp/styles/jquery-ui-overrides.css +++ b/src/main/webapp/styles/jquery-ui-overrides.css @@ -16,10 +16,10 @@ border: none; } .gridworks-tabs.ui-tabs .ui-tabs-nav li a { - padding: 5px 10px; + padding: 4px 10px; } .gridworks-tabs.ui-tabs .ui-tabs-nav li a span.count { - color: #888; + color: #666; font-weight: normal; font-size: 80%; } diff --git a/src/main/webapp/styles/project.css b/src/main/webapp/styles/project.css index 2fc749f5c..3450c0172 100644 --- a/src/main/webapp/styles/project.css +++ b/src/main/webapp/styles/project.css @@ -20,14 +20,14 @@ body { bottom: 0px; left: 0px; z-index: 1000; - padding: 0.5em 0; + padding: 0.4em 0em 0.5em 0em; width: 100%; - border-top: none; - background: #ccc; - color: #888; + background: #E8E8E8; + color: #666; } #footer a { - color: #66c; + font-weight: bold; + color: #333; text-decoration: none; } #footer a:hover { @@ -54,10 +54,6 @@ body { } .left-panel .gridworks-tabs.ui-tabs .ui-tabs-panel { padding: 7px; - -moz-border-radius-topright: 0px; - -webkit-border-top-right-radius: 0px; - -moz-border-radius-bottomright: 0px; - -webkit-border-bottom-right-radius: 0px; overflow: hidden; } diff --git a/src/main/webapp/styles/project/browsing.css b/src/main/webapp/styles/project/browsing.css index 04caf0f33..575b64445 100644 --- a/src/main/webapp/styles/project/browsing.css +++ b/src/main/webapp/styles/project/browsing.css @@ -129,6 +129,7 @@ a.facet-mode-link.facet-mode-link-selected { } .facet-choice-selected .facet-choice-label { font-weight: bold; + color: #ff6a00; } a.facet-choice-label { diff --git a/src/main/webapp/styles/views/data-table-view.css b/src/main/webapp/styles/views/data-table-view.css index 7a71d84e7..7856a4a83 100644 --- a/src/main/webapp/styles/views/data-table-view.css +++ b/src/main/webapp/styles/views/data-table-view.css @@ -4,12 +4,13 @@ } a.viewPanel-pagingControls-page { margin: 0 2px; - padding: 2px 5px; + padding: 2px 4px 3px 4px; font-weight: bold; } a.viewPanel-pagingControls-page.inaction { - background: #aaa; - color: #eee; + background: #f8f8f8; + color: #777; + border: 1px solid #ff6a00; -moz-border-radius: 4px; -webkit-border-radius: 4px; } @@ -57,6 +58,10 @@ table.data-table td.column-header { font-weight: bold; } +table.data-table td.column-header td { + vertical-align: middle; +} + table.column-header-layout { border-collapse: collapse; width: 100%; diff --git a/src/main/webapp/styles/widgets/history.css b/src/main/webapp/styles/widgets/history.css index 614f92841..cec9dc5e4 100644 --- a/src/main/webapp/styles/widgets/history.css +++ b/src/main/webapp/styles/widgets/history.css @@ -69,8 +69,9 @@ a.history-entry:hover { } .history-panel-footer { - padding: 3px; + padding: 6px 0px 0px 0px; text-align: center; + font-weight: bold; } .history-panel-footer a { text-decoration: none;