diff --git a/mindplot/pom.xml b/mindplot/pom.xml index c66e1b16..a538c40c 100644 --- a/mindplot/pom.xml +++ b/mindplot/pom.xml @@ -56,6 +56,8 @@ files="Overlay.js"/> + diff --git a/mindplot/src/main/javascript/libraries/moodialog/MooDialog.Request.js b/mindplot/src/main/javascript/libraries/moodialog/MooDialog.Request.js index 3dd3018a..a0c828c0 100644 --- a/mindplot/src/main/javascript/libraries/moodialog/MooDialog.Request.js +++ b/mindplot/src/main/javascript/libraries/moodialog/MooDialog.Request.js @@ -1,37 +1,36 @@ /* ---- -name: MooDialog.Request -description: Loads Data into a Dialog with Request -authors: Arian Stolwijk -license: MIT-style license -requires: [MooDialog, Core/Request.HTML] -provides: MooDialog.Request -... -*/ + --- + name: MooDialog.Request + description: Loads Data into a Dialog with Request + authors: Arian Stolwijk + license: MIT-style license + requires: [MooDialog, Core/Request.HTML] + provides: MooDialog.Request + ... + */ MooDialog.Request = new Class({ - Extends: MooDialog, + Extends: MooDialog, - initialize: function(url, requestOptions, options){ - this.parent(options); - this.requestOptions = requestOptions || {}; + initialize: function(url, requestOptions, options) { + this.parent(options); + this.requestOptions = requestOptions || {method:'get'}; + this.requestOptions.url = url; + this.addEvent('open', function() { - this.addEvent('open', function(){ - var request = new Request.HTML(this.requestOptions).addEvent('success', function(text){ - this.setContent(text); - }.bind(this)).send({ - url: url - }); - }.bind(this)); + var request = new Request.HTML(this.requestOptions).addEvent('success', function(text) { + this.setContent(text); + }.bind(this)).send(); + }.bind(this)); - if (this.options.autoOpen) this.open(); + if (this.options.autoOpen) this.open(); }, - setRequestOptions: function(options){ - this.requestOptions = Object.merge(this.requestOptions, options); - return this; - } + setRequestOptions: function(options) { + this.requestOptions = Object.merge(this.requestOptions, options); + return this; + } }); diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index be3d05c5..703cf65e 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -17,7 +17,7 @@ */ mindplot.widget.Menu = new Class({ - initialize : function(designer, containerId, readOnly) { + initialize : function(designer, containerId, mapId, readOnly) { $assert(designer, "designer can not be null"); $assert(containerId, "containerId can not be null"); var baseUrl = "../css/widget"; @@ -223,17 +223,14 @@ mindplot.widget.Menu = new Class({ designer.changeFontStyle(); }); - var saveElem = $('saveButton'); + var saveElem = $('save'); if (saveElem) { saveElem.addEvent('click', function() { if (!readOnly) { - $('saveButton').setStyle('cursor', 'wait'); + saveElem.setStyle('cursor', 'wait'); (function() { designer.save(function() { -// var monitor = core.Monitor.getInstance(); -// monitor.logMessage('Save completed successfully'); - saveElem.setStyle('cursor', 'pointer'); }, true); }).delay(1); @@ -248,7 +245,7 @@ mindplot.widget.Menu = new Class({ }); } - var discartElem = $('discartElem'); + var discartElem = $('discart'); if (discartElem) { discartElem.addEvent('click', function() { @@ -262,27 +259,31 @@ mindplot.widget.Menu = new Class({ }); } - if (readOnly) { - $('tagIt').addEvent('click', function(event) { - new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.', - { - 'window': {theme:Windoo.Themes.wise, - title:'' - } - }); + var tagElem = $('tagIt'); + if (tagElem) { + tagElem.addEvent('click', function(event) { + var reqDialog = new MooDialog.Request('../c/tags.htm?mapId=' + mapId, null, {'class': 'MooDialogBig'}); +// var reqDialog = new MooDialog.Request("embeddde.html",null,{'class': 'MooDialogBig'}); + reqDialog.setRequestOptions({ + onRequest: function() { + reqDialog.setContent('loading...'); + } + }); + }); + } + + var shareElem = $('shareIt'); + if (shareElem) { + shareElem.addEvent('click', function() { - $('shareIt').addEvent('click', function(event) { - new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.', - { - 'window': {theme:Windoo.Themes.wise, - title:'' - } - }); }); + } + var publishElem = $('publishIt'); + if (publishElem) { $('publishIt').addEvent('click', function(event) { new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.', { @@ -292,8 +293,10 @@ mindplot.widget.Menu = new Class({ }); }); - - $('history').addEvent('click', function(event) { + } + var historyElem = $('history'); + if (historyElem) { + historyElem.addEvent('click', function(event) { new Windoo.Confirm('This option is not enabled in try mode. You must by signed in order to execute this action.', { 'window': {theme:Windoo.Themes.wise, @@ -302,7 +305,6 @@ mindplot.widget.Menu = new Class({ }); }); - } this._registerEvents(designer); diff --git a/mindplot/src/main/javascript/widget/TopicShapePanel.js b/mindplot/src/main/javascript/widget/TopicShapePanel.js index f6369f24..4b111019 100644 --- a/mindplot/src/main/javascript/widget/TopicShapePanel.js +++ b/mindplot/src/main/javascript/widget/TopicShapePanel.js @@ -26,10 +26,10 @@ mindplot.widget.TopicShapePanel = new Class({ var content = new Element("div", {'class':'toolbarPanel','id':'topicShapePanel'}); content.innerHTML = '' + - '
Rectangle
' + - '
Rounded Rectangle
' + - '
Line
' + - ''; + '
Rectangle
' + + '
Rounded Rectangle
' + + '
Line
' + + '
'; return content; diff --git a/wise-doc/src/main/webapp/css/editor2.css b/wise-doc/src/main/webapp/css/editor2.css index e1197e3c..09c54e1c 100644 --- a/wise-doc/src/main/webapp/css/editor2.css +++ b/wise-doc/src/main/webapp/css/editor2.css @@ -312,7 +312,6 @@ div#toolbar { background-image: -moz-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); background-image: -webkit-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); background-image: -ms-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); - background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.47, rgb(229, 227, 209)), color-stop(0.87, rgb(252, 250, 237))); border-bottom: 3px double rgb(190, 190, 190); border-top: 1px solid rgb(190, 190, 190); @@ -541,7 +540,11 @@ div.toolbarPanelLink, div.toolbarPanelLinkSelectedLink { margin: 1px; cursor: pointer; font-size: 12px; - padding: 5px 15px; + padding: 5px 10px; + font-weight: bold; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } div.toolbarPanelLink:hover, div.toolbarPanelLinkSelectedLink { @@ -693,4 +696,36 @@ div#small_error_icon { .btn-secondary:hover { background-position: 0 -15px; text-decoration: none; +} + +/** */ + +.MooDialogBig { + position: fixed; + top: 50%; + left: 50%; + z-index: 11000; + width: 400px; + margin: -250px 0 0 -250px; + background-color: #ffffff; + border: 1px solid #999; + border: 1px solid rgba(0, 0, 0, 0.3); + *border: 1px solid #999; + /* IE6-7 */ + + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; + padding: 30px; +} + + +.MooDialogBig .content { + height: 300px; } \ No newline at end of file diff --git a/wise-doc/src/main/webapp/html/editor.html b/wise-doc/src/main/webapp/html/editor.html index bcef42ce..86d9fde7 100644 --- a/wise-doc/src/main/webapp/html/editor.html +++ b/wise-doc/src/main/webapp/html/editor.html @@ -11,13 +11,15 @@ - + + + - - - -
hola
- - - - \ No newline at end of file diff --git a/wise-doc/src/main/webapp/js/editor.js b/wise-doc/src/main/webapp/js/editor.js index 3496d6e2..2cd77e0b 100644 --- a/wise-doc/src/main/webapp/js/editor.js +++ b/wise-doc/src/main/webapp/js/editor.js @@ -33,7 +33,7 @@ function buildDesigner() { width: parseInt(window.innerWidth) }); - var menu = new mindplot.widget.Menu(designer, 'toolbar'); + var menu = new mindplot.widget.Menu(designer, 'toolbar',mapId); // If a node has focus, focus can be move to another node using the keys. designer._cleanScreen = function() { diff --git a/wise-doc/src/main/webapp/nicons/iconitos-separados.psd b/wise-doc/src/main/webapp/nicons/iconitos-separados.psd deleted file mode 100644 index 222e2263..00000000 Binary files a/wise-doc/src/main/webapp/nicons/iconitos-separados.psd and /dev/null differ diff --git a/wise-doc/src/main/webapp/nicons/shape-circle.png b/wise-doc/src/main/webapp/nicons/shape-circle.png new file mode 100644 index 00000000..cae3eead Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/shape-circle.png differ diff --git a/wise-doc/src/main/webapp/nicons/shape-rectangle-round.png b/wise-doc/src/main/webapp/nicons/shape-rectangle-round.png new file mode 100644 index 00000000..c34e767c Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/shape-rectangle-round.png differ diff --git a/wise-doc/src/main/webapp/nicons/shape-rectangle.png b/wise-doc/src/main/webapp/nicons/shape-rectangle.png new file mode 100644 index 00000000..9f05ac23 Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/shape-rectangle.png differ diff --git a/wise-webapp/src/main/webapp/css/common.css b/wise-webapp/src/main/webapp/css/common.css index 5c24311d..a7996268 100644 --- a/wise-webapp/src/main/webapp/css/common.css +++ b/wise-webapp/src/main/webapp/css/common.css @@ -187,11 +187,11 @@ h4 { #headerLogo { margin-top: 8px; height: 80px; - width: 134px; - background: url("../images/logo-small.png") no-repeat; + width: 160px; + background: url("../nicons/logo-medium.png") no-repeat; position: absolute; top: 0; - left: 0; + left: -50px; } #headerSlogan { diff --git a/wise-webapp/src/main/webapp/css/commonOldIE.css b/wise-webapp/src/main/webapp/css/commonOldIE.css deleted file mode 100644 index 0065be0f..00000000 --- a/wise-webapp/src/main/webapp/css/commonOldIE.css +++ /dev/null @@ -1,15 +0,0 @@ -#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/editor.css b/wise-webapp/src/main/webapp/css/editor.css deleted file mode 100644 index 22cdb889..00000000 --- a/wise-webapp/src/main/webapp/css/editor.css +++ /dev/null @@ -1,729 +0,0 @@ -@import "common.css"; -@import "widget/lightbox.css"; -@import "libraries/moodialog/css/MooDialog.css"; - -html { - overflow: hidden; -} - -body { - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -o-user-select: none; - user-select: none; -} - -#waitDialog { - position: absolute; - top: 10px; - left: 10px; - height: 200px; -} - -#firstHeader { - width: 100%; -} - -#subHeader { - position: absolute; - width: 100%; - height: 55px; - top: 30px; -} - -#waitingContainer, #errorContainer { - position: relative; - top: 80px; - height: 120px; /*background: whitesmoke;*/ - background: #FEFEFE; - opacity: .99; - padding: 15px; - width: 100%; - border: 1px solid; - border-color: #a9a9a9; - -} - -#errorContainer { - width: 400px; - border: 1px solid red; -} - -#waitingContainer .loadingText { - position: relative; - top: 50%; - margin-top: -35px; - font-size: 30px; - font-weight: bold; - vertical-align: text-bottom; - height: 30px; - float: left; -} - -#errorContainer .loadingText { - position: relative; - top: 50%; - margin-top: -80px; - font-size: 15px; - font-weight: bold; - vertical-align: text-bottom; - height: 30px; - float: right; - padding-left: 120px; -} - -#waitingContainer .loadingIcon { - position: relative; - background: url(../images/loadingIcon.gif) no-repeat; - top: 50%; - margin-top: -65px; - height: 100px; - width: 121px; - float: left; - clear: both; -} - -#errorContainer .loadingIcon { - position: relative; - background: url(../images/errorIcon.png) no-repeat; - top: 50%; - margin-top: -65px; - height: 100px; - width: 121px; - float: left; - clear: both; -} - -#infoContainer { - float: left; -} - -#infoContainer { - float: left; - padding-left: 5px; -} - -#title { - position: relative; - left: 120px; - top: 80px; -} - -#operationsContainer { - font-size: 12px; - float: right; - padding: 0 5px; -} - -#operationsContainer a { - padding: 0 5px; -} - -#user { - font-weight: bold; - margin-right: 5px; -} - -#toolbar { - width: 100%; - height: 25px; - color: #ffffff; - border-bottom: 2px solid black; - position: absolute; - top: 35px; -} - -div#toolbar .buttonContainer { - height: 44px; - float: left; - color: black; -} - -.buttonContainer fieldset { - border: 1px solid #BBB4D6; - padding: 2px; - margin: 1px; - padding-bottom: 4px; -} - -.buttonContainer legend { - padding: 0.2em 0.5em; - border: 1px solid #BBB4D6; - background-color: #F5F5F5; - color: #BBB4D6; - font-size: 11px; - text-align: right; - margin: 0; - -moz-margin-start: 7px; - -moz-margin-end: 7px; -} - -div#toolbar .buttonOn, div#toolbar .buttonOff, div#toolbar .buttonActive, div#toolbar .buttonOn:hover { - width: 32px; - height: 36px; - float: left; - margin: 0 2px 2px 2px; - text-align: center; -} - -div#toolbar .buttonOn:hover, div#toolbar .buttonActive { - margin: 0 1px; - cursor: pointer; - border: 1px solid black; - border-top-color: white; - border-left-color: white; - cursor: pointer; -} - -div#toolbar .buttonOff { - opacity: 0.4; -} -` -div#toolbar .button img { - width: 30px; - height: 30px; - border: 0; -} - -div#toolbar .toolbarLabel { - position: relative; - top: 55%; - text-align: center; - width: 34px; - height: 36px; - font-size: 10px; -} - -.mapSeparator { - width: 1px; - height: 20px; - background-color: #166D66; - float: left; - margin: 5px 3px; -} - -div#file, div#zoom, div#node, div#font, div#share { - position: absolute; - top: -6px; - left: 3px; -} - -div#zoom { - left: 229px; -} - -div#node { - left: 311px; -} - -div#font { - left: 679px; /*left:581px;*/ -} - -div#share { - left: 874px; /*left:777px;*/ -} - -div#saveButton { - background: url(../images/save.png) no-repeat center top; -} - -div#discardButton { - background: url(../images/close.png) no-repeat center top; -} - -div#history { - background: url(../images/history.png) no-repeat center top; -} - -div#print { - background: url(../images/file_printer.png) no-repeat center top; -} - -div#undoEdition { - background: url(../images/file_undo_dis.png) no-repeat center top; -} - -div#redoEdition { - background: url(../images/file_redo_dis.png) no-repeat center top; -} - -#export { - background: url(../images/file_export.png) no-repeat center top; - position: relative; -} - -#exportAnchor { - position: absolute; - width: 100%; - height: 100%; - top: 0; - left: 0; -} - -div#zoomIn { - background: url(../images/zoom_in.png) no-repeat center top; -} - -#zoomOut { - background: url(../images/zoom_out.png) no-repeat center top; -} - -#addTopic { - background: url(../images/topic_add.png) no-repeat center top; -} - -#deleteTopic { - background: url(../images/topic_delete.png) no-repeat center top; -} - -div#topicColor { - background: url(../images/topic_bgcolor.png) no-repeat center top; - z-index: 4; -} - -div#topicIcon { - background: url(../images/topic_icon.png) no-repeat center top; - z-index: 4; -} - -div#topicNote { - background: url(../images/note.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; -} - -#topicBorder { - background: url(../images/topic_border.png) no-repeat center top; - width: 30px; -} - -#fontFamily { - background: url(../images/font_type.png) no-repeat center top; -} - -#topicShape { - background: url(../images/topic_shape.png) no-repeat center top; - width: 30px; -} - -#fontBold { - background: url(../images/font_bold.png) no-repeat center top; -} - -#fontItalic { - background: url(../images/font_italic.png) no-repeat center top; -} - -div#fontColor { - background: url(../images/font_color.png) no-repeat center top; - z-index: 4; -} - -#fontSize { - float: left; - background: url(../images/font_size.png) no-repeat center top; -} - -#font-size { - font-size: 10px; -} - -.wiseToolbarButton { - float: left; - height: 16px; - cursor: pointer; - font-size: 10px; - font-weight: bold; - margin-right: 15px; -} - -#shareIt { - background: url(../images/collab_share.png) no-repeat center top; -} - -#publishIt { - background: url(../images/collab_publish.png) no-repeat center top; -} - -#tagIt { - background: url(../images/collab_tag.png) no-repeat center top; -} - -#colorPalette { - border: 1px solid #bbb4d6; - display: none; - position: absolute; - z-index: 4; - width: 160px; - top: 89px; -} - -#paletteHeader { - background-color: #E5E5E5; - height: 4px; -} - -.toolbarPanel { - color: black; - border-color: #CCC #666 #666 #CCC; - border-style: solid; - border-width: 1px; - background: #E5E5E5; - display: none; - position: absolute; - z-index: 4; - top: 71px; - text-align: left; -} - -div.toolbarPanelLink { - cursor: pointer; - font-size: 14px; - color: black; - font-weight: bold; - padding: 0 3px 0 4px; - margin: 1px; -} - -div.toolbarPanelLink { - cursor: pointer; - font-size: 12px; - font-weight: bold; - padding: 0 3px 0 4px; - margin: 1px; -} - -div.toolbarPanelLink:hover { - cursor: pointer; - font-weight: bold; - background-color: #c3def5; -} - -div.toolbarPanelLinkSelectedLink { - cursor: pointer; - color: white; - font-weight: bold; - padding: 0 3px 0 4px; - margin: 1px; - background-color: #c3def5; -} - -div#actionsContainer { - position: absolute; - z-index: 50; - top: 35px; - width: 190px; - right: 0; - margin: 10px; - float: left; -} - -#actionsContainer .button { - float: right; - font-size: 12px; - font-weight: bold; - white-space: nowrap; - color: #ffffff; - cursor: pointer; - margin: 2px; - z-index: 4; -} - -#actionsContainer .button:hover { - color: blue; -} - -#actionsContainer .mainButton { - float: right; - font-size: 12px; - font-weight: bold; - white-space: nowrap; - color: #ffffff; - cursor: pointer; - margin: 2px; - z-index: 4; -} - -#actionsContainer a { - text-decoration: none; -} - -#actionsContainer .buttonStart { - width: 6px; - height: 25px; - background: url(../images/btnStart2.png) no-repeat left top; - float: left; -} - -#actionsContainer .buttonBody { - background: url(../images/btnBody2.png); - float: left; - height: 18px; - padding: 5px 5px 0; - text-align: center; - color: black; -} - -#actionsContainer .buttonEnd { - width: 7px; - height: 23px; - background: url(../images/btnEnd2.png) no-repeat right top; - float: left; -} - -/* ------------- Footer Styles -------------------------*/ -div#footerEditor { - position: absolute; - height: 60px; - width: 100%; - background: #E5E5E5; - border-top: 1px solid #bbb4d6; - bottom: 0; -} - -#logo { - height: 50px; - width: 80px; - float: right; - margin: 5px; - background: url(../images/logo-vsmall.png) no-repeat right top; -} - -#footerEditor .msgLoggerContainer { - position: relative; - width: 550px; - height: 36px; - left: 50%; - margin-left: -300px; - top: 10px; - opacity: 0; - visibility: hidden; -} - -div#msgStart { - float: left; - height: 36px; - width: 16px; - background: url(../images/footerStart.png) no-repeat right top; -} - -div#msgEnd { - float: left; - height: 36px; - width: 16px; - background: url(../images/footerEnd.png) no-repeat right top; - -} - -div#msgLogger { - float: left; - height: 36px; - width: 500px; - background: url(../images/footerBody.png) repeat-x right top; - text-align: center; - white-space: nowrap; - padding: 5px; - font-size: 13px; - font-weight: bold; -} - -/** Tab labels */ -div#tabsHolder { - width: 100%; - height: 20px; -} - -div#tabs { - float: left; -} - -div.tabContent { - clear: left; - width: 100%; - height: 63px; - border-bottom: 1px solid #bbb4d6; - border-top: 1px solid #bbb4d6; - background: #E5E5E5; - display: none; - position: absolute; - left: 0; -} - -ol#toc { - height: 2em; - list-style: none; - margin: 0; - padding: 0; -} - -ol#toc li { - float: left; - margin: 0 1px 0 0; - border: 0; -} - -ol#toc a { - background: #fff url(../images/tab4.png); - color: #008; - display: block; - float: left; - height: 25px; - padding-left: 10px; - text-decoration: none; -} - -ol#toc a:hover { - background-color: #fff; - background-position: 0 -121px; -} - -ol#toc a:hover span { - background-position: 100% -121px; -} - -ol#toc li.current a { - background-color: #fff; - background-position: 0 -61px; - color: #008; - font-weight: bold; -} - -ol#toc li.current span { - background-position: 100% -61px; -} - -ol#toc span { - background: #fff url(../images/tab4.png) 100% 0; - display: block; - line-height: 2em; - padding-right: 10px; -} - -#mindplot { - position: relative; - top: 103px; - left: 0; - width: 100%; - border: 0; -} - -#workspaceContainer { - background: url(../images/grid.gif) bottom left repeat !important; -} - -span#lastSaved { - font-size: 10px; -} - -.label { - border: none; - color: #ffffff; - font-weight: bold; -} - -.label :hover { - cursor: pointer; -} - -#tryEditorWarning { - position: absolute; - margin: 20px auto; - width: 300px; - right: 10px; - top: 100px; - padding: 20px; - opacity: 0.9; - cursor: move; - background-color: #69686F; - filter: alpha(opacity = 90); - color: #000c8f; -} - -#tryEditorWarning a { - color: white; - font-weight: bold; -} - -#tryEditorWarning h1 { - color: #f5f5f5; - font-weight: bold; - margin-bottom: 5px; - font-size: 15px; -} - -div#helpContainer { - position: absolute; - margin: 20px auto; - z-index: 3; - opacity: 0.9; - width: 220px; - top: 100px; - left: 10px; - color: #000c8f; - padding: 20px; - cursor: move; - background-color: #69686F; - filter: alpha(opacity = 90); -} - -div#helpContent h1 { - font-weight: bold; - color: #f5f5f5; - font-size: 15px; -} - -div#helpContent h2 { - font-weight: bold; - padding: 20px 0 10px 0; - color: #bfbfbf; -} - -div.close { - position: absolute; - height: 12px; - width: 12px; - top: 7px; - right: 10px; - cursor: pointer; - background: url(../images/close12_1.gif) bottom left no-repeat !important; -} - -div#helpContent li { - font-family: arial, helvetica, sans-serif; - list-style-type: disc; - margin-left: 12px; - font-size: 11px; -} - -div#small_error_icon { - padding-left: 18px; - min-height: 16px; - background: url(../images/error_icon.png) bottom left no-repeat !important; -} - -div#toolbar .topicRelation { - width: 56px; - background: url(../images/topic_relationship.png) no-repeat center top; - z-index: 4; -} - -div#toolbar .topicRelation:hover { - width: 56px; - background: url(../images/topic_relationship.png) no-repeat center top; - z-index: 4; -} - -div#toolbar .relationshiplabel { - width: 56px; -} diff --git a/wise-webapp/src/main/webapp/css/editor2.css b/wise-webapp/src/main/webapp/css/editor2.css index 740abee3..8950615f 100644 --- a/wise-webapp/src/main/webapp/css/editor2.css +++ b/wise-webapp/src/main/webapp/css/editor2.css @@ -1,7 +1,9 @@ -@import "widget/lightbox.css"; -@import "libraries/moodialog/css/MooDialog.css"; - +@import "../css/widget/lightbox.css"; +@import "../css/libraries/moodialog/css/MooDialog.css"; +@header-height : 75px; +@header-toolbar-height : 35px; +@header-info-height : @header-height - @header-toolbar-height; /* Common Default Style */ html { @@ -246,7 +248,7 @@ h4 { div#header { width: 100%; - height: 75px; + height: @header-height; background: #393939; /* Old browsers */ background: -moz-linear-gradient(top, #393939 0%, #000000 100%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #393939), color-stop(100%, #000000)); /* Chrome,Safari4+ */ @@ -265,7 +267,7 @@ div#headerLogo { div#headerInfo { width: 100%; - height: 45px; + height: @header-info-height; color: white; } @@ -288,7 +290,7 @@ div#headerActions a { div#headerMapTitle { width: 200px; - height:(45 ) - 13; + height:(@header-info-height ) - 13; text-align: left; padding-top: 13px; padding-left: 50px; @@ -298,7 +300,7 @@ div#headerMapTitle { } div#headerMapTitle span { - padding: 4px 50px; + padding: 4px 50px ; border: 1px solid rgb(90, 90, 90); background-color: rgb(45, 45, 45); -moz-border-radius: 3px; @@ -309,7 +311,7 @@ div#headerMapTitle span { div#toolbar { width: 100%; - height: 35px; + height: @header-toolbar-height; background-image: linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); background-image: -o-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); background-image: -moz-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); @@ -322,7 +324,7 @@ div#toolbar { } div#toolbar .buttonContainer { - height: 35px; + height: @header-toolbar-height; float: left; /*color: black;*/ /*border: 1px solid #BBB4D6;*/ @@ -525,7 +527,7 @@ div#colorPalette { /*.toolbarPanel {*/ /*z-index: 4;*/ -/*top: 75px;*/ +/*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);*/ @@ -544,7 +546,8 @@ div.toolbarPanelLink, div.toolbarPanelLinkSelectedLink { margin: 1px; cursor: pointer; font-size: 12px; - padding: 5px 15px; + padding: 5px 10px; + font-weight: bold; } div.toolbarPanelLink:hover, div.toolbarPanelLinkSelectedLink { @@ -696,4 +699,46 @@ div#small_error_icon { .btn-secondary:hover { background-position: 0 -15px; text-decoration: none; +} + +/** */ + +.MooDialogBig { + position: fixed; + top: 50%; + left: 50%; + z-index: 11000; + width: 400px; + margin: -250px 0 0 -250px; + background-color: #ffffff; + border: 1px solid #999; + border: 1px solid rgba(0, 0, 0, 0.3); + *border: 1px solid #999; + /* IE6-7 */ + + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; + padding: 30px; +} + + +.MooDialogBig .content { + height: 200px; +} + +.MooDialogBig h1 +{ + font-size: 14px; +} +.MooDialogBig h2 +{ + font-size: 14px; + margin: 5px; } \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/mymapsOldIE.css b/wise-webapp/src/main/webapp/css/mymapsOldIE.css deleted file mode 100644 index 14d7b06d..00000000 --- a/wise-webapp/src/main/webapp/css/mymapsOldIE.css +++ /dev/null @@ -1,71 +0,0 @@ -@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/wisehomeOldIE.css b/wise-webapp/src/main/webapp/css/wisehomeOldIE.css deleted file mode 100644 index 24668816..00000000 --- a/wise-webapp/src/main/webapp/css/wisehomeOldIE.css +++ /dev/null @@ -1,86 +0,0 @@ -@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/js/editor.js b/wise-webapp/src/main/webapp/js/editor.js index 058f35d1..feb6cc56 100644 --- a/wise-webapp/src/main/webapp/js/editor.js +++ b/wise-webapp/src/main/webapp/js/editor.js @@ -27,7 +27,7 @@ var designer = null; function setUpToolbar(designer, isTryMode) { - var menu = new mindplot.widget.Menu(designer, 'toolbar'); + var menu = new mindplot.widget.Menu(designer, 'toolbar', mapId); // Autosave ... if (!isTryMode) { diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 2c5f5a99..d3ecbe17 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -16,8 +16,9 @@ <spring:message code="SITE.TITLE"/> - ${mindmap.title} - - + + + @@ -27,18 +28,17 @@ + + - -