diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index 80bff79f..3752575d 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -327,6 +327,7 @@ mindplot.widget.Menu = new Class({ } }); }); + this._registerTooltip('tagIt', "Tag"); } var shareElem = $('shareIt'); @@ -345,6 +346,8 @@ mindplot.widget.Menu = new Class({ }); }); + this._registerTooltip('shareIt', "Collaborators"); + } var publishElem = $('publishIt'); @@ -363,6 +366,7 @@ mindplot.widget.Menu = new Class({ }); }); + this._registerTooltip('publishIt', "Publish"); } var historyElem = $('history'); @@ -381,6 +385,7 @@ mindplot.widget.Menu = new Class({ } }); }); + this._registerTooltip('history', "History"); } this._registerEvents(designer); diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/PublicViewController.java b/wise-webapp/src/main/java/com/wisemapping/controller/PublicViewController.java index 0f75d3df..be535277 100644 --- a/wise-webapp/src/main/java/com/wisemapping/controller/PublicViewController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/PublicViewController.java @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletResponse; import com.wisemapping.model.MindMap; public class PublicViewController extends BaseMultiActionController { - private static final String MAP_ID = "mapId"; protected ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception diff --git a/wise-webapp/src/main/webapp/js/menu.js b/wise-webapp/src/main/webapp/js/menu.js deleted file mode 100644 index 49389dda..00000000 --- a/wise-webapp/src/main/webapp/js/menu.js +++ /dev/null @@ -1,73 +0,0 @@ -/* -* Copyright [2011] [wisemapping] -* -* Licensed under WiseMapping Public License, Version 1.0 (the "License"). -* It is basically the Apache License, Version 2.0 (the "License") plus the -* "powered by wisemapping" text requirement on every single page; -* you may not use this file except in compliance with the License. -* You may obtain a copy of the license at -* -* http://www.wisemapping.org/license -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -var Menu = { - init: function () - { - $ES('.subMenu2', $('mydocs')).each(function(el) { - var parent = el.getParent(); - var button = $E('.button', parent); - if (button.getTag() == 'div') - { - el.setStyle('top', '25px'); - el.setStyle('left', '7px'); - } - button.addEvent('click', this.updateSubMenu.bindWithEvent(this, [button, el])); - button.state = "closed"; - }, this); - - this.currentElement = null; - this.currentItem = null; - $(document).addEvent('click', this.hide.bindWithEvent(this)); - }, - updateSubMenu: function(event, src, el) - { - if (src.state == "open") - { - el.setStyle("visibility", "hidden"); - src.state = "closed"; - this.currentElement = null; - this.currentItem = null; - } - else - { - if (this.currentElement != null) - { - this.hide.attempt(null, this); - } - this.currentElement = el; - this.currentItem = src; - el.setStyle("visibility", "visible"); - src.state = "open"; - } - if (event != null) - { - var evt = new Event(event); - evt.stopPropagation(); - } - }, - hide: function(event) - { - if (this.currentElement != null) - { - this.updateSubMenu.attempt([event, this.currentItem, this.currentElement], this); - } - } -}; - -Window.onDomReady(Menu.init.bind(Menu)); \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/toolbar.jsf b/wise-webapp/src/main/webapp/jsp/toolbar.jsf index 9ad32c2d..3fe7fe17 100644 --- a/wise-webapp/src/main/webapp/jsp/toolbar.jsf +++ b/wise-webapp/src/main/webapp/jsp/toolbar.jsf @@ -1,91 +1,91 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-