From 9bc4504aea50d33737bf7c1b50f988b677169d86 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 23 May 2012 21:54:03 -0300 Subject: [PATCH] Start working on a folders support. --- wise-editor/src/main/webapp/css/editor.less | 2 - .../wisemapping/rest/model/RestMindmap.java | 6 +- wise-webapp/src/main/webapp/css/mymaps.less | 4 +- wise-webapp/src/main/webapp/js/mymaps.js | 5 +- .../src/main/webapp/jsp/mindmapList.jsp | 275 +++++++++--------- wise-webapp/src/test/sql/hsql/test-data.sql | 4 +- wise-webapp/src/test/sql/mysql/test-data.sql | 4 +- 7 files changed, 157 insertions(+), 143 deletions(-) diff --git a/wise-editor/src/main/webapp/css/editor.less b/wise-editor/src/main/webapp/css/editor.less index c63654cd..66ebee7e 100644 --- a/wise-editor/src/main/webapp/css/editor.less +++ b/wise-editor/src/main/webapp/css/editor.less @@ -272,8 +272,6 @@ td.formLabel { padding: 5px; } -} - /*--- Modal Dialog Form ---*/ div.modalDialog { padding: 15px 30px; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java index 057fdcd7..dfb06625 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java @@ -83,7 +83,11 @@ public class RestMindmap { public String getLastModificationTime() { final Calendar date = mindmap.getLastModificationTime(); - return toISO8601(date.getTime()); + String result = null; + if (date != null) { + result = toISO8601(date.getTime()); + } + return result; } public boolean isPublic() { diff --git a/wise-webapp/src/main/webapp/css/mymaps.less b/wise-webapp/src/main/webapp/css/mymaps.less index 0f63f622..88b81561 100644 --- a/wise-webapp/src/main/webapp/css/mymaps.less +++ b/wise-webapp/src/main/webapp/css/mymaps.less @@ -38,6 +38,8 @@ #map-table { width: 100% !important; display: inline-block; + float:right; + border-top: 1px solid black } input#selectAll { @@ -140,7 +142,7 @@ input#selectAll { #tableActions { float: right; - width: 500px; + width: 350px; white-space:nowrap; } diff --git a/wise-webapp/src/main/webapp/js/mymaps.js b/wise-webapp/src/main/webapp/js/mymaps.js index c6dfbbd0..6d02c0c3 100644 --- a/wise-webapp/src/main/webapp/js/mymaps.js +++ b/wise-webapp/src/main/webapp/js/mymaps.js @@ -71,7 +71,7 @@ jQuery.fn.dialogForm = function(options) { $("#" + containerId).find('input').attr('value', ''); } - // Reset button state ... + // Clear button "Saving..." state ... var acceptBtn = $('#' + containerId + ' .btn-accept'); acceptBtn.button('reset'); @@ -107,14 +107,13 @@ jQuery.fn.dialogForm = function(options) { var fieldErrors = errors.fieldErrors; if (fieldErrors) { for (var fieldName in fieldErrors) { - // Mark the field ... + // Mark the field with errors ... var message = fieldErrors[fieldName]; var inputField = $("#" + containerId + " input[name='" + fieldName + "']"); $("#" + containerId).find(".errorMessage").text(message).addClass("alert alert-error"); inputField.parent().addClass('error'); } - } } else { diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 9f642aca..f3a41b20 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -249,13 +249,13 @@ -
-
+
+
@@ -264,134 +264,157 @@
-
+
+
+
    +
  • Folders
    • -
    - - -
    - - - - - - -
    -
    - - + +
    +
    + +
    + + +
    + + + + + + + +
    +
    + + +
    +
    +
    -
    +
    +
    +
    +
    +
    +
    +
    + + + +
    + + -
    - - -
    - - diff --git a/wise-webapp/src/test/sql/hsql/test-data.sql b/wise-webapp/src/test/sql/hsql/test-data.sql index 1b8b1452..670fcf2e 100644 --- a/wise-webapp/src/test/sql/hsql/test-data.sql +++ b/wise-webapp/src/test/sql/hsql/test-data.sql @@ -1,10 +1,10 @@ INSERT INTO COLABORATOR(id,email,creation_date) values (1,'test@wisemapping.org',CURDATE()); INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail) -values(1,'wi','Wise','test', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3',1237,CURDATE(),1); +values(1,'wise-test','Test','User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3',1237,CURDATE(),1); INSERT INTO COLABORATOR(id,email,creation_date) values (2,'admin@wisemapping.org',CURDATE()); INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail) -values(2,'WiseMapping Admin User','Wise','test', 'admin',1237,CURDATE(),1); +values(2,'wise-admin','Admin','User', 'admin',1237,CURDATE(),1); COMMIT; diff --git a/wise-webapp/src/test/sql/mysql/test-data.sql b/wise-webapp/src/test/sql/mysql/test-data.sql index fc794d3d..180fe350 100644 --- a/wise-webapp/src/test/sql/mysql/test-data.sql +++ b/wise-webapp/src/test/sql/mysql/test-data.sql @@ -1,10 +1,10 @@ INSERT INTO COLABORATOR(id,email,creation_date) values (1,'test@wisemapping.org',CURRENT_DATE()); INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail) -values(1,'WiseMapping Test User','Wise','Test', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3',1237,CURRENT_DATE(),1); +values(1,'wise-test','Test','User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3',1237,CURRENT_DATE(),1); INSERT INTO COLABORATOR(id,email,creation_date) values (2,'admin@wisemapping.org',CURRENT_DATE()); INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail) -values(2,'WiseMapping Admin User','Wise','Test', 'admin',1237,CURRENT_DATE(),1); +values(2,'wise-admin','Admin','User', 'admin',1237,CURRENT_DATE(),1); COMMIT;