From b6dd7712f9e3f251f1b3e83100b1cd0fd33c702b Mon Sep 17 00:00:00 2001 From: Paulo Veiga Date: Thu, 2 Feb 2012 00:13:29 -0300 Subject: [PATCH] Keep cleaning and refactoring styles and samples. --- distribution/assembly/standalone-editor.xml | 1 + .../main/javascript/DesignerUndoManager.js | 4 +- .../main/javascript/DwrPersistenceManager.js | 2 +- .../main/javascript/LocalStorageManager.js | 4 +- .../src/main/javascript/PersistenceManager.js | 10 +- .../javascript/StandaloneActionDispatcher.js | 6 +- mindplot/src/main/javascript/widget/IMenu.js | 2 +- wise-editor/src/main/webapp/css/common.css | 674 ------------------ .../src/main/webapp/css/compatibility.less | 158 ++++ wise-editor/src/main/webapp/css/editor.less | 239 +------ wise-editor/src/main/webapp/css/embedded.css | 43 +- wise-editor/src/main/webapp/css/header.less | 8 +- wise-editor/src/main/webapp/css/skin.less | 1 - wise-editor/src/main/webapp/css/toolbar.less | 141 ++-- .../src/main/webapp/css/widget/skin2.less | 3 + .../src/main/webapp/html/container.html | 23 + wise-editor/src/main/webapp/html/editor.html | 44 +- .../src/main/webapp/html/fulleditor.html | 40 +- .../src/main/webapp/html/viewmode.html | 33 +- wise-editor/src/main/webapp/js/editor.js | 16 +- .../main/webapp/{maps => samples}/welcome.xml | 0 wise-webapp/src/main/webapp/css/embedded.css | 135 ---- .../src/main/webapp/jsp/mindmapEditor.jsp | 6 +- 23 files changed, 317 insertions(+), 1276 deletions(-) delete mode 100644 wise-editor/src/main/webapp/css/common.css create mode 100644 wise-editor/src/main/webapp/css/compatibility.less delete mode 120000 wise-editor/src/main/webapp/css/skin.less create mode 100644 wise-editor/src/main/webapp/css/widget/skin2.less create mode 100644 wise-editor/src/main/webapp/html/container.html rename wise-editor/src/main/webapp/{maps => samples}/welcome.xml (100%) delete mode 100644 wise-webapp/src/main/webapp/css/embedded.css diff --git a/distribution/assembly/standalone-editor.xml b/distribution/assembly/standalone-editor.xml index b4e5268d..5bae8c23 100644 --- a/distribution/assembly/standalone-editor.xml +++ b/distribution/assembly/standalone-editor.xml @@ -32,6 +32,7 @@ js/mootools*.js html/editor.html html/viewmode.html + samples/* diff --git a/mindplot/src/main/javascript/DesignerUndoManager.js b/mindplot/src/main/javascript/DesignerUndoManager.js index 48bf215b..d78d6a00 100644 --- a/mindplot/src/main/javascript/DesignerUndoManager.js +++ b/mindplot/src/main/javascript/DesignerUndoManager.js @@ -28,10 +28,10 @@ mindplot.DesignerUndoManager = new Class({ enqueue:function(command) { $assert(command, "Command can not be null"); var length = this._undoQueue.length; - if (command.discartDuplicated && length > 0) { + if (command.discardDuplicated && length > 0) { // Skip duplicated events ... var lastItem = this._undoQueue[length - 1]; - if (lastItem.discartDuplicated != command.discartDuplicated) { + if (lastItem.discardDuplicated != command.discardDuplicated) { this._undoQueue.push(command); } } else { diff --git a/mindplot/src/main/javascript/DwrPersistenceManager.js b/mindplot/src/main/javascript/DwrPersistenceManager.js index d307547f..739901f1 100644 --- a/mindplot/src/main/javascript/DwrPersistenceManager.js +++ b/mindplot/src/main/javascript/DwrPersistenceManager.js @@ -17,7 +17,7 @@ */ mindplot.DwrPersitenceManager = new Class({ - Extends:mindplot.PersitenceManager, + Extends:mindplot.PersistenceManager, initialize: function() { this.parent(); }, diff --git a/mindplot/src/main/javascript/LocalStorageManager.js b/mindplot/src/main/javascript/LocalStorageManager.js index 986cbe15..d4306e2a 100644 --- a/mindplot/src/main/javascript/LocalStorageManager.js +++ b/mindplot/src/main/javascript/LocalStorageManager.js @@ -17,7 +17,7 @@ */ mindplot.LocalStorageManager = new Class({ - Extends:mindplot.PersitenceManager, + Extends:mindplot.PersistenceManager, initialize: function() { this.parent(); }, @@ -32,7 +32,7 @@ mindplot.LocalStorageManager = new Class({ if (xml == null) { // Let's try to open one from the local directory ... var xmlRequest = new Request({ - url: '../maps/' + mapId + '.xml', + url: '../samples/' + mapId + '.xml', method: 'get', async: false, onSuccess: function(responseText) { diff --git a/mindplot/src/main/javascript/PersistenceManager.js b/mindplot/src/main/javascript/PersistenceManager.js index ba2b8a61..12d941f4 100644 --- a/mindplot/src/main/javascript/PersistenceManager.js +++ b/mindplot/src/main/javascript/PersistenceManager.js @@ -16,7 +16,7 @@ * limitations under the License. */ -mindplot.PersitenceManager = new Class({ +mindplot.PersistenceManager = new Class({ initialize: function() { }, @@ -68,11 +68,11 @@ mindplot.PersitenceManager = new Class({ } }); -mindplot.PersitenceManager.init = function(instance) { - mindplot.PersitenceManager._instance = instance; +mindplot.PersistenceManager.init = function(instance) { + mindplot.PersistenceManager._instance = instance; }; -mindplot.PersitenceManager.getInstance = function() { - return mindplot.PersitenceManager._instance; +mindplot.PersistenceManager.getInstance = function() { + return mindplot.PersistenceManager._instance; }; diff --git a/mindplot/src/main/javascript/StandaloneActionDispatcher.js b/mindplot/src/main/javascript/StandaloneActionDispatcher.js index ed9d1403..f2520a2e 100644 --- a/mindplot/src/main/javascript/StandaloneActionDispatcher.js +++ b/mindplot/src/main/javascript/StandaloneActionDispatcher.js @@ -150,7 +150,7 @@ mindplot.StandaloneActionDispatcher = new Class({ }; var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, color); - command.discartDuplicated = "fontColorCommandId"; + command.discardDuplicated = "fontColorCommandId"; this.execute(command); }, @@ -165,7 +165,7 @@ mindplot.StandaloneActionDispatcher = new Class({ }; var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, color); - command.discartDuplicated = "backColor"; + command.discardDuplicated = "backColor"; this.execute(command); }, @@ -180,7 +180,7 @@ mindplot.StandaloneActionDispatcher = new Class({ }; var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, color); - command.discartDuplicated = "borderColorCommandId"; + command.discardDuplicated = "borderColorCommandId"; this.execute(command); }, diff --git a/mindplot/src/main/javascript/widget/IMenu.js b/mindplot/src/main/javascript/widget/IMenu.js index 551e70e5..aaec386b 100644 --- a/mindplot/src/main/javascript/widget/IMenu.js +++ b/mindplot/src/main/javascript/widget/IMenu.js @@ -48,7 +48,7 @@ mindplot.widget.IMenu = new Class({ } // Call persistence manager for saving ... - var persistenceManager = mindplot.PersitenceManager.getInstance(); + var persistenceManager = mindplot.PersistenceManager.getInstance(); persistenceManager.save(mindmap, mindmapProp, saveHistory, { onSuccess: function() { if (saveHistory) { diff --git a/wise-editor/src/main/webapp/css/common.css b/wise-editor/src/main/webapp/css/common.css deleted file mode 100644 index 3e6f24d9..00000000 --- a/wise-editor/src/main/webapp/css/common.css +++ /dev/null @@ -1,674 +0,0 @@ -body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, textarea, p, blockquote, th, td { - margin: 0; - padding: 0; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -fieldset, img { - border: 0; -} - -address, caption, cite, code, dfn, em, strong, th, var { - font-style: normal; - font-weight: normal; -} - -ol, ul { - list-style: none; -} - -caption, th { - text-align: left; -} - -h1, h2, h3, h4, h5, h6 { - font-size: 100%; - font-weight: normal; -} - -q:before, q:after { - content: ''; -} - -abbr, acronym { - border: 0; -} - -/** - * Percents could work for IE, but for backCompat purposes, we are using keywords. - * x-small is for IE6/7 quirks mode. - * - */ -body { - font: 13px arial, helvetica, clean, sans-serif; - font-size: small; - font: x-small; -} - -table { - font-size: inherit; - font-size: 100%; -} - -/** - * 99% for safari; 100% is too large - */ -select, input, textarea { - font: 99% arial, helvetica, clean, sans-serif; -} - -/** - * Bump up !IE to get to 13px equivalent - */ -pre, code { - font: 115% monospace; - font-size: 100%; -} - -/** - * Default line-height based on font-size rather than "computed-value" - * see: http://www.w3.org/TR/CSS21/visudet.html#line-height - */ - -body * { - line-height: 1.22em; -} - -* { - margin: 0; - padding: 0; -} - -body { - font: normal 80% "trebuchet ms", verdana, arial, helvetica, sans-serif; - background-color: #fff; -} - -img { - border: 0; -} - -form { - padding: 0px; - margin: 0px; -} - -p { - margin: 5px 0 5px 0; -} - -ul { - list-style-position: inside; -} - -a:link, a:visited { - font: bold 100%; - text-decoration: underline; - color: black; -} - -a:hover, a:active { - font: bold 100%; - text-decoration: underline; - color: black; -} - -h2 { - font-size: 160%; - color: #8e9181; -} - -h1 { - font-style: normal; - font-size: 180%; - color: white; - padding-bottom: 2px; -} - -h3 { - /* use as subhead on main body */ - clear: left; - font-style: normal; - font-size: 130%; - color: #6b6f5b; -} - -h4 { - /* use as headers in footer */ - font-weight: bold; - font-size: 120%; - border-bottom: 1px solid #8e9181; - color: #e2e3dd; - padding-bottom: 10px; - width: 400px; -} - -#centerContent { - text-align: center; -} - -/* HEADER STYLES */ - -#header { - margin-top: 2px; - height: 78px; - width: 100%; - background: white; - border-bottom: 1px solid #bbb4d6; - position: absolute; - top: 0; - left: 0; -} - -#headerToolbar { - height: 25px; - width: 100%; - background-color: #171a17; - border-top: 1px solid #999999; - border-bottom: 1px solid #424141; - color: white; - font-size: small; - font-style: normal; -} - -#headerContent { - width: 800px; - height: 78px; - position: relative; - top: 0; - left: 0; - margin: auto; -} - -#headerLogo { - margin-top: 8px; - height: 80px; - width: 134px; - background: url("../images/logo-small.png") no-repeat; - position: absolute; - top: 0; - left: 0; -} - -#headerSlogan { - position: absolute; - border-left: 1px dashed gray; - margin-top: 8px; - height: 1em; - width: 100px; - top: 40px; - left: 137px; - white-space: nowrap; - padding-left: 7px; - font-weight: bold; - vertical-align: middle; -} - -#headerButtons { - position: absolute; - top: 65px; - left: 150px; -} - -#newsLink, #blogLink, #aboutLink, #newsLink, #faqLink, #feedbackLink, #supportLink, #logoutLink { - float: right; - z-index: 300; -} - -div#headerButtons a { - float: left; - color: #6F6F6F; - padding: 0 10px; - text-decoration: none; - font-weight: bold; - font-size: 120%; - white-space: nowrap; -} - -div#headerTitle { - float: left; - font-weight: bold; - font-size: 15px; - margin-right: 5px; - margin-left: 5px; -} - -div#printHeader { - background-color: black; - height: 35px; - color: white; -} - -span#headerSubTitle { - font-weight: lighter; - font-size: 12px; -} - -div#headerButtons a:hover { - /*text-decoration: underline;*/ - color: #7e72ad; -} - -div#headerButtons activelink a, div#headerButtons activelink a:hover { - text-decoration: none; - border-top: 0; - border-bottom: 0; -} - -#signUpHeader { - padding-right: 8px; - padding-top: 4px; - position: absolute; - right: 0; - z-index: 50; - text-align: center; -} - -#signUpHeader a, #signUpHeader a:hover { - font-size: 100%; - color: #BBB4D6; - text-decoration: underline; -} - -#editorHeader { - height: 40px; - width: 100%; - background: white; - border-bottom: 1px solid #bbb4d6; - position: absolute; - top: 0; - left: 0; -} - -#editorHeader #headerToolbar { - height: 40px; - width: 100%; - background-color: #171a17; - border-top: 1px solid #999999; - border-bottom: 1px solid #424141; - color: white; - font-size: small; - font-style: normal; -} - -div#editorHeader div#headerTitle { - float: left; - font-weight: bold; - font-size: 22px; - margin-right: 5px; - margin-left: 5px; -} - -div#editorHeader span#headerSubTitle { - font-weight: lighter; - font-size: 12px; -} - -div#editorHeader div#headerActions { - padding-right: 8px; - padding-top: 4px; - position: absolute; - right: 0; - top: 4px; - z-index: 50; -} - -div#editorHeader div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { - color: white; -} - -#footer { - width: 100%; - border-top: 1px solid #8e9181; - text-align: center; - font-size: 90%; - background-color: white; - float: left; -} - -div#printFooter { - height: 60px; - width: 100%; - background: #E5E5E5; - border-top: 1px solid #bbb4d6; -} - -div#printLogo { - height: 50px; - width: 80px; - float: right; - margin: 1px; - background: url(../images/logo-vsmall.png) no-repeat right top; -} - -.btn-primary { - cursor: pointer; - display: inline-block; - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: normal; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - -ms-transition: 0.1s linear all; - -o-transition: 0.1s linear all; - transition: 0.1s linear all; - color: #ffffff; - background-color: #0064cd; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); - background-image: -moz-linear-gradient(top, #049cdb, #0064cd); - background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); - background-image: -o-linear-gradient(top, #049cdb, #0064cd); - background-image: linear-gradient(top, #049cdb, #0064cd); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#049cdb', endColorstr = '#0064cd', GradientType = 0); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #0064cd #0064cd #003f81; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} - -.btn-primary:hover { - background-position: 0 -15px; - text-decoration: none; -} - -.btn-secondary { - cursor: pointer; - display: inline-block; - background-color: #e6e6e6; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#ffffff', endColorstr = '#e6e6e6', GradientType = 0); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: normal; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - -ms-transition: 0.1s linear all; - -o-transition: 0.1s linear all; - transition: 0.1s linear all; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-secondary:hover { - background-position: 0 -15px; - text-decoration: none; -} - -div#paypal { - float: left; - margin: -29px; -} - -.errorMsg { - color: #990000; - font-size: 90%; - font-weight: bold; - padding-left: 5px; -} - -#headerLogo { - cursor: pointer; -} - -#headerLoading { - padding-left: 40px; - background: url('../images/ajax-loader.gif') #BBB4D6 no-repeat left; - position: absolute; - right: 3px; - top: 5px; - width: 75px; - height: 20px; - color: white; - font-weight: bold; - border: 1px solid; - border-color: #f5f5f5; - background-position: 5px 2px; - visibility: hidden; -} - -div#headerActions { - padding-right: 8px; - padding-top: 4px; - position: absolute; - right: 0; - z-index: 50; -} - -div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { - color: white; -} - -div.header_languages { - position: absolute; - right: 0; - top: 30px; - width: 100px; - height: 20px; -} - -div.header_language_flag { - float: left; - margin-right: 3px; -} - -/*--- Modal Dialog Form ---*/ -div.modalDialog { - padding: 15px 30px; -} - -div.modalDialog td { - padding: 3px; -} - -div.modalDialog h1 { - color: #093A9D; - font-size: 200%; - margin-bottom: 5px; - font-weight: bold; -} - -div.modalDialog h2 { - color: gray; - font-size: 110%; - margin: 9px 0; -} - -div.modalDialog h5 { - color: gray; - font-size: 90%; /*border-bottom: 1px dashed #BBB4D6;*/ -} - -/*--- End Modal Dialog Form ---*/ - -/*-- Main Page Style -- */ -div.pageBody { - margin: 10px auto; - width: 800px; - min-height: 500px; -} - -div.pageBodyContent { - padding-top: 30px; -} - -div.pageBodyContent h1 { - color: #093A9D; - font-size: 200%; - margin-bottom: 5px; - font-weight: bold; -} - -div.pageBodyContent h2 { - color: gray; - font-size: 150%; - border-bottom: 1px dashed #BBB4D6; - margin: 20px 0; -} - -div.pageBodyContent ul { - padding: 5px; -} - -div.pageBodyContent li { - list-style-type: disc; - margin-left: 12px; -} - -/*-- End Main Page Style -- */ - -/* Share Styles */ -#userEmails { - float: left; - width: 50%; - padding: 5px; -} - -#userEmails textarea { - width: 100%; -} - -#currentUsers { - float: left; - width: 40%; - height: 400px; - padding: 5px; - padding-left: 15px; - margin-left: 15px; - border-left: 1px dotted gray; -} - -#currentUsers table { - width: 100%; -} - -#invitation { - border: 1px dotted gray; -} - -td.formLabel { - text-align: right; - padding: 2px 10px; - white-space: nowrap; - font-weight: bolder; - vertical-align: top; -} - -span.fieldRequired { - font-weight: bold; - color: #ff4500; - margin: 0 4px; -} - -#keyboardTable { - clear: both; - width: 100%; - height: 300px; - overflow: auto; - border: 0 solid gray; - background-color: white; - z-index: 2; - position: relative; -} - -#keyboardTable table { - width: 100%; - border: 0 solid gray; -} - -#keyboardTable thead { - background-color: #093A9D; - font-size: 12px; - font-weight: normal; - padding: 5px; -} - -#keyboardTable td { - border-bottom: 1px solid #EEEEEE; - color: #5f5f5f; - font-size: 12px; - padding: 3px; -} - -#keyboardTable th { - color: white; - border-right: 1px dotted #ffffff; - font-weight: bold; - text-align: center; - font-size: 12px; - padding: 5px; -} - -#keyboardTable tbody tr:hover { - background-color: #E2f0f6; -} - -#keyboardTable tr { - padding: 5px; -} - -div.installCFG { - width: 100%; - font-size: 130%; -} - -div.installCFG h1 { - width: 100%; - font-size: 130%; -} - -div.installCFG h2 { - font-size: 100%; - border-bottom: 0 solid black; -} - -.chromeFrameInstallDefaultStyle { - position: relative; - left: 0; - top: 0; - margin: 0; -} - -.floating-tip { - background-color: #dfcf3c; - padding: 5px 15px; - color: #666666; - /*font-weight: bold;*/ - /*width: 100px;*/ - font-size: 13px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2); -} - diff --git a/wise-editor/src/main/webapp/css/compatibility.less b/wise-editor/src/main/webapp/css/compatibility.less new file mode 100644 index 00000000..54b6152c --- /dev/null +++ b/wise-editor/src/main/webapp/css/compatibility.less @@ -0,0 +1,158 @@ +html { + overflow: hidden; +} + +body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, textarea, p, blockquote, th, td { + margin: 0; + padding: 0; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +fieldset, img { + border: 0; +} + +address, caption, cite, code, dfn, em, strong, th, var { + font-style: normal; + font-weight: normal; +} + +ol, ul { + list-style: none; +} + +caption, th { + text-align: left; +} + +h1, h2, h3, h4, h5, h6 { + font-size: 100%; + font-weight: normal; +} + +q:before, q:after { + content: ''; +} + +abbr, acronym { + border: 0; +} + +/** + * Percents could work for IE, but for backCompat purposes, we are using keywords. + * x-small is for IE6/7 quirks mode. + * + */ +body { + font: 13px arial, helvetica, clean, sans-serif; + font-size: small; + font: x-small; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -o-user-select: none; + user-select: none; +} + +table { + font-size: inherit; + font-size: 100%; +} + +/** + * 99% for safari; 100% is too large + */ +select, input, textarea { + font: 99% arial, helvetica, clean, sans-serif; +} + +/** + * Bump up !IE to get to 13px equivalent + */ +pre, code { + font: 115% monospace; + font-size: 100%; +} + +/** + * Default line-height based on font-size rather than "computed-value" + * see: http://www.w3.org/TR/CSS21/visudet.html#line-height + */ + +body * { + line-height: 1.22em; +} + +* { + margin: 0; + padding: 0; +} + +body { + font: normal 80% "trebuchet ms", verdana, arial, helvetica, sans-serif; + background-color: #fff; +} + +img { + border: 0; +} + +form { + padding: 0; + margin: 0; +} + +p { + margin: 5px 0 5px 0; +} + +ul { + list-style-position: inside; +} + +a:link, a:visited { + font: bold 100%; + text-decoration: underline; + color: black; +} + +a:hover, a:active { + font: bold 100%; + text-decoration: underline; + color: black; +} + +h2 { + font-size: 160%; + color: #8e9181; +} + +h1 { + font-style: normal; + font-size: 180%; + color: white; + padding-bottom: 2px; +} + +h3 { + /* use as subhead on main body */ + clear: left; + font-style: normal; + font-size: 130%; + color: #6b6f5b; +} + +h4 { + /* use as headers in footer */ + font-weight: bold; + font-size: 120%; + border-bottom: 1px solid #8e9181; + color: #e2e3dd; + padding-bottom: 10px; + width: 400px; +} + diff --git a/wise-editor/src/main/webapp/css/editor.less b/wise-editor/src/main/webapp/css/editor.less index 61f7bdde..8539f04c 100644 --- a/wise-editor/src/main/webapp/css/editor.less +++ b/wise-editor/src/main/webapp/css/editor.less @@ -1,169 +1,7 @@ +@import "compatibility.less"; @import "../css/widget/lightbox.css"; @import "../css/libraries/moodialog/css/MooDialog.css"; -@import "../css/skin.less"; -/* Common Default Style */ -html { - overflow: hidden; -} - -body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, textarea, p, blockquote, th, td { - margin: 0; - padding: 0; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -fieldset, img { - border: 0; -} - -address, caption, cite, code, dfn, em, strong, th, var { - font-style: normal; - font-weight: normal; -} - -ol, ul { - list-style: none; -} - -caption, th { - text-align: left; -} - -h1, h2, h3, h4, h5, h6 { - font-size: 100%; - font-weight: normal; -} - -q:before, q:after { - content: ''; -} - -abbr, acronym { - border: 0; -} - -/** - * Percents could work for IE, but for backCompat purposes, we are using keywords. - * x-small is for IE6/7 quirks mode. - * - */ -body { - font: 13px arial, helvetica, clean, sans-serif; - font-size: small; - font: x-small; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -o-user-select: none; - user-select: none; -} - -table { - font-size: inherit; - font-size: 100%; -} - -/** - * 99% for safari; 100% is too large - */ -select, input, textarea { - font: 99% arial, helvetica, clean, sans-serif; -} - -/** - * Bump up !IE to get to 13px equivalent - */ -pre, code { - font: 115% monospace; - font-size: 100%; -} - -/** - * Default line-height based on font-size rather than "computed-value" - * see: http://www.w3.org/TR/CSS21/visudet.html#line-height - */ - -body * { - line-height: 1.22em; -} - -* { - margin: 0; - padding: 0; -} - -body { - font: normal 80% "trebuchet ms", verdana, arial, helvetica, sans-serif; - background-color: #fff; -} - -img { - border: 0; -} - -form { - padding: 0; - margin: 0; -} - -p { - margin: 5px 0 5px 0; -} - -ul { - list-style-position: inside; -} - -a:link, a:visited { - font: bold 100%; - text-decoration: underline; - color: black; -} - -a:hover, a:active { - font: bold 100%; - text-decoration: underline; - color: black; -} - -h2 { - font-size: 160%; - color: #8e9181; -} - -h1 { - font-style: normal; - font-size: 180%; - color: white; - padding-bottom: 2px; -} - -h3 { - /* use as subhead on main body */ - clear: left; - font-style: normal; - font-size: 130%; - color: #6b6f5b; -} - -h4 { - /* use as headers in footer */ - font-weight: bold; - font-size: 120%; - border-bottom: 1px solid #8e9181; - color: #e2e3dd; - padding-bottom: 10px; - width: 400px; -} - -/**********************************************************/ -/* End: Common Default Style */ -/**********************************************************/ /**********************************************************/ /* Error Dialog ... */ @@ -242,55 +80,7 @@ h4 { /********************************************************************************/ /* Header & Toolbar Styles */ /********************************************************************************/ - @import "header.less"; -@import "toolbar.less"; - - -div#topicRelation { - width: 56px; - background: url(../images/topic-relation.png) no-repeat center top; - z-index: 4; -} - -div#colorPalette { - border: 1px solid #bbb4d6; - display: none; - position: absolute; - z-index: 4; - width: 160px; - top: 89px; -} - -/*.toolbarPanel {*/ -/*z-index: 4;*/ -/*top: @header-height;*/ -/*-moz-transition: opacity 0.218s ease 0s;*/ -/*background: none repeat scroll 0 0 #FFFFFF;*/ -/*border: 1px solid rgba(0, 0, 0, 0.2);*/ -/*box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);*/ -/*cursor: default;*/ -/*font-size: 13px;*/ -/*margin: 0;*/ -/*outline: medium none;*/ -/*padding: 0 0 6px;*/ -/*position: absolute;*/ -/*}*/ - -div.toolbarPanelLink, div.toolbarPanelLinkSelectedLink { - cursor: pointer; - color: black; - margin: 1px; - cursor: pointer; - font-size: 12px; - padding: 5px 10px; - font-weight: bold; -} - -div.toolbarPanelLink:hover, div.toolbarPanelLinkSelectedLink { - cursor: pointer; - background-color: #efefef; -} div#mindplot { position: relative; @@ -300,10 +90,6 @@ div#mindplot { border: 0; } -div#workspaceContainer { - /*background: url(../images/grid.gif) bottom left repeat !important;*/ -} - div#small_error_icon { padding-left: 18px; min-height: 16px; @@ -336,29 +122,6 @@ div#small_error_icon { box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2); } -.toolbarPaneTip { - background-color: rgb(228, 226, 210); - padding: 5px 5px; - color: #f5f5f5; - /*font-weight: bold;*/ - /*width: 100px;*/ - font-size: 11px; - -moz-border-radius: 60px; - -webkit-border-radius: 6px; - border-radius: 6px; - box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.2); - border: 3px double rgb(190, 190, 190); -} - -.toolbarTip { - background-color: #000000; - padding: 5px 5px; - color: #f5f5f5; - /*font-weight: bold;*/ - /*width: 100px;*/ - font-size: 11px; -} - /* */ .btn-primary { cursor: pointer; diff --git a/wise-editor/src/main/webapp/css/embedded.css b/wise-editor/src/main/webapp/css/embedded.css index a95fd159..e1912b88 100644 --- a/wise-editor/src/main/webapp/css/embedded.css +++ b/wise-editor/src/main/webapp/css/embedded.css @@ -9,21 +9,10 @@ html { height: 100px; } -#firstHeader { - width: 100%; -} - -#subHeader { - position: absolute; - width: 100%; - height: 55px; - top: 30px; -} - #loadingContainer { position: relative; top: 80px; - height: 120px; /*background: whitesmoke;*/ + height: 120px; background: #FEFEFE; opacity: .99; padding: 15px; @@ -63,6 +52,7 @@ div#embFooter { left: 0; border-top: 1px solid black; background: #E5E5E5; + font-family: Arial; } div#logo { @@ -123,31 +113,4 @@ div#mapDetails .title { font-weight: bold; margin-left: 10px; margin-right: 3px; -} - -.notesTip { - background-color: #dfcf3c; - padding: 5px 15px; - color: #666666; - /*font-weight: bold;*/ - /*width: 100px;*/ - font-size: 13px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2); -} - -.linkTip { - background-color: #dfcf3c; - padding: 5px 15px; - color: #666666; - /*font-weight: bold;*/ - /*width: 100px;*/ - font-size: 13px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2); -} - +} \ No newline at end of file diff --git a/wise-editor/src/main/webapp/css/header.less b/wise-editor/src/main/webapp/css/header.less index e4af7377..22350474 100644 --- a/wise-editor/src/main/webapp/css/header.less +++ b/wise-editor/src/main/webapp/css/header.less @@ -1,4 +1,6 @@ -@import "skin.less"; +@header-height : 75px; +@header-toolbar-height : 35px; +@header-info-height : @header-height - @header-toolbar-height; div#header { width: 100%; @@ -77,4 +79,6 @@ div#headerNotifier { /*margin-top:-34px;*/ display:none; /*right: 5px;*/ -} \ No newline at end of file +} + +@import "toolbar.less"; diff --git a/wise-editor/src/main/webapp/css/skin.less b/wise-editor/src/main/webapp/css/skin.less deleted file mode 120000 index 5771884f..00000000 --- a/wise-editor/src/main/webapp/css/skin.less +++ /dev/null @@ -1 +0,0 @@ -../../../../../wise-webapp/src/main/webapp/css/skin.less \ No newline at end of file diff --git a/wise-editor/src/main/webapp/css/toolbar.less b/wise-editor/src/main/webapp/css/toolbar.less index 95d30eb2..91f5c286 100644 --- a/wise-editor/src/main/webapp/css/toolbar.less +++ b/wise-editor/src/main/webapp/css/toolbar.less @@ -1,5 +1,3 @@ -@import "skin.less"; - div#toolbar { width: 100%; height: @header-toolbar-height; @@ -100,101 +98,52 @@ div#exportAnchor { left: 0; } -/*div#saveButton {*/ -/*background: url(../images/save.png) no-repeat center top;*/ -/*}*/ +/***************************************************************************************************/ +/* Other toolbar styles */ +/***************************************************************************************************/ +.toolbarTip { + background-color: #000000; + padding: 5px 5px; + color: #f5f5f5; + /*font-weight: bold;*/ + /*width: 100px;*/ + font-size: 11px; +} -/*div#undoEdition {*/ -/*background: url(../images/undo.png) no-repeat center top;*/ -/*}*/ +div#colorPalette { + border: 1px solid #bbb4d6; + display: none; + position: absolute; + z-index: 4; + width: 160px; + top: 89px; +} -/*div#redoEdition {*/ -/*background: url(../images/redo.png) no-repeat center top;*/ -/*}*/ +div.toolbarPanelLink, div.toolbarPanelLinkSelectedLink { + cursor: pointer; + color: black; + margin: 1px; + cursor: pointer; + font-size: 12px; + padding: 5px 10px; + font-weight: bold; +} -/*div#export {*/ -/*background: url(../images/export.png) no-repeat center top;*/ -/*}*/ +div.toolbarPanelLink:hover, div.toolbarPanelLinkSelectedLink { + cursor: pointer; + background-color: #efefef; +} -/*div#zoomIn {*/ -/*background: url(../images/zoom-in.png) no-repeat center top;*/ -/*}*/ - -/*div#zoomOut {*/ -/*background: url(../images/zoom-out.png) no-repeat center top;*/ -/*}*/ - -/*div#addTopic {*/ -/*background: url(../images/topic-add.png) no-repeat center top;*/ -/*}*/ - -/*div#deleteTopic {*/ -/*background: url(../images/topic-delete.png) no-repeat center top;*/ -/*}*/ - -/*div#topicColor {*/ -/*background: url(../images/topic-color.png) no-repeat center top;*/ -/*}*/ - -/*div#topicIcon {*/ -/*background: url(../images/topic-icon.png) no-repeat center top;*/ -/*}*/ - -/*div#topicNote {*/ -/*background: url(../images/note.png) no-repeat center top;*/ -/*}*/ - -/*div#topicNote {*/ -/*background: url(../images/topic-icon.png) no-repeat center top;*/ -/*z-index: 4;*/ -/*}*/ - -/*div#topicLink {*/ -/*background: url(../images/topic-link.png) no-repeat center top;*/ -/*z-index: 4;*/ -/*}*/ - -/*div#topicNote {*/ -/*background-image: url(../images/note.png);*/ -/*z-index: 4;*/ -/*}*/ - -/*div#topicBorder {*/ -/*background: url(../images/topic-border.png) no-repeat center top;*/ -/*}*/ - -/*div#fontFamily {*/ -/*background: url(../images/font-type.png) no-repeat center top;*/ -/*}*/ - -/*div#topicShape {*/ -/*background: url(../images/topic-shape.png) no-repeat center top;*/ -/*}*/ - -/*div#fontBold {*/ -/*background: url(../images/font-bold.png) no-repeat center top;*/ -/*}*/ - -/*div#fontItalic {*/ -/*background: url(../images/font-italic.png) no-repeat center top;*/ -/*}*/ - -/*div#fontColor {*/ -/*background: url(../images/font-color.png) no-repeat center top;*/ -/*}*/ - -/*div#fontSize {*/ -/*background: url(../images/font-size.png) no-repeat center top;*/ -/*}*/ - -/*div#shareIt {*/ -/*background: url(../images/share.png) no-repeat center top;*/ -/*}*/ - -/*div#publishIt {*/ -/*background: url(../images/publish.png) no-repeat center top;*/ -/*}*/ - -/*div#tagIt {*/ -/*background: url(../images/tag.png) no-repeat center top;*/ -/*}*/ \ No newline at end of file +.toolbarPaneTip { + background-color: rgb(228, 226, 210); + padding: 5px 5px; + color: #f5f5f5; + /*font-weight: bold;*/ + /*width: 100px;*/ + font-size: 11px; + -moz-border-radius: 60px; + -webkit-border-radius: 6px; + border-radius: 6px; + box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.2); + border: 3px double rgb(190, 190, 190); +} \ No newline at end of file diff --git a/wise-editor/src/main/webapp/css/widget/skin2.less b/wise-editor/src/main/webapp/css/widget/skin2.less new file mode 100644 index 00000000..57e8771a --- /dev/null +++ b/wise-editor/src/main/webapp/css/widget/skin2.less @@ -0,0 +1,3 @@ +@header-height : 75px; +@header-toolbar-height : 35px; +@header-info-height : @header-height - @header-toolbar-height; \ No newline at end of file diff --git a/wise-editor/src/main/webapp/html/container.html b/wise-editor/src/main/webapp/html/container.html new file mode 100644 index 00000000..2263761a --- /dev/null +++ b/wise-editor/src/main/webapp/html/container.html @@ -0,0 +1,23 @@ + + + + + WiseMapping - Embedded Sample + + + + + + + + + +

Embedded editor sample

+ +

+ +
+ +
+ + diff --git a/wise-editor/src/main/webapp/html/editor.html b/wise-editor/src/main/webapp/html/editor.html index 301e5f81..97068713 100644 --- a/wise-editor/src/main/webapp/html/editor.html +++ b/wise-editor/src/main/webapp/html/editor.html @@ -20,32 +20,28 @@