From 95d9414ae394273f0f7ee44a836f4305ba6db650 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 9 Feb 2014 20:12:24 -0300 Subject: [PATCH 1/6] Change sd to md styles. --- .../src/main/webapp/jsp/accountSettings.jsp | 30 +++++++++---------- wise-webapp/src/main/webapp/jsp/login.jsp | 4 +-- .../src/main/webapp/jsp/mindmapImport.jsp | 12 ++++---- .../src/main/webapp/jsp/mindmapList.jsp | 24 +++++++-------- .../main/webapp/jsp/userForgotPassword.jsp | 4 +-- .../src/main/webapp/jsp/userRegistration.jsp | 24 +++++++-------- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp index a073d19e..4b5cc92d 100755 --- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp +++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp @@ -18,25 +18,25 @@
- -
+ +
- -
+ +
- -
+ +
-
+
"/>
@@ -50,19 +50,19 @@
- -
+ +
- -
+ +
-
+
"/>
@@ -74,8 +74,8 @@
- -
+ +
-
+
"/>
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index d3c65436..f20f4271 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -22,13 +22,13 @@
- +
- +
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp index c6e241fc..d9c84cbd 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp @@ -9,22 +9,22 @@
- -
+ +
- -
+ +
" class="form-control" maxlength="255"/>
- -
+ +
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 55c64ecf..a78ac23d 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -239,14 +239,14 @@
- -
+ +
" autofocus="autofocus" maxlength="255"/>
- -
+ +
" maxlength="255"/>
@@ -277,17 +277,17 @@
- -
+ +
" autofocus="autofocus" class="form-control" maxlength="255"/>
- -
+
" class="form-control" maxlength="255"/>
@@ -317,16 +317,16 @@
- -
+ +
- -
+
diff --git a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp index f163f096..9d36a8a4 100755 --- a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp +++ b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp @@ -19,8 +19,8 @@
- -
+ +
" class="btn btn-primary" diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp index 38bcac93..18b094d0 100644 --- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp +++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp @@ -9,42 +9,42 @@
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
-
+
${requestScope.captchaHtml}

@@ -63,7 +63,7 @@

-
+
" data-loading-text=" ..." id="submitButton" class="btn btn-primary"> From bbc380366fc52fe8f67198886fa4018c2f6a5e2a Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 9 Feb 2014 21:58:23 -0300 Subject: [PATCH 2/6] Fix login page. --- .../src/main/resources/messages_en.properties | 2 +- .../src/main/webapp/css/pageHeaders.css | 1 + .../src/main/webapp/css/pageTemplate.css | 58 +++------ wise-webapp/src/main/webapp/jsp/login.jsp | 93 ++++++++------ wise-webapp/src/main/webapp/jsp/template.jsp | 11 +- .../main/webapp/jsp/userForgotPassword.jsp | 33 ++--- .../src/main/webapp/jsp/userRegistration.jsp | 120 +++++++++--------- 7 files changed, 151 insertions(+), 167 deletions(-) diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index 50bd4ece..7ddba53c 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -248,7 +248,7 @@ ACCESS_HAS_BEEN_REVOKED= Upps. your access permissions to this map has been revo MAP_CAN_NOT_BE_FOUND= Upps. The map can not be found. It must have been deleted. LICENSE=License WELCOME_TO_WISEMAPPING=Welcome to WiseMapping -WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can:
  • Embed mind map it in web pages and blogs
  • Link mind map and documents
  • Share your maps with friend and colleagues
  • Export your maps SVG,PNG,JPG and FreeMind
. +WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can:
  • Embed mind map it in web pages and blogs
  • Link mind map and documents
  • Share your maps with friend and colleagues
  • Export your maps SVG,PNG,JPG and FreeMind
OPENID_LOGIN=Open Id Login LOGING_OPENID_DETAILS=Do you already have an account on one of these sites?. Click the logo to log in with it here: WHY_OPENID=Why OpenID ?
It's a single username and password that allows you to log in to any OpenID-enabled site. It works on thousands of websites.
It's an open standard.
learn more diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css index b31520bc..e78a82ab 100644 --- a/wise-webapp/src/main/webapp/css/pageHeaders.css +++ b/wise-webapp/src/main/webapp/css/pageHeaders.css @@ -57,6 +57,7 @@ html,body { padding-left: 7px; font-weight: bold; vertical-align: middle; + font-size: 20px; } #headerButtons { diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index 8be3ea30..dac20288 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -2,7 +2,7 @@ @import "pageHeaders.css"; div#register { - margin: 40px auto; + margin: 20px auto; text-align: center; white-space: nowrap; } @@ -17,34 +17,6 @@ div#pageContainer { min-height: 100%; } -div.bodyContainer { - padding-top: 30px; - padding-bottom: 85px; /* Height of the footer */ -} - -div.bodyContainer h1 { - color: #093A9D; - font-size: 150%; - margin-bottom: 5px; - font-weight: bold; -} - -div.bodyContainer h2 { - color: gray; - font-size: 150%; - border-bottom: 1px dashed #BBB4D6; - margin: 20px 0; -} - -div.bodyContainer ul { - padding: 5px; -} - -div.bodyContainer li { - list-style-type: disc; - margin-left: 12px; -} - #footerContainer { padding-top: 10px; border-top: 1px black solid; @@ -62,17 +34,25 @@ span.errorMsg { color: red; } -div.fform { - background: #eeeeee; - border: 1px solid #cfcfcf; - padding: 5px 25px; - -moz-border-radius: 8px; - -khtml-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; +/* Reduce styles */ +.jumbotron > h1 { + font-size: 35px; } -div.fform label { - font-weight: bold; +.jumbotron p { + font-size: 15px; +} + +#login h1 { + font-size: 25px; +} + +#loginPanel { + padding: 0 60px; + background: #ffffff; + margin-top: 40px; + background: #F7C931; + color: #ffffff; + } diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index f20f4271..79d7e2bb 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -12,54 +12,63 @@ }); -
-
+
+

-
-

+
+
+

- -
- -
- + +
+ + +
+ +
-
-
- -
- +
+ + +
+ +
-
-
-
- - +
+
+ + +
-
-
- "> -
-
- - - -
- - -
- - - -
- +
+ "> +
+
+ + + +
+ + +
+ + + +
+ +
-
-
+
@@ -69,19 +78,21 @@

- . + .

- +
 . + href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration">.
diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp index 1e9d274a..a03fde5c 100644 --- a/wise-webapp/src/main/webapp/jsp/template.jsp +++ b/wise-webapp/src/main/webapp/jsp/template.jsp @@ -51,13 +51,12 @@ -
+
-
-
-
- -
+
+
+ +
diff --git a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp index 9d36a8a4..d11c228e 100755 --- a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp +++ b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp @@ -9,29 +9,22 @@ }); -
-
-

- -

+

+ +

-

+

- -
- -
- -
- " class="btn btn-primary" - data-loading-text=""/> - " class="btn" - onclick="window.location=''"/> -
- -
+ + +
+
-
+ " class="btn btn-primary" + data-loading-text=""/> + " class="btn" + onclick="window.location=''"/> +
diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp index 18b094d0..8bb4fb6c 100644 --- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp +++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp @@ -1,79 +1,79 @@ <%@page pageEncoding="UTF-8" %> <%@include file="/jsp/init.jsp" %> -
+

-

+

+ +
+ +
+ + +
+
+
+ -

- -
-
- -
- - -
+
+ +
-
- -
- - -
+
+
+ + +
+ +
-
- -
- - -
+
+
+ + +
+ +
-
- -
- - -
+
+
+ + +
+ +
-
- -
- - -
-
-
-
- - ${requestScope.captchaHtml} +
+
+
+ + ${requestScope.captchaHtml}

-
-
-

- - . - -

-
-
-
+
+
+

+ + + . + +

+
+
+
" - data-loading-text=" ..." id="submitButton" - class="btn btn-primary"> + data-loading-text=" ..." id="submitButton" + class="btn btn-primary"> " - onclick="window.location='c/'" class="btn"> -
-
-
+ onclick="window.location='c/'" class="btn"> + +
+
+ - -
From 832fb6ce527ec96fa71cdc2d2326d05dca765632 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 9 Feb 2014 22:04:01 -0300 Subject: [PATCH 3/6] Enable MYSQL display message. --- wise-webapp/src/main/webapp/css/pageTemplate.css | 4 ---- wise-webapp/src/main/webapp/jsp/login.jsp | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index dac20288..c9a543de 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -30,10 +30,6 @@ div#pageContainer { /*-- End Main Page Style -- */ -span.errorMsg { - color: red; -} - /* Reduce styles */ .jumbotron > h1 { font-size: 35px; diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index 79d7e2bb..8bfb93f7 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -55,10 +55,10 @@ -
+
-
+
@@ -86,7 +86,7 @@
- +
Date: Sun, 9 Feb 2014 22:14:53 -0300 Subject: [PATCH 4/6] Fix mindmap list navigator toolbar. --- wise-webapp/src/main/webapp/css/mindmapList.less | 2 +- wise-webapp/src/main/webapp/css/pageHeaders.css | 2 +- wise-webapp/src/main/webapp/css/pageTemplate.css | 9 ++++++++- wise-webapp/src/main/webapp/jsp/mindmapList.jsp | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less index 5f98e768..8e16566a 100644 --- a/wise-webapp/src/main/webapp/css/mindmapList.less +++ b/wise-webapp/src/main/webapp/css/mindmapList.less @@ -211,7 +211,7 @@ abbr[title] { } #foldersContainer { - padding-top: 60px; + padding-top: 86px; } #footerContainer > ul { diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css index e78a82ab..1735b90a 100644 --- a/wise-webapp/src/main/webapp/css/pageHeaders.css +++ b/wise-webapp/src/main/webapp/css/pageHeaders.css @@ -125,4 +125,4 @@ 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 diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index c9a543de..cca97d53 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -30,6 +30,7 @@ div#pageContainer { /*-- End Main Page Style -- */ + /* Reduce styles */ .jumbotron > h1 { font-size: 35px; @@ -41,6 +42,7 @@ div#pageContainer { #login h1 { font-size: 25px; + color: #00008b; } #loginPanel { @@ -49,6 +51,11 @@ div#pageContainer { margin-top: 40px; background: #F7C931; color: #ffffff; - } +#loginPanel h1 { + color: #ffffff; +} + + + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index a78ac23d..dbf91198 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -131,7 +131,7 @@
-
    +
    • From 8996df4cbb7abd5035d6654ef32fc9d13ba88250 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 9 Feb 2014 22:44:58 -0300 Subject: [PATCH 5/6] More minor fixes. --- .../src/main/webapp/css/pageTemplate.css | 3 +- wise-webapp/src/main/webapp/jsp/footer.jsp | 75 +- .../src/main/webapp/jsp/mindmapList.jsp | 665 +++++++++--------- 3 files changed, 388 insertions(+), 355 deletions(-) diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index cca97d53..b474e35c 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -33,7 +33,8 @@ div#pageContainer { /* Reduce styles */ .jumbotron > h1 { - font-size: 35px; + font-size: 30px; + color: #00008b; } .jumbotron p { diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp index c63fbef0..b285e821 100644 --- a/wise-webapp/src/main/webapp/jsp/footer.jsp +++ b/wise-webapp/src/main/webapp/jsp/footer.jsp @@ -1,39 +1,48 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
      - - + +
      - - + +
      -
      -
      @@ -49,15 +58,13 @@ })();
      -
      -

      - | - | - | -
      - -

      - +
      + | + | + | +
      +
      diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index dbf91198..37433599 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -28,67 +28,67 @@ -
      - +
      +
      +
      +
      + + +
      - + +
      + + +
      + + + + + + +
      +
      +
      +
      + +
      +
      + + +
      + +
      +       +
      +
      -
      " class="modal fade"> -
      -
      +
      +
      -
      - -

      -
      -
      -
      - -
      -
      - -
      - " autofocus="autofocus" maxlength="255"/> -
      -
      -
      - -
      - " maxlength="255"/> +
      + +

      +
      +
      +
      + +
      +
      + + +
      + " autofocus="autofocus" + maxlength="255"/> +
      -
      -
      - -
      -
      -
      +
+ +
+
+ - + code="CREATE"/> + +
-
-
+
+ +
+
+ + +
-
- - -
-
+ +
+
+ + +
-
- - -
-