diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js
index 426a5851..d513d2e6 100644
--- a/mindplot/src/main/javascript/widget/Menu.js
+++ b/mindplot/src/main/javascript/widget/Menu.js
@@ -349,18 +349,10 @@ mindplot.widget.Menu = new Class({
var shareElem = $('#shareIt');
if (shareElem) {
this._addButton('shareIt', false, false, function () {
- var reqDialog = new MooDialog.Request('c/iframeWrapper?url=c/maps/' + mapId + "/sharef", null,
- {'class': 'modalDialog shareModalDialog',
+ BootstrapDialog.Request.active = new BootstrapDialog.Request('c/maps/' + mapId + "/sharef", $msg('COLLABORATE'), {
closeButton: true,
- destroyOnClose: true,
- title: $msg('COLLABORATE')
- });
- reqDialog.setRequestOptions({
- onRequest: function () {
- reqDialog.setContent($msg('LOADING'));
- }
+ cancelButton: true
});
- MooDialog.Request.active = reqDialog;
});
this._registerTooltip('shareIt', $msg('COLLABORATE'));
@@ -369,19 +361,10 @@ mindplot.widget.Menu = new Class({
var publishElem = $('#publishIt');
if (publishElem) {
this._addButton('publishIt', false, false, function () {
- var reqDialog = new MooDialog.Request('c/iframeWrapper?url=c/maps/' + mapId + "/publishf", null,
- {'class': 'modalDialog publishModalDialog',
+ BootstrapDialog.Request.active = new BootstrapDialog.Request('c/maps/' + mapId + "/publishf", $msg('PUBLISH'), {
closeButton: true,
- destroyOnClose: true,
- title: $msg('PUBLISH')
- });
- reqDialog.setRequestOptions({
- onRequest: function () {
- reqDialog.setContent($msg('LOADING'));
- }
+ cancelButton: true
});
- MooDialog.Request.active = reqDialog;
-
});
this._registerTooltip('publishIt', $msg('PUBLISH'));
}
@@ -390,16 +373,9 @@ mindplot.widget.Menu = new Class({
if (historyElem) {
this._addButton('history', false, false, function () {
- var reqDialog = new MooDialog.Request('c/iframeWrapper?url=c/maps/' + mapId + "/historyf", null,
- {'class': 'modalDialog historyModalDialog',
- closeButton: true,
- destroyOnClose: true,
- title: $msg('HISTORY')
- });
- reqDialog.setRequestOptions({
- onRequest: function () {
- reqDialog.setContent($msg('LOADING'));
- }
+ BootstrapDialog.Request.active = new BootstrapDialog.Request('c/maps/' + mapId + "/historyf", $msg('HISTORY'), {
+ closeButton: true,
+ cancelButton: true
});
});
this._registerTooltip('history', $msg('HISTORY'));
@@ -412,18 +388,10 @@ mindplot.widget.Menu = new Class({
if (keyboardShortcut) {
keyboardShortcut.bind('click', function (event) {
- var reqDialog = new MooDialog.Request('c/keyboard', null,
- {'class': 'modalDialog keyboardModalDialog',
- closeButton: true,
- destroyOnClose: true,
- title: $msg('SHORTCUTS')
- });
- reqDialog.setRequestOptions({
- onRequest: function () {
- reqDialog.setContent($msg('LOADING'));
- }
+ BootstrapDialog.Request.active = new BootstrapDialog.Request('c/keyboard', $msg('SHORTCUTS'), {
+ closeButton: true,
+ cancelButton: true
});
- MooDialog.Request.active = reqDialog;
event.preventDefault();
});
}
diff --git a/wise-webapp/src/main/webapp/jsp/init.jsp b/wise-webapp/src/main/webapp/jsp/init.jsp
index 4ab7e2a8..e2ef4252 100644
--- a/wise-webapp/src/main/webapp/jsp/init.jsp
+++ b/wise-webapp/src/main/webapp/jsp/init.jsp
@@ -5,3 +5,4 @@
<%
request.setAttribute("principal", com.wisemapping.security.Utils.getUser());
%>
+<%@include file="/jsp/style.jsp" %>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
index 965fbd51..db49cc45 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
@@ -78,6 +78,12 @@
+