From de3fba154798839ae228d992076cdd3b5b80e072 Mon Sep 17 00:00:00 2001 From: Blakko Date: Tue, 15 Oct 2013 16:22:27 +0200 Subject: [PATCH 1/3] Tweaked the preview window to set the width specified in the reconciliation service (if any) --- main/webapp/modules/core/scripts/views/data-table/cell-ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/webapp/modules/core/scripts/views/data-table/cell-ui.js b/main/webapp/modules/core/scripts/views/data-table/cell-ui.js index df55778c5..6e946d008 100644 --- a/main/webapp/modules/core/scripts/views/data-table/cell-ui.js +++ b/main/webapp/modules/core/scripts/views/data-table/cell-ui.js @@ -451,7 +451,7 @@ DataTableCellUI.prototype._previewCandidateTopic = function(candidate, elmt, pre var fakeMenu = MenuSystem.createMenu(); fakeMenu - .width(414) + .width(preview.width?preview.width:414) .addClass('data-table-topic-popup') .html(DOM.loadHTML("core", "scripts/views/data-table/cell-recon-preview-popup-header.html")); From f69f4b0c8053673826a1a9f3c9808a3332b2707d Mon Sep 17 00:00:00 2001 From: Blakko Date: Wed, 11 Jun 2014 14:04:51 +0200 Subject: [PATCH 2/3] Getting rid of tables in html --- .../scripts/reconciliation/recon-dialog.html | 48 ++++++++++--------- .../styles/reconciliation/recon-dialog.less | 10 ++++ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html index a9060ebd8..d15fbff03 100644 --- a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html +++ b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html @@ -1,24 +1,28 @@
-
-
-
- - -
-
-
-
-
-
-
-
- - - +
+
+
+
+
+
+
+
+
+
+
+
+
- - - - - -
+ + + +
+ + + + + +
+
\ No newline at end of file diff --git a/main/webapp/modules/core/styles/reconciliation/recon-dialog.less b/main/webapp/modules/core/styles/reconciliation/recon-dialog.less index 72e146818..f4707d9fc 100644 --- a/main/webapp/modules/core/styles/reconciliation/recon-dialog.less +++ b/main/webapp/modules/core/styles/reconciliation/recon-dialog.less @@ -33,12 +33,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @import-less url("../theme.less"); +.recon-dialog-service { + height: 500px; + padding: 5px 0; + } + .recon-dialog-service-list { border: 1px solid #aaa; padding: 1px; overflow: auto; width: 200px; height: 500px; + float: left; + } + +.recon-dialog-service-panel-container { + float: left; } a.recon-dialog-service-selector { From 505857fc115e456e726ed902c572ed50d5c645db Mon Sep 17 00:00:00 2001 From: Blakko Date: Thu, 12 Jun 2014 14:56:46 +0200 Subject: [PATCH 3/3] Made the recon service list collapsible to have more space for services configuration --- .../modules/core/images/menu-opener.png | Bin 0 -> 337 bytes .../core/langs/translation-default.json | 3 +- .../modules/core/langs/translation-en.json | 4 +- .../modules/core/langs/translation-it.json | 1 + .../scripts/reconciliation/recon-dialog.html | 8 +++- .../scripts/reconciliation/recon-dialog.js | 27 ++++++++++- .../styles/reconciliation/recon-dialog.less | 45 ++++++++++++++++-- 7 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 main/webapp/modules/core/images/menu-opener.png diff --git a/main/webapp/modules/core/images/menu-opener.png b/main/webapp/modules/core/images/menu-opener.png new file mode 100644 index 0000000000000000000000000000000000000000..684b27920c4658f8729e794b5b83a56636eda70b GIT binary patch literal 337 zcmV-X0j~auP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ+*GWV{RCwB~)Gr&a za!(M_rwgQv(Y4uyB?jc>y@lc1nSnpMJ2P9w7gkXU0 zWQSy5N1FHhq?10b^MU(5-sBZmT_HDkKNqsc5*v*1lB?6EQ6BM(YpijBdE1k0lkSqi zsBQ^a;1+in;w^;m)D|+tJog!9U8=LgG&SGZkSSJO`s4whWuV4o;m2a=oQR*y*J;3h j{+sp!_BYwbr}R4jy!tub3bMDH00000NkvXXu0mjfZB&W0 literal 0 HcmV?d00001 diff --git a/main/webapp/modules/core/langs/translation-default.json b/main/webapp/modules/core/langs/translation-default.json index 6ec13d893..fb5985a40 100644 --- a/main/webapp/modules/core/langs/translation-default.json +++ b/main/webapp/modules/core/langs/translation-default.json @@ -364,7 +364,8 @@ "fb-key": "a Freebase key in", "fb-en-ns": "the Wikipedia English namespace", "this-ns": "this namespace:", - "max-candidates" : "Maximum number of candidates to return" + "max-candidates" : "Maximum number of candidates to return", + "service-title": "Services" }, "core-util-enc": { "select-enc": "Select Encoding", diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index b2329a25f..33382dc7d 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -364,8 +364,8 @@ "fb-key": "a Freebase key in", "fb-en-ns": "the Wikipedia English namespace", "this-ns": "this namespace:", - "max-candidates" : "Maximum number of candidates to return" - + "max-candidates" : "Maximum number of candidates to return", + "service-title": "Services" }, "core-util-enc": { "select-enc": "Select Encoding", diff --git a/main/webapp/modules/core/langs/translation-it.json b/main/webapp/modules/core/langs/translation-it.json index 9d99a9981..606bcaf3d 100644 --- a/main/webapp/modules/core/langs/translation-it.json +++ b/main/webapp/modules/core/langs/translation-it.json @@ -365,6 +365,7 @@ "fb-en-ns": "namespace di Wikipedia inglese", "this-ns": "questo namespace:", "max-candidates" : "Maximum number of candidates to return [TODO - translate]", + "service-title": "Servizi" }, "core-util-enc": { "select-enc": "Seleziona la codifica", diff --git a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html index d15fbff03..f56b8383d 100644 --- a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html +++ b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html @@ -3,7 +3,13 @@
-
+
+
+
+ +
+
+