diff --git a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java index 328f25a9..ad48fa61 100644 --- a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java +++ b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java @@ -83,8 +83,8 @@ public class MindMapBean { return result; } - public Calendar getLastEditTime() { - return mindMap.getLastModificationTime(); + public String getLastEditTime() { + return DateFormat.getInstance().format(mindMap.getLastModificationTime().getTime()); } public String getCreationTime() { diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties index 249db319..03aa614b 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties @@ -105,6 +105,7 @@ CAPTCHA_ERROR=Enter the letters as they are shown in the image above. DETAIL_INFORMATION=Detail Information CREATOR=Creator CREATION_TIME=Creation Time +OWNER=Owner VIEWS=Views STATE=State COLLABORATORS=Collaborators @@ -285,6 +286,9 @@ REDO=Redo BY=By MODIFIED=Modified +LAST_UPDATE=Last Update +LAST_UPDATE_BY=Last Updated By + HISTORY_MSG=Looking for an old modification of you map?. Here is the place. NO_HISTORY_RESULTS= No History Information was found. HISTORY_INFO = Here is the list of the last revisions of you map. diff --git a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml index b87fbaf5..4638cb2f 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml @@ -81,15 +81,6 @@ - - - - - - - - - @@ -110,6 +101,11 @@ + + + + + diff --git a/wise-webapp/src/main/webapp/css/mymaps.less b/wise-webapp/src/main/webapp/css/mymaps.less index 14a588bf..667017f6 100644 --- a/wise-webapp/src/main/webapp/css/mymaps.less +++ b/wise-webapp/src/main/webapp/css/mymaps.less @@ -319,3 +319,7 @@ td.details { background-color: #ccc; } +.row-selected { + background-color: #f5f5f5; +} + diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index 618ce23b..ae5c08b0 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -32,58 +32,6 @@ div#register a { font-weight: bold; } -/* WiseMap details */ -#detailContent { - width: 700px; - height: 100%; - padding: 10px; -} - -#detail { - margin: 10px auto; - height: 100%; - padding: 8px; -} - -#detail table { - background-color: white; - width: 100%; -} - -#detail td { - padding: 5px; - vertical-align: top; -} - -#detailTitle { - color: #093A9D; - font-weight: bold; - font-size: 14px; - padding-left: 5px; -} - -#detailTitle img { - padding-left: 5px; -} - -#detailTitle span { - color: #8e9181; - font-weight: normal; - font-size: 14px; -} - -#detail h1 { - color: black; - font-weight: bolder; -} - -#detail .evenRow { - background-color: #ebeef1; -} - -#detail .oddRow { - background-color: #eff3f5; -} div.pageBodyContent ol { margin-left: 12px; diff --git a/wise-webapp/src/main/webapp/js/jquery.dataTables.plugins.js b/wise-webapp/src/main/webapp/js/mymaps.js similarity index 92% rename from wise-webapp/src/main/webapp/js/jquery.dataTables.plugins.js rename to wise-webapp/src/main/webapp/js/mymaps.js index c71932d3..538e9487 100644 --- a/wise-webapp/src/main/webapp/js/jquery.dataTables.plugins.js +++ b/wise-webapp/src/main/webapp/js/mymaps.js @@ -75,7 +75,7 @@ jQuery.fn.dialogForm = function(options) { // Clear previous state ... $("#" + containerId + " .errorMessage").text("").removeClass("alert alert-error"); $("#" + containerId + " .control-group").removeClass('error'); - $("#" + containerId + " input").attr('value',''); + $("#" + containerId + " input").attr('value', ''); var acceptBtn = $('#' + containerId + ' .btn-accept'); @@ -97,7 +97,6 @@ jQuery.fn.dialogForm = function(options) { var redirectUrl = options.redirect; redirectUrl = redirectUrl.replace("{header.resourceId}", resourceId); $(acceptBtn).button('loading'); - $("#" + containerId).modal('hide'); window.location = redirectUrl; } else if (options.postUpdate) { @@ -147,14 +146,21 @@ jQuery.fn.dialogForm = function(options) { // Update toolbar events ... function updateToolbar() { - var selected = $("#mindmapListTable tbody input:checked").length > 0; + + $("#mindmapListTable tbody input:checked").parent().parent().addClass('row-selected'); + $("#mindmapListTable tbody input:not(:checked)").parent().parent().removeClass('row-selected'); + + var inputs = $("#mindmapListTable tbody input:checked"); + var selected = inputs.length > 0; if (selected) { $("#actionsBtn").show(); $("#deleteBtn").show(); - + $("#infoBtn").show(); } else { $("#actionsBtn").hide(); $("#deleteBtn").hide(); + $("#infoBtn").hide(); + } } diff --git a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp index f3906e3d..4e8fb63a 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp @@ -1,194 +1,74 @@ <%@ include file="/jsp/init.jsp" %> <%--@elvariable id="wisemapDetail" type="com.wisemapping.view.MindMapBean"--%> - - - - +
+ -
-
- - - - <spring:message code=" title=""/> - () - - - <spring:message code=" title=""/> - () - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - : - ${wisemapDetail.creationUser}
- "> - - : - - ${wisemapDetail.description}
- - : - ${wisemapDetail.creationTime}
- - - &mapId=${wisemapDetail.id}" rel="moodalbox 780px 530px wizard" - title=""> - - - - - - - :
- 		-
- - - - - -
- - - - ( - - ) -
- - ${mindmapCollaborator.username} -
- - 		- - - - ( - - ) -
- - ${mindmapViewer.username} -
- -
+
+
+
    +
  • : ${wisemapDetail.title}
    • +
  • : ${wisemapDetail.description}
    • +
  • : ${wisemapDetail.creationUser}
    • +
  • : ${wisemapDetail.creationTime}
    • +
  • : ${wisemapDetail.lastEditTime}
    • +
  • : ${wisemapDetail.lastEditor}
    • +
  • : ${wisemapDetail.tags}
    • +
+
+
+
    +
  • (${wisemapDetail.countColaborators}): + + ${mindmapCollaborator.username} + +
    • +
  • (${wisemapDetail.countViewers}): + + ${mindmapViewer.username} + +
    • +
-
- "> - - - : - - -
- - - "> - - - - - - - - : - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - : - - -
- - : - - -
- - : - - - -

-
- - - - - -
+
+
    + + +
  • : +
    • +
  • <: + +
    • +
  • : + +
  • : + +
    • +
    • +     + +
  • : +
    • +     +     +
+
+
-
\ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 4b6baef0..6403e8c5 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -19,7 +19,7 @@ - + @@ -54,10 +54,6 @@ return '' + obj.aData.title + ''; } }, - { - sTitle : "Description", - mDataProp : "description" - }, { sTitle : "Owner", mDataProp :"creator" @@ -72,16 +68,6 @@ var time = obj.aData.lastModificationTime; return '' + jQuery.timeago(time) + '' + ' ' + '' + obj.aData.lastModifierUser + ''; } - }, - { - sTitle: "Details", - sClass: "center", - sWidth : "15px", - bSortable : false, - bSearchable : false, - fnRender : function(obj) { - return ''; - } } ], AutoWidth : false, @@ -214,7 +200,7 @@ // Remove old entry ... tableUI.dataTableExt.removeSelectedRows(); }, - url : "../service/maps/batch?ids="+mapIds.join(',') + url : "../service/maps/batch?ids=" + mapIds.join(',') }); } }); @@ -226,6 +212,25 @@ } }); + $("#infoBtn").click(function() { + var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); + if (mapIds.length > 0) { + $('#info-dialog-modal .modal-body').load("c/map/" + mapIds[0] + "/details.htm", function() { + $('#info-dialog-modal').modal(); + }); + + } + }); + + $("#exportBtn").click(function() { + var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); + if (mapIds.length > 0) { + $('#export-dialog-modal .modal-body').load("c/map/" + mapIds[0] + "/export.htm", function() { + $('#export-dialog-modal').modal(); + }); + + } + }); $("#actionButtons .publishMap").click(function() { }); @@ -270,20 +275,23 @@ - @@ -347,7 +355,7 @@
- +
@@ -376,7 +384,7 @@
- +
@@ -389,13 +397,40 @@
-

Warning!

Deleted mindmap can not be recovered. Do you want to continue - ? +

Warning!

Deleted mindmap can not be recovered. Do you want to + continue ?.
- + +
+ + + + + + @@ -409,7 +444,6 @@ -