From 73e955afacc7a11b2d63f458aac79bee5b4f3c51 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Tue, 11 Feb 2014 21:45:29 -0300 Subject: [PATCH 1/7] Fix table hover issue. --- wise-webapp/src/main/webapp/jsp/mindmapList.jsp | 4 +++- wise-webapp/src/main/webapp/jsp/template.jsp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 37433599..53bbc6fc 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -7,6 +7,8 @@ + + <spring:message code="SITE.TITLE"/> - <spring:message code="MY_WISEMAPS"/> @@ -211,7 +213,7 @@
-
+
diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp index a03fde5c..8cfe3d9e 100644 --- a/wise-webapp/src/main/webapp/jsp/template.jsp +++ b/wise-webapp/src/main/webapp/jsp/template.jsp @@ -12,6 +12,7 @@ + Date: Tue, 11 Feb 2014 23:27:46 -0300 Subject: [PATCH 2/7] Fix no closed div element on account settings. --- .../src/main/webapp/jsp/accountSettings.jsp | 151 ++++++++++-------- 1 file changed, 87 insertions(+), 64 deletions(-) diff --git a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp index 4b5cc92d..2030cb6b 100755 --- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp +++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp @@ -8,62 +8,78 @@
    • -
    • + +
    • +
    -
    -
    +
    - + +
    - +
    +
    - -
    + +
    - + +
    - +
    - "/> -
    + "/> +
    -
    -
    +
    - + +
    - +
    - + +
    - +
    - "/> + "/>
    @@ -74,49 +90,56 @@
    - +
    -
    -
    -
    -
    - "/> -
    +
    +
    +
    +
    + "/>
    +
    -
    +
    - "/> + + "/>
    @@ -157,11 +180,11 @@ postChange( "c/restful/account/password", inputVal, - function() { + function () { changePasswordMsg.removeClass('alert-danger').addClass('alert-info').show(); changePasswordMsg.text(''); }, - function(textStatus) { + function (textStatus) { changePasswordMsg.removeClass('alert-info').addClass('alert-danger').show(); changePasswordMsg.text(textStatus); } @@ -177,12 +200,12 @@ postChange( "c/restful/account/firstname", firstname, - function() { + function () { var changeInfoMsg = $('#changeInfoMsg'); changeInfoMsg.removeClass('alert-error').addClass('alert-info').show(); changeInfoMsg.text(''); }, - function(textStatus) { + function (textStatus) { changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show(); changeInfoMsg.text(textStatus); } @@ -190,11 +213,11 @@ postChange( "c/restful/account/lastname", lastname, - function() { + function () { changeInfoMsg.removeClass('alert-danger').addClass('alert-info').show(); changeInfoMsg.text(''); }, - function(textStatus) { + function (textStatus) { changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show(); changeInfoMsg.text(textStatus); } @@ -209,11 +232,11 @@ postChange( "c/restful/account/locale", locale, - function() { + function () { languageMsg.removeClass('alert-danger').addClass('alert-info').show(); languageMsg.text(''); }, - function(textStatus) { + function (textStatus) { languageMsg.removeClass('alert-info').addClass('alert-danger').show(); languageMsg.text(textStatus); } @@ -226,10 +249,10 @@ postChange( "c/restful/account", locale, - function() { + function () { window.location.href = "/c/logout" }, - function(textStatus) { + function (textStatus) { var deleteAccountMsg = $('#deleteAccountMsg'); deleteAccountMsg.removeClass('alert-info').addClass('alert-danger').show(); deleteAccountMsg.text(textStatus); From 878fe464ea03557fabb32248f9e8d53a07aa6bde Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 12 Feb 2014 00:20:06 -0300 Subject: [PATCH 3/7] Reference bootstrap min. Fin export dialog. --- wise-webapp/src/main/webapp/css/pageHeaders.css | 7 ++++++- wise-webapp/src/main/webapp/css/pageTemplate.css | 2 -- wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp | 9 +++++---- wise-webapp/src/main/webapp/jsp/mindmapExport.jsp | 8 ++++---- wise-webapp/src/main/webapp/jsp/mindmapList.jsp | 2 +- wise-webapp/src/main/webapp/jsp/template.jsp | 2 +- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css index 1735b90a..94ab0341 100644 --- a/wise-webapp/src/main/webapp/css/pageHeaders.css +++ b/wise-webapp/src/main/webapp/css/pageHeaders.css @@ -125,4 +125,9 @@ div#headerActions { div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { color: white; -} \ No newline at end of file +} + +#dialogMainForm label +{ + font-weight:normal; +} diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index b474e35c..ba6bbb4f 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -58,5 +58,3 @@ div#pageContainer { color: #ffffff; } - - diff --git a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp index e4d7b84e..c3b6a64b 100644 --- a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp +++ b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp @@ -21,14 +21,15 @@ - - - + + + + -
    +
    diff --git a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp index 0482e96a..7b3dbd8d 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp @@ -33,7 +33,7 @@ +
    -
    - -
    +
    + - -
    - +
    + +
    + +
    - - + + From b7051d56c0aaf3fdcb877c5667532db6e9530cf7 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 12 Feb 2014 14:34:40 -0300 Subject: [PATCH 6/7] Fix modal dialogs loading ... --- config/database/mysql/{v3.0-to-v3.2.sql => v3.1-to-v3.3.sql} | 0 wise-editor/src/main/webapp/css/editor.less | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename config/database/mysql/{v3.0-to-v3.2.sql => v3.1-to-v3.3.sql} (100%) diff --git a/config/database/mysql/v3.0-to-v3.2.sql b/config/database/mysql/v3.1-to-v3.3.sql similarity index 100% rename from config/database/mysql/v3.0-to-v3.2.sql rename to config/database/mysql/v3.1-to-v3.3.sql diff --git a/wise-editor/src/main/webapp/css/editor.less b/wise-editor/src/main/webapp/css/editor.less index 4572652f..817b4415 100644 --- a/wise-editor/src/main/webapp/css/editor.less +++ b/wise-editor/src/main/webapp/css/editor.less @@ -1,5 +1,5 @@ @import "compatibility.less"; -@import "css/libraries/moodialog/css/MooDialog.css"; +@import "libraries/moodialog/css/MooDialog.css"; /********************************************************************************/ /* Header & Toolbar Styles */ /********************************************************************************/ From 7b45b4b6337647dd7f1f65786d61b8d3a6680a46 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 12 Feb 2014 14:35:31 -0300 Subject: [PATCH 7/7] Remove console.log messsage. --- web2d/src/main/javascript/peer/svg/TextPeer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web2d/src/main/javascript/peer/svg/TextPeer.js b/web2d/src/main/javascript/peer/svg/TextPeer.js index 538a5bd5..62b1197b 100644 --- a/web2d/src/main/javascript/peer/svg/TextPeer.js +++ b/web2d/src/main/javascript/peer/svg/TextPeer.js @@ -169,7 +169,6 @@ web2d.peer.svg.TextPeer = new Class({ computedWidth = 10; } - console.log("Final result:"+computedWidth); var width = parseInt(computedWidth); width = width + this._font.getWidthMargin();