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](../images/shape-rectangle.png)
' +
- '![Rounded Rectangle](../images/shape-rectangle-rounded.png)
' +
- '![Line](../images/shape-line.png)
' +
- '';
+ '![Rectangle](../nicons/shape-rectangle.png)
' +
+ '![Rounded Rectangle](../nicons/shape-rectangle-round.png)
' +
+ '![Line](../nicons/shape-line.png)
' +
+ '![](../nicons/shape-circle.png)
';
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
-
-
-
-