diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index a28f8c2c..f347f49b 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -391,11 +391,28 @@ mootools.js common.js - shadedborder.js - transcorners.js windoo.js - menu.js - slideShow.js + + + + true + true + false + false + + + + generate-resources + + compress + + + + + + ${project.build.directory}/${project.build.finalName}/js/wiseEditorLibrary.js + + mooRainbow.js help.js helpPanel.js diff --git a/wise-webapp/src/main/webapp/css/common.css b/wise-webapp/src/main/webapp/css/common.css index 1f9a8169..2f79b4be 100644 --- a/wise-webapp/src/main/webapp/css/common.css +++ b/wise-webapp/src/main/webapp/css/common.css @@ -259,10 +259,6 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover { border-bottom: 0; } -#signUpHeader .sb-inner { - background-color: white; -} - #signUpHeader { padding-right: 8px; padding-top: 4px; @@ -408,18 +404,6 @@ div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, color: white; } -#join .sb-inner { - background: #9a8fc3; -} - -#join .sb-shadow { - background: white; -} - -#join .sb-border { - background: #A29BBF; -} - div.header_languages { position: absolute; right: 0; diff --git a/wise-webapp/src/main/webapp/css/commonOldIE.css b/wise-webapp/src/main/webapp/css/commonOldIE.css new file mode 100644 index 00000000..0065be0f --- /dev/null +++ b/wise-webapp/src/main/webapp/css/commonOldIE.css @@ -0,0 +1,15 @@ +#signUpHeader .sb-inner { + background-color: white; +} + +#join .sb-inner { + background: #9a8fc3; +} + +#join .sb-shadow { + background: white; +} + +#join .sb-border { + background: #A29BBF; +} diff --git a/wise-webapp/src/main/webapp/css/embedded.css b/wise-webapp/src/main/webapp/css/embedded.css index 76915fd0..1828111b 100644 --- a/wise-webapp/src/main/webapp/css/embedded.css +++ b/wise-webapp/src/main/webapp/css/embedded.css @@ -1,6 +1,3 @@ -@import "common.css"; -@import "thirdparty.css"; - html { overflow: hidden; } diff --git a/wise-webapp/src/main/webapp/css/mymaps.css b/wise-webapp/src/main/webapp/css/mymaps.css index 16f6f9b6..a5c25f4a 100644 --- a/wise-webapp/src/main/webapp/css/mymaps.css +++ b/wise-webapp/src/main/webapp/css/mymaps.css @@ -224,46 +224,27 @@ padding: 10px; } -#mapListContainer .sb-inner { - background: white; -} - -#mapListContainer .sb-shadow { - background: white; -} - -#mapListContainer .sb-border { - background: #A29BBF; -} - -#recentFiles .sb-inner { +#recentFiles.sb { background: #EEEEEE; + border:1px solid #E5E5E5; + -moz-border-radius: 16px; + -khtml-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius:16px; } -#recentFiles .sb-border { - background: #E5E5E5; -} - -#toolbar .sb-border { - background: #A7C6DF; -} - -#toolbar .sb-inner { - background: #C3DEF5; -} - -#mydocs .sb-inner { - background: #C3DEF5; -} - -#mydocs .sb-border { - background: #A7C6DF; -} - -#recentItems .sb-inner { +#recentItems.sb { background: white; + border:1px solid #E5E5E5; + -moz-border-radius: 16px; + -khtml-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius:16px; } -#recentItems .sb-border { - background: #E5E5E5; -} \ No newline at end of file +#mydocs { + -moz-border-radius: 16px; + -khtml-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius:16px; +} diff --git a/wise-webapp/src/main/webapp/css/mymapsOldIE.css b/wise-webapp/src/main/webapp/css/mymapsOldIE.css new file mode 100644 index 00000000..14d7b06d --- /dev/null +++ b/wise-webapp/src/main/webapp/css/mymapsOldIE.css @@ -0,0 +1,71 @@ +@import "commonOldIE.css"; + +#mapListContainer .sb-inner { + background: white; +} + +#mapListContainer .sb-shadow { + background: white; +} + +#mapListContainer .sb-border { + background: #A29BBF; +} + +#recentFiles .sb-inner { + background: #EEEEEE; +} + +#recentFiles .sb-border { + background: #E5E5E5; +} + +#toolbar .sb-border { + background: #A7C6DF; +} + +#toolbar .sb-inner { + background: #C3DEF5; +} + +#mydocs .sb-inner { + background: #C3DEF5; +} + +#mydocs .sb-border { + background: #A7C6DF; +} + +#recentItems .sb-inner { + background: white; +} + +#recentItems .sb-border { + background: #E5E5E5; +} + +#recentFiles.sb { + background: transparent; + border:0 solid #A7C6DF; + -moz-border-radius: 0px; + -khtml-border-radius: 0px; + -webkit-border-radius: 0px; + border-radius:0px; +} + +#recentItems.sb { + background: transparent; + border:0 solid #A7C6DF; + -moz-border-radius: 0px; + -khtml-border-radius: 0px; + -webkit-border-radius: 0px; + border-radius:0px; +} + +#mydocs { + -moz-border-radius: 0px; + -khtml-border-radius: 0px; + -webkit-border-radius: 0px; + border-radius:0px; +} + diff --git a/wise-webapp/src/main/webapp/css/wisehome.css b/wise-webapp/src/main/webapp/css/wisehome.css index c3e17636..73bdf2d0 100644 --- a/wise-webapp/src/main/webapp/css/wisehome.css +++ b/wise-webapp/src/main/webapp/css/wisehome.css @@ -133,14 +133,6 @@ color: black; } -#searchResult .sb-inner { - background: #C3DEF5; -} - -#searchResult .sb-border { - background: #A7C6DF; -} - #search { clear: both; width: 200px; @@ -464,42 +456,10 @@ div#news { font-size: medium; } -#join .sb-inner { - background: #9a8fc3; -} - -#join .sb-shadow { - background: white; -} - -#join .sb-border { - background: #A29BBF; -} - -#newsAndArticles .sb-inner, #recentMaps .sb-inner { - background: #c3def5; -} - -#newsAndArticles .sb-shadow, #recentMaps .sb-shadow { - background: white; -} - -#newsAndArticles .sb-border, #recentMaps .sb-border { - background: #A7C6DF; -} - #recentMapsContent, #newsContent, #joinContent { padding: 5px 10px; } -#recentMapsContent .sb-inner, #newsContent .sb-inner { - background: white; -} - -#recentMapsContent .sb-border, #newsContent .sb-border { - background: #A7C6DF; -} - #search dl { padding-bottom: 10px; } @@ -517,18 +477,6 @@ div#news { font-size: medium; } -#search .sb-inner { - background: white; -} - -#search .sb-shadow { - background: white; -} - -#search .sb-border { - background: #6186CB; -} - /* Finish homepage styles */ div#mainBody { @@ -560,19 +508,11 @@ div#login { padding: 10px; } -div#login .sb-inner, div#forgotPasswordContainer .sb-inner, div#userRegistration .sb-inner { - background-color: #eeeeee; -} - #forgotPasswordContainer { width: 500px; padding: 10px; } -div#login .sb-border, div#forgotPasswordContainer .sb-border, div#userRegistration .sb-border { - background-color: #cfcfcf; -} - /* This is used to fix IE explorer bug rendering rounded corners*/ div#loginContent { width: 100%; @@ -622,14 +562,6 @@ div#register a { padding: 10px; } -#detailContent .sb-inner { - background: #C3DEF5; -} - -#detailContent .sb-border { - background: #A7C6DF; -} - #detail { margin: 10px auto; height: 100%; @@ -646,14 +578,6 @@ div#register a { vertical-align: top; } -#detail .sb-inner { - background: white; -} - -#detail .sb-border { - background: #E5E5E5; -} - #detailTitle { color: #093A9D; font-weight: bold; @@ -705,4 +629,50 @@ div.newsContainer { div.newsContainer h2 { padding:10px; color:#6B628F; -} \ No newline at end of file +} + +#login.sb, #userRegistration.sb, #forgotPasswordContainer.sb { + background: #eeeeee; + border:1px solid #cfcfcf; + -moz-border-radius: 8px; + -khtml-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius:8px; +} + +#detailContent.sb { + background: #C3DEF5; + border:1px solid #A7C6DF; + -moz-border-radius: 16px; + -khtml-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius:16px; +} + +#detail.sb { + background: white; + border:1px solid #E5E5E5; + -moz-border-radius: 16px; + -khtml-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius:16px; +} + +#userRegistration.sb { + background: #eeeeee; + border:1px solid #cfcfcf; + -moz-border-radius: 8px; + -khtml-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius:16px; +} + +#searchResult.sb { + background: #C3DEF5; + border:1px solid #A7C6DF; + -moz-border-radius: 16px; + -khtml-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius:16px; +} + diff --git a/wise-webapp/src/main/webapp/css/wisehomeOldIE.css b/wise-webapp/src/main/webapp/css/wisehomeOldIE.css new file mode 100644 index 00000000..24668816 --- /dev/null +++ b/wise-webapp/src/main/webapp/css/wisehomeOldIE.css @@ -0,0 +1,86 @@ +@import "commonOldIE.css"; + +#searchResult .sb-inner { + background: #C3DEF5; +} + +#searchResult .sb-border { + background: #A7C6DF; +} + +#join .sb-inner { + background: #9a8fc3; +} + +#join .sb-shadow { + background: white; +} + +#join .sb-border { + background: #A29BBF; +} + +#newsAndArticles .sb-inner, #recentMaps .sb-inner { + background: #c3def5; +} + +#newsAndArticles .sb-shadow, #recentMaps .sb-shadow { + background: white; +} + +#newsAndArticles .sb-border, #recentMaps .sb-border { + background: #A7C6DF; +} + +#recentMapsContent .sb-inner, #newsContent .sb-inner { + background: white; +} + +#recentMapsContent .sb-border, #newsContent .sb-border { + background: #A7C6DF; +} + +#search .sb-inner { + background: white; +} + +#search .sb-shadow { + background: white; +} + +#search .sb-border { + background: #6186CB; +} + +div#login .sb-inner, div#forgotPasswordContainer .sb-inner, div#userRegistration .sb-inner { + background-color: #eeeeee; +} + +div#login .sb-border, div#forgotPasswordContainer .sb-border, div#userRegistration .sb-border { + background-color: #cfcfcf; +} + +#detailContent .sb-inner { + background: #C3DEF5; +} + +#detailContent .sb-border { + background: #A7C6DF; +} + +#detail .sb-inner { + background: white; +} + +#detail .sb-border { + background: #E5E5E5; +} + +#login.sb, #forgotPasswordContainer.sb, #userRegistration.sb, #detailContent.sb, #detail.sb, #searchResult.sb{ + background: transparent; + border:0 solid #A7C6DF; + -moz-border-radius: 0px; + -khtml-border-radius: 0px; + -webkit-border-radius: 0px; + border-radius:0px; +} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp b/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp index 720724f2..a85ba09e 100644 --- a/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp +++ b/wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp @@ -10,6 +10,9 @@ + diff --git a/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp b/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp index 5fb3a4e6..99080737 100755 --- a/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp +++ b/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp @@ -1,12 +1,14 @@ <%@ include file="/jsp/init.jsp" %>
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index c9f810b7..602a1529 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -1,11 +1,13 @@ <%@ include file="/jsp/init.jsp" %>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp index 9605db3e..eb815a08 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp @@ -2,11 +2,13 @@ <%--@elvariable id="wisemapDetail" type="com.wisemapping.view.MindMapBean"--%> + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index e969b30e..33863712 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -12,12 +12,13 @@ - - - + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp b/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp index ee971f54..f8ed6b28 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp @@ -6,6 +6,9 @@ - + !--[if lt IE 9]> + +
diff --git a/wise-webapp/src/main/webapp/jsp/searchResult.jsp b/wise-webapp/src/main/webapp/jsp/searchResult.jsp index f554d9ad..5c065aab 100755 --- a/wise-webapp/src/main/webapp/jsp/searchResult.jsp +++ b/wise-webapp/src/main/webapp/jsp/searchResult.jsp @@ -1,13 +1,15 @@ <%@ include file="/jsp/init.jsp" %> + diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp index 6f72c663..39b538c4 100644 --- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp +++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp @@ -1,13 +1,15 @@ <%@ include file="/jsp/init.jsp" %>