From de515c572c3f06aa5d3d4fb96c56eae85da81667 Mon Sep 17 00:00:00 2001 From: Claudio Barril Date: Sat, 8 Mar 2014 16:24:34 -0300 Subject: [PATCH 01/56] remove unused exception and class --- ...lMindmapRelationshipNotFoundException.java | 20 -------- .../com/wisemapping/model/LabelMindmap.java | 50 ------------------- 2 files changed, 70 deletions(-) delete mode 100644 wise-webapp/src/main/java/com/wisemapping/exceptions/LabelMindmapRelationshipNotFoundException.java delete mode 100644 wise-webapp/src/main/java/com/wisemapping/model/LabelMindmap.java diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/LabelMindmapRelationshipNotFoundException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/LabelMindmapRelationshipNotFoundException.java deleted file mode 100644 index 5201296b..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/LabelMindmapRelationshipNotFoundException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wisemapping.exceptions; - -import org.jetbrains.annotations.NotNull; - -public class LabelMindmapRelationshipNotFoundException extends ClientException { - - private static final String MSG_KEY = "LABEL_MINDMAP_RELATION_NOT_BE_FOUND"; - - public LabelMindmapRelationshipNotFoundException(@NotNull String msg) - { - super(msg,Severity.WARNING); - } - - @NotNull - @Override - protected String getMsgBundleKey() { - return MSG_KEY; - } - -} diff --git a/wise-webapp/src/main/java/com/wisemapping/model/LabelMindmap.java b/wise-webapp/src/main/java/com/wisemapping/model/LabelMindmap.java deleted file mode 100644 index b5ec5eae..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/model/LabelMindmap.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.wisemapping.model; - -import java.io.Serializable; - -public class LabelMindmap implements Serializable{ - - private int mindmapId; - private int labelId; - - public LabelMindmap(int labelId, int mindmapId) { - this.mindmapId = mindmapId; - this.labelId = labelId; - } - - public LabelMindmap() {} - - public int getMindmapId() { - return mindmapId; - } - - public void setMindmapId(int mindmapId) { - this.mindmapId = mindmapId; - } - - public int getLabelId() { - return labelId; - } - - public void setLabelId(int labelId) { - this.labelId = labelId; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof LabelMindmap)) return false; - - LabelMindmap that = (LabelMindmap) o; - - return labelId == that.labelId && mindmapId == that.mindmapId; - - } - - @Override - public int hashCode() { - int result = mindmapId; - result = 31 * result + labelId; - return result; - } -} From c6b7e48d7af21cb532d3450e679143096ad97a2c Mon Sep 17 00:00:00 2001 From: Claudio Barril Date: Sat, 8 Mar 2014 16:25:13 -0300 Subject: [PATCH 02/56] rename parameter --- .../src/main/java/com/wisemapping/rest/MindmapController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java index 02f066d3..5da36f26 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java @@ -165,10 +165,10 @@ public class MindmapController extends BaseController { } @RequestMapping(method = RequestMethod.GET, value = "/maps/", produces = {"application/json", "application/xml"}) - public RestMindmapList retrieveList(@RequestParam(required = false) String q) throws IOException { + public RestMindmapList retrieveList(@RequestParam(required = false) String filterValue) throws IOException { final User user = Utils.getUser(); - final MindmapFilter filter = MindmapFilter.parse(q); + final MindmapFilter filter = MindmapFilter.parse(filterValue); final List collaborations = mindmapService.findCollaborations(user); final List mindmaps = new ArrayList(); From 78859324a177058297df28cf44e5b6016104ddf5 Mon Sep 17 00:00:00 2001 From: Claudio Barril Date: Sat, 8 Mar 2014 16:26:01 -0300 Subject: [PATCH 03/56] select only my labels from all mindmap labels --- .../java/com/wisemapping/rest/model/RestMindmapInfo.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java index b1194739..1ccdc20a 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java @@ -99,8 +99,11 @@ public class RestMindmapInfo { } public Set getLabels() { final Set result = new LinkedHashSet<>(); + final User me = Utils.getUser(); for (Label label : mindmap.getLabels()) { - result.add(new RestLabel(label)); + if (label.getCreator().equals(me)) { + result.add(new RestLabel(label)); + } } return result; } From d7cfa0de044a4b5320a81a94445b0e698331ca99 Mon Sep 17 00:00:00 2001 From: Claudio Barril Date: Sun, 9 Mar 2014 02:32:19 -0300 Subject: [PATCH 05/56] renaming method addLabel to linkLabel --- .../src/main/java/com/wisemapping/rest/MindmapController.java | 2 +- .../src/main/java/com/wisemapping/service/MindmapService.java | 2 +- .../main/java/com/wisemapping/service/MindmapServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java index 5da36f26..3716f3a4 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java @@ -652,7 +652,7 @@ public class MindmapController extends BaseController { final Mindmap mindmap = findMindmapById(mindmapId); final Label label = mindmap.findLabel(labelId); if (label == null) { - mindmapService.addLabel(mindmap, delegated); + mindmapService.linkLabel(mindmap, delegated); } } } diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java b/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java index a2ed8c40..94dca87c 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java @@ -68,7 +68,7 @@ public interface MindmapService { void purgeHistory(int mapId) throws IOException; - void addLabel(@NotNull final Mindmap mindmap, @NotNull final Label label); + void linkLabel(@NotNull final Mindmap mindmap, @NotNull final Label label); void removeLabel(@NotNull final Mindmap mindmap, @NotNull final Label label); } diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java index e3d7159f..aa858163 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java @@ -88,7 +88,7 @@ public class MindmapServiceImpl } @Override - public void addLabel(@NotNull Mindmap mindmap, @NotNull final Label label) { + public void linkLabel(@NotNull Mindmap mindmap, @NotNull final Label label) { mindmap.addLabel(label); } From 73f48b6de55ad22842af56c293eaa331fe46ced8 Mon Sep 17 00:00:00 2001 From: Claudio Barril Date: Sun, 9 Mar 2014 02:33:06 -0300 Subject: [PATCH 06/56] force linkLabel to use view security in mindmap service --- wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml index 65ea911d..7beb0094 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml @@ -13,6 +13,7 @@ getMindmapUserBy getMindmapById + linkLabel find* filter* From 58be9c08482666a912ee12ed04b23c1fb5edfacb Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Sun, 9 Mar 2014 22:08:46 -0300 Subject: [PATCH 07/56] Revert "rename parameter" This reverts commit 29894a276e1b94efa0881fda9d5d349e21872342. --- .../src/main/java/com/wisemapping/rest/MindmapController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java index 3716f3a4..89d79f5d 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java @@ -165,10 +165,10 @@ public class MindmapController extends BaseController { } @RequestMapping(method = RequestMethod.GET, value = "/maps/", produces = {"application/json", "application/xml"}) - public RestMindmapList retrieveList(@RequestParam(required = false) String filterValue) throws IOException { + public RestMindmapList retrieveList(@RequestParam(required = false) String q) throws IOException { final User user = Utils.getUser(); - final MindmapFilter filter = MindmapFilter.parse(filterValue); + final MindmapFilter filter = MindmapFilter.parse(q); final List collaborations = mindmapService.findCollaborations(user); final List mindmaps = new ArrayList(); From 5ac8e92abdc4bf1a73bf0fc93c889c9d19ba943a Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Sun, 9 Mar 2014 23:41:00 -0300 Subject: [PATCH 08/56] small buttons --- .../src/main/webapp/jsp/mindmapList.jsp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 8b18f16a..ce0762b8 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -170,24 +170,24 @@
- - + +
- -
-
- @@ -349,7 +349,7 @@
- @@ -394,7 +394,7 @@
-
@@ -434,7 +434,7 @@
- @@ -458,7 +458,7 @@
- @@ -481,7 +481,7 @@
- @@ -520,7 +520,7 @@
-
@@ -540,7 +540,7 @@
-
@@ -560,7 +560,7 @@
- @@ -581,7 +581,7 @@
-
From c3fd6455154c8a93d9d721f55a36819b91777026 Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Sun, 9 Mar 2014 23:41:17 -0300 Subject: [PATCH 09/56] small searcher --- wise-webapp/src/main/webapp/jsp/mindmapList.jsp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index ce0762b8..99d74059 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -94,14 +94,16 @@ // Customize search action ... $('#mindmapListTable_filter').appendTo("#tableActions"); + $('#mindmapListTable_filter label').addClass('input-group-sm'); var input = $('#mindmapListTable_filter input'); - input.addClass('input-small search-query form-control'); + input.addClass('form-control'); input.attr('placeholder', 'Search'); - $("#mindmapListTable_info").appendTo("#pageInfo"); // Re-arrange pagination actions ... $("#tableFooter").appendTo("#mindmapListTable_wrapper"); $("#mindmapListTable_length").appendTo("#tableFooter"); + $("#mindmapListTable_info").appendTo("#tableFooter"); + $('#mindmapListTable_length select').attr("style", "width:60px;"); From 2b5c1518f4ce7880fd92c1fa41494ee8f0592d2b Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Sun, 9 Mar 2014 23:41:39 -0300 Subject: [PATCH 10/56] css and animation fadeIn --- .../src/main/webapp/css/mindmapList.less | 19 +++++++++++++------ wise-webapp/src/main/webapp/js/mindmapList.js | 6 +++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less index cbcc41d8..e18b719a 100644 --- a/wise-webapp/src/main/webapp/css/mindmapList.less +++ b/wise-webapp/src/main/webapp/css/mindmapList.less @@ -17,6 +17,11 @@ .nav-pills li { position: relative; width: 90%; + height: 35px; +} +.nav-pills li a { + height: inherit; + font-size: 13px; } .nav-pills { width: 108%; @@ -107,19 +112,21 @@ input#selectAll { width: 100%; } +.dataTables_info { + font-size: 12px; + line-height: 1.428571429; + color: #555; + font-weight: 700; + +} .dataTables_length { display: block; height: 34px; - padding: 6px 12px; - font-size: 14px; + font-size: 12px; line-height: 1.428571429; color: #555; background-color: #fff; background-image: none; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; float: right; } diff --git a/wise-webapp/src/main/webapp/js/mindmapList.js b/wise-webapp/src/main/webapp/js/mindmapList.js index bdb27ccc..de5c580a 100644 --- a/wise-webapp/src/main/webapp/js/mindmapList.js +++ b/wise-webapp/src/main/webapp/js/mindmapList.js @@ -185,14 +185,14 @@ function updateStatusToolbar() { $("#mindmapListTable tbody input:checked").parent().parent().addClass('row-selected'); $("#mindmapListTable tbody input:not(:checked)").parent().parent().removeClass('row-selected'); - $('.buttonsToolbar').find('.act-single').hide().end().find('.act-multiple').hide(); + $('.buttonsToolbar').find('.act-single').fadeOut('slow').end().find('.act-multiple').fadeOut('slow'); var tableElem = $('#mindmapListTable'); var selectedRows = tableElem.dataTableExt.getSelectedRows(); if (selectedRows.length > 0) { if (selectedRows.length == 1) { - $('.buttonsToolbar').find('.act-single').show().end().find('.act-multiple').show(); + $('.buttonsToolbar').find('.act-single').fadeIn('slow').end().find('.act-multiple').fadeIn('slow'); // Can be executed by the owner ? var rowData = tableElem.dataTable().fnGetData(selectedRows[0]); @@ -202,7 +202,7 @@ function updateStatusToolbar() { $(".buttonsToolbar").find('#publishBtn').hide().end().find('#shareBtn').hide().end().find('#renameBtn').hide(); } } else { - $(".buttonsToolbar .act-multiple").show(); + $(".buttonsToolbar .act-multiple").fadeIn('slow'); } } } From 16985ae7d7bd6550da89e2bbddf73332f73769ba Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Mon, 10 Mar 2014 00:12:49 -0300 Subject: [PATCH 11/56] rows clickeables --- .../src/main/webapp/css/mindmapList.less | 9 ++++++++ wise-webapp/src/main/webapp/js/mindmapList.js | 21 ++++++++++++++++--- .../src/main/webapp/jsp/mindmapList.jsp | 2 +- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less index e18b719a..4b948472 100644 --- a/wise-webapp/src/main/webapp/css/mindmapList.less +++ b/wise-webapp/src/main/webapp/css/mindmapList.less @@ -47,6 +47,10 @@ -moz-border-radius: @radius; } +.mindmapName { + color: #428bca; +} + /* ------------------------------ Table --------------------------------- */ @table-gap: 2%; @@ -106,6 +110,10 @@ input#selectAll { padding: 4px; } +#mindmapListTable tbody tr { + cursor: pointer; +} + /* Pagination Styles */ #paginateContainer { height: 40px; @@ -194,6 +202,7 @@ input#selectAll { .closeTag { cursor: pointer; + z-index: 2000; } .tableTag { diff --git a/wise-webapp/src/main/webapp/js/mindmapList.js b/wise-webapp/src/main/webapp/js/mindmapList.js index de5c580a..4404e1d7 100644 --- a/wise-webapp/src/main/webapp/js/mindmapList.js +++ b/wise-webapp/src/main/webapp/js/mindmapList.js @@ -254,8 +254,23 @@ function updateStarred(spanElem) { function callbackOnTableInit() { // Register starred events ... - $('#mindmapListTable .starredOff, #mindmapListTable .starredOn').click(function () { + $('#mindmapListTable .starredOff, #mindmapListTable .starredOn').click(function (event) { updateStarred(this); + event.stopPropagation(); + }); + + $("#mindmapListTable tbody tr").click( + function(event) { + var target = $(event.target); + if (!target.is('.closeTag')){ + if (!target.parent().is('.closeTag')) { + var baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf("c/maps/")); + window.open(baseUrl + 'c/maps/' + $(this).find('.mindmapName').attr('value') + '/edit' , '_self'); + } + } + }); + $('input:checkbox').click(function(event) { + event.stopPropagation(); }); updateStatusToolbar(); } @@ -474,9 +489,9 @@ $(function () { }) }); - $(document).on('click', ".closeTag", function() { + $(document).on('click', ".closeTag", function(event) { var me = $(this); - var mindmapId = me.parents("td").find("a").attr("value"); + var mindmapId = me.parents("td").find(".mindmapName").attr("value"); var data = { id: me.attr("value"), title: me.attr("name"), diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 99d74059..827dc4d1 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -58,7 +58,7 @@ bUseRendered: false, mDataProp: "title", fnRender: function (obj) { - return '' + $('').text(obj.aData.title).html() + '' + labelTagsAsHtml(obj.aData.labels); + return '' + $('').text(obj.aData.title).html() + '' + labelTagsAsHtml(obj.aData.labels); } }, { From e6e05e6be3d68c3679e95d3ec570b0fcbf6bfa37 Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Mon, 10 Mar 2014 01:22:30 -0300 Subject: [PATCH 12/56] new header --- .../src/main/webapp/css/pageHeaders.css | 2 +- wise-webapp/src/main/webapp/jsp/header.jsp | 68 ++++++++++++------- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css index 94ab0341..6af04beb 100644 --- a/wise-webapp/src/main/webapp/css/pageHeaders.css +++ b/wise-webapp/src/main/webapp/css/pageHeaders.css @@ -112,7 +112,7 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover { div#headerActions { padding-right: 8px; - padding-top: 4px; + padding-top: 2px; position: absolute; right: 0; z-index: 50; diff --git a/wise-webapp/src/main/webapp/jsp/header.jsp b/wise-webapp/src/main/webapp/jsp/header.jsp index 5cdaeb7b..5858d281 100644 --- a/wise-webapp/src/main/webapp/jsp/header.jsp +++ b/wise-webapp/src/main/webapp/jsp/header.jsp @@ -13,6 +13,24 @@ } %> + +