From 3b57c8417578469cf27a16743221ca75fbd5b187 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Sat, 16 Oct 2010 18:36:35 +0000 Subject: [PATCH] Removed borders from tab panel bodies in schema alignment skeleton. Render operation index in history widget so user can refer to each operation. git-svn-id: http://google-refine.googlecode.com/svn/trunk@1581 7d457c2a-affb-35e4-300a-418c747d4874 --- .../dialogs/schema-alignment-dialog.less | 4 ++-- .../core/scripts/widgets/history-widget.js | 5 ++++- .../modules/core/styles/project/sidebar.less | 19 ++++++++++++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less b/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less index fcd9de427..ef4902c96 100644 --- a/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less +++ b/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less @@ -3,8 +3,8 @@ .schema-alignment-dialog-canvas { height: 400px; overflow: auto; - border: 1px solid #aaa; padding: 10px; + margin-top: 3px; background: white; } @@ -70,9 +70,9 @@ a.schema-alignment-link-tag:hover { div.schema-alignment-dialog-preview { height: 400px; overflow: auto; - border: 1px solid #aaa; background: white; padding: 10px; + margin-top: 3px; white-space: pre; font-family: monospace; font-size: 9pt; diff --git a/main/webapp/modules/core/scripts/widgets/history-widget.js b/main/webapp/modules/core/scripts/widgets/history-widget.js index 5a0f0f499..946f17670 100644 --- a/main/webapp/modules/core/scripts/widgets/history-widget.js +++ b/main/webapp/modules/core/scripts/widgets/history-widget.js @@ -61,9 +61,12 @@ HistoryWidget.prototype._render = function() { var renderEntry = function(container, index, entry, lastDoneID, title) { var a = $('').appendTo(container); - a.addClass("history-entry").html(entry.description).attr("title", title).click(function(evt) { + a.addClass("history-entry").text(entry.description).attr("title", title).click(function(evt) { return self._onClickHistoryEntry(evt, entry, lastDoneID); }); + + $('').addClass("history-entry-index").text((index + 1) + ".").prependTo(a); + return a; }; diff --git a/main/webapp/modules/core/styles/project/sidebar.less b/main/webapp/modules/core/styles/project/sidebar.less index d7b5d6b9a..43780dee7 100644 --- a/main/webapp/modules/core/styles/project/sidebar.less +++ b/main/webapp/modules/core/styles/project/sidebar.less @@ -93,7 +93,8 @@ } a.history-entry { display: block; - padding: 7px 5px; + position: relative; + padding: 7px 5px 7px 36px; text-decoration: none; color: black; border-top: 1px dotted #ddd; @@ -104,14 +105,26 @@ a.history-entry:first-child { a.history-entry:hover { background: #ddd; } +.history-entry-index { + position: absolute; + left: 0px; + top: 0px; + width: 30px; + text-align: right; + font-size: 80%; + padding: 2px; + color: @history_now_color; +} .history-past a.history-entry:hover{ - padding: 11px 5px 2px 5px; + padding-top: 11px; + padding-bottom: 2px; border-top: 2px solid @history_now_color; background: url(../../images/up-arrow.png) top center no-repeat; } .history-future a.history-entry:hover{ - padding: 2px 5px 11px 5px; + padding-top: 2px; + padding-bottom: 11px; border-bottom: 2px solid @history_now_color; background: url(../../images/down-arrow.png) bottom center no-repeat; }