diff --git a/.gitignore b/.gitignore index 13b5c4c9..1762a2b7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ wisemapping.log* .DS_Store target .idea +wise-webapp/src/main/webapp/react/* diff --git a/README.md b/README.md index bfea037e..acc9591c 100644 --- a/README.md +++ b/README.md @@ -8,50 +8,58 @@ The goal of this project is to provide a high quality product that can be deploy The following products must be installed: - * Java Development Kit 8 or higher ([http://www.oracle.com/technetwork/java/javase/downloads/index.html]) + * Java 11 to 16 * Maven 3.x or higher ([http://maven.apache.org/]) ### Compiling WiseMapping uses Maven as packaging and project management. It's composed of 5 maven sub-modules: - * core-js: Utilities JavaScript classes - * web2d: JavaScript 2D SVG abstraction library used by the mind map editor - * mindplot: JavaScript mindmap designer core - * wise-editor: Mindmap Editor standalone distribution + * wise-react: React font-end fetcher * wise-webapp: J2EE web application The full compilation of the project can be performed executing within : -`mvn package` +`export MAVEN_OPTS="--illegal-access=permit"` +`mvn clean install` -Once this command is execute, the file /wise-webapp/target/wisemapping*.war will be generated. +Once this command is executed, the file /wise-webapp/target/wisemapping*.war will be generated. + +### Local Development +The previously generated war can be deployed locally executing within the directory /wise-webapp the following command: + +`cd wise-webapp;mvn jetty:run-war` + +This will start the application on the URL: [http://localhost:8080/] using file based database. + +User: test@wisemapping.org +Password: test + +### Local Development - UI Integration + +In order to reduce the life-cycle to develop UI backend testing, you can do the following hack: + +* Clone [https://bitbucket.org/wisemapping/wisemapping-open-source/] and [https://bitbucket.org/wisemapping/wisemapping-frontend/] at the same top level directory +* Compile `WiseMapping Frontend` +* Compile `WiseMapping Open Source` +* Follow the Local Testing steps. ### Compiling and running with docker-compose Check out the [docker section](./docker/README.md) -### Testing -The previously generated war can be deployed locally executing within the directory /wise-webapp the following command: - -`cd wise-webapp;mvn jetty:run-war` - -This will start the application on the URL: [http://localhost:8080/] using file based database.. - -User: test@wisemapping.org -Password: test ## Running the JS only version -Start by creating the .zip file: +Start by creating the .zip file. `mvn assembly:assembly -Dmaven.test.skip=true` -To test the javascript frontend you then do: +To test the javascript frontend, install a simple http-server. - ruby -rwebrick -e 'WEBrick::HTTPServer.new(:Port=>8000,:DocumentRoot=>".").start' +`npm install -g http-server` -Now open a browser using the URL http://localhost:8000/wise-editor/src/main/webapp/ +Now open a browser using the URL http://localhost:8080/wise-editor/src/main/webapp/ ## Troubleshooting @@ -77,18 +85,18 @@ Now open a browser using the URL http://localhost:8000/wise-editor/src/main/weba ### Founders - * Pablo Luna * Paulo Veiga + * Pablo Luna -### Individual Controbutors +### Individual Contributors * Ezequiel Bergamaschi - * Claudio Barril ### Past Individual Contributors * Ignacio Manzano * Nicolas Damonte + * Claudio Barril ## License diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 6e5e5a54..3d77cb7d 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -14,7 +14,15 @@ pipelines: name: Build and Test caches: - maven + - node script: + - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.36.0/install.sh | bash + - . $HOME/.nvm/nvm.sh && nvm install node + - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2 || true + - export PATH=$HOME/.yarn/bin:$PATH + # Workaround for jaxb plugin bug on java 11 or higher. + - export MAVEN_OPTS="--illegal-access=permit" + - yarn --version - mvn -B verify --file pom.xml install after-script: # Collect checkstyle results, if any, and convert to Bitbucket Code Insights. @@ -25,3 +33,7 @@ pipelines: # Run a security scan for sensitive data. # See more security tools at https://bitbucket.org/product/features/pipelines/integrations?&category=security - pipe: atlassian/git-secrets-scan:0.4.3 + - step: + runs-on: self.hosted + script: echo hello + diff --git a/core-js/pom.xml b/core-js/pom.xml deleted file mode 100644 index 4ab4e1e6..00000000 --- a/core-js/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - 4.0.0 - core-js - jar - Core JavaScript Utils Libraries - - - org.wisemapping - wisemapping - ../pom.xml - 5.0.2-SNAPSHOT - - - scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git - - - - - - maven-antrun-plugin - - - merge-js-resources - generate-resources - - run - - - - - - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5 - - - com.github.searls - jasmine-maven-plugin - 1.3.1.5 - - - - test - - - - - - Functions.js - - - - - net.alchim31.maven - yuicompressor-maven-plugin - - - generate-resources - - compress - - - src/main/javascript/ - target/tmp/ - - - ${basedir}/target/classes/core.js - - ${basedir}/target/tmp/header-min.js - ${basedir}/target/tmp/Functions-min.js - ${basedir}/target/tmp/Utils-min.js - ${basedir}/../mindplot/src/main/javascript/Options.js - ${basedir}/../mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js - ${basedir}/../mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.Request.js - - - - true - false - true - - - - - - - diff --git a/core-js/src/main/javascript/Functions.js b/core-js/src/main/javascript/Functions.js deleted file mode 100644 index d6faa88d..00000000 --- a/core-js/src/main/javascript/Functions.js +++ /dev/null @@ -1,62 +0,0 @@ -/* - Function: $defined - Returns true if the passed in value/object is defined, that means is not null or undefined. - - Arguments: - obj - object to inspect - */ - -$defined = function (obj) { - return (obj != undefined); -}; - - -$assert = function (assert, message) { - if (!$defined(assert) || !assert) { - logStackTrace(); - console.log(message); - throw new Error(message); - } -}; - -Math.sign = function (value) { - return (value >= 0) ? 1 : -1; -}; - -function logStackTrace(exception) { - - if (!$defined(exception)) { - try { - throw Error("Unexpected Exception"); - } catch (e) { - exception = e; - } - } - var result = ""; - if (exception.stack) { //Firefox and Chrome... - result = exception.stack; - } - else if (window.opera && exception.message) { //Opera - result = exception.message; - } else { //IE and Safari - result = exception.sourceURL + ': ' + exception.line + "\n\n"; - - var currentFunction = arguments.callee.caller; - while (currentFunction) { - var fn = currentFunction.toString(); - result = result + "\n" + fn; - currentFunction = currentFunction.caller; - } - } - window.errorStack = result; - return result; -} - -// Support for Windows ... -if (!window.console) { - console = { - log:function (e) { - - } - }; -} \ No newline at end of file diff --git a/core-js/src/main/javascript/Utils.js b/core-js/src/main/javascript/Utils.js deleted file mode 100644 index 57e416f5..00000000 --- a/core-js/src/main/javascript/Utils.js +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -core.Utils = { - -}; - - -core.Utils.innerXML = function (node) { - // summary: - // Implementation of MS's innerXML function. - if ($defined(node.innerXML)) { - return node.innerXML; - // string - } else if ($defined(node.xml)) { - return node.xml; - // string - } else if ($defined(XMLSerializer)) { - return (new XMLSerializer()).serializeToString(node); - // string - } -}; - -/** - * Cross-browser implementation of creating an XML document object. - */ -core.Utils.createDocument = function () { - var doc = null; - if ($defined(window.ActiveXObject)) { - //http://blogs.msdn.com/b/xmlteam/archive/2006/10/23/using-the-right-version-of-msxml-in-internet-explorer.aspx - var progIDs = [ 'Msxml2.DOMDocument.6.0', 'Msxml2.DOMDocument.3.0']; - for (var i = 0; i < progIDs.length; i++) { - try { - doc = new ActiveXObject(progIDs[i]); - break; - } - catch (ex) { - } - } - } else if (window.document.implementation && window.document.implementation.createDocument) { - doc = window.document.implementation.createDocument("", "", null); - } - $assert(doc, "Parser could not be instantiated"); - - return doc; -}; \ No newline at end of file diff --git a/core-js/src/main/javascript/header.js b/core-js/src/main/javascript/header.js deleted file mode 100644 index d3284d3a..00000000 --- a/core-js/src/main/javascript/header.js +++ /dev/null @@ -1,19 +0,0 @@ -/* -* Copyright [2015] [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 core = {}; diff --git a/core-js/src/test/javascript/testSuite.js b/core-js/src/test/javascript/testSuite.js deleted file mode 100644 index 760d0aab..00000000 --- a/core-js/src/test/javascript/testSuite.js +++ /dev/null @@ -1,10 +0,0 @@ -describe("Functions suite test", function() { - it("$defined() test spec", function() { - var testVariable = undefined; - expect($defined(testVariable)).toBe(false); - testVariable = 1; - expect($defined(testVariable)).toBe(true); - testVariable = null; - expect($defined(testVariable)).toBe(false); - }); -}); diff --git a/mindplot/pom.xml b/mindplot/pom.xml deleted file mode 100644 index b2e2388e..00000000 --- a/mindplot/pom.xml +++ /dev/null @@ -1,427 +0,0 @@ - - - 4.0.0 - mindplot - jar - Mindmap Draw JavaScript Library - - - org.wisemapping - wisemapping - ../pom.xml - 5.0.2-SNAPSHOT - - - - - org.wisemapping - web2d - ${com.wisemapping.version} - runtime - - - - - - - jstd-maven-plugin google code repo - http://jstd-maven-plugin.googlecode.com/svn/maven2 - - - - - - - org.codehaus.gmaven - gmaven-plugin - 1.4 - - - - generate-resources - - execute - - - - def outdir = new File(project.basedir, 'src/main/javascript'); - if (project.packaging != 'pom') { - def dir = new File(project.basedir, 'src/main/resources/'); - - dir.eachFile { file -> - def matcher = file.name =~ /messages_(.+)\.properties/; - def lang = matcher[0][1]; - def outfile = new File(outdir, "MessageBundle_${lang}.js"); - println "Converting ${file.name} to ${outfile.name}"; - - outfile.withWriter('UTF-8') { out -> - out.writeLine "mindplot.Messages.BUNDLES['${lang.toLowerCase()}'] = { "; - file.eachLine('UTF-8') { line -> - if (line.trim() != "" && line[0] != '#') { - matcher = line =~ /(.+)=(.+)/; - out.writeLine("'${matcher[0][1]}' : \"${matcher[0][2]}\","); - } - } - out.writeLine("'DUMMY' : '' "); - out.writeLine "};" - } - } - } - - - - - - - maven-antrun-plugin - - - merge-js-resources - generate-resources - - run - - - - - - - - - - - - - - - - - - net.alchim31.maven - yuicompressor-maven-plugin - - - generate-resources - - compress - - - ${basedir}/src/main/javascript - ${basedir}/target/compress/ - true - - libraries/**/*.js - - - - ${project.build.directory}/classes/mindplot-min.js - ${basedir}/target/compress - - header.js - Events.js - Options.js - ${basedir}/../web2d/target/classes/web2d.svg-min.js - Messages.js - TopicEventDispatcher.js - model/IMindmap.js - model/Mindmap.js - model/INodeModel.js - model/NodeModel.js - model/RelationshipModel.js - ActionDispatcher.js - StandaloneActionDispatcher.js - DesignerModel.js - Designer.js - ScreenManager.js - Workspace.js - ShrinkConnector.js - Keyboard.js - DesignerKeyboard.js - Keyboard.js - TopicStyle.js - NodeGraph.js - Topic.js - CentralTopic.js - MainTopic.js - DragTopic.js - DragManager.js - DragPivot.js - ConnectionLine.js - Relationship.js - DragConnector.js - TextEditor.js - MultilineTextEditor.js - TextEditorFactory.js - util/Shape.js - util/FadeEffect.js - persistence/ModelCodeName.js - persistence/XMLSerializer_Pela.js - persistence/XMLSerializer_Tango.js - persistence/Pela2TangoMigrator.js - persistence/XMLSerializer_Beta.js - persistence/Beta2PelaMigrator.js - persistence/XMLSerializerFactory.js - PersistenceManager.js - RestPersistenceManager.js - LocalStorageManager.js - EditorProperties.js - IconGroup.js - Icon.js - LinkIcon.js - NoteIcon.js - ActionIcon.js - ImageIcon.js - model/FeatureModel.js - model/IconModel.js - model/LinkModel.js - model/NoteModel.js - Command.js - DesignerActionRunner.js - DesignerUndoManager.js - ControlPoint.js - EditorOptions.js - RelationshipPivot.js - TopicFeature.js - commands/GenericFunctionCommand.js - commands/DeleteCommand.js - commands/DragTopicCommand.js - commands/AddTopicCommand.js - commands/ChangeFeatureToTopicCommand.js - commands/RemoveFeatureFromTopicCommand.js - commands/AddFeatureToTopicCommand.js - commands/AddRelationshipCommand.js - commands/MoveControlPointCommand.js - widget/ModalDialogNotifier.js - widget/ToolbarNotifier.js - widget/ToolbarItem.js - widget/ToolbarPaneItem.js - widget/NoteEditor.js - widget/LinkEditor.js - widget/FloatingTip.js - widget/LinkIconTooltip.js - widget/KeyboardShortcutTooltip.js - widget/ColorPalettePanel.js - widget/ListToolbarPanel.js - widget/FontFamilyPanel.js - widget/FontSizePanel.js - widget/TopicShapePanel.js - widget/IconPanel.js - widget/IMenu.js - widget/Menu.js - TopicFeature.js - layout/EventBusDispatcher.js - layout/ChangeEvent.js - layout/LayoutManager.js - layout/Node.js - layout/RootedTreeSet.js - layout/ChildrenSorterStrategy.js - layout/AbstractBasicSorter.js - layout/BalancedSorter.js - layout/SymmetricSorter.js - layout/GridSorter.js - layout/OriginalLayout.js - layout/EventBus.js - MessageBundle_en.js - MessageBundle_es.js - MessageBundle_de.js - MessageBundle_fr.js - MessageBundle_pt_BR.js - MessageBundle_zh_CN.js - MessageBundle_zh_TW.js - MessageBundle_ca.js - footer.js - - - - false - false - UTF-8 - false - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - com.github.searls - jasmine-maven-plugin - 1.3.1.5 - - - - - - - - - - net.sourceforge.htmlunit - htmlunit - 2.15 - - - - org.openqa.selenium.phantomjs.PhantomJSDriver - - - phantomjs.binary.path - ${phantomjs.binary} - - - - libraries/mootools/mootools-core-1.4.5-full-nocompat-yc.js - lib/jquery.js - lib/core.js/ - lib/web2d.svg-min.js - libraries/hotkeys/jquery.hotkeys.js - libraries/underscorejs/underscore-min.js - libraries/bootstrap/js/bootstrap.js - - - header.js - Events.js - Messages.js - TopicEventDispatcher.js - model/IMindmap.js - model/Mindmap.js - model/INodeModel.js - model/NodeModel.js - model/RelationshipModel.js - ActionDispatcher.js - StandaloneActionDispatcher.js - DesignerModel.js - Designer.js - ScreenManager.js - Workspace.js - ShrinkConnector.js - Keyboard.js - DesignerKeyboard.js - Keyboard.js - TopicStyle.js - NodeGraph.js - Topic.js - CentralTopic.js - MainTopic.js - DragTopic.js - DragManager.js - DragPivot.js - ConnectionLine.js - Relationship.js - DragConnector.js - TextEditor.js - MultilineTextEditor.js - TextEditorFactory.js - util/Shape.js - util/FadeEffect.js - persistence/ModelCodeName.js - persistence/XMLSerializer_Pela.js - persistence/XMLSerializer_Tango.js - persistence/Pela2TangoMigrator.js - persistence/XMLSerializer_Beta.js - persistence/Beta2PelaMigrator.js - persistence/XMLSerializerFactory.js - PersistenceManager.js - RestPersistenceManager.js - LocalStorageManager.js - EditorProperties.js - IconGroup.js - Icon.js - LinkIcon.js - NoteIcon.js - ActionIcon.js - ImageIcon.js - model/FeatureModel.js - model/IconModel.js - model/LinkModel.js - model/NoteModel.js - Command.js - DesignerActionRunner.js - DesignerUndoManager.js - ControlPoint.js - EditorOptions.js - RelationshipPivot.js - TopicFeature.js - commands/GenericFunctionCommand.js - commands/DeleteCommand.js - commands/DragTopicCommand.js - commands/AddTopicCommand.js - commands/ChangeFeatureToTopicCommand.js - commands/RemoveFeatureFromTopicCommand.js - commands/AddFeatureToTopicCommand.js - commands/AddRelationshipCommand.js - commands/MoveControlPointCommand.js - widget/ModalDialogNotifier.js - widget/ToolbarNotifier.js - widget/ToolbarItem.js - widget/ToolbarPaneItem.js - widget/NoteEditor.js - widget/LinkEditor.js - widget/FloatingTip.js - widget/LinkIconTooltip.js - widget/KeyboardShortcutTooltip.js - widget/ColorPalettePanel.js - widget/ListToolbarPanel.js - widget/FontFamilyPanel.js - widget/FontSizePanel.js - widget/TopicShapePanel.js - widget/IconPanel.js - widget/IMenu.js - widget/Menu.js - TopicFeature.js - layout/EventBusDispatcher.js - layout/ChangeEvent.js - layout/LayoutManager.js - layout/Node.js - layout/RootedTreeSet.js - layout/ChildrenSorterStrategy.js - layout/AbstractBasicSorter.js - layout/BalancedSorter.js - layout/SymmetricSorter.js - layout/GridSorter.js - layout/OriginalLayout.js - layout/EventBus.js - MessageBundle_en.js - MessageBundle_es.js - MessageBundle_de.js - MessageBundle_fr.js - MessageBundle_pt_BR.js - MessageBundle_zh_CN.js - MessageBundle_zh_TW.js - MessageBundle_ca.js - footer.js - - - static/test/*.js - simpleTest.js - - - - - com.github.klieber - phantomjs-maven-plugin - 0.5 - - - - install - - - - - 1.9.2 - - - - - diff --git a/mindplot/src/main/javascript/.gitignore b/mindplot/src/main/javascript/.gitignore deleted file mode 100644 index cc4e9f6e..00000000 --- a/mindplot/src/main/javascript/.gitignore +++ /dev/null @@ -1 +0,0 @@ -MessageBundle_* \ No newline at end of file diff --git a/mindplot/src/main/javascript/ActionDispatcher.js b/mindplot/src/main/javascript/ActionDispatcher.js deleted file mode 100644 index 33552e5f..00000000 --- a/mindplot/src/main/javascript/ActionDispatcher.js +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -//noinspection JSUnusedLocalSymbols -mindplot.ActionDispatcher = new Class({ - Implements:[mindplot.Events], - initialize: function(commandContext) { - $assert(commandContext, "commandContext can not be null"); - }, - - addRelationship: function(model, mindmap) { - throw "method must be implemented."; - }, - - addTopics: function(models, parentTopicId) { - throw "method must be implemented."; - }, - - deleteEntities: function(topicsIds, relIds) { - throw "method must be implemented."; - }, - - dragTopic: function(topicId, position, order, parentTopic) { - throw "method must be implemented."; - }, - - moveTopic: function(topicId, position) { - throw "method must be implemented."; - }, - - moveControlPoint: function(ctrlPoint, point) { - throw "method must be implemented."; - }, - - changeFontFamilyToTopic: function(topicIds, fontFamily) { - throw "method must be implemented."; - }, - - changeFontStyleToTopic: function(topicsIds) { - throw "method must be implemented."; - }, - - changeFontColorToTopic: function(topicsIds, color) { - throw "method must be implemented."; - }, - - changeFontSizeToTopic : function(topicsIds, size) { - throw "method must be implemented."; - }, - - changeBackgroundColorToTopic: function(topicsIds, color) { - throw "method must be implemented."; - }, - - changeBorderColorToTopic: function(topicsIds, color) { - throw "method must be implemented."; - }, - - changeShapeTypeToTopic : function(topicsIds, shapeType) { - throw "method must be implemented."; - }, - - changeFontWeightToTopic : function(topicsIds) { - throw "method must be implemented."; - }, - - changeTextToTopic : function(topicsIds, text) { - throw "method must be implemented."; - }, - - shrinkBranch : function(topicsIds, collapse) { - throw "method must be implemented."; - }, - - addFeatureToTopic : function(topicId, type, attributes) { - throw "method must be implemented."; - }, - - changeFeatureToTopic : function(topicId, featureId, attributes) { - throw "method must be implemented."; - }, - - removeFeatureFromTopic : function(topicId, featureId) { - throw "method must be implemented."; - } -}); - -mindplot.ActionDispatcher.setInstance = function(dispatcher) { - mindplot.ActionDispatcher._instance = dispatcher; -}; - -mindplot.ActionDispatcher.getInstance = function() { - return mindplot.ActionDispatcher._instance; -}; - diff --git a/mindplot/src/main/javascript/ActionIcon.js b/mindplot/src/main/javascript/ActionIcon.js deleted file mode 100644 index f22b1793..00000000 --- a/mindplot/src/main/javascript/ActionIcon.js +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.ActionIcon = new Class({ - Extends:mindplot.Icon, - initialize: function(topic, url) { - this.parent(url); - this._node = topic; - }, - getNode:function() { - return this._node; - }, - - setPosition:function(x, y) { - var size = this.getSize(); - this.getImage().setPosition(x - size.width / 2, y - size.height / 2); - }, - - addEvent:function(event, fn) { - this.getImage().addEvent(event, fn); - }, - - addToGroup:function(group) { - group.append(this.getImage()); - }, - - setVisibility:function(visible) { - this.getImage().setVisibility(visible); - }, - - isVisible:function() { - return this.getImage().isVisible(); - }, - - setCursor:function(cursor) { - return this.getImage().setCursor(cursor); - }, - - moveToBack:function(cursor) { - return this.getImage().moveToBack(cursor); - }, - - moveToFront:function(cursor) { - return this.getImage().moveToFront(cursor); - } -}); - diff --git a/mindplot/src/main/javascript/CentralTopic.js b/mindplot/src/main/javascript/CentralTopic.js deleted file mode 100644 index 196a4029..00000000 --- a/mindplot/src/main/javascript/CentralTopic.js +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.CentralTopic = new Class(/** @lends CentralTopic*/{ - - Extends:mindplot.Topic, - /** - * @extends mindplot.Topic - * @constructs - * @param model - * @param options - */ - initialize:function (model, options) { - this.parent(model, options); - }, - - _registerEvents:function () { - this.parent(); - - // This disable the drag of the central topic. But solves the problem of deselecting the nodes when the screen is clicked. - this.addEvent('mousedown', function (event) { - event.stopPropagation(); - }); - }, - - /** */ - workoutIncomingConnectionPoint:function () { - return this.getPosition(); - }, - - /** */ - setCursor:function (type) { - type = (type == 'move') ? 'default' : type; - this.parent(type); - }, - - /** */ - updateTopicShape:function () { - - }, - - _updatePositionOnChangeSize:function () { - - // Center main topic ... - var zeroPoint = new core.Point(0, 0); - this.setPosition(zeroPoint); - }, - - /** */ - getShrinkConnector:function () { - return null; - }, - - /** */ - workoutOutgoingConnectionPoint:function (targetPosition) { - $assert(targetPosition, 'targetPoint can not be null'); - var pos = this.getPosition(); - var isAtRight = mindplot.util.Shape.isAtRight(targetPosition, pos); - var size = this.getSize(); - return mindplot.util.Shape.calculateRectConnectionPoint(pos, size, !isAtRight); - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/Command.js b/mindplot/src/main/javascript/Command.js deleted file mode 100644 index 9ea2cb8f..00000000 --- a/mindplot/src/main/javascript/Command.js +++ /dev/null @@ -1,65 +0,0 @@ -/* -* Copyright [2015] [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. -*/ - -mindplot.Command = new Class(/** @lends mindplot.Command */{ - /** - * @classdesc The command base class for handling do/undo mindmap operations - * @constructs - */ - initialize: function() - { - this._id = mindplot.Command._nextUUID(); - }, - - /** - * @abstract - */ - execute: function(commandContext) - { - throw "execute must be implemented."; - }, - - /** - * Triggered by the undo button - reverses the executed command - * @abstract - */ - undoExecute: function(commandContext) - { - throw "undo must be implemented."; - }, - - /** - * Returns the unique id of this command - * @returns {Number} command id - */ - getId:function() - { - return this._id; - } -}); - -mindplot.Command._nextUUID = function() -{ - if (!$defined(mindplot.Command._uuid)) - { - mindplot.Command._uuid = 1; - } - - mindplot.Command._uuid = mindplot.Command._uuid + 1; - return mindplot.Command._uuid; -}; \ No newline at end of file diff --git a/mindplot/src/main/javascript/ConnectionLine.js b/mindplot/src/main/javascript/ConnectionLine.js deleted file mode 100644 index 751894b3..00000000 --- a/mindplot/src/main/javascript/ConnectionLine.js +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.ConnectionLine = new Class({ - initialize:function (sourceNode, targetNode, lineType) { - $assert(targetNode, 'parentNode node can not be null'); - $assert(sourceNode, 'childNode node can not be null'); - $assert(sourceNode != targetNode, 'Circular connection'); - - this._targetTopic = targetNode; - this._sourceTopic = sourceNode; - - var line; - var ctrlPoints = this._getCtrlPoints(sourceNode, targetNode); - if (targetNode.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { - line = this._createLine(lineType, mindplot.ConnectionLine.CURVED); - line.setSrcControlPoint(ctrlPoints[0]); - line.setDestControlPoint(ctrlPoints[1]); - } else { - line = this._createLine(lineType, mindplot.ConnectionLine.SIMPLE_CURVED); - line.setSrcControlPoint(ctrlPoints[0]); - line.setDestControlPoint(ctrlPoints[1]); - } - // Set line styles ... - var strokeColor = mindplot.ConnectionLine.getStrokeColor(); - line.setStroke(1, 'solid', strokeColor, 1); - line.setFill(strokeColor, 1); - - this._line2d = line; - }, - - _getCtrlPoints:function (sourceNode, targetNode) { - var srcPos = sourceNode.workoutOutgoingConnectionPoint(targetNode.getPosition()); - var destPos = targetNode.workoutIncomingConnectionPoint(sourceNode.getPosition()); - var deltaX = (srcPos.x - destPos.x) / 3; - return [new core.Point(deltaX, 0), new core.Point(-deltaX, 0)]; - }, - - _createLine:function (lineType, defaultStyle) { - if (!$defined(lineType)) { - lineType = defaultStyle; - } - lineType = parseInt(lineType); - this._lineType = lineType; - var line = null; - switch (lineType) { - case mindplot.ConnectionLine.POLYLINE: - line = new web2d.PolyLine(); - break; - case mindplot.ConnectionLine.CURVED: - line = new web2d.CurvedLine(); - break; - case mindplot.ConnectionLine.SIMPLE_CURVED: - line = new web2d.CurvedLine(); - line.setStyle(web2d.CurvedLine.SIMPLE_LINE); - break; - default: - line = new web2d.Line(); - break; - } - return line; - }, - - setVisibility:function (value) { - this._line2d.setVisibility(value); - }, - - isVisible:function () { - return this._line2d.isVisible(); - }, - - setOpacity:function (opacity) { - this._line2d.setOpacity(opacity); - }, - - redraw:function () { - var line2d = this._line2d; - var sourceTopic = this._sourceTopic; - var sourcePosition = sourceTopic.getPosition(); - - var targetTopic = this._targetTopic; - var targetPosition = targetTopic.getPosition(); - - var sPos, tPos; - sPos = sourceTopic.workoutOutgoingConnectionPoint(targetPosition); - tPos = targetTopic.workoutIncomingConnectionPoint(sourcePosition); - - line2d.setFrom(tPos.x, tPos.y); - line2d.setTo(sPos.x, sPos.y); - - if (line2d.getType() == "CurvedLine") { - var ctrlPoints = this._getCtrlPoints(this._sourceTopic, this._targetTopic); - line2d.setSrcControlPoint(ctrlPoints[0]); - line2d.setDestControlPoint(ctrlPoints[1]); - } - - // Add connector ... - this._positionateConnector(targetTopic); - - }, - - _positionateConnector:function (targetTopic) { - var targetPosition = targetTopic.getPosition(); - var offset = mindplot.Topic.CONNECTOR_WIDTH / 2; - var targetTopicSize = targetTopic.getSize(); - var y, x; - if (targetTopic.getShapeType() == mindplot.model.TopicShape.LINE) { - y = targetTopicSize.height; - } else { - y = targetTopicSize.height / 2; - } - y = y - offset; - - var connector = targetTopic.getShrinkConnector(); - if ($defined(connector)) { - if (Math.sign(targetPosition.x) > 0) { - x = targetTopicSize.width; - connector.setPosition(x, y); - } - else { - x = -mindplot.Topic.CONNECTOR_WIDTH; - } - connector.setPosition(x, y); - } - - }, - - setStroke:function (color, style, opacity) { - this._line2d.setStroke(null, null, color, opacity); - }, - - addToWorkspace:function (workspace) { - workspace.append(this._line2d); - this._line2d.moveToBack(); - }, - - removeFromWorkspace:function (workspace) { - workspace.removeChild(this._line2d); - }, - - getTargetTopic:function () { - return this._targetTopic; - }, - - getSourceTopic:function () { - return this._sourceTopic; - }, - - getLineType:function () { - return this._lineType; - }, - - getLine:function () { - return this._line2d; - }, - - getModel:function () { - return this._model; - }, - - setModel:function (model) { - this._model = model; - }, - - getType:function () { - return "ConnectionLine"; - }, - - getId:function () { - return this._model.getId(); - }, - - moveToBack:function () { - this._line2d.moveToBack(); - }, - - moveToFront:function () { - this._line2d.moveToFront(); - } -}); - -mindplot.ConnectionLine.getStrokeColor = function () { - return '#495879'; -}; - -mindplot.ConnectionLine.SIMPLE = 0; -mindplot.ConnectionLine.POLYLINE = 1; -mindplot.ConnectionLine.CURVED = 2; -mindplot.ConnectionLine.SIMPLE_CURVED = 3; \ No newline at end of file diff --git a/mindplot/src/main/javascript/ControlPoint.js b/mindplot/src/main/javascript/ControlPoint.js deleted file mode 100644 index c7bcb3ca..00000000 --- a/mindplot/src/main/javascript/ControlPoint.js +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.ControlPoint = new Class({ - initialize: function () { - var control1 = new web2d.Elipse({ - width: 6, - height: 6, - stroke: '1 solid #6589de', - fillColor: 'gray', - visibility: false - }); - control1.setCursor('pointer'); - - var control2 = new web2d.Elipse({ - width: 6, - height: 6, - stroke: '1 solid #6589de', - fillColor: 'gray', - visibility: false - }); - control2.setCursor('pointer'); - - this._controlPointsController = [control1, control2]; - this._controlLines = [new web2d.Line({strokeColor: "#6589de", strokeWidth: 1, opacity: 0.3}), - new web2d.Line({strokeColor: "#6589de", strokeWidth: 1, opacity: 0.3})]; - - this._isBinded = false; - var me = this; - this._controlPointsController[0].addEvent('mousedown', function (event) { - (me._mouseDown)(event, mindplot.ControlPoint.FROM, me); - }); - this._controlPointsController[0].addEvent('click', function (event) { - (me._mouseClick)(event); - }); - this._controlPointsController[0].addEvent('dblclick', function (event) { - (me._mouseClick)(event); - }); - - this._controlPointsController[1].addEvent('mousedown', function (event) { - (me._mouseDown)(event, mindplot.ControlPoint.TO, me); - }); - this._controlPointsController[1].addEvent('click', function (event) { - (me._mouseClick)(event); - }); - this._controlPointsController[1].addEvent('dblclick', function (event) { - (me._mouseClick)(event); - }); - }, - - setLine: function (line) { - if ($defined(this._line)) { - this._removeLine(); - } - this._line = line; - this._createControlPoint(); - this._endPoint = []; - this._orignalCtrlPoint = []; - this._orignalCtrlPoint[0] = this._controls[0].clone(); - this._orignalCtrlPoint[1] = this._controls[1].clone(); - this._endPoint[0] = this._line.getLine().getFrom().clone(); - this._endPoint[1] = this._line.getLine().getTo().clone(); - }, - - redraw: function () { - if ($defined(this._line)) - this._createControlPoint(); - }, - - _createControlPoint: function () { - this._controls = this._line.getLine().getControlPoints(); - var pos = this._line.getLine().getFrom(); - this._controlPointsController[0].setPosition(this._controls[mindplot.ControlPoint.FROM].x + pos.x, this._controls[mindplot.ControlPoint.FROM].y + pos.y - 3); - this._controlLines[0].setFrom(pos.x, pos.y); - this._controlLines[0].setTo(this._controls[mindplot.ControlPoint.FROM].x + pos.x + 3, this._controls[mindplot.ControlPoint.FROM].y + pos.y); - pos = this._line.getLine().getTo(); - this._controlLines[1].setFrom(pos.x, pos.y); - this._controlLines[1].setTo(this._controls[mindplot.ControlPoint.TO].x + pos.x + 3, this._controls[mindplot.ControlPoint.TO].y + pos.y); - this._controlPointsController[1].setPosition(this._controls[mindplot.ControlPoint.TO].x + pos.x, this._controls[mindplot.ControlPoint.TO].y + pos.y - 3); - - }, - - _removeLine: function () { - - }, - - _mouseDown: function (event, point, me) { - if (!this._isBinded) { - this._isBinded = true; - this._mouseMoveFunction = function (event) { - (me._mouseMoveEvent)(event, point, me); - }; - - this._workspace.getScreenManager().addEvent('mousemove', this._mouseMoveFunction); - this._mouseUpFunction = function (event) { - (me._mouseUp)(event, point, me); - }; - this._workspace.getScreenManager().addEvent('mouseup', this._mouseUpFunction); - } - event.preventDefault(); - event.stopPropagation(); - return false; - }, - - _mouseMoveEvent: function (event, point) { - var screen = this._workspace.getScreenManager(); - var pos = screen.getWorkspaceMousePosition(event); - - var cords; - if (point == 0) { - cords = mindplot.util.Shape.calculateRelationShipPointCoordinates(this._line.getSourceTopic(), pos); - this._line.setFrom(cords.x, cords.y); - this._line.setSrcControlPoint(new core.Point(pos.x - cords.x, pos.y - cords.y)); - } else { - cords = mindplot.util.Shape.calculateRelationShipPointCoordinates(this._line.getTargetTopic(), pos); - this._line.setTo(cords.x, cords.y); - this._line.setDestControlPoint(new core.Point(pos.x - cords.x, pos.y - cords.y)); - } - - this._controls[point].x = (pos.x - cords.x); - this._controls[point].y = (pos.y - cords.y); - this._controlPointsController[point].setPosition(pos.x - 5, pos.y - 3); - this._controlLines[point].setFrom(cords.x, cords.y); - this._controlLines[point].setTo(pos.x - 2, pos.y); - this._line.getLine().updateLine(point); - - }, - - _mouseUp: function (event, point) { - this._workspace.getScreenManager().removeEvent('mousemove', this._mouseMoveFunction); - this._workspace.getScreenManager().removeEvent('mouseup', this._mouseUpFunction); - - var actionDispatcher = mindplot.ActionDispatcher.getInstance(); - actionDispatcher.moveControlPoint(this, point); - this._isBinded = false; - }, - - _mouseClick: function (event) { - event.preventDefault(); - event.stopPropagation(); - return false; - }, - - setVisibility: function (visible) { - if (visible) { - this._controlLines[0].moveToFront(); - this._controlLines[1].moveToFront(); - this._controlPointsController[0].moveToFront(); - this._controlPointsController[1].moveToFront(); - } - this._controlPointsController[0].setVisibility(visible); - this._controlPointsController[1].setVisibility(visible); - this._controlLines[0].setVisibility(visible); - this._controlLines[1].setVisibility(visible); - }, - - addToWorkspace: function (workspace) { - this._workspace = workspace; - workspace.append(this._controlPointsController[0]); - workspace.append(this._controlPointsController[1]); - workspace.append(this._controlLines[0]); - workspace.append(this._controlLines[1]); - }, - - removeFromWorkspace: function (workspace) { - this._workspace = null; - workspace.removeChild(this._controlPointsController[0]); - workspace.removeChild(this._controlPointsController[1]); - workspace.removeChild(this._controlLines[0]); - workspace.removeChild(this._controlLines[1]); - }, - - getControlPoint: function (index) { - return this._controls[index]; - }, - - getOriginalEndPoint: function (index) { - return this._endPoint[index]; - }, - - getOriginalCtrlPoint: function (index) { - return this._orignalCtrlPoint[index]; - } -}); - -mindplot.ControlPoint.FROM = 0; -mindplot.ControlPoint.TO = 1; diff --git a/mindplot/src/main/javascript/Designer.js b/mindplot/src/main/javascript/Designer.js deleted file mode 100644 index ea9b2e14..00000000 --- a/mindplot/src/main/javascript/Designer.js +++ /dev/null @@ -1,1027 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.Designer = new Class(/** @lends Designer */{ - Extends: mindplot.Events, - /** - * @constructs - * @param {Object} options - * @param {HTMLElement} divElement - * @extends mindplot.Events - */ - initialize: function (options, divElement) { - $assert(options, "options must be defined"); - $assert(options.zoom, "zoom must be defined"); - $assert(options.size, "size must be defined"); - $assert(divElement, "divElement must be defined"); - - // Set up i18n location ... - mindplot.Messages.init(options.locale); - - this._options = options; - - // Set full div elem render area ... - divElement.css(options.size); - - // Dispatcher manager ... - var commandContext = new mindplot.CommandContext(this); - this._actionDispatcher = new mindplot.StandaloneActionDispatcher(commandContext); - - var me = this; - this._actionDispatcher.addEvent("modelUpdate", function (event) { - me.fireEvent("modelUpdate", event); - }); - - mindplot.ActionDispatcher.setInstance(this._actionDispatcher); - this._model = new mindplot.DesignerModel(options); - - // Init Screen manager.. - var screenManager = new mindplot.ScreenManager(divElement); - this._workspace = new mindplot.Workspace(screenManager, this._model.getZoom()); - - // Init layout manager ... - this._eventBussDispatcher = new mindplot.layout.EventBusDispatcher(this.getModel()); - - // Register events - if (!this.isReadOnly()) { - // Register mouse events ... - this._registerMouseEvents(); - - // Register keyboard events ... - mindplot.DesignerKeyboard.register(this); - - this._dragManager = this._buildDragManager(this._workspace); - } - this._registerWheelEvents(); - - this._relPivot = new mindplot.RelationshipPivot(this._workspace, this); - - // Set editor working area ... - this.setViewPort(options.viewPort); - - mindplot.TopicEventDispatcher.configure(this.isReadOnly()); - this._clipboard = []; - }, - - /** - * @private - */ - _registerWheelEvents: function () { - var zoomFactor = 1.006; - var me = this; - // Zoom In and Zoom Out must active event - $(document).on('mousewheel', function (event) { - if (event.deltaY > 0) { - me.zoomIn(zoomFactor); - } else { - me.zoomOut(zoomFactor); - } - event.preventDefault(); - }); - }, - - /** - * @param {String} type the event type - * @param {Function} listener - * forwards to the TopicEventDispatcher or the parent Events class, depending on the type - */ - addEvent: function (type, listener) { - if (type == mindplot.TopicEvent.EDIT || type == mindplot.TopicEvent.CLICK) { - var editor = mindplot.TopicEventDispatcher.getInstance(); - editor.addEvent(type, listener); - } else { - this.parent(type, listener); - } - }, - - /** - * @private - */ - _registerMouseEvents: function () { - var workspace = this._workspace; - var screenManager = workspace.getScreenManager(); - var me = this; - // Initialize workspace event listeners. - screenManager.addEvent('update', function () { - // Topic must be set to his original state. All editors must be closed. - var topics = me.getModel().getTopics(); - _.each(topics, function (object) { - object.closeEditors(); - }); - - // Clean some selected nodes on event .. - if (me._cleanScreen) - me._cleanScreen(); - }); - - // Deselect on click ... - screenManager.addEvent('click', function (event) { - me.onObjectFocusEvent(null, event); - }); - - // Create nodes on double click... - screenManager.addEvent('dblclick', function (event) { - if (workspace.isWorkspaceEventsEnabled()) { - var mousePos = screenManager.getWorkspaceMousePosition(event); - var centralTopic = me.getModel().getCentralTopic(); - var model = me._createChildModel(centralTopic, mousePos); - this._actionDispatcher.addTopics([model], [centralTopic.getId()]); - } - }.bind(this)); - - // Register mouse drag and drop event ... - function noopHandler(evt) { - evt.stopPropagation(); - evt.preventDefault(); - } - }, - - /** - * @private - * @param {mindplot.Workspace} workspace - * @return {mindplot.DragManager} the new dragManager for the workspace with events - * registered - */ - _buildDragManager: function (workspace) { - - var designerModel = this.getModel(); - var dragConnector = new mindplot.DragConnector(designerModel, this._workspace); - var dragManager = new mindplot.DragManager(workspace, this._eventBussDispatcher); - var topics = designerModel.getTopics(); - - dragManager.addEvent('startdragging', function () { - // Enable all mouse events. - for (var i = 0; i < topics.length; i++) { - topics[i].setMouseEventsEnabled(false); - } - }); - - dragManager.addEvent('dragging', function (event, dragTopic) { - dragTopic.updateFreeLayout(event); - if (!dragTopic.isFreeLayoutOn(event)) { - // The node is being drag. Is the connection still valid ? - dragConnector.checkConnection(dragTopic); - - if (!dragTopic.isVisible() && dragTopic.isConnected()) { - dragTopic.setVisibility(true); - } - } - }); - - dragManager.addEvent('enddragging', function (event, dragTopic) { - for (var i = 0; i < topics.length; i++) { - topics[i].setMouseEventsEnabled(true); - } - dragTopic.applyChanges(workspace); - }); - - return dragManager; - }, - - /** - * @param {{width:Number, height:Number}} size - * sets width and height of the workspace - */ - setViewPort: function (size) { - this._workspace.setViewPort(size); - var model = this.getModel(); - this._workspace.setZoom(model.getZoom(), true); - }, - - /** - * @private - * @param {mindplot.model.NodeModel} model - * @param {Boolean} readOnly - * @return {mindplot.CentralTopic|mindplot.MainTopic} the topic to the given model, - * connected, added to the drag manager, with events registered - complying type & read mode - */ - _buildNodeGraph: function (model, readOnly) { - - // Create node graph ... - var topic = mindplot.NodeGraph.create(model, {readOnly: readOnly}); - this.getModel().addTopic(topic); - var me = this; - // Add Topic events ... - if (!readOnly) { - // If a node had gained focus, clean the rest of the nodes ... - topic.addEvent('mousedown', function (event) { - me.onObjectFocusEvent(topic, event); - }); - - // Register node listeners ... - if (topic.getType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { - - // Central Topic doesn't support to be dragged - this._dragManager.add(topic); - } - } - - // Connect Topic ... - var isConnected = model.isConnected(); - if (isConnected) { - // Improve this ... - var targetTopicModel = model.getParent(); - var targetTopic = null; - - var topics = this.getModel().getTopics(); - for (var i = 0; i < topics.length; i++) { - var t = topics[i]; - if (t.getModel() == targetTopicModel) { - targetTopic = t; - // Disconnect the node. It will be connected again later ... - model.disconnect(); - break; - } - } - $assert(targetTopic, "Could not find a topic to connect"); - topic.connectTo(targetTopic, this._workspace); - } - - topic.addEvent('ontblur', function () { - var topics = me.getModel().filterSelectedTopics(); - var rels = me.getModel().filterSelectedRelationships(); - - if (topics.length == 0 || rels.length == 0) { - me.fireEvent('onblur'); - } - }); - - topic.addEvent('ontfocus', function () { - var topics = me.getModel().filterSelectedTopics(); - var rels = me.getModel().filterSelectedRelationships(); - - if (topics.length == 1 || rels.length == 1) { - me.fireEvent('onfocus'); - } - }); - - return topic; - }, - - /** - * @param {?mindplot.Topic} currentObject - * @param {Event=} event - * sets focus to the given currentObject and removes it from any other objects if not - * triggered with Ctrl pressed - */ - onObjectFocusEvent: function (currentObject, event) { - // Close node editors .. - var topics = this.getModel().getTopics(); - _.each(topics, function (topic) { - topic.closeEditors(); - }); - - var model = this.getModel(); - var objects = model.getEntities(); - _.each(objects, function (object) { - // Disable all nodes on focus but not the current if Ctrl key isn't being pressed - if (!$defined(event) || (!event.ctrlKey && !event.metaKey)) { - if (object.isOnFocus() && object != currentObject) { - object.setOnFocus(false); - } - } - }); - - }, - - /** sets focus to all model entities, i.e. relationships and topics */ - selectAll: function () { - var model = this.getModel(); - var objects = model.getEntities(); - _.each(objects, function (object) { - object.setOnFocus(true); - }); - }, - - /** removes focus from all model entities, i.e. relationships and topics */ - deselectAll: function () { - var objects = this.getModel().getEntities(); - _.each(objects, function (object) { - object.setOnFocus(false); - }); - }, - - /** - * Set the zoom of the map - * @param {Number} zoom number between 0.3 and 1.9 - */ - setZoom: function (zoom) { - if (zoom > 1.9 || zoom < 0.3) { - $notify($msg('ZOOM_IN_ERROR')); - return; - } - this.getModel().setZoom(zoom); - this._workspace.setZoom(zoom); - }, - - /** - * @param {Number=} factor - * zoom out by the given factor, or 1.2, if undefined - */ - zoomOut: function (factor) { - if (!factor) - factor = 1.2; - - var model = this.getModel(); - var scale = model.getZoom() * factor; - if (scale <= 1.9) { - model.setZoom(scale); - this._workspace.setZoom(scale); - } - else { - $notify($msg('ZOOM_ERROR')); - } - - }, - - /** - * @param {Number=} factor - * zoom in by the given factor, or 1.2, if undefined - */ - zoomIn: function (factor) { - if (!factor) - factor = 1.2; - - var model = this.getModel(); - var scale = model.getZoom() / factor; - - if (scale >= 0.3) { - model.setZoom(scale); - this._workspace.setZoom(scale); - } - else { - $notify($msg('ZOOM_ERROR')); - } - }, - - /** copy selected topics to a private clipboard */ - copyToClipboard: function () { - var topics = this.getModel().filterSelectedTopics(); - if (topics.length <= 0) { - // If there are more than one node selected, - $notify($msg('AT_LEAST_ONE_TOPIC_MUST_BE_SELECTED')); - return; - } - - // Exclude central topic .. - topics = topics.filter(function (topic) { - return !topic.isCentralTopic(); - }); - - this._clipboard = topics.map(function (topic) { - var nodeModel = topic.getModel().deepCopy(); - - // Change position to make the new topic evident... - var pos = nodeModel.getPosition(); - nodeModel.setPosition(pos.x + (60 * Math.sign(pos.x)), pos.y + 30); - - return nodeModel; - }); - - $notify($msg('SELECTION_COPIED_TO_CLIPBOARD')); - }, - - /** paste clipboard contents to the mindmap */ - pasteClipboard: function () { - if (this._clipboard.length == 0) { - $notify($msg('CLIPBOARD_IS_EMPTY')); - return; - } - this._actionDispatcher.addTopics(this._clipboard); - this._clipboard = []; - }, - - /** @return {mindplot.DesignerModel} model */ - getModel: function () { - return this._model; - }, - - /** collapse the subtree of the selected topic */ - shrinkSelectedBranch: function () { - var nodes = this.getModel().filterSelectedTopics(); - if (nodes.length <= 0 || nodes.length != 1) { - // If there are more than one node selected, - $notify($msg('ONLY_ONE_TOPIC_MUST_BE_SELECTED_COLLAPSE')); - return; - - } - // Execute event ... - var topic = nodes[0]; - if (topic.getType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { - this._actionDispatcher.shrinkBranch([topic.getId()], !topic.areChildrenShrunken()); - } - }, - - /** create a NodeModel for the selected node's child and add it via the ActionDispatcher */ - createChildForSelectedNode: function () { - var nodes = this.getModel().filterSelectedTopics(); - if (nodes.length <= 0) { - // If there are more than one node selected, - $notify($msg('ONE_TOPIC_MUST_BE_SELECTED')); - return; - - } - if (nodes.length != 1) { - - // If there are more than one node selected, - $notify($msg('ONLY_ONE_TOPIC_MUST_BE_SELECTED')); - return; - } - - // Add new node ... - var parentTopic = nodes[0]; - var parentTopicId = parentTopic.getId(); - var childModel = this._createChildModel(parentTopic); - - // Execute event ... - this._actionDispatcher.addTopics([childModel], [parentTopicId]); - - }, - - /** - * @private - */ - _copyNodeProps: function (sourceModel, targetModel) { - - // I don't copy the font size if the target is the source is the central topic. - if (sourceModel.getType() != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { - var fontSize = sourceModel.getFontSize(); - if (fontSize) { - targetModel.setFontSize(fontSize) - } - } - - var fontFamily = sourceModel.getFontFamily(); - if (fontFamily) { - targetModel.setFontFamily(fontFamily) - } - - var fontColor = sourceModel.getFontColor(); - if (fontColor) { - targetModel.setFontColor(fontColor) - } - - var fontWeight = sourceModel.getFontWeight(); - if (fontWeight) { - targetModel.setFontWeight(fontWeight) - } - - var fontStyle = sourceModel.getFontStyle(); - if (fontStyle) { - targetModel.setFontStyle(fontStyle) - } - - var shape = sourceModel.getShapeType(); - if (shape) { - targetModel.setShapeType(shape) - } - - var borderColor = sourceModel.getBorderColor(); - if (borderColor) { - targetModel.setBorderColor(borderColor) - } - - var backgroundColor = sourceModel.getBackgroundColor(); - if (backgroundColor) { - targetModel.setBackgroundColor(backgroundColor) - } - }, - - /** - * @private - * @param {mindplot.Topic} topic the parent topic of the child to create the NodeModel for - * @param {core.Point} mousePos the mouse position - * @return {mindplot.NodeModel} the node model for the new child - */ - _createChildModel: function (topic, mousePos) { - // Create a new node ... - var parentModel = topic.getModel(); - var mindmap = parentModel.getMindmap(); - var childModel = mindmap.createNode(); - - // Create a new node ... - var layoutManager = this._eventBussDispatcher.getLayoutManager(); - var result = layoutManager.predict(topic.getId(), null, mousePos); - childModel.setOrder(result.order); - - var position = result.position; - childModel.setPosition(position.x, position.y); - - this._copyNodeProps(parentModel, childModel); - - return childModel; - }, - - /** - * @param {Events} event - * @param {mindplot.model.NodeModel} model - * @todo not used - */ - addDraggedNode: function (event, model) { - $assert(event, "event can not be null"); - $assert(model, "model can not be null"); - - // Position far from the visual area ... - model.setPosition(1000, 1000); - - this._actionDispatcher.addTopics([model]); - var topic = this.getModel().findTopicById(model.getId()); - - // Simulate a mouse down event to start the dragging ... - topic.fireEvent("mousedown", event); - }, - - /** - * creates a sibling or child node of the selected node, if the selected node is the - * central topic - */ - createSiblingForSelectedNode: function () { - var nodes = this.getModel().filterSelectedTopics(); - if (nodes.length <= 0) { - // If there are no nodes selected, - $notify($msg('ONE_TOPIC_MUST_BE_SELECTED')); - return; - - } - if (nodes.length > 1) { - // If there are more than one node selected, - $notify($msg('ONLY_ONE_TOPIC_MUST_BE_SELECTED')); - return; - } - - var topic = nodes[0]; - if (!topic.getOutgoingConnectedTopic()) { // Central topic and isolated topics .... - // Central topic doesn't have siblings ... - this.createChildForSelectedNode(); - - } else { - var parentTopic = topic.getOutgoingConnectedTopic(); - var siblingModel = this._createSiblingModel(topic); - - // Hack: if parent is central topic, add node below not on opposite side. - // This should be done in the layout - if (parentTopic.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { - siblingModel.setOrder(topic.getOrder() + 2); - } - - var parentTopicId = parentTopic.getId(); - this._actionDispatcher.addTopics([siblingModel], [parentTopicId]); - } - }, - - /** - * @private - * @param {mindplot.Topic} topic the topic to create the sibling to - * @return {mindplot.NodeModel} the node model of the sibling - */ - _createSiblingModel: function (topic) { - var result = null; - var parentTopic = topic.getOutgoingConnectedTopic(); - if (parentTopic != null) { - - // Create a new node ... - var model = topic.getModel(); - var mindmap = model.getMindmap(); - result = mindmap.createNode(); - - // Create a new node ... - var order = topic.getOrder() + 1; - result.setOrder(order); - result.setPosition(10, 10); // Set a dummy position ... - } - - this._copyNodeProps(model, result); - - return result; - }, - - /** - * @param {Event} event - */ - showRelPivot: function (event) { - - var nodes = this.getModel().filterSelectedTopics(); - if (nodes.length <= 0) { - // This could not happen ... - $notify($msg('RELATIONSHIP_COULD_NOT_BE_CREATED')); - return; - } - - // Current mouse position .... - var screen = this._workspace.getScreenManager(); - var pos = screen.getWorkspaceMousePosition(event); - - // create a connection ... - this._relPivot.start(nodes[0], pos); - }, - - /** @return {{zoom:Number}} the zoom */ - getMindmapProperties: function () { - var model = this.getModel(); - return {zoom: model.getZoom()}; - }, - - /** - * @param {mindplot.Mindmap} mindmapModel - * @throws will throw an error if mindmapModel is null or undefined - */ - loadMap: function (mindmapModel) { - $assert(mindmapModel, "mindmapModel can not be null"); - this._mindmap = mindmapModel; - - // Init layout manager ... - var size = {width: 25, height: 25}; - var layoutManager = new mindplot.layout.LayoutManager(mindmapModel.getCentralTopic().getId(), size); - var me = this; - layoutManager.addEvent('change', function (event) { - var id = event.getId(); - var topic = me.getModel().findTopicById(id); - topic.setPosition(event.getPosition()); - topic.setOrder(event.getOrder()); - }); - this._eventBussDispatcher.setLayoutManager(layoutManager); - - - // Building node graph ... - var branches = mindmapModel.getBranches(); - for (var i = 0; i < branches.length; i++) { - // NodeModel -> NodeGraph ... - var nodeModel = branches[i]; - var nodeGraph = this.nodeModelToNodeGraph(nodeModel); - - // Update shrink render state... - nodeGraph.setBranchVisibility(true); - } - - var relationships = mindmapModel.getRelationships(); - for (var j = 0; j < relationships.length; j++) { - this._relationshipModelToRelationship(relationships[j]); - } - - // Place the focus on the Central Topic - var centralTopic = this.getModel().getCentralTopic(); - this.goToNode(centralTopic); - - // Finally, sort the map ... - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.DoLayout); - - this.fireEvent('loadSuccess'); - }, - - /** */ - getMindmap: function () { - return this._mindmap; - }, - - /** */ - undo: function () { - // @Todo: This is a hack... - this._actionDispatcher._actionRunner.undo(); - }, - - /** */ - redo: function () { - this._actionDispatcher._actionRunner.redo(); - }, - - /** */ - isReadOnly: function () { - return this._options.readOnly; - }, - - /** - * @param {mindplot.model.NodeModel} nodeModel - * @return {mindplot.Topic} the topic (extends mindplot.NodeGraph) created to the model - */ - nodeModelToNodeGraph: function (nodeModel) { - $assert(nodeModel, "Node model can not be null"); - var children = nodeModel.getChildren().slice(); - children = children.sort(function (a, b) { - return a.getOrder() - b.getOrder() - }); - - var nodeGraph = this._buildNodeGraph(nodeModel, this.isReadOnly()); - nodeGraph.setVisibility(false); - - this._workspace.append(nodeGraph); - for (var i = 0; i < children.length; i++) { - var child = children[i]; - if ($defined(child)) - this.nodeModelToNodeGraph(child); - } - - return nodeGraph; - }, - - /** - * @private - * @param {mindplot.model.RelationshipModel} model - * @return {mindplot.Relationship} the relationship created to the model - * @throws will throw an error if model is null or undefined - */ - _relationshipModelToRelationship: function (model) { - $assert(model, "Node model can not be null"); - - var result = this._buildRelationshipShape(model); - - var sourceTopic = result.getSourceTopic(); - sourceTopic.addRelationship(result); - - var targetTopic = result.getTargetTopic(); - targetTopic.addRelationship(result); - - result.setVisibility(sourceTopic.isVisible() && targetTopic.isVisible()); - - this._workspace.append(result); - return result; - }, - - /** - * @param {mindplot.model.RelationshipModel} model - * @return {mindplot.Relationship} the relationship added to the mindmap - */ - addRelationship: function (model) { - var mindmap = this.getMindmap(); - mindmap.addRelationship(model); - return this._relationshipModelToRelationship(model); - }, - - /** - * deletes the relationship from the linked topics, DesignerModel, Workspace and Mindmap - * @param {mindplot.Relationship} rel the relationship to delete - */ - deleteRelationship: function (rel) { - var sourceTopic = rel.getSourceTopic(); - sourceTopic.deleteRelationship(rel); - - var targetTopic = rel.getTargetTopic(); - targetTopic.deleteRelationship(rel); - - this.getModel().removeRelationship(rel); - this._workspace.removeChild(rel); - - var mindmap = this.getMindmap(); - mindmap.deleteRelationship(rel.getModel()); - }, - - /** - * @private - * @param {mindplot.model.RelationshipModel} model - * @return {mindplot.Relationship} the new relationship with events registered - * @throws will throw an error if the target topic cannot be found - */ - _buildRelationshipShape: function (model) { - var dmodel = this.getModel(); - - var sourceTopicId = model.getFromNode(); - var sourceTopic = dmodel.findTopicById(sourceTopicId); - - var targetTopicId = model.getToNode(); - var targetTopic = dmodel.findTopicById(targetTopicId); - $assert(targetTopic, "targetTopic could not be found:" + targetTopicId + dmodel.getTopics().map(function (e) { - return e.getId() - })); - - // Build relationship line .... - var result = new mindplot.Relationship(sourceTopic, targetTopic, model); - var me = this; - - result.addEvent('ontblur', function () { - var topics = me.getModel().filterSelectedTopics(); - var rels = me.getModel().filterSelectedRelationships(); - - if (topics.length == 0 || rels.length == 0) { - me.fireEvent('onblur'); - } - }); - - result.addEvent('ontfocus', function () { - var topics = me.getModel().filterSelectedTopics(); - var rels = me.getModel().filterSelectedRelationships(); - - if (topics.length == 1 || rels.length == 1) { - me.fireEvent('onfocus'); - } - }); - - // Append it to the workspace ... - dmodel.addRelationship(result); - - return result; - }, - - /** - * @param {mindplot.Topic} node the topic to remove - * removes the given topic and its children from Workspace, DesignerModel and NodeModel - */ - removeTopic: function (node) { - if (!node.isCentralTopic()) { - var parent = node._parent; - node.disconnect(this._workspace); - - //remove children - while (node.getChildren().length > 0) { - this.removeTopic(node.getChildren()[0]); - } - - this._workspace.removeChild(node); - this.getModel().removeTopic(node); - - // Delete this node from the model... - var model = node.getModel(); - model.deleteNode(); - - if ($defined(parent)) { - this.goToNode(parent); - } - } - }, - - /** - * @private - */ - _resetEdition: function () { - var screenManager = this._workspace.getScreenManager(); - screenManager.fireEvent("update"); - screenManager.fireEvent("mouseup"); - this._relPivot.dispose(); - }, - - /** */ - deleteSelectedEntities: function () { - // Is there some action in progress ?. - this._resetEdition(); - - var topics = this.getModel().filterSelectedTopics(); - var relation = this.getModel().filterSelectedRelationships(); - if (topics.length <= 0 && relation.length <= 0) { - // If there are more than one node selected, - $notify($msg('ENTITIES_COULD_NOT_BE_DELETED')); - return; - } else if (topics.length == 1 && topics[0].isCentralTopic()) { - $notify($msg('CENTRAL_TOPIC_CAN_NOT_BE_DELETED')); - return; - } - - // If the central topic has been selected, I must filter ir - var topicIds = topics.filter(function (topic) { - return !topic.isCentralTopic(); - }).map(function (topic) { - return topic.getId() - }); - - - var relIds = relation.map(function (rel) { - return rel.getId(); - }); - - // Finally delete the topics ... - if (topicIds.length > 0 || relIds.length > 0) { - this._actionDispatcher.deleteEntities(topicIds, relIds); - } - - }, - - /** */ - changeFontFamily: function (font) { - var topicsIds = this.getModel().filterTopicsIds(); - if (topicsIds.length > 0) { - this._actionDispatcher.changeFontFamilyToTopic(topicsIds, font); - - } - }, - - /** */ - changeFontStyle: function () { - var topicsIds = this.getModel().filterTopicsIds(); - if (topicsIds.length > 0) { - this._actionDispatcher.changeFontStyleToTopic(topicsIds); - } - }, - - /** */ - changeFontColor: function (color) { - $assert(color, "color can not be null"); - - var topicsIds = this.getModel().filterTopicsIds(); - if (topicsIds.length > 0) { - this._actionDispatcher.changeFontColorToTopic(topicsIds, color); - } - }, - - /** */ - changeBackgroundColor: function (color) { - - var validateFunc = function (topic) { - return topic.getShapeType() != mindplot.model.TopicShape.LINE; - }; - var validateError = 'Color can not be set to line topics.'; - - var topicsIds = this.getModel().filterTopicsIds(validateFunc, validateError); - if (topicsIds.length > 0) { - this._actionDispatcher.changeBackgroundColorToTopic(topicsIds, color); - } - }, - - /** */ - changeBorderColor: function (color) { - var validateFunc = function (topic) { - return topic.getShapeType() != mindplot.model.TopicShape.LINE; - }; - var validateError = 'Color can not be set to line topics.'; - var topicsIds = this.getModel().filterTopicsIds(validateFunc, validateError); - if (topicsIds.length > 0) { - this._actionDispatcher.changeBorderColorToTopic(topicsIds, color); - } - }, - - /** */ - changeFontSize: function (size) { - var topicsIds = this.getModel().filterTopicsIds(); - if (topicsIds.length > 0) { - this._actionDispatcher.changeFontSizeToTopic(topicsIds, size); - } - }, - - /** */ - changeTopicShape: function (shape) { - var validateFunc = function (topic) { - return !(topic.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE && shape == mindplot.model.TopicShape.LINE) - }; - - var validateError = 'Central Topic shape can not be changed to line figure.'; - var topicsIds = this.getModel().filterTopicsIds(validateFunc, validateError); - if (topicsIds.length > 0) { - this._actionDispatcher.changeShapeTypeToTopic(topicsIds, shape); - } - }, - - /** */ - changeFontWeight: function () { - var topicsIds = this.getModel().filterTopicsIds(); - if (topicsIds.length > 0) { - this._actionDispatcher.changeFontWeightToTopic(topicsIds); - } - }, - - /** */ - addIconType: function (iconType) { - var topicsIds = this.getModel().filterTopicsIds(); - if (topicsIds.length > 0) { - this._actionDispatcher.addFeatureToTopic(topicsIds[0], mindplot.TopicFeature.Icon.id, {id: iconType}); - } - }, - - /** - * lets the selected topic open the link editor where the user can define or modify an - * existing link - */ - addLink: function () { - var model = this.getModel(); - var topic = model.selectedTopic(); - if (topic) { - topic.showLinkEditor(); - this.onObjectFocusEvent(); - } - }, - - /** */ - addNote: function () { - var model = this.getModel(); - var topic = model.selectedTopic(); - if (topic) { - topic.showNoteEditor(); - this.onObjectFocusEvent(); - } - }, - - /** - * @param {mindplot.Topic} node - * sets the focus to the given node - */ - goToNode: function (node) { - node.setOnFocus(true); - this.onObjectFocusEvent(node); - }, - - /** @return {mindplot.Workspace} */ - getWorkSpace: function () { - return this._workspace; - } - } -); diff --git a/mindplot/src/main/javascript/DesignerActionRunner.js b/mindplot/src/main/javascript/DesignerActionRunner.js deleted file mode 100644 index b7e7304d..00000000 --- a/mindplot/src/main/javascript/DesignerActionRunner.js +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.DesignerActionRunner = new Class({ - initialize: function (commandContext, notifier) { - $assert(commandContext, "commandContext can not be null"); - - this._undoManager = new mindplot.DesignerUndoManager(); - this._context = commandContext; - this._notifier = notifier; - }, - - execute: function (command) { - $assert(command, "command can not be null"); - command.execute(this._context); - this._undoManager.enqueue(command); - this.fireChangeEvent(); - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.DoLayout); - - }, - - undo: function () { - this._undoManager.execUndo(this._context); - this.fireChangeEvent(); - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.DoLayout); - }, - - redo: function () { - this._undoManager.execRedo(this._context); - this.fireChangeEvent(); - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.DoLayout); - - }, - - fireChangeEvent: function () { - var event = this._undoManager.buildEvent(); - this._notifier.fireEvent("modelUpdate", event); - } -}); diff --git a/mindplot/src/main/javascript/DesignerKeyboard.js b/mindplot/src/main/javascript/DesignerKeyboard.js deleted file mode 100644 index 48b8377c..00000000 --- a/mindplot/src/main/javascript/DesignerKeyboard.js +++ /dev/null @@ -1,397 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.DesignerKeyboard = new Class({ - Extends: mindplot.Keyboard, - Static:{ - register:function (designer) { - this._instance = new mindplot.DesignerKeyboard(designer); - }, - - getInstance:function () { - return this._instance; - } - }, - - initialize:function (designer) { - $assert(designer, "designer can not be null"); - this._registerEvents(designer); - }, - - _registerEvents:function (designer) { - - // Try with the keyboard .. - var model = designer.getModel(); - this.addShortcut( - ['backspace'], function (event) { - event.preventDefault(); - event.stopPropagation(); - designer.deleteSelectedEntities(); - } - ); - this.addShortcut( - ['space'], function() { - designer.shrinkSelectedBranch(); - } - ); - this.addShortcut( - ['f2'],function(event) { - event.stopPropagation(); - event.preventDefault(); - var node = model.selectedTopic(); - if (node) { - node.showTextEditor(); - } - } - ); - this.addShortcut( - ['del'], function(event) { - designer.deleteSelectedEntities(); - event.preventDefault(); - event.stopPropagation(); - } - ); - this.addShortcut( - ['enter'], function() { - designer.createSiblingForSelectedNode(); - } - ); - this.addShortcut( - ['insert'], function(event) { - designer.createChildForSelectedNode(); - event.preventDefault(); - event.stopPropagation(); - } - ); - this.addShortcut( - ['tab'], function(event) { - designer.createChildForSelectedNode(); - event.preventDefault(); - event.stopPropagation(); - } - ); - this.addShortcut( - ['meta+enter'], function(event) { - event.preventDefault(); - event.stopPropagation(); - designer.createChildForSelectedNode(); - } - ); - this.addShortcut( - ['ctrl+z', 'meta+z'], function(event) { - event.preventDefault(event); - event.stopPropagation(); - designer.undo(); - } - ); - this.addShortcut( - ['ctrl+c', 'meta+c'], function (event) { - event.preventDefault(event); - event.stopPropagation(); - designer.copyToClipboard(); - } - ); - this.addShortcut( - ['ctrl+v', 'meta+v'], function (event) { - event.preventDefault(event); - event.stopPropagation(); - designer.pasteClipboard(); - } - ); - this.addShortcut( - ['ctrl+shift+z', 'meta+shift+z', 'ctrl+y', 'meta+y'], function (event) { - event.preventDefault(); - event.stopPropagation(); - designer.redo(); - } - ); - this.addShortcut( - ['ctrl+a', 'meta+a'], function (event) { - event.preventDefault(); - event.stopPropagation(); - designer.selectAll(); - } - ); - this.addShortcut( - ['ctrl+b', 'meta+b'], function (event) { - event.preventDefault(); - event.stopPropagation(); - - designer.changeFontWeight(); - } - ); - this.addShortcut( - ['ctrl+s', 'meta+s'], function (event) { - event.preventDefault(); - event.stopPropagation(); - $(document).find('#save').trigger('click'); - } - ); - this.addShortcut( - ['ctrl+i', 'meta+i'], function (event) { - event.preventDefault(); - event.stopPropagation(); - - designer.changeFontStyle(); - } - ); - this.addShortcut( - ['ctrl+shift+a', 'meta+shift+a'], function (event) { - event.preventDefault(); - event.stopPropagation(); - - designer.deselectAll(); - } - ); - this.addShortcut( - ['meta+=', 'ctrl+='], function (event) { - event.preventDefault(); - event.stopPropagation(); - - designer.zoomIn(); - } - ); - this.addShortcut( - ['meta+-', 'ctrl+-'], function (event) { - event.preventDefault(); - event.stopPropagation(); - - designer.zoomOut(); - } - ); - var me = this; - this.addShortcut( - 'right', function (event) { - var node = model.selectedTopic(); - if (node) { - if (node.isCentralTopic()) { - me._goToSideChild(designer, node, 'RIGHT'); - } - else { - if (node.getPosition().x < 0) { - me._goToParent(designer, node); - } - else if (!node.areChildrenShrunken()) { - me._goToChild(designer, node); - } - } - } else { - var centralTopic = model.getCentralTopic(); - me._goToNode(designer, centralTopic); - } - event.preventDefault(); - event.stopPropagation(); - } - ); - this.addShortcut( - 'left', function (event) { - var node = model.selectedTopic(); - if (node) { - if (node.isCentralTopic()) { - me._goToSideChild(designer, node, 'LEFT'); - } - else { - if (node.getPosition().x > 0) { - me._goToParent(designer, node); - } - else if (!node.areChildrenShrunken()) { - me._goToChild(designer, node); - } - } - } else { - var centralTopic = model.getCentralTopic(); - me._goToNode(designer, centralTopic); - } - event.preventDefault(); - event.stopPropagation(); - } - ); - this.addShortcut( - 'up', function (event) { - var node = model.selectedTopic(); - if (node) { - if (!node.isCentralTopic()) { - me._goToBrother(designer, node, 'UP'); - } - } else { - var centralTopic = model.getCentralTopic(); - me._goToNode(designer, centralTopic); - } - event.preventDefault(); - event.stopPropagation(); - } - ); - this.addShortcut( - 'down', function (event) { - var node = model.selectedTopic(); - if (node) { - if (!node.isCentralTopic()) { - me._goToBrother(designer, node, 'DOWN'); - } - } else { - var centralTopic = model.getCentralTopic(); - me._goToNode(designer, centralTopic); - } - event.preventDefault(); - event.stopPropagation(); - } - ); - var excludes = ['esc', 'escape', 'f1', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10', 'f11', 'f12']; - - $(document).on('keypress', function (event) { - var keyCode; - // Firefox doesn't skip special keys for keypress event... - if (event.key && excludes.contains(event.key.toLowerCase())) { - return; - } - // Sometimes Firefox doesn't contain keyCode value - if (event.key && event.keyCode == 0) { - keyCode = event.charCode; - } else { - keyCode = event.keyCode; - } - - var specialKey = jQuery.hotkeys.specialKeys[keyCode]; - if (["enter", "capslock"].indexOf(specialKey) == -1 && !jQuery.hotkeys.shiftNums[keyCode]) { - var nodes = designer.getModel().filterSelectedTopics(); - if (nodes.length > 0) { - - // If a modifier is press, the key selected must be ignored. - var pressKey = String.fromCharCode(keyCode); - if (event.ctrlKey || event.altKey || event.metaKey) { - return; - } - nodes[0].showTextEditor(pressKey); - event.stopPropagation(); - } - } - - }); - - }, - - _goToBrother:function (designer, node, direction) { - var parent = node.getParent(); - if (parent) { - var brothers = parent.getChildren(); - - var target = node; - var y = node.getPosition().y; - var x = node.getPosition().x; - var dist = null; - for (var i = 0; i < brothers.length; i++) { - var sameSide = (x * brothers[i].getPosition().x) >= 0; - if (brothers[i] != node && sameSide) { - var brother = brothers[i]; - var brotherY = brother.getPosition().y; - if (direction == "DOWN" && brotherY > y) { - var distancia = y - brotherY; - if (distancia < 0) { - distancia = distancia * (-1); - } - if (dist == null || dist > distancia) { - dist = distancia; - target = brothers[i]; - } - } - else if (direction == "UP" && brotherY < y) { - var distance = y - brotherY; - if (distance < 0) { - distance = distance * (-1); - } - if (dist == null || dist > distance) { - dist = distance; - target = brothers[i]; - } - } - } - } - this._goToNode(designer, target); - } - }, - - - _goToSideChild:function (designer, node, side) { - var children = node.getChildren(); - if (children.length > 0) { - var target = children[0]; - var top = null; - for (var i = 0; i < children.length; i++) { - var child = children[i]; - var childY = child.getPosition().y; - if (side == 'LEFT' && child.getPosition().x < 0) { - if (top == null || childY < top) { - target = child; - top = childY; - } - } - if (side == 'RIGHT' && child.getPosition().x > 0) { - if (top == null || childY < top) { - target = child; - top = childY; - } - } - } - - this._goToNode(designer, target); - } - }, - - _goToParent:function (designer, node) { - var parent = node.getParent(); - if (parent) { - this._goToNode(designer, parent); - } - }, - - _goToChild:function (designer, node) { - var children = node.getChildren(); - if (children.length > 0) { - var target = children[0]; - var top = target.getPosition().y; - for (var i = 0; i < children.length; i++) { - var child = children[i]; - if (child.getPosition().y < top) { - top = child.getPosition().y; - target = child; - } - } - this._goToNode(designer, target); - } - }, - - _goToNode:function (designer, node) { - // First deselect all the nodes ... - designer.deselectAll(); - - // Give focus to the selected node.... - node.setOnFocus(true); - } - -}); - -mindplot.DesignerKeyboard.specialKeys = { - 8: "backspace", 9: "tab", 10: "return", 13: "enter", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause", - 20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", - 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", - 96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7", - 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", - 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", - 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 186: ";", 191: "/", - 220: "\\", 222: "'", 224: "meta" -}; \ No newline at end of file diff --git a/mindplot/src/main/javascript/DesignerModel.js b/mindplot/src/main/javascript/DesignerModel.js deleted file mode 100644 index 6fcd6762..00000000 --- a/mindplot/src/main/javascript/DesignerModel.js +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.DesignerModel = new Class(/** @lends DesignerModel */{ - Implements:[mindplot.Events], - /** - * @implements {mindplot.Events} - * @constructs - * @param {{readOnly: Boolean, zoom: Number, saveOnLoad: Boolean, size: {width: Number, - * height: Number}, viewPort: {width: Number, height: Number}, container: String, - * persistenceManager: String, mapId: String, locale: String}} options - * options loaded from json config - * @see {@link ConfigParameters.md} - * @see {@link editor.html} - */ - initialize:function (options) { - this._zoom = options.zoom; - this._topics = []; - this._relationships = []; - }, - - /** @return {Number} zoom between 0.3 (largest text) and 1.9 */ - getZoom:function () { - return this._zoom; - }, - - /** @param {Number} zoom number between 0.3 and 1.9 to set the zoom to */ - setZoom:function (zoom) { - this._zoom = zoom; - }, - - /** @return {@link mindplot.Topic[]} all topics */ - getTopics:function () { - return this._topics; - }, - - /** @return {mindplot.Relationship[]} all relationships */ - getRelationships:function () { - return this._relationships; - }, - - /** @return {mindplot.CentralTopic} the central topic */ - getCentralTopic:function () { - var topics = this.getTopics(); - return topics[0]; - }, - - /** @return {mindplot.Topic[]} selected topics */ - filterSelectedTopics:function () { - var result = []; - for (var i = 0; i < this._topics.length; i++) { - if (this._topics[i].isOnFocus()) { - result.push(this._topics[i]); - } - } - return result; - }, - - /** - * @return {mindplot.Relationship[]} selected relationships - */ - filterSelectedRelationships:function () { - var result = []; - for (var i = 0; i < this._relationships.length; i++) { - if (this._relationships[i].isOnFocus()) { - result.push(this._relationships[i]); - } - } - return result; - }, - - /** - * @return {Array.} all topics and relationships - */ - getEntities:function () { - var result = [].append(this._topics); - result.append(this._relationships); - return result; - }, - - /** - * removes occurrences of the given topic from the topic array - * @param {mindplot.Topic} topic the topic to remove - */ - removeTopic:function (topic) { - $assert(topic, "topic can not be null"); - this._topics.erase(topic); - }, - - /** - * removes occurrences of the given relationship from the relationship array - * @param {mindplot.Relationship} rel the relationship to remove - */ - removeRelationship:function (rel) { - $assert(rel, "rel can not be null"); - this._relationships.erase(rel); - }, - - /** - * adds the given topic to the topic array - * @param {mindplot.Topic} topic the topic to add - * @throws will throw an error if topic is null or undefined - * @throws will throw an error if the topic's id is not a number - */ - addTopic:function (topic) { - $assert(topic, "topic can not be null"); - $assert(typeof topic.getId() == "number", "id is not a number:" + topic.getId()); - this._topics.push(topic); - }, - - /** - * adds the given relationship to the relationship array - * @param {mindplot.Relationship} rel the relationship to add - * @throws will throw an error if rel is null or undefined - */ - addRelationship:function (rel) { - $assert(rel, "rel can not be null"); - this._relationships.push(rel); - }, - - /** - * @param {Function=} validate a function to validate nodes - * @param {String=} errorMsg an error message to display if the validation fails - * @return {String} returns an array of the selected (and, if applicable, valid) topics' ids - */ - filterTopicsIds:function (validate, errorMsg) { - var result = []; - var topics = this.filterSelectedTopics(); - - - var isValid = true; - for (var i = 0; i < topics.length; i++) { - var selectedNode = topics[i]; - if ($defined(validate)) { - isValid = validate(selectedNode); - } - - // Add node only if it's valid. - if (isValid) { - result.push(selectedNode.getId()); - } else { - $notify(errorMsg); - } - } - return result; - }, - - /** - * @return {mindplot.Topic} the first selected topic if one or more are found by the - * filterSelectedTopics function, null otherwise - */ - selectedTopic:function () { - var topics = this.filterSelectedTopics(); - return (topics.length > 0) ? topics[0] : null; - }, - - /** - * @param {String} id the id of the topic to be retrieved - * @return {mindplot.Topic} the topic with the respective id - */ - findTopicById:function (id) { - var result = null; - for (var i = 0; i < this._topics.length; i++) { - var topic = this._topics[i]; - if (topic.getId() == id) { - result = topic; - break; - } - } - return result; - - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/DesignerUndoManager.js b/mindplot/src/main/javascript/DesignerUndoManager.js deleted file mode 100644 index a982f067..00000000 --- a/mindplot/src/main/javascript/DesignerUndoManager.js +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.DesignerUndoManager = new Class({ - initialize: function(fireChange) { - this._undoQueue = []; - this._redoQueue = []; - this._baseId = 0; - }, - - enqueue:function(command) { - $assert(command, "Command can not be null"); - var length = this._undoQueue.length; - if (command.discardDuplicated && length > 0) { - // Skip duplicated events ... - var lastItem = this._undoQueue[length - 1]; - if (lastItem.discardDuplicated != command.discardDuplicated) { - this._undoQueue.push(command); - } - } else { - this._undoQueue.push(command); - } - this._redoQueue = []; - }, - - execUndo: function(commandContext) { - if (this._undoQueue.length > 0) { - var command = this._undoQueue.pop(); - this._redoQueue.push(command); - - command.undoExecute(commandContext); - } - }, - - execRedo: function(commandContext) { - if (this._redoQueue.length > 0) { - var command = this._redoQueue.pop(); - this._undoQueue.push(command); - command.execute(commandContext); - } - }, - - buildEvent: function() { - return {undoSteps: this._undoQueue.length, redoSteps:this._redoQueue.length}; - }, - - markAsChangeBase: function() { - var undoLength = this._undoQueue.length; - if (undoLength > 0) { - var command = this._undoQueue[undoLength - 1]; - this._baseId = command.getId(); - } else { - this._baseId = 0; - } - }, - - hasBeenChanged: function() { - var result = true; - var undoLength= this._undoQueue.length; - if (undoLength == 0 && this._baseId == 0) { - result = false; - } else if (undoLength > 0) { - var command = this._undoQueue[undoLength - 1]; - result = (this._baseId != command.getId()); - } - return result; - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/DragConnector.js b/mindplot/src/main/javascript/DragConnector.js deleted file mode 100644 index 2f2c9b1f..00000000 --- a/mindplot/src/main/javascript/DragConnector.js +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.DragConnector = new Class({ - initialize:function (designerModel, workspace) { - $assert(designerModel, 'designerModel can not be null'); - $assert(workspace, 'workspace can not be null'); - - // this._layoutManager = layoutManager; - this._designerModel = designerModel; - this._workspace = workspace; - }, - - checkConnection:function (dragTopic) { - var topics = this._designerModel.getTopics(); - - // Must be disconnected from their current connection ?. - var candidates = this._searchConnectionCandidates(dragTopic); - var currentConnection = dragTopic.getConnectedToTopic(); - - - if (currentConnection && (candidates.length == 0 || candidates[0] != currentConnection)) { - dragTopic.disconnect(this._workspace); - } - - // Finally, connect nodes ... - if (!dragTopic.isConnected() && candidates.length > 0) { - dragTopic.connectTo(candidates[0]); - } - }, - - _searchConnectionCandidates:function (dragTopic) { - var topics = this._designerModel.getTopics(); - var draggedNode = dragTopic.getDraggedTopic(); - - // Drag node connects to the border ... - var dragTopicWidth = dragTopic.getSize ? dragTopic.getSize().width : 0; // Hack... - var xMouseGap = dragTopic.getPosition().x > 0 ? 0 : dragTopicWidth; - var sPos = {x:dragTopic.getPosition().x - xMouseGap, y:dragTopic.getPosition().y}; - - // Perform a initial filter to discard topics: - // - Exclude dragged topic - // - Exclude dragTopic pivot - // - Nodes that are collapsed - // - It's not part of the branch dragged itself - topics = topics.filter(function (topic) { - var result = draggedNode != topic; - result = result && topic != draggedNode; - result = result && !topic.areChildrenShrunken() && !topic.isCollapsed(); - result = result && !draggedNode.isChildTopic(topic); - return result; - }); - - // Filter all the nodes that are outside the vertical boundary: - // * The node is to out of the x scope - // * The x distance greater the vertical tolerated distance - topics = topics.filter(function (topic) { - var tpos = topic.getPosition(); - // Center topic has different alignment than the rest of the nodes. That's why i need to divide it by two... - var txborder = tpos.x + (topic.getSize().width / 2) * Math.sign(sPos.x); - var distance = (sPos.x - txborder) * Math.sign(sPos.x); - return distance > 0 && (distance < mindplot.DragConnector.MAX_VERTICAL_CONNECTION_TOLERANCE); - - }); - - // Assign a priority based on the distance: - // - Alignment with the targetNode - // - Vertical distance - // - Horizontal proximity - // - It's already connected. - var currentConnection = dragTopic.getConnectedToTopic(); - var me = this; - topics = topics.sort(function (a, b) { - var aPos = a.getPosition(); - var bPos = b.getPosition(); - - var av = me._isVerticallyAligned(a.getSize(), aPos, sPos); - var bv = me._isVerticallyAligned(b.getSize(), bPos, sPos); - return me._proximityWeight(av, a, sPos, currentConnection) - me._proximityWeight(bv, b, sPos, currentConnection); - - }); - return topics; - }, - - _proximityWeight:function (isAligned, target, sPos, currentConnection) { - var tPos = target.getPosition(); - return (isAligned ? 0 : 200 ) + Math.abs(tPos.x - sPos.x) + Math.abs(tPos.y - sPos.y) + (currentConnection == target ? 0 : 100); - }, - - _isVerticallyAligned:function (targetSize, targetPosition, sourcePosition) { - - return Math.abs(sourcePosition.y - targetPosition.y) < targetSize.height / 2; - - } - -}); - -mindplot.DragConnector.MAX_VERTICAL_CONNECTION_TOLERANCE = 80; diff --git a/mindplot/src/main/javascript/DragManager.js b/mindplot/src/main/javascript/DragManager.js deleted file mode 100644 index dc51577e..00000000 --- a/mindplot/src/main/javascript/DragManager.js +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.DragManager = new Class({ - initialize:function(workspace, eventDispatcher) { - this._workspace = workspace; - this._designerModel = workspace; - this._listeners = {}; - this._isDragInProcess = false; - this._eventDispatcher = eventDispatcher; - mindplot.DragTopic.init(this._workspace); - }, - - add : function(node) { - // Add behaviour ... - var workspace = this._workspace; - var screen = workspace.getScreenManager(); - var dragManager = this; - var me = this; - var mouseDownListener = function(event) { - if (workspace.isWorkspaceEventsEnabled()) { - // Disable double drag... - workspace.enableWorkspaceEvents(false); - - // Set initial position. - var layoutManager = me._eventDispatcher.getLayoutManager(); - var dragNode = node.createDragNode(layoutManager); - - // Register mouse move listener ... - var mouseMoveListener = dragManager._buildMouseMoveListener(workspace, dragNode, dragManager); - screen.addEvent('mousemove', mouseMoveListener); - - // Register mouse up listeners ... - var mouseUpListener = dragManager._buildMouseUpListener(workspace, node, dragNode, dragManager); - screen.addEvent('mouseup', mouseUpListener); - - // Change cursor. - window.document.body.style.cursor = 'move'; - } - }; - node.addEvent('mousedown', mouseDownListener); - }, - - remove : function(node) { - var nodes = this._topics; - var contained = false; - var index = -1; - for (var i = 0; i < nodes.length; i++) { - if (nodes[i] == node) { - contained = true; - index = i; - } - } - }, - - _buildMouseMoveListener : function(workspace, dragNode, dragManager) { - var screen = workspace.getScreenManager(); - var me = this; - var result = function(event) { - - if (!me._isDragInProcess) { - // Execute Listeners .. - var startDragListener = dragManager._listeners['startdragging']; - startDragListener(event, dragNode); - - // Add shadow node to the workspace. - workspace.append(dragNode); - - me._isDragInProcess = true; - } - - var pos = screen.getWorkspaceMousePosition(event); - dragNode.setPosition(pos.x, pos.y); - - // Call mouse move listeners ... - var dragListener = dragManager._listeners['dragging']; - if ($defined(dragListener)) { - dragListener(event, dragNode); - } - - event.preventDefault(); - - }; - dragManager._mouseMoveListener = result; - return result; - }, - - _buildMouseUpListener : function(workspace, node, dragNode, dragManager) { - var screen = workspace.getScreenManager(); - var me = this; - var result = function(event) { - $assert(dragNode.isDragTopic, 'dragNode must be an DragTopic'); - - // Remove all the events. - screen.removeEvent('mousemove', dragManager._mouseMoveListener); - screen.removeEvent('mouseup', dragManager._mouseUpListener); - - // Help GC - dragManager._mouseMoveListener = null; - dragManager._mouseUpListener = null; - - workspace.enableWorkspaceEvents(true); - // Change the cursor to the default. - window.document.body.style.cursor = 'default'; - - if (me._isDragInProcess) { - - // Execute Listeners only if the node has been moved. - var endDragListener = dragManager._listeners['enddragging']; - endDragListener(event, dragNode); - - // Remove drag node from the workspace. - dragNode.removeFromWorkspace(workspace); - - me._isDragInProcess = false; - } - - - }; - dragManager._mouseUpListener = result; - return result; - }, - - /** - * type: - * - startdragging. - * - dragging - * - enddragging - */ - addEvent : function(type, listener) { - this._listeners[type] = listener; - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/DragPivot.js b/mindplot/src/main/javascript/DragPivot.js deleted file mode 100644 index 2e6d918f..00000000 --- a/mindplot/src/main/javascript/DragPivot.js +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.DragPivot = new Class({ - initialize:function() { - this._position = new core.Point(); - this._size = mindplot.DragTopic.PIVOT_SIZE; - - this._straightLine = this._buildStraightLine(); - this._curvedLine = this._buildCurvedLine(); - this._dragPivot = this._buildRect(); - this._connectRect = this._buildRect(); - this._targetTopic = null; - this._isVisible = false; - }, - - isVisible:function() { - return this._isVisible; - }, - - getTargetTopic : function() { - return this._targetTopic; - }, - - _buildStraightLine : function() { - var line = new web2d.CurvedLine(); - line.setStyle(web2d.CurvedLine.SIMPLE_LINE); - line.setStroke(1, 'solid', '#CC0033'); - line.setOpacity(0.4); - line.setVisibility(false); - return line; - }, - - _buildCurvedLine : function() { - var line = new web2d.CurvedLine(); - line.setStyle(web2d.CurvedLine.SIMPLE_LINE); - line.setStroke(1, 'solid', '#CC0033'); - line.setOpacity(0.4); - line.setVisibility(false); - return line; - }, - - - _redrawLine : function() { - // Update line position. - $assert(this.getTargetTopic(), 'Illegal invocation. Target node can not be null'); - - var pivotRect = this._getPivotRect(); - - // Pivot position has not changed. In this case, position change is not required. - var targetTopic = this.getTargetTopic(); - var position = this._position; - - // Calculate pivot connection point ... - var size = this._size; - var targetPosition = targetTopic.getPosition(); - var line = this._getConnectionLine(); - - // Update Line position. - var isAtRight = mindplot.util.Shape.isAtRight(targetPosition, position); - var pivotPoint = mindplot.util.Shape.calculateRectConnectionPoint(position, size, isAtRight); - line.setFrom(pivotPoint.x, pivotPoint.y); - - // Update rect position - var cx = position.x - (parseInt(size.width) / 2); - var cy = position.y - (parseInt(size.height) / 2); - pivotRect.setPosition(cx, cy); - - // Make line visible only when the position has been already changed. - // This solve several strange effects ;) - var targetPoint = targetTopic.workoutIncomingConnectionPoint(pivotPoint); - line.setTo(targetPoint.x, targetPoint.y); - }, - - setPosition : function(point) { - this._position = point; - this._redrawLine(); - }, - - getPosition : function() { - return this._position; - }, - - _buildRect : function() { - var size = this._size; - var rectAttributes = {fillColor:'#CC0033',opacity:0.4,width:size.width,height:size.height,strokeColor:'#FF9933'}; - var rect = new web2d.Rect(0, rectAttributes); - rect.setVisibility(false); - return rect; - }, - - _getPivotRect : function() { - return this._dragPivot; - }, - - getSize : function() { - var elem2d = this._getPivotRect(); - return elem2d.getSize(); - }, - - setVisibility : function(value) { - if (this.isVisible() != value) { - - var pivotRect = this._getPivotRect(); - pivotRect.setVisibility(value); - - var connectRect = this._connectRect; - connectRect.setVisibility(value); - - var line = this._getConnectionLine(); - if (line) { - line.setVisibility(value); - } - this._isVisible = value; - } - }, - - // If the node is connected, validate that there is a line connecting both... - _getConnectionLine : function() { - var result = null; - var parentTopic = this._targetTopic; - if (parentTopic) { - if (parentTopic.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { - result = this._straightLine; - } else { - result = this._curvedLine; - } - } - return result; - }, - - addToWorkspace : function(workspace) { - var pivotRect = this._getPivotRect(); - workspace.append(pivotRect); - - var connectToRect = this._connectRect; - workspace.append(connectToRect); - - // Add a hidden straight line ... - var straighLine = this._straightLine; - straighLine.setVisibility(false); - workspace.append(straighLine); - straighLine.moveToBack(); - - // Add a hidden curved line ... - var curvedLine = this._curvedLine; - curvedLine.setVisibility(false); - workspace.append(curvedLine); - curvedLine.moveToBack(); - - // Add a connect rect ... - var connectRect = this._connectRect; - connectRect.setVisibility(false); - workspace.append(connectRect); - connectRect.moveToBack(); - }, - - removeFromWorkspace : function(workspace) { - var shape = this._getPivotRect(); - workspace.removeChild(shape); - - var connectToRect = this._connectRect; - workspace.removeChild(connectToRect); - - if ($defined(this._straightLine)) { - workspace.removeChild(this._straightLine); - } - - if ($defined(this._curvedLine)) { - workspace.removeChild(this._curvedLine); - } - }, - - connectTo : function(targetTopic, position) { - $assert(!this._outgoingLine, 'Could not connect an already connected node'); - $assert(targetTopic != this, 'Circular connection are not allowed'); - $assert(position, 'position can not be null'); - $assert(targetTopic, 'parent can not be null'); - - this._position = position; - this._targetTopic = targetTopic; - - // Connected to Rect ... - var connectRect = this._connectRect; - var targetSize = targetTopic.getSize(); - - // Add 4 pixel in order to keep create a rect bigger than the topic. - var width = targetSize.width + 4; - var height = targetSize.height + 4; - - connectRect.setSize(width, height); - - var targetPosition = targetTopic.getPosition(); - var cx = Math.ceil(targetPosition.x - (width / 2)); - var cy = Math.ceil(targetPosition.y - (height / 2)); - connectRect.setPosition(cx, cy); - - // Change elements position ... - var pivotRect = this._getPivotRect(); - pivotRect.moveToFront(); - pivotRect.setPosition(position.x, position.y); - - this._redrawLine(); - }, - - disconnect : function(workspace) { - $assert(workspace, 'workspace can not be null.'); - $assert(this._targetTopic, 'There are not connected topic.'); - - this.setVisibility(false); - this._targetTopic = null; - } -}); diff --git a/mindplot/src/main/javascript/DragTopic.js b/mindplot/src/main/javascript/DragTopic.js deleted file mode 100644 index d0a55513..00000000 --- a/mindplot/src/main/javascript/DragTopic.js +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.DragTopic = new Class({ - initialize:function (dragShape, draggedNode, layoutManger) { - $assert(dragShape, 'Rect can not be null.'); - $assert(draggedNode, 'draggedNode can not be null.'); - $assert(layoutManger, 'layoutManger can not be null.'); - - this._elem2d = dragShape; - this._order = null; - this._draggedNode = draggedNode; - this._layoutManager = layoutManger; - this._position = new core.Point(); - this._isInWorkspace = false; - this._isFreeLayoutEnabled = false; - }, - - setOrder:function (order) { - this._order = order; - }, - - setPosition:function (x, y) { - // Update drag shadow position .... - var position = {x:x, y:y}; - if (this.isFreeLayoutOn() && this.isConnected()) { - var _layoutManager = this._layoutManager; - var par = this.getConnectedToTopic(); - position = _layoutManager.predict(par.getId(), this._draggedNode.getId(), position, true).position; - } - this._position.setValue(position.x, position.y); - - // Elements are positioned in the center. - // All topic element must be positioned based on the innerShape. - var draggedNode = this._draggedNode; - var size = draggedNode.getSize(); - var cx = position.x - (position.x > 0 ? 0 : size.width); - var cy = Math.ceil(position.y - (size.height / 2)); - this._elem2d.setPosition(cx, cy); - - // In case is not free, pivot must be draw ... - if (this.isConnected() && !this.isFreeLayoutOn()) { - var parent = this.getConnectedToTopic(); - var predict = this._layoutManager.predict(parent.getId(), this._draggedNode.getId(), this.getPosition()); - if (this._order != predict.order) { - var dragPivot = this._getDragPivot(); - var pivotPosition = predict.position; - dragPivot.connectTo(parent, pivotPosition); - this.setOrder(predict.order); - } - } - }, - - updateFreeLayout:function (event) { - var isFreeEnabled = (event.metaKey && Browser.Platform.mac) || (event.ctrlKey && !Browser.Platform.mac); - if (this.isFreeLayoutOn() != isFreeEnabled) { - var dragPivot = this._getDragPivot(); - dragPivot.setVisibility(!isFreeEnabled); - this._isFreeLayoutEnabled = isFreeEnabled; - } - }, - - setVisibility:function (value) { - var dragPivot = this._getDragPivot(); - dragPivot.setVisibility(value); - }, - - isVisible:function () { - var dragPivot = this._getDragPivot(); - return dragPivot.isVisible(); - }, - - getInnerShape:function () { - return this._elem2d; - }, - - disconnect:function (workspace) { - // Clear connection line ... - var dragPivot = this._getDragPivot(); - dragPivot.disconnect(workspace); - }, - - connectTo:function (parent) { - $assert(parent, 'Parent connection node can not be null.'); - - // Where it should be connected ? - var predict = designer._eventBussDispatcher._layoutManager.predict(parent.getId(), this._draggedNode.getId(), this.getPosition()); - - // Connect pivot ... - var dragPivot = this._getDragPivot(); - var position = predict.position; - dragPivot.connectTo(parent, position); - dragPivot.setVisibility(true); - - this.setOrder(predict.order); - }, - - getDraggedTopic:function () { - return this._draggedNode; - }, - - removeFromWorkspace:function (workspace) { - if (this._isInWorkspace) { - // Remove drag shadow. - workspace.removeChild(this._elem2d); - - // Remove pivot shape. To improve performance it will not be removed. Only the visibility will be changed. - var dragPivot = this._getDragPivot(); - dragPivot.setVisibility(false); - - this._isInWorkspace = false; - } - }, - - isInWorkspace:function () { - return this._isInWorkspace; - }, - - addToWorkspace:function (workspace) { - if (!this._isInWorkspace) { - workspace.append(this._elem2d); - var dragPivot = this._getDragPivot(); - dragPivot.addToWorkspace(workspace); - this._isInWorkspace = true; - } - }, - - _getDragPivot:function () { - return mindplot.DragTopic.__getDragPivot(); - }, - - getPosition:function () { - return this._position; - }, - - isDragTopic:function () { - return true; - }, - - applyChanges:function (workspace) { - $assert(workspace, 'workspace can not be null'); - - - var actionDispatcher = mindplot.ActionDispatcher.getInstance(); - var draggedTopic = this.getDraggedTopic(); - var topicId = draggedTopic.getId(); - var position = this.getPosition(); - - if (!this.isFreeLayoutOn()) { - var order = null; - var parent = null; - var isDragConnected = this.isConnected(); - if (isDragConnected) { - var targetTopic = this.getConnectedToTopic(); - order = this._order; - parent = targetTopic; - } - - // If the node is not connected, position based on the original drag topic position. - actionDispatcher.dragTopic(topicId, position, order, parent); - } else { - actionDispatcher.moveTopic(topicId, position); - } - }, - - getConnectedToTopic:function () { - var dragPivot = this._getDragPivot(); - return dragPivot.getTargetTopic(); - }, - - isConnected:function () { - return this.getConnectedToTopic() != null; - }, - - isFreeLayoutOn:function () { -// return this._isFreeLayoutEnabled; - // Disable free layout ... - return false; - } - -}); - -mindplot.DragTopic.PIVOT_SIZE = {width:50, height:6}; - -mindplot.DragTopic.init = function (workspace) { - - $assert(workspace, "workspace can not be null"); - var pivot = mindplot.DragTopic.__getDragPivot(); - workspace.append(pivot); -}; - -mindplot.DragTopic.__getDragPivot = function () { - var result = mindplot.DragTopic._dragPivot; - if (!$defined(result)) { - result = new mindplot.DragPivot(); - mindplot.DragTopic._dragPivot = result; - } - return result; -}; - diff --git a/mindplot/src/main/javascript/EditorOptions.js b/mindplot/src/main/javascript/EditorOptions.js deleted file mode 100644 index d2d73742..00000000 --- a/mindplot/src/main/javascript/EditorOptions.js +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.EditorOptions = -{ - LayoutManager:"OriginalLayout", -// LayoutManager:"FreeMindLayout", - textEditor:"TextEditor" -// textEditor:"RichTextEditor" -}; diff --git a/mindplot/src/main/javascript/EditorProperties.js b/mindplot/src/main/javascript/EditorProperties.js deleted file mode 100644 index ef7e345d..00000000 --- a/mindplot/src/main/javascript/EditorProperties.js +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.EditorProperties = new Class({ - initialize: function () { - this._zoom = 0; - this._position = 0; - }, - - setZoom: function (zoom) { - this._zoom = zoom; - }, - - getZoom: function () { - return this._zoom; - }, - - asProperties: function () { - return "zoom=" + this._zoom + "\n"; - } -}); - - - - diff --git a/mindplot/src/main/javascript/Events.js b/mindplot/src/main/javascript/Events.js deleted file mode 100644 index fe239881..00000000 --- a/mindplot/src/main/javascript/Events.js +++ /dev/null @@ -1,41 +0,0 @@ -mindplot.Events = new Class({ - - $events: {}, - - _removeOn: function (string) { - return string.replace(/^on([A-Z])/, function (full, first) { - return first.toLowerCase(); - }); - }, - - addEvent: function (type, fn, internal) { - type = this._removeOn(type); - - this.$events[type] = (this.$events[type] || []).include(fn); - if (internal) fn.internal = true; - return this; - }, - - fireEvent: function (type, args, delay) { - type = this._removeOn(type); - var events = this.$events[type]; - if (!events) return this; - args = Array.from(args); - _.each(events, function (fn) { - if (delay) fn.delay(delay, this, args); - else fn.apply(this, args); - }, this); - return this; - }, - - removeEvent: function (type, fn) { - type = this._removeOn(type); - var events = this.$events[type]; - if (events && !fn.internal) { - var index = events.indexOf(fn); - if (index != -1) events.splice(index, 1); - } - return this; - } - -}); diff --git a/mindplot/src/main/javascript/Icon.js b/mindplot/src/main/javascript/Icon.js deleted file mode 100644 index 491808a1..00000000 --- a/mindplot/src/main/javascript/Icon.js +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.Icon = new Class({ - initialize: function (url) { - $assert(url, 'topic can not be null'); - this._image = new web2d.Image(); - this._image.setHref(url); - this._image.setSize(mindplot.Icon.SIZE, mindplot.Icon.SIZE); - }, - - getImage: function () { - return this._image; - }, - - setGroup: function (group) { - this._group = group; - }, - - getGroup: function () { - return this._group; - }, - - getSize: function () { - return this._image.getSize(); - }, - - getPosition: function () { - return this._image.getPosition(); - }, - - addEvent: function (type, fnc) { - this._image.addEvent(type, fnc); - }, - - remove: function () { - throw "Unsupported operation"; - } -}); - -mindplot.Icon.SIZE = 90; - - - - diff --git a/mindplot/src/main/javascript/IconGroup.js b/mindplot/src/main/javascript/IconGroup.js deleted file mode 100644 index 6c8a3d67..00000000 --- a/mindplot/src/main/javascript/IconGroup.js +++ /dev/null @@ -1,340 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.IconGroup = new Class(/**@lends IconGroup */{ - /** - * @constructs - * @param topicId - * @param iconSize - * @throws will throw an error if topicId is null or undefined - * @throws will throw an error if iconSize is null or undefined - */ - initialize: function (topicId, iconSize) { - $assert($defined(topicId), "topicId can not be null"); - $assert($defined(iconSize), "iconSize can not be null"); - - this._icons = []; - this._group = new web2d.Group({ - width: 0, - height: iconSize, - x: 0, - y: 0, - coordSizeWidth: 0, - coordSizeHeight: 100 - }); - this._removeTip = new mindplot.IconGroup.RemoveTip(this._group, topicId); - this.seIconSize(iconSize, iconSize); - - this._registerListeners(); - - }, - - /** */ - setPosition: function (x, y) { - this._group.setPosition(x, y); - }, - - /** */ - getPosition: function () { - return this._group.getPosition(); - }, - - /** */ - getNativeElement: function () { - return this._group; - }, - - /** */ - getSize: function () { - return this._group.getSize(); - }, - - /** */ - seIconSize: function (width, height) { - this._iconSize = {width: width, height: height}; - this._resize(this._icons.length); - }, - - /** - * @param icon the icon to be added to the icon group - * @param {Boolean} remove - * @throws will throw an error if icon is not defined - */ - addIcon: function (icon, remove) { - $defined(icon, "icon is not defined"); - - icon.setGroup(this); - this._icons.push(icon); - - // Adjust group and position ... - this._resize(this._icons.length); - this._positionIcon(icon, this._icons.length - 1); - - var imageShape = icon.getImage(); - this._group.append(imageShape); - - // Register event for the group .. - if (remove) { - this._removeTip.decorate(this._topicId, icon); - } - }, - - _findIconFromModel: function (iconModel) { - var result = null; - _.each(this._icons, function (icon) { - var elModel = icon.getModel(); - if (elModel.getId() == iconModel.getId()) { - result = icon; - } - }, this); - - if (result == null) { - throw new Error("Icon can no be found:" + iconModel.getId() + ", Icons:" + this._icons); - } - - return result; - }, - - /** */ - removeIconByModel: function (featureModel) { - $assert(featureModel, "featureModel can not be null"); - - var icon = this._findIconFromModel(featureModel); - this._removeIcon(icon); - }, - - _removeIcon: function (icon) { - $assert(icon, "icon can not be null"); - - this._removeTip.close(0); - this._group.removeChild(icon.getImage()); - - this._icons.erase(icon); - this._resize(this._icons.length); - var me = this; - // Add all again ... - _.each(this._icons, function (elem, i) { - me._positionIcon(elem, i); - }); - }, - - /** */ - moveToFront: function () { - this._group.moveToFront(); - }, - - _registerListeners: function () { - this._group.addEvent('click', function (event) { - // Avoid node creation ... - event.stopPropagation(); - - }); - - this._group.addEvent('dblclick', function (event) { - event.stopPropagation(); - - }); - }, - - _resize: function (iconsLength) { - this._group.setSize(iconsLength * this._iconSize.width, this._iconSize.height); - - var iconSize = mindplot.Icon.SIZE + (mindplot.IconGroup.ICON_PADDING * 2); - this._group.setCoordSize(iconsLength * iconSize, iconSize); - }, - - _positionIcon: function (icon, order) { - - var iconSize = mindplot.Icon.SIZE + (mindplot.IconGroup.ICON_PADDING * 2); - icon.getImage().setPosition(iconSize * order + mindplot.IconGroup.ICON_PADDING, mindplot.IconGroup.ICON_PADDING); - } -}); - -/** - * @constant - * @type {Number} - * @default - */ -mindplot.IconGroup.ICON_PADDING = 5; - -mindplot.IconGroup.RemoveTip = new Class(/** @lends IconGroup.RemoveTip */{ - /** - * @classdesc inner class of IconGroup - * @constructs - * @param container - */ - initialize: function (container) { - $assert(container, "group can not be null"); - this._fadeElem = container; - }, - - - /** - * @param topicId - * @param icon - * @throws will throw an error if icon is null or undefined - */ - show: function (topicId, icon) { - $assert(icon, 'icon can not be null'); - - // Nothing to do ... - if (this._activeIcon != icon) { - // If there is an active icon, close it first ... - if (this._activeIcon) { - this.close(0); - } - - // Now, let move the position the icon... - var pos = icon.getPosition(); - - // Register events ... - var widget = this._buildWeb2d(); - widget.addEvent('click', function () { - icon.remove(); - }); - - var me = this; - - widget.addEvent('mouseover', function () { - me.show(topicId, icon); - }); - - widget.addEvent('mouseout', function () { - me.hide(); - }); - - widget.setPosition(pos.x + 80, pos.y - 50); - this._fadeElem.append(widget); - - // Setup current element ... - this._activeIcon = icon; - this._widget = widget; - - } else { - clearTimeout(this._closeTimeoutId); - } - }, - - /** */ - hide: function () { - this.close(200); - }, - - /** - * @param delay - */ - close: function (delay) { - - // This is not ok, trying to close the same dialog twice ? - if (this._closeTimeoutId) { - clearTimeout(this._closeTimeoutId) - } - - var me = this; - if (this._activeIcon) { - var widget = this._widget; - var close = function () { - me._activeIcon = null; - me._fadeElem.removeChild(widget); - me._widget = null; - me._closeTimeoutId = null; - }; - - if (!$defined(delay) || delay == 0) { - close(); - } - else { - this._closeTimeoutId = close.delay(delay); - } - } - }, - - _buildWeb2d: function () { - var result = new web2d.Group({ - width: 10, - height: 10, - x: 0, - y: 0, - coordSizeWidth: 10, - coordSizeHeight: 10 - }); - - var outerRect = new web2d.Rect(0, { - x: 0, - y: 0, - width: 10, - height: 10, - stroke: '0', - fillColor: 'black' - }); - result.append(outerRect); - outerRect.setCursor('pointer'); - - var innerRect = new web2d.Rect(0, { - x: 1, - y: 1, - width: 8, - height: 8, - stroke: '1 solid white', - fillColor: 'gray' - }); - result.append(innerRect); - - var line = new web2d.Line({stroke: '1 solid white'}); - line.setFrom(1, 1); - line.setTo(9, 9); - result.append(line); - - var line2 = new web2d.Line({stroke: '1 solid white'}); - line2.setFrom(1, 9); - line2.setTo(9, 1); - result.append(line2); - - // Some events ... - result.addEvent('mouseover', function () { - innerRect.setFill('#CC0033'); - }); - result.addEvent('mouseout', function () { - innerRect.setFill('gray'); - }); - - result.setSize(50, 50); - return result; - }, - - /** - * @param topicId - * @param icon - */ - decorate: function (topicId, icon) { - - var me = this; - - if (!icon.__remove) { - icon.addEvent('mouseover', function () { - me.show(topicId, icon); - }); - - icon.addEvent('mouseout', function () { - me.hide(); - }); - icon.__remove = true; - } - } - -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/ImageIcon.js b/mindplot/src/main/javascript/ImageIcon.js deleted file mode 100644 index a2fe6763..00000000 --- a/mindplot/src/main/javascript/ImageIcon.js +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.ImageIcon = new Class({ - Extends: mindplot.Icon, - initialize: function (topic, iconModel, readOnly) { - $assert(iconModel, 'iconModel can not be null'); - $assert(topic, 'topic can not be null'); - - this._topicId = topic.getId(); - this._featureModel = iconModel; - - // Build graph image representation ... - var iconType = iconModel.getIconType(); - var imgUrl = this._getImageUrl(iconType); - this.parent(imgUrl); - - if (!readOnly) { - - //Icon - var image = this.getImage(); - var me = this; - image.addEvent('click', function () { - - var iconType = iconModel.getIconType(); - var newIconType = me._getNextFamilyIconId(iconType); - iconModel.setIconType(newIconType); - - var imgUrl = me._getImageUrl(newIconType); - me._image.setHref(imgUrl); - - }); - this._image.setCursor('pointer'); - } - }, - - _getImageUrl: function (iconId) { - return "icons/" + iconId + ".png"; - }, - - getModel: function () { - return this._featureModel; - }, - - _getNextFamilyIconId: function (iconId) { - - var familyIcons = this._getFamilyIcons(iconId); - $assert(familyIcons != null, "Family Icon not found!"); - - var result = null; - for (var i = 0; i < familyIcons.length && result == null; i++) { - if (familyIcons[i] == iconId) { - //Is last one? - if (i == (familyIcons.length - 1)) { - result = familyIcons[0]; - } else { - result = familyIcons[i + 1]; - } - break; - } - } - - return result; - }, - - _getFamilyIcons: function (iconId) { - $assert(iconId != null, "id must not be null"); - $assert(iconId.indexOf("_") != -1, "Invalid icon id (it must contain '_')"); - - var result = null; - for (var i = 0; i < mindplot.ImageIcon.prototype.ICON_FAMILIES.length; i++) { - var family = mindplot.ImageIcon.prototype.ICON_FAMILIES[i]; - var iconFamilyId = iconId.substr(0, iconId.indexOf("_")); - - if (family.id == iconFamilyId) { - result = family.icons; - break; - } - } - return result; - }, - - remove: function () { - var actionDispatcher = mindplot.ActionDispatcher.getInstance(); - var featureId = this._featureModel.getId(); - var topicId = this._topicId; - actionDispatcher.removeFeatureFromTopic(topicId, featureId); - } -}); - -mindplot.ImageIcon.prototype.ICON_FAMILIES = [ - {"id": "face", "icons": ["face_plain", "face_sad", "face_crying", "face_smile", "face_surprise", "face_wink"]}, - {"id": "funy", "icons": ["funy_angel", "funy_devilish", "funy_glasses", "funy_grin", "funy_kiss", "funy_monkey"]}, - {"id": "conn", "icons": ["conn_connect", "conn_disconnect"]}, - { - "id": "sport", - "icons": ["sport_basketball", "sport_football", "sport_golf", "sport_raquet", "sport_shuttlecock", "sport_soccer", "sport_tennis"] - }, - {"id": "bulb", "icons": ["bulb_light_on", "bulb_light_off"]}, - {"id": "thumb", "icons": ["thumb_thumb_up", "thumb_thumb_down"]}, - {"id": "tick", "icons": ["tick_tick", "tick_cross"]}, - { - "id": "onoff", - "icons": ["onoff_clock", "onoff_clock_red", "onoff_add", "onoff_delete", "onoff_status_offline", "onoff_status_online"] - }, - { - "id": "money", - "icons": ["money_money", "money_dollar", "money_euro", "money_pound", "money_yen", "money_coins", "money_ruby"] - }, - {"id": "time", "icons": ["time_calendar", "time_clock", "time_hourglass"]}, - { - "id": "number", - "icons": ["number_1", "number_2", "number_3", "number_4", "number_5", "number_6", "number_7", "number_8", "number_9"] - }, - {"id": "chart", "icons": ["chart_bar", "chart_line", "chart_curve", "chart_pie", "chart_organisation"]}, - {"id": "sign", "icons": ["sign_warning", "sign_info", "sign_stop", "sign_help", "sign_cancel"]}, - { - "id": "hard", - "icons": ["hard_cd", "hard_computer", "hard_controller", "hard_driver_disk", "hard_ipod", "hard_keyboard", "hard_mouse", "hard_printer"] - }, - { - "id": "soft", - "icons": ["soft_bug", "soft_cursor", "soft_database_table", "soft_database", "soft_feed", "soft_folder_explore", "soft_rss", "soft_penguin"] - }, - {"id": "arrow", "icons": ["arrow_up", "arrow_down", "arrow_left", "arrow_right"]}, - { - "id": "arrowc", - "icons": ["arrowc_rotate_anticlockwise", "arrowc_rotate_clockwise", "arrowc_turn_left", "arrowc_turn_right"] - }, - {"id": "people", "icons": ["people_group", "people_male1", "people_male2", "people_female1", "people_female2"]}, - {"id": "mail", "icons": ["mail_envelop", "mail_mailbox", "mail_edit", "mail_list"]}, - {"id": "flag", "icons": ["flag_blue", "flag_green", "flag_orange", "flag_pink", "flag_purple", "flag_yellow"]}, - { - "id": "bullet", - "icons": ["bullet_black", "bullet_blue", "bullet_green", "bullet_orange", "bullet_red", "bullet_pink", "bullet_purple"] - }, - {"id": "tag", "icons": ["tag_blue", "tag_green", "tag_orange", "tag_red", "tag_pink", "tag_yellow"]}, - { - "id": "object", - "icons": ["object_bell", "object_clanbomber", "object_key", "object_pencil", "object_phone", "object_magnifier", "object_clip", "object_music", "object_star", "object_wizard", "object_house", "object_cake", "object_camera", "object_palette", "object_rainbow"] - }, - { - "id": "weather", - "icons": ["weather_clear-night", "weather_clear", "weather_few-clouds-night", "weather_few-clouds", "weather_overcast", "weather_severe-alert", "weather_showers-scattered", "weather_showers", "weather_snow", "weather_storm"] - }, - {"id": "task", "icons": ["task_0", "task_25", "task_50", "task_75", "task_100"]} -]; - diff --git a/mindplot/src/main/javascript/Keyboard.js b/mindplot/src/main/javascript/Keyboard.js deleted file mode 100644 index dbb80180..00000000 --- a/mindplot/src/main/javascript/Keyboard.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.Keyboard = new Class({ - - initialize: function () { - }, - - addShortcut: function (shortcuts, callback) { - if (!$.isArray(shortcuts)) { - shortcuts = [shortcuts]; - } - _.each(shortcuts, function (shortcut) { - $(document).bind('keydown', shortcut, callback); - }); - } - -}); diff --git a/mindplot/src/main/javascript/LinkIcon.js b/mindplot/src/main/javascript/LinkIcon.js deleted file mode 100644 index cd57959c..00000000 --- a/mindplot/src/main/javascript/LinkIcon.js +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.LinkIcon = new Class({ - - Extends: mindplot.Icon, - initialize: function (topic, linkModel, readOnly) { - $assert(topic, 'topic can not be null'); - $assert(linkModel, 'linkModel can not be null'); - - this.parent(mindplot.LinkIcon.IMAGE_URL); - this._linksModel = linkModel; - this._topic = topic; - this._readOnly = readOnly; - - this._registerEvents(); - }, - - _registerEvents: function () { - this._image.setCursor('pointer'); - this._tip = new mindplot.widget.LinkIconTooltip(this); - - var me = this; - if (!this._readOnly) { - // Add on click event to open the editor ... - this.addEvent('click', function (event) { - me._tip.hide(); - me._topic.showLinkEditor(); - event.stopPropagation(); - }); - //FIXME: we shouldn't have timeout of that.. - this.addEvent("mouseleave", function (event) { - window.setTimeout(function () { - if (!$("#linkPopover:hover").length) { - me._tip.hide(); - } - event.stopPropagation(); - }, 100) - }); - } - - $(this.getImage()._peer._native).mouseenter(function () { - me._tip.show(); - }) - }, - - getModel: function () { - return this._linksModel; - } -}); -mindplot.LinkIcon.IMAGE_URL = "images/links.png"; - - \ No newline at end of file diff --git a/mindplot/src/main/javascript/LocalStorageManager.js b/mindplot/src/main/javascript/LocalStorageManager.js deleted file mode 100644 index 7063a187..00000000 --- a/mindplot/src/main/javascript/LocalStorageManager.js +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.LocalStorageManager = new Class({ - Extends: mindplot.PersistenceManager, - initialize: function (documentUrl, forceLoad) { - this.parent(); - this.documentUrl = documentUrl; - this.forceLoad = forceLoad; - }, - - saveMapXml: function (mapId, mapXml, pref, saveHistory, events) { - localStorage.setItem(mapId + "-xml", mapXml); - }, - - discardChanges: function (mapId) { - localStorage.removeItem(mapId + "-xml"); - }, - - loadMapDom: function (mapId) { - var xml = localStorage.getItem(mapId + "-xml"); - if (xml == null || this.forceLoad) { - $.ajax({ - url: this.documentUrl.replace("{id}", mapId), - headers: {"Content-Type": "text/plain", "Accept": "application/xml"}, - type: 'get', - dataType: "text", - async: false, - success: function (response) { - xml = response; - } - }); - // If I could not load it from a file, hard code one. - if (xml == null) { - throw new Error("Map could not be loaded"); - } - } - - return jQuery.parseXML(xml); - }, - - unlockMap: function (mindmap) { - // Ignore, no implementation required ... - } - } -); - - diff --git a/mindplot/src/main/javascript/MainTopic.js b/mindplot/src/main/javascript/MainTopic.js deleted file mode 100644 index 29d3cd60..00000000 --- a/mindplot/src/main/javascript/MainTopic.js +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.MainTopic = new Class(/** @lends MainTopic */{ - Extends: mindplot.Topic, - /** - * @extends mindplot.Topic - * @constructs - * @param model - * @param options - */ - initialize: function (model, options) { - this.parent(model, options); - }, - - INNER_RECT_ATTRIBUTES: {stroke: '0.5 solid #009900'}, - - _buildDragShape: function () { - var innerShape = this._buildShape(this.INNER_RECT_ATTRIBUTES, this.getShapeType()); - var size = this.getSize(); - innerShape.setSize(size.width, size.height); - innerShape.setPosition(0, 0); - innerShape.setOpacity(0.5); - innerShape.setCursor('default'); - innerShape.setVisibility(true); - - var brColor = this.getBorderColor(); - innerShape.setAttribute("strokeColor", brColor); - - var bgColor = this.getBackgroundColor(); - innerShape.setAttribute("fillColor", bgColor); - - // Create group ... - var groupAttributes = {width: 100, height: 100, coordSizeWidth: 100, coordSizeHeight: 100}; - var group = new web2d.Group(groupAttributes); - group.append(innerShape); - - // Add Text ... - if (this.getShapeType() != mindplot.model.TopicShape.IMAGE) { - var textShape = this._buildTextShape(true); - var text = this.getText(); - textShape.setText(text); - textShape.setOpacity(0.5); - group.append(textShape); - } - return group; - }, - - /** */ - updateTopicShape: function (targetTopic, workspace) { - // Change figure based on the connected topic ... - var model = this.getModel(); - var shapeType = model.getShapeType(); - if (!targetTopic.isCentralTopic()) { - if (!$defined(shapeType)) { - // Get the real shape type ... - shapeType = this.getShapeType(); - this._setShapeType(shapeType, false); - } - } - }, - - /** */ - disconnect: function (workspace) { - this.parent(workspace); - var size = this.getSize(); - - var model = this.getModel(); - var shapeType = model.getShapeType(); - if (!$defined(shapeType)) { - // Change figure ... - shapeType = this.getShapeType(); - this._setShapeType(mindplot.model.TopicShape.ROUNDED_RECT, false); - } - var innerShape = this.getInnerShape(); - innerShape.setVisibility(true); - }, - - _updatePositionOnChangeSize: function (oldSize, newSize) { - - var xOffset = Math.round((newSize.width - oldSize.width) / 2); - var pos = this.getPosition(); - if ($defined(pos)) { - if (pos.x > 0) { - pos.x = pos.x + xOffset; - } else { - pos.x = pos.x - xOffset; - } - this.setPosition(pos); - } - }, - - /** */ - workoutIncomingConnectionPoint: function (sourcePosition) { - return mindplot.util.Shape.workoutIncomingConnectionPoint(this, sourcePosition); - }, - - /** */ - workoutOutgoingConnectionPoint: function (targetPosition) { - $assert(targetPosition, 'targetPoint can not be null'); - var pos = this.getPosition(); - var isAtRight = mindplot.util.Shape.isAtRight(targetPosition, pos); - var size = this.getSize(); - - var result; - if (this.getShapeType() == mindplot.model.TopicShape.LINE) { - - result = new core.Point(); - var groupPosition = this._elem2d.getPosition(); - var innerShareSize = this.getInnerShape().getSize(); - - if (innerShareSize) { - var magicCorrectionNumber = 0.3; - if (!isAtRight) { - result.x = groupPosition.x + innerShareSize.width - magicCorrectionNumber; - } else { - result.x = groupPosition.x + magicCorrectionNumber; - } - result.y = groupPosition.y + innerShareSize.height; - } else { - // Hack: When the size has not being defined. This is because the node has not being added. - // Try to do our best ... - if (!isAtRight) { - result.x = pos.x + (size.width / 2); - } else { - result.x = pos.x - (size.width / 2); - } - result.y = pos.y + (size.height / 2); - } - - } else { - result = mindplot.util.Shape.calculateRectConnectionPoint(pos, size, isAtRight, true); - } - return result; - } - -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/Messages.js b/mindplot/src/main/javascript/Messages.js deleted file mode 100644 index 0e73f26c..00000000 --- a/mindplot/src/main/javascript/Messages.js +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.Messages = new Class({ - Static: { - init: function (locale) { - locale = $defined(locale) ? locale : 'en'; - var bundle = mindplot.Messages.BUNDLES[locale]; - if (bundle == null && locale.indexOf("_") != -1) { - // Try to locate without the specialization ... - locale = locale.substring(0, locale.indexOf("_")); - bundle = mindplot.Messages.BUNDLES[locale]; - } - mindplot.Messages.__bundle = bundle; - } - } -}); - -$msg = function (key) { - if (!mindplot.Messages.__bundle) { - mindplot.Messages.init('en'); - } - - var msg = mindplot.Messages.__bundle[key]; - return msg ? msg : key; -}; - -mindplot.Messages.BUNDLES = {}; - diff --git a/mindplot/src/main/javascript/MultilineTextEditor.js b/mindplot/src/main/javascript/MultilineTextEditor.js deleted file mode 100644 index c94e308d..00000000 --- a/mindplot/src/main/javascript/MultilineTextEditor.js +++ /dev/null @@ -1,313 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.MultilineTextEditor = new Class({ - Extends: mindplot.Events, - initialize: function () { - this._topic = null; - this._timeoutId = -1; - }, - - _buildEditor: function () { - - var result = $('
') - .attr('id', 'textContainer') - .css({ - display: "none", - zIndex: "8", - overflow: "hidden", - border: "0 none" - }); - - - var textareaElem = $('') - .css({ - border: "1px gray dashed", - background: "rgba(98, 135, 167, .3)", - outline: '0 none', - resize: 'none', - overflow: "hidden" - }); - - result.append(textareaElem); - return result; - }, - - _registerEvents: function (containerElem) { - var textareaElem = this._getTextareaElem(); - var me = this; - textareaElem.on('keydown', function (event) { - switch (jQuery.hotkeys.specialKeys[event.keyCode]) { - case 'esc': - me.close(false); - break; - case 'enter': - if (event.metaKey || event.ctrlKey) { - - // Add return ... - var text = textareaElem.val(); - var cursorPosition = text.length; - if (textareaElem.selectionStart) { - cursorPosition = textareaElem.selectionStart; - } - - var head = text.substring(0, cursorPosition); - var tail = ""; - if (cursorPosition < text.length) { - tail = text.substring(cursorPosition, text.length); - } - textareaElem.val(head + "\n" + tail); - - // Position cursor ... - if (textareaElem[0].setSelectionRange) { - textareaElem.focus(); - textareaElem[0].setSelectionRange(cursorPosition + 1, cursorPosition + 1); - } else if (textareaElem.createTextRange) { - var range = textareaElem.createTextRange(); - range.moveStart('character', cursorPosition + 1); - range.select(); - } - - } - else { - me.close(true); - } - break; - case 'tab': - event.preventDefault(); - var start = $(this).get(0).selectionStart; - var end = $(this).get(0).selectionEnd; - - // set textarea value to: text before caret + tab + text after caret - $(this).val($(this).val().substring(0, start) + "\t" + $(this).val().substring(end)); - - // put caret at right position again - $(this).get(0).selectionStart = $(this).get(0).selectionEnd = start + 1; - break; - } - event.stopPropagation(); - }); - - textareaElem.on('keypress', function (event) { - event.stopPropagation(); - }); - - textareaElem.on('keyup', function (event) { - var text = me._getTextareaElem().val(); - me.fireEvent('input', [event, text]); - me._adjustEditorSize(); - }); - - // If the user clicks on the input, all event must be ignored ... - containerElem.on('click', function (event) { - event.stopPropagation(); - }); - containerElem.on('dblclick', function (event) { - event.stopPropagation(); - }); - containerElem.on('mousedown', function (event) { - event.stopPropagation(); - }); - }, - - _adjustEditorSize: function () { - - if (this.isVisible()) { - var textElem = this._getTextareaElem(); - - var lines = textElem.val().split('\n'); - var maxLineLength = 1; - _.each(lines, function (line) { - if (maxLineLength < line.length) - maxLineLength = line.length; - }); - - textElem.attr('cols', maxLineLength); - textElem.attr('rows', lines.length); - - this._containerElem.css({ - width: (maxLineLength + 3) + 'em', - height: textElem.height() - }); - } - }, - - isVisible: function () { - return $defined(this._containerElem) && this._containerElem.css('display') == 'block'; - }, - - _updateModel: function () { - - if (this._topic.getText() != this._getText()) { - var text = this._getText(); - var topicId = this._topic.getId(); - - var actionDispatcher = mindplot.ActionDispatcher.getInstance(); - actionDispatcher.changeTextToTopic([topicId], text); - } - }, - - show: function (topic, text) { - // Close a previous node editor if it's opened ... - if (this._topic) { - this.close(false); - } - - this._topic = topic; - if (!this.isVisible()) { - //Create editor ui - var containerElem = this._buildEditor(); - $('body').append(containerElem); - - this._containerElem = containerElem; - this._registerEvents(containerElem); - this._showEditor(text); - } - }, - - _showEditor: function (defaultText) { - - var topic = this._topic; - - // Hide topic text ... - topic.getTextShape().setVisibility(false); - - // Set Editor Style - var nodeText = topic.getTextShape(); - var font = nodeText.getFont(); - font.size = nodeText.getHtmlFontSize(); - font.color = nodeText.getColor(); - this._setStyle(font); - var me = this; - // Set editor's initial size - var displayFunc = function () { - // Position the editor and set the size... - var textShape = topic.getTextShape(); - - me._containerElem.css('display', 'block'); - - //FIXME: Im not sure if this is best way... - var shapePosition = textShape.getNativePosition(); - me._containerElem.offset(shapePosition); - - // Set editor's initial text ... - var text = $defined(defaultText) ? defaultText : topic.getText(); - me._setText(text); - - // Set the element focus and select the current text ... - var inputElem = me._getTextareaElem(); - me._positionCursor(inputElem, !$defined(defaultText)); - - }; - - this._timeoutId = displayFunc.delay(10); - }, - - _setStyle: function (fontStyle) { - var inputField = this._getTextareaElem(); - if (!$defined(fontStyle.font)) { - fontStyle.font = "Arial"; - } - if (!$defined(fontStyle.style)) { - fontStyle.style = "normal"; - } - if (!$defined(fontStyle.weight)) { - fontStyle.weight = "normal"; - } - if (!$defined(fontStyle.size)) { - fontStyle.size = 12; - } - var style = { - fontSize: fontStyle.size + "px", - fontFamily: fontStyle.font, - fontStyle: fontStyle.style, - fontWeight: fontStyle.weight, - color: fontStyle.color - }; - inputField.css(style); - this._containerElem.css(style); - }, - - _setText: function (text) { - var textareaElem = this._getTextareaElem(); - textareaElem.val(text); - this._adjustEditorSize(); - }, - - _getText: function () { - return this._getTextareaElem().val(); - }, - - _getTextareaElem: function () { - return this._containerElem.find('textarea'); - }, - - _positionCursor: function (textareaElem, selectText) { - textareaElem.focus(); - var lengh = textareaElem.val().length; - if (selectText) { - // Mark text as selected ... - if (textareaElem.createTextRange) { - var rang = textareaElem.createTextRange(); - rang.select(); - rang.move("character", lengh); - } - else { - textareaElem[0].setSelectionRange(0, lengh); - } - - } else { - // Move the cursor to the last character .. - if (textareaElem.createTextRange) { - var range = textareaElem.createTextRange(); - range.move("character", lengh); - } else { - if (Browser.ie11) { - textareaElem[0].selectionStart = lengh; - textareaElem[0].selectionEnd = lengh; - } else { - textareaElem.selectionStart = lengh; - textareaElem.selectionEnd = lengh; - } - textareaElem.focus(); - } - } - - }, - - close: function (update) { - if (this.isVisible() && this._topic) { - // Update changes ... - clearTimeout(this._timeoutId); - - if (!$defined(update) || update) { - this._updateModel(); - } - - // Let make the visible text in the node visible again ... - this._topic.getTextShape().setVisibility(true); - - // Remove it form the screen ... - this._containerElem.remove(); - this._containerElem = null; - this._timeoutId = -1; - } - this._topic = null; - } -}); - diff --git a/mindplot/src/main/javascript/NodeGraph.js b/mindplot/src/main/javascript/NodeGraph.js deleted file mode 100644 index 1e4f8d63..00000000 --- a/mindplot/src/main/javascript/NodeGraph.js +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.NodeGraph = new Class(/** @lends NodeGraph */{ - /** - * @constructs - * @param {mindplot.model.NodeModel} nodeModel - * @param {Object} options - * @throws will throw an error if nodeModel is null or undefined - */ - initialize: function (nodeModel, options) { - $assert(nodeModel, "model can not be null"); - - this._options = options; - this._mouseEvents = true; - this.setModel(nodeModel); - this._onFocus = false; - this._size = {width: 50, height: 20}; - }, - - /** @return true if option is set to read-only */ - isReadOnly: function () { - return this._options.readOnly; - }, - - /** @return model type */ - getType: function () { - var model = this.getModel(); - return model.getType(); - }, - - /** - * @param {String} id - * @throws will throw an error if the topic id is not a number - */ - setId: function (id) { - $assert(typeof topic.getId() == "number", "id is not a number:" + id); - this.getModel().setId(id); - }, - - _set2DElement: function (elem2d) { - this._elem2d = elem2d; - }, - - /** - * @return 2D element - * @throws will throw an error if the element is null or undefined within node graph - */ - get2DElement: function () { - $assert(this._elem2d, 'NodeGraph has not been initialized properly'); - return this._elem2d; - }, - - /** @abstract */ - setPosition: function (point, fireEvent) { - throw "Unsupported operation"; - }, - - /** */ - addEvent: function (type, listener) { - var elem = this.get2DElement(); - elem.addEvent(type, listener); - }, - - /** */ - removeEvent: function (type, listener) { - var elem = this.get2DElement(); - elem.removeEvent(type, listener); - }, - - /** */ - fireEvent: function (type, event) { - var elem = this.get2DElement(); - elem.trigger(type, event); - }, - - /** */ - setMouseEventsEnabled: function (isEnabled) { - this._mouseEvents = isEnabled; - }, - - /** */ - isMouseEventsEnabled: function () { - return this._mouseEvents; - }, - - /** @return {Object} size*/ - getSize: function () { - return this._size; - }, - - /** @param {Object} size*/ - setSize: function (size) { - this._size.width = parseInt(size.width); - this._size.height = parseInt(size.height); - }, - - /** - * @return {mindplot.model.NodeModel} the node model - */ - getModel: function () { - $assert(this._model, 'Model has not been initialized yet'); - return this._model; - }, - - /** - * @param {mindplot.NodeModel} model the node model - * @throws will throw an error if model is null or undefined - */ - setModel: function (model) { - $assert(model, 'Model can not be null'); - this._model = model; - }, - - /** */ - getId: function () { - return this._model.getId(); - }, - - /** */ - setOnFocus: function (focus) { - if (this._onFocus != focus) { - - this._onFocus = focus; - var outerShape = this.getOuterShape(); - if (focus) { - outerShape.setFill(mindplot.Topic.OUTER_SHAPE_ATTRIBUTES_FOCUS.fillColor); - outerShape.setOpacity(1); - - } else { - outerShape.setFill(mindplot.Topic.OUTER_SHAPE_ATTRIBUTES.fillColor); - outerShape.setOpacity(0); - } - this.setCursor('move'); - - // In any case, always try to hide the editor ... - this.closeEditors(); - - // Fire event ... - this.fireEvent(focus ? 'ontfocus' : 'ontblur', this); - - } - }, - - /** @return {Boolean} true if the node graph is on focus */ - isOnFocus: function () { - return this._onFocus; - }, - - /** */ - dispose: function (workspace) { - this.setOnFocus(false); - workspace.removeChild(this); - }, - - /** */ - createDragNode: function (layoutManager) { - var dragShape = this._buildDragShape(); - return new mindplot.DragTopic(dragShape, this, layoutManager); - }, - - _buildDragShape: function () { - $assert(false, '_buildDragShape must be implemented by all nodes.'); - }, - - /** */ - getPosition: function () { - var model = this.getModel(); - return model.getPosition(); - } -}); - -/** - * creates a new topic from the given node model - * @memberof mindplot.Nodegraph - * @param {mindplot.model.NodeModel} nodeModel - * @param {Object} options - * @throws will throw an error if nodeModel is null or undefined - * @throws will throw an error if the nodeModel's type is null or undefined - * @throws will throw an error if the node type cannot be recognized as either central or main - * topic type - * @return {mindplot.CentralTopic|mindplot.MainTopic} the new topic - */ -mindplot.NodeGraph.create = function (nodeModel, options) { - $assert(nodeModel, 'Model can not be null'); - - var type = nodeModel.getType(); - $assert(type, 'Node model type can not be null'); - - var result; - if (type == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { - result = new mindplot.CentralTopic(nodeModel, options); - } else if (type == mindplot.model.INodeModel.MAIN_TOPIC_TYPE) { - result = new mindplot.MainTopic(nodeModel, options); - } else { - $assert(false, "unsupported node type:" + type); - } - - return result; -}; \ No newline at end of file diff --git a/mindplot/src/main/javascript/NoteIcon.js b/mindplot/src/main/javascript/NoteIcon.js deleted file mode 100644 index 07bbd75c..00000000 --- a/mindplot/src/main/javascript/NoteIcon.js +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.NoteIcon = new Class({ - Extends: mindplot.Icon, - initialize: function (topic, noteModel, readOnly) { - $assert(topic, 'topic can not be null'); - - this.parent(mindplot.NoteIcon.IMAGE_URL); - this._linksModel = noteModel; - this._topic = topic; - this._readOnly = readOnly; - - this._registerEvents(); - }, - - _registerEvents: function () { - this._image.setCursor('pointer'); - var me = this; - - if (!this._readOnly) { - // Add on click event to open the editor ... - this.addEvent('click', function (event) { - me._topic.showNoteEditor(); - event.stopPropagation(); - }); - } - this._tip = new mindplot.widget.FloatingTip($(me.getImage()._peer._native), { - title: $msg('NOTE'), - container: 'body', - // Content can also be a function of the target element! - content: function () { - return me._buildTooltipContent(); - }, - html: true, - placement: 'bottom', - destroyOnExit: true - }); - - }, - - _buildTooltipContent: function () { - if ($("body").find("#textPopoverNote").length == 1) { - var text = $("body").find("#textPopoverNote"); - text.text(this._linksModel.getText()); - } else { - var result = $('
').css({padding: '5px'}); - - var text = $('
').text(this._linksModel.getText()) - .css({ - 'white-space': 'pre-wrap', - 'word-wrap': 'break-word' - } - ); - result.append(text); - return result; - } - }, - - getModel: function () { - return this._linksModel; - } -}); - -mindplot.NoteIcon.IMAGE_URL = "images/notes.png"; - diff --git a/mindplot/src/main/javascript/Options.js b/mindplot/src/main/javascript/Options.js deleted file mode 100644 index a217f2f5..00000000 --- a/mindplot/src/main/javascript/Options.js +++ /dev/null @@ -1,13 +0,0 @@ -Options = new Class({ - - setOptions: function () { - var options = this.options = Object.merge.apply(null, [{}, this.options].append(arguments)); - if (this.addEvent) for (var option in options) { - if (typeOf(options[option]) != 'function' || !(/^on[A-Z]/).test(option)) continue; - this.addEvent(option, options[option]); - delete options[option]; - } - return this; - } - -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/PersistenceManager.js b/mindplot/src/main/javascript/PersistenceManager.js deleted file mode 100644 index 02d39b43..00000000 --- a/mindplot/src/main/javascript/PersistenceManager.js +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.PersistenceManager = new Class({ - Static: { - loadFromDom: function (mapId, mapDom) { - $assert(mapId, "mapId can not be null"); - $assert(mapDom, "mapDom can not be null"); - - var serializer = mindplot.persistence.XMLSerializerFactory.getSerializerFromDocument(mapDom); - return serializer.loadFromDom(mapDom, mapId); - } - }, - - initialize: function () { - - }, - - save: function (mindmap, editorProperties, saveHistory, events, sync) { - $assert(mindmap, "mindmap can not be null"); - $assert(editorProperties, "editorProperties can not be null"); - - var mapId = mindmap.getId(); - $assert(mapId, "mapId can not be null"); - - var serializer = mindplot.persistence.XMLSerializerFactory.getSerializerFromMindmap(mindmap); - var domMap = serializer.toXML(mindmap); - var mapXml = core.Utils.innerXML(domMap); - - var pref = JSON.stringify(editorProperties); - try { - this.saveMapXml(mapId, mapXml, pref, saveHistory, events, sync); - } catch (e) { - console.log(e); - events.onError(this._buildError()); - } - }, - - load: function (mapId) { - $assert(mapId, "mapId can not be null"); - var domDocument = this.loadMapDom(mapId); - return mindplot.PersistenceManager.loadFromDom(mapId, domDocument); - }, - - discardChanges: function (mapId) { - throw new Error("Method must be implemented"); - }, - - loadMapDom: function (mapId) { - throw new Error("Method must be implemented"); - }, - - saveMapXml: function (mapId, mapXml, pref, saveHistory, events, sync) { - throw new Error("Method must be implemented"); - }, - - unlockMap: function (mindmap) { - throw new Error("Method must be implemented"); - } -}); - -mindplot.PersistenceManager.init = function (instance) { - mindplot.PersistenceManager._instance = instance; -}; - -mindplot.PersistenceManager.getInstance = function () { - return mindplot.PersistenceManager._instance; -}; - diff --git a/mindplot/src/main/javascript/Relationship.js b/mindplot/src/main/javascript/Relationship.js deleted file mode 100644 index 5de50fbd..00000000 --- a/mindplot/src/main/javascript/Relationship.js +++ /dev/null @@ -1,330 +0,0 @@ -/* - * Copyright [2015] [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. - */ -mindplot.Relationship = new Class({ - Extends: mindplot.ConnectionLine, - Static: { - getStrokeColor: function () { - return '#9b74e6'; - }, - type: "Relationship" - }, - initialize: function (sourceNode, targetNode, model) { - $assert(sourceNode, "sourceNode can not be null"); - $assert(targetNode, "targetNode can not be null"); - - this.parent(sourceNode, targetNode, model.getLineType()); - this.setModel(model); - - var strokeColor = mindplot.Relationship.getStrokeColor(); - - this._line2d.setIsSrcControlPointCustom(false); - this._line2d.setIsDestControlPointCustom(false); - this._line2d.setCursor('pointer'); - this._line2d.setStroke(1, 'solid', strokeColor); - this._line2d.setDashed(4, 2); - this._focusShape = this._createLine(this.getLineType(), mindplot.ConnectionLine.SIMPLE_CURVED); - this._focusShape.setStroke(2, "solid", "#3f96ff"); - - var ctrlPoints = this._line2d.getControlPoints(); - this._focusShape.setSrcControlPoint(ctrlPoints[0]); - this._focusShape.setDestControlPoint(ctrlPoints[1]); - this._focusShape.setVisibility(false); - this._onFocus = false; - this._isInWorkspace = false; - this._controlPointsController = new mindplot.ControlPoint(); - - this._startArrow = new web2d.Arrow(); - this._startArrow.setStrokeColor(strokeColor); - this._startArrow.setStrokeWidth(2); - this.setShowStartArrow(true); - - // Share style is disable ... - if (this._showEndArrow) { - this._endArrow = new web2d.Arrow(); - this._endArrow.setStrokeColor(strokeColor); - this._endArrow.setStrokeWidth(2); - } - - // Position the line ... - if ($defined(model.getSrcCtrlPoint())) { - var srcPoint = model.getSrcCtrlPoint().clone(); - this.setSrcControlPoint(srcPoint); - } - if ($defined(model.getDestCtrlPoint())) { - var destPoint = model.getDestCtrlPoint().clone(); - this.setDestControlPoint(destPoint); - } - }, - - setStroke: function (color, style, opacity) { - this.parent(color, style, opacity); - this._startArrow.setStrokeColor(color); - }, - - redraw: function () { - var line2d = this._line2d; - var sourceTopic = this._sourceTopic; - var sourcePosition = sourceTopic.getPosition(); - - var targetTopic = this._targetTopic; - var targetPosition = targetTopic.getPosition(); - if (targetTopic.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { - targetPosition = mindplot.util.Shape.workoutIncomingConnectionPoint(targetTopic, sourcePosition); - } - - var sPos, tPos; - this._line2d.setStroke(2); - var ctrlPoints = this._line2d.getControlPoints(); - if (!this._line2d.isDestControlPointCustom() && !this._line2d.isSrcControlPointCustom()) { - - var defaultPoints = mindplot.util.Shape.calculateDefaultControlPoints(sourcePosition, targetPosition); - ctrlPoints[0].x = defaultPoints[0].x; - ctrlPoints[0].y = defaultPoints[0].y; - - ctrlPoints[1].x = defaultPoints[1].x; - ctrlPoints[1].y = defaultPoints[1].y; - } - var spoint = new core.Point(); - spoint.x = parseInt(ctrlPoints[0].x) + parseInt(sourcePosition.x); - spoint.y = parseInt(ctrlPoints[0].y) + parseInt(sourcePosition.y); - - var tpoint = new core.Point(); - tpoint.x = parseInt(ctrlPoints[1].x) + parseInt(targetPosition.x); - tpoint.y = parseInt(ctrlPoints[1].y) + parseInt(targetPosition.y); - - sPos = mindplot.util.Shape.calculateRelationShipPointCoordinates(sourceTopic, spoint); - tPos = mindplot.util.Shape.calculateRelationShipPointCoordinates(targetTopic, tpoint); - - line2d.setFrom(sPos.x, sPos.y); - line2d.setTo(tPos.x, tPos.y); - - line2d.moveToFront(); - - //Positionate Arrows - this._positionArrows(); - - // Add connector ... - this._positionateConnector(targetTopic); - - if (this.isOnFocus()) { - this._refreshShape(); - } - this._focusShape.moveToBack(); - this._controlPointsController.redraw(); - }, - - _positionArrows: function () { - var tpos = this._line2d.getTo(); - var spos = this._line2d.getFrom(); - - this._startArrow.setFrom(spos.x, spos.y); - this._startArrow.moveToBack(); - - if (this._endArrow) { - this._endArrow.setFrom(tpos.x, tpos.y); - this._endArrow.moveToBack(); - } - - if (this._line2d.getType() == "CurvedLine") { - var controlPoints = this._line2d.getControlPoints(); - this._startArrow.setControlPoint(controlPoints[0]); - if (this._endArrow) { - this._endArrow.setControlPoint(controlPoints[1]); - } - } else { - this._startArrow.setControlPoint(this._line2d.getTo()); - if (this._endArrow) { - this._endArrow.setControlPoint(this._line2d.getFrom()); - } - } - - if (this._showEndArrow) { - this._endArrow.setVisibility(this.isVisible()); - } - this._startArrow.setVisibility(this.isVisible() && this._showStartArrow); - }, - - addToWorkspace: function (workspace) { - workspace.append(this._focusShape); - workspace.append(this._controlPointsController); - - this._controlPointControllerListener = this._initializeControlPointController.bind(this); - this._line2d.addEvent('click', this._controlPointControllerListener); - this._isInWorkspace = true; - - workspace.append(this._startArrow); - if (this._endArrow) - workspace.append(this._endArrow); - - this.parent(workspace); - this._positionArrows(); - this.redraw(); - - }, - - _initializeControlPointController: function () { - this.setOnFocus(true); - }, - - removeFromWorkspace: function (workspace) { - workspace.removeChild(this._focusShape); - workspace.removeChild(this._controlPointsController); - this._line2d.removeEvent('click', this._controlPointControllerListener); - this._isInWorkspace = false; - workspace.removeChild(this._startArrow); - if (this._endArrow) - workspace.removeChild(this._endArrow); - - this.parent(workspace); - }, - - getType: function () { - return mindplot.Relationship.type; - }, - - setOnFocus: function (focus) { - // Change focus shape - if (this.isOnFocus() != focus) { - if (focus) { - this._refreshShape(); - this._controlPointsController.setLine(this); - } - this._focusShape.setVisibility(focus); - - this._controlPointsController.setVisibility(focus); - this._onFocus = focus; - this.fireEvent(focus ? 'ontfocus' : 'ontblur', this); - } - }, - - _refreshShape: function () { - var sPos = this._line2d.getFrom(); - var tPos = this._line2d.getTo(); - var ctrlPoints = this._line2d.getControlPoints(); - this._focusShape.setFrom(sPos.x, sPos.y); - this._focusShape.setTo(tPos.x, tPos.y); - var shapeCtrlPoints = this._focusShape.getControlPoints(); - shapeCtrlPoints[0].x = ctrlPoints[0].x; - shapeCtrlPoints[0].y = ctrlPoints[0].y; - shapeCtrlPoints[1].x = ctrlPoints[1].x; - shapeCtrlPoints[1].y = ctrlPoints[1].y; - this._focusShape.updateLine(); - }, - - addEvent: function (type, listener) { - // Translate to web 2d events ... - if (type == 'onfocus') { - type = 'mousedown'; - } - - var line = this._line2d; - line.addEvent(type, listener); - }, - - isOnFocus: function () { - return this._onFocus; - }, - - isInWorkspace: function () { - return this._isInWorkspace; - }, - - setVisibility: function (value) { - this.parent(value); - if (this._showEndArrow) - this._endArrow.setVisibility(this._showEndArrow); - this._startArrow.setVisibility(this._showStartArrow && value); - }, - - setOpacity: function (opacity) { - this.parent(opacity); - if (this._showEndArrow) - this._endArrow.setOpacity(opacity); - if (this._showStartArrow) - this._startArrow.setOpacity(opacity); - }, - - setShowEndArrow: function (visible) { - this._showEndArrow = visible; - if (this._isInWorkspace) - this.redraw(); - }, - - setShowStartArrow: function (visible) { - this._showStartArrow = visible; - if (this._isInWorkspace) - this.redraw(); - }, - - setFrom: function (x, y) { - $assert($defined(x), "x must be defined"); - $assert($defined(y), "y must be defined"); - - this._line2d.setFrom(x, y); - this._startArrow.setFrom(x, y); - }, - - setTo: function (x, y) { - $assert($defined(x), "x must be defined"); - $assert($defined(y), "y must be defined"); - - this._line2d.setTo(x, y); - if (this._endArrow) - this._endArrow.setFrom(x, y); - }, - - setSrcControlPoint: function (control) { - this._line2d.setSrcControlPoint(control); - this._startArrow.setControlPoint(control); - }, - - setDestControlPoint: function (control) { - this._line2d.setDestControlPoint(control); - if (this._showEndArrow) - this._endArrow.setControlPoint(control); - }, - - getControlPoints: function () { - return this._line2d.getControlPoints(); - }, - - isSrcControlPointCustom: function () { - return this._line2d.isSrcControlPointCustom(); - }, - - isDestControlPointCustom: function () { - return this._line2d.isDestControlPointCustom(); - }, - - setIsSrcControlPointCustom: function (isCustom) { - this._line2d.setIsSrcControlPointCustom(isCustom); - }, - - setIsDestControlPointCustom: function (isCustom) { - this._line2d.setIsDestControlPointCustom(isCustom); - }, - - getId: function () { - return this._model.getId(); - }, - - fireEvent: function (type, event) { - var elem = this._line2d; - elem.trigger(type, event); - } -}); diff --git a/mindplot/src/main/javascript/RelationshipPivot.js b/mindplot/src/main/javascript/RelationshipPivot.js deleted file mode 100644 index e0106694..00000000 --- a/mindplot/src/main/javascript/RelationshipPivot.js +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.RelationshipPivot = new Class({ - initialize: function (workspace, designer) { - $assert(workspace, "workspace can not be null"); - $assert(designer, "designer can not be null"); - this._workspace = workspace; - this._designer = designer; - - //FIXME: the aim of the migration is remove .bind mootools method, please remove these! - this._mouseMoveEvent = this._mouseMove.bind(this); - this._onClickEvent = this._cleanOnMouseClick.bind(this); - this._onTopicClick = this._connectOnFocus.bind(this); - - }, - - start: function (sourceTopic, targetPos) { - $assert(sourceTopic, "sourceTopic can not be null"); - $assert(targetPos, "targetPos can not be null"); - - this.dispose(); - this._sourceTopic = sourceTopic; - if (sourceTopic != null) { - this._workspace.enableWorkspaceEvents(false); - - var sourcePos = sourceTopic.getPosition(); - var strokeColor = mindplot.Relationship.getStrokeColor(); - - this._pivot = new web2d.CurvedLine(); - this._pivot.setStyle(web2d.CurvedLine.SIMPLE_LINE); - - var fromPos = this._calculateFromPosition(sourcePos); - this._pivot.setFrom(fromPos.x, fromPos.y); - - this._pivot.setTo(targetPos.x, targetPos.y); - this._pivot.setStroke(2, 'solid', strokeColor); - this._pivot.setDashed(4, 2); - - this._startArrow = new web2d.Arrow(); - this._startArrow.setStrokeColor(strokeColor); - this._startArrow.setStrokeWidth(2); - this._startArrow.setFrom(sourcePos.x, sourcePos.y); - - this._workspace.append(this._pivot); - this._workspace.append(this._startArrow); - - this._workspace.addEvent('mousemove', this._mouseMoveEvent); - this._workspace.addEvent('click', this._onClickEvent); - - // Register focus events on all topics ... - var model = this._designer.getModel(); - var topics = model.getTopics(); - _.each(topics, function (topic) { - topic.addEvent('ontfocus', this._onTopicClick); - }.bind(this)); - } - - }, - - dispose: function () { - var workspace = this._workspace; - - if (this._isActive()) { - workspace.removeEvent('mousemove', this._mouseMoveEvent); - workspace.removeEvent('click', this._onClickEvent); - - var model = this._designer.getModel(); - var topics = model.getTopics(); - var me = this; - _.each(topics, function (topic) { - topic.removeEvent('ontfocus', me._onTopicClick); - }); - - workspace.removeChild(this._pivot); - workspace.removeChild(this._startArrow); - workspace.enableWorkspaceEvents(true); - - this._sourceTopic = null; - this._pivot = null; - this._startArrow = null; - } - }, - - _mouseMove: function (event) { - var screen = this._workspace.getScreenManager(); - var pos = screen.getWorkspaceMousePosition(event); - - // Leave the arrow a couple of pixels away from the cursor. - var sourcePosition = this._sourceTopic.getPosition(); - var gapDistance = Math.sign(pos.x - sourcePosition.x) * 5; - - var sPos = this._calculateFromPosition(pos); - this._pivot.setFrom(sPos.x, sPos.y); - - // Update target position ... - this._pivot.setTo(pos.x - gapDistance, pos.y); - - var controlPoints = this._pivot.getControlPoints(); - this._startArrow.setFrom(pos.x - gapDistance, pos.y); - this._startArrow.setControlPoint(controlPoints[1]); - - event.stopPropagation(); - return false; - }, - - _cleanOnMouseClick: function (event) { - - // The user clicks on a desktop on in other element that is not a node. - this.dispose(); - event.stopPropagation(); - }, - - _calculateFromPosition: function (toPosition) { - - // Calculate origin position ... - var sourcePosition = this._sourceTopic.getPosition(); - if (this._sourceTopic.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) { - sourcePosition = mindplot.util.Shape.workoutIncomingConnectionPoint(this._sourceTopic, toPosition); - } - var controlPoint = mindplot.util.Shape.calculateDefaultControlPoints(sourcePosition, toPosition); - - var spoint = new core.Point(); - spoint.x = parseInt(controlPoint[0].x) + parseInt(sourcePosition.x); - spoint.y = parseInt(controlPoint[0].y) + parseInt(sourcePosition.y); - return mindplot.util.Shape.calculateRelationShipPointCoordinates(this._sourceTopic, spoint); - }, - - _connectOnFocus: function (event, targetTopic) { - var sourceTopic = this._sourceTopic; - var mindmap = this._designer.getMindmap(); - - // Avoid circular connections ... - if (targetTopic.getId() != sourceTopic.getId()) { - var relModel = mindmap.createRelationship(targetTopic.getId(), sourceTopic.getId()); - this._designer._actionDispatcher.addRelationship(relModel); - } - this.dispose(); - }, - - _isActive: function () { - return this._pivot != null; - } -}); - diff --git a/mindplot/src/main/javascript/RestPersistenceManager.js b/mindplot/src/main/javascript/RestPersistenceManager.js deleted file mode 100644 index 38b9a8bd..00000000 --- a/mindplot/src/main/javascript/RestPersistenceManager.js +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.RESTPersistenceManager = new Class({ - Extends: mindplot.PersistenceManager, - initialize: function (options) { - this.parent(); - $assert(options.documentUrl, "documentUrl can not be null"); - $assert(options.revertUrl, "revertUrl can not be null"); - $assert(options.lockUrl, "lockUrl can not be null"); - $assert(options.session, "session can not be null"); - $assert(options.timestamp, "timestamp can not be null"); - - this.documentUrl = options.documentUrl; - this.revertUrl = options.revertUrl; - this.lockUrl = options.lockUrl; - this.timestamp = options.timestamp; - this.session = options.session; - }, - - saveMapXml: function (mapId, mapXml, pref, saveHistory, events, sync) { - - var data = { - id: mapId, - xml: mapXml, - properties: pref - }; - - var persistence = this; - var query = "minor=" + !saveHistory; - query = query + "×tamp=" + this.timestamp; - query = query + "&session=" + this.session; - - if (!persistence.onSave) { - - // Mark save in process and fire a event unlocking the save ... - persistence.onSave = true; - persistence.clearTimeout = setTimeout(function () { - persistence.clearTimeout = null; - persistence.onSave = false; - }, 10000); - - $.ajax({ - url: this.documentUrl.replace("{id}", mapId) + "?" + query, - type: 'put', - dataType: "json", - data: JSON.stringify(data), - contentType: "application/json; charset=utf-8", - async: !sync, - - success: function (data, textStatus, jqXHRresponseText) { - persistence.timestamp = data; - events.onSuccess(); - }, - error: function (jqXHR, textStatus, errorThrown) { - events.onError(persistence._buildError()); - }, - complete: function () { - // Clear event timeout ... - if (persistence.clearTimeout) { - clearTimeout(persistence.clearTimeout); - } - persistence.onSave = false; - }, - fail: function (xhr, textStatus) { - - var responseText = xhr.responseText; - var userMsg = {severity: "SEVERE", message: $msg('SAVE_COULD_NOT_BE_COMPLETED')}; - - var contentType = xhr.getResponseHeader("Content-Type"); - if (contentType != null && contentType.indexOf("application/json") != -1) { - var serverMsg = null; - try { - serverMsg = $.parseJSON(responseText); - serverMsg = serverMsg.globalSeverity ? serverMsg : null; - } catch (e) { - // Message could not be decoded ... - } - userMsg = persistence._buildError(serverMsg); - - } else { - if (this.status == 405) { - userMsg = {severity: "SEVERE", message: $msg('SESSION_EXPIRED')}; - } - } - events.onError(userMsg); - persistence.onSave = false; - } - }); - } - }, - - discardChanges: function (mapId) { - $.ajax({ - url: this.revertUrl.replace("{id}", mapId), - async: false, - method: 'post', - headers: {"Content-Type": "application/json; charset=utf-8", "Accept": "application/json"} - }); - }, - - unlockMap: function (mindmap) { - var mapId = mindmap.getId(); - $.ajax({ - url: this.lockUrl.replace("{id}", mapId), - async: false, - method: 'put', - headers: {"Content-Type": "text/plain"}, - data: "false" - }); - }, - - _buildError: function (jsonSeverResponse) { - var message = jsonSeverResponse ? jsonSeverResponse.globalErrors[0] : null; - var severity = jsonSeverResponse ? jsonSeverResponse.globalSeverity : null; - - if (!message) { - message = $msg('SAVE_COULD_NOT_BE_COMPLETED'); - } - - if (!severity) { - severity = "INFO"; - } - return {severity: severity, message: message}; - }, - - loadMapDom: function (mapId) { - // Let's try to open one from the local directory ... - var xml; - $.ajax({ - url: this.documentUrl.replace("{id}", mapId) + "/xml", - method: 'get', - async: false, - headers: {"Content-Type": "text/plain", "Accept": "application/xml"}, - success: function (responseText) { - xml = responseText; - } - }); - - // If I could not load it from a file, hard code one. - if (xml == null) { - throw new Error("Map could not be loaded"); - } - - return xml; - } - } -); diff --git a/mindplot/src/main/javascript/ScreenManager.js b/mindplot/src/main/javascript/ScreenManager.js deleted file mode 100644 index e180b77d..00000000 --- a/mindplot/src/main/javascript/ScreenManager.js +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.ScreenManager = new Class({ - initialize: function (divElement) { - $assert(divElement, "can not be null"); - this._divContainer = divElement; - this._padding = {x: 0, y: 0}; - - // Ignore default click event propagation. Prevent 'click' event on drag. - this._clickEvents = []; - this._divContainer.bind('click', function (event) { - event.stopPropagation() - }); - - this._divContainer.bind('dblclick', function (event) { - event.stopPropagation(); - event.preventDefault(); - }); - }, - - setScale: function (scale) { - $assert(scale, 'Screen scale can not be null'); - this._scale = scale; - }, - - addEvent: function (event, listener) { - if (event == 'click') - this._clickEvents.push(listener); - else - this._divContainer.bind(event, listener); - }, - - removeEvent: function (event, listener) { - if (event == 'click') { - this._clickEvents.remove(listener); - } - else { - this._divContainer.unbind(event, listener); - } - }, - - fireEvent: function (type, event) { - if (type == 'click') { - _.each(this._clickEvents, function (listener) { - listener(type, event); - }); - } - else { - this._divContainer.trigger(type, event); - } - }, - - _getElementPosition: function (elem) { - // Retrieve current element position. - var elementPosition = elem.getPosition(); - var x = elementPosition.x; - var y = elementPosition.y; - - // Add workspace offset. - x = x - this._padding.x; - y = y - this._padding.y; - - // Scale coordinate in order to be relative to the workspace. That's coord/size; - x = x / this._scale; - y = y / this._scale; - - // Remove decimal part.. - return {x: x, y: y}; - }, - - getWorkspaceIconPosition: function (e) { - // Retrieve current icon position. - var image = e.getImage(); - var elementPosition = image.getPosition(); - var imageSize = e.getSize(); - - //Add group offset - var iconGroup = e.getGroup(); - var group = iconGroup.getNativeElement(); - var coordOrigin = group.getCoordOrigin(); - var groupSize = group.getSize(); - var coordSize = group.getCoordSize(); - - var scale = {x: coordSize.width / parseInt(groupSize.width), y: coordSize.height / parseInt(groupSize.height)}; - - var x = (elementPosition.x - coordOrigin.x - (parseInt(imageSize.width) / 2)) / scale.x; - var y = (elementPosition.y - coordOrigin.y - (parseInt(imageSize.height) / 2)) / scale.y; - - //Retrieve iconGroup Position - var groupPosition = iconGroup.getPosition(); - x = x + groupPosition.x; - y = y + groupPosition.y; - - //Retrieve topic Position - var topic = iconGroup.getTopic(); - var topicPosition = this._getElementPosition(topic); - topicPosition.x = topicPosition.x - (parseInt(topic.getSize().width) / 2); - - // Remove decimal part.. - return {x: x + topicPosition.x, y: y + topicPosition.y}; - }, - - getWorkspaceMousePosition: function (event) { - // Retrieve current mouse position. - var x = event.clientX; - var y = event.clientY; - - //FIXME: paulo: why? Subtract div position. - /*var containerPosition = this.getContainer().position(); - x = x - containerPosition.x; - y = y - containerPosition.y;*/ - - // Scale coordinate in order to be relative to the workspace. That's coordSize/size; - x = x * this._scale; - y = y * this._scale; - - // Add workspace offset. - x = x + this._padding.x; - y = y + this._padding.y; - - // Remove decimal part.. - return new core.Point(x, y); - }, - - getContainer: function () { - return this._divContainer; - }, - - setOffset: function (x, y) { - this._padding.x = x; - this._padding.y = y; - } -}); diff --git a/mindplot/src/main/javascript/ShrinkConnector.js b/mindplot/src/main/javascript/ShrinkConnector.js deleted file mode 100644 index 8dd59a4f..00000000 --- a/mindplot/src/main/javascript/ShrinkConnector.js +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.ShirinkConnector = new Class({ - initialize: function (topic) { - - var ellipse = new web2d.Elipse(mindplot.Topic.prototype.INNER_RECT_ATTRIBUTES); - this._ellipse = ellipse; - ellipse.setFill('rgb(62,118,179)'); - - ellipse.setSize(mindplot.Topic.CONNECTOR_WIDTH, mindplot.Topic.CONNECTOR_WIDTH); - ellipse.addEvent('click', function (event) { - var model = topic.getModel(); - var collapse = !model.areChildrenShrunken(); - - var topicId = topic.getId(); - var actionDispatcher = mindplot.ActionDispatcher.getInstance(); - actionDispatcher.shrinkBranch([topicId], collapse); - - event.stopPropagation(); - - }); - - ellipse.addEvent('mousedown', function (event) { - // Avoid node creation ... - event.stopPropagation(); - }); - - ellipse.addEvent('dblclick', function (event) { - // Avoid node creation ... - event.stopPropagation(); - }); - - ellipse.addEvent('mouseover', function (event) { - - ellipse.setFill('rgb(153, 0, 255)'); - }); - var me = this; - ellipse.addEvent('mouseout', function (event) { - var color = topic.getBackgroundColor(); - me.setFill(color); - }); - - ellipse.setCursor('default'); - this._fillColor = '#f7f7f7'; - var model = topic.getModel(); - this.changeRender(model.areChildrenShrunken()); - - }, - - changeRender: function (isShrink) { - var elipse = this._ellipse; - if (isShrink) { - elipse.setStroke('2', 'solid'); - } else { - elipse.setStroke('1', 'solid'); - } - }, - - setVisibility: function (value) { - this._ellipse.setVisibility(value); - }, - - setOpacity: function (opacity) { - this._ellipse.setOpacity(opacity); - }, - - setFill: function (color) { - this._fillColor = color; - this._ellipse.setFill(color); - }, - - setAttribute: function (name, value) { - this._ellipse.setAttribute(name, value); - }, - - addToWorkspace: function (group) { - group.append(this._ellipse); - }, - - setPosition: function (x, y) { - this._ellipse.setPosition(x, y); - }, - - moveToBack: function () { - this._ellipse.moveToBack(); - }, - - moveToFront: function () { - this._ellipse.moveToFront(); - } -}); diff --git a/mindplot/src/main/javascript/StandaloneActionDispatcher.js b/mindplot/src/main/javascript/StandaloneActionDispatcher.js deleted file mode 100644 index 1cc0b3e6..00000000 --- a/mindplot/src/main/javascript/StandaloneActionDispatcher.js +++ /dev/null @@ -1,360 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.StandaloneActionDispatcher = new Class(/** @lends StandaloneActionDispatcher */{ - Extends: mindplot.ActionDispatcher, - /** - * @extends mindplot.ActionDispatcher - * @constructs - * @param {mindplot.CommandContext} commandContext - */ - initialize: function (commandContext) { - this.parent(commandContext); - this._actionRunner = new mindplot.DesignerActionRunner(commandContext, this); - }, - - /** */ - addTopics: function (models, parentTopicsId) { - var command = new mindplot.commands.AddTopicCommand(models, parentTopicsId); - this.execute(command); - }, - - /** */ - addRelationship: function (model) { - var command = new mindplot.commands.AddRelationshipCommand(model); - this.execute(command); - }, - - /** */ - deleteEntities: function (topicsIds, relIds) { - var command = new mindplot.commands.DeleteCommand(topicsIds, relIds); - this.execute(command); - }, - - /** */ - dragTopic: function (topicId, position, order, parentTopic) { - var command = new mindplot.commands.DragTopicCommand(topicId, position, order, parentTopic); - this.execute(command); - }, - - /** */ - moveTopic: function (topicId, position) { - $assert($defined(topicId), "topicsId can not be null"); - $assert($defined(position), "position can not be null"); - - var commandFunc = function (topic, value) { - var result = topic.getPosition(); - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeMoveEvent, { - node: topic.getModel(), - position: value - }); - return result; - }; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicId, position); - this.execute(command); - }, - - /** */ - moveControlPoint: function (ctrlPoint, point) { - var command = new mindplot.commands.MoveControlPointCommand(ctrlPoint, point); - this.execute(command); - }, - - /** */ - changeFontStyleToTopic: function (topicsIds) { - - var commandFunc = function (topic) { - var result = topic.getFontStyle(); - var style = (result == "italic") ? "normal" : "italic"; - topic.setFontStyle(style, true); - return result; - }; - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds); - this.execute(command); - - }, - - /** */ - changeTextToTopic: function (topicsIds, text) { - $assert($defined(topicsIds), "topicsIds can not be null"); - - var commandFunc = function (topic, value) { - var result = topic.getText(); - topic.setText(value); - return result; - }; - commandFunc.commandType = "changeTextToTopic"; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, text); - this.execute(command); - }, - - /** */ - changeFontFamilyToTopic: function (topicIds, fontFamily) { - $assert(topicIds, "topicIds can not be null"); - $assert(fontFamily, "fontFamily can not be null"); - - - var commandFunc = function (topic, fontFamily) { - var result = topic.getFontFamily(); - topic.setFontFamily(fontFamily, true); - - topic._adjustShapes(); - return result; - }; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicIds, fontFamily); - this.execute(command); - }, - - /** */ - changeFontColorToTopic: function (topicsIds, color) { - $assert(topicsIds, "topicIds can not be null"); - $assert(color, "color can not be null"); - - var commandFunc = function (topic, color) { - var result = topic.getFontColor(); - topic.setFontColor(color, true); - return result; - }; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, color); - command.discardDuplicated = "fontColorCommandId"; - this.execute(command); - }, - - /** */ - changeBackgroundColorToTopic: function (topicsIds, color) { - $assert(topicsIds, "topicIds can not be null"); - $assert(color, "color can not be null"); - - var commandFunc = function (topic, color) { - var result = topic.getBackgroundColor(); - topic.setBackgroundColor(color); - return result; - }; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, color); - command.discardDuplicated = "backColor"; - this.execute(command); - }, - - /** */ - changeBorderColorToTopic: function (topicsIds, color) { - $assert(topicsIds, "topicIds can not be null"); - $assert(color, "topicIds can not be null"); - - var commandFunc = function (topic, color) { - var result = topic.getBorderColor(); - topic.setBorderColor(color); - return result; - }; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, color); - command.discardDuplicated = "borderColorCommandId"; - this.execute(command); - }, - - /** */ - changeFontSizeToTopic: function (topicsIds, size) { - $assert(topicsIds, "topicIds can not be null"); - $assert(size, "size can not be null"); - - var commandFunc = function (topic, size) { - var result = topic.getFontSize(); - topic.setFontSize(size, true); - - topic._adjustShapes(); - return result; - }; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, size); - this.execute(command); - }, - - /** */ - changeShapeTypeToTopic: function (topicsIds, shapeType) { - $assert(topicsIds, "topicsIds can not be null"); - $assert(shapeType, "shapeType can not be null"); - - var commandFunc = function (topic, shapeType) { - var result = topic.getShapeType(); - topic.setShapeType(shapeType, true); - return result; - }; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, shapeType); - this.execute(command); - }, - - /** */ - changeFontWeightToTopic: function (topicsIds) { - $assert(topicsIds, "topicsIds can not be null"); - - var commandFunc = function (topic) { - var result = topic.getFontWeight(); - var weight = (result == "bold") ? "normal" : "bold"; - topic.setFontWeight(weight, true); - - topic._adjustShapes(); - return result; - }; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds); - this.execute(command); - }, - - /** */ - shrinkBranch: function (topicsIds, collapse) { - $assert(topicsIds, "topicsIds can not be null"); - - var commandFunc = function (topic, isShrink) { - topic.setChildrenShrunken(isShrink); - return !isShrink; - }; - - var command = new mindplot.commands.GenericFunctionCommand(commandFunc, topicsIds, collapse); - this.execute(command, false); - }, - - /** */ - addFeatureToTopic: function (topicId, featureType, attributes) { - var command = new mindplot.commands.AddFeatureToTopicCommand(topicId, featureType, attributes); - this.execute(command); - }, - - /** */ - changeFeatureToTopic: function (topicId, featureId, attributes) { - var command = new mindplot.commands.ChangeFeatureToTopicCommand(topicId, featureId, attributes); - this.execute(command); - }, - - /** */ - removeFeatureFromTopic: function (topicId, featureId) { - var command = new mindplot.commands.RemoveFeatureFromTopicCommand(topicId, featureId); - this.execute(command); - }, - - /** */ - execute: function (command) { - this._actionRunner.execute(command); - } - -}); - -mindplot.CommandContext = new Class(/** @lends CommandContext */{ - /** - * @constructs - * @param {mindplot.Designer} designer - */ - initialize: function (designer) { - $assert(designer, "designer can not be null"); - this._designer = designer; - }, - - /** */ - findTopics: function (topicsIds) { - $assert($defined(topicsIds), "topicsIds can not be null"); - if (!(topicsIds instanceof Array)) { - topicsIds = [topicsIds]; - } - - var designerTopics = this._designer.getModel().getTopics(); - var result = designerTopics.filter(function (topic) { - return topicsIds.contains(topic.getId()); - }); - - if (result.length != topicsIds.length) { - var ids = designerTopics.map(function (topic) { - return topic.getId(); - }); - $assert(result.length == topicsIds.length, "Could not find topic. Result:" + result + ", Filter Criteria:" + topicsIds + ", Current Topics: [" + ids + "]"); - } - return result; - }, - - /** */ - deleteTopic: function (topic) { - this._designer.removeTopic(topic); - }, - - /** */ - createTopic: function (model) { - $assert(model, "model can not be null"); - return this._designer.nodeModelToNodeGraph(model); - }, - - /** */ - createModel: function () { - var mindmap = this._designer.getMindmap(); - return mindmap.createNode(mindplot.NodeModel.MAIN_TOPIC_TYPE); - }, - - /** */ - addTopic: function (topic) { - var mindmap = this._designer.getMindmap(); - return mindmap.addBranch(topic.getModel()); - }, - - /** */ - connect: function (childTopic, parentTopic) { - childTopic.connectTo(parentTopic, this._designer._workspace); - }, - - /** */ - disconnect: function (topic) { - topic.disconnect(this._designer._workspace); - }, - - /** */ - addRelationship: function (model) { - $assert(model, "model cannot be null"); - return this._designer.addRelationship(model); - }, - - /** */ - deleteRelationship: function (relationship) { - this._designer.deleteRelationship(relationship); - }, - - /** */ - findRelationships: function (relIds) { - $assert($defined(relIds), "relId can not be null"); - if (!(relIds instanceof Array)) { - relIds = [relIds]; - } - - var designerRel = this._designer.getModel().getRelationships(); - return designerRel.filter(function (rel) { - return relIds.contains(rel.getId()); - }); - }, - - /** */ - moveTopic: function (topic, position) { - $assert(topic, "topic cannot be null"); - $assert(position, "position cannot be null"); - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeMoveEvent, { - node: topic.getModel(), - position: position - }); - } -}); - - diff --git a/mindplot/src/main/javascript/TextEditor.js b/mindplot/src/main/javascript/TextEditor.js deleted file mode 100644 index 00a0a974..00000000 --- a/mindplot/src/main/javascript/TextEditor.js +++ /dev/null @@ -1,268 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -//FIXME: Not used! -mindplot.TextEditor = new Class({ - initialize: function (topic) { - this._topic = topic; - }, - - _buildEditor: function () { - - this._size = {width: 500, height: 100}; - var result = new Element('div'); - result.setStyles({ - position: "absolute", - display: "none", - zIndex: "8", - width: "500px", - height: "100px" - } - ); - - - var inputContainer = new Element('div'); - inputContainer.setStyles({ - border: "none", - overflow: "auto" - }); - inputContainer.inject(result); - - var inputText = new Element('input', - { - type: "text", - tabindex: '-1', - value: "" - } - ); - inputText.setStyles({ - border: "none", - background: "transparent" - }); - inputText.inject(inputContainer); - - var spanContainer = new Element('div'); - spanContainer.setStyle('visibility', "hidden"); - spanContainer.inject(result); - - var spanElem = new Element('span', {tabindex: "-1"}); - spanElem.setStyle('white-space', "nowrap"); - spanElem.setStyle('nowrap', 'nowrap'); - spanElem.inject(spanContainer); - - - return result; - }, - - _registerEvents: function (divElem) { - var inputElem = this._getTextareaElem(); - var spanElem = this._getSpanElem(); - var me = this; - - divElem.addEvent('keydown', function (event) { - switch (event.key) { - case 'esc': - me.close(false); - break; - case 'enter': - me.close(true); - break; - default: - spanElem.innerHTML = inputElem.value; - var size = inputElem.value.length + 1; - inputElem.size = size; - if (spanElem.offsetWidth > (parseInt(divElem.style.width) - 100)) { - divElem.style.width = (spanElem.offsetWidth + 100) + "px"; - } - break; - } - event.stopPropagation(); - }); - - // If the user clicks on the input, all event must be ignored ... - divElem.addEvent('click', function (event) { - event.stopPropagation(); - }); - divElem.addEvent('dblclick', function (event) { - event.stopPropagation(); - }); - divElem.addEvent('mousedown', function (event) { - event.stopPropagation(); - }); - }, - - isVisible: function () { - return $defined(this._containerElem) && this._containerElem.getStyle('display') == 'block'; - }, - - _updateModel: function () { - - if (this._topic.getText() != this._getText()) { - var text = this._getText(); - var topicId = this._topic.getId(); - - var actionDispatcher = mindplot.ActionDispatcher.getInstance(); - actionDispatcher.changeTextToTopic([topicId], text); - } - }, - - show: function (text) { - - if (!this.isVisible()) { - //Create editor ui - var editorElem = this._buildEditor(); - editorElem.inject($(document.body)[0]); - - this._containerElem = editorElem; - this._registerEvents(editorElem); - this._showEditor(text); - } - }, - - _showEditor: function (defaultText) { - - var topic = this._topic; - - // Hide topic text ... - topic.getTextShape().setVisibility(false); - - // Set Editor Style - var nodeText = topic.getTextShape(); - var font = nodeText.getFont(); - font.size = nodeText.getHtmlFontSize(); - font.color = nodeText.getColor(); - this._setStyle(font); - - // Set editor's initial text - var text = $defined(defaultText) ? defaultText : topic.getText(); - this._setText(text); - - var me = this; - // Set editor's initial size - var displayFunc = function () { - // Position the editor and set the size... - var textShape = me._topic.getTextShape(); - - me._containerElem.css('display', 'block'); - - me._containerElem.offset(textShape.getNativePosition()); - // Set size ... - var elemSize = topic.getSize(); - me._setEditorSize(elemSize.width, elemSize.height); - - var textareaElem = me._getTextareaElem(); - textareaElem.focus(); - me._positionCursor(textareaElem, !$defined(defaultText)); - - }; - - displayFunc.delay(10); - }, - - _setStyle: function (fontStyle) { - var inputField = this._getTextareaElem(); - var spanField = this._getSpanElem(); - if (!$defined(fontStyle.font)) { - fontStyle.font = "Arial"; - } - if (!$defined(fontStyle.style)) { - fontStyle.style = "normal"; - } - if (!$defined(fontStyle.weight)) { - fontStyle.weight = "normal"; - } - if (!$defined(fontStyle.size)) { - fontStyle.size = 12; - } - inputField.style.fontSize = fontStyle.size + "px"; - inputField.style.fontFamily = fontStyle.font; - inputField.style.fontStyle = fontStyle.style; - inputField.style.fontWeight = fontStyle.weight; - inputField.style.color = fontStyle.color; - spanField.style.fontFamily = fontStyle.font; - spanField.style.fontStyle = fontStyle.style; - spanField.style.fontWeight = fontStyle.weight; - spanField.style.fontSize = fontStyle.size + "px"; - }, - - _setText: function (text) { - var inputField = this._getTextareaElem(); - inputField.size = text.length + 1; - this._containerElem.style.width = (inputField.size * parseInt(inputField.style.fontSize) + 100) + "px"; - var spanField = this._getSpanElem(); - spanField.innerHTML = text; - inputField.value = text; - }, - - _getText: function () { - return this._getTextareaElem().value; - }, - - _getTextareaElem: function () { - return this._containerElem.getElement('input'); - }, - - _getSpanElem: function () { - return this._containerElem.getElement('span'); - }, - - _setEditorSize: function (width, height) { - var textShape = this._topic.getTextShape(); - var scale = web2d.peer.utils.TransformUtil.workoutScale(textShape._peer); - this._size = {width: width * scale.width, height: height * scale.height}; - this._containerElem.style.width = this._size.width * 2 + "px"; - this._containerElem.style.height = this._size.height + "px"; - }, - - _positionCursor: function (inputElem, selectText) { - // Select text if it's required ... - if (inputElem.createTextRange) //ie - { - var range = inputElem.createTextRange(); - var pos = inputElem.value.length; - if (!selectText) { - range.select(); - range.move("character", pos); - } - else { - range.move("character", pos); - range.select(); - } - } - else if (!selectText) { - inputElem.setSelectionRange(0, inputElem.value.length); - } - }, - - close: function (update) { - if (this.isVisible()) { - // Update changes ... - if (!$defined(update) || update) { - this._updateModel(); - } - - // Let make the visible text in the node visible again ... - this._topic.getTextShape().setVisibility(true); - - // Remove it form the screen ... - this._containerElem.dispose(); - this._containerElem = null; - } - } -}); - diff --git a/mindplot/src/main/javascript/TextEditorFactory.js b/mindplot/src/main/javascript/TextEditorFactory.js deleted file mode 100644 index 5899fb79..00000000 --- a/mindplot/src/main/javascript/TextEditorFactory.js +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright [2015] [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. - */ -mindplot.TextEditorFactory = {}; - -mindplot.TextEditorFactory.getTextEditorFromName = function (name) { - var editorClass = null; - if (name == "RichTextEditor") { - editorClass = mindplot.RichTextEditor; - } else { - editorClass = mindplot.TextEditor; - } - return editorClass; -}; \ No newline at end of file diff --git a/mindplot/src/main/javascript/Topic.js b/mindplot/src/main/javascript/Topic.js deleted file mode 100644 index 65db1002..00000000 --- a/mindplot/src/main/javascript/Topic.js +++ /dev/null @@ -1,1356 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.Topic = new Class(/** @lends Topic */{ - Extends: mindplot.NodeGraph, - /** - * @extends mindplot.NodeGraph - * @constructs - * @param model - * @param options - */ - initialize: function (model, options) { - this.parent(model, options); - this._children = []; - this._parent = null; - this._relationships = []; - this._isInWorkspace = false; - this._buildTopicShape(); - - // Position a topic .... - var pos = model.getPosition(); - if (pos != null && this.isCentralTopic()) { - this.setPosition(pos); - } - - // Register events for the topic ... - if (!this.isReadOnly()) { - this._registerEvents(); - } - }, - - _registerEvents: function () { - - this.setMouseEventsEnabled(true); - - // Prevent click on the topics being propagated ... - this.addEvent('click', function (event) { - event.stopPropagation(); - }); - var me = this; - this.addEvent('dblclick', function (event) { - me._getTopicEventDispatcher().show(me); - event.stopPropagation(); - }); - }, - - /** - * @param {String} type the topic shape type - * @see {@link mindplot.model.INodeModel} - */ - setShapeType: function (type) { - this._setShapeType(type, true); - }, - - /** @return {mindplot.Topic} parent topic */ - getParent: function () { - return this._parent; - }, - - _setShapeType: function (type, updateModel) { - // Remove inner shape figure ... - var model = this.getModel(); - if ($defined(updateModel) && updateModel) { - model.setShapeType(type); - } - - var oldInnerShape = this.getInnerShape(); - if (oldInnerShape != null) { - - this._removeInnerShape(); - - // Create a new one ... - var innerShape = this.getInnerShape(); - - // Update figure size ... - var size = this.getSize(); - this.setSize(size, true); - - var group = this.get2DElement(); - group.append(innerShape); - - // Move text to the front ... - var text = this.getTextShape(); - text.moveToFront(); - - //Move iconGroup to front ... - var iconGroup = this.getIconGroup(); - if ($defined(iconGroup)) { - iconGroup.moveToFront(); - } - - //Move connector to front - var connector = this.getShrinkConnector(); - if ($defined(connector)) { - connector.moveToFront(); - } - } - - }, - - /** @return {String} topic shape type */ - getShapeType: function () { - var model = this.getModel(); - var result = model.getShapeType(); - if (!$defined(result)) { - result = mindplot.TopicStyle.defaultShapeType(this); - } - return result; - }, - - _removeInnerShape: function () { - var group = this.get2DElement(); - var innerShape = this.getInnerShape(); - group.removeChild(innerShape); - this._innerShape = null; - return innerShape; - }, - - /** @return {web2d.Line|web2d.Rect|web2d.Image} inner shape of the topic */ - getInnerShape: function () { - if (!$defined(this._innerShape)) { - // Create inner box. - this._innerShape = this._buildShape(mindplot.Topic.INNER_RECT_ATTRIBUTES, this.getShapeType()); - - // Update bgcolor ... - var bgColor = this.getBackgroundColor(); - this._setBackgroundColor(bgColor, false); - - // Update border color ... - var brColor = this.getBorderColor(); - this._setBorderColor(brColor, false); - - // Define the pointer ... - if (!this.isCentralTopic() && !this.isReadOnly()) { - this._innerShape.setCursor('move'); - } else { - this._innerShape.setCursor('default'); - } - - } - return this._innerShape; - }, - - _buildShape: function (attributes, shapeType) { - $assert(attributes, "attributes can not be null"); - $assert(shapeType, "shapeType can not be null"); - - var result; - if (shapeType == mindplot.model.TopicShape.RECTANGLE) { - result = new web2d.Rect(0, attributes); - } else if (shapeType == mindplot.model.TopicShape.IMAGE) { - var model = this.getModel(); - var url = model.getImageUrl(); - var size = model.getImageSize(); - - result = new web2d.Image(); - result.setHref(url); - result.setSize(size.width, size.height); - - result.getSize = function () { - return model.getImageSize(); - }; - - result.setPosition = function () { - }; - } - else if (shapeType == mindplot.model.TopicShape.ELLIPSE) { - result = new web2d.Rect(0.9, attributes); - } - else if (shapeType == mindplot.model.TopicShape.ROUNDED_RECT) { - result = new web2d.Rect(0.3, attributes); - } - else if (shapeType == mindplot.model.TopicShape.LINE) { - result = new web2d.Line({strokeColor: "#495879", strokeWidth: 1}); - result.setSize = function (width, height) { - this.size = {width: width, height: height}; - result.setFrom(0, height); - result.setTo(width, height); - - // Lines will have the same color of the default connection lines... - var stokeColor = mindplot.ConnectionLine.getStrokeColor(); - result.setStroke(1, 'solid', stokeColor); - }; - - result.getSize = function () { - return this.size; - }; - - result.setPosition = function () { - }; - - result.setFill = function () { - - }; - - result.setStroke = function () { - - }; - } - else { - $assert(false, "Unsupported figure shapeType:" + shapeType); - } - result.setPosition(0, 0); - return result; - }, - - /** @param {String} type the cursor type, either 'pointer', 'default' or 'move' */ - setCursor: function (type) { - var innerShape = this.getInnerShape(); - innerShape.setCursor(type); - - var outerShape = this.getOuterShape(); - outerShape.setCursor(type); - - var textShape = this.getTextShape(); - textShape.setCursor(type); - }, - - /** @return outer shape */ - getOuterShape: function () { - if (!$defined(this._outerShape)) { - var rect = this._buildShape(mindplot.Topic.OUTER_SHAPE_ATTRIBUTES, mindplot.model.TopicShape.ROUNDED_RECT); - rect.setPosition(-2, -3); - rect.setOpacity(0); - this._outerShape = rect; - } - - return this._outerShape; - }, - - /** @return text shape */ - getTextShape: function () { - if (!$defined(this._text)) { - this._text = this._buildTextShape(false); - - // Set Text ... - var text = this.getText(); - this._setText(text, false); - } - - return this._text; - }, - - /** @return icon group */ - getOrBuildIconGroup: function () { - if (!$defined(this._iconsGroup)) { - this._iconsGroup = this._buildIconGroup(); - var group = this.get2DElement(); - group.append(this._iconsGroup.getNativeElement()); - this._iconsGroup.moveToFront(); - } - return this._iconsGroup; - }, - - /** */ - getIconGroup: function () { - return this._iconsGroup; - }, - - _buildIconGroup: function () { - var textHeight = this.getTextShape().getFontHeight(); - var result = new mindplot.IconGroup(this.getId(), textHeight); - var padding = mindplot.TopicStyle.getInnerPadding(this); - result.setPosition(padding, padding); - - // Load topic features ... - var model = this.getModel(); - var featuresModel = model.getFeatures(); - for (var i = 0; i < featuresModel.length; i++) { - var featureModel = featuresModel[i]; - var icon = mindplot.TopicFeature.createIcon(this, featureModel, this.isReadOnly()); - result.addIcon(icon, featureModel.getType() == mindplot.TopicFeature.Icon.id && !this.isReadOnly()); - } - - return result; - }, - - /** - * assigns the new feature model to the topic's node model and adds the respective icon - * @param {mindplot.model.FeatureModel} featureModel - * @return {mindplot.Icon} the icon corresponding to the feature model - */ - addFeature: function (featureModel) { - var iconGroup = this.getOrBuildIconGroup(); - this.closeEditors(); - - // Update model ... - var model = this.getModel(); - model.addFeature(featureModel); - - var result = mindplot.TopicFeature.createIcon(this, featureModel, this.isReadOnly()); - iconGroup.addIcon(result, featureModel.getType() == mindplot.TopicFeature.Icon.id && !this.isReadOnly()); - - this._adjustShapes(); - return result; - }, - - /** */ - findFeatureById: function (id) { - var model = this.getModel(); - return model.findFeatureById(id); - }, - - /** */ - removeFeature: function (featureModel) { - $assert(featureModel, "featureModel could not be null"); - - //Removing the icon from MODEL - var model = this.getModel(); - model.removeFeature(featureModel); - - //Removing the icon from UI - var iconGroup = this.getIconGroup(); - if ($defined(iconGroup)) { - iconGroup.removeIconByModel(featureModel); - } - this._adjustShapes(); - }, - - /** */ - addRelationship: function (relationship) { - this._relationships.push(relationship); - }, - - /** */ - deleteRelationship: function (relationship) { - this._relationships.erase(relationship); - }, - - /** */ - getRelationships: function () { - return this._relationships; - }, - - _buildTextShape: function (readOnly) { - var result = new web2d.Text(); - var family = this.getFontFamily(); - var size = this.getFontSize(); - var weight = this.getFontWeight(); - var style = this.getFontStyle(); - result.setFont(family, size, style, weight); - - var color = this.getFontColor(); - result.setColor(color); - - if (!readOnly) { - // Propagate mouse events ... - if (!this.isCentralTopic()) { - result.setCursor('move'); - } else { - result.setCursor('default'); - } - } - - return result; - }, - - /** */ - setFontFamily: function (value, updateModel) { - var textShape = this.getTextShape(); - textShape.setFontFamily(value); - if ($defined(updateModel) && updateModel) { - var model = this.getModel(); - model.setFontFamily(value); - } - this._adjustShapes(updateModel); - }, - - /** */ - setFontSize: function (value, updateModel) { - - var textShape = this.getTextShape(); - textShape.setSize(value); - - if ($defined(updateModel) && updateModel) { - var model = this.getModel(); - model.setFontSize(value); - } - this._adjustShapes(updateModel); - - }, - - /** */ - setFontStyle: function (value, updateModel) { - var textShape = this.getTextShape(); - textShape.setStyle(value); - if ($defined(updateModel) && updateModel) { - var model = this.getModel(); - model.setFontStyle(value); - } - this._adjustShapes(updateModel); - }, - - /** */ - setFontWeight: function (value, updateModel) { - var textShape = this.getTextShape(); - textShape.setWeight(value); - if ($defined(updateModel) && updateModel) { - var model = this.getModel(); - model.setFontWeight(value); - } - this._adjustShapes(); - }, - - /** */ - getFontWeight: function () { - var model = this.getModel(); - var result = model.getFontWeight(); - if (!$defined(result)) { - var font = mindplot.TopicStyle.defaultFontStyle(this); - result = font.weight; - } - return result; - }, - - /** */ - getFontFamily: function () { - var model = this.getModel(); - var result = model.getFontFamily(); - if (!$defined(result)) { - var font = mindplot.TopicStyle.defaultFontStyle(this); - result = font.font; - } - return result; - }, - - /** */ - getFontColor: function () { - var model = this.getModel(); - var result = model.getFontColor(); - if (!$defined(result)) { - var font = mindplot.TopicStyle.defaultFontStyle(this); - result = font.color; - } - return result; - }, - - /** */ - getFontStyle: function () { - var model = this.getModel(); - var result = model.getFontStyle(); - if (!$defined(result)) { - var font = mindplot.TopicStyle.defaultFontStyle(this); - result = font.style; - } - return result; - }, - - /** */ - getFontSize: function () { - var model = this.getModel(); - var result = model.getFontSize(); - if (!$defined(result)) { - var font = mindplot.TopicStyle.defaultFontStyle(this); - result = font.size; - } - return result; - }, - - /** */ - setFontColor: function (value, updateModel) { - var textShape = this.getTextShape(); - textShape.setColor(value); - if ($defined(updateModel) && updateModel) { - var model = this.getModel(); - model.setFontColor(value); - } - }, - - _setText: function (text, updateModel) { - var textShape = this.getTextShape(); - textShape.setText(text == null ? mindplot.TopicStyle.defaultText(this) : text); - - if ($defined(updateModel) && updateModel) { - var model = this.getModel(); - model.setText(text); - } - }, - - /** */ - setText: function (text) { - // Avoid empty nodes ... - if (!text || $.trim(text).length == 0) { - text = null; - } - - this._setText(text, true); - this._adjustShapes(); - }, - - /** */ - getText: function () { - var model = this.getModel(); - var result = model.getText(); - if (!$defined(result)) { - result = mindplot.TopicStyle.defaultText(this); - } - return result; - }, - - /** */ - setBackgroundColor: function (color) { - this._setBackgroundColor(color, true); - }, - - _setBackgroundColor: function (color, updateModel) { - var innerShape = this.getInnerShape(); - innerShape.setFill(color); - - var connector = this.getShrinkConnector(); - if (connector) { - connector.setFill(color); - } - - if ($defined(updateModel) && updateModel) { - var model = this.getModel(); - model.setBackgroundColor(color); - } - }, - - /** */ - getBackgroundColor: function () { - var model = this.getModel(); - var result = model.getBackgroundColor(); - if (!$defined(result)) { - result = mindplot.TopicStyle.defaultBackgroundColor(this); - } - return result; - }, - - /** */ - setBorderColor: function (color) { - this._setBorderColor(color, true); - }, - - _setBorderColor: function (color, updateModel) { - var innerShape = this.getInnerShape(); - innerShape.setAttribute('strokeColor', color); - - var connector = this.getShrinkConnector(); - if (connector) { - connector.setAttribute('strokeColor', color); - } - - if ($defined(updateModel) && updateModel) { - var model = this.getModel(); - model.setBorderColor(color); - } - }, - - /** */ - getBorderColor: function () { - var model = this.getModel(); - var result = model.getBorderColor(); - if (!$defined(result)) { - result = mindplot.TopicStyle.defaultBorderColor(this); - } - return result; - }, - - _buildTopicShape: function () { - var groupAttributes = {width: 100, height: 100, coordSizeWidth: 100, coordSizeHeight: 100}; - var group = new web2d.Group(groupAttributes); - this._set2DElement(group); - - // Shape must be build based on the model width ... - var outerShape = this.getOuterShape(); - var innerShape = this.getInnerShape(); - var textShape = this.getTextShape(); - - // Add to the group ... - group.append(outerShape); - group.append(innerShape); - group.append(textShape); - - // Update figure size ... - var model = this.getModel(); - if (model.getFeatures().length != 0) { - this.getOrBuildIconGroup(); - } - - var shrinkConnector = this.getShrinkConnector(); - if ($defined(shrinkConnector)) { - shrinkConnector.addToWorkspace(group); - } - - // Register listeners ... - this._registerDefaultListenersToElement(group, this); - }, - - _registerDefaultListenersToElement: function (elem, topic) { - var mouseOver = function (event) { - if (topic.isMouseEventsEnabled()) { - topic.handleMouseOver(event); - } - }; - elem.addEvent('mouseover', mouseOver); - - var outout = function (event) { - if (topic.isMouseEventsEnabled()) { - topic.handleMouseOut(event); - } - }; - elem.addEvent('mouseout', outout); - - var me = this; - // Focus events ... - elem.addEvent('mousedown', function (event) { - if (!me.isReadOnly()) { - // Disable topic selection of readOnly mode ... - var value = true; - if ((event.metaKey && Browser.Platform.mac) || (event.ctrlKey && !Browser.Platform.mac)) { - value = !me.isOnFocus(); - event.stopPropagation(); - event.preventDefault(); - } - topic.setOnFocus(value); - } - - var eventDispatcher = me._getTopicEventDispatcher(); - eventDispatcher.process(mindplot.TopicEvent.CLICK, me); - event.stopPropagation(); - - }); - }, - - /** */ - areChildrenShrunken: function () { - var model = this.getModel(); - return model.areChildrenShrunken() && !this.isCentralTopic(); - }, - - /** */ - isCollapsed: function () { - var result = false; - - var current = this.getParent(); - while (current && !result) { - result = current.areChildrenShrunken(); - current = current.getParent(); - } - return result; - }, - - /** */ - setChildrenShrunken: function (value) { - // Update Model ... - var model = this.getModel(); - model.setChildrenShrunken(value); - - // Change render base on the state. - var shrinkConnector = this.getShrinkConnector(); - if ($defined(shrinkConnector)) { - shrinkConnector.changeRender(value); - } - - // Do some fancy animation .... - var elements = this._flatten2DElements(this); - var fade = new mindplot.util.FadeEffect(elements, !value); - var me = this; - fade.addEvent('complete', function () { - // Set focus on the parent node ... - if (value) { - me.setOnFocus(true); - } - - // Set focus in false for all the children ... - elements.forEach(function (elem) { - if (elem.setOnFocus) { - elem.setOnFocus(false); - } - }); - }); - fade.start(); - - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeShrinkEvent, model); - - }, - - /** */ - getShrinkConnector: function () { - var result = this._connector; - if (this._connector == null) { - this._connector = new mindplot.ShirinkConnector(this); - this._connector.setVisibility(false); - result = this._connector; - - } - return result; - }, - - /** */ - handleMouseOver: function () { - var outerShape = this.getOuterShape(); - outerShape.setOpacity(1); - }, - - /** */ - handleMouseOut: function () { - var outerShape = this.getOuterShape(); - if (!this.isOnFocus()) { - outerShape.setOpacity(0); - } - }, - - /** */ - showTextEditor: function (text) { - this._getTopicEventDispatcher().show(this, {text: text}); - }, - - /** */ - showNoteEditor: function () { - - var topicId = this.getId(); - var model = this.getModel(); - var editorModel = { - getValue: function () { - var notes = model.findFeatureByType(mindplot.TopicFeature.Note.id); - var result; - if (notes.length > 0) - result = notes[0].getText(); - - return result; - }, - - setValue: function (value) { - var dispatcher = mindplot.ActionDispatcher.getInstance(); - var notes = model.findFeatureByType(mindplot.TopicFeature.Note.id); - if (!$defined(value)) { - var featureId = notes[0].getId(); - dispatcher.removeFeatureFromTopic(topicId, featureId); - } - else { - if (notes.length > 0) { - dispatcher.changeFeatureToTopic(topicId, notes[0].getId(), {text: value}); - } - else { - dispatcher.addFeatureToTopic(topicId, mindplot.TopicFeature.Note.id, {text: value}); - } - } - } - }; - var editor = new mindplot.widget.NoteEditor(editorModel); - this.closeEditors(); - editor.show(); - }, - - /** opens a dialog where the user can enter or edit an existing link associated with this topic */ - showLinkEditor: function () { - - var topicId = this.getId(); - var model = this.getModel(); - var editorModel = { - getValue: function () { - //@param {mindplot.model.LinkModel[]} links - var links = model.findFeatureByType(mindplot.TopicFeature.Link.id); - var result; - if (links.length > 0) - result = links[0].getUrl(); - - return result; - }, - - setValue: function (value) { - var dispatcher = mindplot.ActionDispatcher.getInstance(); - var links = model.findFeatureByType(mindplot.TopicFeature.Link.id); - if (!$defined(value)) { - var featureId = links[0].getId(); - dispatcher.removeFeatureFromTopic(topicId, featureId); - } - else { - if (links.length > 0) { - dispatcher.changeFeatureToTopic(topicId, links[0].getId(), {url: value}); - } - else { - dispatcher.addFeatureToTopic(topicId, mindplot.TopicFeature.Link.id, {url: value}); - } - } - } - }; - - this.closeEditors(); - var editor = new mindplot.widget.LinkEditor(editorModel); - editor.show(); - }, - - /** */ - closeEditors: function () { - this._getTopicEventDispatcher().close(true); - }, - - _getTopicEventDispatcher: function () { - return mindplot.TopicEventDispatcher.getInstance(); - }, - - /** - * Point: references the center of the rect shape.!!! - */ - setPosition: function (point) { - $assert(point, "position can not be null"); - point.x = Math.ceil(point.x); - point.y = Math.ceil(point.y); - - // Update model's position ... - var model = this.getModel(); - model.setPosition(point.x, point.y); - - // Elements are positioned in the center. - // All topic element must be positioned based on the innerShape. - var size = this.getSize(); - - var cx = point.x - (size.width / 2); - var cy = point.y - (size.height / 2); - - // Update visual position. - this._elem2d.setPosition(cx, cy); - - // Update connection lines ... - this._updateConnectionLines(); - - // Check object state. - this.invariant(); - }, - - /** */ - getOutgoingLine: function () { - return this._outgoingLine; - }, - - /** */ - getIncomingLines: function () { - var result = []; - var children = this.getChildren(); - for (var i = 0; i < children.length; i++) { - var node = children[i]; - var line = node.getOutgoingLine(); - if ($defined(line)) { - result.push(line); - } - } - return result; - }, - - /** */ - getOutgoingConnectedTopic: function () { - var result = null; - var line = this.getOutgoingLine(); - if ($defined(line)) { - result = line.getTargetTopic(); - } - return result; - }, - - _updateConnectionLines: function () { - // Update this to parent line ... - var outgoingLine = this.getOutgoingLine(); - if ($defined(outgoingLine)) { - outgoingLine.redraw(); - } - - // Update all the incoming lines ... - var incomingLines = this.getIncomingLines(); - for (var i = 0; i < incomingLines.length; i++) { - incomingLines[i].redraw(); - } - - // Update relationship lines - for (var j = 0; j < this._relationships.length; j++) { - this._relationships[j].redraw(); - } - }, - - /** */ - setBranchVisibility: function (value) { - var current = this; - var parent = this; - while (parent != null && !parent.isCentralTopic()) { - current = parent; - parent = current.getParent(); - } - current.setVisibility(value); - }, - - /** */ - setVisibility: function (value) { - this._setTopicVisibility(value); - - // Hide all children... - this._setChildrenVisibility(value); - - // If there there are connection to the node, topic must be hidden. - this._setRelationshipLinesVisibility(value); - - // If it's connected, the connection must be rendered. - var outgoingLine = this.getOutgoingLine(); - if (outgoingLine) { - outgoingLine.setVisibility(value); - } - }, - - /** */ - moveToBack: function () { - - // Update relationship lines - for (var j = 0; j < this._relationships.length; j++) { - this._relationships[j].moveToBack(); - } - var connector = this.getShrinkConnector(); - if ($defined(connector)) { - connector.moveToBack(); - } - - this.get2DElement().moveToBack(); - }, - - /** */ - moveToFront: function () { - - this.get2DElement().moveToFront(); - var connector = this.getShrinkConnector(); - if ($defined(connector)) { - connector.moveToFront(); - } - // Update relationship lines - for (var j = 0; j < this._relationships.length; j++) { - this._relationships[j].moveToFront(); - } - }, - - /** */ - isVisible: function () { - var elem = this.get2DElement(); - return elem.isVisible(); - }, - - _setRelationshipLinesVisibility: function (value) { - _.each(this._relationships, function (relationship) { - var sourceTopic = relationship.getSourceTopic(); - var targetTopic = relationship.getTargetTopic(); - - var targetParent = targetTopic.getModel().getParent(); - var sourceParent = sourceTopic.getModel().getParent(); - relationship.setVisibility(value && (targetParent == null || !targetParent.areChildrenShrunken()) && (sourceParent == null || !sourceParent.areChildrenShrunken())); - }); - }, - - _setTopicVisibility: function (value) { - var elem = this.get2DElement(); - elem.setVisibility(value); - - if (this.getIncomingLines().length > 0) { - var connector = this.getShrinkConnector(); - if ($defined(connector)) { - connector.setVisibility(value); - } - } - - var textShape = this.getTextShape(); - textShape.setVisibility(this.getShapeType() != mindplot.model.TopicShape.IMAGE ? value : false); - }, - - /** */ - setOpacity: function (opacity) { - var elem = this.get2DElement(); - elem.setOpacity(opacity); - - var connector = this.getShrinkConnector(); - if ($defined(connector)) { - connector.setOpacity(opacity); - } - var textShape = this.getTextShape(); - textShape.setOpacity(opacity); - }, - - _setChildrenVisibility: function (isVisible) { - - // Hide all children. - var children = this.getChildren(); - var model = this.getModel(); - - isVisible = isVisible ? !model.areChildrenShrunken() : isVisible; - for (var i = 0; i < children.length; i++) { - var child = children[i]; - child.setVisibility(isVisible); - - var outgoingLine = child.getOutgoingLine(); - outgoingLine.setVisibility(isVisible); - } - - }, - - /** */ - invariant: function () { - var line = this._outgoingLine; - var model = this.getModel(); - var isConnected = model.isConnected(); - - // Check consistency... - if ((isConnected && !line) || (!isConnected && line)) { - // $assert(false,'Illegal state exception.'); - } - }, - - /** */ - setSize: function (size, force) { - $assert(size, "size can not be null"); - $assert($defined(size.width), "size seem not to be a valid element"); - size = {width: Math.ceil(size.width), height: Math.ceil(size.height)}; - - var oldSize = this.getSize(); - var hasSizeChanged = oldSize.width != size.width || oldSize.height != size.height; - if (hasSizeChanged || force) { - mindplot.NodeGraph.prototype.setSize.call(this, size); - - var outerShape = this.getOuterShape(); - var innerShape = this.getInnerShape(); - - outerShape.setSize(size.width + 4, size.height + 6); - innerShape.setSize(size.width, size.height); - - // Update the figure position(ej: central topic must be centered) and children position. - this._updatePositionOnChangeSize(oldSize, size); - - if (hasSizeChanged) { - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeResizeEvent, { - node: this.getModel(), - size: size - }); - } - } - }, - - _updatePositionOnChangeSize: function () { - $assert(false, "this method must be overwrited."); - }, - - /** */ - disconnect: function (workspace) { - var outgoingLine = this.getOutgoingLine(); - if ($defined(outgoingLine)) { - $assert(workspace, 'workspace can not be null'); - - this._outgoingLine = null; - - // Disconnect nodes ... - var targetTopic = outgoingLine.getTargetTopic(); - targetTopic.removeChild(this); - - // Update model ... - var childModel = this.getModel(); - childModel.disconnect(); - - this._parent = null; - - // Remove graphical element from the workspace... - outgoingLine.removeFromWorkspace(workspace); - - // Remove from workspace. - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeDisconnectEvent, this.getModel()); - - // Change text based on the current connection ... - var model = this.getModel(); - if (!model.getText()) { - var text = this.getText(); - this._setText(text, false); - } - if (!model.getFontSize()) { - var size = this.getFontSize(); - this.setFontSize(size, false); - } - - // Hide connection line?. - if (targetTopic.getChildren().length == 0) { - var connector = targetTopic.getShrinkConnector(); - if ($defined(connector)) { - connector.setVisibility(false); - } - } - } - }, - - /** */ - getOrder: function () { - var model = this.getModel(); - return model.getOrder(); - }, - - /** */ - setOrder: function (value) { - var model = this.getModel(); - model.setOrder(value); - }, - - /** */ - connectTo: function (targetTopic, workspace) { - $assert(!this._outgoingLine, 'Could not connect an already connected node'); - $assert(targetTopic != this, 'Circular connection are not allowed'); - $assert(targetTopic, 'Parent Graph can not be null'); - $assert(workspace, 'Workspace can not be null'); - - // Connect Graphical Nodes ... - targetTopic.append(this); - this._parent = targetTopic; - - // Update model ... - var targetModel = targetTopic.getModel(); - var childModel = this.getModel(); - childModel.connectTo(targetModel); - - // Create a connection line ... - var outgoingLine = new mindplot.ConnectionLine(this, targetTopic); - outgoingLine.setVisibility(false); - - this._outgoingLine = outgoingLine; - workspace.append(outgoingLine); - - // Update figure is necessary. - this.updateTopicShape(targetTopic); - - // Change text based on the current connection ... - var model = this.getModel(); - if (!model.getText()) { - var text = this.getText(); - this._setText(text, false); - } - if (!model.getFontSize()) { - var size = this.getFontSize(); - this.setFontSize(size, false); - } - this.getTextShape(); - - // Display connection node... - var connector = targetTopic.getShrinkConnector(); - if ($defined(connector)) { - connector.setVisibility(true); - } - - // Redraw line ... - outgoingLine.redraw(); - - // Fire connection event ... - if (this.isInWorkspace()) { - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeConnectEvent, { - parentNode: targetTopic.getModel(), - childNode: this.getModel() - }); - } - }, - - /** */ - append: function (child) { - var children = this.getChildren(); - children.push(child); - }, - - /** */ - removeChild: function (child) { - var children = this.getChildren(); - children.erase(child); - }, - - /** */ - getChildren: function () { - var result = this._children; - if (!$defined(result)) { - this._children = []; - result = this._children; - } - return result; - }, - - /** */ - removeFromWorkspace: function (workspace) { - var elem2d = this.get2DElement(); - workspace.removeChild(elem2d); - var line = this.getOutgoingLine(); - if ($defined(line)) { - workspace.removeChild(line); - } - this._isInWorkspace = false; - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeRemoved, this.getModel()); - }, - - /** */ - addToWorkspace: function (workspace) { - var elem = this.get2DElement(); - workspace.append(elem); - if (!this.isInWorkspace()) { - if (!this.isCentralTopic()) { - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeAdded, this.getModel()); - } - - if (this.getModel().isConnected()) - mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeConnectEvent, { - parentNode: this.getOutgoingConnectedTopic().getModel(), - childNode: this.getModel() - }); - - } - this._isInWorkspace = true; - this._adjustShapes(); - }, - - /** */ - isInWorkspace: function () { - return this._isInWorkspace; - }, - - /** */ - createDragNode: function (layoutManager) { - var result = this.parent(layoutManager); - - // Is the node already connected ? - var targetTopic = this.getOutgoingConnectedTopic(); - if ($defined(targetTopic)) { - result.connectTo(targetTopic); - result.setVisibility(false); - } - - // If a drag node is create for it, let's hide the editor. - this._getTopicEventDispatcher().close(); - - return result; - }, - - _adjustShapes: function () { - if (this._isInWorkspace) { - - var textShape = this.getTextShape(); - if (this.getShapeType() != mindplot.model.TopicShape.IMAGE) { - - var textWidth = textShape.getWidth(); - - var textHeight = textShape.getHeight(); - textHeight = textHeight != 0 ? textHeight : 20; - - var topicPadding = mindplot.TopicStyle.getInnerPadding(this); - - // Adjust the icon size to the size of the text ... - var iconGroup = this.getOrBuildIconGroup(); - var fontHeight = this.getTextShape().getFontHeight(); - iconGroup.setPosition(topicPadding, topicPadding); - iconGroup.seIconSize(fontHeight, fontHeight); - - // Add a extra padding between the text and the icons - var iconsWidth = iconGroup.getSize().width; - if (iconsWidth != 0) { - - iconsWidth = iconsWidth + (textHeight / 4); - } - - var height = textHeight + (topicPadding * 2); - var width = textWidth + iconsWidth + (topicPadding * 2); - - this.setSize({width: width, height: height}); - - // Position node ... - textShape.setPosition(topicPadding + iconsWidth, topicPadding); - } else { - // In case of images, the size if fixed ... - var size = this.getModel().getImageSize(); - this.setSize(size); - } - } - }, - - _flatten2DElements: function (topic) { - var result = []; - - var children = topic.getChildren(); - for (var i = 0; i < children.length; i++) { - - var child = children[i]; - result.push(child); - result.push(child.getOutgoingLine()); - - var relationships = child.getRelationships(); - result = result.concat(relationships); - - if (!child.areChildrenShrunken()) { - var innerChilds = this._flatten2DElements(child); - result = result.concat(innerChilds); - } - } - return result; - }, - - /** - * @param childTopic - * @return {Boolean} true if childtopic is a child topic of this topic or the topic itself - */ - isChildTopic: function (childTopic) { - var result = (this.getId() == childTopic.getId()); - if (!result) { - var children = this.getChildren(); - for (var i = 0; i < children.length; i++) { - var parent = children[i]; - result = parent.isChildTopic(childTopic); - if (result) { - break; - } - } - } - return result; - }, - - /** @return {Boolean} true if the topic is the central topic of the map */ - isCentralTopic: function () { - return this.getModel().getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE; - } - - -}); - -/** - * @constant - * @type {Number} - * @default - */ -mindplot.Topic.CONNECTOR_WIDTH = 6; -/** - * @constant - * @type {Object} - * @default - */ -mindplot.Topic.OUTER_SHAPE_ATTRIBUTES = {fillColor: 'rgb(252,235,192)', stroke: '1 dot rgb(241,163,39)', x: 0, y: 0}; -/** - * @constant - * @type {Object} - * @default - */ -mindplot.Topic.OUTER_SHAPE_ATTRIBUTES_FOCUS = {fillColor: 'rgb(244,184,45)', x: 0, y: 0}; -/** - * @constant - * @type {Object} - * @default - * */ -mindplot.Topic.INNER_RECT_ATTRIBUTES = {stroke: '2 solid'}; - - - diff --git a/mindplot/src/main/javascript/TopicEventDispatcher.js b/mindplot/src/main/javascript/TopicEventDispatcher.js deleted file mode 100644 index 015463df..00000000 --- a/mindplot/src/main/javascript/TopicEventDispatcher.js +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.TopicEventDispatcher = new Class({ - Extends: mindplot.Events, - Static: { - _instance: null, - - configure: function (readOnly) { - this._instance = new mindplot.TopicEventDispatcher(readOnly); - }, - - getInstance: function () { - return this._instance; - } - }, - - initialize: function (readOnly) { - this._readOnly = readOnly; - this._activeEditor = null; - this._multilineEditor = new mindplot.MultilineTextEditor(); - }, - - close: function (update) { - if (this.isVisible()) { - this._activeEditor.close(update); - this._activeEditor = null; - } - }, - - show: function (topic, options) { - this.process(mindplot.TopicEvent.EDIT, topic, options); - }, - - process: function (eventType, topic, options) { - $assert(eventType, "eventType can not be null"); - - // Close all previous open editor .... - if (this.isVisible()) { - this.close(); - } - - // Open the new editor ... - var model = topic.getModel(); - if (model.getShapeType() != mindplot.model.TopicShape.IMAGE && !this._readOnly && eventType == mindplot.TopicEvent.EDIT) { - this._multilineEditor.show(topic, options ? options.text : null); - this._activeEditor = this._multilineEditor; - } else { - this.fireEvent(eventType, {model: model, readOnly: this._readOnly}); - } - }, - - isVisible: function () { - return this._activeEditor != null && this._activeEditor.isVisible(); - } -}); - - -mindplot.TopicEvent = { - EDIT: "editnode", - CLICK: "clicknode" -}; - diff --git a/mindplot/src/main/javascript/TopicFeature.js b/mindplot/src/main/javascript/TopicFeature.js deleted file mode 100644 index 19d1e20c..00000000 --- a/mindplot/src/main/javascript/TopicFeature.js +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -/** */ -mindplot.TopicFeature = { - /** the icon object */ - Icon: { - id: mindplot.model.IconModel.FEATURE_TYPE, - model: mindplot.model.IconModel, - icon: mindplot.ImageIcon - }, - - /** the link object */ - Link: { - id: mindplot.model.LinkModel.FEATURE_TYPE, - model: mindplot.model.LinkModel, - icon: mindplot.LinkIcon - }, - - /** the note object */ - Note: { - id: mindplot.model.NoteModel.FEATURE_TYPE, - model: mindplot.model.NoteModel, - icon: mindplot.NoteIcon - }, - - /** - * @param id the feature metadata id - * @return {Boolean} returns true if the given id is contained in the metadata array - */ - isSupported: function (id) { - return mindplot.TopicFeature._featuresMetadataById.some(function (elem) { - return elem.id == id; - }); - }, - - /** - * @param type - * @param attributes - * @throws will throw an error if type is null or undefined - * @throws will throw an error if attributes is null or undefined - * @return {mindplot.model.FeatureModel} a new instance of the feature model subclass matching - * the topic feature - */ - createModel: function (type, attributes) { - $assert(type, 'type can not be null'); - $assert(attributes, 'attributes can not be null'); - - var model = mindplot.TopicFeature._featuresMetadataById.filter(function (elem) { - return elem.id == type; - })[0].model; - return new model(attributes); - }, - - /** - * @param {mindplot.Topic} topic - * @param {mindplot.model.FeatureModel} model - * @param {Boolean} readOnly true if the editor is running in read-only mode - * @throws will throw an error if topic is null or undefined - * @throws will throw an error if model is null or undefined - * @return {mindplot.Icon} a new instance of the icon subclass matching the topic feature - */ - createIcon: function (topic, model, readOnly) { - $assert(topic, 'topic can not be null'); - $assert(model, 'model can not be null'); - - var icon = mindplot.TopicFeature._featuresMetadataById.filter(function (elem) { - return elem.id == model.getType(); - })[0].icon; - return new icon(topic, model, readOnly); - } -}; - -mindplot.TopicFeature._featuresMetadataById = [mindplot.TopicFeature.Icon, mindplot.TopicFeature.Link, mindplot.TopicFeature.Note]; - - diff --git a/mindplot/src/main/javascript/TopicStyle.js b/mindplot/src/main/javascript/TopicStyle.js deleted file mode 100644 index ce719342..00000000 --- a/mindplot/src/main/javascript/TopicStyle.js +++ /dev/null @@ -1,132 +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. - */ -mindplot.TopicStyle = new Class({ - Static: { - _getStyles: function (topic) { - $assert(topic, "topic can not be null"); - - var result; - if (topic.isCentralTopic()) { - result = mindplot.TopicStyle.STYLES.CENTRAL_TOPIC; - } else { - var targetTopic = topic.getOutgoingConnectedTopic(); - if ($defined(targetTopic)) { - if (targetTopic.isCentralTopic()) { - result = mindplot.TopicStyle.STYLES.MAIN_TOPIC; - } else { - result = mindplot.TopicStyle.STYLES.SUB_TOPIC; - } - } else { - result = mindplot.TopicStyle.STYLES.ISOLATED_TOPIC; - } - } - return result; - }, - - defaultText: function (topic) { - var msgKey = this._getStyles(topic).msgKey; - return $msg(msgKey); - }, - - defaultFontStyle: function (topic) { - return this._getStyles(topic).fontStyle; - }, - - defaultBackgroundColor: function (topic) { - return this._getStyles(topic).backgroundColor; - }, - - defaultBorderColor: function (topic) { - return this._getStyles(topic).borderColor; - }, - - getInnerPadding: function (topic) { - return this._getStyles(topic).innerPadding; - }, - - defaultShapeType: function (topic) { - return this._getStyles(topic).shapeType; - } - - } -}); - -mindplot.TopicStyle.STYLES = -{ - CENTRAL_TOPIC: { - borderColor: 'rgb(57,113,177)', - backgroundColor: 'rgb(80,157,192)', - fontStyle: { - font: "Verdana", - size: 10, - style: "normal", - weight: "bold", - color: "#ffffff" - }, - msgKey: 'CENTRAL_TOPIC', - innerPadding: 11, - shapeType: mindplot.model.TopicShape.ROUNDED_RECT - }, - - MAIN_TOPIC: { - borderColor: 'rgb(2,59,185)', - backgroundColor: 'rgb(224,229,239)', - fontStyle: { - font: "Arial", - size: 8, - style: "normal", - weight: "normal", - color: "rgb(82,92,97)" - }, - msgKey: 'MAIN_TOPIC', - innerPadding: 3, - shapeType: mindplot.model.TopicShape.LINE - - }, - - SUB_TOPIC: { - borderColor: 'rgb(2,59,185)', - backgroundColor: 'rgb(224,229,239)', - fontStyle: { - font: "Arial", - size: 6, - style: "normal", - weight: "normal", - color: "rgb(82,92,97)" - }, - msgKey: 'SUB_TOPIC', - innerPadding: 3, - shapeType: mindplot.model.TopicShape.LINE - }, - - ISOLATED_TOPIC: { - borderColor: 'rgb(2,59,185)', - backgroundColor: 'rgb(224,229,239)', - fontStyle: { - font: "Verdana", - size: 8, - style: "normal", - weight: "normal", - color: "rgb(82,92,97)" - }, - msgKey: 'ISOLATED_TOPIC', - innerPadding: 4, - shapeType: mindplot.model.TopicShape.LINE - } -}; - diff --git a/mindplot/src/main/javascript/Workspace.js b/mindplot/src/main/javascript/Workspace.js deleted file mode 100644 index c4481d2a..00000000 --- a/mindplot/src/main/javascript/Workspace.js +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.Workspace = new Class({ - initialize: function (screenManager, zoom) { - // Create a suitable container ... - $assert(screenManager, 'Div container can not be null'); - $assert(zoom, 'zoom container can not be null'); - - this._zoom = zoom; - this._screenManager = screenManager; - - var divContainer = screenManager.getContainer(); - this._screenWidth = parseInt(divContainer.css('width')); - this._screenHeight = parseInt(divContainer.css('height')); - - // Initialize web2d workspace. - var workspace = this._createWorkspace(); - this._workspace = workspace; - - // Append to the workspace... - workspace.addItAsChildTo(divContainer); - this.setZoom(zoom, true); - - // Register drag events ... - this._registerDragEvents(); - this._eventsEnabled = true; - }, - - _createWorkspace: function () { - // Initialize workspace ... - var coordOriginX = -(this._screenWidth / 2); - var coordOriginY = -(this._screenHeight / 2); - - var workspaceProfile = { - width: this._screenWidth + "px", - height: this._screenHeight + "px", - coordSizeWidth: this._screenWidth, - coordSizeHeight: this._screenHeight, - coordOriginX: coordOriginX, - coordOriginY: coordOriginY, - fillColor: 'transparent', - strokeWidth: 0 - }; - web2d.peer.Toolkit.init(); - return new web2d.Workspace(workspaceProfile); - }, - - append: function (shape) { - if ($defined(shape.addToWorkspace)) { - shape.addToWorkspace(this); - } else { - this._workspace.append(shape); - } - }, - - removeChild: function (shape) { - // Element is a node, not a web2d element? - if ($defined(shape.removeFromWorkspace)) { - shape.removeFromWorkspace(this); - } else { - this._workspace.removeChild(shape); - } - }, - - addEvent: function (type, listener) { - this._workspace.addEvent(type, listener); - }, - - removeEvent: function (type, listener) { - $assert(type, 'type can not be null'); - $assert(listener, 'listener can not be null'); - this._workspace.removeEvent(type, listener); - }, - - getSize: function () { - return this._workspace.getCoordSize(); - }, - - setZoom: function (zoom, center) { - this._zoom = zoom; - var workspace = this._workspace; - - // Update coord scale... - var coordWidth = zoom * this._screenWidth; - var coordHeight = zoom * this._screenHeight; - workspace.setCoordSize(coordWidth, coordHeight); - - // View port coords ... - if (this._viewPort) { - this._viewPort.width = this._viewPort.width * zoom; - this._viewPort.height = this._viewPort.height * zoom; - } - - // Center topic.... - var coordOriginX; - var coordOriginY; - - if (center) { - if (this._viewPort) { - coordOriginX = -(this._viewPort.width / 2); - coordOriginY = -(this._viewPort.height / 2); - } else { - coordOriginX = -(coordWidth / 2); - coordOriginY = -(coordHeight / 2); - } - } else { - var coordOrigin = workspace.getCoordOrigin(); - coordOriginX = coordOrigin.x; - coordOriginY = coordOrigin.y; - } - - workspace.setCoordOrigin(coordOriginX, coordOriginY); - - // Update screen. - this._screenManager.setOffset(coordOriginX, coordOriginY); - this._screenManager.setScale(zoom); - - // Some changes in the screen. Let's fire an update event... - this._screenManager.fireEvent('update'); - }, - - getScreenManager: function () { - return this._screenManager; - }, - - enableWorkspaceEvents: function (value) { - this._eventsEnabled = value; - }, - - isWorkspaceEventsEnabled: function () { - return this._eventsEnabled; - }, - - dumpNativeChart: function () { - return this._workspace.dumpNativeChart(); - }, - - _registerDragEvents: function () { - var workspace = this._workspace; - var screenManager = this._screenManager; - var mWorkspace = this; - var mouseDownListener = function (event) { - if (!$defined(workspace._mouseMoveListener)) { - if (mWorkspace.isWorkspaceEventsEnabled()) { - mWorkspace.enableWorkspaceEvents(false); - - var mouseDownPosition = screenManager.getWorkspaceMousePosition(event); - var originalCoordOrigin = workspace.getCoordOrigin(); - - var wasDragged = false; - workspace._mouseMoveListener = function (event) { - - var currentMousePosition = screenManager.getWorkspaceMousePosition(event); - - var offsetX = currentMousePosition.x - mouseDownPosition.x; - var coordOriginX = -offsetX + originalCoordOrigin.x; - - var offsetY = currentMousePosition.y - mouseDownPosition.y; - var coordOriginY = -offsetY + originalCoordOrigin.y; - - workspace.setCoordOrigin(coordOriginX, coordOriginY); - - // Change cursor. - if (Browser.firefox) { - window.document.body.style.cursor = "-moz-grabbing"; - } else { - window.document.body.style.cursor = "move"; - } - event.preventDefault(); - - // Fire drag event ... - screenManager.fireEvent('update'); - wasDragged = true; - - - }; - screenManager.addEvent('mousemove', workspace._mouseMoveListener); - - // Register mouse up listeners ... - workspace._mouseUpListener = function (event) { - - screenManager.removeEvent('mousemove', workspace._mouseMoveListener); - screenManager.removeEvent('mouseup', workspace._mouseUpListener); - workspace._mouseUpListener = null; - workspace._mouseMoveListener = null; - window.document.body.style.cursor = 'default'; - - // Update screen manager offset. - var coordOrigin = workspace.getCoordOrigin(); - screenManager.setOffset(coordOrigin.x, coordOrigin.y); - mWorkspace.enableWorkspaceEvents(true); - - if (!wasDragged) { - screenManager.fireEvent('click'); - } - }; - screenManager.addEvent('mouseup', workspace._mouseUpListener); - } - } else { - workspace._mouseUpListener(); - } - }; - screenManager.addEvent('mousedown', mouseDownListener); - }, - - setViewPort: function (size) { - this._viewPort = size; - } -}); - - diff --git a/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js b/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js deleted file mode 100644 index 81e3dde6..00000000 --- a/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.commands.AddFeatureToTopicCommand = new Class(/** @lends AddFeatureToTopicCommand */{ - Extends:mindplot.Command, - /** - * @classdesc This command class handles do/undo of adding features to topics, e.g. an - * icon or a note. For a reference of existing features, refer to {@link mindplot.TopicFeature} - * @constructs - * @param {String} topicId the id of the topic - * @param {String} featureType the id of the feature type to add, e.g. "icon" - * @param {Object} attributes the attribute(s) of the respective feature model - * @extends mindplot.Command - * @see mindplot.model.FeatureModel and subclasses - */ - initialize:function (topicId, featureType, attributes) { - - $assert($defined(topicId), 'topicId can not be null'); - $assert(featureType, 'featureType can not be null'); - $assert(attributes, 'attributes can not be null'); - - this.parent(); - this._topicId = topicId; - this._featureType = featureType; - this._attributes = attributes; - this._featureModel = null; - }, - - /** - * Overrides abstract parent method - */ - execute:function (commandContext) { - var topic = commandContext.findTopics(this._topicId)[0]; - - // Feature must be created only one time. - if (!this._featureModel) { - var model = topic.getModel(); - this._featureModel = model.createFeature(this._featureType, this._attributes); - } - topic.addFeature(this._featureModel); - }, - - /** - * Overrides abstract parent method - * @see {@link mindplot.Command.undoExecute} - */ - undoExecute:function (commandContext) { - var topic = commandContext.findTopics(this._topicId)[0]; - topic.removeFeature(this._featureModel); - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/commands/AddRelationshipCommand.js b/mindplot/src/main/javascript/commands/AddRelationshipCommand.js deleted file mode 100644 index 2e9da1ab..00000000 --- a/mindplot/src/main/javascript/commands/AddRelationshipCommand.js +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.commands.AddRelationshipCommand = new Class(/** @lends AddRelationshipCommand */{ - Extends:mindplot.Command, - /** - * @classdesc This command class handles do/undo of adding a relationship to a topic. - * @constructs - * @param {XMLDOM} model - * @extends mindplot.Command - */ - initialize:function (model) { - $assert(model, 'Relationship model can not be null'); - - this.parent(); - this._model = model; - }, - - /** - * Overrides abstract parent method - */ - execute:function (commandContext) { - var relationship = commandContext.addRelationship(this._model); - relationship.setOnFocus(true); - }, - - /** - * Overrides abstract parent method - * @see {@link mindplot.Command.undoExecute} - */ - undoExecute:function (commandContext) { - var rel = commandContext.findRelationships(this._model.getId()); - commandContext.deleteRelationship(rel[0]); - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/commands/AddTopicCommand.js b/mindplot/src/main/javascript/commands/AddTopicCommand.js deleted file mode 100644 index 73459d99..00000000 --- a/mindplot/src/main/javascript/commands/AddTopicCommand.js +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.commands.AddTopicCommand = new Class(/** @lends AddTopicCommand */{ - Extends:mindplot.Command, - /** - * @classdesc This command class handles do/undo of adding one or multiple topics to - * the mindmap. - * @constructs - * @param {Array} models one or multiple models - * @param {Array} parentTopicsId ids of the parent topics to add the children to, or null - * when attaching a dragged node or a node/branch from clipboard - * @extends mindplot.Command - */ - initialize:function (models, parentTopicsId) { - $assert(models, 'models can not be null'); - $assert(parentTopicsId == null || parentTopicsId.length == models.length, 'parents and models must have the same size'); - - this.parent(); - this._models = models; - this._parentsIds = parentTopicsId; - }, - - /** - * Overrides abstract parent method - */ - execute:function (commandContext) { - - var me = this; - _.each(this._models, function (model, index) { - - // Add a new topic ... - var topic = commandContext.createTopic(model); - - // Connect to topic ... - if (me._parentsIds) { - var parentId = me._parentsIds[index]; - if ($defined(parentId)) { - var parentTopic = commandContext.findTopics(parentId)[0]; - commandContext.connect(topic, parentTopic); - } - } else { - commandContext.addTopic(topic); - } - - // Select just created node ... - var designer = commandContext._designer; - designer.onObjectFocusEvent(topic); - topic.setOnFocus(true); - - // Render node ... - topic.setVisibility(true); - - }); - }, - - /** - * Overrides abstract parent method - * @see {@link mindplot.Command.undoExecute} - */ - undoExecute:function (commandContext) { - // Delete disconnected the nodes. Create a copy of the topics ... - var clonedModel = []; - _.each(this._models, function (model) { - clonedModel.push(model.clone()); - }); - - // Finally, remove the nodes ... - _.each(this._models, function (model) { - - var topicId = model.getId(); - var topic = commandContext.findTopics(topicId)[0]; - commandContext.deleteTopic(topic); - }); - - this._models = clonedModel; - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js b/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js deleted file mode 100644 index 2110c90f..00000000 --- a/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.commands.ChangeFeatureToTopicCommand = new Class(/** @lends ChangeFeatureToTopicCommand */{ - Extends:mindplot.Command, - /** - * @extends mindplot.Command - * @constructs - * @param topicId - * @param featureId - * @param attributes - * @throws will throw an error if topicId is null or undefined - * @throws will throw an error if featureId is null or undefined - * @throws will throw an error if attributes is null or undefined - */ - initialize: function(topicId, featureId, attributes) { - $assert($defined(topicId), 'topicId can not be null'); - $assert($defined(featureId), 'featureId can not be null'); - $assert($defined(attributes), 'attributes can not be null'); - - this.parent(); - this._topicId = topicId; - this._featureId = featureId; - this._attributes = attributes; - }, - - /** - * Overrides abstract parent method - */ - execute: function(commandContext) { - var topic = commandContext.findTopics(this._topicId)[0]; - var feature = topic.findFeatureById(this._featureId); - - var oldAttributes = feature.getAttributes(); - feature.setAttributes(this._attributes); - this._attributes = oldAttributes; - }, - - /** - * Overrides abstract parent method - * @see {@link mindplot.Command.undoExecute} - */ - undoExecute: function(commandContext) { - this.execute(commandContext); - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/commands/DeleteCommand.js b/mindplot/src/main/javascript/commands/DeleteCommand.js deleted file mode 100644 index 4046f309..00000000 --- a/mindplot/src/main/javascript/commands/DeleteCommand.js +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.commands.DeleteCommand = new Class(/** @lends mindplot.commands.DeleteCommand */{ - Extends:mindplot.Command, - /** - * @classdesc This command class handles do/undo of deleting a topic. - * @constructs - * @param {Array} topicIds ids of the topics to delete - * @param {Array} relIds ids of the relationships connected to the topics - * @extends mindplot.Command - */ - initialize:function (topicIds, relIds) { - $assert($defined(relIds), 'topicIds can not be null'); - - this.parent(); - this._relIds = relIds; - this._topicIds = topicIds; - this._deletedTopicModels = []; - this._deletedRelModel = []; - this._parentTopicIds = []; - }, - - /** - * Overrides abstract parent method - */ - execute:function (commandContext) { - - // If a parent has been selected for deletion, the children must be excluded from the delete ... - var topics = this._filterChildren(this._topicIds, commandContext); - - if (topics.length > 0) { - _.each(topics, function (topic) { - // In case that it's editing text node, force close without update ... - topic.closeEditors(); - - var model = topic.getModel(); - - // Delete relationships - var relationships = this._collectInDepthRelationships(topic); - this._deletedRelModel.append(relationships.map(function (rel) { - return rel.getModel().clone(); - })); - - _.each(relationships, function (relationship) { - commandContext.deleteRelationship(relationship); - }); - - // Store information for undo ... - var clonedModel = model.clone(); - this._deletedTopicModels.push(clonedModel); - var outTopic = topic.getOutgoingConnectedTopic(); - var outTopicId = null; - if (outTopic != null) { - outTopicId = outTopic.getId(); - } - this._parentTopicIds.push(outTopicId); - - // Finally, delete the topic from the workspace... - commandContext.deleteTopic(topic); - - }, this); - } - - var rels = commandContext.findRelationships(this._relIds); - if (rels.length > 0) { - _.each(rels, function (rel) { - this._deletedRelModel.push(rel.getModel().clone()); - commandContext.deleteRelationship(rel); - }, this); - } - }, - - /** - * Overrides abstract parent method - * @see {@link mindplot.Command.undoExecute} - */ - undoExecute:function (commandContext) { - - // Add all the topics ... - _.each(this._deletedTopicModels, function (model) { - commandContext.createTopic(model); - }, this); - - // Do they need to be connected ? - _.each(this._deletedTopicModels, function (topicModel, index) { - var topics = commandContext.findTopics(topicModel.getId()); - - var parentId = this._parentTopicIds[index]; - if (parentId) { - var parentTopics = commandContext.findTopics(parentId); - commandContext.connect(topics[0], parentTopics[0]); - } - }, this); - - // Add rebuild relationships ... - _.each(this._deletedRelModel, function (model) { - commandContext.addRelationship(model); - }); - - // Finally display the topics ... - _.each(this._deletedTopicModels, function (topicModel) { - var topics = commandContext.findTopics(topicModel.getId()); - topics[0].setBranchVisibility(true); - }, this); - - // Focus on last recovered topic .. - if (this._deletedTopicModels.length > 0) { - var firstTopic = this._deletedTopicModels[0]; - var topic = commandContext.findTopics(firstTopic.getId())[0]; - topic.setOnFocus(true); - } - - this._deletedTopicModels = []; - this._parentTopicIds = []; - this._deletedRelModel = []; - }, - - _filterChildren:function (topicIds, commandContext) { - var topics = commandContext.findTopics(topicIds); - - var result = []; - _.each(topics, function (topic) { - var parent = topic.getParent(); - var found = false; - while (parent != null && !found) { - found = topicIds.contains(parent.getId()); - if (found) { - break; - } - parent = parent.getParent(); - } - - if (!found) { - result.push(topic); - } - }); - - return result; - }, - - _collectInDepthRelationships:function (topic) { - var result = []; - result.append(topic.getRelationships()); - - var children = topic.getChildren(); - var rels = children.map(function (topic) { - return this._collectInDepthRelationships(topic); - }, this); - result.append(rels.flatten()); - - if (result.length > 0) { - // Filter for unique ... - result = result.sort(function (a, b) { - return a.getModel().getId() - b.getModel().getId(); - }); - var ret = [result[0]]; - for (var i = 1; i < result.length; i++) { // start loop at 1 as element 0 can never be a duplicate - if (result[i - 1] !== result[i]) { - ret.push(result[i]); - } - } - result = ret; - } - return result; - } - -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/commands/DragTopicCommand.js b/mindplot/src/main/javascript/commands/DragTopicCommand.js deleted file mode 100644 index 478aa6e6..00000000 --- a/mindplot/src/main/javascript/commands/DragTopicCommand.js +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.commands.DragTopicCommand = new Class(/** @lends DragTopicCommand */{ - Extends:mindplot.Command, - /** - * @classdesc This command class handles do/undo of dragging a topic to a new position. - * @constructs - * @param {String} topicId id of the topic to drag - * @param {Object} position - * @param {Number} order the order property (children of one node are displayed in order from 0 to n) - * @param {mindplot.Topic} parentTopic the topic to be made the dragged topic's new parent - * @extends mindplot.Command - */ - initialize:function (topicId, position, order, parentTopic) { - $assert(topicId, "topicId must be defined"); - - this._topicsId = topicId; - if ($defined(parentTopic)) - this._parentId = parentTopic.getId(); - - this.parent(); - this._position = position; - this._order = order; - }, - - /** - * Overrides abstract parent method - */ - execute:function (commandContext) { - - var topic = commandContext.findTopics(this._topicsId)[0]; - topic.setVisibility(false); - - // Save old position ... - var origParentTopic = topic.getOutgoingConnectedTopic(); - - // In this case, topics are positioned using order ... - var origOrder = topic.getOrder(); - var origPosition = topic.getPosition(); - - // Disconnect topic .. - if ($defined(origParentTopic) && origParentTopic != this._parentId) { - commandContext.disconnect(topic); - } - - // Set topic order ... - if (this._order != null) { - topic.setOrder(this._order); - } else if (this._position != null) { - commandContext.moveTopic(topic, this._position); - } else { - $assert("Illegal command state exception."); - } - - // Finally, connect topic ... - if (origParentTopic != this._parentId) { - - if ($defined(this._parentId)) { - var parentTopic = commandContext.findTopics(this._parentId)[0]; - commandContext.connect(topic, parentTopic); - } - - // Backup old parent id ... - this._parentId = null; - if ($defined(origParentTopic)) { - this._parentId = origParentTopic.getId(); - } - } - topic.setVisibility(true); - - // Store for undo ... - this._order = origOrder; - this._position = origPosition; - - }, - - /** - * Overrides abstract parent method - * @see {@link mindplot.Command.undoExecute} - */ - undoExecute:function (commandContext) { - this.execute(commandContext); - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/commands/GenericFunctionCommand.js b/mindplot/src/main/javascript/commands/GenericFunctionCommand.js deleted file mode 100644 index 8cf4eb0b..00000000 --- a/mindplot/src/main/javascript/commands/GenericFunctionCommand.js +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.commands.GenericFunctionCommand = new Class(/** @lends GenericFunctionCommand */{ - Extends:mindplot.Command, - /** - * @classdesc This command handles do/undo of different actions, e.g. moving topics to - * a different position, changing text or font,... (for full reference check the - * StandaloneActionDispatcher i.e. the ActionDispatcher subclass in use) - * @constructs - * @param {Function} commandFunc the function the command shall execute - * @param {String|Array} topicsIds the ids of the topics affected - * @param {Object} [value] value arbitrary value necessary for the execution of the function, - * e.g. color, font family or text - * @extends mindplot.Command - */ - initialize:function (commandFunc, topicsIds, value) { - $assert(commandFunc, "commandFunc must be defined"); - $assert($defined(topicsIds), "topicsIds must be defined"); - - this.parent(); - this._value = value; - this._topicsId = topicsIds; - this._commandFunc = commandFunc; - this._oldValues = []; - }, - - /** - * Overrides abstract parent method - */ - execute:function (commandContext) { - if (!this.applied) { - - var topics = null; - try { - topics = commandContext.findTopics(this._topicsId); - } catch (e) { - if (this._commandFunc.commandType != "changeTextToTopic") { - // Workaround: For some reason, there is a combination of events that involves - // making some modification and firing out of focus event. This is causing - // that a remove node try to be removed. In some other life, I will come with the solution. - // Almost aways occurs with IE9. I could be related with some change of order in sets o something similar. - throw e; - } - } - - if (topics != null) { - var me = this; - _.each(topics, function (topic) { - var oldValue = me._commandFunc(topic, me._value); - me._oldValues.push(oldValue); - }); - } - this.applied = true; - - } else { - throw "Command can not be applied two times in a row."; - } - - }, - - /** - * Overrides abstract parent method - * @see {@link mindplot.Command.undoExecute} - */ - undoExecute:function (commandContext) { - if (this.applied) { - var topics = commandContext.findTopics(this._topicsId); - var me = this; - _.each(topics, function (topic, index) { - me._commandFunc(topic, me._oldValues[index]); - - }); - - this.applied = false; - this._oldValues = []; - } else { - throw "undo can not be applied."; - } - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/commands/MoveControlPointCommand.js b/mindplot/src/main/javascript/commands/MoveControlPointCommand.js deleted file mode 100644 index 9d94e6d3..00000000 --- a/mindplot/src/main/javascript/commands/MoveControlPointCommand.js +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.commands.MoveControlPointCommand = new Class(/** @lends MoveControlPointCommand */{ - Extends:mindplot.Command, - /** - * @classdesc This command handles do/undo of changing the control points of a relationship - * arrow. These are the two points that appear when the relationship is on focus. They - * influence how the arrow is drawn (not the source or the destination topic nor the arrow - * direction) - * @constructs - * @param {ControlPoint} ctrlPointController - * @param {Number} point 0 for the destination control point, 1 for the source control point - * @param ctrlPointController {ControlPoint} - * @param point {Number} 0 for the destination control point, 1 for the source control point - */ - initialize:function (ctrlPointController, point) { - $assert(ctrlPointController, 'line can not be null'); - $assert($defined(point), 'point can not be null'); - - this.parent(); - this._ctrlPointControler = ctrlPointController; - this._line = ctrlPointController._line; - this._controlPoint = this._ctrlPointControler.getControlPoint(point).clone(); - this._oldControlPoint = this._ctrlPointControler.getOriginalCtrlPoint(point).clone(); - this._originalEndPoint = this._ctrlPointControler.getOriginalEndPoint(point).clone(); - switch (point) { - case 0: - this._wasCustom = this._line.getLine().isSrcControlPointCustom(); - this._endPoint = this._line.getLine().getFrom().clone(); - break; - case 1: - this._wasCustom = this._line.getLine().isDestControlPointCustom(); - this._endPoint = this._line.getLine().getTo().clone(); - break; - } - this._point = point; - }, - - /** - * Overrides abstract parent method - */ - execute:function (commandContext) { - var model = this._line.getModel(); - switch (this._point) { - case 0: - model.setSrcCtrlPoint(this._controlPoint.clone()); - this._line.setFrom(this._endPoint.x, this._endPoint.y); - this._line.setIsSrcControlPointCustom(true); - this._line.setSrcControlPoint(this._controlPoint.clone()); - break; - case 1: - model.setDestCtrlPoint(this._controlPoint.clone()); - this._wasCustom = this._line.getLine().isDestControlPointCustom(); - this._line.setTo(this._endPoint.x, this._endPoint.y); - this._line.setIsDestControlPointCustom(true); - this._line.setDestControlPoint(this._controlPoint.clone()); - break; - } - if (this._line.isOnFocus()) { - this._line._refreshShape(); - this._ctrlPointControler.setLine(this._line); - } - this._line.getLine().updateLine(this._point); - }, - - /** - * Overrides abstract parent method - * @see {@link mindplot.Command.undoExecute} - */ - undoExecute:function (commandContext) { - var line = this._line; - var model = line.getModel(); - switch (this._point) { - case 0: - if ($defined(this._oldControlPoint)) { - line.setFrom(this._originalEndPoint.x, this._originalEndPoint.y); - model.setSrcCtrlPoint(this._oldControlPoint.clone()); - line.setSrcControlPoint(this._oldControlPoint.clone()); - line.setIsSrcControlPointCustom(this._wasCustom); - } - break; - case 1: - if ($defined(this._oldControlPoint)) { - line.setTo(this._originalEndPoint.x, this._originalEndPoint.y); - model.setDestCtrlPoint(this._oldControlPoint.clone()); - line.setDestControlPoint(this._oldControlPoint.clone()); - line.setIsDestControlPointCustom(this._wasCustom); - } - break; - } - this._line.getLine().updateLine(this._point); - if (this._line.isOnFocus()) { - this._ctrlPointControler.setLine(line); - line._refreshShape(); - } - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js b/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js deleted file mode 100644 index e7dda1c7..00000000 --- a/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.commands.RemoveFeatureFromTopicCommand = new Class(/**@lends RemoveFeatureFromTopicCommand */{ - Extends:mindplot.Command, - /** - * @classdesc This command handles do/undo of removing a feature from a topic, e.g. an icon or - * a note. For a reference of existing features, refer to {@link mindplot.TopicFeature}. - * @constructs - * @param {String} topicId id of the topic to remove the feature from - * @param {String} featureId id of the feature to remove - * @extends mindplot.Command - */ - initialize:function (topicId, featureId) { - $assert($defined(topicId), 'topicId can not be null'); - $assert(featureId, 'iconModel can not be null'); - - this.parent(); - this._topicId = topicId; - this._featureId = featureId; - this._oldFeature = null; - }, - - /** - * Overrides abstract parent method - */ - execute:function (commandContext) { - var topic = commandContext.findTopics(this._topicId)[0]; - var feature = topic.findFeatureById(this._featureId); - topic.removeFeature(feature); - this._oldFeature = feature; - }, - - /** - * Overrides abstract parent method - * @see {@link mindplot.Command.undoExecute} - */ - undoExecute:function (commandContext) { - var topic = commandContext.findTopics(this._topicId)[0]; - topic.addFeature(this._oldFeature); - this._oldFeature = null; - } -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/footer.js b/mindplot/src/main/javascript/footer.js deleted file mode 100644 index 6858d261..00000000 --- a/mindplot/src/main/javascript/footer.js +++ /dev/null @@ -1,5 +0,0 @@ -try { - $(document).trigger('loadcomplete', 'mind'); -} catch (e) { - console.error(e.stack); -} diff --git a/mindplot/src/main/javascript/header.js b/mindplot/src/main/javascript/header.js deleted file mode 100644 index ed9280ad..00000000 --- a/mindplot/src/main/javascript/header.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright [2015] [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 mindplot = {}; -mindplot.util = {}; -mindplot.commands = {}; -mindplot.layout = {}; -mindplot.layout.boards = {}; -mindplot.layout.boards.original = {}; -mindplot.widget = {}; -mindplot.model = {}; -mindplot.collaboration = {}; -mindplot.collaboration.framework = {}; -mindplot.persistence = {}; - -mindplot.layout = {}; - -Class.Mutators.Static = function (items) { - this.extend(items); -}; - diff --git a/mindplot/src/main/javascript/layout/AbstractBasicSorter.js b/mindplot/src/main/javascript/layout/AbstractBasicSorter.js deleted file mode 100644 index c0df23c9..00000000 --- a/mindplot/src/main/javascript/layout/AbstractBasicSorter.js +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -/** - * @class - * @extends mindplot.layout.ChildrenSorterStrategy - */ -mindplot.layout.AbstractBasicSorter = new Class(/** @lends AbstractBasicSorter */{ - Extends: mindplot.layout.ChildrenSorterStrategy, - - /** - * @param {} treeSet - * @param {} node - * @return the height of a node and its children if existing and not shrunken - */ - computeChildrenIdByHeights: function(treeSet, node) { - var result = {}; - this._computeChildrenHeight(treeSet, node, result); - return result; - }, - - _getVerticalPadding: function() { - return mindplot.layout.AbstractBasicSorter.INTERNODE_VERTICAL_PADDING; - }, - - _computeChildrenHeight : function(treeSet, node, heightCache) { - var height = node.getSize().height + (this._getVerticalPadding() * 2); // 2* Top and down padding; - - var result; - var children = treeSet.getChildren(node); - if (children.length == 0 || node.areChildrenShrunken()) { - result = height; - } else { - var childrenHeight = 0; - _.each(children, function(child) { - childrenHeight += this._computeChildrenHeight(treeSet, child, heightCache); - }, this); - - result = Math.max(height, childrenHeight); - } - - if (heightCache) { - heightCache[node.getId()] = result; - } - - return result; - }, - - _getSortedChildren:function(treeSet, node) { - var result = treeSet.getChildren(node); - result.sort(function(a, b) { - return a.getOrder() - b.getOrder() - }); - return result; - }, - - _getRelativeDirection: function(reference, position) { - var offset = position.x - reference.x; - return offset >= 0 ? 1 : -1; - } - -}); - -/** - * @constant - * @type {Number} - * @default - */ -mindplot.layout.AbstractBasicSorter.INTERNODE_VERTICAL_PADDING = 5; -/** - * @constant - * @type {Number} - * @default - */ -mindplot.layout.AbstractBasicSorter.INTERNODE_HORIZONTAL_PADDING = 30; \ No newline at end of file diff --git a/mindplot/src/main/javascript/layout/BalancedSorter.js b/mindplot/src/main/javascript/layout/BalancedSorter.js deleted file mode 100644 index f9d881f0..00000000 --- a/mindplot/src/main/javascript/layout/BalancedSorter.js +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.layout.BalancedSorter = new Class(/** @lends BalancedSorter */{ - Extends:mindplot.layout.AbstractBasicSorter, - /** - * @constructs - * @extends mindplot.layout.AbstractBasicSorter - */ - initialize:function () { - - }, - - /** - * @param {} graph - * @param {} parent - * @param {} node - * @param {} position - * @param {Boolean} free - * @return an array with order and position - */ - predict:function (graph, parent, node, position, free) { - // If its a free node... - if (free) { - $assert($defined(position), "position cannot be null for predict in free positioning"); - $assert($defined(node), "node cannot be null for predict in free positioning"); - - var rootNode = graph.getRootNode(parent); - var direction = this._getRelativeDirection(rootNode.getPosition(), node.getPosition()); - - var limitXPos = parent.getPosition().x + direction * (parent.getSize().width / 2 + node.getSize().width / 2 + mindplot.layout.BalancedSorter.INTERNODE_HORIZONTAL_PADDING); - - var xPos = direction > 0 ? - (position.x >= limitXPos ? position.x : limitXPos) : - (position.x <= limitXPos ? position.x : limitXPos); - - return [0, {x:xPos, y:position.y}]; - } - - var rootNode = graph.getRootNode(parent); - - // If it is a dragged node... - if (node) { - $assert($defined(position), "position cannot be null for predict in dragging"); - var nodeDirection = this._getRelativeDirection(rootNode.getPosition(), node.getPosition()); - var positionDirection = this._getRelativeDirection(rootNode.getPosition(), position); - var siblings = graph.getSiblings(node); - - var sameParent = parent == graph.getParent(node); - if (siblings.length == 0 && nodeDirection == positionDirection && sameParent) { - return [node.getOrder(), node.getPosition()]; - } - } - - if (!position) { - var right = this._getChildrenForOrder(parent, graph, 0); - var left = this._getChildrenForOrder(parent, graph, 1); - } - // Filter nodes on one side.. - var order = position ? (position.x > rootNode.getPosition().x ? 0 : 1) : ((right.length - left.length) > 0 ? 1 : 0); - var direction = order % 2 == 0 ? 1 : -1; - - // Exclude the dragged node (if set) - var children = this._getChildrenForOrder(parent, graph, order).filter(function (child) { - return child != node; - }); - - // No children? - if (children.length == 0) { - return [order, {x:parent.getPosition().x + direction * (parent.getSize().width / 2 + mindplot.layout.BalancedSorter.INTERNODE_HORIZONTAL_PADDING * 2), y:parent.getPosition().y}]; - } - - // Try to fit within ... - var result = null; - var last = children.getLast(); - position = position || {x:last.getPosition().x, y:last.getPosition().y + 1}; - _.each(children, function (child, index) { - var cpos = child.getPosition(); - if (position.y > cpos.y) { - yOffset = child == last ? - child.getSize().height + mindplot.layout.BalancedSorter.INTERNODE_VERTICAL_PADDING * 2 : - (children[index + 1].getPosition().y - child.getPosition().y) / 2; - result = [child.getOrder() + 2, {x:cpos.x, y:cpos.y + yOffset}]; - } - }); - - // Position wasn't below any node, so it must be inserted above - if (!result) { - var first = children[0]; - result = [position.x > 0 ? 0 : 1, { - x:first.getPosition().x, - y:first.getPosition().y - first.getSize().height - mindplot.layout.BalancedSorter.INTERNODE_VERTICAL_PADDING * 2 - }]; - } - - return result; - }, - - /** - * @param {} treeSet - * @param {} parent - * @param {} child - * @param {} order - */ - insert:function (treeSet, parent, child, order) { - var children = this._getChildrenForOrder(parent, treeSet, order); - - // If no children, return 0 or 1 depending on the side - if (children.length == 0) { - child.setOrder(order % 2); - return; - } - - // Shift all the elements by two, so side is the same. - // In case of balanced sorter, order don't need to be continuous... - var max = 0; - for (var i = 0; i < children.length; i++) { - var node = children[i]; - max = Math.max(max, node.getOrder()); - if (node.getOrder() >= order) { - max = Math.max(max, node.getOrder() + 2); - node.setOrder(node.getOrder() + 2); - } - } - - var newOrder = order > (max + 1) ? (max + 2) : order; - child.setOrder(newOrder); - }, - - /** - * @param {} treeSet - * @param {} node - */ - detach:function (treeSet, node) { - var parent = treeSet.getParent(node); - // Filter nodes on one side.. - var children = this._getChildrenForOrder(parent, treeSet, node.getOrder()); - - _.each(children, function (child, index) { - if (child.getOrder() > node.getOrder()) { - child.setOrder(child.getOrder() - 2); - } - }); - node.setOrder(node.getOrder() % 2 == 0 ? 0 : 1); - }, - - /** - * @param {} treeSet - * @param {} node - * @return offsets - */ - computeOffsets:function (treeSet, node) { - $assert(treeSet, "treeSet can no be null."); - $assert(node, "node can no be null."); - - var children = this._getSortedChildren(treeSet, node); - - // Compute heights ... - var heights = children.map( - function (child) { - return {id:child.getId(), order:child.getOrder(), width:child.getSize().width, height:this._computeChildrenHeight(treeSet, child)}; - }, this).reverse(); - - - // Compute the center of the branch ... - var totalPHeight = 0; - var totalNHeight = 0; - - _.each(heights, function (elem) { - if (elem.order % 2 == 0) { - totalPHeight += elem.height; - } else { - totalNHeight += elem.height; - } - }); - var psum = totalPHeight / 2; - var nsum = totalNHeight / 2; - var ysum = 0; - - // Calculate the offsets ... - var result = {}; - for (var i = 0; i < heights.length; i++) { - var direction = heights[i].order % 2 ? -1 : 1; - - if (direction > 0) { - psum = psum - heights[i].height; - ysum = psum; - } else { - nsum = nsum - heights[i].height; - ysum = nsum; - } - - var yOffset = ysum + heights[i].height / 2; - var xOffset = direction * (node.getSize().width / 2 + heights[i].width / 2 + +mindplot.layout.BalancedSorter.INTERNODE_HORIZONTAL_PADDING); - - $assert(!isNaN(xOffset), "xOffset can not be null"); - $assert(!isNaN(yOffset), "yOffset can not be null"); - - result[heights[i].id] = {x:xOffset, y:yOffset}; - } - return result; - }, - - /** - * @param {} treeSet - * @param {} node - * @throw will throw an error if order elements are missing - */ - verify:function (treeSet, node) { - // Check that all is consistent ... - var children = this._getChildrenForOrder(node, treeSet, node.getOrder()); - - // All odd ordered nodes should be "continuous" by themselves - // All even numbered nodes should be "continuous" by themselves - var factor = node.getOrder() % 2 == 0 ? 2 : 1; - for (var i = 0; i < children.length; i++) { - var order = i == 0 && factor == 1 ? 1 : (factor * i); - $assert(children[i].getOrder() == order, "Missing order elements. Missing order: " + (i * factor) + ". Parent:" + node.getId() + ",Node:" + children[i].getId()); - } - }, - - /** - * @param {} treeSet - * @param {} child - * @return the direction of the child within the treeSet - */ - getChildDirection:function (treeSet, child) { - return child.getOrder() % 2 == 0 ? 1 : -1; - }, - - /** - * @return {String} the print name of this class - */ - toString:function () { - return "Balanced Sorter"; - }, - - _getChildrenForOrder:function (parent, graph, order) { - return this._getSortedChildren(graph, parent).filter(function (child) { - return child.getOrder() % 2 == order % 2; - }); - }, - - _getVerticalPadding:function () { - return mindplot.layout.BalancedSorter.INTERNODE_VERTICAL_PADDING; - } -}); - -/** - * @constant - * @type {Number} - * @default - */ -mindplot.layout.BalancedSorter.INTERNODE_VERTICAL_PADDING = 5; -/** - * @constant - * @type {Number} - * @default - */ -mindplot.layout.BalancedSorter.INTERNODE_HORIZONTAL_PADDING = 30; diff --git a/mindplot/src/main/javascript/layout/ChangeEvent.js b/mindplot/src/main/javascript/layout/ChangeEvent.js deleted file mode 100644 index fb03e07c..00000000 --- a/mindplot/src/main/javascript/layout/ChangeEvent.js +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.layout.ChangeEvent = new Class(/** @lends ChangeEvent */{ - /** - * @constructs - * @param {} id - * @throws will throw an error if the given id is not/cannot be converted to a numerical value - */ - initialize:function(id) { - $assert(!isNaN(id), "id can not be null"); - this._id = id; - this._position = null; - this._order = null; - }, - - /** @return id */ - getId:function() { - return this._id; - }, - - /** @return order */ - getOrder: function() { - return this._order; - }, - - /** @return position */ - getPosition: function() { - return this._position; - }, - - /** - * @param {} value the order to set - * @throws will throw an error if the given parameter is not/cannot be converted to a numerical - * value - */ - setOrder: function(value) { - $assert(!isNaN(value), "value can not be null"); - this._order = value; - }, - - /** @param {} value - * @throws will throw an error if the value is null or undefined*/ - setPosition: function(value) { - $assert(value, "value can not be null"); - this._position = value; - }, - - /** @return {String} order and position */ - toString: function() { - return "[order:" + this.getOrder() + ", position: {" + this.getPosition().x + "," + this.getPosition().y + "}]"; - } -}); - - diff --git a/mindplot/src/main/javascript/layout/ChildrenSorterStrategy.js b/mindplot/src/main/javascript/layout/ChildrenSorterStrategy.js deleted file mode 100644 index d60edb12..00000000 --- a/mindplot/src/main/javascript/layout/ChildrenSorterStrategy.js +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.layout.ChildrenSorterStrategy = new Class(/** @lends ChildrenSorterStrategy */{ - /** - * @constructs - */ - initialize:function() { - - }, - - /** @abstract */ - computeChildrenIdByHeights: function(treeSet, node) { - throw "Method must be implemented"; - }, - - /** @abstract */ - computeOffsets:function(treeSet, node) { - throw "Method must be implemented"; - }, - - /** @abstract */ - insert: function(treeSet, parent, child, order) { - throw "Method must be implemented"; - }, - - /** @abstract */ - detach:function(treeSet, node) { - throw "Method must be implemented"; - }, - - /** @abstract */ - predict:function(treeSet, parent, node, position, free) { - throw "Method must be implemented"; - }, - - /** @abstract */ - verify:function(treeSet, node) { - throw "Method must be implemented"; - }, - - /** @abstract */ - getChildDirection: function(treeSet, node) { - throw "Method must be implemented"; - }, - - /** @abstract */ - toString:function() { - throw "Method must be implemented: print name"; - } - -}); - diff --git a/mindplot/src/main/javascript/layout/EventBus.js b/mindplot/src/main/javascript/layout/EventBus.js deleted file mode 100644 index 73ac7ee1..00000000 --- a/mindplot/src/main/javascript/layout/EventBus.js +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.EventBus = new Class(/** @lends EventBus */{ - Implements: mindplot.Events, - /** - * @constructs - * @implements mindplot.Events - */ - initialize: function() { - } -}); - -/** - * Enum for events - * @enum {String} - */ -mindplot.EventBus.events = { - NodeResizeEvent:'NodeResizeEvent', - NodeMoveEvent:'NodeMoveEvent', - NodeShrinkEvent:'NodeShrinkEvent', - NodeConnectEvent:'NodeConnectEvent', - NodeDisconnectEvent:'NodeDisconnectEvent', - NodeAdded:'NodeAdded', - NodeRemoved:'NodeRemoved', - DoLayout:'DoLayout' -}; - -/** instance */ -mindplot.EventBus.instance = new mindplot.EventBus(); \ No newline at end of file diff --git a/mindplot/src/main/javascript/layout/EventBusDispatcher.js b/mindplot/src/main/javascript/layout/EventBusDispatcher.js deleted file mode 100644 index bb1dd6ed..00000000 --- a/mindplot/src/main/javascript/layout/EventBusDispatcher.js +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.layout.EventBusDispatcher = new Class(/** @lends EventBusDispatcher */{ - /** - * @constructs - */ - initialize:function() { - this.registerBusEvents(); - }, - - /** - * @param {mindplot.layout.LayoutManager} layoutManager - */ - setLayoutManager : function(layoutManager) { - this._layoutManager = layoutManager; - }, - - /** - * register bus events - */ - registerBusEvents:function () { - mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeAdded, this._nodeAdded.bind(this)); - mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeRemoved, this._nodeRemoved.bind(this)); - mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeResizeEvent, this._nodeResizeEvent.bind(this)); - mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeMoveEvent, this._nodeMoveEvent.bind(this)); - mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeDisconnectEvent, this._nodeDisconnectEvent.bind(this)); - mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeConnectEvent, this._nodeConnectEvent.bind(this)); - mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.NodeShrinkEvent, this._nodeShrinkEvent.bind(this)); - mindplot.EventBus.instance.addEvent(mindplot.EventBus.events.DoLayout, this._doLayout.bind(this)); - }, - - _nodeResizeEvent: function(args) { - this._layoutManager.updateNodeSize(args.node.getId(), args.size); - }, - - _nodeMoveEvent: function(args) { - this._layoutManager.moveNode(args.node.getId(), args.position); - }, - - _nodeDisconnectEvent: function(node) { - this._layoutManager.disconnectNode(node.getId()); - }, - - _nodeConnectEvent: function(args) { - this._layoutManager.connectNode(args.parentNode.getId(), args.childNode.getId(), args.childNode.getOrder()); - - }, - - _nodeShrinkEvent: function(node) { - this._layoutManager.updateShrinkState(node.getId(), node.areChildrenShrunken()); - }, - - _nodeAdded: function(node) { - // Central topic must not be added twice ... - if (node.getId() != 0) { - this._layoutManager.addNode(node.getId(), {width:10,height:10}, node.getPosition()); - this._layoutManager.updateShrinkState(node.getId(), node.areChildrenShrunken()); - } - }, - - _nodeRemoved: function(node) { - this._layoutManager.removeNode(node.getId()); - }, - - _doLayout: function() { -// (function() { - this._layoutManager.layout(true); -// console.log("---------"); -// this._layoutManager.dump(); -// console.log("---------"); -// console.log("---------"); -// }).delay(0, this); - }, - - /** @return layout manager */ - getLayoutManager: function() { - return this._layoutManager; - } - -}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/layout/GridSorter.js b/mindplot/src/main/javascript/layout/GridSorter.js deleted file mode 100644 index 8ccfba94..00000000 --- a/mindplot/src/main/javascript/layout/GridSorter.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -/** - * @class - * @extends mindplot.layout.AbstractBasicSorter - */ -mindplot.layout.GridSorter = new Class(/** @lends GridSorter */{ - Extends: mindplot.layout.AbstractBasicSorter, - - /** - * @param {} treeSet - * @param {} node - * @return offsets - */ - computeOffsets: function(treeSet, node) { - $assert(treeSet, "treeSet can no be null."); - $assert(node, "node can no be null."); - $assert("order can no be null."); - - var children = this._getSortedChildren(treeSet, node); - - // Compute heights ... - var me = this; - var heights = children.map(function(child) { - return { - id: child.getId(), - height: me._computeChildrenHeight(treeSet, child) - }; - }); - - // Calculate the offsets ... - var result = {}; - for (var i = 0; i < heights.length; i++) { - var even = i%2 == 0 ? 1 : -1; - - var zeroHeight = i == 0 ? 0 : heights[0].height/2 * even; - var middleHeight = 0; - for (var j=i-2; j>0; j=j-2) { - middleHeight += heights[j].height * even; - } - var finalHeight = i == 0 ? 0 : heights[i].height/2 * even; - - var yOffset = zeroHeight + middleHeight +finalHeight; - var xOffset = node.getSize().width + mindplot.layout.GridSorter.GRID_HORIZONTAR_SIZE; - - $assert(!isNaN(xOffset), "xOffset can not be null"); - $assert(!isNaN(yOffset), "yOffset can not be null"); - - result[heights[i].id] = {x:xOffset,y:yOffset}; - - } - return result; - }, - - /** - * @return {String} the print name of this class - */ - toString:function() { - return "Grid Sorter"; - } - -}); - -/** - * @constant - * @type {Number} - * @default - */ -mindplot.layout.GridSorter.GRID_HORIZONTAR_SIZE = 20; -/** - * @constant - * @type {Number} - * @default - */ -mindplot.layout.GridSorter.INTER_NODE_VERTICAL_DISTANCE = 50; - diff --git a/mindplot/src/main/javascript/layout/LayoutManager.js b/mindplot/src/main/javascript/layout/LayoutManager.js deleted file mode 100644 index dabeb4b4..00000000 --- a/mindplot/src/main/javascript/layout/LayoutManager.js +++ /dev/null @@ -1,266 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.layout.LayoutManager = new Class(/** @lends LayoutManager */{ - Extends: mindplot.Events, - /** - * @constructs - * @extends mindplot.Events - * @param {} rootNodeId - * @param {} rootSize - * @throws will throw an error if the root node id is null or undefined - * @throws will throw an error if the root size is null - */ - initialize: function(rootNodeId, rootSize) { - $assert($defined(rootNodeId), "rootNodeId can not be null"); - $assert(rootSize, "rootSize can not be null"); - var position = position || {x:0, y:0}; - - this._treeSet = new mindplot.layout.RootedTreeSet(); - this._layout = new mindplot.layout.OriginalLayout(this._treeSet); - - var rootNode = this._layout.createNode(rootNodeId, rootSize, position, 'root'); - this._treeSet.setRoot(rootNode); - this._events = []; - }, - - /** - * @param id - * @param size - * @throws will throw an error if id is null or undefined - */ - updateNodeSize: function(id, size) { - $assert($defined(id), "id can not be null"); - - var node = this._treeSet.find(id); - node.setSize(size); - }, - - /** - * @param id - * @param value - * @throws will throw an error if id is null or undefined - * @throws will throw an error if value is null or undefined - * @return this - */ - updateShrinkState: function(id, value) { - $assert($defined(id), "id can not be null"); - $assert($defined(value), "value can not be null"); - - var node = this._treeSet.find(id); - node.setShrunken(value); - - return this; - }, - - /** - * @param id - * @return {@link RootedTreeSet}.find(id) - */ - find: function(id) { - return this._treeSet.find(id); - }, - - /** - * @param id - * @param position - * @throws will throw an error if id is null or undefined - * @throws will throw an error if position is null or undefined - * @throws will throw an error if the position's x property is null or undefined - * @throws will throw an error if the position's y property is null or undefined - */ - moveNode: function(id, position) { - $assert($defined(id), "id cannot be null"); - $assert($defined(position), "position cannot be null"); - $assert($defined(position.x), "x can not be null"); - $assert($defined(position.y), "y can not be null"); - - var node = this._treeSet.find(id); - // @Todo: this should not be here. This is broking the isolated node support... -// node.setFree(true); -// node.setFreeDisplacement({x:position.x - node.getPosition().x, y:position.y - node.getPosition().y}); - node.setPosition(position); - }, - - /** - * @param parentId - * @param childId - * @param order - * @throws will throw an error if parentId is null or undefined - * @throws will throw an error if childId is null or undefined - * @throws will throw an error if order is null or undefined - * @return this - */ - connectNode: function(parentId, childId, order) { - $assert($defined(parentId), "parentId cannot be null"); - $assert($defined(childId), "childId cannot be null"); - $assert($defined(order), "order cannot be null"); - - this._layout.connectNode(parentId, childId, order); - - return this; - }, - - /** - * @param id - * @throws will throw an error if id is null or undefined - * @return this - */ - disconnectNode: function(id) { - $assert($defined(id), "id can not be null"); - this._layout.disconnectNode(id); - - return this; - }, - - /** - * @param id - * @param size - * @param position - * @throws will throw an error if id is null or undefined - * @return this - */ - addNode:function(id, size, position) { - $assert($defined(id), "id can not be null"); - var result = this._layout.createNode(id, size, position, 'topic'); - this._treeSet.add(result); - - return this; - }, - - /** - * removes a node and its connection to parent if existing - * @param id - * @throws will throw an error if id is null or undefined - * @return this - */ - removeNode: function(id) { - $assert($defined(id), "id can not be null"); - var node = this._treeSet.find(id); - - // Is It connected ? - if (this._treeSet.getParent(node)) { - this.disconnectNode(id); - } - - // Remove the all the branch ... - this._treeSet.remove(id); - - return this; - }, - - /** - * @param {Number} parentId - * @param {Number=} nodeId - * @param {String=} position the position to use as mindplot.layout.Node.properties position - * property as '(x,y)' - * @param {Boolean=} free true specifies free node positioning - * @throws will throw an error if parentId is null or undefined - */ - predict: function(parentId, nodeId, position, free) { - $assert($defined(parentId), "parentId can not be null"); - - var parent = this._treeSet.find(parentId); - var node = nodeId ? this._treeSet.find(nodeId) : null; - var sorter = parent.getSorter(); - - var result = sorter.predict(this._treeSet, parent, node, position, free); - return {order:result[0],position:result[1]}; - }, - - /** - * logs dump to console - */ - dump: function() { - console.log(this._treeSet.dump()); - }, - - /** - * @param containerId - * @param {width:Number, height:Number} size - * @throws will throw an error if containerId is null or undefined - * @return canvas - */ - plot: function(containerId, size) { - $assert(containerId, "containerId cannot be null"); - size = size || {width:200,height:200}; - var squaresize = 10; - var canvas = Raphael(containerId, size.width, size.height); - canvas.drawGrid(0, 0, size.width, size.height, size.width / squaresize, size.height / squaresize); - this._treeSet.plot(canvas); - - return canvas; - }, - - /** - * initializes the layout to be updated - * @param fireEvents - * @return this - */ - layout: function(fireEvents) { - // File repositioning ... - this._layout.layout(); - - // Collect changes ... - this._collectChanges(); - - if ($(fireEvents).length>0 || fireEvents) { - this._flushEvents(); - } - - return this; - }, - - _flushEvents: function() { - _.each(this._events, function(event) { - this.fireEvent('change', event); - }, this); - this._events = []; - }, - - _collectChanges: function(nodes) { - if (!nodes) - nodes = this._treeSet.getTreeRoots(); - - _.each(nodes, function(node) { - if (node.hasOrderChanged() || node.hasPositionChanged()) { - - // Find or create a event ... - var id = node.getId(); - var event = this._events.some(function(event) { - return event.id == id; - }); - if (!event) { - event = new mindplot.layout.ChangeEvent(id); - } - - // Update nodes ... - event.setOrder(node.getOrder()); - event.setPosition(node.getPosition()); - - node.resetPositionState(); - node.resetOrderState(); - node.resetFreeState(); - this._events.push(event); - } - this._collectChanges(this._treeSet.getChildren(node)); - }, this); - } - -}); - diff --git a/mindplot/src/main/javascript/layout/Node.js b/mindplot/src/main/javascript/layout/Node.js deleted file mode 100644 index fece5e04..00000000 --- a/mindplot/src/main/javascript/layout/Node.js +++ /dev/null @@ -1,221 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.layout.Node = new Class(/** @lends Node */{ - /** - * @constructs - * @param id - * @param size - * @param position - * @param sorter - * @throws will throw an error if id is not a finite number or is null or undefined - * @throws will throw an error if size is null or undefined - * @throws will throw an error if position is null or undefined - * @throws will throw an error if sorter is null or undefined - */ - initialize:function (id, size, position, sorter) { - $assert(typeof id === 'number' && isFinite(id), "id can not be null"); - $assert(size, "size can not be null"); - $assert(position, "position can not be null"); - $assert(sorter, "sorter can not be null"); - - this._id = id; - this._sorter = sorter; - this._properties = {}; - - this.setSize(size); - this.setPosition(position); - this.setShrunken(false); - }, - - /** */ - getId:function () { - return this._id; - }, - - /** */ - setFree:function (value) { - this._setProperty('free', value); - }, - - /** */ - isFree:function () { - return this._getProperty('free'); - }, - - /** */ - hasFreeChanged:function () { - return this._isPropertyChanged('free'); - }, - - /** */ - hasFreeDisplacementChanged:function () { - return this._isPropertyChanged('freeDisplacement'); - }, - - /** */ - setShrunken:function (value) { - this._setProperty('shrink', value); - }, - - /** */ - areChildrenShrunken:function () { - return this._getProperty('shrink'); - }, - - /** */ - setOrder:function (order) { - $assert(typeof order === 'number' && isFinite(order), "Order can not be null. Value:" + order); - this._setProperty('order', order); - }, - - /** */ - resetPositionState:function () { - var prop = this._properties['position']; - if (prop) { - prop.hasChanged = false; - } - }, - - /** */ - resetOrderState:function () { - var prop = this._properties['order']; - if (prop) { - prop.hasChanged = false; - } - }, - - /** */ - resetFreeState:function () { - var prop = this._properties['freeDisplacement']; - if (prop) { - prop.hasChanged = false; - } - }, - - /** */ - getOrder:function () { - return this._getProperty('order'); - }, - - /** */ - hasOrderChanged:function () { - return this._isPropertyChanged('order'); - }, - - /** */ - hasPositionChanged:function () { - return this._isPropertyChanged('position'); - }, - - /** */ - hasSizeChanged:function () { - return this._isPropertyChanged('size'); - }, - - /** */ - getPosition:function () { - return this._getProperty('position'); - }, - - /** */ - setSize:function (size) { - $assert($defined(size), "Size can not be null"); - this._setProperty('size', Object.clone(size)); - }, - - /** */ - getSize:function () { - return this._getProperty('size'); - }, - - /** */ - setFreeDisplacement:function (displacement) { - $assert($defined(displacement), "Position can not be null"); - $assert($defined(displacement.x), "x can not be null"); - $assert($defined(displacement.y), "y can not be null"); - var oldDisplacement = this.getFreeDisplacement(); - var newDisplacement = {x:oldDisplacement.x + displacement.x, y:oldDisplacement.y + displacement.y}; - - this._setProperty('freeDisplacement', Object.clone(newDisplacement)); - }, - - /** */ - resetFreeDisplacement:function () { - this._setProperty('freeDisplacement', {x:0, y:0}); - }, - - /** */ - getFreeDisplacement:function () { - var freeDisplacement = this._getProperty('freeDisplacement'); - return (freeDisplacement || {x:0, y:0}); - }, - - /** */ - setPosition:function (position) { - $assert($defined(position), "Position can not be null"); - $assert($defined(position.x), "x can not be null"); - $assert($defined(position.y), "y can not be null"); - - // This is a performance improvement to avoid movements that really could be avoided. - var currentPos = this.getPosition(); - if (currentPos == null || Math.abs(currentPos.x - position.x) > 2 || Math.abs(currentPos.y - position.y) > 2) - this._setProperty('position', position); - }, - - _setProperty:function (key, value) { - var prop = this._properties[key]; - if (!prop) { - prop = { - hasChanged:false, - value:null, - oldValue:null - }; - } - - // Only update if the property has changed ... - if (JSON.stringify(prop.value) != JSON.stringify(value)) { - prop.oldValue = prop.value; - prop.value = value; - prop.hasChanged = true; - } - this._properties[key] = prop; - }, - - _getProperty:function (key) { - var prop = this._properties[key]; - return $defined(prop) ? prop.value : null; - }, - - _isPropertyChanged:function (key) { - var prop = this._properties[key]; - return prop ? prop.hasChanged : false; - }, - - /** */ - getSorter:function () { - return this._sorter; - }, - - /** @return {String} returns id, order, position, size and shrink information*/ - toString:function () { - return "[id:" + this.getId() + ", order:" + this.getOrder() + ", position: {" + this.getPosition().x + "," + this.getPosition().y + "}, size: {" + this.getSize().width + "," + this.getSize().height + "}, shrink:" + this.areChildrenShrunken() + "]"; - } - -}); - diff --git a/mindplot/src/main/javascript/layout/OriginalLayout.js b/mindplot/src/main/javascript/layout/OriginalLayout.js deleted file mode 100644 index aadae2a7..00000000 --- a/mindplot/src/main/javascript/layout/OriginalLayout.js +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.layout.OriginalLayout = new Class(/** @lends OriginalLayout */{ - /** - * @constructs - * @param treeSet - */ - initialize:function (treeSet) { - this._treeSet = treeSet; - }, - - /** */ - createNode:function (id, size, position, type) { - $assert($defined(id), "id can not be null"); - $assert(size, "size can not be null"); - $assert(position, "position can not be null"); - $assert(type, "type can not be null"); - - var strategy = type === 'root' ? - mindplot.layout.OriginalLayout.BALANCED_SORTER : - mindplot.layout.OriginalLayout.SYMMETRIC_SORTER; - return new mindplot.layout.Node(id, size, position, strategy); - }, - - /** */ - connectNode:function (parentId, childId, order) { - - var parent = this._treeSet.find(parentId); - var child = this._treeSet.find(childId); - - // Insert the new node ... - var sorter = parent.getSorter(); - sorter.insert(this._treeSet, parent, child, order); - - // Connect the new node ... - this._treeSet.connect(parentId, childId); - - // Fire a basic validation ... - sorter.verify(this._treeSet, parent); - }, - - /** */ - disconnectNode:function (nodeId) { - var node = this._treeSet.find(nodeId); - var parent = this._treeSet.getParent(node); - $assert(parent, "Node already disconnected"); - - // Make it fixed - node.setFree(false); - node.resetFreeDisplacement(); - - // Remove from children list. - var sorter = parent.getSorter(); - sorter.detach(this._treeSet, node); - - // Disconnect the new node ... - this._treeSet.disconnect(nodeId); - - // Fire a basic validation ... - parent.getSorter().verify(this._treeSet, parent); - }, - - /** */ - layout:function () { - var roots = this._treeSet.getTreeRoots(); - _.each(roots, function (node) { - - // Calculate all node heights ... - var sorter = node.getSorter(); - - var heightById = sorter.computeChildrenIdByHeights(this._treeSet, node); - - this._layoutChildren(node, heightById); - - this._fixOverlapping(node, heightById); - }, this); - }, - - _layoutChildren:function (node, heightById) { - - var nodeId = node.getId(); - var children = this._treeSet.getChildren(node); - var parent = this._treeSet.getParent(node); - var childrenOrderMoved = children.some(function (child) { - return child.hasOrderChanged(); - }); - var childrenSizeChanged = children.some(function (child) { - return child.hasSizeChanged(); - }); - - // If ether any of the nodes has been changed of position or the height of the children is not - // the same, children nodes must be repositioned .... - var newBranchHeight = heightById[nodeId]; - - var parentHeightChanged = $defined(parent) ? parent._heightChanged : false; - var heightChanged = node._branchHeight != newBranchHeight; - node._heightChanged = heightChanged || parentHeightChanged; - - if (childrenOrderMoved || childrenSizeChanged || heightChanged || parentHeightChanged) { - var sorter = node.getSorter(); - var offsetById = sorter.computeOffsets(this._treeSet, node); - var parentPosition = node.getPosition(); - var me = this; - _.each(children, function (child) { - var offset = offsetById[child.getId()]; - - var childFreeDisplacement = child.getFreeDisplacement(); - var direction = node.getSorter().getChildDirection(me._treeSet, child); - - if ((direction > 0 && childFreeDisplacement.x < 0) || (direction < 0 && childFreeDisplacement.x > 0)) { - child.resetFreeDisplacement(); - child.setFreeDisplacement({x:-childFreeDisplacement.x, y:childFreeDisplacement.y}); - } - - offset.x += child.getFreeDisplacement().x; - offset.y += child.getFreeDisplacement().y; - - var parentX = parentPosition.x; - var parentY = parentPosition.y; - - var newPos = {x:parentX + offset.x, y:parentY + offset.y + me._calculateAlignOffset(node, child, heightById)}; - me._treeSet.updateBranchPosition(child, newPos); - }); - - node._branchHeight = newBranchHeight; - } - - // Continue reordering the children nodes ... - _.each(children, function (child) { - this._layoutChildren(child, heightById); - }, this); - }, - - _calculateAlignOffset:function (node, child, heightById) { - if (child.isFree()) { - return 0; - } - - var offset = 0; - - var nodeHeight = node.getSize().height; - var childHeight = child.getSize().height; - - if (this._treeSet.isStartOfSubBranch(child) && this._branchIsTaller(child, heightById)) { - if (this._treeSet.hasSinglePathToSingleLeaf(child)) { - offset = heightById[child.getId()] / 2 - (childHeight + child.getSorter()._getVerticalPadding() * 2) / 2; - } else { - offset = this._treeSet.isLeaf(child) ? 0 : -(childHeight - nodeHeight) / 2; - } - } else if (nodeHeight > childHeight) { - if (this._treeSet.getSiblings(child).length > 0) { - offset = 0; - } else { - offset = nodeHeight / 2 - childHeight / 2; - } - } - else if (childHeight > nodeHeight) { - if (this._treeSet.getSiblings(child).length > 0) { - offset = 0; - } else { - offset = -(childHeight / 2 - nodeHeight / 2); - } - } - - return offset; - }, - - _branchIsTaller:function (node, heightById) { - return heightById[node.getId()] > (node.getSize().height + node.getSorter()._getVerticalPadding() * 2); - }, - - _fixOverlapping:function (node, heightById) { - var children = this._treeSet.getChildren(node); - - if (node.isFree()) { - this._shiftBranches(node, heightById); - } - - _.each(children, function (child) { - this._fixOverlapping(child, heightById); - }, this); - }, - - _shiftBranches:function (node, heightById) { - var shiftedBranches = [node]; - - var siblingsToShift = this._treeSet.getSiblingsInVerticalDirection(node, node.getFreeDisplacement().y); - var last = node; - _.each(siblingsToShift, function (sibling) { - var overlappingOccurs = shiftedBranches.some(function (shiftedBranch) { - return this._branchesOverlap(shiftedBranch, sibling, heightById); - }, this); - - if (!sibling.isFree() || overlappingOccurs) { - var sAmount = node.getFreeDisplacement().y; - this._treeSet.shiftBranchPosition(sibling, 0, sAmount); - shiftedBranches.push(sibling); - } - }, this); - - var branchesToShift = this._treeSet.getBranchesInVerticalDirection(node, node.getFreeDisplacement().y).filter(function (branch) { - return !shiftedBranches.contains(branch); - }); - - _.each(branchesToShift, function (branch) { - var bAmount = node.getFreeDisplacement().y; - this._treeSet.shiftBranchPosition(branch, 0, bAmount); - shiftedBranches.push(branch); - last = branch; - }, this); - }, - - _branchesOverlap:function (branchA, branchB, heightById) { - // a branch doesn't really overlap with itself - if (branchA == branchB) { - return false; - } - - var topA = branchA.getPosition().y - heightById[branchA.getId()] / 2; - var bottomA = branchA.getPosition().y + heightById[branchA.getId()] / 2; - var topB = branchB.getPosition().y - heightById[branchB.getId()] / 2; - var bottomB = branchB.getPosition().y + heightById[branchB.getId()] / 2; - - return !(topA >= bottomB || bottomA <= topB); - } - -}); - - -/** - * @type {mindplot.layout.SymmetricSorter} - */ -mindplot.layout.OriginalLayout.SYMMETRIC_SORTER = new mindplot.layout.SymmetricSorter(); -/** - * @type {mindplot.layout.BalancedSorter} - */ -mindplot.layout.OriginalLayout.BALANCED_SORTER = new mindplot.layout.BalancedSorter(); - - - diff --git a/mindplot/src/main/javascript/layout/RootedTreeSet.js b/mindplot/src/main/javascript/layout/RootedTreeSet.js deleted file mode 100644 index 9ff1e546..00000000 --- a/mindplot/src/main/javascript/layout/RootedTreeSet.js +++ /dev/null @@ -1,395 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.layout.RootedTreeSet = new Class(/** @lends RootedTreeSet */{ - /** @constructs */ - initialize:function () { - this._rootNodes = []; - }, - - /** - * @param root - * @throws will throw an error if root is null or undefined - */ - setRoot:function (root) { - $assert(root, 'root can not be null'); - this._rootNodes.push(this._decodate(root)); - }, - - /** getter */ - getTreeRoots:function () { - return this._rootNodes; - }, - - _decodate:function (node) { - node._children = []; - return node; - }, - - /** - * @param {mindplot.model.NodeModel} node - * @throws will throw an error if node is null or undefined - * @throws will throw an error if node with id already exists - * @throws will throw an error if node has been added already - */ - add:function (node) { - $assert(node, 'node can not be null'); - $assert(!this.find(node.getId(), false), 'node already exits with this id. Id:' + node.getId()); - $assert(!node._children, 'node already added'); - this._rootNodes.push(this._decodate(node)); - }, - - - /** - * @param nodeId - * @throws will throw an error if nodeId is null or undefined - */ - remove:function (nodeId) { - $assert($defined(nodeId), 'nodeId can not be null'); - var node = this.find(nodeId); - this._rootNodes.erase(node); - }, - - /** - * @param parentId - * @param childId - * @throws will throw an error if parentId is null or undefined - * @throws will throw an error if childId is null or undefined - * @throws will throw an error if node with id childId is already a child of parent - */ - connect:function (parentId, childId) { - $assert($defined(parentId), 'parent can not be null'); - $assert($defined(childId), 'child can not be null'); - - var parent = this.find(parentId); - var child = this.find(childId, true); - $assert(!child._parent, 'node already connected. Id:' + child.getId() + ",previous:" + child._parent); - - parent._children.push(child); - child._parent = parent; - this._rootNodes.erase(child); - }, - - /** - * @param nodeId - * @throws will throw an error if nodeId is null or undefined - * @throws will throw an error if node is not connected - */ - disconnect:function (nodeId) { - $assert($defined(nodeId), 'nodeId can not be null'); - var node = this.find(nodeId); - $assert(node._parent, "Node is not connected"); - - node._parent._children.erase(node); - this._rootNodes.push(node); - node._parent = null; - }, - - /** - * @param id - * @param validate - * @throws will throw an error if id is null or undefined - * @throws will throw an error if node cannot be found - * @return node - */ - find:function (id, validate) { - $assert($defined(id), 'id can not be null'); - - var graphs = this._rootNodes; - var result = null; - for (var i = 0; i < graphs.length; i++) { - var node = graphs[i]; - result = this._find(id, node); - if (result) { - break; - } - } - validate = !$defined(validate) ? true : validate; - $assert(validate ? result : true, 'node could not be found id:' + id + "\n,RootedTreeSet" + this.dump()); - return result; - - }, - - _find:function (id, parent) { - if (parent.getId() == id) { - return parent; - - } - - var result = null; - var children = parent._children; - for (var i = 0; i < children.length; i++) { - var child = children[i]; - result = this._find(id, child); - if (result) - break; - } - - return result; - }, - - /** - * @param node - * @throws will throw an error if nodeId is null or undefined - * @return children - */ - getChildren:function (node) { - $assert(node, 'node cannot be null'); - return node._children; - }, - - /** - * @param node - * @throws will throw an error if node is null or undefined - * @return root node or the provided node, if it has no parent - */ - getRootNode:function (node) { - $assert(node, "node cannot be null"); - var parent = this.getParent(node); - if ($defined(parent)) { - return this.getRootNode(parent); - } - - return node; - }, - - /** - * @param node - * @throws will throw an error if node is null or undefined - * @return {Array} ancestors*/ - getAncestors:function (node) { - $assert(node, 'node cannot be null'); - return this._getAncestors(this.getParent(node), []); - }, - - _getAncestors:function (node, ancestors) { - var result = ancestors; - if (node) { - result.push(node); - this._getAncestors(this.getParent(node), result); - } - return result; - }, - - /** - * @param node - * @throws will throw an error if node is null or undefined - * @return {Array} siblings - */ - getSiblings:function (node) { - $assert(node, 'node cannot be null'); - if (!$defined(node._parent)) { - return []; - } - var siblings = node._parent._children.filter(function (child) { - return child != node; - }); - return siblings; - }, - - /** - * @param node - * @throws will throw an error if node is null or undefined - * @return {Boolean} whether the node has a single path to a single leaf (no branching) - */ - hasSinglePathToSingleLeaf:function (node) { - $assert(node, 'node cannot be null'); - return this._hasSinglePathToSingleLeaf(node); - }, - - _hasSinglePathToSingleLeaf:function (node) { - var children = this.getChildren(node); - - if (children.length == 1) { - return this._hasSinglePathToSingleLeaf(children[0]); - } - - return children.length == 0; - }, - - /** - * @param node - * @return {Boolean} whether the node is the start of a subbranch*/ - isStartOfSubBranch:function (node) { - return this.getSiblings(node).length > 0 && this.getChildren(node).length == 1; - }, - - /** - * @param node - * @throws will throw an error if node is null or undefined - * @return {Boolean} whether the node is a leaf - */ - isLeaf:function (node) { - $assert(node, 'node cannot be null'); - return this.getChildren(node).length == 0; - }, - - /** - * @param node - * @throws will throw an error if node is null or undefined - * @return parent - */ - getParent:function (node) { - $assert(node, 'node cannot be null'); - return node._parent; - }, - - /** - * @return result - */ - dump:function () { - var branches = this._rootNodes; - var result = ""; - for (var i = 0; i < branches.length; i++) { - var branch = branches[i]; - result += this._dump(branch, ""); - } - return result; - }, - - _dump:function (node, indent) { - var result = indent + node + "\n"; - var children = this.getChildren(node); - for (var i = 0; i < children.length; i++) { - var child = children[i]; - result += this._dump(child, indent + " "); - } - - return result; - }, - - /** - * @param canvas - */ - plot:function (canvas) { - var branches = this._rootNodes; - for (var i = 0; i < branches.length; i++) { - var branch = branches[i]; - this._plot(canvas, branch); - } - }, - - _plot:function (canvas, node, root) { - var children = this.getChildren(node); - var cx = node.getPosition().x + canvas.width / 2 - node.getSize().width / 2; - var cy = node.getPosition().y + canvas.height / 2 - node.getSize().height / 2; - var rect = canvas.rect(cx, cy, node.getSize().width, node.getSize().height); - var order = node.getOrder() == null ? "r" : node.getOrder(); - var text = canvas.text(node.getPosition().x + canvas.width / 2, node.getPosition().y + canvas.height / 2, node.getId() + "[" + order + "]"); - text.attr('fill', '#FFF'); - var fillColor = this._rootNodes.contains(node) ? "#000" : (node.isFree() ? "#abc" : "#c00"); - rect.attr('fill', fillColor); - - var rectPosition = {x:rect.attr("x") - canvas.width / 2 + rect.attr("width") / 2, y:rect.attr("y") - canvas.height / 2 + rect.attr("height") / 2}; - var rectSize = {width:rect.attr("width"), height:rect.attr("height")}; - rect.click(function () { - console.log("[id:" + node.getId() + ", order:" + node.getOrder() + ", position:(" + rectPosition.x + "," + rectPosition.y + "), size:" + rectSize.width + "x" + rectSize.height + ", freeDisplacement:(" + node.getFreeDisplacement().x + "," + node.getFreeDisplacement().y + ")]"); - }); - text.click(function () { - console.log("[id:" + node.getId() + ", order:" + node.getOrder() + ", position:(" + rectPosition.x + "," + rectPosition.y + "), size:" + rectSize.width + "x" + rectSize.height + ", freeDisplacement:(" + node.getFreeDisplacement().x + "," + node.getFreeDisplacement().y + ")]"); - }); - - for (var i = 0; i < children.length; i++) { - var child = children[i]; - this._plot(canvas, child); - } - }, - - /** - * @param node - * @param position - */ - updateBranchPosition:function (node, position) { - - var oldPos = node.getPosition(); - node.setPosition(position); - - var xOffset = oldPos.x - position.x; - var yOffset = oldPos.y - position.y; - - var children = this.getChildren(node); - var me = this; - _.each(children, function (child) { - me.shiftBranchPosition(child, xOffset, yOffset); - }); - - }, - - /** - * @param node - * @param xOffset - * @param yOffset - */ - shiftBranchPosition:function (node, xOffset, yOffset) { - var position = node.getPosition(); - node.setPosition({x:position.x + xOffset, y:position.y + yOffset}); - - var children = this.getChildren(node); - var me = this; - _.each(children, function (child) { - me.shiftBranchPosition(child, xOffset, yOffset); - }); - }, - - /** - * @param node - * @param yOffset - * @return siblings in the offset (vertical) direction, i.e. with lower or higher order, respectively - */ - getSiblingsInVerticalDirection:function (node, yOffset) { - // siblings with lower or higher order, depending on the direction of the offset and on the same side as their parent - var parent = this.getParent(node); - var siblings = this.getSiblings(node).filter(function (sibling) { - var sameSide = node.getPosition().x > parent.getPosition().x ? sibling.getPosition().x > parent.getPosition().x : sibling.getPosition().x < parent.getPosition().x; - var orderOK = yOffset < 0 ? sibling.getOrder() < node.getOrder() : sibling.getOrder() > node.getOrder(); - return orderOK && sameSide; - }); - - if (yOffset < 0) { - siblings.reverse(); - } - - return siblings; - }, - - /** - * @param node - * @param yOffset - * @return branches of the root node on the same side as the given node's, in the given - * vertical direction - */ - getBranchesInVerticalDirection:function (node, yOffset) { - // direct descendants of the root that do not contain the node and are on the same side - // and on the direction of the offset - var rootNode = this.getRootNode(node); - var branches = this.getChildren(rootNode).filter(function (child) { - return this._find(node.getId(), child); - }, this); - - var branch = branches[0]; - var rootDescendants = this.getSiblings(branch).filter(function (sibling) { - var sameSide = node.getPosition().x > rootNode.getPosition().x ? sibling.getPosition().x > rootNode.getPosition().x : sibling.getPosition().x < rootNode.getPosition().x; - var sameDirection = yOffset < 0 ? sibling.getOrder() < branch.getOrder() : sibling.getOrder() > branch.getOrder(); - return sameSide && sameDirection; - }, this); - - return rootDescendants; - } - -}); - diff --git a/mindplot/src/main/javascript/layout/SymmetricSorter.js b/mindplot/src/main/javascript/layout/SymmetricSorter.js deleted file mode 100644 index fefd778e..00000000 --- a/mindplot/src/main/javascript/layout/SymmetricSorter.js +++ /dev/null @@ -1,282 +0,0 @@ -/* - * Copyright [2015] [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. - */ - -mindplot.layout.SymmetricSorter = new Class(/** @lends SymmetricSorter */{ - Extends:mindplot.layout.AbstractBasicSorter, - /** - * @constructs - * @extends mindplot.layout.AbstractBasicSorter - */ - initialize:function () { - - }, - - /** - * Predict the order and position of a dragged node. - * - * @param graph The tree set - * @param parent The parent of the node - * @param node The node - * @param position The position of the drag - * @param free Free drag or not - * @return {*} - */ - predict:function (graph, parent, node, position, free) { - - var self = this; - var rootNode = graph.getRootNode(parent); - - // If its a free node... - if (free) { - $assert($defined(position), "position cannot be null for predict in free positioning"); - $assert($defined(node), "node cannot be null for predict in free positioning"); - - var direction = this._getRelativeDirection(rootNode.getPosition(), parent.getPosition()); - var limitXPos = parent.getPosition().x + direction * (parent.getSize().width / 2 + node.getSize().width / 2 + mindplot.layout.SymmetricSorter.INTERNODE_HORIZONTAL_PADDING); - - var xPos = direction > 0 ? - (position.x >= limitXPos ? position.x : limitXPos) : - (position.x <= limitXPos ? position.x : limitXPos); - - return [0, {x:xPos, y:position.y}]; - } - - // Its not a dragged node (it is being added) - if (!node) { - var parentDirection = self._getRelativeDirection(rootNode.getPosition(), parent.getPosition()); - var position = { - x:parent.getPosition().x + parentDirection * (parent.getSize().width + mindplot.layout.SymmetricSorter.INTERNODE_HORIZONTAL_PADDING), - y:parent.getPosition().y - }; - return [graph.getChildren(parent).length, position]; - } - - // If it is a dragged node... - $assert($defined(position), "position cannot be null for predict in dragging"); - var nodeDirection = this._getRelativeDirection(rootNode.getPosition(), node.getPosition()); - var positionDirection = this._getRelativeDirection(rootNode.getPosition(), position); - var siblings = graph.getSiblings(node); - - // node has no siblings and its trying to reconnect to its own parent - var sameParent = parent == graph.getParent(node); - if (siblings.length == 0 && nodeDirection == positionDirection && sameParent) { - return [node.getOrder(), node.getPosition()]; - } - - var parentChildren = graph.getChildren(parent); - - if (parentChildren.length == 0) { - // Fit as a child of the parent node... - var position = { - x:parent.getPosition().x + positionDirection * (parent.getSize().width + mindplot.layout.SymmetricSorter.INTERNODE_HORIZONTAL_PADDING), - y:parent.getPosition().y - }; - return [0, position]; - } else { - // Try to fit within ... - var result = null; - var last = parentChildren.getLast(); - for (var i = 0; i < parentChildren.length; i++) { - var parentChild = parentChildren[i]; - var nodeAfter = (i + 1) == parentChild.length ? null : parentChildren[i + 1]; - - // Fit at the bottom - if (!nodeAfter && position.y > parentChild.getPosition().y) { - var order = (graph.getParent(node) && graph.getParent(node).getId() == parent.getId()) ? - last.getOrder() : last.getOrder() + 1; - var position = { - x:parentChild.getPosition().x, - y:parentChild.getPosition().y + parentChild.getSize().height + mindplot.layout.SymmetricSorter.INTERNODE_VERTICAL_PADDING * 2 - }; - return [order, position]; - } - - // Fit after this node - if (nodeAfter && position.y > parentChild.getPosition().y && position.y < nodeAfter.getPosition().y) { - if (nodeAfter.getId() == node.getId() || parentChild.getId() == node.getId()) { - return [node.getOrder(), node.getPosition()]; - } else { - var order = position.y > node.getPosition().y ? - nodeAfter.getOrder() - 1 : parentChild.getOrder() + 1; - var position = { - x:parentChild.getPosition().x, - y:parentChild.getPosition().y + (nodeAfter.getPosition().y - parentChild.getPosition().y) / 2 - }; - - return [order, position]; - } - } - } - } - - // Position wasn't below any node, so it must be fitted above the first - var first = parentChildren[0]; - var position = { - x:first.getPosition().x, - y:first.getPosition().y - first.getSize().height - mindplot.layout.SymmetricSorter.INTERNODE_VERTICAL_PADDING * 2 - }; - return [0, position]; - }, - - /** - * @param treeSet - * @param parent - * @param child - * @param order - * @throws will throw an error if the order is not strictly continuous - */ - insert:function (treeSet, parent, child, order) { - var children = this._getSortedChildren(treeSet, parent); - $assert(order <= children.length, "Order must be continues and can not have holes. Order:" + order); - - // Shift all the elements in one . - for (var i = order; i < children.length; i++) { - var node = children[i]; - node.setOrder(i + 1); - } - child.setOrder(order); - }, - - /** - * @param treeSet - * @param node - * @throws will throw an error if the node is in the wrong position*/ - detach:function (treeSet, node) { - var parent = treeSet.getParent(node); - var children = this._getSortedChildren(treeSet, parent); - var order = node.getOrder(); - $assert(children[order] === node, "Node seems not to be in the right position"); - - // Shift all the nodes ... - for (var i = node.getOrder() + 1; i < children.length; i++) { - var child = children[i]; - child.setOrder(child.getOrder() - 1); - } - node.setOrder(0); - }, - - /** - * @param treeSet - * @param node - * @throws will throw an error if treeSet is null or undefined - * @throws will throw an error if node is null or undefined - * @throws will throw an error if the calculated x offset cannot be converted to a numeric - * value, is null or undefined - * @throws will throw an error if the calculated y offset cannot be converted to a numeric - * value, is null or undefined - * @return offsets - */ - computeOffsets:function (treeSet, node) { - $assert(treeSet, "treeSet can no be null."); - $assert(node, "node can no be null."); - - var children = this._getSortedChildren(treeSet, node); - - // Compute heights ... - var heights = children.map( - function (child) { - return {id:child.getId(), order:child.getOrder(), position:child.getPosition(), width:child.getSize().width, height:this._computeChildrenHeight(treeSet, child)}; - }, this).reverse(); - - // Compute the center of the branch ... - var totalHeight = 0; - _.each(heights, function (elem) { - totalHeight += elem.height; - }); - var ysum = totalHeight / 2; - - // Calculate the offsets ... - var result = {}; - for (var i = 0; i < heights.length; i++) { - ysum = ysum - heights[i].height; - var childNode = treeSet.find(heights[i].id); - var direction = this.getChildDirection(treeSet, childNode); - - var yOffset = ysum + heights[i].height / 2; - var xOffset = direction * (heights[i].width / 2 + node.getSize().width / 2 + mindplot.layout.SymmetricSorter.INTERNODE_HORIZONTAL_PADDING); - - $assert(!isNaN(xOffset), "xOffset can not be null"); - $assert(!isNaN(yOffset), "yOffset can not be null"); - - result[heights[i].id] = {x:xOffset, y:yOffset}; - } - return result; - }, - - /** - * @param treeSet - * @param node - * @throws will throw an error if order elements are missing - */ - verify:function (treeSet, node) { - // Check that all is consistent ... - var children = this._getSortedChildren(treeSet, node); - - for (var i = 0; i < children.length; i++) { - $assert(children[i].getOrder() == i, "missing order elements"); - } - }, - - /** - * @param treeSet - * @param child - * @return direction of the given child from its parent or from the root node, if isolated*/ - getChildDirection:function (treeSet, child) { - $assert(treeSet, "treeSet can no be null."); - $assert(treeSet.getParent(child), "This should not happen"); - - var result; - var rootNode = treeSet.getRootNode(child); - if (treeSet.getParent(child) == rootNode) { - // This is the case of a isolated child ... In this case, the directions is based on the root. - result = Math.sign(rootNode.getPosition().x); - } else { - // if this is not the case, honor the direction of the parent ... - var parent = treeSet.getParent(child); - var grandParent = treeSet.getParent(parent); - var sorter = grandParent.getSorter(); - result = sorter.getChildDirection(treeSet, parent); - - } - return result; - }, - - /** @return {String} the print name of this class */ - toString:function () { - return "Symmetric Sorter"; - }, - - _getVerticalPadding:function () { - return mindplot.layout.SymmetricSorter.INTERNODE_VERTICAL_PADDING; - } -}); - -/** - * @constant - * @type {Number} - * @default - */ -mindplot.layout.SymmetricSorter.INTERNODE_VERTICAL_PADDING = 5; -/** - * @constant - * @type {Number} - * @default - */ -mindplot.layout.SymmetricSorter.INTERNODE_HORIZONTAL_PADDING = 30; - - diff --git a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.Request.js b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.Request.js deleted file mode 100644 index 4f12b859..00000000 --- a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.Request.js +++ /dev/null @@ -1,49 +0,0 @@ -BootstrapDialog.Request = new Class({ - - Extends: BootstrapDialog, - - initialize: function(url, title, options) { - this.parent(title, options); - this.requestOptions = {}; - this.requestOptions.cache = false; - var me = this; - this.requestOptions.fail = function(xhr) { - // Intercept form requests ... - console.log("Failure:"); - console.log(xhr); - }; - - this.requestOptions.success = function() { - // Intercept form requests ... - var forms = me._native.find('form'); - _.each(forms, function(form) { - $(form).on('submit', function(event) { - // Intercept form ... - me.requestOptions.url = form.action; - me.requestOptions.method = form.method ? form.method : 'post'; - $.ajax(me.requestOptions); - event.stopPropagation(); - return false; - }); - }); - }; - - this._native.find('.modal-body').load(url, function () { - me.acceptButton.unbind('click').click(function () { - submitDialogForm(); - }); - me._native.on('hidden.bs.modal', function () { - $(this).remove(); - }); - me.show(); - }); - }, - - onDialogShown: function() { - if (typeof(onDialogShown) == "function") { - onDialogShown(); - } - } - - -}); diff --git a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js deleted file mode 100644 index 83f37aef..00000000 --- a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js +++ /dev/null @@ -1,111 +0,0 @@ -var BootstrapDialog = new Class({ - Implements: Options, - - options: { - cancelButton: false, - closeButton: false, - acceptButton: true, - removeButton:false, - errorMessage: false, - onEventData:{} - }, - - initialize: function (title, options) { - this.setOptions(options); - this.options.onEventData.dialog = this; - this._native = $('
').append('
'); - var content = $('
'); - var header = this._buildHeader(title); - if (header) { - content.append(header); - } - var body = $('
'); - if(this.options.errorMessage){ - var error = $('
'); - error.hide(); - body.append(error); - } - content.append(body); - var footer = this._buildFooter(); - if (footer) { - content.append(footer); - } - this._native.find(".modal-dialog").append(content); - this._native.on('hidden.bs.modal', function() { - $(this).remove(); - }); - this._native.on('shown.bs.modal', this.onDialogShown); - }, - - _buildFooter: function() { - var footer = null; - if (this.options.acceptButton || this.options.removeButton || this.options.cancelButton) { - footer = $('
'); - } - if (this.options.acceptButton) { - this.acceptButton = $(''); - footer.append(this.acceptButton); - this.acceptButton.unbind('click').on("click",this.options.onEventData, this.onAcceptClick) - } - if (this.options.removeButton) { - this.removeButton = $(''); - footer.append(this.removeButton); - this.removeButton.on('click', this.options.onEventData, this.onRemoveClick); - } - if (this.options.cancelButton) { - footer.append(''); - } - return footer; - }, - - _buildHeader: function(title) { - var header = null; - if (this.options.closeButton || title) { - header = $('
'); - } - if (this.options.closeButton) { - header.append( - '' - ); - } - if (title) { - header.append('

' + title + '

'); - } - return header; - }, - - onAcceptClick: function(event) { - throw "Unsupported operation"; - }, - - onDialogShown: function() {}, - onRemoveClick: function(event) { - throw "Unsupported operation"; - }, - - show: function () { - this._native.modal(); - }, - - setContent: function(content) { - var modalBody = this._native.find('.modal-body'); - modalBody.append(content); - }, - - css: function(options){ - this._native.find('.modal-dialog').css(options); - }, - - close: function() { - this._native.modal('hide'); - }, - - alertError: function(message){ - this._native.find('.alert-danger').text(message); - this._native.find('.alert-danger').show(); - }, - - cleanError: function(){ - this._native.find('.alert-danger').hide(); - } -}); diff --git a/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-colorpicker.css b/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-colorpicker.css deleted file mode 100644 index 28d2bca7..00000000 --- a/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-colorpicker.css +++ /dev/null @@ -1,214 +0,0 @@ -/*! - * Bootstrap Colorpicker - * http://mjolnic.github.io/bootstrap-colorpicker/ - * - * Originally written by (c) 2012 Stefan Petre - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - */ - -.colorpicker-saturation { - float: left; - width: 100px; - height: 100px; - cursor: crosshair; - background-image: url("../img/bootstrap-colorpicker/saturation.png"); -} - -.colorpicker-saturation i { - position: absolute; - top: 0; - left: 0; - display: block; - width: 5px; - height: 5px; - margin: -4px 0 0 -4px; - border: 1px solid #000; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.colorpicker-saturation i b { - display: block; - width: 5px; - height: 5px; - border: 1px solid #fff; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.colorpicker-hue, -.colorpicker-alpha { - float: left; - width: 15px; - height: 100px; - margin-bottom: 4px; - margin-left: 4px; - cursor: row-resize; -} - -.colorpicker-hue i, -.colorpicker-alpha i { - position: absolute; - top: 0; - left: 0; - display: block; - width: 100%; - height: 1px; - margin-top: -1px; - background: #000; - border-top: 1px solid #fff; -} - -.colorpicker-hue { - background-image: url("../img/bootstrap-colorpicker/hue.png"); -} - -.colorpicker-alpha { - display: none; - background-image: url("../img/bootstrap-colorpicker/alpha.png"); -} - -.colorpicker { - top: 0; - left: 0; - z-index: 2500; - min-width: 130px; - padding: 4px; - margin-top: 1px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - *zoom: 1; -} - -.colorpicker:before, -.colorpicker:after { - display: table; - line-height: 0; - content: ""; -} - -.colorpicker:after { - clear: both; -} - -.colorpicker:before { - position: absolute; - top: -7px; - left: 6px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; -} - -.colorpicker:after { - position: absolute; - top: -6px; - left: 7px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; -} - -.colorpicker div { - position: relative; -} - -.colorpicker.colorpicker-with-alpha { - min-width: 140px; -} - -.colorpicker.colorpicker-with-alpha .colorpicker-alpha { - display: block; -} - -.colorpicker-color { - height: 10px; - margin-top: 5px; - clear: both; - background-image: url("../img/bootstrap-colorpicker/alpha.png"); - background-position: 0 100%; -} - -.colorpicker-color div { - height: 10px; -} - -.colorpicker-element .input-group-addon i { - display: block; - width: 16px; - height: 16px; - cursor: pointer; -} - -.colorpicker.colorpicker-inline { - position: relative; - display: inline-block; - float: none; -} - -.colorpicker.colorpicker-horizontal { - width: 110px; - height: auto; - min-width: 110px; -} - -.colorpicker.colorpicker-horizontal .colorpicker-saturation { - margin-bottom: 4px; -} - -.colorpicker.colorpicker-horizontal .colorpicker-color { - width: 100px; -} - -.colorpicker.colorpicker-horizontal .colorpicker-hue, -.colorpicker.colorpicker-horizontal .colorpicker-alpha { - float: left; - width: 100px; - height: 15px; - margin-bottom: 4px; - margin-left: 0; - cursor: col-resize; -} - -.colorpicker.colorpicker-horizontal .colorpicker-hue i, -.colorpicker.colorpicker-horizontal .colorpicker-alpha i { - position: absolute; - top: 0; - left: 0; - display: block; - width: 1px; - height: 15px; - margin-top: 0; - background: #ffffff; - border: none; -} - -.colorpicker.colorpicker-horizontal .colorpicker-hue { - background-image: url("../img/bootstrap-colorpicker/hue-horizontal.png"); -} - -.colorpicker.colorpicker-horizontal .colorpicker-alpha { - background-image: url("../img/bootstrap-colorpicker/alpha-horizontal.png"); -} - -.colorpicker.colorpicker-hidden { - display: none; -} - -.colorpicker.colorpicker-visible { - display: block; -} - -.colorpicker-inline.colorpicker-visible { - display: inline-block; -} \ No newline at end of file diff --git a/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-colorpicker.min.css b/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-colorpicker.min.css deleted file mode 100644 index d48417fa..00000000 --- a/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-colorpicker.min.css +++ /dev/null @@ -1,9 +0,0 @@ -/*! - * Bootstrap Colorpicker - * http://mjolnic.github.io/bootstrap-colorpicker/ - * - * Originally written by (c) 2012 Stefan Petre - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0.txt - * - */.colorpicker-saturation{float:left;width:100px;height:100px;cursor:crosshair;background-image:url("../img/bootstrap-colorpicker/saturation.png")}.colorpicker-saturation i{position:absolute;top:0;left:0;display:block;width:5px;height:5px;margin:-4px 0 0 -4px;border:1px solid #000;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.colorpicker-saturation i b{display:block;width:5px;height:5px;border:1px solid #fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.colorpicker-hue,.colorpicker-alpha{float:left;width:15px;height:100px;margin-bottom:4px;margin-left:4px;cursor:row-resize}.colorpicker-hue i,.colorpicker-alpha i{position:absolute;top:0;left:0;display:block;width:100%;height:1px;margin-top:-1px;background:#000;border-top:1px solid #fff}.colorpicker-hue{background-image:url("../img/bootstrap-colorpicker/hue.png")}.colorpicker-alpha{display:none;background-image:url("../img/bootstrap-colorpicker/alpha.png")}.colorpicker{top:0;left:0;z-index:2500;min-width:130px;padding:4px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1}.colorpicker:before,.colorpicker:after{display:table;line-height:0;content:""}.colorpicker:after{clear:both}.colorpicker:before{position:absolute;top:-7px;left:6px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.colorpicker:after{position:absolute;top:-6px;left:7px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.colorpicker div{position:relative}.colorpicker.colorpicker-with-alpha{min-width:140px}.colorpicker.colorpicker-with-alpha .colorpicker-alpha{display:block}.colorpicker-color{height:10px;margin-top:5px;clear:both;background-image:url("../img/bootstrap-colorpicker/alpha.png");background-position:0 100%}.colorpicker-color div{height:10px}.colorpicker-element .input-group-addon i{display:block;width:16px;height:16px;cursor:pointer}.colorpicker.colorpicker-inline{position:relative;display:inline-block;float:none}.colorpicker.colorpicker-horizontal{width:110px;height:auto;min-width:110px}.colorpicker.colorpicker-horizontal .colorpicker-saturation{margin-bottom:4px}.colorpicker.colorpicker-horizontal .colorpicker-color{width:100px}.colorpicker.colorpicker-horizontal .colorpicker-hue,.colorpicker.colorpicker-horizontal .colorpicker-alpha{float:left;width:100px;height:15px;margin-bottom:4px;margin-left:0;cursor:col-resize}.colorpicker.colorpicker-horizontal .colorpicker-hue i,.colorpicker.colorpicker-horizontal .colorpicker-alpha i{position:absolute;top:0;left:0;display:block;width:1px;height:15px;margin-top:0;background:#fff;border:0}.colorpicker.colorpicker-horizontal .colorpicker-hue{background-image:url("../img/bootstrap-colorpicker/hue-horizontal.png")}.colorpicker.colorpicker-horizontal .colorpicker-alpha{background-image:url("../img/bootstrap-colorpicker/alpha-horizontal.png")}.colorpicker.colorpicker-hidden{display:none}.colorpicker.colorpicker-visible{display:block}.colorpicker-inline.colorpicker-visible{display:inline-block} \ No newline at end of file diff --git a/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-theme.css b/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-theme.css deleted file mode 100644 index a4069929..00000000 --- a/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-theme.css +++ /dev/null @@ -1,347 +0,0 @@ -/*! - * Bootstrap v3.1.1 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ - -.btn-default, -.btn-primary, -.btn-success, -.btn-info, -.btn-warning, -.btn-danger { - text-shadow: 0 -1px 0 rgba(0, 0, 0, .2); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075); -} -.btn-default:active, -.btn-primary:active, -.btn-success:active, -.btn-info:active, -.btn-warning:active, -.btn-danger:active, -.btn-default.active, -.btn-primary.active, -.btn-success.active, -.btn-info.active, -.btn-warning.active, -.btn-danger.active { - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); -} -.btn:active, -.btn.active { - background-image: none; -} -.btn-default { - text-shadow: 0 1px 0 #fff; - background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%); - background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - background-repeat: repeat-x; - border-color: #dbdbdb; - border-color: #ccc; -} -.btn-default:hover, -.btn-default:focus { - background-color: #e0e0e0; - background-position: 0 -15px; -} -.btn-default:active, -.btn-default.active { - background-color: #e0e0e0; - border-color: #dbdbdb; -} -.btn-primary { - background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%); - background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - background-repeat: repeat-x; - border-color: #2b669a; -} -.btn-primary:hover, -.btn-primary:focus { - background-color: #2d6ca2; - background-position: 0 -15px; -} -.btn-primary:active, -.btn-primary.active { - background-color: #2d6ca2; - border-color: #2b669a; -} -.btn-success { - background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%); - background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - background-repeat: repeat-x; - border-color: #3e8f3e; -} -.btn-success:hover, -.btn-success:focus { - background-color: #419641; - background-position: 0 -15px; -} -.btn-success:active, -.btn-success.active { - background-color: #419641; - border-color: #3e8f3e; -} -.btn-info { - background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%); - background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - background-repeat: repeat-x; - border-color: #28a4c9; -} -.btn-info:hover, -.btn-info:focus { - background-color: #2aabd2; - background-position: 0 -15px; -} -.btn-info:active, -.btn-info.active { - background-color: #2aabd2; - border-color: #28a4c9; -} -.btn-warning { - background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%); - background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - background-repeat: repeat-x; - border-color: #e38d13; -} -.btn-warning:hover, -.btn-warning:focus { - background-color: #eb9316; - background-position: 0 -15px; -} -.btn-warning:active, -.btn-warning.active { - background-color: #eb9316; - border-color: #e38d13; -} -.btn-danger { - background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%); - background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - background-repeat: repeat-x; - border-color: #b92c28; -} -.btn-danger:hover, -.btn-danger:focus { - background-color: #c12e2a; - background-position: 0 -15px; -} -.btn-danger:active, -.btn-danger.active { - background-color: #c12e2a; - border-color: #b92c28; -} -.thumbnail, -.img-thumbnail { - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075); - box-shadow: 0 1px 2px rgba(0, 0, 0, .075); -} -.dropdown-menu > li > a:hover, -.dropdown-menu > li > a:focus { - background-color: #e8e8e8; - background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%); - background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0); - background-repeat: repeat-x; -} -.dropdown-menu > .active > a, -.dropdown-menu > .active > a:hover, -.dropdown-menu > .active > a:focus { - background-color: #357ebd; - background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%); - background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); - background-repeat: repeat-x; -} -.navbar-default { - background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%); - background-image: linear-gradient(to bottom, #fff 0%, #f8f8f8 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - background-repeat: repeat-x; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075); -} -.navbar-default .navbar-nav > .active > a { - background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%); - background-image: linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0); - background-repeat: repeat-x; - -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075); - box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075); -} -.navbar-brand, -.navbar-nav > li > a { - text-shadow: 0 1px 0 rgba(255, 255, 255, .25); -} -.navbar-inverse { - background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%); - background-image: linear-gradient(to bottom, #3c3c3c 0%, #222 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - background-repeat: repeat-x; -} -.navbar-inverse .navbar-nav > .active > a { - background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%); - background-image: linear-gradient(to bottom, #222 0%, #282828 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0); - background-repeat: repeat-x; - -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25); - box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25); -} -.navbar-inverse .navbar-brand, -.navbar-inverse .navbar-nav > li > a { - text-shadow: 0 -1px 0 rgba(0, 0, 0, .25); -} -.navbar-static-top, -.navbar-fixed-top, -.navbar-fixed-bottom { - border-radius: 0; -} -.alert { - text-shadow: 0 1px 0 rgba(255, 255, 255, .2); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05); -} -.alert-success { - background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%); - background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0); - background-repeat: repeat-x; - border-color: #b2dba1; -} -.alert-info { - background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%); - background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0); - background-repeat: repeat-x; - border-color: #9acfea; -} -.alert-warning { - background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%); - background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0); - background-repeat: repeat-x; - border-color: #f5e79e; -} -.alert-danger { - background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%); - background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0); - background-repeat: repeat-x; - border-color: #dca7a7; -} -.progress { - background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%); - background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0); - background-repeat: repeat-x; -} -.progress-bar { - background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%); - background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0); - background-repeat: repeat-x; -} -.progress-bar-success { - background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%); - background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0); - background-repeat: repeat-x; -} -.progress-bar-info { - background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%); - background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0); - background-repeat: repeat-x; -} -.progress-bar-warning { - background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%); - background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0); - background-repeat: repeat-x; -} -.progress-bar-danger { - background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%); - background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0); - background-repeat: repeat-x; -} -.list-group { - border-radius: 4px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075); - box-shadow: 0 1px 2px rgba(0, 0, 0, .075); -} -.list-group-item.active, -.list-group-item.active:hover, -.list-group-item.active:focus { - text-shadow: 0 -1px 0 #3071a9; - background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%); - background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0); - background-repeat: repeat-x; - border-color: #3278b3; -} -.panel { - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05); - box-shadow: 0 1px 2px rgba(0, 0, 0, .05); -} -.panel-default > .panel-heading { - background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%); - background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0); - background-repeat: repeat-x; -} -.panel-primary > .panel-heading { - background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%); - background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0); - background-repeat: repeat-x; -} -.panel-success > .panel-heading { - background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%); - background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0); - background-repeat: repeat-x; -} -.panel-info > .panel-heading { - background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%); - background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0); - background-repeat: repeat-x; -} -.panel-warning > .panel-heading { - background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%); - background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0); - background-repeat: repeat-x; -} -.panel-danger > .panel-heading { - background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%); - background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0); - background-repeat: repeat-x; -} -.well { - background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%); - background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0); - background-repeat: repeat-x; - border-color: #dcdcdc; - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1); -} -/*# sourceMappingURL=bootstrap-theme.css.map */ diff --git a/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-theme.css.map b/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-theme.css.map deleted file mode 100644 index b36fc9a4..00000000 --- a/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap-theme.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["less/theme.less","less/mixins.less"],"names":[],"mappings":"AAeA;AACA;AACA;AACA;AACA;AACA;EACE,wCAAA;ECoGA,2FAAA;EACQ,mFAAA;;ADhGR,YAAC;AAAD,YAAC;AAAD,YAAC;AAAD,SAAC;AAAD,YAAC;AAAD,WAAC;AACD,YAAC;AAAD,YAAC;AAAD,YAAC;AAAD,SAAC;AAAD,YAAC;AAAD,WAAC;EC8FD,wDAAA;EACQ,gDAAA;;ADnER,IAAC;AACD,IAAC;EACC,sBAAA;;AAKJ;EC4PI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED7TA,2BAAA;EACA,qBAAA;EAyB2C,yBAAA;EAA2B,kBAAA;;AAvBtE,YAAC;AACD,YAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,YAAC;AACD,YAAC;EACC,yBAAA;EACA,qBAAA;;AAeJ;EC2PI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED7TA,2BAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,YAAC;AACD,YAAC;EACC,yBAAA;EACA,qBAAA;;AAgBJ;EC0PI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED7TA,2BAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,YAAC;AACD,YAAC;EACC,yBAAA;EACA,qBAAA;;AAiBJ;ECyPI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED7TA,2BAAA;EACA,qBAAA;;AAEA,SAAC;AACD,SAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,SAAC;AACD,SAAC;EACC,yBAAA;EACA,qBAAA;;AAkBJ;ECwPI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED7TA,2BAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,YAAC;AACD,YAAC;EACC,yBAAA;EACA,qBAAA;;AAmBJ;ECuPI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED7TA,2BAAA;EACA,qBAAA;;AAEA,WAAC;AACD,WAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,WAAC;AACD,WAAC;EACC,yBAAA;EACA,qBAAA;;AA2BJ;AACA;EC6CE,kDAAA;EACQ,0CAAA;;ADpCV,cAAe,KAAK,IAAG;AACvB,cAAe,KAAK,IAAG;ECmOnB,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EDpOF,yBAAA;;AAEF,cAAe,UAAU;AACzB,cAAe,UAAU,IAAG;AAC5B,cAAe,UAAU,IAAG;EC6NxB,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED9NF,yBAAA;;AAUF;ECiNI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EAoCF,mEAAA;EDrPA,kBAAA;ECaA,2FAAA;EACQ,mFAAA;;ADjBV,eAOE,YAAY,UAAU;EC0MpB,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EApMF,wDAAA;EACQ,gDAAA;;ADLV;AACA,WAAY,KAAK;EACf,8CAAA;;AAIF;EC+LI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EAoCF,mEAAA;;ADtOF,eAIE,YAAY,UAAU;EC2LpB,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EApMF,uDAAA;EACQ,+CAAA;;ADCV,eASE;AATF,eAUE,YAAY,KAAK;EACf,yCAAA;;AAKJ;AACA;AACA;EACE,gBAAA;;AAUF;EACE,6CAAA;EChCA,0FAAA;EACQ,kFAAA;;AD2CV;ECqJI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED5JF,qBAAA;;AAKF;ECoJI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED5JF,qBAAA;;AAMF;ECmJI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED5JF,qBAAA;;AAOF;ECkJI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED5JF,qBAAA;;AAgBF;ECyII,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADlIJ;EC+HI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADjIJ;EC8HI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADhIJ;EC6HI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;AD/HJ;EC4HI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;AD9HJ;EC2HI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADtHJ;EACE,kBAAA;EC/EA,kDAAA;EACQ,0CAAA;;ADiFV,gBAAgB;AAChB,gBAAgB,OAAO;AACvB,gBAAgB,OAAO;EACrB,6BAAA;EC4GE,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED7GF,qBAAA;;AAUF;ECjGE,iDAAA;EACQ,yCAAA;;AD0GV,cAAe;ECsFX,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADxFJ,cAAe;ECqFX,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADvFJ,cAAe;ECoFX,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADtFJ,WAAY;ECmFR,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADrFJ,cAAe;ECkFX,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADpFJ,aAAc;ECiFV,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;AD5EJ;ECyEI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED1EF,qBAAA;EC1HA,yFAAA;EACQ,iFAAA","sourcesContent":["\n//\n// Load core variables and mixins\n// --------------------------------------------------\n\n@import \"variables.less\";\n@import \"mixins.less\";\n\n\n\n//\n// Buttons\n// --------------------------------------------------\n\n// Common styles\n.btn-default,\n.btn-primary,\n.btn-success,\n.btn-info,\n.btn-warning,\n.btn-danger {\n text-shadow: 0 -1px 0 rgba(0,0,0,.2);\n @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);\n .box-shadow(@shadow);\n\n // Reset the shadow\n &:active,\n &.active {\n .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n }\n}\n\n// Mixin for generating new styles\n.btn-styles(@btn-color: #555) {\n #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%));\n .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners\n background-repeat: repeat-x;\n border-color: darken(@btn-color, 14%);\n\n &:hover,\n &:focus {\n background-color: darken(@btn-color, 12%);\n background-position: 0 -15px;\n }\n\n &:active,\n &.active {\n background-color: darken(@btn-color, 12%);\n border-color: darken(@btn-color, 14%);\n }\n}\n\n// Common styles\n.btn {\n // Remove the gradient for the pressed/active state\n &:active,\n &.active {\n background-image: none;\n }\n}\n\n// Apply the mixin to the buttons\n.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }\n.btn-primary { .btn-styles(@btn-primary-bg); }\n.btn-success { .btn-styles(@btn-success-bg); }\n.btn-info { .btn-styles(@btn-info-bg); }\n.btn-warning { .btn-styles(@btn-warning-bg); }\n.btn-danger { .btn-styles(@btn-danger-bg); }\n\n\n\n//\n// Images\n// --------------------------------------------------\n\n.thumbnail,\n.img-thumbnail {\n .box-shadow(0 1px 2px rgba(0,0,0,.075));\n}\n\n\n\n//\n// Dropdowns\n// --------------------------------------------------\n\n.dropdown-menu > li > a:hover,\n.dropdown-menu > li > a:focus {\n #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));\n background-color: darken(@dropdown-link-hover-bg, 5%);\n}\n.dropdown-menu > .active > a,\n.dropdown-menu > .active > a:hover,\n.dropdown-menu > .active > a:focus {\n #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));\n background-color: darken(@dropdown-link-active-bg, 5%);\n}\n\n\n\n//\n// Navbar\n// --------------------------------------------------\n\n// Default navbar\n.navbar-default {\n #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg);\n .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered\n border-radius: @navbar-border-radius;\n @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);\n .box-shadow(@shadow);\n\n .navbar-nav > .active > a {\n #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));\n .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));\n }\n}\n.navbar-brand,\n.navbar-nav > li > a {\n text-shadow: 0 1px 0 rgba(255,255,255,.25);\n}\n\n// Inverted navbar\n.navbar-inverse {\n #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);\n .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered\n\n .navbar-nav > .active > a {\n #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));\n .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));\n }\n\n .navbar-brand,\n .navbar-nav > li > a {\n text-shadow: 0 -1px 0 rgba(0,0,0,.25);\n }\n}\n\n// Undo rounded corners in static and fixed navbars\n.navbar-static-top,\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n border-radius: 0;\n}\n\n\n\n//\n// Alerts\n// --------------------------------------------------\n\n// Common styles\n.alert {\n text-shadow: 0 1px 0 rgba(255,255,255,.2);\n @shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05);\n .box-shadow(@shadow);\n}\n\n// Mixin for generating new styles\n.alert-styles(@color) {\n #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 7.5%));\n border-color: darken(@color, 15%);\n}\n\n// Apply the mixin to the alerts\n.alert-success { .alert-styles(@alert-success-bg); }\n.alert-info { .alert-styles(@alert-info-bg); }\n.alert-warning { .alert-styles(@alert-warning-bg); }\n.alert-danger { .alert-styles(@alert-danger-bg); }\n\n\n\n//\n// Progress bars\n// --------------------------------------------------\n\n// Give the progress background some depth\n.progress {\n #gradient > .vertical(@start-color: darken(@progress-bg, 4%); @end-color: @progress-bg)\n}\n\n// Mixin for generating new styles\n.progress-bar-styles(@color) {\n #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 10%));\n}\n\n// Apply the mixin to the progress bars\n.progress-bar { .progress-bar-styles(@progress-bar-bg); }\n.progress-bar-success { .progress-bar-styles(@progress-bar-success-bg); }\n.progress-bar-info { .progress-bar-styles(@progress-bar-info-bg); }\n.progress-bar-warning { .progress-bar-styles(@progress-bar-warning-bg); }\n.progress-bar-danger { .progress-bar-styles(@progress-bar-danger-bg); }\n\n\n\n//\n// List groups\n// --------------------------------------------------\n\n.list-group {\n border-radius: @border-radius-base;\n .box-shadow(0 1px 2px rgba(0,0,0,.075));\n}\n.list-group-item.active,\n.list-group-item.active:hover,\n.list-group-item.active:focus {\n text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);\n #gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));\n border-color: darken(@list-group-active-border, 7.5%);\n}\n\n\n\n//\n// Panels\n// --------------------------------------------------\n\n// Common styles\n.panel {\n .box-shadow(0 1px 2px rgba(0,0,0,.05));\n}\n\n// Mixin for generating new styles\n.panel-heading-styles(@color) {\n #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 5%));\n}\n\n// Apply the mixin to the panel headings only\n.panel-default > .panel-heading { .panel-heading-styles(@panel-default-heading-bg); }\n.panel-primary > .panel-heading { .panel-heading-styles(@panel-primary-heading-bg); }\n.panel-success > .panel-heading { .panel-heading-styles(@panel-success-heading-bg); }\n.panel-info > .panel-heading { .panel-heading-styles(@panel-info-heading-bg); }\n.panel-warning > .panel-heading { .panel-heading-styles(@panel-warning-heading-bg); }\n.panel-danger > .panel-heading { .panel-heading-styles(@panel-danger-heading-bg); }\n\n\n\n//\n// Wells\n// --------------------------------------------------\n\n.well {\n #gradient > .vertical(@start-color: darken(@well-bg, 5%); @end-color: @well-bg);\n border-color: darken(@well-bg, 10%);\n @shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1);\n .box-shadow(@shadow);\n}\n","//\n// Mixins\n// --------------------------------------------------\n\n\n// Utilities\n// -------------------------\n\n// Clearfix\n// Source: http://nicolasgallagher.com/micro-clearfix-hack/\n//\n// For modern browsers\n// 1. The space content is one way to avoid an Opera bug when the\n// contenteditable attribute is included anywhere else in the document.\n// Otherwise it causes space to appear at the top and bottom of elements\n// that are clearfixed.\n// 2. The use of `table` rather than `block` is only necessary if using\n// `:before` to contain the top-margins of child elements.\n.clearfix() {\n &:before,\n &:after {\n content: \" \"; // 1\n display: table; // 2\n }\n &:after {\n clear: both;\n }\n}\n\n// WebKit-style focus\n.tab-focus() {\n // Default\n outline: thin dotted;\n // WebKit\n outline: 5px auto -webkit-focus-ring-color;\n outline-offset: -2px;\n}\n\n// Center-align a block level element\n.center-block() {\n display: block;\n margin-left: auto;\n margin-right: auto;\n}\n\n// Sizing shortcuts\n.size(@width; @height) {\n width: @width;\n height: @height;\n}\n.square(@size) {\n .size(@size; @size);\n}\n\n// Placeholder text\n.placeholder(@color: @input-color-placeholder) {\n &::-moz-placeholder { color: @color; // Firefox\n opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526\n &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+\n &::-webkit-input-placeholder { color: @color; } // Safari and Chrome\n}\n\n// Text overflow\n// Requires inline-block or block for proper styling\n.text-overflow() {\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n}\n\n// CSS image replacement\n//\n// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for\n// mixins being reused as classes with the same name, this doesn't hold up. As\n// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note\n// that we cannot chain the mixins together in Less, so they are repeated.\n//\n// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757\n\n// Deprecated as of v3.0.1 (will be removed in v4)\n.hide-text() {\n font: ~\"0/0\" a;\n color: transparent;\n text-shadow: none;\n background-color: transparent;\n border: 0;\n}\n// New mixin to use as of v3.0.1\n.text-hide() {\n .hide-text();\n}\n\n\n\n// CSS3 PROPERTIES\n// --------------------------------------------------\n\n// Single side border-radius\n.border-top-radius(@radius) {\n border-top-right-radius: @radius;\n border-top-left-radius: @radius;\n}\n.border-right-radius(@radius) {\n border-bottom-right-radius: @radius;\n border-top-right-radius: @radius;\n}\n.border-bottom-radius(@radius) {\n border-bottom-right-radius: @radius;\n border-bottom-left-radius: @radius;\n}\n.border-left-radius(@radius) {\n border-bottom-left-radius: @radius;\n border-top-left-radius: @radius;\n}\n\n// Drop shadows\n//\n// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's\n// supported browsers that have box shadow capabilities now support the\n// standard `box-shadow` property.\n.box-shadow(@shadow) {\n -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1\n box-shadow: @shadow;\n}\n\n// Transitions\n.transition(@transition) {\n -webkit-transition: @transition;\n transition: @transition;\n}\n.transition-property(@transition-property) {\n -webkit-transition-property: @transition-property;\n transition-property: @transition-property;\n}\n.transition-delay(@transition-delay) {\n -webkit-transition-delay: @transition-delay;\n transition-delay: @transition-delay;\n}\n.transition-duration(@transition-duration) {\n -webkit-transition-duration: @transition-duration;\n transition-duration: @transition-duration;\n}\n.transition-transform(@transition) {\n -webkit-transition: -webkit-transform @transition;\n -moz-transition: -moz-transform @transition;\n -o-transition: -o-transform @transition;\n transition: transform @transition;\n}\n\n// Transformations\n.rotate(@degrees) {\n -webkit-transform: rotate(@degrees);\n -ms-transform: rotate(@degrees); // IE9 only\n transform: rotate(@degrees);\n}\n.scale(@ratio; @ratio-y...) {\n -webkit-transform: scale(@ratio, @ratio-y);\n -ms-transform: scale(@ratio, @ratio-y); // IE9 only\n transform: scale(@ratio, @ratio-y);\n}\n.translate(@x; @y) {\n -webkit-transform: translate(@x, @y);\n -ms-transform: translate(@x, @y); // IE9 only\n transform: translate(@x, @y);\n}\n.skew(@x; @y) {\n -webkit-transform: skew(@x, @y);\n -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+\n transform: skew(@x, @y);\n}\n.translate3d(@x; @y; @z) {\n -webkit-transform: translate3d(@x, @y, @z);\n transform: translate3d(@x, @y, @z);\n}\n\n.rotateX(@degrees) {\n -webkit-transform: rotateX(@degrees);\n -ms-transform: rotateX(@degrees); // IE9 only\n transform: rotateX(@degrees);\n}\n.rotateY(@degrees) {\n -webkit-transform: rotateY(@degrees);\n -ms-transform: rotateY(@degrees); // IE9 only\n transform: rotateY(@degrees);\n}\n.perspective(@perspective) {\n -webkit-perspective: @perspective;\n -moz-perspective: @perspective;\n perspective: @perspective;\n}\n.perspective-origin(@perspective) {\n -webkit-perspective-origin: @perspective;\n -moz-perspective-origin: @perspective;\n perspective-origin: @perspective;\n}\n.transform-origin(@origin) {\n -webkit-transform-origin: @origin;\n -moz-transform-origin: @origin;\n -ms-transform-origin: @origin; // IE9 only\n transform-origin: @origin;\n}\n\n// Animations\n.animation(@animation) {\n -webkit-animation: @animation;\n animation: @animation;\n}\n.animation-name(@name) {\n -webkit-animation-name: @name;\n animation-name: @name;\n}\n.animation-duration(@duration) {\n -webkit-animation-duration: @duration;\n animation-duration: @duration;\n}\n.animation-timing-function(@timing-function) {\n -webkit-animation-timing-function: @timing-function;\n animation-timing-function: @timing-function;\n}\n.animation-delay(@delay) {\n -webkit-animation-delay: @delay;\n animation-delay: @delay;\n}\n.animation-iteration-count(@iteration-count) {\n -webkit-animation-iteration-count: @iteration-count;\n animation-iteration-count: @iteration-count;\n}\n.animation-direction(@direction) {\n -webkit-animation-direction: @direction;\n animation-direction: @direction;\n}\n\n// Backface visibility\n// Prevent browsers from flickering when using CSS 3D transforms.\n// Default value is `visible`, but can be changed to `hidden`\n.backface-visibility(@visibility){\n -webkit-backface-visibility: @visibility;\n -moz-backface-visibility: @visibility;\n backface-visibility: @visibility;\n}\n\n// Box sizing\n.box-sizing(@boxmodel) {\n -webkit-box-sizing: @boxmodel;\n -moz-box-sizing: @boxmodel;\n box-sizing: @boxmodel;\n}\n\n// User select\n// For selecting text on the page\n.user-select(@select) {\n -webkit-user-select: @select;\n -moz-user-select: @select;\n -ms-user-select: @select; // IE10+\n user-select: @select;\n}\n\n// Resize anything\n.resizable(@direction) {\n resize: @direction; // Options: horizontal, vertical, both\n overflow: auto; // Safari fix\n}\n\n// CSS3 Content Columns\n.content-columns(@column-count; @column-gap: @grid-gutter-width) {\n -webkit-column-count: @column-count;\n -moz-column-count: @column-count;\n column-count: @column-count;\n -webkit-column-gap: @column-gap;\n -moz-column-gap: @column-gap;\n column-gap: @column-gap;\n}\n\n// Optional hyphenation\n.hyphens(@mode: auto) {\n word-wrap: break-word;\n -webkit-hyphens: @mode;\n -moz-hyphens: @mode;\n -ms-hyphens: @mode; // IE10+\n -o-hyphens: @mode;\n hyphens: @mode;\n}\n\n// Opacity\n.opacity(@opacity) {\n opacity: @opacity;\n // IE8 filter\n @opacity-ie: (@opacity * 100);\n filter: ~\"alpha(opacity=@{opacity-ie})\";\n}\n\n\n\n// GRADIENTS\n// --------------------------------------------------\n\n#gradient {\n\n // Horizontal gradient, from left to right\n //\n // Creates two color stops, start and end, by specifying a color and position for each color stop.\n // Color stops are not available in IE9 and below.\n .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1-6, Chrome 10+\n background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n background-repeat: repeat-x;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down\n }\n\n // Vertical gradient, from top to bottom\n //\n // Creates two color stops, start and end, by specifying a color and position for each color stop.\n // Color stops are not available in IE9 and below.\n .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+\n background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n background-repeat: repeat-x;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down\n }\n\n .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {\n background-repeat: repeat-x;\n background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+\n background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n }\n .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);\n background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);\n background-repeat: no-repeat;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n }\n .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n background-repeat: no-repeat;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n }\n .radial(@inner-color: #555; @outer-color: #333) {\n background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);\n background-image: radial-gradient(circle, @inner-color, @outer-color);\n background-repeat: no-repeat;\n }\n .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {\n background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n }\n}\n\n// Reset filters for IE\n//\n// When you need to remove a gradient background, do not forget to use this to reset\n// the IE filter for IE9 and below.\n.reset-filter() {\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(enabled = false)\"));\n}\n\n\n\n// Retina images\n//\n// Short retina mixin for setting background-image and -size\n\n.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {\n background-image: url(\"@{file-1x}\");\n\n @media\n only screen and (-webkit-min-device-pixel-ratio: 2),\n only screen and ( min--moz-device-pixel-ratio: 2),\n only screen and ( -o-min-device-pixel-ratio: 2/1),\n only screen and ( min-device-pixel-ratio: 2),\n only screen and ( min-resolution: 192dpi),\n only screen and ( min-resolution: 2dppx) {\n background-image: url(\"@{file-2x}\");\n background-size: @width-1x @height-1x;\n }\n}\n\n\n// Responsive image\n//\n// Keep images from scaling beyond the width of their parents.\n\n.img-responsive(@display: block) {\n display: @display;\n max-width: 100%; // Part 1: Set a maximum relative to the parent\n height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching\n}\n\n\n// COMPONENT MIXINS\n// --------------------------------------------------\n\n// Horizontal dividers\n// -------------------------\n// Dividers (basically an hr) within dropdowns and nav lists\n.nav-divider(@color: #e5e5e5) {\n height: 1px;\n margin: ((@line-height-computed / 2) - 1) 0;\n overflow: hidden;\n background-color: @color;\n}\n\n// Panels\n// -------------------------\n.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {\n border-color: @border;\n\n & > .panel-heading {\n color: @heading-text-color;\n background-color: @heading-bg-color;\n border-color: @heading-border;\n\n + .panel-collapse .panel-body {\n border-top-color: @border;\n }\n }\n & > .panel-footer {\n + .panel-collapse .panel-body {\n border-bottom-color: @border;\n }\n }\n}\n\n// Alerts\n// -------------------------\n.alert-variant(@background; @border; @text-color) {\n background-color: @background;\n border-color: @border;\n color: @text-color;\n\n hr {\n border-top-color: darken(@border, 5%);\n }\n .alert-link {\n color: darken(@text-color, 10%);\n }\n}\n\n// Tables\n// -------------------------\n.table-row-variant(@state; @background) {\n // Exact selectors below required to override `.table-striped` and prevent\n // inheritance to nested tables.\n .table > thead > tr,\n .table > tbody > tr,\n .table > tfoot > tr {\n > td.@{state},\n > th.@{state},\n &.@{state} > td,\n &.@{state} > th {\n background-color: @background;\n }\n }\n\n // Hover states for `.table-hover`\n // Note: this is not available for cells or rows within `thead` or `tfoot`.\n .table-hover > tbody > tr {\n > td.@{state}:hover,\n > th.@{state}:hover,\n &.@{state}:hover > td,\n &.@{state}:hover > th {\n background-color: darken(@background, 5%);\n }\n }\n}\n\n// List Groups\n// -------------------------\n.list-group-item-variant(@state; @background; @color) {\n .list-group-item-@{state} {\n color: @color;\n background-color: @background;\n\n a& {\n color: @color;\n\n .list-group-item-heading { color: inherit; }\n\n &:hover,\n &:focus {\n color: @color;\n background-color: darken(@background, 5%);\n }\n &.active,\n &.active:hover,\n &.active:focus {\n color: #fff;\n background-color: @color;\n border-color: @color;\n }\n }\n }\n}\n\n// Button variants\n// -------------------------\n// Easily pump out default styles, as well as :hover, :focus, :active,\n// and disabled options for all buttons\n.button-variant(@color; @background; @border) {\n color: @color;\n background-color: @background;\n border-color: @border;\n\n &:hover,\n &:focus,\n &:active,\n &.active,\n .open .dropdown-toggle& {\n color: @color;\n background-color: darken(@background, 8%);\n border-color: darken(@border, 12%);\n }\n &:active,\n &.active,\n .open .dropdown-toggle& {\n background-image: none;\n }\n &.disabled,\n &[disabled],\n fieldset[disabled] & {\n &,\n &:hover,\n &:focus,\n &:active,\n &.active {\n background-color: @background;\n border-color: @border;\n }\n }\n\n .badge {\n color: @background;\n background-color: @color;\n }\n}\n\n// Button sizes\n// -------------------------\n.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n padding: @padding-vertical @padding-horizontal;\n font-size: @font-size;\n line-height: @line-height;\n border-radius: @border-radius;\n}\n\n// Pagination\n// -------------------------\n.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {\n > li {\n > a,\n > span {\n padding: @padding-vertical @padding-horizontal;\n font-size: @font-size;\n }\n &:first-child {\n > a,\n > span {\n .border-left-radius(@border-radius);\n }\n }\n &:last-child {\n > a,\n > span {\n .border-right-radius(@border-radius);\n }\n }\n }\n}\n\n// Labels\n// -------------------------\n.label-variant(@color) {\n background-color: @color;\n &[href] {\n &:hover,\n &:focus {\n background-color: darken(@color, 10%);\n }\n }\n}\n\n// Contextual backgrounds\n// -------------------------\n.bg-variant(@color) {\n background-color: @color;\n a&:hover {\n background-color: darken(@color, 10%);\n }\n}\n\n// Typography\n// -------------------------\n.text-emphasis-variant(@color) {\n color: @color;\n a&:hover {\n color: darken(@color, 10%);\n }\n}\n\n// Navbar vertical align\n// -------------------------\n// Vertically center elements in the navbar.\n// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin.\n.navbar-vertical-align(@element-height) {\n margin-top: ((@navbar-height - @element-height) / 2);\n margin-bottom: ((@navbar-height - @element-height) / 2);\n}\n\n// Progress bars\n// -------------------------\n.progress-bar-variant(@color) {\n background-color: @color;\n .progress-striped & {\n #gradient > .striped();\n }\n}\n\n// Responsive utilities\n// -------------------------\n// More easily include all the states for responsive-utilities.less.\n.responsive-visibility() {\n display: block !important;\n table& { display: table; }\n tr& { display: table-row !important; }\n th&,\n td& { display: table-cell !important; }\n}\n\n.responsive-invisibility() {\n display: none !important;\n}\n\n\n// Grid System\n// -----------\n\n// Centered container element\n.container-fixed() {\n margin-right: auto;\n margin-left: auto;\n padding-left: (@grid-gutter-width / 2);\n padding-right: (@grid-gutter-width / 2);\n &:extend(.clearfix all);\n}\n\n// Creates a wrapper for a series of columns\n.make-row(@gutter: @grid-gutter-width) {\n margin-left: (@gutter / -2);\n margin-right: (@gutter / -2);\n &:extend(.clearfix all);\n}\n\n// Generate the extra small columns\n.make-xs-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n float: left;\n width: percentage((@columns / @grid-columns));\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n}\n.make-xs-column-offset(@columns) {\n @media (min-width: @screen-xs-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-xs-column-push(@columns) {\n @media (min-width: @screen-xs-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-xs-column-pull(@columns) {\n @media (min-width: @screen-xs-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Generate the small columns\n.make-sm-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n\n @media (min-width: @screen-sm-min) {\n float: left;\n width: percentage((@columns / @grid-columns));\n }\n}\n.make-sm-column-offset(@columns) {\n @media (min-width: @screen-sm-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-sm-column-push(@columns) {\n @media (min-width: @screen-sm-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-sm-column-pull(@columns) {\n @media (min-width: @screen-sm-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Generate the medium columns\n.make-md-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n\n @media (min-width: @screen-md-min) {\n float: left;\n width: percentage((@columns / @grid-columns));\n }\n}\n.make-md-column-offset(@columns) {\n @media (min-width: @screen-md-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-md-column-push(@columns) {\n @media (min-width: @screen-md-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-md-column-pull(@columns) {\n @media (min-width: @screen-md-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Generate the large columns\n.make-lg-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n\n @media (min-width: @screen-lg-min) {\n float: left;\n width: percentage((@columns / @grid-columns));\n }\n}\n.make-lg-column-offset(@columns) {\n @media (min-width: @screen-lg-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-lg-column-push(@columns) {\n @media (min-width: @screen-lg-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-lg-column-pull(@columns) {\n @media (min-width: @screen-lg-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Framework grid generation\n//\n// Used only by Bootstrap to generate the correct number of grid classes given\n// any value of `@grid-columns`.\n\n.make-grid-columns() {\n // Common styles for all sizes of grid columns, widths 1-12\n .col(@index) when (@index = 1) { // initial\n @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n .col((@index + 1), @item);\n }\n .col(@index, @list) when (@index =< @grid-columns) { // general; \"=<\" isn't a typo\n @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n .col((@index + 1), ~\"@{list}, @{item}\");\n }\n .col(@index, @list) when (@index > @grid-columns) { // terminal\n @{list} {\n position: relative;\n // Prevent columns from collapsing when empty\n min-height: 1px;\n // Inner gutter via padding\n padding-left: (@grid-gutter-width / 2);\n padding-right: (@grid-gutter-width / 2);\n }\n }\n .col(1); // kickstart it\n}\n\n.float-grid-columns(@class) {\n .col(@index) when (@index = 1) { // initial\n @item: ~\".col-@{class}-@{index}\";\n .col((@index + 1), @item);\n }\n .col(@index, @list) when (@index =< @grid-columns) { // general\n @item: ~\".col-@{class}-@{index}\";\n .col((@index + 1), ~\"@{list}, @{item}\");\n }\n .col(@index, @list) when (@index > @grid-columns) { // terminal\n @{list} {\n float: left;\n }\n }\n .col(1); // kickstart it\n}\n\n.calc-grid-column(@index, @class, @type) when (@type = width) and (@index > 0) {\n .col-@{class}-@{index} {\n width: percentage((@index / @grid-columns));\n }\n}\n.calc-grid-column(@index, @class, @type) when (@type = push) {\n .col-@{class}-push-@{index} {\n left: percentage((@index / @grid-columns));\n }\n}\n.calc-grid-column(@index, @class, @type) when (@type = pull) {\n .col-@{class}-pull-@{index} {\n right: percentage((@index / @grid-columns));\n }\n}\n.calc-grid-column(@index, @class, @type) when (@type = offset) {\n .col-@{class}-offset-@{index} {\n margin-left: percentage((@index / @grid-columns));\n }\n}\n\n// Basic looping in LESS\n.loop-grid-columns(@index, @class, @type) when (@index >= 0) {\n .calc-grid-column(@index, @class, @type);\n // next iteration\n .loop-grid-columns((@index - 1), @class, @type);\n}\n\n// Create grid for specific class\n.make-grid(@class) {\n .float-grid-columns(@class);\n .loop-grid-columns(@grid-columns, @class, width);\n .loop-grid-columns(@grid-columns, @class, pull);\n .loop-grid-columns(@grid-columns, @class, push);\n .loop-grid-columns(@grid-columns, @class, offset);\n}\n\n// Form validation states\n//\n// Used in forms.less to generate the form validation CSS for warnings, errors,\n// and successes.\n\n.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {\n // Color the label and help text\n .help-block,\n .control-label,\n .radio,\n .checkbox,\n .radio-inline,\n .checkbox-inline {\n color: @text-color;\n }\n // Set the border and box shadow on specific inputs to match\n .form-control {\n border-color: @border-color;\n .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work\n &:focus {\n border-color: darken(@border-color, 10%);\n @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);\n .box-shadow(@shadow);\n }\n }\n // Set validation states also for addons\n .input-group-addon {\n color: @text-color;\n border-color: @border-color;\n background-color: @background-color;\n }\n // Optional feedback icon\n .form-control-feedback {\n color: @text-color;\n }\n}\n\n// Form control focus state\n//\n// Generate a customized focus state and for any input with the specified color,\n// which defaults to the `@input-focus-border` variable.\n//\n// We highly encourage you to not customize the default value, but instead use\n// this to tweak colors on an as-needed basis. This aesthetic change is based on\n// WebKit's default styles, but applicable to a wider range of browsers. Its\n// usability and accessibility should be taken into account with any change.\n//\n// Example usage: change the default blue border and shadow to white for better\n// contrast against a dark gray background.\n\n.form-control-focus(@color: @input-border-focus) {\n @color-rgba: rgba(red(@color), green(@color), blue(@color), .6);\n &:focus {\n border-color: @color;\n outline: 0;\n .box-shadow(~\"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}\");\n }\n}\n\n// Form control sizing\n//\n// Relative text size, padding, and border-radii changes for form controls. For\n// horizontal sizing, wrap controls in the predefined grid classes. ``\n// element gets special love because it's special, and that's a fact!\n\n.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n height: @input-height;\n padding: @padding-vertical @padding-horizontal;\n font-size: @font-size;\n line-height: @line-height;\n border-radius: @border-radius;\n\n select& {\n height: @input-height;\n line-height: @input-height;\n }\n\n textarea&,\n select[multiple]& {\n height: auto;\n }\n}\n","//\n// Variables\n// --------------------------------------------------\n\n\n//== Colors\n//\n//## Gray and brand colors for use across Bootstrap.\n\n@gray-darker: lighten(#000, 13.5%); // #222\n@gray-dark: lighten(#000, 20%); // #333\n@gray: lighten(#000, 33.5%); // #555\n@gray-light: lighten(#000, 60%); // #999\n@gray-lighter: lighten(#000, 93.5%); // #eee\n\n@brand-primary: #428bca;\n@brand-success: #5cb85c;\n@brand-info: #5bc0de;\n@brand-warning: #f0ad4e;\n@brand-danger: #d9534f;\n\n\n//== Scaffolding\n//\n// ## Settings for some of the most global styles.\n\n//** Background color for ``.\n@body-bg: #fff;\n//** Global text color on ``.\n@text-color: @gray-dark;\n\n//** Global textual link color.\n@link-color: @brand-primary;\n//** Link hover color set via `darken()` function.\n@link-hover-color: darken(@link-color, 15%);\n\n\n//== Typography\n//\n//## Font, line-height, and color for body text, headings, and more.\n\n@font-family-sans-serif: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n@font-family-serif: Georgia, \"Times New Roman\", Times, serif;\n//** Default monospace fonts for ``, ``, and `
`.\n@font-family-monospace:   Menlo, Monaco, Consolas, \"Courier New\", monospace;\n@font-family-base:        @font-family-sans-serif;\n\n@font-size-base:          13px;\n@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px\n@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px\n\n@font-size-h1:            floor((@font-size-base * 2.6)); // ~36px\n@font-size-h2:            floor((@font-size-base * 2.15)); // ~30px\n@font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px\n@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px\n@font-size-h5:            @font-size-base;\n@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px\n\n//** Unit-less `line-height` for use in components like buttons.\n@line-height-base:        1.428571429; // 20/14\n//** Computed \"line-height\" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.\n@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px\n\n//** By default, this inherits from the ``.\n@headings-font-family:    inherit;\n@headings-font-weight:    500;\n@headings-line-height:    1.1;\n@headings-color:          inherit;\n\n\n//-- Iconography\n//\n//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.\n\n@icon-font-path:          \"../fonts/\";\n@icon-font-name:          \"glyphicons-halflings-regular\";\n@icon-font-svg-id:        \"glyphicons_halflingsregular\";\n\n//== Components\n//\n//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).\n\n@padding-base-vertical:     6px;\n@padding-base-horizontal:   12px;\n\n@padding-large-vertical:    10px;\n@padding-large-horizontal:  16px;\n\n@padding-small-vertical:    5px;\n@padding-small-horizontal:  10px;\n\n@padding-xs-vertical:       1px;\n@padding-xs-horizontal:     5px;\n\n@line-height-large:         1.33;\n@line-height-small:         1.5;\n\n@border-radius-base:        4px;\n@border-radius-large:       6px;\n@border-radius-small:       3px;\n\n//** Global color for active items (e.g., navs or dropdowns).\n@component-active-color:    #fff;\n//** Global background color for active items (e.g., navs or dropdowns).\n@component-active-bg:       @brand-primary;\n\n//** Width of the `border` for generating carets that indicator dropdowns.\n@caret-width-base:          4px;\n//** Carets increase slightly in size for larger components.\n@caret-width-large:         5px;\n\n\n//== Tables\n//\n//## Customizes the `.table` component with basic values, each used across all table variations.\n\n//** Padding for ``s and ``s.\n@table-cell-padding:            8px;\n//** Padding for cells in `.table-condensed`.\n@table-condensed-cell-padding:  5px;\n\n//** Default background color used for all tables.\n@table-bg:                      transparent;\n//** Background color used for `.table-striped`.\n@table-bg-accent:               #f9f9f9;\n//** Background color used for `.table-hover`.\n@table-bg-hover:                #f5f5f5;\n@table-bg-active:               @table-bg-hover;\n\n//** Border color for table and cell borders.\n@table-border-color:            #ddd;\n\n\n//== Buttons\n//\n//## For each of Bootstrap's buttons, define text, background and border color.\n\n@btn-font-weight:                normal;\n\n@btn-default-color:              #333;\n@btn-default-bg:                 #fff;\n@btn-default-border:             #ccc;\n\n@btn-primary-color:              #fff;\n@btn-primary-bg:                 @brand-primary;\n@btn-primary-border:             darken(@btn-primary-bg, 5%);\n\n@btn-success-color:              #fff;\n@btn-success-bg:                 @brand-success;\n@btn-success-border:             darken(@btn-success-bg, 5%);\n\n@btn-info-color:                 #fff;\n@btn-info-bg:                    @brand-info;\n@btn-info-border:                darken(@btn-info-bg, 5%);\n\n@btn-warning-color:              #fff;\n@btn-warning-bg:                 @brand-warning;\n@btn-warning-border:             darken(@btn-warning-bg, 5%);\n\n@btn-danger-color:               #fff;\n@btn-danger-bg:                  @brand-danger;\n@btn-danger-border:              darken(@btn-danger-bg, 5%);\n\n@btn-link-disabled-color:        @gray-light;\n\n\n//== Forms\n//\n//##\n\n//** `` background color\n@input-bg:                       #fff;\n//** `` background color\n@input-bg-disabled:              @gray-lighter;\n\n//** Text color for ``s\n@input-color:                    @gray;\n//** `` border color\n@input-border:                   #ccc;\n//** `` border radius\n@input-border-radius:            @border-radius-base;\n//** Border color for inputs on focus\n@input-border-focus:             #66afe9;\n\n//** Placeholder text color\n@input-color-placeholder:        @gray-light;\n\n//** Default `.form-control` height\n@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);\n//** Large `.form-control` height\n@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);\n//** Small `.form-control` height\n@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);\n\n@legend-color:                   @gray-dark;\n@legend-border-color:            #e5e5e5;\n\n//** Background color for textual input addons\n@input-group-addon-bg:           @gray-lighter;\n//** Border color for textual input addons\n@input-group-addon-border-color: @input-border;\n\n\n//== Dropdowns\n//\n//## Dropdown menu container and contents.\n\n//** Background for the dropdown menu.\n@dropdown-bg:                    #fff;\n//** Dropdown menu `border-color`.\n@dropdown-border:                rgba(0,0,0,.15);\n//** Dropdown menu `border-color` **for IE8**.\n@dropdown-fallback-border:       #ccc;\n//** Divider color for between dropdown items.\n@dropdown-divider-bg:            #e5e5e5;\n\n//** Dropdown link text color.\n@dropdown-link-color:            @gray-dark;\n//** Hover color for dropdown links.\n@dropdown-link-hover-color:      darken(@gray-dark, 5%);\n//** Hover background for dropdown links.\n@dropdown-link-hover-bg:         #f5f5f5;\n\n//** Active dropdown menu item text color.\n@dropdown-link-active-color:     @component-active-color;\n//** Active dropdown menu item background color.\n@dropdown-link-active-bg:        @component-active-bg;\n\n//** Disabled dropdown menu item background color.\n@dropdown-link-disabled-color:   @gray-light;\n\n//** Text color for headers within dropdown menus.\n@dropdown-header-color:          @gray-light;\n\n// Note: Deprecated @dropdown-caret-color as of v3.1.0\n@dropdown-caret-color:           #000;\n\n\n//-- Z-index master list\n//\n// Warning: Avoid customizing these values. They're used for a bird's eye view\n// of components dependent on the z-axis and are designed to all work together.\n//\n// Note: These variables are not generated into the Customizer.\n\n@zindex-navbar:            1000;\n@zindex-dropdown:          1000;\n@zindex-popover:           1010;\n@zindex-tooltip:           1030;\n@zindex-navbar-fixed:      1030;\n@zindex-modal-background:  1040;\n@zindex-modal:             1050;\n\n\n//== Media queries breakpoints\n//\n//## Define the breakpoints at which your layout will change, adapting to different screen sizes.\n\n// Extra small screen / phone\n// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1\n@screen-xs:                  480px;\n@screen-xs-min:              @screen-xs;\n@screen-phone:               @screen-xs-min;\n\n// Small screen / tablet\n// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1\n@screen-sm:                  768px;\n@screen-sm-min:              @screen-sm;\n@screen-tablet:              @screen-sm-min;\n\n// Medium screen / desktop\n// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1\n@screen-md:                  992px;\n@screen-md-min:              @screen-md;\n@screen-desktop:             @screen-md-min;\n\n// Large screen / wide desktop\n// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1\n@screen-lg:                  1200px;\n@screen-lg-min:              @screen-lg;\n@screen-lg-desktop:          @screen-lg-min;\n\n// So media queries don't overlap when required, provide a maximum\n@screen-xs-max:              (@screen-sm-min - 1);\n@screen-sm-max:              (@screen-md-min - 1);\n@screen-md-max:              (@screen-lg-min - 1);\n\n\n//== Grid system\n//\n//## Define your custom responsive grid.\n\n//** Number of columns in the grid.\n@grid-columns:              12;\n//** Padding between columns. Gets divided in half for the left and right.\n@grid-gutter-width:         30px;\n// Navbar collapse\n//** Point at which the navbar becomes uncollapsed.\n@grid-float-breakpoint:     @screen-sm-min;\n//** Point at which the navbar begins collapsing.\n@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);\n\n\n//== Container sizes\n//\n//## Define the maximum width of `.container` for different screen sizes.\n\n// Small screen / tablet\n@container-tablet:             ((720px + @grid-gutter-width));\n//** For `@screen-sm-min` and up.\n@container-sm:                 @container-tablet;\n\n// Medium screen / desktop\n@container-desktop:            ((940px + @grid-gutter-width));\n//** For `@screen-md-min` and up.\n@container-md:                 @container-desktop;\n\n// Large screen / wide desktop\n@container-large-desktop:      ((1140px + @grid-gutter-width));\n//** For `@screen-lg-min` and up.\n@container-lg:                 @container-large-desktop;\n\n\n//== Navbar\n//\n//##\n\n// Basics of a navbar\n@navbar-height:                    50px;\n@navbar-margin-bottom:             @line-height-computed;\n@navbar-border-radius:             @border-radius-base;\n@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));\n@navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);\n@navbar-collapse-max-height:       340px;\n\n@navbar-default-color:             #777;\n@navbar-default-bg:                #f8f8f8;\n@navbar-default-border:            darken(@navbar-default-bg, 6.5%);\n\n// Navbar links\n@navbar-default-link-color:                #777;\n@navbar-default-link-hover-color:          #333;\n@navbar-default-link-hover-bg:             transparent;\n@navbar-default-link-active-color:         #555;\n@navbar-default-link-active-bg:            darken(@navbar-default-bg, 6.5%);\n@navbar-default-link-disabled-color:       #ccc;\n@navbar-default-link-disabled-bg:          transparent;\n\n// Navbar brand label\n@navbar-default-brand-color:               @navbar-default-link-color;\n@navbar-default-brand-hover-color:         darken(@navbar-default-brand-color, 10%);\n@navbar-default-brand-hover-bg:            transparent;\n\n// Navbar toggle\n@navbar-default-toggle-hover-bg:           #ddd;\n@navbar-default-toggle-icon-bar-bg:        #888;\n@navbar-default-toggle-border-color:       #ddd;\n\n\n// Inverted navbar\n// Reset inverted navbar basics\n@navbar-inverse-color:                      @gray-light;\n@navbar-inverse-bg:                         #222;\n@navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);\n\n// Inverted navbar links\n@navbar-inverse-link-color:                 @gray-light;\n@navbar-inverse-link-hover-color:           #fff;\n@navbar-inverse-link-hover-bg:              transparent;\n@navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;\n@navbar-inverse-link-active-bg:             darken(@navbar-inverse-bg, 10%);\n@navbar-inverse-link-disabled-color:        #444;\n@navbar-inverse-link-disabled-bg:           transparent;\n\n// Inverted navbar brand label\n@navbar-inverse-brand-color:                @navbar-inverse-link-color;\n@navbar-inverse-brand-hover-color:          #fff;\n@navbar-inverse-brand-hover-bg:             transparent;\n\n// Inverted navbar toggle\n@navbar-inverse-toggle-hover-bg:            #333;\n@navbar-inverse-toggle-icon-bar-bg:         #fff;\n@navbar-inverse-toggle-border-color:        #333;\n\n\n//== Navs\n//\n//##\n\n//=== Shared nav styles\n@nav-link-padding:                          10px 15px;\n@nav-link-hover-bg:                         @gray-lighter;\n\n@nav-disabled-link-color:                   @gray-light;\n@nav-disabled-link-hover-color:             @gray-light;\n\n@nav-open-link-hover-color:                 #fff;\n\n//== Tabs\n@nav-tabs-border-color:                     #ddd;\n\n@nav-tabs-link-hover-border-color:          @gray-lighter;\n\n@nav-tabs-active-link-hover-bg:             @body-bg;\n@nav-tabs-active-link-hover-color:          @gray;\n@nav-tabs-active-link-hover-border-color:   #ddd;\n\n@nav-tabs-justified-link-border-color:            #ddd;\n@nav-tabs-justified-active-link-border-color:     @body-bg;\n\n//== Pills\n@nav-pills-border-radius:                   @border-radius-base;\n@nav-pills-active-link-hover-bg:            @component-active-bg;\n@nav-pills-active-link-hover-color:         @component-active-color;\n\n\n//== Pagination\n//\n//##\n\n@pagination-color:                     @link-color;\n@pagination-bg:                        #fff;\n@pagination-border:                    #ddd;\n\n@pagination-hover-color:               @link-hover-color;\n@pagination-hover-bg:                  @gray-lighter;\n@pagination-hover-border:              #ddd;\n\n@pagination-active-color:              #fff;\n@pagination-active-bg:                 @brand-primary;\n@pagination-active-border:             @brand-primary;\n\n@pagination-disabled-color:            @gray-light;\n@pagination-disabled-bg:               #fff;\n@pagination-disabled-border:           #ddd;\n\n\n//== Pager\n//\n//##\n\n@pager-bg:                             @pagination-bg;\n@pager-border:                         @pagination-border;\n@pager-border-radius:                  15px;\n\n@pager-hover-bg:                       @pagination-hover-bg;\n\n@pager-active-bg:                      @pagination-active-bg;\n@pager-active-color:                   @pagination-active-color;\n\n@pager-disabled-color:                 @pagination-disabled-color;\n\n\n//== Jumbotron\n//\n//##\n\n@jumbotron-padding:              30px;\n@jumbotron-color:                inherit;\n@jumbotron-bg:                   @gray-lighter;\n@jumbotron-heading-color:        inherit;\n@jumbotron-font-size:            ceil((@font-size-base * 1.5));\n\n\n//== Form states and alerts\n//\n//## Define colors for form feedback states and, by default, alerts.\n\n@state-success-text:             #3c763d;\n@state-success-bg:               #dff0d8;\n@state-success-border:           darken(spin(@state-success-bg, -10), 5%);\n\n@state-info-text:                #31708f;\n@state-info-bg:                  #d9edf7;\n@state-info-border:              darken(spin(@state-info-bg, -10), 7%);\n\n@state-warning-text:             #8a6d3b;\n@state-warning-bg:               #fcf8e3;\n@state-warning-border:           darken(spin(@state-warning-bg, -10), 5%);\n\n@state-danger-text:              #a94442;\n@state-danger-bg:                #f2dede;\n@state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);\n\n\n//== Tooltips\n//\n//##\n\n//** Tooltip max width\n@tooltip-max-width:           200px;\n//** Tooltip text color\n@tooltip-color:               #fff;\n//** Tooltip background color\n@tooltip-bg:                  #000;\n@tooltip-opacity:             .9;\n\n//** Tooltip arrow width\n@tooltip-arrow-width:         5px;\n//** Tooltip arrow color\n@tooltip-arrow-color:         @tooltip-bg;\n\n\n//== Popovers\n//\n//##\n\n//** Popover body background color\n@popover-bg:                          #fff;\n//** Popover maximum width\n@popover-max-width:                   276px;\n//** Popover border color\n@popover-border-color:                rgba(0,0,0,.2);\n//** Popover fallback border color\n@popover-fallback-border-color:       #ccc;\n\n//** Popover title background color\n@popover-title-bg:                    darken(@popover-bg, 3%);\n\n//** Popover arrow width\n@popover-arrow-width:                 10px;\n//** Popover arrow color\n@popover-arrow-color:                 #fff;\n\n//** Popover outer arrow width\n@popover-arrow-outer-width:           (@popover-arrow-width + 1);\n//** Popover outer arrow color\n@popover-arrow-outer-color:           fadein(@popover-border-color, 5%);\n//** Popover outer arrow fallback color\n@popover-arrow-outer-fallback-color:  darken(@popover-fallback-border-color, 20%);\n\n\n//== Labels\n//\n//##\n\n//** Default label background color\n@label-default-bg:            @gray-light;\n//** Primary label background color\n@label-primary-bg:            @brand-primary;\n//** Success label background color\n@label-success-bg:            @brand-success;\n//** Info label background color\n@label-info-bg:               @brand-info;\n//** Warning label background color\n@label-warning-bg:            @brand-warning;\n//** Danger label background color\n@label-danger-bg:             @brand-danger;\n\n//** Default label text color\n@label-color:                 #fff;\n//** Default text color of a linked label\n@label-link-hover-color:      #fff;\n\n\n//== Modals\n//\n//##\n\n//** Padding applied to the modal body\n@modal-inner-padding:         20px;\n\n//** Padding applied to the modal title\n@modal-title-padding:         15px;\n//** Modal title line-height\n@modal-title-line-height:     @line-height-base;\n\n//** Background color of modal content area\n@modal-content-bg:                             #fff;\n//** Modal content border color\n@modal-content-border-color:                   rgba(0,0,0,.2);\n//** Modal content border color **for IE8**\n@modal-content-fallback-border-color:          #999;\n\n//** Modal backdrop background color\n@modal-backdrop-bg:           #000;\n//** Modal backdrop opacity\n@modal-backdrop-opacity:      .5;\n//** Modal header border color\n@modal-header-border-color:   #e5e5e5;\n//** Modal footer border color\n@modal-footer-border-color:   @modal-header-border-color;\n\n@modal-lg:                    900px;\n@modal-md:                    600px;\n@modal-sm:                    300px;\n\n\n//== Alerts\n//\n//## Define alert colors, border radius, and padding.\n\n@alert-padding:               15px;\n@alert-border-radius:         @border-radius-base;\n@alert-link-font-weight:      bold;\n\n@alert-success-bg:            @state-success-bg;\n@alert-success-text:          @state-success-text;\n@alert-success-border:        @state-success-border;\n\n@alert-info-bg:               @state-info-bg;\n@alert-info-text:             @state-info-text;\n@alert-info-border:           @state-info-border;\n\n@alert-warning-bg:            @state-warning-bg;\n@alert-warning-text:          @state-warning-text;\n@alert-warning-border:        @state-warning-border;\n\n@alert-danger-bg:             @state-danger-bg;\n@alert-danger-text:           @state-danger-text;\n@alert-danger-border:         @state-danger-border;\n\n\n//== Progress bars\n//\n//##\n\n//** Background color of the whole progress component\n@progress-bg:                 #f5f5f5;\n//** Progress bar text color\n@progress-bar-color:          #fff;\n\n//** Default progress bar color\n@progress-bar-bg:             @brand-primary;\n//** Success progress bar color\n@progress-bar-success-bg:     @brand-success;\n//** Warning progress bar color\n@progress-bar-warning-bg:     @brand-warning;\n//** Danger progress bar color\n@progress-bar-danger-bg:      @brand-danger;\n//** Info progress bar color\n@progress-bar-info-bg:        @brand-info;\n\n\n//== List group\n//\n//##\n\n//** Background color on `.list-group-item`\n@list-group-bg:                 #fff;\n//** `.list-group-item` border color\n@list-group-border:             #ddd;\n//** List group border radius\n@list-group-border-radius:      @border-radius-base;\n\n//** Background color of single list elements on hover\n@list-group-hover-bg:           #f5f5f5;\n//** Text color of active list elements\n@list-group-active-color:       @component-active-color;\n//** Background color of active list elements\n@list-group-active-bg:          @component-active-bg;\n//** Border color of active list elements\n@list-group-active-border:      @list-group-active-bg;\n@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);\n\n@list-group-link-color:         #555;\n@list-group-link-heading-color: #333;\n\n\n//== Panels\n//\n//##\n\n@panel-bg:                    #fff;\n@panel-body-padding:          15px;\n@panel-border-radius:         @border-radius-base;\n\n//** Border color for elements within panels\n@panel-inner-border:          #ddd;\n@panel-footer-bg:             #f5f5f5;\n\n@panel-default-text:          @gray-dark;\n@panel-default-border:        #ddd;\n@panel-default-heading-bg:    #f5f5f5;\n\n@panel-primary-text:          #fff;\n@panel-primary-border:        @brand-primary;\n@panel-primary-heading-bg:    @brand-primary;\n\n@panel-success-text:          @state-success-text;\n@panel-success-border:        @state-success-border;\n@panel-success-heading-bg:    @state-success-bg;\n\n@panel-info-text:             @state-info-text;\n@panel-info-border:           @state-info-border;\n@panel-info-heading-bg:       @state-info-bg;\n\n@panel-warning-text:          @state-warning-text;\n@panel-warning-border:        @state-warning-border;\n@panel-warning-heading-bg:    @state-warning-bg;\n\n@panel-danger-text:           @state-danger-text;\n@panel-danger-border:         @state-danger-border;\n@panel-danger-heading-bg:     @state-danger-bg;\n\n\n//== Thumbnails\n//\n//##\n\n//** Padding around the thumbnail image\n@thumbnail-padding:           4px;\n//** Thumbnail background color\n@thumbnail-bg:                @body-bg;\n//** Thumbnail border color\n@thumbnail-border:            #ddd;\n//** Thumbnail border radius\n@thumbnail-border-radius:     @border-radius-base;\n\n//** Custom text color for thumbnail captions\n@thumbnail-caption-color:     @text-color;\n//** Padding around the thumbnail caption\n@thumbnail-caption-padding:   9px;\n\n\n//== Wells\n//\n//##\n\n@well-bg:                     #f5f5f5;\n@well-border:                 darken(@well-bg, 7%);\n\n\n//== Badges\n//\n//##\n\n@badge-color:                 #fff;\n//** Linked badge text color on hover\n@badge-link-hover-color:      #fff;\n@badge-bg:                    @gray-light;\n\n//** Badge text color in active nav link\n@badge-active-color:          @link-color;\n//** Badge background color in active nav link\n@badge-active-bg:             #fff;\n\n@badge-font-weight:           bold;\n@badge-line-height:           1;\n@badge-border-radius:         10px;\n\n\n//== Breadcrumbs\n//\n//##\n\n@breadcrumb-padding-vertical:   8px;\n@breadcrumb-padding-horizontal: 15px;\n//** Breadcrumb background color\n@breadcrumb-bg:                 #f5f5f5;\n//** Breadcrumb text color\n@breadcrumb-color:              #ccc;\n//** Text color of current page in the breadcrumb\n@breadcrumb-active-color:       @gray-light;\n//** Textual separator for between breadcrumb elements\n@breadcrumb-separator:          \"/\";\n\n\n//== Carousel\n//\n//##\n\n@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);\n\n@carousel-control-color:                      #fff;\n@carousel-control-width:                      15%;\n@carousel-control-opacity:                    .5;\n@carousel-control-font-size:                  20px;\n\n@carousel-indicator-active-bg:                #fff;\n@carousel-indicator-border-color:             #fff;\n\n@carousel-caption-color:                      #fff;\n\n\n//== Close\n//\n//##\n\n@close-font-weight:           bold;\n@close-color:                 #000;\n@close-text-shadow:           0 1px 0 #fff;\n\n\n//== Code\n//\n//##\n\n@code-color:                  #c7254e;\n@code-bg:                     #f9f2f4;\n\n@kbd-color:                   #fff;\n@kbd-bg:                      #333;\n\n@pre-bg:                      #f5f5f5;\n@pre-color:                   @gray-dark;\n@pre-border-color:            #ccc;\n@pre-scrollable-max-height:   340px;\n\n\n//== Type\n//\n//##\n\n//** Text muted color\n@text-muted:                  @gray-light;\n//** Abbreviations and acronyms border color\n@abbr-border-color:           @gray-light;\n//** Headings small color\n@headings-small-color:        @gray-light;\n//** Blockquote small color\n@blockquote-small-color:      @gray-light;\n//** Blockquote font size\n@blockquote-font-size:        (@font-size-base * 1.25);\n//** Blockquote border color\n@blockquote-border-color:     @gray-lighter;\n//** Page header border color\n@page-header-border-color:    @gray-lighter;\n\n\n//== Miscellaneous\n//\n//##\n\n//** Horizontal line color.\n@hr-border:                   @gray-lighter;\n\n//** Horizontal offset for forms and lists.\n@component-offset-horizontal: 180px;\n","//\n// Thumbnails\n// --------------------------------------------------\n\n\n// Mixin and adjust the regular image class\n.thumbnail {\n  display: block;\n  padding: @thumbnail-padding;\n  margin-bottom: @line-height-computed;\n  line-height: @line-height-base;\n  background-color: @thumbnail-bg;\n  border: 1px solid @thumbnail-border;\n  border-radius: @thumbnail-border-radius;\n  .transition(all .2s ease-in-out);\n\n  > img,\n  a > img {\n    &:extend(.img-responsive);\n    margin-left: auto;\n    margin-right: auto;\n  }\n\n  // Add a hover state for linked versions only\n  a&:hover,\n  a&:focus,\n  a&.active {\n    border-color: @link-color;\n  }\n\n  // Image captions\n  .caption {\n    padding: @thumbnail-caption-padding;\n    color: @thumbnail-caption-color;\n  }\n}\n","//\n// Carousel\n// --------------------------------------------------\n\n\n// Wrapper for the slide container and indicators\n.carousel {\n  position: relative;\n}\n\n.carousel-inner {\n  position: relative;\n  overflow: hidden;\n  width: 100%;\n\n  > .item {\n    display: none;\n    position: relative;\n    .transition(.6s ease-in-out left);\n\n    // Account for jankitude on images\n    > img,\n    > a > img {\n      &:extend(.img-responsive);\n      line-height: 1;\n    }\n  }\n\n  > .active,\n  > .next,\n  > .prev { display: block; }\n\n  > .active {\n    left: 0;\n  }\n\n  > .next,\n  > .prev {\n    position: absolute;\n    top: 0;\n    width: 100%;\n  }\n\n  > .next {\n    left: 100%;\n  }\n  > .prev {\n    left: -100%;\n  }\n  > .next.left,\n  > .prev.right {\n    left: 0;\n  }\n\n  > .active.left {\n    left: -100%;\n  }\n  > .active.right {\n    left: 100%;\n  }\n\n}\n\n// Left/right controls for nav\n// ---------------------------\n\n.carousel-control {\n  position: absolute;\n  top: 0;\n  left: 0;\n  bottom: 0;\n  width: @carousel-control-width;\n  .opacity(@carousel-control-opacity);\n  font-size: @carousel-control-font-size;\n  color: @carousel-control-color;\n  text-align: center;\n  text-shadow: @carousel-text-shadow;\n  // We can't have this transition here because WebKit cancels the carousel\n  // animation if you trip this while in the middle of another animation.\n\n  // Set gradients for backgrounds\n  &.left {\n    #gradient > .horizontal(@start-color: rgba(0,0,0,.5); @end-color: rgba(0,0,0,.0001));\n  }\n  &.right {\n    left: auto;\n    right: 0;\n    #gradient > .horizontal(@start-color: rgba(0,0,0,.0001); @end-color: rgba(0,0,0,.5));\n  }\n\n  // Hover/focus state\n  &:hover,\n  &:focus {\n    outline: none;\n    color: @carousel-control-color;\n    text-decoration: none;\n    .opacity(.9);\n  }\n\n  // Toggles\n  .icon-prev,\n  .icon-next,\n  .glyphicon-chevron-left,\n  .glyphicon-chevron-right {\n    position: absolute;\n    top: 50%;\n    z-index: 5;\n    display: inline-block;\n  }\n  .icon-prev,\n  .glyphicon-chevron-left {\n    left: 50%;\n  }\n  .icon-next,\n  .glyphicon-chevron-right {\n    right: 50%;\n  }\n  .icon-prev,\n  .icon-next {\n    width:  20px;\n    height: 20px;\n    margin-top: -10px;\n    margin-left: -10px;\n    font-family: serif;\n  }\n\n  .icon-prev {\n    &:before {\n      content: '\\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)\n    }\n  }\n  .icon-next {\n    &:before {\n      content: '\\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)\n    }\n  }\n}\n\n// Optional indicator pips\n//\n// Add an unordered list with the following class and add a list item for each\n// slide your carousel holds.\n\n.carousel-indicators {\n  position: absolute;\n  bottom: 10px;\n  left: 50%;\n  z-index: 15;\n  width: 60%;\n  margin-left: -30%;\n  padding-left: 0;\n  list-style: none;\n  text-align: center;\n\n  li {\n    display: inline-block;\n    width:  10px;\n    height: 10px;\n    margin: 1px;\n    text-indent: -999px;\n    border: 1px solid @carousel-indicator-border-color;\n    border-radius: 10px;\n    cursor: pointer;\n\n    // IE8-9 hack for event handling\n    //\n    // Internet Explorer 8-9 does not support clicks on elements without a set\n    // `background-color`. We cannot use `filter` since that's not viewed as a\n    // background color by the browser. Thus, a hack is needed.\n    //\n    // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we\n    // set alpha transparency for the best results possible.\n    background-color: #000 \\9; // IE8\n    background-color: rgba(0,0,0,0); // IE9\n  }\n  .active {\n    margin: 0;\n    width:  12px;\n    height: 12px;\n    background-color: @carousel-indicator-active-bg;\n  }\n}\n\n// Optional captions\n// -----------------------------\n// Hidden by default for smaller viewports\n.carousel-caption {\n  position: absolute;\n  left: 15%;\n  right: 15%;\n  bottom: 20px;\n  z-index: 10;\n  padding-top: 20px;\n  padding-bottom: 20px;\n  color: @carousel-caption-color;\n  text-align: center;\n  text-shadow: @carousel-text-shadow;\n  & .btn {\n    text-shadow: none; // No shadow for button elements in carousel-caption\n  }\n}\n\n\n// Scale up controls for tablets and up\n@media screen and (min-width: @screen-sm-min) {\n\n  // Scale up the controls a smidge\n  .carousel-control {\n    .glyphicon-chevron-left,\n    .glyphicon-chevron-right,\n    .icon-prev,\n    .icon-next {\n      width: 30px;\n      height: 30px;\n      margin-top: -15px;\n      margin-left: -15px;\n      font-size: 30px;\n    }\n  }\n\n  // Show and left align the captions\n  .carousel-caption {\n    left: 20%;\n    right: 20%;\n    padding-bottom: 30px;\n  }\n\n  // Move up the indicators\n  .carousel-indicators {\n    bottom: 20px;\n  }\n}\n","//\n// Typography\n// --------------------------------------------------\n\n\n// Headings\n// -------------------------\n\nh1, h2, h3, h4, h5, h6,\n.h1, .h2, .h3, .h4, .h5, .h6 {\n  font-family: @headings-font-family;\n  font-weight: @headings-font-weight;\n  line-height: @headings-line-height;\n  color: @headings-color;\n\n  small,\n  .small {\n    font-weight: normal;\n    line-height: 1;\n    color: @headings-small-color;\n  }\n}\n\nh1, .h1,\nh2, .h2,\nh3, .h3 {\n  margin-top: @line-height-computed;\n  margin-bottom: (@line-height-computed / 2);\n\n  small,\n  .small {\n    font-size: 65%;\n  }\n}\nh4, .h4,\nh5, .h5,\nh6, .h6 {\n  margin-top: (@line-height-computed / 2);\n  margin-bottom: (@line-height-computed / 2);\n\n  small,\n  .small {\n    font-size: 75%;\n  }\n}\n\nh1, .h1 { font-size: @font-size-h1; }\nh2, .h2 { font-size: @font-size-h2; }\nh3, .h3 { font-size: @font-size-h3; }\nh4, .h4 { font-size: @font-size-h4; }\nh5, .h5 { font-size: @font-size-h5; }\nh6, .h6 { font-size: @font-size-h6; }\n\n\n// Body text\n// -------------------------\n\np {\n  margin: 0 0 (@line-height-computed / 2);\n}\n\n.lead {\n  margin-bottom: @line-height-computed;\n  font-size: floor((@font-size-base * 1.15));\n  font-weight: 200;\n  line-height: 1.4;\n\n  @media (min-width: @screen-sm-min) {\n    font-size: (@font-size-base * 1.5);\n  }\n}\n\n\n// Emphasis & misc\n// -------------------------\n\n// Ex: 14px base font * 85% = about 12px\nsmall,\n.small  { font-size: 85%; }\n\n// Undo browser default styling\ncite    { font-style: normal; }\n\n// Alignment\n.text-left           { text-align: left; }\n.text-right          { text-align: right; }\n.text-center         { text-align: center; }\n.text-justify        { text-align: justify; }\n\n// Contextual colors\n.text-muted {\n  color: @text-muted;\n}\n.text-primary {\n  .text-emphasis-variant(@brand-primary);\n}\n.text-success {\n  .text-emphasis-variant(@state-success-text);\n}\n.text-info {\n  .text-emphasis-variant(@state-info-text);\n}\n.text-warning {\n  .text-emphasis-variant(@state-warning-text);\n}\n.text-danger {\n  .text-emphasis-variant(@state-danger-text);\n}\n\n// Contextual backgrounds\n// For now we'll leave these alongside the text classes until v4 when we can\n// safely shift things around (per SemVer rules).\n.bg-primary {\n  // Given the contrast here, this is the only class to have its color inverted\n  // automatically.\n  color: #fff;\n  .bg-variant(@brand-primary);\n}\n.bg-success {\n  .bg-variant(@state-success-bg);\n}\n.bg-info {\n  .bg-variant(@state-info-bg);\n}\n.bg-warning {\n  .bg-variant(@state-warning-bg);\n}\n.bg-danger {\n  .bg-variant(@state-danger-bg);\n}\n\n\n// Page header\n// -------------------------\n\n.page-header {\n  padding-bottom: ((@line-height-computed / 2) - 1);\n  margin: (@line-height-computed * 2) 0 @line-height-computed;\n  border-bottom: 1px solid @page-header-border-color;\n}\n\n\n// Lists\n// --------------------------------------------------\n\n// Unordered and Ordered lists\nul,\nol {\n  margin-top: 0;\n  margin-bottom: (@line-height-computed / 2);\n  ul,\n  ol {\n    margin-bottom: 0;\n  }\n}\n\n// List options\n\n// Unstyled keeps list items block level, just removes default browser padding and list-style\n.list-unstyled {\n  padding-left: 0;\n  list-style: none;\n}\n\n// Inline turns list items into inline-block\n.list-inline {\n  .list-unstyled();\n  margin-left: -5px;\n\n  > li {\n    display: inline-block;\n    padding-left: 5px;\n    padding-right: 5px;\n  }\n}\n\n// Description Lists\ndl {\n  margin-top: 0; // Remove browser default\n  margin-bottom: @line-height-computed;\n}\ndt,\ndd {\n  line-height: @line-height-base;\n}\ndt {\n  font-weight: bold;\n}\ndd {\n  margin-left: 0; // Undo browser default\n}\n\n// Horizontal description lists\n//\n// Defaults to being stacked without any of the below styles applied, until the\n// grid breakpoint is reached (default of ~768px).\n\n@media (min-width: @grid-float-breakpoint) {\n  .dl-horizontal {\n    dt {\n      float: left;\n      width: (@component-offset-horizontal - 20);\n      clear: left;\n      text-align: right;\n      .text-overflow();\n    }\n    dd {\n      margin-left: @component-offset-horizontal;\n      &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present\n    }\n  }\n}\n\n// MISC\n// ----\n\n// Abbreviations and acronyms\nabbr[title],\n// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257\nabbr[data-original-title] {\n  cursor: help;\n  border-bottom: 1px dotted @abbr-border-color;\n}\n.initialism {\n  font-size: 90%;\n  text-transform: uppercase;\n}\n\n// Blockquotes\nblockquote {\n  padding: (@line-height-computed / 2) @line-height-computed;\n  margin: 0 0 @line-height-computed;\n  font-size: @blockquote-font-size;\n  border-left: 5px solid @blockquote-border-color;\n\n  p,\n  ul,\n  ol {\n    &:last-child {\n      margin-bottom: 0;\n    }\n  }\n\n  // Note: Deprecated small and .small as of v3.1.0\n  // Context: https://github.com/twbs/bootstrap/issues/11660\n  footer,\n  small,\n  .small {\n    display: block;\n    font-size: 80%; // back to default font-size\n    line-height: @line-height-base;\n    color: @blockquote-small-color;\n\n    &:before {\n      content: '\\2014 \\00A0'; // em dash, nbsp\n    }\n  }\n}\n\n// Opposite alignment of blockquote\n//\n// Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0.\n.blockquote-reverse,\nblockquote.pull-right {\n  padding-right: 15px;\n  padding-left: 0;\n  border-right: 5px solid @blockquote-border-color;\n  border-left: 0;\n  text-align: right;\n\n  // Account for citation\n  footer,\n  small,\n  .small {\n    &:before { content: ''; }\n    &:after {\n      content: '\\00A0 \\2014'; // nbsp, em dash\n    }\n  }\n}\n\n// Quotes\nblockquote:before,\nblockquote:after {\n  content: \"\";\n}\n\n// Addresses\naddress {\n  margin-bottom: @line-height-computed;\n  font-style: normal;\n  line-height: @line-height-base;\n}\n","//\n// Code (inline and block)\n// --------------------------------------------------\n\n\n// Inline and block code styles\ncode,\nkbd,\npre,\nsamp {\n  font-family: @font-family-monospace;\n}\n\n// Inline code\ncode {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: @code-color;\n  background-color: @code-bg;\n  white-space: nowrap;\n  border-radius: @border-radius-base;\n}\n\n// User input typically entered via keyboard\nkbd {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: @kbd-color;\n  background-color: @kbd-bg;\n  border-radius: @border-radius-small;\n  box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);\n}\n\n// Blocks of code\npre {\n  display: block;\n  padding: ((@line-height-computed - 1) / 2);\n  margin: 0 0 (@line-height-computed / 2);\n  font-size: (@font-size-base - 1); // 14px to 13px\n  line-height: @line-height-base;\n  word-break: break-all;\n  word-wrap: break-word;\n  color: @pre-color;\n  background-color: @pre-bg;\n  border: 1px solid @pre-border-color;\n  border-radius: @border-radius-base;\n\n  // Account for some code outputs that place code tags in pre tags\n  code {\n    padding: 0;\n    font-size: inherit;\n    color: inherit;\n    white-space: pre-wrap;\n    background-color: transparent;\n    border-radius: 0;\n  }\n}\n\n// Enable scrollable blocks of code\n.pre-scrollable {\n  max-height: @pre-scrollable-max-height;\n  overflow-y: scroll;\n}\n","//\n// Grid system\n// --------------------------------------------------\n\n\n// Container widths\n//\n// Set the container width, and override it for fixed navbars in media queries.\n\n.container {\n  .container-fixed();\n\n  @media (min-width: @screen-sm-min) {\n    width: @container-sm;\n  }\n  @media (min-width: @screen-md-min) {\n    width: @container-md;\n  }\n  @media (min-width: @screen-lg-min) {\n    width: @container-lg;\n  }\n}\n\n\n// Fluid container\n//\n// Utilizes the mixin meant for fixed width containers, but without any defined\n// width for fluid, full width layouts.\n\n.container-fluid {\n  .container-fixed();\n}\n\n\n// Row\n//\n// Rows contain and clear the floats of your columns.\n\n.row {\n  .make-row();\n}\n\n\n// Columns\n//\n// Common styles for small and large grid columns\n\n.make-grid-columns();\n\n\n// Extra small grid\n//\n// Columns, offsets, pushes, and pulls for extra small devices like\n// smartphones.\n\n.make-grid(xs);\n\n\n// Small grid\n//\n// Columns, offsets, pushes, and pulls for the small device range, from phones\n// to tablets.\n\n@media (min-width: @screen-sm-min) {\n  .make-grid(sm);\n}\n\n\n// Medium grid\n//\n// Columns, offsets, pushes, and pulls for the desktop device range.\n\n@media (min-width: @screen-md-min) {\n  .make-grid(md);\n}\n\n\n// Large grid\n//\n// Columns, offsets, pushes, and pulls for the large desktop device range.\n\n@media (min-width: @screen-lg-min) {\n  .make-grid(lg);\n}\n","//\n// Tables\n// --------------------------------------------------\n\n\ntable {\n  max-width: 100%;\n  background-color: @table-bg;\n}\nth {\n  text-align: left;\n}\n\n\n// Baseline styles\n\n.table {\n  width: 100%;\n  margin-bottom: @line-height-computed;\n  // Cells\n  > thead,\n  > tbody,\n  > tfoot {\n    > tr {\n      > th,\n      > td {\n        padding: @table-cell-padding;\n        line-height: @line-height-base;\n        vertical-align: top;\n        border-top: 1px solid @table-border-color;\n      }\n    }\n  }\n  // Bottom align for column headings\n  > thead > tr > th {\n    vertical-align: bottom;\n    border-bottom: 2px solid @table-border-color;\n  }\n  // Remove top border from thead by default\n  > caption + thead,\n  > colgroup + thead,\n  > thead:first-child {\n    > tr:first-child {\n      > th,\n      > td {\n        border-top: 0;\n      }\n    }\n  }\n  // Account for multiple tbody instances\n  > tbody + tbody {\n    border-top: 2px solid @table-border-color;\n  }\n\n  // Nesting\n  .table {\n    background-color: @body-bg;\n  }\n}\n\n\n// Condensed table w/ half padding\n\n.table-condensed {\n  > thead,\n  > tbody,\n  > tfoot {\n    > tr {\n      > th,\n      > td {\n        padding: @table-condensed-cell-padding;\n      }\n    }\n  }\n}\n\n\n// Bordered version\n//\n// Add borders all around the table and between all the columns.\n\n.table-bordered {\n  border: 1px solid @table-border-color;\n  > thead,\n  > tbody,\n  > tfoot {\n    > tr {\n      > th,\n      > td {\n        border: 1px solid @table-border-color;\n      }\n    }\n  }\n  > thead > tr {\n    > th,\n    > td {\n      border-bottom-width: 2px;\n    }\n  }\n}\n\n\n// Zebra-striping\n//\n// Default zebra-stripe styles (alternating gray and transparent backgrounds)\n\n.table-striped {\n  > tbody > tr:nth-child(odd) {\n    > td,\n    > th {\n      background-color: @table-bg-accent;\n    }\n  }\n}\n\n\n// Hover effect\n//\n// Placed here since it has to come after the potential zebra striping\n\n.table-hover {\n  > tbody > tr:hover {\n    > td,\n    > th {\n      background-color: @table-bg-hover;\n    }\n  }\n}\n\n\n// Table cell sizing\n//\n// Reset default table behavior\n\ntable col[class*=\"col-\"] {\n  position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)\n  float: none;\n  display: table-column;\n}\ntable {\n  td,\n  th {\n    &[class*=\"col-\"] {\n      position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)\n      float: none;\n      display: table-cell;\n    }\n  }\n}\n\n\n// Table backgrounds\n//\n// Exact selectors below required to override `.table-striped` and prevent\n// inheritance to nested tables.\n\n// Generate the contextual variants\n.table-row-variant(active; @table-bg-active);\n.table-row-variant(success; @state-success-bg);\n.table-row-variant(info; @state-info-bg);\n.table-row-variant(warning; @state-warning-bg);\n.table-row-variant(danger; @state-danger-bg);\n\n\n// Responsive tables\n//\n// Wrap your tables in `.table-responsive` and we'll make them mobile friendly\n// by enabling horizontal scrolling. Only applies <768px. Everything above that\n// will display normally.\n\n@media (max-width: @screen-xs-max) {\n  .table-responsive {\n    width: 100%;\n    margin-bottom: (@line-height-computed * 0.75);\n    overflow-y: hidden;\n    overflow-x: scroll;\n    -ms-overflow-style: -ms-autohiding-scrollbar;\n    border: 1px solid @table-border-color;\n    -webkit-overflow-scrolling: touch;\n\n    // Tighten up spacing\n    > .table {\n      margin-bottom: 0;\n\n      // Ensure the content doesn't wrap\n      > thead,\n      > tbody,\n      > tfoot {\n        > tr {\n          > th,\n          > td {\n            white-space: nowrap;\n          }\n        }\n      }\n    }\n\n    // Special overrides for the bordered tables\n    > .table-bordered {\n      border: 0;\n\n      // Nuke the appropriate borders so that the parent can handle them\n      > thead,\n      > tbody,\n      > tfoot {\n        > tr {\n          > th:first-child,\n          > td:first-child {\n            border-left: 0;\n          }\n          > th:last-child,\n          > td:last-child {\n            border-right: 0;\n          }\n        }\n      }\n\n      // Only nuke the last row's bottom-border in `tbody` and `tfoot` since\n      // chances are there will be only one `tr` in a `thead` and that would\n      // remove the border altogether.\n      > tbody,\n      > tfoot {\n        > tr:last-child {\n          > th,\n          > td {\n            border-bottom: 0;\n          }\n        }\n      }\n\n    }\n  }\n}\n","//\n// Forms\n// --------------------------------------------------\n\n\n// Normalize non-controls\n//\n// Restyle and baseline non-control form elements.\n\nfieldset {\n  padding: 0;\n  margin: 0;\n  border: 0;\n  // Chrome and Firefox set a `min-width: -webkit-min-content;` on fieldsets,\n  // so we reset that to ensure it behaves more like a standard block element.\n  // See https://github.com/twbs/bootstrap/issues/12359.\n  min-width: 0;\n}\n\nlegend {\n  display: block;\n  width: 100%;\n  padding: 0;\n  margin-bottom: @line-height-computed;\n  font-size: (@font-size-base * 1.5);\n  line-height: inherit;\n  color: @legend-color;\n  border: 0;\n  border-bottom: 1px solid @legend-border-color;\n}\n\nlabel {\n  display: inline-block;\n  margin-bottom: 5px;\n  font-weight: bold;\n}\n\n\n// Normalize form controls\n//\n// While most of our form styles require extra classes, some basic normalization\n// is required to ensure optimum display with or without those classes to better\n// address browser inconsistencies.\n\n// Override content-box in Normalize (* isn't specific enough)\ninput[type=\"search\"] {\n  .box-sizing(border-box);\n}\n\n// Position radios and checkboxes better\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  margin: 4px 0 0;\n  margin-top: 1px \\9; /* IE8-9 */\n  line-height: normal;\n}\n\n// Set the height of file controls to match text inputs\ninput[type=\"file\"] {\n  display: block;\n}\n\n// Make range inputs behave like textual form controls\ninput[type=\"range\"] {\n  display: block;\n  width: 100%;\n}\n\n// Make multiple select elements height not fixed\nselect[multiple],\nselect[size] {\n  height: auto;\n}\n\n// Focus for file, radio, and checkbox\ninput[type=\"file\"]:focus,\ninput[type=\"radio\"]:focus,\ninput[type=\"checkbox\"]:focus {\n  .tab-focus();\n}\n\n// Adjust output element\noutput {\n  display: block;\n  padding-top: (@padding-base-vertical + 1);\n  font-size: @font-size-base;\n  line-height: @line-height-base;\n  color: @input-color;\n}\n\n\n// Common form controls\n//\n// Shared size and type resets for form controls. Apply `.form-control` to any\n// of the following form controls:\n//\n// select\n// textarea\n// input[type=\"text\"]\n// input[type=\"password\"]\n// input[type=\"datetime\"]\n// input[type=\"datetime-local\"]\n// input[type=\"date\"]\n// input[type=\"month\"]\n// input[type=\"time\"]\n// input[type=\"week\"]\n// input[type=\"number\"]\n// input[type=\"email\"]\n// input[type=\"url\"]\n// input[type=\"search\"]\n// input[type=\"tel\"]\n// input[type=\"color\"]\n\n.form-control {\n  display: block;\n  width: 100%;\n  height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)\n  padding: @padding-base-vertical @padding-base-horizontal;\n  font-size: @font-size-base;\n  line-height: @line-height-base;\n  color: @input-color;\n  background-color: @input-bg;\n  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n  border: 1px solid @input-border;\n  border-radius: @input-border-radius;\n  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));\n  .transition(~\"border-color ease-in-out .15s, box-shadow ease-in-out .15s\");\n\n  // Customize the `:focus` state to imitate native WebKit styles.\n  .form-control-focus();\n\n  // Placeholder\n  .placeholder();\n\n  // Disabled and read-only inputs\n  //\n  // HTML5 says that controls under a fieldset > legend:first-child won't be\n  // disabled if the fieldset is disabled. Due to implementation difficulty, we\n  // don't honor that edge case; we style them as disabled anyway.\n  &[disabled],\n  &[readonly],\n  fieldset[disabled] & {\n    cursor: not-allowed;\n    background-color: @input-bg-disabled;\n    opacity: 1; // iOS fix for unreadable disabled content\n  }\n\n  // Reset height for `textarea`s\n  textarea& {\n    height: auto;\n  }\n}\n\n\n// Search inputs in iOS\n//\n// This overrides the extra rounded corners on search inputs in iOS so that our\n// `.form-control` class can properly style them. Note that this cannot simply\n// be added to `.form-control` as it's not specific enough. For details, see\n// https://github.com/twbs/bootstrap/issues/11586.\n\ninput[type=\"search\"] {\n  -webkit-appearance: none;\n}\n\n\n// Special styles for iOS date input\n//\n// In Mobile Safari, date inputs require a pixel line-height that matches the\n// given height of the input.\n\ninput[type=\"date\"] {\n  line-height: @input-height-base;\n}\n\n\n// Form groups\n//\n// Designed to help with the organization and spacing of vertical forms. For\n// horizontal forms, use the predefined grid classes.\n\n.form-group {\n  margin-bottom: 15px;\n}\n\n\n// Checkboxes and radios\n//\n// Indent the labels to position radios/checkboxes as hanging controls.\n\n.radio,\n.checkbox {\n  display: block;\n  min-height: @line-height-computed; // clear the floating input if there is no label text\n  margin-top: 10px;\n  margin-bottom: 10px;\n  padding-left: 20px;\n  label {\n    display: inline;\n    font-weight: normal;\n    cursor: pointer;\n  }\n}\n.radio input[type=\"radio\"],\n.radio-inline input[type=\"radio\"],\n.checkbox input[type=\"checkbox\"],\n.checkbox-inline input[type=\"checkbox\"] {\n  float: left;\n  margin-left: -20px;\n}\n.radio + .radio,\n.checkbox + .checkbox {\n  margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing\n}\n\n// Radios and checkboxes on same line\n.radio-inline,\n.checkbox-inline {\n  display: inline-block;\n  padding-left: 20px;\n  margin-bottom: 0;\n  vertical-align: middle;\n  font-weight: normal;\n  cursor: pointer;\n}\n.radio-inline + .radio-inline,\n.checkbox-inline + .checkbox-inline {\n  margin-top: 0;\n  margin-left: 10px; // space out consecutive inline controls\n}\n\n// Apply same disabled cursor tweak as for inputs\n//\n// Note: Neither radios nor checkboxes can be readonly.\ninput[type=\"radio\"],\ninput[type=\"checkbox\"],\n.radio,\n.radio-inline,\n.checkbox,\n.checkbox-inline {\n  &[disabled],\n  fieldset[disabled] & {\n    cursor: not-allowed;\n  }\n}\n\n\n// Form control sizing\n//\n// Build on `.form-control` with modifier classes to decrease or increase the\n// height and font-size of form controls.\n\n.input-sm {\n  .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n\n.input-lg {\n  .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);\n}\n\n\n// Form control feedback states\n//\n// Apply contextual and semantic states to individual form controls.\n\n.has-feedback {\n  // Enable absolute positioning\n  position: relative;\n\n  // Ensure icons don't overlap text\n  .form-control {\n    padding-right: (@input-height-base * 1.25);\n  }\n\n  // Feedback icon (requires .glyphicon classes)\n  .form-control-feedback {\n    position: absolute;\n    top: (@line-height-computed + 5); // Height of the `label` and its margin\n    right: 0;\n    display: block;\n    width: @input-height-base;\n    height: @input-height-base;\n    line-height: @input-height-base;\n    text-align: center;\n  }\n}\n\n// Feedback states\n.has-success {\n  .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);\n}\n.has-warning {\n  .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg);\n}\n.has-error {\n  .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);\n}\n\n\n// Static form control text\n//\n// Apply class to a `p` element to make any string of text align with labels in\n// a horizontal form layout.\n\n.form-control-static {\n  margin-bottom: 0; // Remove default margin from `p`\n}\n\n\n// Help text\n//\n// Apply to any element you wish to create light text for placement immediately\n// below a form control. Use for general help, formatting, or instructional text.\n\n.help-block {\n  display: block; // account for any element using help-block\n  margin-top: 5px;\n  margin-bottom: 10px;\n  color: lighten(@text-color, 25%); // lighten the text some for contrast\n}\n\n\n\n// Inline forms\n//\n// Make forms appear inline(-block) by adding the `.form-inline` class. Inline\n// forms begin stacked on extra small (mobile) devices and then go inline when\n// viewports reach <768px.\n//\n// Requires wrapping inputs and labels with `.form-group` for proper display of\n// default HTML form controls and our custom form controls (e.g., input groups).\n//\n// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.\n\n.form-inline {\n\n  // Kick in the inline\n  @media (min-width: @screen-sm-min) {\n    // Inline-block all the things for \"inline\"\n    .form-group {\n      display: inline-block;\n      margin-bottom: 0;\n      vertical-align: middle;\n    }\n\n    // In navbar-form, allow folks to *not* use `.form-group`\n    .form-control {\n      display: inline-block;\n      width: auto; // Prevent labels from stacking above inputs in `.form-group`\n      vertical-align: middle;\n    }\n    // Input groups need that 100% width though\n    .input-group > .form-control {\n      width: 100%;\n    }\n\n    .control-label {\n      margin-bottom: 0;\n      vertical-align: middle;\n    }\n\n    // Remove default margin on radios/checkboxes that were used for stacking, and\n    // then undo the floating of radios and checkboxes to match (which also avoids\n    // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).\n    .radio,\n    .checkbox {\n      display: inline-block;\n      margin-top: 0;\n      margin-bottom: 0;\n      padding-left: 0;\n      vertical-align: middle;\n    }\n    .radio input[type=\"radio\"],\n    .checkbox input[type=\"checkbox\"] {\n      float: none;\n      margin-left: 0;\n    }\n\n    // Validation states\n    //\n    // Reposition the icon because it's now within a grid column and columns have\n    // `position: relative;` on them. Also accounts for the grid gutter padding.\n    .has-feedback .form-control-feedback {\n      top: 0;\n    }\n  }\n}\n\n\n// Horizontal forms\n//\n// Horizontal forms are built on grid classes and allow you to create forms with\n// labels on the left and inputs on the right.\n\n.form-horizontal {\n\n  // Consistent vertical alignment of labels, radios, and checkboxes\n  .control-label,\n  .radio,\n  .checkbox,\n  .radio-inline,\n  .checkbox-inline {\n    margin-top: 0;\n    margin-bottom: 0;\n    padding-top: (@padding-base-vertical + 1); // Default padding plus a border\n  }\n  // Account for padding we're adding to ensure the alignment and of help text\n  // and other content below items\n  .radio,\n  .checkbox {\n    min-height: (@line-height-computed + (@padding-base-vertical + 1));\n  }\n\n  // Make form groups behave like rows\n  .form-group {\n    .make-row();\n  }\n\n  .form-control-static {\n    padding-top: (@padding-base-vertical + 1);\n  }\n\n  // Only right align form labels here when the columns stop stacking\n  @media (min-width: @screen-sm-min) {\n    .control-label {\n      text-align: right;\n    }\n  }\n\n  // Validation states\n  //\n  // Reposition the icon because it's now within a grid column and columns have\n  // `position: relative;` on them. Also accounts for the grid gutter padding.\n  .has-feedback .form-control-feedback {\n    top: 0;\n    right: (@grid-gutter-width / 2);\n  }\n}\n","//\n// Buttons\n// --------------------------------------------------\n\n\n// Base styles\n// --------------------------------------------------\n\n.btn {\n  display: inline-block;\n  margin-bottom: 0; // For input.btn\n  font-weight: @btn-font-weight;\n  text-align: center;\n  vertical-align: middle;\n  cursor: pointer;\n  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n  border: 1px solid transparent;\n  white-space: nowrap;\n  .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);\n  .user-select(none);\n\n  &,\n  &:active,\n  &.active {\n    &:focus {\n      .tab-focus();\n    }\n  }\n\n  &:hover,\n  &:focus {\n    color: @btn-default-color;\n    text-decoration: none;\n  }\n\n  &:active,\n  &.active {\n    outline: 0;\n    background-image: none;\n    .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n  }\n\n  &.disabled,\n  &[disabled],\n  fieldset[disabled] & {\n    cursor: not-allowed;\n    pointer-events: none; // Future-proof disabling of clicks\n    .opacity(.65);\n    .box-shadow(none);\n  }\n}\n\n\n// Alternate buttons\n// --------------------------------------------------\n\n.btn-default {\n  .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);\n}\n.btn-primary {\n  .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);\n}\n// Success appears as green\n.btn-success {\n  .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);\n}\n// Info appears as blue-green\n.btn-info {\n  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);\n}\n// Warning appears as orange\n.btn-warning {\n  .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);\n}\n// Danger and error appear as red\n.btn-danger {\n  .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);\n}\n\n\n// Link buttons\n// -------------------------\n\n// Make a button look and behave like a link\n.btn-link {\n  color: @link-color;\n  font-weight: normal;\n  cursor: pointer;\n  border-radius: 0;\n\n  &,\n  &:active,\n  &[disabled],\n  fieldset[disabled] & {\n    background-color: transparent;\n    .box-shadow(none);\n  }\n  &,\n  &:hover,\n  &:focus,\n  &:active {\n    border-color: transparent;\n  }\n  &:hover,\n  &:focus {\n    color: @link-hover-color;\n    text-decoration: underline;\n    background-color: transparent;\n  }\n  &[disabled],\n  fieldset[disabled] & {\n    &:hover,\n    &:focus {\n      color: @btn-link-disabled-color;\n      text-decoration: none;\n    }\n  }\n}\n\n\n// Button Sizes\n// --------------------------------------------------\n\n.btn-lg {\n  // line-height: ensure even-numbered height of button next to large input\n  .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);\n}\n.btn-sm {\n  // line-height: ensure proper height of button next to small input\n  .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n.btn-xs {\n  .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n\n\n// Block button\n// --------------------------------------------------\n\n.btn-block {\n  display: block;\n  width: 100%;\n  padding-left: 0;\n  padding-right: 0;\n}\n\n// Vertically space out multiple block buttons\n.btn-block + .btn-block {\n  margin-top: 5px;\n}\n\n// Specificity overrides\ninput[type=\"submit\"],\ninput[type=\"reset\"],\ninput[type=\"button\"] {\n  &.btn-block {\n    width: 100%;\n  }\n}\n","//\n// Button groups\n// --------------------------------------------------\n\n// Make the div behave like a button\n.btn-group,\n.btn-group-vertical {\n  position: relative;\n  display: inline-block;\n  vertical-align: middle; // match .btn alignment given font-size hack above\n  > .btn {\n    position: relative;\n    float: left;\n    // Bring the \"active\" button to the front\n    &:hover,\n    &:focus,\n    &:active,\n    &.active {\n      z-index: 2;\n    }\n    &:focus {\n      // Remove focus outline when dropdown JS adds it after closing the menu\n      outline: none;\n    }\n  }\n}\n\n// Prevent double borders when buttons are next to each other\n.btn-group {\n  .btn + .btn,\n  .btn + .btn-group,\n  .btn-group + .btn,\n  .btn-group + .btn-group {\n    margin-left: -1px;\n  }\n}\n\n// Optional: Group multiple button groups together for a toolbar\n.btn-toolbar {\n  margin-left: -5px; // Offset the first child's margin\n  &:extend(.clearfix all);\n\n  .btn-group,\n  .input-group {\n    float: left;\n  }\n  > .btn,\n  > .btn-group,\n  > .input-group {\n    margin-left: 5px;\n  }\n}\n\n.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {\n  border-radius: 0;\n}\n\n// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match\n.btn-group > .btn:first-child {\n  margin-left: 0;\n  &:not(:last-child):not(.dropdown-toggle) {\n    .border-right-radius(0);\n  }\n}\n// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it\n.btn-group > .btn:last-child:not(:first-child),\n.btn-group > .dropdown-toggle:not(:first-child) {\n  .border-left-radius(0);\n}\n\n// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)\n.btn-group > .btn-group {\n  float: left;\n}\n.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group > .btn-group:first-child {\n  > .btn:last-child,\n  > .dropdown-toggle {\n    .border-right-radius(0);\n  }\n}\n.btn-group > .btn-group:last-child > .btn:first-child {\n  .border-left-radius(0);\n}\n\n// On active and open, don't show outline\n.btn-group .dropdown-toggle:active,\n.btn-group.open .dropdown-toggle {\n  outline: 0;\n}\n\n\n// Sizing\n//\n// Remix the default button sizing classes into new ones for easier manipulation.\n\n.btn-group-xs > .btn { &:extend(.btn-xs); }\n.btn-group-sm > .btn { &:extend(.btn-sm); }\n.btn-group-lg > .btn { &:extend(.btn-lg); }\n\n\n// Split button dropdowns\n// ----------------------\n\n// Give the line between buttons some depth\n.btn-group > .btn + .dropdown-toggle {\n  padding-left: 8px;\n  padding-right: 8px;\n}\n.btn-group > .btn-lg + .dropdown-toggle {\n  padding-left: 12px;\n  padding-right: 12px;\n}\n\n// The clickable button for toggling the menu\n// Remove the gradient and set the same inset shadow as the :active state\n.btn-group.open .dropdown-toggle {\n  .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n\n  // Show no shadow for `.btn-link` since it has no other button styles.\n  &.btn-link {\n    .box-shadow(none);\n  }\n}\n\n\n// Reposition the caret\n.btn .caret {\n  margin-left: 0;\n}\n// Carets in other button sizes\n.btn-lg .caret {\n  border-width: @caret-width-large @caret-width-large 0;\n  border-bottom-width: 0;\n}\n// Upside down carets for .dropup\n.dropup .btn-lg .caret {\n  border-width: 0 @caret-width-large @caret-width-large;\n}\n\n\n// Vertical button groups\n// ----------------------\n\n.btn-group-vertical {\n  > .btn,\n  > .btn-group,\n  > .btn-group > .btn {\n    display: block;\n    float: none;\n    width: 100%;\n    max-width: 100%;\n  }\n\n  // Clear floats so dropdown menus can be properly placed\n  > .btn-group {\n    &:extend(.clearfix all);\n    > .btn {\n      float: none;\n    }\n  }\n\n  > .btn + .btn,\n  > .btn + .btn-group,\n  > .btn-group + .btn,\n  > .btn-group + .btn-group {\n    margin-top: -1px;\n    margin-left: 0;\n  }\n}\n\n.btn-group-vertical > .btn {\n  &:not(:first-child):not(:last-child) {\n    border-radius: 0;\n  }\n  &:first-child:not(:last-child) {\n    border-top-right-radius: @border-radius-base;\n    .border-bottom-radius(0);\n  }\n  &:last-child:not(:first-child) {\n    border-bottom-left-radius: @border-radius-base;\n    .border-top-radius(0);\n  }\n}\n.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group-vertical > .btn-group:first-child:not(:last-child) {\n  > .btn:last-child,\n  > .dropdown-toggle {\n    .border-bottom-radius(0);\n  }\n}\n.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  .border-top-radius(0);\n}\n\n\n\n// Justified button groups\n// ----------------------\n\n.btn-group-justified {\n  display: table;\n  width: 100%;\n  table-layout: fixed;\n  border-collapse: separate;\n  > .btn,\n  > .btn-group {\n    float: none;\n    display: table-cell;\n    width: 1%;\n  }\n  > .btn-group .btn {\n    width: 100%;\n  }\n}\n\n\n// Checkbox and radio options\n[data-toggle=\"buttons\"] > .btn > input[type=\"radio\"],\n[data-toggle=\"buttons\"] > .btn > input[type=\"checkbox\"] {\n  display: none;\n}\n","//\n// Component animations\n// --------------------------------------------------\n\n// Heads up!\n//\n// We don't use the `.opacity()` mixin here since it causes a bug with text\n// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.\n\n.fade {\n  opacity: 0;\n  .transition(opacity .15s linear);\n  &.in {\n    opacity: 1;\n  }\n}\n\n.collapse {\n  display: none;\n  &.in {\n    display: block;\n  }\n}\n.collapsing {\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  .transition(height .35s ease);\n}\n","//\n// Glyphicons for Bootstrap\n//\n// Since icons are fonts, they can be placed anywhere text is placed and are\n// thus automatically sized to match the surrounding child. To use, create an\n// inline element with the appropriate classes, like so:\n//\n//  Star\n\n// Import the fonts\n@font-face {\n  font-family: 'Glyphicons Halflings';\n  src: ~\"url('@{icon-font-path}@{icon-font-name}.eot')\";\n  src: ~\"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')\",\n       ~\"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')\",\n       ~\"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')\",\n       ~\"url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg')\";\n}\n\n// Catchall baseclass\n.glyphicon {\n  position: relative;\n  top: 1px;\n  display: inline-block;\n  font-family: 'Glyphicons Halflings';\n  font-style: normal;\n  font-weight: normal;\n  line-height: 1;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n\n// Individual icons\n.glyphicon-asterisk               { &:before { content: \"\\2a\"; } }\n.glyphicon-plus                   { &:before { content: \"\\2b\"; } }\n.glyphicon-euro                   { &:before { content: \"\\20ac\"; } }\n.glyphicon-minus                  { &:before { content: \"\\2212\"; } }\n.glyphicon-cloud                  { &:before { content: \"\\2601\"; } }\n.glyphicon-envelope               { &:before { content: \"\\2709\"; } }\n.glyphicon-pencil                 { &:before { content: \"\\270f\"; } }\n.glyphicon-glass                  { &:before { content: \"\\e001\"; } }\n.glyphicon-music                  { &:before { content: \"\\e002\"; } }\n.glyphicon-search                 { &:before { content: \"\\e003\"; } }\n.glyphicon-heart                  { &:before { content: \"\\e005\"; } }\n.glyphicon-star                   { &:before { content: \"\\e006\"; } }\n.glyphicon-star-empty             { &:before { content: \"\\e007\"; } }\n.glyphicon-user                   { &:before { content: \"\\e008\"; } }\n.glyphicon-film                   { &:before { content: \"\\e009\"; } }\n.glyphicon-th-large               { &:before { content: \"\\e010\"; } }\n.glyphicon-th                     { &:before { content: \"\\e011\"; } }\n.glyphicon-th-list                { &:before { content: \"\\e012\"; } }\n.glyphicon-ok                     { &:before { content: \"\\e013\"; } }\n.glyphicon-remove                 { &:before { content: \"\\e014\"; } }\n.glyphicon-zoom-in                { &:before { content: \"\\e015\"; } }\n.glyphicon-zoom-out               { &:before { content: \"\\e016\"; } }\n.glyphicon-off                    { &:before { content: \"\\e017\"; } }\n.glyphicon-signal                 { &:before { content: \"\\e018\"; } }\n.glyphicon-cog                    { &:before { content: \"\\e019\"; } }\n.glyphicon-trash                  { &:before { content: \"\\e020\"; } }\n.glyphicon-home                   { &:before { content: \"\\e021\"; } }\n.glyphicon-file                   { &:before { content: \"\\e022\"; } }\n.glyphicon-time                   { &:before { content: \"\\e023\"; } }\n.glyphicon-road                   { &:before { content: \"\\e024\"; } }\n.glyphicon-download-alt           { &:before { content: \"\\e025\"; } }\n.glyphicon-download               { &:before { content: \"\\e026\"; } }\n.glyphicon-upload                 { &:before { content: \"\\e027\"; } }\n.glyphicon-inbox                  { &:before { content: \"\\e028\"; } }\n.glyphicon-play-circle            { &:before { content: \"\\e029\"; } }\n.glyphicon-repeat                 { &:before { content: \"\\e030\"; } }\n.glyphicon-refresh                { &:before { content: \"\\e031\"; } }\n.glyphicon-list-alt               { &:before { content: \"\\e032\"; } }\n.glyphicon-lock                   { &:before { content: \"\\e033\"; } }\n.glyphicon-flag                   { &:before { content: \"\\e034\"; } }\n.glyphicon-headphones             { &:before { content: \"\\e035\"; } }\n.glyphicon-volume-off             { &:before { content: \"\\e036\"; } }\n.glyphicon-volume-down            { &:before { content: \"\\e037\"; } }\n.glyphicon-volume-up              { &:before { content: \"\\e038\"; } }\n.glyphicon-qrcode                 { &:before { content: \"\\e039\"; } }\n.glyphicon-barcode                { &:before { content: \"\\e040\"; } }\n.glyphicon-tag                    { &:before { content: \"\\e041\"; } }\n.glyphicon-tags                   { &:before { content: \"\\e042\"; } }\n.glyphicon-book                   { &:before { content: \"\\e043\"; } }\n.glyphicon-bookmark               { &:before { content: \"\\e044\"; } }\n.glyphicon-print                  { &:before { content: \"\\e045\"; } }\n.glyphicon-camera                 { &:before { content: \"\\e046\"; } }\n.glyphicon-font                   { &:before { content: \"\\e047\"; } }\n.glyphicon-bold                   { &:before { content: \"\\e048\"; } }\n.glyphicon-italic                 { &:before { content: \"\\e049\"; } }\n.glyphicon-text-height            { &:before { content: \"\\e050\"; } }\n.glyphicon-text-width             { &:before { content: \"\\e051\"; } }\n.glyphicon-align-left             { &:before { content: \"\\e052\"; } }\n.glyphicon-align-center           { &:before { content: \"\\e053\"; } }\n.glyphicon-align-right            { &:before { content: \"\\e054\"; } }\n.glyphicon-align-justify          { &:before { content: \"\\e055\"; } }\n.glyphicon-list                   { &:before { content: \"\\e056\"; } }\n.glyphicon-indent-left            { &:before { content: \"\\e057\"; } }\n.glyphicon-indent-right           { &:before { content: \"\\e058\"; } }\n.glyphicon-facetime-video         { &:before { content: \"\\e059\"; } }\n.glyphicon-picture                { &:before { content: \"\\e060\"; } }\n.glyphicon-map-marker             { &:before { content: \"\\e062\"; } }\n.glyphicon-adjust                 { &:before { content: \"\\e063\"; } }\n.glyphicon-tint                   { &:before { content: \"\\e064\"; } }\n.glyphicon-edit                   { &:before { content: \"\\e065\"; } }\n.glyphicon-share                  { &:before { content: \"\\e066\"; } }\n.glyphicon-check                  { &:before { content: \"\\e067\"; } }\n.glyphicon-move                   { &:before { content: \"\\e068\"; } }\n.glyphicon-step-backward          { &:before { content: \"\\e069\"; } }\n.glyphicon-fast-backward          { &:before { content: \"\\e070\"; } }\n.glyphicon-backward               { &:before { content: \"\\e071\"; } }\n.glyphicon-play                   { &:before { content: \"\\e072\"; } }\n.glyphicon-pause                  { &:before { content: \"\\e073\"; } }\n.glyphicon-stop                   { &:before { content: \"\\e074\"; } }\n.glyphicon-forward                { &:before { content: \"\\e075\"; } }\n.glyphicon-fast-forward           { &:before { content: \"\\e076\"; } }\n.glyphicon-step-forward           { &:before { content: \"\\e077\"; } }\n.glyphicon-eject                  { &:before { content: \"\\e078\"; } }\n.glyphicon-chevron-left           { &:before { content: \"\\e079\"; } }\n.glyphicon-chevron-right          { &:before { content: \"\\e080\"; } }\n.glyphicon-plus-sign              { &:before { content: \"\\e081\"; } }\n.glyphicon-minus-sign             { &:before { content: \"\\e082\"; } }\n.glyphicon-remove-sign            { &:before { content: \"\\e083\"; } }\n.glyphicon-ok-sign                { &:before { content: \"\\e084\"; } }\n.glyphicon-question-sign          { &:before { content: \"\\e085\"; } }\n.glyphicon-info-sign              { &:before { content: \"\\e086\"; } }\n.glyphicon-screenshot             { &:before { content: \"\\e087\"; } }\n.glyphicon-remove-circle          { &:before { content: \"\\e088\"; } }\n.glyphicon-ok-circle              { &:before { content: \"\\e089\"; } }\n.glyphicon-ban-circle             { &:before { content: \"\\e090\"; } }\n.glyphicon-arrow-left             { &:before { content: \"\\e091\"; } }\n.glyphicon-arrow-right            { &:before { content: \"\\e092\"; } }\n.glyphicon-arrow-up               { &:before { content: \"\\e093\"; } }\n.glyphicon-arrow-down             { &:before { content: \"\\e094\"; } }\n.glyphicon-share-alt              { &:before { content: \"\\e095\"; } }\n.glyphicon-resize-full            { &:before { content: \"\\e096\"; } }\n.glyphicon-resize-small           { &:before { content: \"\\e097\"; } }\n.glyphicon-exclamation-sign       { &:before { content: \"\\e101\"; } }\n.glyphicon-gift                   { &:before { content: \"\\e102\"; } }\n.glyphicon-leaf                   { &:before { content: \"\\e103\"; } }\n.glyphicon-fire                   { &:before { content: \"\\e104\"; } }\n.glyphicon-eye-open               { &:before { content: \"\\e105\"; } }\n.glyphicon-eye-close              { &:before { content: \"\\e106\"; } }\n.glyphicon-warning-sign           { &:before { content: \"\\e107\"; } }\n.glyphicon-plane                  { &:before { content: \"\\e108\"; } }\n.glyphicon-calendar               { &:before { content: \"\\e109\"; } }\n.glyphicon-random                 { &:before { content: \"\\e110\"; } }\n.glyphicon-comment                { &:before { content: \"\\e111\"; } }\n.glyphicon-magnet                 { &:before { content: \"\\e112\"; } }\n.glyphicon-chevron-up             { &:before { content: \"\\e113\"; } }\n.glyphicon-chevron-down           { &:before { content: \"\\e114\"; } }\n.glyphicon-retweet                { &:before { content: \"\\e115\"; } }\n.glyphicon-shopping-cart          { &:before { content: \"\\e116\"; } }\n.glyphicon-folder-close           { &:before { content: \"\\e117\"; } }\n.glyphicon-folder-open            { &:before { content: \"\\e118\"; } }\n.glyphicon-resize-vertical        { &:before { content: \"\\e119\"; } }\n.glyphicon-resize-horizontal      { &:before { content: \"\\e120\"; } }\n.glyphicon-hdd                    { &:before { content: \"\\e121\"; } }\n.glyphicon-bullhorn               { &:before { content: \"\\e122\"; } }\n.glyphicon-bell                   { &:before { content: \"\\e123\"; } }\n.glyphicon-certificate            { &:before { content: \"\\e124\"; } }\n.glyphicon-thumbs-up              { &:before { content: \"\\e125\"; } }\n.glyphicon-thumbs-down            { &:before { content: \"\\e126\"; } }\n.glyphicon-hand-right             { &:before { content: \"\\e127\"; } }\n.glyphicon-hand-left              { &:before { content: \"\\e128\"; } }\n.glyphicon-hand-up                { &:before { content: \"\\e129\"; } }\n.glyphicon-hand-down              { &:before { content: \"\\e130\"; } }\n.glyphicon-circle-arrow-right     { &:before { content: \"\\e131\"; } }\n.glyphicon-circle-arrow-left      { &:before { content: \"\\e132\"; } }\n.glyphicon-circle-arrow-up        { &:before { content: \"\\e133\"; } }\n.glyphicon-circle-arrow-down      { &:before { content: \"\\e134\"; } }\n.glyphicon-globe                  { &:before { content: \"\\e135\"; } }\n.glyphicon-wrench                 { &:before { content: \"\\e136\"; } }\n.glyphicon-tasks                  { &:before { content: \"\\e137\"; } }\n.glyphicon-filter                 { &:before { content: \"\\e138\"; } }\n.glyphicon-briefcase              { &:before { content: \"\\e139\"; } }\n.glyphicon-fullscreen             { &:before { content: \"\\e140\"; } }\n.glyphicon-dashboard              { &:before { content: \"\\e141\"; } }\n.glyphicon-paperclip              { &:before { content: \"\\e142\"; } }\n.glyphicon-heart-empty            { &:before { content: \"\\e143\"; } }\n.glyphicon-link                   { &:before { content: \"\\e144\"; } }\n.glyphicon-phone                  { &:before { content: \"\\e145\"; } }\n.glyphicon-pushpin                { &:before { content: \"\\e146\"; } }\n.glyphicon-usd                    { &:before { content: \"\\e148\"; } }\n.glyphicon-gbp                    { &:before { content: \"\\e149\"; } }\n.glyphicon-sort                   { &:before { content: \"\\e150\"; } }\n.glyphicon-sort-by-alphabet       { &:before { content: \"\\e151\"; } }\n.glyphicon-sort-by-alphabet-alt   { &:before { content: \"\\e152\"; } }\n.glyphicon-sort-by-order          { &:before { content: \"\\e153\"; } }\n.glyphicon-sort-by-order-alt      { &:before { content: \"\\e154\"; } }\n.glyphicon-sort-by-attributes     { &:before { content: \"\\e155\"; } }\n.glyphicon-sort-by-attributes-alt { &:before { content: \"\\e156\"; } }\n.glyphicon-unchecked              { &:before { content: \"\\e157\"; } }\n.glyphicon-expand                 { &:before { content: \"\\e158\"; } }\n.glyphicon-collapse-down          { &:before { content: \"\\e159\"; } }\n.glyphicon-collapse-up            { &:before { content: \"\\e160\"; } }\n.glyphicon-log-in                 { &:before { content: \"\\e161\"; } }\n.glyphicon-flash                  { &:before { content: \"\\e162\"; } }\n.glyphicon-log-out                { &:before { content: \"\\e163\"; } }\n.glyphicon-new-window             { &:before { content: \"\\e164\"; } }\n.glyphicon-record                 { &:before { content: \"\\e165\"; } }\n.glyphicon-save                   { &:before { content: \"\\e166\"; } }\n.glyphicon-open                   { &:before { content: \"\\e167\"; } }\n.glyphicon-saved                  { &:before { content: \"\\e168\"; } }\n.glyphicon-import                 { &:before { content: \"\\e169\"; } }\n.glyphicon-export                 { &:before { content: \"\\e170\"; } }\n.glyphicon-send                   { &:before { content: \"\\e171\"; } }\n.glyphicon-floppy-disk            { &:before { content: \"\\e172\"; } }\n.glyphicon-floppy-saved           { &:before { content: \"\\e173\"; } }\n.glyphicon-floppy-remove          { &:before { content: \"\\e174\"; } }\n.glyphicon-floppy-save            { &:before { content: \"\\e175\"; } }\n.glyphicon-floppy-open            { &:before { content: \"\\e176\"; } }\n.glyphicon-credit-card            { &:before { content: \"\\e177\"; } }\n.glyphicon-transfer               { &:before { content: \"\\e178\"; } }\n.glyphicon-cutlery                { &:before { content: \"\\e179\"; } }\n.glyphicon-header                 { &:before { content: \"\\e180\"; } }\n.glyphicon-compressed             { &:before { content: \"\\e181\"; } }\n.glyphicon-earphone               { &:before { content: \"\\e182\"; } }\n.glyphicon-phone-alt              { &:before { content: \"\\e183\"; } }\n.glyphicon-tower                  { &:before { content: \"\\e184\"; } }\n.glyphicon-stats                  { &:before { content: \"\\e185\"; } }\n.glyphicon-sd-video               { &:before { content: \"\\e186\"; } }\n.glyphicon-hd-video               { &:before { content: \"\\e187\"; } }\n.glyphicon-subtitles              { &:before { content: \"\\e188\"; } }\n.glyphicon-sound-stereo           { &:before { content: \"\\e189\"; } }\n.glyphicon-sound-dolby            { &:before { content: \"\\e190\"; } }\n.glyphicon-sound-5-1              { &:before { content: \"\\e191\"; } }\n.glyphicon-sound-6-1              { &:before { content: \"\\e192\"; } }\n.glyphicon-sound-7-1              { &:before { content: \"\\e193\"; } }\n.glyphicon-copyright-mark         { &:before { content: \"\\e194\"; } }\n.glyphicon-registration-mark      { &:before { content: \"\\e195\"; } }\n.glyphicon-cloud-download         { &:before { content: \"\\e197\"; } }\n.glyphicon-cloud-upload           { &:before { content: \"\\e198\"; } }\n.glyphicon-tree-conifer           { &:before { content: \"\\e199\"; } }\n.glyphicon-tree-deciduous         { &:before { content: \"\\e200\"; } }\n","//\n// Dropdown menus\n// --------------------------------------------------\n\n\n// Dropdown arrow/caret\n.caret {\n  display: inline-block;\n  width: 0;\n  height: 0;\n  margin-left: 2px;\n  vertical-align: middle;\n  border-top:   @caret-width-base solid;\n  border-right: @caret-width-base solid transparent;\n  border-left:  @caret-width-base solid transparent;\n}\n\n// The dropdown wrapper (div)\n.dropdown {\n  position: relative;\n}\n\n// Prevent the focus on the dropdown toggle when closing dropdowns\n.dropdown-toggle:focus {\n  outline: 0;\n}\n\n// The dropdown menu (ul)\n.dropdown-menu {\n  position: absolute;\n  top: 100%;\n  left: 0;\n  z-index: @zindex-dropdown;\n  display: none; // none by default, but block on \"open\" of the menu\n  float: left;\n  min-width: 160px;\n  padding: 5px 0;\n  margin: 2px 0 0; // override default ul\n  list-style: none;\n  font-size: @font-size-base;\n  background-color: @dropdown-bg;\n  border: 1px solid @dropdown-fallback-border; // IE8 fallback\n  border: 1px solid @dropdown-border;\n  border-radius: @border-radius-base;\n  .box-shadow(0 6px 12px rgba(0,0,0,.175));\n  background-clip: padding-box;\n\n  // Aligns the dropdown menu to right\n  //\n  // Deprecated as of 3.1.0 in favor of `.dropdown-menu-[dir]`\n  &.pull-right {\n    right: 0;\n    left: auto;\n  }\n\n  // Dividers (basically an hr) within the dropdown\n  .divider {\n    .nav-divider(@dropdown-divider-bg);\n  }\n\n  // Links within the dropdown menu\n  > li > a {\n    display: block;\n    padding: 3px 20px;\n    clear: both;\n    font-weight: normal;\n    line-height: @line-height-base;\n    color: @dropdown-link-color;\n    white-space: nowrap; // prevent links from randomly breaking onto new lines\n  }\n}\n\n// Hover/Focus state\n.dropdown-menu > li > a {\n  &:hover,\n  &:focus {\n    text-decoration: none;\n    color: @dropdown-link-hover-color;\n    background-color: @dropdown-link-hover-bg;\n  }\n}\n\n// Active state\n.dropdown-menu > .active > a {\n  &,\n  &:hover,\n  &:focus {\n    color: @dropdown-link-active-color;\n    text-decoration: none;\n    outline: 0;\n    background-color: @dropdown-link-active-bg;\n  }\n}\n\n// Disabled state\n//\n// Gray out text and ensure the hover/focus state remains gray\n\n.dropdown-menu > .disabled > a {\n  &,\n  &:hover,\n  &:focus {\n    color: @dropdown-link-disabled-color;\n  }\n}\n// Nuke hover/focus effects\n.dropdown-menu > .disabled > a {\n  &:hover,\n  &:focus {\n    text-decoration: none;\n    background-color: transparent;\n    background-image: none; // Remove CSS gradient\n    .reset-filter();\n    cursor: not-allowed;\n  }\n}\n\n// Open state for the dropdown\n.open {\n  // Show the menu\n  > .dropdown-menu {\n    display: block;\n  }\n\n  // Remove the outline when :focus is triggered\n  > a {\n    outline: 0;\n  }\n}\n\n// Menu positioning\n//\n// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown\n// menu with the parent.\n.dropdown-menu-right {\n  left: auto; // Reset the default from `.dropdown-menu`\n  right: 0;\n}\n// With v3, we enabled auto-flipping if you have a dropdown within a right\n// aligned nav component. To enable the undoing of that, we provide an override\n// to restore the default dropdown menu alignment.\n//\n// This is only for left-aligning a dropdown menu within a `.navbar-right` or\n// `.pull-right` nav component.\n.dropdown-menu-left {\n  left: 0;\n  right: auto;\n}\n\n// Dropdown section headers\n.dropdown-header {\n  display: block;\n  padding: 3px 20px;\n  font-size: @font-size-small;\n  line-height: @line-height-base;\n  color: @dropdown-header-color;\n}\n\n// Backdrop to catch body clicks on mobile, etc.\n.dropdown-backdrop {\n  position: fixed;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  top: 0;\n  z-index: (@zindex-dropdown - 10);\n}\n\n// Right aligned dropdowns\n.pull-right > .dropdown-menu {\n  right: 0;\n  left: auto;\n}\n\n// Allow for dropdowns to go bottom up (aka, dropup-menu)\n//\n// Just add .dropup after the standard .dropdown class and you're set, bro.\n// TODO: abstract this so that the navbar fixed styles are not placed here?\n\n.dropup,\n.navbar-fixed-bottom .dropdown {\n  // Reverse the caret\n  .caret {\n    border-top: 0;\n    border-bottom: @caret-width-base solid;\n    content: \"\";\n  }\n  // Different positioning for bottom up menu\n  .dropdown-menu {\n    top: auto;\n    bottom: 100%;\n    margin-bottom: 1px;\n  }\n}\n\n\n// Component alignment\n//\n// Reiterate per navbar.less and the modified component alignment there.\n\n@media (min-width: @grid-float-breakpoint) {\n  .navbar-right {\n    .dropdown-menu {\n      .dropdown-menu-right();\n    }\n    // Necessary for overrides of the default right aligned menu.\n    // Will remove come v4 in all likelihood.\n    .dropdown-menu-left {\n      .dropdown-menu-left();\n    }\n  }\n}\n\n","//\n// Input groups\n// --------------------------------------------------\n\n// Base styles\n// -------------------------\n.input-group {\n  position: relative; // For dropdowns\n  display: table;\n  border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table\n\n  // Undo padding and float of grid classes\n  &[class*=\"col-\"] {\n    float: none;\n    padding-left: 0;\n    padding-right: 0;\n  }\n\n  .form-control {\n    // Ensure that the input is always above the *appended* addon button for\n    // proper border colors.\n    position: relative;\n    z-index: 2;\n\n    // IE9 fubars the placeholder attribute in text inputs and the arrows on\n    // select elements in input groups. To fix it, we float the input. Details:\n    // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855\n    float: left;\n\n    width: 100%;\n    margin-bottom: 0;\n  }\n}\n\n// Sizing options\n//\n// Remix the default form control sizing classes into new ones for easier\n// manipulation.\n\n.input-group-lg > .form-control,\n.input-group-lg > .input-group-addon,\n.input-group-lg > .input-group-btn > .btn { .input-lg(); }\n.input-group-sm > .form-control,\n.input-group-sm > .input-group-addon,\n.input-group-sm > .input-group-btn > .btn { .input-sm(); }\n\n\n// Display as table-cell\n// -------------------------\n.input-group-addon,\n.input-group-btn,\n.input-group .form-control {\n  display: table-cell;\n\n  &:not(:first-child):not(:last-child) {\n    border-radius: 0;\n  }\n}\n// Addon and addon wrapper for buttons\n.input-group-addon,\n.input-group-btn {\n  width: 1%;\n  white-space: nowrap;\n  vertical-align: middle; // Match the inputs\n}\n\n// Text input groups\n// -------------------------\n.input-group-addon {\n  padding: @padding-base-vertical @padding-base-horizontal;\n  font-size: @font-size-base;\n  font-weight: normal;\n  line-height: 1;\n  color: @input-color;\n  text-align: center;\n  background-color: @input-group-addon-bg;\n  border: 1px solid @input-group-addon-border-color;\n  border-radius: @border-radius-base;\n\n  // Sizing\n  &.input-sm {\n    padding: @padding-small-vertical @padding-small-horizontal;\n    font-size: @font-size-small;\n    border-radius: @border-radius-small;\n  }\n  &.input-lg {\n    padding: @padding-large-vertical @padding-large-horizontal;\n    font-size: @font-size-large;\n    border-radius: @border-radius-large;\n  }\n\n  // Nuke default margins from checkboxes and radios to vertically center within.\n  input[type=\"radio\"],\n  input[type=\"checkbox\"] {\n    margin-top: 0;\n  }\n}\n\n// Reset rounded corners\n.input-group .form-control:first-child,\n.input-group-addon:first-child,\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group > .btn,\n.input-group-btn:first-child > .dropdown-toggle,\n.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {\n  .border-right-radius(0);\n}\n.input-group-addon:first-child {\n  border-right: 0;\n}\n.input-group .form-control:last-child,\n.input-group-addon:last-child,\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group > .btn,\n.input-group-btn:last-child > .dropdown-toggle,\n.input-group-btn:first-child > .btn:not(:first-child),\n.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {\n  .border-left-radius(0);\n}\n.input-group-addon:last-child {\n  border-left: 0;\n}\n\n// Button input groups\n// -------------------------\n.input-group-btn {\n  position: relative;\n  // Jankily prevent input button groups from wrapping with `white-space` and\n  // `font-size` in combination with `inline-block` on buttons.\n  font-size: 0;\n  white-space: nowrap;\n\n  // Negative margin for spacing, position for bringing hovered/focused/actived\n  // element above the siblings.\n  > .btn {\n    position: relative;\n    + .btn {\n      margin-left: -1px;\n    }\n    // Bring the \"active\" button to the front\n    &:hover,\n    &:focus,\n    &:active {\n      z-index: 2;\n    }\n  }\n\n  // Negative margin to only have a 1px border between the two\n  &:first-child {\n    > .btn,\n    > .btn-group {\n      margin-right: -1px;\n    }\n  }\n  &:last-child {\n    > .btn,\n    > .btn-group {\n      margin-left: -1px;\n    }\n  }\n}\n","//\n// Navs\n// --------------------------------------------------\n\n\n// Base class\n// --------------------------------------------------\n\n.nav {\n  margin-bottom: 0;\n  padding-left: 0; // Override default ul/ol\n  list-style: none;\n  &:extend(.clearfix all);\n\n  > li {\n    position: relative;\n    display: block;\n\n    > a {\n      position: relative;\n      display: block;\n      padding: @nav-link-padding;\n      &:hover,\n      &:focus {\n        text-decoration: none;\n        background-color: @nav-link-hover-bg;\n      }\n    }\n\n    // Disabled state sets text to gray and nukes hover/tab effects\n    &.disabled > a {\n      color: @nav-disabled-link-color;\n\n      &:hover,\n      &:focus {\n        color: @nav-disabled-link-hover-color;\n        text-decoration: none;\n        background-color: transparent;\n        cursor: not-allowed;\n      }\n    }\n  }\n\n  // Open dropdowns\n  .open > a {\n    &,\n    &:hover,\n    &:focus {\n      background-color: @nav-link-hover-bg;\n      border-color: @link-color;\n    }\n  }\n\n  // Nav dividers (deprecated with v3.0.1)\n  //\n  // This should have been removed in v3 with the dropping of `.nav-list`, but\n  // we missed it. We don't currently support this anywhere, but in the interest\n  // of maintaining backward compatibility in case you use it, it's deprecated.\n  .nav-divider {\n    .nav-divider();\n  }\n\n  // Prevent IE8 from misplacing imgs\n  //\n  // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989\n  > li > a > img {\n    max-width: none;\n  }\n}\n\n\n// Tabs\n// -------------------------\n\n// Give the tabs something to sit on\n.nav-tabs {\n  border-bottom: 1px solid @nav-tabs-border-color;\n  > li {\n    float: left;\n    // Make the list-items overlay the bottom border\n    margin-bottom: -1px;\n\n    // Actual tabs (as links)\n    > a {\n      margin-right: 2px;\n      line-height: @line-height-base;\n      border: 1px solid transparent;\n      border-radius: @border-radius-base @border-radius-base 0 0;\n      &:hover {\n        border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;\n      }\n    }\n\n    // Active state, and its :hover to override normal :hover\n    &.active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @nav-tabs-active-link-hover-color;\n        background-color: @nav-tabs-active-link-hover-bg;\n        border: 1px solid @nav-tabs-active-link-hover-border-color;\n        border-bottom-color: transparent;\n        cursor: default;\n      }\n    }\n  }\n  // pulling this in mainly for less shorthand\n  &.nav-justified {\n    .nav-justified();\n    .nav-tabs-justified();\n  }\n}\n\n\n// Pills\n// -------------------------\n.nav-pills {\n  > li {\n    float: left;\n\n    // Links rendered as pills\n    > a {\n      border-radius: @nav-pills-border-radius;\n    }\n    + li {\n      margin-left: 2px;\n    }\n\n    // Active state\n    &.active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @nav-pills-active-link-hover-color;\n        background-color: @nav-pills-active-link-hover-bg;\n      }\n    }\n  }\n}\n\n\n// Stacked pills\n.nav-stacked {\n  > li {\n    float: none;\n    + li {\n      margin-top: 2px;\n      margin-left: 0; // no need for this gap between nav items\n    }\n  }\n}\n\n\n// Nav variations\n// --------------------------------------------------\n\n// Justified nav links\n// -------------------------\n\n.nav-justified {\n  width: 100%;\n\n  > li {\n    float: none;\n     > a {\n      text-align: center;\n      margin-bottom: 5px;\n    }\n  }\n\n  > .dropdown .dropdown-menu {\n    top: auto;\n    left: auto;\n  }\n\n  @media (min-width: @screen-sm-min) {\n    > li {\n      display: table-cell;\n      width: 1%;\n      > a {\n        margin-bottom: 0;\n      }\n    }\n  }\n}\n\n// Move borders to anchors instead of bottom of list\n//\n// Mixin for adding on top the shared `.nav-justified` styles for our tabs\n.nav-tabs-justified {\n  border-bottom: 0;\n\n  > li > a {\n    // Override margin from .nav-tabs\n    margin-right: 0;\n    border-radius: @border-radius-base;\n  }\n\n  > .active > a,\n  > .active > a:hover,\n  > .active > a:focus {\n    border: 1px solid @nav-tabs-justified-link-border-color;\n  }\n\n  @media (min-width: @screen-sm-min) {\n    > li > a {\n      border-bottom: 1px solid @nav-tabs-justified-link-border-color;\n      border-radius: @border-radius-base @border-radius-base 0 0;\n    }\n    > .active > a,\n    > .active > a:hover,\n    > .active > a:focus {\n      border-bottom-color: @nav-tabs-justified-active-link-border-color;\n    }\n  }\n}\n\n\n// Tabbable tabs\n// -------------------------\n\n// Hide tabbable panes to start, show them when `.active`\n.tab-content {\n  > .tab-pane {\n    display: none;\n  }\n  > .active {\n    display: block;\n  }\n}\n\n\n// Dropdowns\n// -------------------------\n\n// Specific dropdowns\n.nav-tabs .dropdown-menu {\n  // make dropdown border overlap tab border\n  margin-top: -1px;\n  // Remove the top rounded corners here since there is a hard edge above the menu\n  .border-top-radius(0);\n}\n","//\n// Navbars\n// --------------------------------------------------\n\n\n// Wrapper and base class\n//\n// Provide a static navbar from which we expand to create full-width, fixed, and\n// other navbar variations.\n\n.navbar {\n  position: relative;\n  min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)\n  margin-bottom: @navbar-margin-bottom;\n  border: 1px solid transparent;\n\n  // Prevent floats from breaking the navbar\n  &:extend(.clearfix all);\n\n  @media (min-width: @grid-float-breakpoint) {\n    border-radius: @navbar-border-radius;\n  }\n}\n\n\n// Navbar heading\n//\n// Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy\n// styling of responsive aspects.\n\n.navbar-header {\n  &:extend(.clearfix all);\n\n  @media (min-width: @grid-float-breakpoint) {\n    float: left;\n  }\n}\n\n\n// Navbar collapse (body)\n//\n// Group your navbar content into this for easy collapsing and expanding across\n// various device sizes. By default, this content is collapsed when <768px, but\n// will expand past that for a horizontal display.\n//\n// To start (on mobile devices) the navbar links, forms, and buttons are stacked\n// vertically and include a `max-height` to overflow in case you have too much\n// content for the user's viewport.\n\n.navbar-collapse {\n  max-height: @navbar-collapse-max-height;\n  overflow-x: visible;\n  padding-right: @navbar-padding-horizontal;\n  padding-left:  @navbar-padding-horizontal;\n  border-top: 1px solid transparent;\n  box-shadow: inset 0 1px 0 rgba(255,255,255,.1);\n  &:extend(.clearfix all);\n  -webkit-overflow-scrolling: touch;\n\n  &.in {\n    overflow-y: auto;\n  }\n\n  @media (min-width: @grid-float-breakpoint) {\n    width: auto;\n    border-top: 0;\n    box-shadow: none;\n\n    &.collapse {\n      display: block !important;\n      height: auto !important;\n      padding-bottom: 0; // Override default setting\n      overflow: visible !important;\n    }\n\n    &.in {\n      overflow-y: visible;\n    }\n\n    // Undo the collapse side padding for navbars with containers to ensure\n    // alignment of right-aligned contents.\n    .navbar-fixed-top &,\n    .navbar-static-top &,\n    .navbar-fixed-bottom & {\n      padding-left: 0;\n      padding-right: 0;\n    }\n  }\n}\n\n\n// Both navbar header and collapse\n//\n// When a container is present, change the behavior of the header and collapse.\n\n.container,\n.container-fluid {\n  > .navbar-header,\n  > .navbar-collapse {\n    margin-right: -@navbar-padding-horizontal;\n    margin-left:  -@navbar-padding-horizontal;\n\n    @media (min-width: @grid-float-breakpoint) {\n      margin-right: 0;\n      margin-left:  0;\n    }\n  }\n}\n\n\n//\n// Navbar alignment options\n//\n// Display the navbar across the entirety of the page or fixed it to the top or\n// bottom of the page.\n\n// Static top (unfixed, but 100% wide) navbar\n.navbar-static-top {\n  z-index: @zindex-navbar;\n  border-width: 0 0 1px;\n\n  @media (min-width: @grid-float-breakpoint) {\n    border-radius: 0;\n  }\n}\n\n// Fix the top/bottom navbars when screen real estate supports it\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n  position: fixed;\n  right: 0;\n  left: 0;\n  z-index: @zindex-navbar-fixed;\n\n  // Undo the rounded corners\n  @media (min-width: @grid-float-breakpoint) {\n    border-radius: 0;\n  }\n}\n.navbar-fixed-top {\n  top: 0;\n  border-width: 0 0 1px;\n}\n.navbar-fixed-bottom {\n  bottom: 0;\n  margin-bottom: 0; // override .navbar defaults\n  border-width: 1px 0 0;\n}\n\n\n// Brand/project name\n\n.navbar-brand {\n  float: left;\n  padding: @navbar-padding-vertical @navbar-padding-horizontal;\n  font-size: @font-size-large;\n  line-height: @line-height-computed;\n  height: @navbar-height;\n\n  &:hover,\n  &:focus {\n    text-decoration: none;\n  }\n\n  @media (min-width: @grid-float-breakpoint) {\n    .navbar > .container &,\n    .navbar > .container-fluid & {\n      margin-left: -@navbar-padding-horizontal;\n    }\n  }\n}\n\n\n// Navbar toggle\n//\n// Custom button for toggling the `.navbar-collapse`, powered by the collapse\n// JavaScript plugin.\n\n.navbar-toggle {\n  position: relative;\n  float: right;\n  margin-right: @navbar-padding-horizontal;\n  padding: 9px 10px;\n  .navbar-vertical-align(34px);\n  background-color: transparent;\n  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n  border: 1px solid transparent;\n  border-radius: @border-radius-base;\n\n  // We remove the `outline` here, but later compensate by attaching `:hover`\n  // styles to `:focus`.\n  &:focus {\n    outline: none;\n  }\n\n  // Bars\n  .icon-bar {\n    display: block;\n    width: 22px;\n    height: 2px;\n    border-radius: 1px;\n  }\n  .icon-bar + .icon-bar {\n    margin-top: 4px;\n  }\n\n  @media (min-width: @grid-float-breakpoint) {\n    display: none;\n  }\n}\n\n\n// Navbar nav links\n//\n// Builds on top of the `.nav` components with its own modifier class to make\n// the nav the full height of the horizontal nav (above 768px).\n\n.navbar-nav {\n  margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;\n\n  > li > a {\n    padding-top:    10px;\n    padding-bottom: 10px;\n    line-height: @line-height-computed;\n  }\n\n  @media (max-width: @grid-float-breakpoint-max) {\n    // Dropdowns get custom display when collapsed\n    .open .dropdown-menu {\n      position: static;\n      float: none;\n      width: auto;\n      margin-top: 0;\n      background-color: transparent;\n      border: 0;\n      box-shadow: none;\n      > li > a,\n      .dropdown-header {\n        padding: 5px 15px 5px 25px;\n      }\n      > li > a {\n        line-height: @line-height-computed;\n        &:hover,\n        &:focus {\n          background-image: none;\n        }\n      }\n    }\n  }\n\n  // Uncollapse the nav\n  @media (min-width: @grid-float-breakpoint) {\n    float: left;\n    margin: 0;\n\n    > li {\n      float: left;\n      > a {\n        padding-top:    @navbar-padding-vertical;\n        padding-bottom: @navbar-padding-vertical;\n      }\n    }\n\n    &.navbar-right:last-child {\n      margin-right: -@navbar-padding-horizontal;\n    }\n  }\n}\n\n\n// Component alignment\n//\n// Repurpose the pull utilities as their own navbar utilities to avoid specificity\n// issues with parents and chaining. Only do this when the navbar is uncollapsed\n// though so that navbar contents properly stack and align in mobile.\n\n@media (min-width: @grid-float-breakpoint) {\n  .navbar-left  { .pull-left(); }\n  .navbar-right { .pull-right(); }\n}\n\n\n// Navbar form\n//\n// Extension of the `.form-inline` with some extra flavor for optimum display in\n// our navbars.\n\n.navbar-form {\n  margin-left: -@navbar-padding-horizontal;\n  margin-right: -@navbar-padding-horizontal;\n  padding: 10px @navbar-padding-horizontal;\n  border-top: 1px solid transparent;\n  border-bottom: 1px solid transparent;\n  @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);\n  .box-shadow(@shadow);\n\n  // Mixin behavior for optimum display\n  .form-inline();\n\n  .form-group {\n    @media (max-width: @grid-float-breakpoint-max) {\n      margin-bottom: 5px;\n    }\n  }\n\n  // Vertically center in expanded, horizontal navbar\n  .navbar-vertical-align(@input-height-base);\n\n  // Undo 100% width for pull classes\n  @media (min-width: @grid-float-breakpoint) {\n    width: auto;\n    border: 0;\n    margin-left: 0;\n    margin-right: 0;\n    padding-top: 0;\n    padding-bottom: 0;\n    .box-shadow(none);\n\n    // Outdent the form if last child to line up with content down the page\n    &.navbar-right:last-child {\n      margin-right: -@navbar-padding-horizontal;\n    }\n  }\n}\n\n\n// Dropdown menus\n\n// Menu position and menu carets\n.navbar-nav > li > .dropdown-menu {\n  margin-top: 0;\n  .border-top-radius(0);\n}\n// Menu position and menu caret support for dropups via extra dropup class\n.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {\n  .border-bottom-radius(0);\n}\n\n\n// Buttons in navbars\n//\n// Vertically center a button within a navbar (when *not* in a form).\n\n.navbar-btn {\n  .navbar-vertical-align(@input-height-base);\n\n  &.btn-sm {\n    .navbar-vertical-align(@input-height-small);\n  }\n  &.btn-xs {\n    .navbar-vertical-align(22);\n  }\n}\n\n\n// Text in navbars\n//\n// Add a class to make any element properly align itself vertically within the navbars.\n\n.navbar-text {\n  .navbar-vertical-align(@line-height-computed);\n\n  @media (min-width: @grid-float-breakpoint) {\n    float: left;\n    margin-left: @navbar-padding-horizontal;\n    margin-right: @navbar-padding-horizontal;\n\n    // Outdent the form if last child to line up with content down the page\n    &.navbar-right:last-child {\n      margin-right: 0;\n    }\n  }\n}\n\n// Alternate navbars\n// --------------------------------------------------\n\n// Default navbar\n.navbar-default {\n  background-color: @navbar-default-bg;\n  border-color: @navbar-default-border;\n\n  .navbar-brand {\n    color: @navbar-default-brand-color;\n    &:hover,\n    &:focus {\n      color: @navbar-default-brand-hover-color;\n      background-color: @navbar-default-brand-hover-bg;\n    }\n  }\n\n  .navbar-text {\n    color: @navbar-default-color;\n  }\n\n  .navbar-nav {\n    > li > a {\n      color: @navbar-default-link-color;\n\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-hover-color;\n        background-color: @navbar-default-link-hover-bg;\n      }\n    }\n    > .active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-active-color;\n        background-color: @navbar-default-link-active-bg;\n      }\n    }\n    > .disabled > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-disabled-color;\n        background-color: @navbar-default-link-disabled-bg;\n      }\n    }\n  }\n\n  .navbar-toggle {\n    border-color: @navbar-default-toggle-border-color;\n    &:hover,\n    &:focus {\n      background-color: @navbar-default-toggle-hover-bg;\n    }\n    .icon-bar {\n      background-color: @navbar-default-toggle-icon-bar-bg;\n    }\n  }\n\n  .navbar-collapse,\n  .navbar-form {\n    border-color: @navbar-default-border;\n  }\n\n  // Dropdown menu items\n  .navbar-nav {\n    // Remove background color from open dropdown\n    > .open > a {\n      &,\n      &:hover,\n      &:focus {\n        background-color: @navbar-default-link-active-bg;\n        color: @navbar-default-link-active-color;\n      }\n    }\n\n    @media (max-width: @grid-float-breakpoint-max) {\n      // Dropdowns get custom display when collapsed\n      .open .dropdown-menu {\n        > li > a {\n          color: @navbar-default-link-color;\n          &:hover,\n          &:focus {\n            color: @navbar-default-link-hover-color;\n            background-color: @navbar-default-link-hover-bg;\n          }\n        }\n        > .active > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-default-link-active-color;\n            background-color: @navbar-default-link-active-bg;\n          }\n        }\n        > .disabled > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-default-link-disabled-color;\n            background-color: @navbar-default-link-disabled-bg;\n          }\n        }\n      }\n    }\n  }\n\n\n  // Links in navbars\n  //\n  // Add a class to ensure links outside the navbar nav are colored correctly.\n\n  .navbar-link {\n    color: @navbar-default-link-color;\n    &:hover {\n      color: @navbar-default-link-hover-color;\n    }\n  }\n\n}\n\n// Inverse navbar\n\n.navbar-inverse {\n  background-color: @navbar-inverse-bg;\n  border-color: @navbar-inverse-border;\n\n  .navbar-brand {\n    color: @navbar-inverse-brand-color;\n    &:hover,\n    &:focus {\n      color: @navbar-inverse-brand-hover-color;\n      background-color: @navbar-inverse-brand-hover-bg;\n    }\n  }\n\n  .navbar-text {\n    color: @navbar-inverse-color;\n  }\n\n  .navbar-nav {\n    > li > a {\n      color: @navbar-inverse-link-color;\n\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-hover-color;\n        background-color: @navbar-inverse-link-hover-bg;\n      }\n    }\n    > .active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-active-color;\n        background-color: @navbar-inverse-link-active-bg;\n      }\n    }\n    > .disabled > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-disabled-color;\n        background-color: @navbar-inverse-link-disabled-bg;\n      }\n    }\n  }\n\n  // Darken the responsive nav toggle\n  .navbar-toggle {\n    border-color: @navbar-inverse-toggle-border-color;\n    &:hover,\n    &:focus {\n      background-color: @navbar-inverse-toggle-hover-bg;\n    }\n    .icon-bar {\n      background-color: @navbar-inverse-toggle-icon-bar-bg;\n    }\n  }\n\n  .navbar-collapse,\n  .navbar-form {\n    border-color: darken(@navbar-inverse-bg, 7%);\n  }\n\n  // Dropdowns\n  .navbar-nav {\n    > .open > a {\n      &,\n      &:hover,\n      &:focus {\n        background-color: @navbar-inverse-link-active-bg;\n        color: @navbar-inverse-link-active-color;\n      }\n    }\n\n    @media (max-width: @grid-float-breakpoint-max) {\n      // Dropdowns get custom display\n      .open .dropdown-menu {\n        > .dropdown-header {\n          border-color: @navbar-inverse-border;\n        }\n        .divider {\n          background-color: @navbar-inverse-border;\n        }\n        > li > a {\n          color: @navbar-inverse-link-color;\n          &:hover,\n          &:focus {\n            color: @navbar-inverse-link-hover-color;\n            background-color: @navbar-inverse-link-hover-bg;\n          }\n        }\n        > .active > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-inverse-link-active-color;\n            background-color: @navbar-inverse-link-active-bg;\n          }\n        }\n        > .disabled > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-inverse-link-disabled-color;\n            background-color: @navbar-inverse-link-disabled-bg;\n          }\n        }\n      }\n    }\n  }\n\n  .navbar-link {\n    color: @navbar-inverse-link-color;\n    &:hover {\n      color: @navbar-inverse-link-hover-color;\n    }\n  }\n\n}\n","//\n// Utility classes\n// --------------------------------------------------\n\n\n// Floats\n// -------------------------\n\n.clearfix {\n  .clearfix();\n}\n.center-block {\n  .center-block();\n}\n.pull-right {\n  float: right !important;\n}\n.pull-left {\n  float: left !important;\n}\n\n\n// Toggling content\n// -------------------------\n\n// Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1\n.hide {\n  display: none !important;\n}\n.show {\n  display: block !important;\n}\n.invisible {\n  visibility: hidden;\n}\n.text-hide {\n  .text-hide();\n}\n\n\n// Hide from screenreaders and browsers\n//\n// Credit: HTML5 Boilerplate\n\n.hidden {\n  display: none !important;\n  visibility: hidden !important;\n}\n\n\n// For Affix plugin\n// -------------------------\n\n.affix {\n  position: fixed;\n}\n","//\n// Breadcrumbs\n// --------------------------------------------------\n\n\n.breadcrumb {\n  padding: @breadcrumb-padding-vertical @breadcrumb-padding-horizontal;\n  margin-bottom: @line-height-computed;\n  list-style: none;\n  background-color: @breadcrumb-bg;\n  border-radius: @border-radius-base;\n\n  > li {\n    display: inline-block;\n\n    + li:before {\n      content: \"@{breadcrumb-separator}\\00a0\"; // Unicode space added since inline-block means non-collapsing white-space\n      padding: 0 5px;\n      color: @breadcrumb-color;\n    }\n  }\n\n  > .active {\n    color: @breadcrumb-active-color;\n  }\n}\n","//\n// Pagination (multiple pages)\n// --------------------------------------------------\n.pagination {\n  display: inline-block;\n  padding-left: 0;\n  margin: @line-height-computed 0;\n  border-radius: @border-radius-base;\n\n  > li {\n    display: inline; // Remove list-style and block-level defaults\n    > a,\n    > span {\n      position: relative;\n      float: left; // Collapse white-space\n      padding: @padding-base-vertical @padding-base-horizontal;\n      line-height: @line-height-base;\n      text-decoration: none;\n      color: @pagination-color;\n      background-color: @pagination-bg;\n      border: 1px solid @pagination-border;\n      margin-left: -1px;\n    }\n    &:first-child {\n      > a,\n      > span {\n        margin-left: 0;\n        .border-left-radius(@border-radius-base);\n      }\n    }\n    &:last-child {\n      > a,\n      > span {\n        .border-right-radius(@border-radius-base);\n      }\n    }\n  }\n\n  > li > a,\n  > li > span {\n    &:hover,\n    &:focus {\n      color: @pagination-hover-color;\n      background-color: @pagination-hover-bg;\n      border-color: @pagination-hover-border;\n    }\n  }\n\n  > .active > a,\n  > .active > span {\n    &,\n    &:hover,\n    &:focus {\n      z-index: 2;\n      color: @pagination-active-color;\n      background-color: @pagination-active-bg;\n      border-color: @pagination-active-border;\n      cursor: default;\n    }\n  }\n\n  > .disabled {\n    > span,\n    > span:hover,\n    > span:focus,\n    > a,\n    > a:hover,\n    > a:focus {\n      color: @pagination-disabled-color;\n      background-color: @pagination-disabled-bg;\n      border-color: @pagination-disabled-border;\n      cursor: not-allowed;\n    }\n  }\n}\n\n// Sizing\n// --------------------------------------------------\n\n// Large\n.pagination-lg {\n  .pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @border-radius-large);\n}\n\n// Small\n.pagination-sm {\n  .pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @border-radius-small);\n}\n","//\n// Pager pagination\n// --------------------------------------------------\n\n\n.pager {\n  padding-left: 0;\n  margin: @line-height-computed 0;\n  list-style: none;\n  text-align: center;\n  &:extend(.clearfix all);\n  li {\n    display: inline;\n    > a,\n    > span {\n      display: inline-block;\n      padding: 5px 14px;\n      background-color: @pager-bg;\n      border: 1px solid @pager-border;\n      border-radius: @pager-border-radius;\n    }\n\n    > a:hover,\n    > a:focus {\n      text-decoration: none;\n      background-color: @pager-hover-bg;\n    }\n  }\n\n  .next {\n    > a,\n    > span {\n      float: right;\n    }\n  }\n\n  .previous {\n    > a,\n    > span {\n      float: left;\n    }\n  }\n\n  .disabled {\n    > a,\n    > a:hover,\n    > a:focus,\n    > span {\n      color: @pager-disabled-color;\n      background-color: @pager-bg;\n      cursor: not-allowed;\n    }\n  }\n\n}\n","//\n// Labels\n// --------------------------------------------------\n\n.label {\n  display: inline;\n  padding: .2em .6em .3em;\n  font-size: 75%;\n  font-weight: bold;\n  line-height: 1;\n  color: @label-color;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  border-radius: .25em;\n\n  // Add hover effects, but only for links\n  &[href] {\n    &:hover,\n    &:focus {\n      color: @label-link-hover-color;\n      text-decoration: none;\n      cursor: pointer;\n    }\n  }\n\n  // Empty labels collapse automatically (not available in IE8)\n  &:empty {\n    display: none;\n  }\n\n  // Quick fix for labels in buttons\n  .btn & {\n    position: relative;\n    top: -1px;\n  }\n}\n\n// Colors\n// Contextual variations (linked labels get darker on :hover)\n\n.label-default {\n  .label-variant(@label-default-bg);\n}\n\n.label-primary {\n  .label-variant(@label-primary-bg);\n}\n\n.label-success {\n  .label-variant(@label-success-bg);\n}\n\n.label-info {\n  .label-variant(@label-info-bg);\n}\n\n.label-warning {\n  .label-variant(@label-warning-bg);\n}\n\n.label-danger {\n  .label-variant(@label-danger-bg);\n}\n","//\n// Badges\n// --------------------------------------------------\n\n\n// Base classes\n.badge {\n  display: inline-block;\n  min-width: 10px;\n  padding: 3px 7px;\n  font-size: @font-size-small;\n  font-weight: @badge-font-weight;\n  color: @badge-color;\n  line-height: @badge-line-height;\n  vertical-align: baseline;\n  white-space: nowrap;\n  text-align: center;\n  background-color: @badge-bg;\n  border-radius: @badge-border-radius;\n\n  // Empty badges collapse automatically (not available in IE8)\n  &:empty {\n    display: none;\n  }\n\n  // Quick fix for badges in buttons\n  .btn & {\n    position: relative;\n    top: -1px;\n  }\n  .btn-xs & {\n    top: 0;\n    padding: 1px 5px;\n  }\n}\n\n// Hover state, but only for links\na.badge {\n  &:hover,\n  &:focus {\n    color: @badge-link-hover-color;\n    text-decoration: none;\n    cursor: pointer;\n  }\n}\n\n// Account for counters in navs\na.list-group-item.active > .badge,\n.nav-pills > .active > a > .badge {\n  color: @badge-active-color;\n  background-color: @badge-active-bg;\n}\n.nav-pills > li > a > .badge {\n  margin-left: 3px;\n}\n","//\n// Jumbotron\n// --------------------------------------------------\n\n\n.jumbotron {\n  padding: @jumbotron-padding;\n  margin-bottom: @jumbotron-padding;\n  color: @jumbotron-color;\n  background-color: @jumbotron-bg;\n\n  h1,\n  .h1 {\n    color: @jumbotron-heading-color;\n  }\n  p {\n    margin-bottom: (@jumbotron-padding / 2);\n    font-size: @jumbotron-font-size;\n    font-weight: 200;\n  }\n\n  .container & {\n    border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container\n  }\n\n  .container {\n    max-width: 100%;\n  }\n\n  @media screen and (min-width: @screen-sm-min) {\n    padding-top:    (@jumbotron-padding * 1.6);\n    padding-bottom: (@jumbotron-padding * 1.6);\n\n    .container & {\n      padding-left:  (@jumbotron-padding * 2);\n      padding-right: (@jumbotron-padding * 2);\n    }\n\n    h1,\n    .h1 {\n      font-size: (@font-size-base * 4.5);\n    }\n  }\n}\n","//\n// Alerts\n// --------------------------------------------------\n\n\n// Base styles\n// -------------------------\n\n.alert {\n  padding: @alert-padding;\n  margin-bottom: @line-height-computed;\n  border: 1px solid transparent;\n  border-radius: @alert-border-radius;\n\n  // Headings for larger alerts\n  h4 {\n    margin-top: 0;\n    // Specified for the h4 to prevent conflicts of changing @headings-color\n    color: inherit;\n  }\n  // Provide class for links that match alerts\n  .alert-link {\n    font-weight: @alert-link-font-weight;\n  }\n\n  // Improve alignment and spacing of inner content\n  > p,\n  > ul {\n    margin-bottom: 0;\n  }\n  > p + p {\n    margin-top: 5px;\n  }\n}\n\n// Dismissable alerts\n//\n// Expand the right padding and account for the close button's positioning.\n\n.alert-dismissable {\n padding-right: (@alert-padding + 20);\n\n  // Adjust close link position\n  .close {\n    position: relative;\n    top: -2px;\n    right: -21px;\n    color: inherit;\n  }\n}\n\n// Alternate styles\n//\n// Generate contextual modifier classes for colorizing the alert.\n\n.alert-success {\n  .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);\n}\n.alert-info {\n  .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);\n}\n.alert-warning {\n  .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);\n}\n.alert-danger {\n  .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);\n}\n","//\n// Progress bars\n// --------------------------------------------------\n\n\n// Bar animations\n// -------------------------\n\n// WebKit\n@-webkit-keyframes progress-bar-stripes {\n  from  { background-position: 40px 0; }\n  to    { background-position: 0 0; }\n}\n\n// Spec and IE10+\n@keyframes progress-bar-stripes {\n  from  { background-position: 40px 0; }\n  to    { background-position: 0 0; }\n}\n\n\n\n// Bar itself\n// -------------------------\n\n// Outer container\n.progress {\n  overflow: hidden;\n  height: @line-height-computed;\n  margin-bottom: @line-height-computed;\n  background-color: @progress-bg;\n  border-radius: @border-radius-base;\n  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));\n}\n\n// Bar of progress\n.progress-bar {\n  float: left;\n  width: 0%;\n  height: 100%;\n  font-size: @font-size-small;\n  line-height: @line-height-computed;\n  color: @progress-bar-color;\n  text-align: center;\n  background-color: @progress-bar-bg;\n  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));\n  .transition(width .6s ease);\n}\n\n// Striped bars\n.progress-striped .progress-bar {\n  #gradient > .striped();\n  background-size: 40px 40px;\n}\n\n// Call animation for the active one\n.progress.active .progress-bar {\n  .animation(progress-bar-stripes 2s linear infinite);\n}\n\n\n\n// Variations\n// -------------------------\n\n.progress-bar-success {\n  .progress-bar-variant(@progress-bar-success-bg);\n}\n\n.progress-bar-info {\n  .progress-bar-variant(@progress-bar-info-bg);\n}\n\n.progress-bar-warning {\n  .progress-bar-variant(@progress-bar-warning-bg);\n}\n\n.progress-bar-danger {\n  .progress-bar-variant(@progress-bar-danger-bg);\n}\n","// Media objects\n// Source: http://stubbornella.org/content/?p=497\n// --------------------------------------------------\n\n\n// Common styles\n// -------------------------\n\n// Clear the floats\n.media,\n.media-body {\n  overflow: hidden;\n  zoom: 1;\n}\n\n// Proper spacing between instances of .media\n.media,\n.media .media {\n  margin-top: 15px;\n}\n.media:first-child {\n  margin-top: 0;\n}\n\n// For images and videos, set to block\n.media-object {\n  display: block;\n}\n\n// Reset margins on headings for tighter default spacing\n.media-heading {\n  margin: 0 0 5px;\n}\n\n\n// Media image alignment\n// -------------------------\n\n.media {\n  > .pull-left {\n    margin-right: 10px;\n  }\n  > .pull-right {\n    margin-left: 10px;\n  }\n}\n\n\n// Media list variation\n// -------------------------\n\n// Undo default ul/ol styles\n.media-list {\n  padding-left: 0;\n  list-style: none;\n}\n","//\n// List groups\n// --------------------------------------------------\n\n\n// Base class\n//\n// Easily usable on 
    , 
      , or 
      .\n\n.list-group {\n  // No need to set list-style: none; since .list-group-item is block level\n  margin-bottom: 20px;\n  padding-left: 0; // reset padding because ul and ol\n}\n\n\n// Individual list items\n//\n// Use on `li`s or `div`s within the `.list-group` parent.\n\n.list-group-item {\n  position: relative;\n  display: block;\n  padding: 10px 15px;\n  // Place the border on the list items and negative margin up for better styling\n  margin-bottom: -1px;\n  background-color: @list-group-bg;\n  border: 1px solid @list-group-border;\n\n  // Round the first and last items\n  &:first-child {\n    .border-top-radius(@list-group-border-radius);\n  }\n  &:last-child {\n    margin-bottom: 0;\n    .border-bottom-radius(@list-group-border-radius);\n  }\n\n  // Align badges within list items\n  > .badge {\n    float: right;\n  }\n  > .badge + .badge {\n    margin-right: 5px;\n  }\n}\n\n\n// Linked list items\n//\n// Use anchor elements instead of `li`s or `div`s to create linked list items.\n// Includes an extra `.active` modifier class for showing selected items.\n\na.list-group-item {\n  color: @list-group-link-color;\n\n  .list-group-item-heading {\n    color: @list-group-link-heading-color;\n  }\n\n  // Hover state\n  &:hover,\n  &:focus {\n    text-decoration: none;\n    background-color: @list-group-hover-bg;\n  }\n\n  // Active class on item itself, not parent\n  &.active,\n  &.active:hover,\n  &.active:focus {\n    z-index: 2; // Place active items above their siblings for proper border styling\n    color: @list-group-active-color;\n    background-color: @list-group-active-bg;\n    border-color: @list-group-active-border;\n\n    // Force color to inherit for custom content\n    .list-group-item-heading {\n      color: inherit;\n    }\n    .list-group-item-text {\n      color: @list-group-active-text-color;\n    }\n  }\n}\n\n\n// Contextual variants\n//\n// Add modifier classes to change text and background color on individual items.\n// Organizationally, this must come after the `:hover` states.\n\n.list-group-item-variant(success; @state-success-bg; @state-success-text);\n.list-group-item-variant(info; @state-info-bg; @state-info-text);\n.list-group-item-variant(warning; @state-warning-bg; @state-warning-text);\n.list-group-item-variant(danger; @state-danger-bg; @state-danger-text);\n\n\n// Custom content options\n//\n// Extra classes for creating well-formatted content within `.list-group-item`s.\n\n.list-group-item-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n.list-group-item-text {\n  margin-bottom: 0;\n  line-height: 1.3;\n}\n","//\n// Panels\n// --------------------------------------------------\n\n\n// Base class\n.panel {\n  margin-bottom: @line-height-computed;\n  background-color: @panel-bg;\n  border: 1px solid transparent;\n  border-radius: @panel-border-radius;\n  .box-shadow(0 1px 1px rgba(0,0,0,.05));\n}\n\n// Panel contents\n.panel-body {\n  padding: @panel-body-padding;\n  &:extend(.clearfix all);\n}\n\n// Optional heading\n.panel-heading {\n  padding: 10px 15px;\n  border-bottom: 1px solid transparent;\n  .border-top-radius((@panel-border-radius - 1));\n\n  > .dropdown .dropdown-toggle {\n    color: inherit;\n  }\n}\n\n// Within heading, strip any `h*` tag of its default margins for spacing.\n.panel-title {\n  margin-top: 0;\n  margin-bottom: 0;\n  font-size: ceil((@font-size-base * 1.125));\n  color: inherit;\n\n  > a {\n    color: inherit;\n  }\n}\n\n// Optional footer (stays gray in every modifier class)\n.panel-footer {\n  padding: 10px 15px;\n  background-color: @panel-footer-bg;\n  border-top: 1px solid @panel-inner-border;\n  .border-bottom-radius((@panel-border-radius - 1));\n}\n\n\n// List groups in panels\n//\n// By default, space out list group content from panel headings to account for\n// any kind of custom content between the two.\n\n.panel {\n  > .list-group {\n    margin-bottom: 0;\n\n    .list-group-item {\n      border-width: 1px 0;\n      border-radius: 0;\n    }\n\n    // Add border top radius for first one\n    &:first-child {\n      .list-group-item:first-child {\n        border-top: 0;\n        .border-top-radius((@panel-border-radius - 1));\n      }\n    }\n    // Add border bottom radius for last one\n    &:last-child {\n      .list-group-item:last-child {\n        border-bottom: 0;\n        .border-bottom-radius((@panel-border-radius - 1));\n      }\n    }\n  }\n}\n// Collapse space between when there's no additional content.\n.panel-heading + .list-group {\n  .list-group-item:first-child {\n    border-top-width: 0;\n  }\n}\n\n\n// Tables in panels\n//\n// Place a non-bordered `.table` within a panel (not within a `.panel-body`) and\n// watch it go full width.\n\n.panel {\n  > .table,\n  > .table-responsive > .table {\n    margin-bottom: 0;\n  }\n  // Add border top radius for first one\n  > .table:first-child,\n  > .table-responsive:first-child > .table:first-child {\n    .border-top-radius((@panel-border-radius - 1));\n\n    > thead:first-child,\n    > tbody:first-child {\n      > tr:first-child {\n        td:first-child,\n        th:first-child {\n          border-top-left-radius: (@panel-border-radius - 1);\n        }\n        td:last-child,\n        th:last-child {\n          border-top-right-radius: (@panel-border-radius - 1);\n        }\n      }\n    }\n  }\n  // Add border bottom radius for last one\n  > .table:last-child,\n  > .table-responsive:last-child > .table:last-child {\n    .border-bottom-radius((@panel-border-radius - 1));\n\n    > tbody:last-child,\n    > tfoot:last-child {\n      > tr:last-child {\n        td:first-child,\n        th:first-child {\n          border-bottom-left-radius: (@panel-border-radius - 1);\n        }\n        td:last-child,\n        th:last-child {\n          border-bottom-right-radius: (@panel-border-radius - 1);\n        }\n      }\n    }\n  }\n  > .panel-body + .table,\n  > .panel-body + .table-responsive {\n    border-top: 1px solid @table-border-color;\n  }\n  > .table > tbody:first-child > tr:first-child th,\n  > .table > tbody:first-child > tr:first-child td {\n    border-top: 0;\n  }\n  > .table-bordered,\n  > .table-responsive > .table-bordered {\n    border: 0;\n    > thead,\n    > tbody,\n    > tfoot {\n      > tr {\n        > th:first-child,\n        > td:first-child {\n          border-left: 0;\n        }\n        > th:last-child,\n        > td:last-child {\n          border-right: 0;\n        }\n      }\n    }\n    > thead,\n    > tbody {\n      > tr:first-child {\n        > td,\n        > th {\n          border-bottom: 0;\n        }\n      }\n    }\n    > tbody,\n    > tfoot {\n      > tr:last-child {\n        > td,\n        > th {\n          border-bottom: 0;\n        }\n      }\n    }\n  }\n  > .table-responsive {\n    border: 0;\n    margin-bottom: 0;\n  }\n}\n\n\n// Collapsable panels (aka, accordion)\n//\n// Wrap a series of panels in `.panel-group` to turn them into an accordion with\n// the help of our collapse JavaScript plugin.\n\n.panel-group {\n  margin-bottom: @line-height-computed;\n\n  // Tighten up margin so it's only between panels\n  .panel {\n    margin-bottom: 0;\n    border-radius: @panel-border-radius;\n    overflow: hidden; // crop contents when collapsed\n    + .panel {\n      margin-top: 5px;\n    }\n  }\n\n  .panel-heading {\n    border-bottom: 0;\n    + .panel-collapse .panel-body {\n      border-top: 1px solid @panel-inner-border;\n    }\n  }\n  .panel-footer {\n    border-top: 0;\n    + .panel-collapse .panel-body {\n      border-bottom: 1px solid @panel-inner-border;\n    }\n  }\n}\n\n\n// Contextual variations\n.panel-default {\n  .panel-variant(@panel-default-border; @panel-default-text; @panel-default-heading-bg; @panel-default-border);\n}\n.panel-primary {\n  .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border);\n}\n.panel-success {\n  .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);\n}\n.panel-info {\n  .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);\n}\n.panel-warning {\n  .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);\n}\n.panel-danger {\n  .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);\n}\n","//\n// Wells\n// --------------------------------------------------\n\n\n// Base class\n.well {\n  min-height: 20px;\n  padding: 19px;\n  margin-bottom: 20px;\n  background-color: @well-bg;\n  border: 1px solid @well-border;\n  border-radius: @border-radius-base;\n  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));\n  blockquote {\n    border-color: #ddd;\n    border-color: rgba(0,0,0,.15);\n  }\n}\n\n// Sizes\n.well-lg {\n  padding: 24px;\n  border-radius: @border-radius-large;\n}\n.well-sm {\n  padding: 9px;\n  border-radius: @border-radius-small;\n}\n","//\n// Close icons\n// --------------------------------------------------\n\n\n.close {\n  float: right;\n  font-size: (@font-size-base * 1.5);\n  font-weight: @close-font-weight;\n  line-height: 1;\n  color: @close-color;\n  text-shadow: @close-text-shadow;\n  .opacity(.2);\n\n  &:hover,\n  &:focus {\n    color: @close-color;\n    text-decoration: none;\n    cursor: pointer;\n    .opacity(.5);\n  }\n\n  // Additional properties for button version\n  // iOS requires the button element instead of an anchor tag.\n  // If you want the anchor version, it requires `href=\"#\"`.\n  button& {\n    padding: 0;\n    cursor: pointer;\n    background: transparent;\n    border: 0;\n    -webkit-appearance: none;\n  }\n}\n","//\n// Modals\n// --------------------------------------------------\n\n// .modal-open      - body class for killing the scroll\n// .modal           - container to scroll within\n// .modal-dialog    - positioning shell for the actual modal\n// .modal-content   - actual modal w/ bg and corners and shit\n\n// Kill the scroll on the body\n.modal-open {\n  overflow: hidden;\n}\n\n// Container that the modal scrolls within\n.modal {\n  display: none;\n  overflow: auto;\n  overflow-y: scroll;\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: @zindex-modal;\n  -webkit-overflow-scrolling: touch;\n\n  // Prevent Chrome on Windows from adding a focus outline. For details, see\n  // https://github.com/twbs/bootstrap/pull/10951.\n  outline: 0;\n\n  // When fading in the modal, animate it to slide down\n  &.fade .modal-dialog {\n    .translate(0, -25%);\n    .transition-transform(~\"0.3s ease-out\");\n  }\n  &.in .modal-dialog { .translate(0, 0)}\n}\n\n// Shell div to position the modal with bottom padding\n.modal-dialog {\n  position: relative;\n  width: auto;\n  margin: 10px;\n}\n\n// Actual modal\n.modal-content {\n  position: relative;\n  background-color: @modal-content-bg;\n  border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)\n  border: 1px solid @modal-content-border-color;\n  border-radius: @border-radius-large;\n  .box-shadow(0 3px 9px rgba(0,0,0,.5));\n  background-clip: padding-box;\n  // Remove focus outline from opened modal\n  outline: none;\n}\n\n// Modal background\n.modal-backdrop {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: @zindex-modal-background;\n  background-color: @modal-backdrop-bg;\n  // Fade for backdrop\n  &.fade { .opacity(0); }\n  &.in { .opacity(@modal-backdrop-opacity); }\n}\n\n// Modal header\n// Top section of the modal w/ title and dismiss\n.modal-header {\n  padding: @modal-title-padding;\n  border-bottom: 1px solid @modal-header-border-color;\n  min-height: (@modal-title-padding + @modal-title-line-height);\n}\n// Close icon\n.modal-header .close {\n  margin-top: -2px;\n}\n\n// Title text within header\n.modal-title {\n  margin: 0;\n  line-height: @modal-title-line-height;\n}\n\n// Modal body\n// Where all modal content resides (sibling of .modal-header and .modal-footer)\n.modal-body {\n  position: relative;\n  padding: @modal-inner-padding;\n}\n\n// Footer (for actions)\n.modal-footer {\n  margin-top: 15px;\n  padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding;\n  text-align: right; // right align buttons\n  border-top: 1px solid @modal-footer-border-color;\n  &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons\n\n  // Properly space out buttons\n  .btn + .btn {\n    margin-left: 5px;\n    margin-bottom: 0; // account for input[type=\"submit\"] which gets the bottom margin like all other inputs\n  }\n  // but override that for button groups\n  .btn-group .btn + .btn {\n    margin-left: -1px;\n  }\n  // and override it for block buttons as well\n  .btn-block + .btn-block {\n    margin-left: 0;\n  }\n}\n\n// Scale up the modal\n@media (min-width: @screen-sm-min) {\n  // Automatically set modal's width for larger viewports\n  .modal-dialog {\n    width: @modal-md;\n    margin: 30px auto;\n  }\n  .modal-content {\n    .box-shadow(0 5px 15px rgba(0,0,0,.5));\n  }\n\n  // Modal sizes\n  .modal-sm { width: @modal-sm; }\n}\n\n@media (min-width: @screen-md-min) {\n  .modal-lg { width: @modal-lg; }\n}\n","//\n// Tooltips\n// --------------------------------------------------\n\n\n// Base class\n.tooltip {\n  position: absolute;\n  z-index: @zindex-tooltip;\n  display: block;\n  visibility: visible;\n  font-size: @font-size-small;\n  line-height: 1.4;\n  .opacity(0);\n\n  &.in     { .opacity(@tooltip-opacity); }\n  &.top    { margin-top:  -3px; padding: @tooltip-arrow-width 0; }\n  &.right  { margin-left:  3px; padding: 0 @tooltip-arrow-width; }\n  &.bottom { margin-top:   3px; padding: @tooltip-arrow-width 0; }\n  &.left   { margin-left: -3px; padding: 0 @tooltip-arrow-width; }\n}\n\n// Wrapper for the tooltip content\n.tooltip-inner {\n  max-width: @tooltip-max-width;\n  padding: 3px 8px;\n  color: @tooltip-color;\n  text-align: center;\n  text-decoration: none;\n  background-color: @tooltip-bg;\n  border-radius: @border-radius-base;\n}\n\n// Arrows\n.tooltip-arrow {\n  position: absolute;\n  width: 0;\n  height: 0;\n  border-color: transparent;\n  border-style: solid;\n}\n.tooltip {\n  &.top .tooltip-arrow {\n    bottom: 0;\n    left: 50%;\n    margin-left: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-top-color: @tooltip-arrow-color;\n  }\n  &.top-left .tooltip-arrow {\n    bottom: 0;\n    left: @tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-top-color: @tooltip-arrow-color;\n  }\n  &.top-right .tooltip-arrow {\n    bottom: 0;\n    right: @tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-top-color: @tooltip-arrow-color;\n  }\n  &.right .tooltip-arrow {\n    top: 50%;\n    left: 0;\n    margin-top: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-right-color: @tooltip-arrow-color;\n  }\n  &.left .tooltip-arrow {\n    top: 50%;\n    right: 0;\n    margin-top: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-left-color: @tooltip-arrow-color;\n  }\n  &.bottom .tooltip-arrow {\n    top: 0;\n    left: 50%;\n    margin-left: -@tooltip-arrow-width;\n    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-bottom-color: @tooltip-arrow-color;\n  }\n  &.bottom-left .tooltip-arrow {\n    top: 0;\n    left: @tooltip-arrow-width;\n    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-bottom-color: @tooltip-arrow-color;\n  }\n  &.bottom-right .tooltip-arrow {\n    top: 0;\n    right: @tooltip-arrow-width;\n    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-bottom-color: @tooltip-arrow-color;\n  }\n}\n","//\n// Popovers\n// --------------------------------------------------\n\n\n.popover {\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: @zindex-popover;\n  display: none;\n  max-width: @popover-max-width;\n  padding: 1px;\n  text-align: left; // Reset given new insertion method\n  background-color: @popover-bg;\n  background-clip: padding-box;\n  border: 1px solid @popover-fallback-border-color;\n  border: 1px solid @popover-border-color;\n  border-radius: @border-radius-large;\n  .box-shadow(0 5px 10px rgba(0,0,0,.2));\n\n  // Overrides for proper insertion\n  white-space: normal;\n\n  // Offset the popover to account for the popover arrow\n  &.top     { margin-top: -@popover-arrow-width; }\n  &.right   { margin-left: @popover-arrow-width; }\n  &.bottom  { margin-top: @popover-arrow-width; }\n  &.left    { margin-left: -@popover-arrow-width; }\n}\n\n.popover-title {\n  margin: 0; // reset heading margin\n  padding: 8px 14px;\n  font-size: @font-size-base;\n  font-weight: normal;\n  line-height: 18px;\n  background-color: @popover-title-bg;\n  border-bottom: 1px solid darken(@popover-title-bg, 5%);\n  border-radius: 5px 5px 0 0;\n}\n\n.popover-content {\n  padding: 9px 14px;\n}\n\n// Arrows\n//\n// .arrow is outer, .arrow:after is inner\n\n.popover > .arrow {\n  &,\n  &:after {\n    position: absolute;\n    display: block;\n    width: 0;\n    height: 0;\n    border-color: transparent;\n    border-style: solid;\n  }\n}\n.popover > .arrow {\n  border-width: @popover-arrow-outer-width;\n}\n.popover > .arrow:after {\n  border-width: @popover-arrow-width;\n  content: \"\";\n}\n\n.popover {\n  &.top > .arrow {\n    left: 50%;\n    margin-left: -@popover-arrow-outer-width;\n    border-bottom-width: 0;\n    border-top-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-top-color: @popover-arrow-outer-color;\n    bottom: -@popover-arrow-outer-width;\n    &:after {\n      content: \" \";\n      bottom: 1px;\n      margin-left: -@popover-arrow-width;\n      border-bottom-width: 0;\n      border-top-color: @popover-arrow-color;\n    }\n  }\n  &.right > .arrow {\n    top: 50%;\n    left: -@popover-arrow-outer-width;\n    margin-top: -@popover-arrow-outer-width;\n    border-left-width: 0;\n    border-right-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-right-color: @popover-arrow-outer-color;\n    &:after {\n      content: \" \";\n      left: 1px;\n      bottom: -@popover-arrow-width;\n      border-left-width: 0;\n      border-right-color: @popover-arrow-color;\n    }\n  }\n  &.bottom > .arrow {\n    left: 50%;\n    margin-left: -@popover-arrow-outer-width;\n    border-top-width: 0;\n    border-bottom-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-bottom-color: @popover-arrow-outer-color;\n    top: -@popover-arrow-outer-width;\n    &:after {\n      content: \" \";\n      top: 1px;\n      margin-left: -@popover-arrow-width;\n      border-top-width: 0;\n      border-bottom-color: @popover-arrow-color;\n    }\n  }\n\n  &.left > .arrow {\n    top: 50%;\n    right: -@popover-arrow-outer-width;\n    margin-top: -@popover-arrow-outer-width;\n    border-right-width: 0;\n    border-left-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-left-color: @popover-arrow-outer-color;\n    &:after {\n      content: \" \";\n      right: 1px;\n      border-right-width: 0;\n      border-left-color: @popover-arrow-color;\n      bottom: -@popover-arrow-width;\n    }\n  }\n\n}\n","//\n// Responsive: Utility classes\n// --------------------------------------------------\n\n\n// IE10 in Windows (Phone) 8\n//\n// Support for responsive views via media queries is kind of borked in IE10, for\n// Surface/desktop in split view and for Windows Phone 8. This particular fix\n// must be accompanied by a snippet of JavaScript to sniff the user agent and\n// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at\n// our Getting Started page for more information on this bug.\n//\n// For more information, see the following:\n//\n// Issue: https://github.com/twbs/bootstrap/issues/10497\n// Docs: http://getbootstrap.com/getting-started/#browsers\n// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/\n\n@-ms-viewport {\n  width: device-width;\n}\n\n\n// Visibility utilities\n.visible-xs,\n.visible-sm,\n.visible-md,\n.visible-lg {\n  .responsive-invisibility();\n}\n\n.visible-xs {\n  @media (max-width: @screen-xs-max) {\n    .responsive-visibility();\n  }\n}\n.visible-sm {\n  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n    .responsive-visibility();\n  }\n}\n.visible-md {\n  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n    .responsive-visibility();\n  }\n}\n.visible-lg {\n  @media (min-width: @screen-lg-min) {\n    .responsive-visibility();\n  }\n}\n\n.hidden-xs {\n  @media (max-width: @screen-xs-max) {\n    .responsive-invisibility();\n  }\n}\n.hidden-sm {\n  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n    .responsive-invisibility();\n  }\n}\n.hidden-md {\n  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n    .responsive-invisibility();\n  }\n}\n.hidden-lg {\n  @media (min-width: @screen-lg-min) {\n    .responsive-invisibility();\n  }\n}\n\n\n// Print utilities\n//\n// Media queries are placed on the inside to be mixin-friendly.\n\n.visible-print {\n  .responsive-invisibility();\n\n  @media print {\n    .responsive-visibility();\n  }\n}\n\n.hidden-print {\n  @media print {\n    .responsive-invisibility();\n  }\n}\n"]}
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.eot b/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index 4a4ca865..00000000
Binary files a/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.svg b/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index e3e2dc73..00000000
--- a/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.ttf b/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index 67fa00bf..00000000
Binary files a/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.woff b/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 8c54182a..00000000
Binary files a/mindplot/src/main/javascript/libraries/bootstrap/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/img/bootstrap-colorpicker/alpha-horizontal.png b/mindplot/src/main/javascript/libraries/bootstrap/img/bootstrap-colorpicker/alpha-horizontal.png
deleted file mode 100644
index d0a65c08..00000000
Binary files a/mindplot/src/main/javascript/libraries/bootstrap/img/bootstrap-colorpicker/alpha-horizontal.png and /dev/null differ
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/img/bootstrap-colorpicker/hue-horizontal.png b/mindplot/src/main/javascript/libraries/bootstrap/img/bootstrap-colorpicker/hue-horizontal.png
deleted file mode 100644
index a0d9add8..00000000
Binary files a/mindplot/src/main/javascript/libraries/bootstrap/img/bootstrap-colorpicker/hue-horizontal.png and /dev/null differ
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/img/bootstrap-colorpicker/saturation.png b/mindplot/src/main/javascript/libraries/bootstrap/img/bootstrap-colorpicker/saturation.png
deleted file mode 100644
index 594ae50e..00000000
Binary files a/mindplot/src/main/javascript/libraries/bootstrap/img/bootstrap-colorpicker/saturation.png and /dev/null differ
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/img/glyphicons-halflings-blue.png b/mindplot/src/main/javascript/libraries/bootstrap/img/glyphicons-halflings-blue.png
deleted file mode 100644
index a8dca0fc..00000000
Binary files a/mindplot/src/main/javascript/libraries/bootstrap/img/glyphicons-halflings-blue.png and /dev/null differ
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap-colorpicker.js b/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap-colorpicker.js
deleted file mode 100644
index 15f9b9ec..00000000
--- a/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap-colorpicker.js
+++ /dev/null
@@ -1,951 +0,0 @@
-/*!
- * Bootstrap Colorpicker
- * http://mjolnic.github.io/bootstrap-colorpicker/
- *
- * Originally written by (c) 2012 Stefan Petre
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0.txt
- *
- * @todo Update DOCS
- */
-(function($) {
-    'use strict';
-
-    // Color object
-    var Color = function(val) {
-        this.value = {
-            h: 0,
-            s: 0,
-            b: 0,
-            a: 1
-        };
-        this.origFormat = null; // original string format
-        if (val) {
-            if (val.toLowerCase !== undefined) {
-                this.setColor(val);
-            } else if (val.h !== undefined) {
-                this.value = val;
-            }
-        }
-    };
-
-    Color.prototype = {
-        constructor: Color,
-        _sanitizeNumber: function(val) {
-            if (typeof val === 'number') {
-                return val;
-            }
-            if (isNaN(val) || (val === null) || (val === '') || (val === undefined)) {
-                return 1;
-            }
-            if (val.toLowerCase !== undefined) {
-                return parseFloat(val);
-            }
-            return 1;
-        },
-        //parse a string to HSB
-        setColor: function(strVal) {
-            strVal = strVal.toLowerCase();
-            this.value = this.stringToHSB(strVal) ||  {
-                h: 0,
-                s: 0,
-                b: 0,
-                a: 1
-            };
-        },
-        stringToHSB: function(strVal) {
-            strVal = strVal.toLowerCase();
-            var that = this,
-                result = false;
-            $.each(this.stringParsers, function(i, parser) {
-                var match = parser.re.exec(strVal),
-                    values = match && parser.parse.apply(that, [match]),
-                    format = parser.format || 'rgba';
-                if (values) {
-                    if (format.match(/hsla?/)) {
-                        result = that.RGBtoHSB.apply(that, that.HSLtoRGB.apply(that, values));
-                    } else {
-                        result = that.RGBtoHSB.apply(that, values);
-                    }
-                    that.origFormat = format;
-                    return false;
-                }
-                return true;
-            });
-            return result;
-        },
-        setHue: function(h) {
-            this.value.h = 1 - h;
-        },
-        setSaturation: function(s) {
-            this.value.s = s;
-        },
-        setBrightness: function(b) {
-            this.value.b = 1 - b;
-        },
-        setAlpha: function(a) {
-            this.value.a = parseInt((1 - a) * 100, 10) / 100;
-        },
-        toRGB: function(h, s, v, a) {
-            h = h || this.value.h;
-            s = s || this.value.s;
-            v = v || this.value.b;
-            a = a || this.value.a;
-
-            var r, g, b, i, f, p, q, t;
-            if (h && s === undefined && v === undefined) {
-                s = h.s, v = h.v, h = h.h;
-            }
-            i = Math.floor(h * 6);
-            f = h * 6 - i;
-            p = v * (1 - s);
-            q = v * (1 - f * s);
-            t = v * (1 - (1 - f) * s);
-            switch (i % 6) {
-                case 0:
-                    r = v, g = t, b = p;
-                    break;
-                case 1:
-                    r = q, g = v, b = p;
-                    break;
-                case 2:
-                    r = p, g = v, b = t;
-                    break;
-                case 3:
-                    r = p, g = q, b = v;
-                    break;
-                case 4:
-                    r = t, g = p, b = v;
-                    break;
-                case 5:
-                    r = v, g = p, b = q;
-                    break;
-            }
-            return {
-                r: Math.floor(r * 255),
-                g: Math.floor(g * 255),
-                b: Math.floor(b * 255),
-                a: a
-            };
-        },
-        toHex: function(h, s, b, a) {
-            var rgb = this.toRGB(h, s, b, a);
-            return '#' + ((1 << 24) | (parseInt(rgb.r) << 16) | (parseInt(rgb.g) << 8) | parseInt(rgb.b)).toString(16).substr(1);
-        },
-        toHSL: function(h, s, b, a) {
-            h = h || this.value.h;
-            s = s || this.value.s;
-            b = b || this.value.b;
-            a = a || this.value.a;
-
-            var H = h,
-                L = (2 - s) * b,
-                S = s * b;
-            if (L > 0 && L <= 1) {
-                S /= L;
-            } else {
-                S /= 2 - L;
-            }
-            L /= 2;
-            if (S > 1) {
-                S = 1;
-            }
-            return {
-                h: isNaN(H) ? 0 : H,
-                s: isNaN(S) ? 0 : S,
-                l: isNaN(L) ? 0 : L,
-                a: isNaN(a) ? 0 : a,
-            };
-        },
-        RGBtoHSB: function(r, g, b, a) {
-            r /= 255;
-            g /= 255;
-            b /= 255;
-
-            var H, S, V, C;
-            V = Math.max(r, g, b);
-            C = V - Math.min(r, g, b);
-            H = (C === 0 ? null :
-                V === r ? (g - b) / C :
-                V === g ? (b - r) / C + 2 :
-                (r - g) / C + 4
-            );
-            H = ((H + 360) % 6) * 60 / 360;
-            S = C === 0 ? 0 : C / V;
-            return {
-                h: this._sanitizeNumber(H),
-                s: S,
-                b: V,
-                a: this._sanitizeNumber(a)
-            };
-        },
-        HueToRGB: function(p, q, h) {
-            if (h < 0) {
-                h += 1;
-            } else if (h > 1) {
-                h -= 1;
-            }
-            if ((h * 6) < 1) {
-                return p + (q - p) * h * 6;
-            } else if ((h * 2) < 1) {
-                return q;
-            } else if ((h * 3) < 2) {
-                return p + (q - p) * ((2 / 3) - h) * 6;
-            } else {
-                return p;
-            }
-        },
-        HSLtoRGB: function(h, s, l, a) {
-            if (s < 0) {
-                s = 0;
-            }
-            var q;
-            if (l <= 0.5) {
-                q = l * (1 + s);
-            } else {
-                q = l + s - (l * s);
-            }
-
-            var p = 2 * l - q;
-
-            var tr = h + (1 / 3);
-            var tg = h;
-            var tb = h - (1 / 3);
-
-            var r = Math.round(this.HueToRGB(p, q, tr) * 255);
-            var g = Math.round(this.HueToRGB(p, q, tg) * 255);
-            var b = Math.round(this.HueToRGB(p, q, tb) * 255);
-            return [r, g, b, this._sanitizeNumber(a)];
-        },
-        toString: function(format) {
-            format = format ||  'rgba';
-            switch (format) {
-                case 'rgb':
-                    {
-                        var rgb = this.toRGB();
-                        return 'rgb(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ')';
-                    }
-                    break;
-                case 'rgba':
-                    {
-                        var rgb = this.toRGB();
-                        return 'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',' + rgb.a + ')';
-                    }
-                    break;
-                case 'hsl':
-                    {
-                        var hsl = this.toHSL();
-                        return 'hsl(' + Math.round(hsl.h * 360) + ',' + Math.round(hsl.s * 100) + '%,' + Math.round(hsl.l * 100) + '%)';
-                    }
-                    break;
-                case 'hsla':
-                    {
-                        var hsl = this.toHSL();
-                        return 'hsla(' + Math.round(hsl.h * 360) + ',' + Math.round(hsl.s * 100) + '%,' + Math.round(hsl.l * 100) + '%,' + hsl.a + ')';
-                    }
-                    break;
-                case 'hex':
-                    {
-                        return this.toHex();
-                    }
-                    break;
-                default:
-                    {
-                        return false;
-                    }
-                    break;
-            }
-        },
-        // a set of RE's that can match strings and generate color tuples.
-        // from John Resig color plugin
-        // https://github.com/jquery/jquery-color/
-        stringParsers: [{
-            re: /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,
-            format: 'hex',
-            parse: function(execResult) {
-                return [
-                    parseInt(execResult[1], 16),
-                    parseInt(execResult[2], 16),
-                    parseInt(execResult[3], 16),
-                    1
-                ];
-            }
-        }, {
-            re: /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/,
-            format: 'hex',
-            parse: function(execResult) {
-                return [
-                    parseInt(execResult[1] + execResult[1], 16),
-                    parseInt(execResult[2] + execResult[2], 16),
-                    parseInt(execResult[3] + execResult[3], 16),
-                    1
-                ];
-            }
-        }, {
-            re: /rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*?\)/,
-            format: 'rgb',
-            parse: function(execResult) {
-                return [
-                    execResult[1],
-                    execResult[2],
-                    execResult[3],
-                    1
-                ];
-            }
-        }, {
-            re: /rgb\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*?\)/,
-            format: 'rgb',
-            parse: function(execResult) {
-                return [
-                    2.55 * execResult[1],
-                    2.55 * execResult[2],
-                    2.55 * execResult[3],
-                    1
-                ];
-            }
-        }, {
-            re: /rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
-            format: 'rgba',
-            parse: function(execResult) {
-                return [
-                    execResult[1],
-                    execResult[2],
-                    execResult[3],
-                    execResult[4]
-                ];
-            }
-        }, {
-            re: /rgba\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
-            format: 'rgba',
-            parse: function(execResult) {
-                return [
-                    2.55 * execResult[1],
-                    2.55 * execResult[2],
-                    2.55 * execResult[3],
-                    execResult[4]
-                ];
-            }
-        }, {
-            re: /hsl\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*?\)/,
-            format: 'hsl',
-            parse: function(execResult) {
-                return [
-                    execResult[1] / 360,
-                    execResult[2] / 100,
-                    execResult[3] / 100,
-                    execResult[4]
-                ];
-            }
-        }, {
-            re: /hsla\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
-            format: 'hsla',
-            parse: function(execResult) {
-                return [
-                    execResult[1] / 360,
-                    execResult[2] / 100,
-                    execResult[3] / 100,
-                    execResult[4]
-                ];
-            }
-        }, {
-            //predefined color name
-            re: /^([a-z]{3,})$/,
-            format: 'alias',
-            parse: function(execResult) {
-                var hexval = this.colorNameToHex(execResult[0]) ||  '#000000';
-                var match = this.stringParsers[0].re.exec(hexval),
-                    values = match && this.stringParsers[0].parse.apply(this, [match]);
-                return values;
-            }
-        }],
-        colorNameToHex: function(name) {
-            // 140 predefined colors from the HTML Colors spec
-            var colors = {
-                "aliceblue": "#f0f8ff",
-                "antiquewhite": "#faebd7",
-                "aqua": "#00ffff",
-                "aquamarine": "#7fffd4",
-                "azure": "#f0ffff",
-                "beige": "#f5f5dc",
-                "bisque": "#ffe4c4",
-                "black": "#000000",
-                "blanchedalmond": "#ffebcd",
-                "blue": "#0000ff",
-                "blueviolet": "#8a2be2",
-                "brown": "#a52a2a",
-                "burlywood": "#deb887",
-                "cadetblue": "#5f9ea0",
-                "chartreuse": "#7fff00",
-                "chocolate": "#d2691e",
-                "coral": "#ff7f50",
-                "cornflowerblue": "#6495ed",
-                "cornsilk": "#fff8dc",
-                "crimson": "#dc143c",
-                "cyan": "#00ffff",
-                "darkblue": "#00008b",
-                "darkcyan": "#008b8b",
-                "darkgoldenrod": "#b8860b",
-                "darkgray": "#a9a9a9",
-                "darkgreen": "#006400",
-                "darkkhaki": "#bdb76b",
-                "darkmagenta": "#8b008b",
-                "darkolivegreen": "#556b2f",
-                "darkorange": "#ff8c00",
-                "darkorchid": "#9932cc",
-                "darkred": "#8b0000",
-                "darksalmon": "#e9967a",
-                "darkseagreen": "#8fbc8f",
-                "darkslateblue": "#483d8b",
-                "darkslategray": "#2f4f4f",
-                "darkturquoise": "#00ced1",
-                "darkviolet": "#9400d3",
-                "deeppink": "#ff1493",
-                "deepskyblue": "#00bfff",
-                "dimgray": "#696969",
-                "dodgerblue": "#1e90ff",
-                "firebrick": "#b22222",
-                "floralwhite": "#fffaf0",
-                "forestgreen": "#228b22",
-                "fuchsia": "#ff00ff",
-                "gainsboro": "#dcdcdc",
-                "ghostwhite": "#f8f8ff",
-                "gold": "#ffd700",
-                "goldenrod": "#daa520",
-                "gray": "#808080",
-                "green": "#008000",
-                "greenyellow": "#adff2f",
-                "honeydew": "#f0fff0",
-                "hotpink": "#ff69b4",
-                "indianred ": "#cd5c5c",
-                "indigo ": "#4b0082",
-                "ivory": "#fffff0",
-                "khaki": "#f0e68c",
-                "lavender": "#e6e6fa",
-                "lavenderblush": "#fff0f5",
-                "lawngreen": "#7cfc00",
-                "lemonchiffon": "#fffacd",
-                "lightblue": "#add8e6",
-                "lightcoral": "#f08080",
-                "lightcyan": "#e0ffff",
-                "lightgoldenrodyellow": "#fafad2",
-                "lightgrey": "#d3d3d3",
-                "lightgreen": "#90ee90",
-                "lightpink": "#ffb6c1",
-                "lightsalmon": "#ffa07a",
-                "lightseagreen": "#20b2aa",
-                "lightskyblue": "#87cefa",
-                "lightslategray": "#778899",
-                "lightsteelblue": "#b0c4de",
-                "lightyellow": "#ffffe0",
-                "lime": "#00ff00",
-                "limegreen": "#32cd32",
-                "linen": "#faf0e6",
-                "magenta": "#ff00ff",
-                "maroon": "#800000",
-                "mediumaquamarine": "#66cdaa",
-                "mediumblue": "#0000cd",
-                "mediumorchid": "#ba55d3",
-                "mediumpurple": "#9370d8",
-                "mediumseagreen": "#3cb371",
-                "mediumslateblue": "#7b68ee",
-                "mediumspringgreen": "#00fa9a",
-                "mediumturquoise": "#48d1cc",
-                "mediumvioletred": "#c71585",
-                "midnightblue": "#191970",
-                "mintcream": "#f5fffa",
-                "mistyrose": "#ffe4e1",
-                "moccasin": "#ffe4b5",
-                "navajowhite": "#ffdead",
-                "navy": "#000080",
-                "oldlace": "#fdf5e6",
-                "olive": "#808000",
-                "olivedrab": "#6b8e23",
-                "orange": "#ffa500",
-                "orangered": "#ff4500",
-                "orchid": "#da70d6",
-                "palegoldenrod": "#eee8aa",
-                "palegreen": "#98fb98",
-                "paleturquoise": "#afeeee",
-                "palevioletred": "#d87093",
-                "papayawhip": "#ffefd5",
-                "peachpuff": "#ffdab9",
-                "peru": "#cd853f",
-                "pink": "#ffc0cb",
-                "plum": "#dda0dd",
-                "powderblue": "#b0e0e6",
-                "purple": "#800080",
-                "red": "#ff0000",
-                "rosybrown": "#bc8f8f",
-                "royalblue": "#4169e1",
-                "saddlebrown": "#8b4513",
-                "salmon": "#fa8072",
-                "sandybrown": "#f4a460",
-                "seagreen": "#2e8b57",
-                "seashell": "#fff5ee",
-                "sienna": "#a0522d",
-                "silver": "#c0c0c0",
-                "skyblue": "#87ceeb",
-                "slateblue": "#6a5acd",
-                "slategray": "#708090",
-                "snow": "#fffafa",
-                "springgreen": "#00ff7f",
-                "steelblue": "#4682b4",
-                "tan": "#d2b48c",
-                "teal": "#008080",
-                "thistle": "#d8bfd8",
-                "tomato": "#ff6347",
-                "turquoise": "#40e0d0",
-                "violet": "#ee82ee",
-                "wheat": "#f5deb3",
-                "white": "#ffffff",
-                "whitesmoke": "#f5f5f5",
-                "yellow": "#ffff00",
-                "yellowgreen": "#9acd32"
-            };
-
-            if (typeof colors[name.toLowerCase()] !== 'undefined') {
-                return colors[name.toLowerCase()];
-            }
-            return false;
-        }
-    };
-
-
-    var defaults = {
-        horizontal: false, // horizontal mode layout ?
-        inline: false, //forces to show the colorpicker as an inline element
-        color: false, //forces a color
-        format: false, //forces a format
-        input: 'input', // children input selector
-        container: false, // container selector
-        component: '.add-on, .input-group-addon', // children component selector
-        sliders: {
-            saturation: {
-                maxLeft: 100,
-                maxTop: 100,
-                callLeft: 'setSaturation',
-                callTop: 'setBrightness'
-            },
-            hue: {
-                maxLeft: 0,
-                maxTop: 100,
-                callLeft: false,
-                callTop: 'setHue'
-            },
-            alpha: {
-                maxLeft: 0,
-                maxTop: 100,
-                callLeft: false,
-                callTop: 'setAlpha'
-            }
-        },
-        slidersHorz: {
-            saturation: {
-                maxLeft: 100,
-                maxTop: 100,
-                callLeft: 'setSaturation',
-                callTop: 'setBrightness'
-            },
-            hue: {
-                maxLeft: 100,
-                maxTop: 0,
-                callLeft: 'setHue',
-                callTop: false
-            },
-            alpha: {
-                maxLeft: 100,
-                maxTop: 0,
-                callLeft: 'setAlpha',
-                callTop: false
-            }
-        },
-        template: '
      ' +
-            '
      ' +
-            '
      ' +
-            '
      ' +
-            '
      ' +
-            '
      '
-    };
-
-    var Colorpicker = function(element, options) {
-        this.element = $(element).addClass('colorpicker-element');
-        this.options = $.extend({}, defaults, this.element.data(), options);
-        this.component = this.options.component;
-        this.component = (this.component !== false) ? this.element.find(this.component) : false;
-        if (this.component && (this.component.length === 0)) {
-            this.component = false;
-        }
-        this.container = (this.options.container === true) ? this.element : this.options.container;
-        this.container = (this.container !== false) ? $(this.container) : false;
-
-        // Is the element an input? Should we search inside for any input?
-        this.input = this.element.is('input') ? this.element : (this.options.input ?
-            this.element.find(this.options.input) : false);
-        if (this.input && (this.input.length === 0)) {
-            this.input = false;
-        }
-        // Set HSB color
-        this.color = new Color(this.options.color !== false ? this.options.color : this.getValue());
-        this.format = this.options.format !== false ? this.options.format : this.color.origFormat;
-
-        // Setup picker
-        this.picker = $(this.options.template);
-        if (this.options.inline) {
-            this.picker.addClass('colorpicker-inline colorpicker-visible');
-        } else {
-            this.picker.addClass('colorpicker-hidden');
-        }
-        if (this.options.horizontal) {
-            this.picker.addClass('colorpicker-horizontal');
-        }
-        if (this.format === 'rgba' || this.format === 'hsla') {
-            this.picker.addClass('colorpicker-with-alpha');
-        }
-        this.picker.on('mousedown.colorpicker', $.proxy(this.mousedown, this));
-        this.picker.appendTo(this.container ? this.container : $('body'));
-
-        // Bind events
-        if (this.input !== false) {
-            this.input.on({
-                'keyup.colorpicker': $.proxy(this.keyup, this)
-            });
-            if (this.component === false) {
-                this.element.on({
-                    'focus.colorpicker': $.proxy(this.show, this)
-                });
-            }
-            if (this.options.inline === false) {
-                this.element.on({
-                    'focusout.colorpicker': $.proxy(this.hide, this)
-                });
-            }
-        }
-
-        if (this.component !== false) {
-            this.component.on({
-                'click.colorpicker': $.proxy(this.show, this)
-            });
-        }
-
-        if ((this.input === false) && (this.component === false)) {
-            this.element.on({
-                'click.colorpicker': $.proxy(this.show, this)
-            });
-        }
-        this.update();
-
-        $($.proxy(function() {
-            this.element.trigger('create');
-        }, this));
-    };
-
-    Colorpicker.version = '2.0.0-beta';
-
-    Colorpicker.Color = Color;
-
-    Colorpicker.prototype = {
-        constructor: Colorpicker,
-        destroy: function() {
-            this.picker.remove();
-            this.element.removeData('colorpicker').off('.colorpicker');
-            if (this.input !== false) {
-                this.input.off('.colorpicker');
-            }
-            if (this.component !== false) {
-                this.component.off('.colorpicker');
-            }
-            this.element.removeClass('colorpicker-element');
-            this.element.trigger({
-                type: 'destroy'
-            });
-        },
-        reposition: function() {
-            if (this.options.inline !== false) {
-                return false;
-            }
-            var offset = this.component ? this.component.offset() : this.element.offset();
-            this.picker.css({
-                top: offset.top + (this.component ? this.component.outerHeight() : this.element.outerHeight()),
-                left: offset.left
-            });
-        },
-        show: function(e) {
-            if (this.isDisabled()) {
-                return false;
-            }
-            this.picker.addClass('colorpicker-visible').removeClass('colorpicker-hidden');
-            this.reposition();
-            $(window).on('resize.colorpicker', $.proxy(this.reposition, this));
-            if (!this.hasInput() && e) {
-                if (e.stopPropagation && e.preventDefault) {
-                    e.stopPropagation();
-                    e.preventDefault();
-                }
-            }
-            if (this.options.inline === false) {
-                $(window.document).on({
-                    'mousedown.colorpicker': $.proxy(this.hide, this)
-                });
-            }
-            this.element.trigger({
-                type: 'showPicker',
-                color: this.color
-            });
-        },
-        hide: function() {
-            this.picker.addClass('colorpicker-hidden').removeClass('colorpicker-visible');
-            $(window).off('resize.colorpicker', this.reposition);
-            $(document).off({
-                'mousedown.colorpicker': this.hide
-            });
-            this.update();
-            this.element.trigger({
-                type: 'hidePicker',
-                color: this.color
-            });
-        },
-        updateData: function(val) {
-            val = val ||  this.color.toString(this.format);
-            this.element.data('color', val);
-            return val;
-        },
-        updateInput: function(val) {
-            val = val ||  this.color.toString(this.format);
-            if (this.input !== false) {
-                this.input.prop('value', val);
-            }
-            return val;
-        },
-        updatePicker: function(val) {
-            if (val !== undefined) {
-                this.color = new Color(val);
-            }
-            var sl = (this.options.horizontal === false) ? this.options.sliders : this.options.slidersHorz;
-            var icns = this.picker.find('i');
-            if (icns.length === 0) {
-                return;
-            }
-            if (this.options.horizontal === false) {
-                sl = this.options.sliders;
-                icns.eq(1).css('top', sl.hue.maxTop * (1 - this.color.value.h)).end()
-                    .eq(2).css('top', sl.alpha.maxTop * (1 - this.color.value.a));
-            } else {
-                sl = this.options.slidersHorz;
-                icns.eq(1).css('left', sl.hue.maxLeft * (1 - this.color.value.h)).end()
-                    .eq(2).css('left', sl.alpha.maxLeft * (1 - this.color.value.a));
-            }
-            icns.eq(0).css({
-                'top': sl.saturation.maxTop - this.color.value.b * sl.saturation.maxTop,
-                'left': this.color.value.s * sl.saturation.maxLeft
-            });
-            this.picker.find('.colorpicker-saturation').css('backgroundColor', this.color.toHex(this.color.value.h, 1, 1, 1));
-            this.picker.find('.colorpicker-alpha').css('backgroundColor', this.color.toHex());
-            this.picker.find('.colorpicker-color, .colorpicker-color div').css('backgroundColor', this.color.toString(this.format));
-            return val;
-        },
-        updateComponent: function(val) {
-            val = val ||  this.color.toString(this.format);
-            if (this.component !== false) {
-                var icn = this.component.find('i').eq(0);
-                if (icn.length > 0) {
-                    icn.css({
-                        'backgroundColor': val
-                    });
-                } else {
-                    this.component.css({
-                        'backgroundColor': val
-                    });
-                }
-            }
-            return val;
-        },
-        update: function(force) {
-            var val = this.updateComponent();
-            if ((this.getValue(false) !== false) || (force === true)) {
-                // Update input/data only if the current value is not blank
-                this.updateInput(val);
-                this.updateData(val);
-            }
-            this.updatePicker();
-            return val;
-
-        },
-        setValue: function(val) { // set color manually
-            this.color = new Color(val);
-            this.update();
-            this.element.trigger({
-                type: 'changeColor',
-                color: this.color,
-                value: val
-            });
-        },
-        getValue: function(defaultValue) {
-            defaultValue = (defaultValue === undefined) ? '#000000' : defaultValue;
-            var val;
-            if (this.hasInput()) {
-                val = this.input.val();
-            } else {
-                val = this.element.data('color');
-            }
-            if ((val === undefined) || (val === '') || (val === null)) {
-                // if not defined or empty, return default
-                val = defaultValue;
-            }
-            return val;
-        },
-        hasInput: function() {
-            return (this.input !== false);
-        },
-        isDisabled: function() {
-            if (this.hasInput()) {
-                return (this.input.prop('disabled') === true);
-            }
-            return false;
-        },
-        disable: function() {
-            if (this.hasInput()) {
-                this.input.prop('disabled', true);
-                return true;
-            }
-            return false;
-        },
-        enable: function() {
-            if (this.hasInput()) {
-                this.input.prop('disabled', false);
-                return true;
-            }
-            return false;
-        },
-        currentSlider: null,
-        mousePointer: {
-            left: 0,
-            top: 0
-        },
-        mousedown: function(e) {
-            e.stopPropagation();
-            e.preventDefault();
-
-            var target = $(e.target);
-
-            //detect the slider and set the limits and callbacks
-            var zone = target.closest('div');
-            var sl = this.options.horizontal ? this.options.slidersHorz : this.options.sliders;
-            if (!zone.is('.colorpicker')) {
-                if (zone.is('.colorpicker-saturation')) {
-                    this.currentSlider = $.extend({}, sl.saturation);
-                } else if (zone.is('.colorpicker-hue')) {
-                    this.currentSlider = $.extend({}, sl.hue);
-                } else if (zone.is('.colorpicker-alpha')) {
-                    this.currentSlider = $.extend({}, sl.alpha);
-                } else {
-                    return false;
-                }
-                var offset = zone.offset();
-                //reference to guide's style
-                this.currentSlider.guide = zone.find('i')[0].style;
-                this.currentSlider.left = e.pageX - offset.left;
-                this.currentSlider.top = e.pageY - offset.top;
-                this.mousePointer = {
-                    left: e.pageX,
-                    top: e.pageY
-                };
-                //trigger mousemove to move the guide to the current position
-                $(document).on({
-                    'mousemove.colorpicker': $.proxy(this.mousemove, this),
-                    'mouseup.colorpicker': $.proxy(this.mouseup, this)
-                }).trigger('mousemove');
-            }
-            return false;
-        },
-        mousemove: function(e) {
-            e.stopPropagation();
-            e.preventDefault();
-            var left = Math.max(
-                0,
-                Math.min(
-                    this.currentSlider.maxLeft,
-                    this.currentSlider.left + ((e.pageX || this.mousePointer.left) - this.mousePointer.left)
-                )
-            );
-            var top = Math.max(
-                0,
-                Math.min(
-                    this.currentSlider.maxTop,
-                    this.currentSlider.top + ((e.pageY || this.mousePointer.top) - this.mousePointer.top)
-                )
-            );
-            this.currentSlider.guide.left = left + 'px';
-            this.currentSlider.guide.top = top + 'px';
-            if (this.currentSlider.callLeft) {
-                this.color[this.currentSlider.callLeft].call(this.color, left / 100);
-            }
-            if (this.currentSlider.callTop) {
-                this.color[this.currentSlider.callTop].call(this.color, top / 100);
-            }
-            this.update(true);
-
-            this.element.trigger({
-                type: 'changeColor',
-                color: this.color
-            });
-            return false;
-        },
-        mouseup: function(e) {
-            e.stopPropagation();
-            e.preventDefault();
-            $(document).off({
-                'mousemove.colorpicker': this.mousemove,
-                'mouseup.colorpicker': this.mouseup
-            });
-            return false;
-        },
-        keyup: function(e) {
-            if ((e.keyCode === 38)) {
-                if (this.color.value.a < 1) {
-                    this.color.value.a = Math.round((this.color.value.a + 0.01) * 100) / 100;
-                }
-                this.update(true);
-            } else if ((e.keyCode === 40)) {
-                if (this.color.value.a > 0) {
-                    this.color.value.a = Math.round((this.color.value.a - 0.01) * 100) / 100;
-                }
-                this.update(true);
-            } else {
-                var val = this.input.val();
-                this.color = new Color(val);
-                if (this.getValue(false) !== false) {
-                    this.updateData();
-                    this.updateComponent();
-                    this.updatePicker();
-                }
-            }
-            this.element.trigger({
-                type: 'changeColor',
-                color: this.color,
-                value: val
-            });
-        }
-    };
-
-    $.colorpicker = Colorpicker;
-
-    $.fn.colorpicker = function(option) {
-        var pickerArgs = arguments;
-
-        return this.each(function() {
-            var $this = $(this),
-                inst = $this.data('colorpicker'),
-                options = ((typeof option === 'object') ? option : {});
-            if ((!inst) && (typeof option !== 'string')) {
-                $this.data('colorpicker', new Colorpicker(this, options));
-            } else {
-                if (typeof option === 'string') {
-                    inst[option].apply(inst, Array.prototype.slice.call(pickerArgs, 1));
-                }
-            }
-        });
-    };
-
-    $.fn.colorpicker.constructor = Colorpicker;
-
-})(window.jQuery);
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap-colorpicker.min.js b/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap-colorpicker.min.js
deleted file mode 100644
index 16802aee..00000000
--- a/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap-colorpicker.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(a){"use strict";var b=function(a){this.value={h:0,s:0,b:0,a:1},this.origFormat=null,a&&(void 0!==a.toLowerCase?this.setColor(a):void 0!==a.h&&(this.value=a))};b.prototype={constructor:b,_sanitizeNumber:function(a){return"number"==typeof a?a:isNaN(a)||null===a||""===a||void 0===a?1:void 0!==a.toLowerCase?parseFloat(a):1},setColor:function(a){a=a.toLowerCase(),this.value=this.stringToHSB(a)||{h:0,s:0,b:0,a:1}},stringToHSB:function(b){b=b.toLowerCase();var c=this,d=!1;return a.each(this.stringParsers,function(a,e){var f=e.re.exec(b),g=f&&e.parse.apply(c,[f]),h=e.format||"rgba";return g?(d=h.match(/hsla?/)?c.RGBtoHSB.apply(c,c.HSLtoRGB.apply(c,g)):c.RGBtoHSB.apply(c,g),c.origFormat=h,!1):!0}),d},setHue:function(a){this.value.h=1-a},setSaturation:function(a){this.value.s=a},setBrightness:function(a){this.value.b=1-a},setAlpha:function(a){this.value.a=parseInt(100*(1-a),10)/100},toRGB:function(a,b,c,d){a=a||this.value.h,b=b||this.value.s,c=c||this.value.b,d=d||this.value.a;var e,f,g,h,i,j,k,l;switch(a&&void 0===b&&void 0===c&&(b=a.s,c=a.v,a=a.h),h=Math.floor(6*a),i=6*a-h,j=c*(1-b),k=c*(1-i*b),l=c*(1-(1-i)*b),h%6){case 0:e=c,f=l,g=j;break;case 1:e=k,f=c,g=j;break;case 2:e=j,f=c,g=l;break;case 3:e=j,f=k,g=c;break;case 4:e=l,f=j,g=c;break;case 5:e=c,f=j,g=k}return{r:Math.floor(255*e),g:Math.floor(255*f),b:Math.floor(255*g),a:d}},toHex:function(a,b,c,d){var e=this.toRGB(a,b,c,d);return"#"+(1<<24|parseInt(e.r)<<16|parseInt(e.g)<<8|parseInt(e.b)).toString(16).substr(1)},toHSL:function(a,b,c,d){a=a||this.value.h,b=b||this.value.s,c=c||this.value.b,d=d||this.value.a;var e=a,f=(2-b)*c,g=b*c;return g/=f>0&&1>=f?f:2-f,f/=2,g>1&&(g=1),{h:isNaN(e)?0:e,s:isNaN(g)?0:g,l:isNaN(f)?0:f,a:isNaN(d)?0:d}},RGBtoHSB:function(a,b,c,d){a/=255,b/=255,c/=255;var e,f,g,h;return g=Math.max(a,b,c),h=g-Math.min(a,b,c),e=0===h?null:g===a?(b-c)/h:g===b?(c-a)/h+2:(a-b)/h+4,e=(e+360)%6*60/360,f=0===h?0:h/g,{h:this._sanitizeNumber(e),s:f,b:g,a:this._sanitizeNumber(d)}},HueToRGB:function(a,b,c){return 0>c?c+=1:c>1&&(c-=1),1>6*c?a+(b-a)*c*6:1>2*c?b:2>3*c?a+(b-a)*(2/3-c)*6:a},HSLtoRGB:function(a,b,c,d){0>b&&(b=0);var e;e=.5>=c?c*(1+b):c+b-c*b;var f=2*c-e,g=a+1/3,h=a,i=a-1/3,j=Math.round(255*this.HueToRGB(f,e,g)),k=Math.round(255*this.HueToRGB(f,e,h)),l=Math.round(255*this.HueToRGB(f,e,i));return[j,k,l,this._sanitizeNumber(d)]},toString:function(a){switch(a=a||"rgba"){case"rgb":var b=this.toRGB();return"rgb("+b.r+","+b.g+","+b.b+")";case"rgba":var b=this.toRGB();return"rgba("+b.r+","+b.g+","+b.b+","+b.a+")";case"hsl":var c=this.toHSL();return"hsl("+Math.round(360*c.h)+","+Math.round(100*c.s)+"%,"+Math.round(100*c.l)+"%)";case"hsla":var c=this.toHSL();return"hsla("+Math.round(360*c.h)+","+Math.round(100*c.s)+"%,"+Math.round(100*c.l)+"%,"+c.a+")";case"hex":return this.toHex();default:return!1}},stringParsers:[{re:/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,format:"hex",parse:function(a){return[parseInt(a[1],16),parseInt(a[2],16),parseInt(a[3],16),1]}},{re:/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/,format:"hex",parse:function(a){return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16),1]}},{re:/rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*?\)/,format:"rgb",parse:function(a){return[a[1],a[2],a[3],1]}},{re:/rgb\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*?\)/,format:"rgb",parse:function(a){return[2.55*a[1],2.55*a[2],2.55*a[3],1]}},{re:/rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,format:"rgba",parse:function(a){return[a[1],a[2],a[3],a[4]]}},{re:/rgba\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,format:"rgba",parse:function(a){return[2.55*a[1],2.55*a[2],2.55*a[3],a[4]]}},{re:/hsl\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*?\)/,format:"hsl",parse:function(a){return[a[1]/360,a[2]/100,a[3]/100,a[4]]}},{re:/hsla\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,format:"hsla",parse:function(a){return[a[1]/360,a[2]/100,a[3]/100,a[4]]}},{re:/^([a-z]{3,})$/,format:"alias",parse:function(a){var b=this.colorNameToHex(a[0])||"#000000",c=this.stringParsers[0].re.exec(b),d=c&&this.stringParsers[0].parse.apply(this,[c]);return d}}],colorNameToHex:function(a){var b={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4","indianred ":"#cd5c5c","indigo ":"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgrey:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370d8",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#d87093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"};return"undefined"!=typeof b[a.toLowerCase()]?b[a.toLowerCase()]:!1}};var c={horizontal:!1,inline:!1,color:!1,format:!1,input:"input",container:!1,component:".add-on, .input-group-addon",sliders:{saturation:{maxLeft:100,maxTop:100,callLeft:"setSaturation",callTop:"setBrightness"},hue:{maxLeft:0,maxTop:100,callLeft:!1,callTop:"setHue"},alpha:{maxLeft:0,maxTop:100,callLeft:!1,callTop:"setAlpha"}},slidersHorz:{saturation:{maxLeft:100,maxTop:100,callLeft:"setSaturation",callTop:"setBrightness"},hue:{maxLeft:100,maxTop:0,callLeft:"setHue",callTop:!1},alpha:{maxLeft:100,maxTop:0,callLeft:"setAlpha",callTop:!1}},template:'
      '},d=function(d,e){this.element=a(d).addClass("colorpicker-element"),this.options=a.extend({},c,this.element.data(),e),this.component=this.options.component,this.component=this.component!==!1?this.element.find(this.component):!1,this.component&&0===this.component.length&&(this.component=!1),this.container=this.options.container===!0?this.element:this.options.container,this.container=this.container!==!1?a(this.container):!1,this.input=this.element.is("input")?this.element:this.options.input?this.element.find(this.options.input):!1,this.input&&0===this.input.length&&(this.input=!1),this.color=new b(this.options.color!==!1?this.options.color:this.getValue()),this.format=this.options.format!==!1?this.options.format:this.color.origFormat,this.picker=a(this.options.template),this.options.inline?this.picker.addClass("colorpicker-inline colorpicker-visible"):this.picker.addClass("colorpicker-hidden"),this.options.horizontal&&this.picker.addClass("colorpicker-horizontal"),("rgba"===this.format||"hsla"===this.format)&&this.picker.addClass("colorpicker-with-alpha"),this.picker.on("mousedown.colorpicker",a.proxy(this.mousedown,this)),this.picker.appendTo(this.container?this.container:a("body")),this.input!==!1&&(this.input.on({"keyup.colorpicker":a.proxy(this.keyup,this)}),this.component===!1&&this.element.on({"focus.colorpicker":a.proxy(this.show,this)}),this.options.inline===!1&&this.element.on({"focusout.colorpicker":a.proxy(this.hide,this)})),this.component!==!1&&this.component.on({"click.colorpicker":a.proxy(this.show,this)}),this.input===!1&&this.component===!1&&this.element.on({"click.colorpicker":a.proxy(this.show,this)}),this.update(),a(a.proxy(function(){this.element.trigger("create")},this))};d.version="2.0.0-beta",d.Color=b,d.prototype={constructor:d,destroy:function(){this.picker.remove(),this.element.removeData("colorpicker").off(".colorpicker"),this.input!==!1&&this.input.off(".colorpicker"),this.component!==!1&&this.component.off(".colorpicker"),this.element.removeClass("colorpicker-element"),this.element.trigger({type:"destroy"})},reposition:function(){if(this.options.inline!==!1)return!1;var a=this.component?this.component.offset():this.element.offset();this.picker.css({top:a.top+(this.component?this.component.outerHeight():this.element.outerHeight()),left:a.left})},show:function(b){return this.isDisabled()?!1:(this.picker.addClass("colorpicker-visible").removeClass("colorpicker-hidden"),this.reposition(),a(window).on("resize.colorpicker",a.proxy(this.reposition,this)),!this.hasInput()&&b&&b.stopPropagation&&b.preventDefault&&(b.stopPropagation(),b.preventDefault()),this.options.inline===!1&&a(window.document).on({"mousedown.colorpicker":a.proxy(this.hide,this)}),this.element.trigger({type:"showPicker",color:this.color}),void 0)},hide:function(){this.picker.addClass("colorpicker-hidden").removeClass("colorpicker-visible"),a(window).off("resize.colorpicker",this.reposition),a(document).off({"mousedown.colorpicker":this.hide}),this.update(),this.element.trigger({type:"hidePicker",color:this.color})},updateData:function(a){return a=a||this.color.toString(this.format),this.element.data("color",a),a},updateInput:function(a){return a=a||this.color.toString(this.format),this.input!==!1&&this.input.prop("value",a),a},updatePicker:function(a){void 0!==a&&(this.color=new b(a));var c=this.options.horizontal===!1?this.options.sliders:this.options.slidersHorz,d=this.picker.find("i");return 0!==d.length?(this.options.horizontal===!1?(c=this.options.sliders,d.eq(1).css("top",c.hue.maxTop*(1-this.color.value.h)).end().eq(2).css("top",c.alpha.maxTop*(1-this.color.value.a))):(c=this.options.slidersHorz,d.eq(1).css("left",c.hue.maxLeft*(1-this.color.value.h)).end().eq(2).css("left",c.alpha.maxLeft*(1-this.color.value.a))),d.eq(0).css({top:c.saturation.maxTop-this.color.value.b*c.saturation.maxTop,left:this.color.value.s*c.saturation.maxLeft}),this.picker.find(".colorpicker-saturation").css("backgroundColor",this.color.toHex(this.color.value.h,1,1,1)),this.picker.find(".colorpicker-alpha").css("backgroundColor",this.color.toHex()),this.picker.find(".colorpicker-color, .colorpicker-color div").css("backgroundColor",this.color.toString(this.format)),a):void 0},updateComponent:function(a){if(a=a||this.color.toString(this.format),this.component!==!1){var b=this.component.find("i").eq(0);b.length>0?b.css({backgroundColor:a}):this.component.css({backgroundColor:a})}return a},update:function(a){var b=this.updateComponent();return(this.getValue(!1)!==!1||a===!0)&&(this.updateInput(b),this.updateData(b)),this.updatePicker(),b},setValue:function(a){this.color=new b(a),this.update(),this.element.trigger({type:"changeColor",color:this.color,value:a})},getValue:function(a){a=void 0===a?"#000000":a;var b;return b=this.hasInput()?this.input.val():this.element.data("color"),(void 0===b||""===b||null===b)&&(b=a),b},hasInput:function(){return this.input!==!1},isDisabled:function(){return this.hasInput()?this.input.prop("disabled")===!0:!1},disable:function(){return this.hasInput()?(this.input.prop("disabled",!0),!0):!1},enable:function(){return this.hasInput()?(this.input.prop("disabled",!1),!0):!1},currentSlider:null,mousePointer:{left:0,top:0},mousedown:function(b){b.stopPropagation(),b.preventDefault();var c=a(b.target),d=c.closest("div"),e=this.options.horizontal?this.options.slidersHorz:this.options.sliders;if(!d.is(".colorpicker")){if(d.is(".colorpicker-saturation"))this.currentSlider=a.extend({},e.saturation);else if(d.is(".colorpicker-hue"))this.currentSlider=a.extend({},e.hue);else{if(!d.is(".colorpicker-alpha"))return!1;this.currentSlider=a.extend({},e.alpha)}var f=d.offset();this.currentSlider.guide=d.find("i")[0].style,this.currentSlider.left=b.pageX-f.left,this.currentSlider.top=b.pageY-f.top,this.mousePointer={left:b.pageX,top:b.pageY},a(document).on({"mousemove.colorpicker":a.proxy(this.mousemove,this),"mouseup.colorpicker":a.proxy(this.mouseup,this)}).trigger("mousemove")}return!1},mousemove:function(a){a.stopPropagation(),a.preventDefault();var b=Math.max(0,Math.min(this.currentSlider.maxLeft,this.currentSlider.left+((a.pageX||this.mousePointer.left)-this.mousePointer.left))),c=Math.max(0,Math.min(this.currentSlider.maxTop,this.currentSlider.top+((a.pageY||this.mousePointer.top)-this.mousePointer.top)));return this.currentSlider.guide.left=b+"px",this.currentSlider.guide.top=c+"px",this.currentSlider.callLeft&&this.color[this.currentSlider.callLeft].call(this.color,b/100),this.currentSlider.callTop&&this.color[this.currentSlider.callTop].call(this.color,c/100),this.update(!0),this.element.trigger({type:"changeColor",color:this.color}),!1},mouseup:function(b){return b.stopPropagation(),b.preventDefault(),a(document).off({"mousemove.colorpicker":this.mousemove,"mouseup.colorpicker":this.mouseup}),!1},keyup:function(a){if(38===a.keyCode)this.color.value.a<1&&(this.color.value.a=Math.round(100*(this.color.value.a+.01))/100),this.update(!0);else if(40===a.keyCode)this.color.value.a>0&&(this.color.value.a=Math.round(100*(this.color.value.a-.01))/100),this.update(!0);else{var c=this.input.val();this.color=new b(c),this.getValue(!1)!==!1&&(this.updateData(),this.updateComponent(),this.updatePicker())}this.element.trigger({type:"changeColor",color:this.color,value:c})}},a.colorpicker=d,a.fn.colorpicker=function(b){var c=arguments;return this.each(function(){var e=a(this),f=e.data("colorpicker"),g="object"==typeof b?b:{};f||"string"==typeof b?"string"==typeof b&&f[b].apply(f,Array.prototype.slice.call(c,1)):e.data("colorpicker",new d(this,g))})},a.fn.colorpicker.constructor=d}(window.jQuery);
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap.js b/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap.js
deleted file mode 100644
index 8ae571b6..00000000
--- a/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap.js
+++ /dev/null
@@ -1,1951 +0,0 @@
-/*!
- * Bootstrap v3.1.1 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }
-
-/* ========================================================================
- * Bootstrap: transition.js v3.1.1
- * http://getbootstrap.com/javascript/#transitions
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-  // ============================================================
-
-  function transitionEnd() {
-    var el = document.createElement('bootstrap')
-
-    var transEndEventNames = {
-      'WebkitTransition' : 'webkitTransitionEnd',
-      'MozTransition'    : 'transitionend',
-      'OTransition'      : 'oTransitionEnd otransitionend',
-      'transition'       : 'transitionend'
-    }
-
-    for (var name in transEndEventNames) {
-      if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
-      }
-    }
-
-    return false // explicit for ie8 (  ._.)
-  }
-
-  // http://blog.alexmaccaw.com/css-transitions
-  $.fn.emulateTransitionEnd = function (duration) {
-    var called = false, $el = this
-    $(this).one($.support.transition.end, function () { called = true })
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-    setTimeout(callback, duration)
-    return this
-  }
-
-  $(function () {
-    $.support.transition = transitionEnd()
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: alert.js v3.1.1
- * http://getbootstrap.com/javascript/#alerts
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // ALERT CLASS DEFINITION
-  // ======================
-
-  var dismiss = '[data-dismiss="alert"]'
-  var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
-  }
-
-  Alert.prototype.close = function (e) {
-    var $this    = $(this)
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = $(selector)
-
-    if (e) e.preventDefault()
-
-    if (!$parent.length) {
-      $parent = $this.hasClass('alert') ? $this : $this.parent()
-    }
-
-    $parent.trigger(e = $.Event('close.bs.alert'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      $parent.trigger('closed.bs.alert').remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent
-        .one($.support.transition.end, removeElement)
-        .emulateTransitionEnd(150) :
-      removeElement()
-  }
-
-
-  // ALERT PLUGIN DEFINITION
-  // =======================
-
-  var old = $.fn.alert
-
-  $.fn.alert = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
-
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.alert.Constructor = Alert
-
-
-  // ALERT NO CONFLICT
-  // =================
-
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
-
-
-  // ALERT DATA-API
-  // ==============
-
-  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: button.js v3.1.1
- * http://getbootstrap.com/javascript/#buttons
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // BUTTON PUBLIC CLASS DEFINITION
-  // ==============================
-
-  var Button = function (element, options) {
-    this.$element  = $(element)
-    this.options   = $.extend({}, Button.DEFAULTS, options)
-    this.isLoading = false
-  }
-
-  Button.DEFAULTS = {
-    loadingText: 'loading...'
-  }
-
-  Button.prototype.setState = function (state) {
-    var d    = 'disabled'
-    var $el  = this.$element
-    var val  = $el.is('input') ? 'val' : 'html'
-    var data = $el.data()
-
-    state = state + 'Text'
-
-    if (!data.resetText) $el.data('resetText', $el[val]())
-
-    $el[val](data[state] || this.options[state])
-
-    // push to event loop to allow forms to submit
-    setTimeout($.proxy(function () {
-      if (state == 'loadingText') {
-        this.isLoading = true
-        $el.addClass(d).attr(d, d)
-      } else if (this.isLoading) {
-        this.isLoading = false
-        $el.removeClass(d).removeAttr(d)
-      }
-    }, this), 0)
-  }
-
-  Button.prototype.toggle = function () {
-    var changed = true
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
-
-    if ($parent.length) {
-      var $input = this.$element.find('input')
-      if ($input.prop('type') == 'radio') {
-        if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
-        else $parent.find('.active').removeClass('active')
-      }
-      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
-    }
-
-    if (changed) this.$element.toggleClass('active')
-  }
-
-
-  // BUTTON PLUGIN DEFINITION
-  // ========================
-
-  var old = $.fn.button
-
-  $.fn.button = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.button')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.button', (data = new Button(this, options)))
-
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-
-  $.fn.button.Constructor = Button
-
-
-  // BUTTON NO CONFLICT
-  // ==================
-
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
-
-
-  // BUTTON DATA-API
-  // ===============
-
-  $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
-    var $btn = $(e.target)
-    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-    $btn.button('toggle')
-    e.preventDefault()
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: carousel.js v3.1.1
- * http://getbootstrap.com/javascript/#carousel
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CAROUSEL CLASS DEFINITION
-  // =========================
-
-  var Carousel = function (element, options) {
-    this.$element    = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options     = options
-    this.paused      =
-    this.sliding     =
-    this.interval    =
-    this.$active     =
-    this.$items      = null
-
-    this.options.pause == 'hover' && this.$element
-      .on('mouseenter', $.proxy(this.pause, this))
-      .on('mouseleave', $.proxy(this.cycle, this))
-  }
-
-  Carousel.DEFAULTS = {
-    interval: 5000,
-    pause: 'hover',
-    wrap: true
-  }
-
-  Carousel.prototype.cycle =  function (e) {
-    e || (this.paused = false)
-
-    this.interval && clearInterval(this.interval)
-
-    this.options.interval
-      && !this.paused
-      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-
-    return this
-  }
-
-  Carousel.prototype.getActiveIndex = function () {
-    this.$active = this.$element.find('.item.active')
-    this.$items  = this.$active.parent().children()
-
-    return this.$items.index(this.$active)
-  }
-
-  Carousel.prototype.to = function (pos) {
-    var that        = this
-    var activeIndex = this.getActiveIndex()
-
-    if (pos > (this.$items.length - 1) || pos < 0) return
-
-    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
-    if (activeIndex == pos) return this.pause().cycle()
-
-    return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
-  }
-
-  Carousel.prototype.pause = function (e) {
-    e || (this.paused = true)
-
-    if (this.$element.find('.next, .prev').length && $.support.transition) {
-      this.$element.trigger($.support.transition.end)
-      this.cycle(true)
-    }
-
-    this.interval = clearInterval(this.interval)
-
-    return this
-  }
-
-  Carousel.prototype.next = function () {
-    if (this.sliding) return
-    return this.slide('next')
-  }
-
-  Carousel.prototype.prev = function () {
-    if (this.sliding) return
-    return this.slide('prev')
-  }
-
-  Carousel.prototype.slide = function (type, next) {
-    var $active   = this.$element.find('.item.active')
-    var $next     = next || $active[type]()
-    var isCycling = this.interval
-    var direction = type == 'next' ? 'left' : 'right'
-    var fallback  = type == 'next' ? 'first' : 'last'
-    var that      = this
-
-    if (!$next.length) {
-      if (!this.options.wrap) return
-      $next = this.$element.find('.item')[fallback]()
-    }
-
-    if ($next.hasClass('active')) return this.sliding = false
-
-    var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
-    this.$element.trigger(e)
-    if (e.isDefaultPrevented()) return
-
-    this.sliding = true
-
-    isCycling && this.pause()
-
-    if (this.$indicators.length) {
-      this.$indicators.find('.active').removeClass('active')
-      this.$element.one('slid.bs.carousel', function () {
-        var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
-        $nextIndicator && $nextIndicator.addClass('active')
-      })
-    }
-
-    if ($.support.transition && this.$element.hasClass('slide')) {
-      $next.addClass(type)
-      $next[0].offsetWidth // force reflow
-      $active.addClass(direction)
-      $next.addClass(direction)
-      $active
-        .one($.support.transition.end, function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
-        })
-        .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
-    } else {
-      $active.removeClass('active')
-      $next.addClass('active')
-      this.sliding = false
-      this.$element.trigger('slid.bs.carousel')
-    }
-
-    isCycling && this.cycle()
-
-    return this
-  }
-
-
-  // CAROUSEL PLUGIN DEFINITION
-  // ==========================
-
-  var old = $.fn.carousel
-
-  $.fn.carousel = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.carousel')
-      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
-      var action  = typeof option == 'string' ? option : options.slide
-
-      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  $.fn.carousel.Constructor = Carousel
-
-
-  // CAROUSEL NO CONFLICT
-  // ====================
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
-
-  // CAROUSEL DATA-API
-  // =================
-
-  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-    var $this   = $(this), href
-    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-    var options = $.extend({}, $target.data(), $this.data())
-    var slideIndex = $this.attr('data-slide-to')
-    if (slideIndex) options.interval = false
-
-    $target.carousel(options)
-
-    if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('bs.carousel').to(slideIndex)
-    }
-
-    e.preventDefault()
-  })
-
-  $(window).on('load', function () {
-    $('[data-ride="carousel"]').each(function () {
-      var $carousel = $(this)
-      $carousel.carousel($carousel.data())
-    })
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: collapse.js v3.1.1
- * http://getbootstrap.com/javascript/#collapse
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // COLLAPSE PUBLIC CLASS DEFINITION
-  // ================================
-
-  var Collapse = function (element, options) {
-    this.$element      = $(element)
-    this.options       = $.extend({}, Collapse.DEFAULTS, options)
-    this.transitioning = null
-
-    if (this.options.parent) this.$parent = $(this.options.parent)
-    if (this.options.toggle) this.toggle()
-  }
-
-  Collapse.DEFAULTS = {
-    toggle: true
-  }
-
-  Collapse.prototype.dimension = function () {
-    var hasWidth = this.$element.hasClass('width')
-    return hasWidth ? 'width' : 'height'
-  }
-
-  Collapse.prototype.show = function () {
-    if (this.transitioning || this.$element.hasClass('in')) return
-
-    var startEvent = $.Event('show.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    var actives = this.$parent && this.$parent.find('> .panel > .in')
-
-    if (actives && actives.length) {
-      var hasData = actives.data('bs.collapse')
-      if (hasData && hasData.transitioning) return
-      actives.collapse('hide')
-      hasData || actives.data('bs.collapse', null)
-    }
-
-    var dimension = this.dimension()
-
-    this.$element
-      .removeClass('collapse')
-      .addClass('collapsing')
-      [dimension](0)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse in')
-        [dimension]('auto')
-      this.transitioning = 0
-      this.$element.trigger('shown.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
-
-    this.$element
-      .one($.support.transition.end, $.proxy(complete, this))
-      .emulateTransitionEnd(350)
-      [dimension](this.$element[0][scrollSize])
-  }
-
-  Collapse.prototype.hide = function () {
-    if (this.transitioning || !this.$element.hasClass('in')) return
-
-    var startEvent = $.Event('hide.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    var dimension = this.dimension()
-
-    this.$element
-      [dimension](this.$element[dimension]())
-      [0].offsetHeight
-
-    this.$element
-      .addClass('collapsing')
-      .removeClass('collapse')
-      .removeClass('in')
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.transitioning = 0
-      this.$element
-        .trigger('hidden.bs.collapse')
-        .removeClass('collapsing')
-        .addClass('collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    this.$element
-      [dimension](0)
-      .one($.support.transition.end, $.proxy(complete, this))
-      .emulateTransitionEnd(350)
-  }
-
-  Collapse.prototype.toggle = function () {
-    this[this.$element.hasClass('in') ? 'hide' : 'show']()
-  }
-
-
-  // COLLAPSE PLUGIN DEFINITION
-  // ==========================
-
-  var old = $.fn.collapse
-
-  $.fn.collapse = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.collapse')
-      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data && options.toggle && option == 'show') option = !option
-      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.collapse.Constructor = Collapse
-
-
-  // COLLAPSE NO CONFLICT
-  // ====================
-
-  $.fn.collapse.noConflict = function () {
-    $.fn.collapse = old
-    return this
-  }
-
-
-  // COLLAPSE DATA-API
-  // =================
-
-  $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) {
-    var $this   = $(this), href
-    var target  = $this.attr('data-target')
-        || e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-    var $target = $(target)
-    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
-    var parent  = $this.attr('data-parent')
-    var $parent = parent && $(parent)
-
-    if (!data || !data.transitioning) {
-      if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
-      $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-    }
-
-    $target.collapse(option)
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: dropdown.js v3.1.1
- * http://getbootstrap.com/javascript/#dropdowns
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // DROPDOWN CLASS DEFINITION
-  // =========================
-
-  var backdrop = '.dropdown-backdrop'
-  var toggle   = '[data-toggle=dropdown]'
-  var Dropdown = function (element) {
-    $(element).on('click.bs.dropdown', this.toggle)
-  }
-
-  Dropdown.prototype.toggle = function (e) {
-    var $this = $(this)
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    clearMenus()
-
-    if (!isActive) {
-      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we use a backdrop because click events don't delegate
-        $('
      ').insertAfter($(this)).on('click', clearMenus)
-      }
-
-      var relatedTarget = { relatedTarget: this }
-      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
-
-      if (e.isDefaultPrevented()) return
-
-      $parent
-        .toggleClass('open')
-        .trigger('shown.bs.dropdown', relatedTarget)
-
-      $this.focus()
-    }
-
-    return false
-  }
-
-  Dropdown.prototype.keydown = function (e) {
-    if (!/(38|40|27)/.test(e.keyCode)) return
-
-    var $this = $(this)
-
-    e.preventDefault()
-    e.stopPropagation()
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    if (!isActive || (isActive && e.keyCode == 27)) {
-      if (e.which == 27) $parent.find(toggle).focus()
-      return $this.click()
-    }
-
-    var desc = ' li:not(.divider):visible a'
-    var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc)
-
-    if (!$items.length) return
-
-    var index = $items.index($items.filter(':focus'))
-
-    if (e.keyCode == 38 && index > 0)                 index--                        // up
-    if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-    if (!~index)                                      index = 0
-
-    $items.eq(index).focus()
-  }
-
-  function clearMenus(e) {
-    $(backdrop).remove()
-    $(toggle).each(function () {
-      var $parent = getParent($(this))
-      var relatedTarget = { relatedTarget: this }
-      if (!$parent.hasClass('open')) return
-      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
-      if (e.isDefaultPrevented()) return
-      $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
-    })
-  }
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    var $parent = selector && $(selector)
-
-    return $parent && $parent.length ? $parent : $this.parent()
-  }
-
-
-  // DROPDOWN PLUGIN DEFINITION
-  // ==========================
-
-  var old = $.fn.dropdown
-
-  $.fn.dropdown = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.dropdown')
-
-      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.dropdown.Constructor = Dropdown
-
-
-  // DROPDOWN NO CONFLICT
-  // ====================
-
-  $.fn.dropdown.noConflict = function () {
-    $.fn.dropdown = old
-    return this
-  }
-
-
-  // APPLY TO STANDARD DROPDOWN ELEMENTS
-  // ===================================
-
-  $(document)
-    .on('click.bs.dropdown.data-api', clearMenus)
-    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: modal.js v3.1.1
- * http://getbootstrap.com/javascript/#modals
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // MODAL CLASS DEFINITION
-  // ======================
-
-  var Modal = function (element, options) {
-    this.options   = options
-    this.$element  = $(element)
-    this.$backdrop =
-    this.isShown   = null
-
-    if (this.options.remote) {
-      this.$element
-        .find('.modal-content')
-        .load(this.options.remote, $.proxy(function () {
-          this.$element.trigger('loaded.bs.modal')
-        }, this))
-    }
-  }
-
-  Modal.DEFAULTS = {
-    backdrop: true,
-    keyboard: true,
-    show: true
-  }
-
-  Modal.prototype.toggle = function (_relatedTarget) {
-    return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)
-  }
-
-  Modal.prototype.show = function (_relatedTarget) {
-    var that = this
-    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
-
-    this.$element.trigger(e)
-
-    if (this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = true
-
-    this.escape()
-
-    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
-
-    this.backdrop(function () {
-      var transition = $.support.transition && that.$element.hasClass('fade')
-
-      if (!that.$element.parent().length) {
-        that.$element.appendTo(document.body) // don't move modals dom position
-      }
-
-      that.$element
-        .show()
-        .scrollTop(0)
-
-      if (transition) {
-        that.$element[0].offsetWidth // force reflow
-      }
-
-      that.$element
-        .addClass('in')
-        .attr('aria-hidden', false)
-
-      that.enforceFocus()
-
-      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
-
-      transition ?
-        that.$element.find('.modal-dialog') // wait for modal to slide in
-          .one($.support.transition.end, function () {
-            that.$element.focus().trigger(e)
-          })
-          .emulateTransitionEnd(300) :
-        that.$element.focus().trigger(e)
-    })
-  }
-
-  Modal.prototype.hide = function (e) {
-    if (e) e.preventDefault()
-
-    e = $.Event('hide.bs.modal')
-
-    this.$element.trigger(e)
-
-    if (!this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = false
-
-    this.escape()
-
-    $(document).off('focusin.bs.modal')
-
-    this.$element
-      .removeClass('in')
-      .attr('aria-hidden', true)
-      .off('click.dismiss.bs.modal')
-
-    $.support.transition && this.$element.hasClass('fade') ?
-      this.$element
-        .one($.support.transition.end, $.proxy(this.hideModal, this))
-        .emulateTransitionEnd(300) :
-      this.hideModal()
-  }
-
-  Modal.prototype.enforceFocus = function () {
-    $(document)
-      .off('focusin.bs.modal') // guard against infinite focus loop
-      .on('focusin.bs.modal', $.proxy(function (e) {
-        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-          this.$element.focus()
-        }
-      }, this))
-  }
-
-  Modal.prototype.escape = function () {
-    if (this.isShown && this.options.keyboard) {
-      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
-        e.which == 27 && this.hide()
-      }, this))
-    } else if (!this.isShown) {
-      this.$element.off('keyup.dismiss.bs.modal')
-    }
-  }
-
-  Modal.prototype.hideModal = function () {
-    var that = this
-    this.$element.hide()
-    this.backdrop(function () {
-      that.removeBackdrop()
-      that.$element.trigger('hidden.bs.modal')
-    })
-  }
-
-  Modal.prototype.removeBackdrop = function () {
-    this.$backdrop && this.$backdrop.remove()
-    this.$backdrop = null
-  }
-
-  Modal.prototype.backdrop = function (callback) {
-    var animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-    if (this.isShown && this.options.backdrop) {
-      var doAnimate = $.support.transition && animate
-
-      this.$backdrop = $('
      ')
-        .appendTo(document.body)
-
-      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
-        if (e.target !== e.currentTarget) return
-        this.options.backdrop == 'static'
-          ? this.$element[0].focus.call(this.$element[0])
-          : this.hide.call(this)
-      }, this))
-
-      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-      this.$backdrop.addClass('in')
-
-      if (!callback) return
-
-      doAnimate ?
-        this.$backdrop
-          .one($.support.transition.end, callback)
-          .emulateTransitionEnd(150) :
-        callback()
-
-    } else if (!this.isShown && this.$backdrop) {
-      this.$backdrop.removeClass('in')
-
-      $.support.transition && this.$element.hasClass('fade') ?
-        this.$backdrop
-          .one($.support.transition.end, callback)
-          .emulateTransitionEnd(150) :
-        callback()
-
-    } else if (callback) {
-      callback()
-    }
-  }
-
-
-  // MODAL PLUGIN DEFINITION
-  // =======================
-
-  var old = $.fn.modal
-
-  $.fn.modal = function (option, _relatedTarget) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.modal')
-      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option](_relatedTarget)
-      else if (options.show) data.show(_relatedTarget)
-    })
-  }
-
-  $.fn.modal.Constructor = Modal
-
-
-  // MODAL NO CONFLICT
-  // =================
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
-
-
-  // MODAL DATA-API
-  // ==============
-
-  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this   = $(this)
-    var href    = $this.attr('href')
-    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
-
-    if ($this.is('a')) e.preventDefault()
-
-    $target
-      .modal(option, this)
-      .one('hide', function () {
-        $this.is(':visible') && $this.focus()
-      })
-  })
-
-  $(document)
-    .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
-    .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: tooltip.js v3.1.1
- * http://getbootstrap.com/javascript/#tooltip
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TOOLTIP PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Tooltip = function (element, options) {
-    this.type       =
-    this.options    =
-    this.enabled    =
-    this.timeout    =
-    this.hoverState =
-    this.$element   = null
-
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.DEFAULTS = {
-    animation: true,
-    placement: 'top',
-    selector: false,
-    template: '
      ',
-    trigger: 'hover focus',
-    title: '',
-    delay: 0,
-    html: false,
-    container: false
-  }
-
-  Tooltip.prototype.init = function (type, element, options) {
-    this.enabled  = true
-    this.type     = type
-    this.$element = $(element)
-    this.options  = this.getOptions(options)
-
-    var triggers = this.options.trigger.split(' ')
-
-    for (var i = triggers.length; i--;) {
-      var trigger = triggers[i]
-
-      if (trigger == 'click') {
-        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-      } else if (trigger != 'manual') {
-        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
-        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
-
-        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-      }
-    }
-
-    this.options.selector ?
-      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-      this.fixTitle()
-  }
-
-  Tooltip.prototype.getDefaults = function () {
-    return Tooltip.DEFAULTS
-  }
-
-  Tooltip.prototype.getOptions = function (options) {
-    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
-
-    if (options.delay && typeof options.delay == 'number') {
-      options.delay = {
-        show: options.delay,
-        hide: options.delay
-      }
-    }
-
-    return options
-  }
-
-  Tooltip.prototype.getDelegateOptions = function () {
-    var options  = {}
-    var defaults = this.getDefaults()
-
-    this._options && $.each(this._options, function (key, value) {
-      if (defaults[key] != value) options[key] = value
-    })
-
-    return options
-  }
-
-  Tooltip.prototype.enter = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'in'
-
-    if (!self.options.delay || !self.options.delay.show) return self.show()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'in') self.show()
-    }, self.options.delay.show)
-  }
-
-  Tooltip.prototype.leave = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'out'
-
-    if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'out') self.hide()
-    }, self.options.delay.hide)
-  }
-
-  Tooltip.prototype.show = function () {
-    var e = $.Event('show.bs.' + this.type)
-
-    if (this.hasContent() && this.enabled) {
-      this.$element.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-      var that = this;
-
-      var $tip = this.tip()
-
-      this.setContent()
-
-      if (this.options.animation) $tip.addClass('fade')
-
-      var placement = typeof this.options.placement == 'function' ?
-        this.options.placement.call(this, $tip[0], this.$element[0]) :
-        this.options.placement
-
-      var autoToken = /\s?auto?\s?/i
-      var autoPlace = autoToken.test(placement)
-      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
-
-      $tip
-        .detach()
-        .css({ top: 0, left: 0, display: 'block' })
-        .addClass(placement)
-
-      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-
-      var pos          = this.getPosition()
-      var actualWidth  = $tip[0].offsetWidth
-      var actualHeight = $tip[0].offsetHeight
-
-      if (autoPlace) {
-        var $parent = this.$element.parent()
-
-        var orgPlacement = placement
-        var docScroll    = document.documentElement.scrollTop || document.body.scrollTop
-        var parentWidth  = this.options.container == 'body' ? window.innerWidth  : $parent.outerWidth()
-        var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight()
-        var parentLeft   = this.options.container == 'body' ? 0 : $parent.offset().left
-
-        placement = placement == 'bottom' && pos.top   + pos.height  + actualHeight - docScroll > parentHeight  ? 'top'    :
-                    placement == 'top'    && pos.top   - docScroll   - actualHeight < 0                         ? 'bottom' :
-                    placement == 'right'  && pos.right + actualWidth > parentWidth                              ? 'left'   :
-                    placement == 'left'   && pos.left  - actualWidth < parentLeft                               ? 'right'  :
-                    placement
-
-        $tip
-          .removeClass(orgPlacement)
-          .addClass(placement)
-      }
-
-      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
-
-      this.applyPlacement(calculatedOffset, placement)
-      this.hoverState = null
-
-      var complete = function() {
-        that.$element.trigger('shown.bs.' + that.type)
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        $tip
-          .one($.support.transition.end, complete)
-          .emulateTransitionEnd(150) :
-        complete()
-    }
-  }
-
-  Tooltip.prototype.applyPlacement = function (offset, placement) {
-    var replace
-    var $tip   = this.tip()
-    var width  = $tip[0].offsetWidth
-    var height = $tip[0].offsetHeight
-
-    // manually read margins because getBoundingClientRect includes difference
-    var marginTop = parseInt($tip.css('margin-top'), 10)
-    var marginLeft = parseInt($tip.css('margin-left'), 10)
-
-    // we must check for NaN for ie 8/9
-    if (isNaN(marginTop))  marginTop  = 0
-    if (isNaN(marginLeft)) marginLeft = 0
-
-    offset.top  = offset.top  + marginTop
-    offset.left = offset.left + marginLeft
-
-    // $.fn.offset doesn't round pixel values
-    // so we use setOffset directly with our own function B-0
-    $.offset.setOffset($tip[0], $.extend({
-      using: function (props) {
-        $tip.css({
-          top: Math.round(props.top),
-          left: Math.round(props.left)
-        })
-      }
-    }, offset), 0)
-
-    $tip.addClass('in')
-
-    // check to see if placing tip in new offset caused the tip to resize itself
-    var actualWidth  = $tip[0].offsetWidth
-    var actualHeight = $tip[0].offsetHeight
-
-    if (placement == 'top' && actualHeight != height) {
-      replace = true
-      offset.top = offset.top + height - actualHeight
-    }
-
-    if (/bottom|top/.test(placement)) {
-      var delta = 0
-
-      if (offset.left < 0) {
-        delta       = offset.left * -2
-        offset.left = 0
-
-        $tip.offset(offset)
-
-        actualWidth  = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-      }
-
-      this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-    } else {
-      this.replaceArrow(actualHeight - height, actualHeight, 'top')
-    }
-
-    if (replace) $tip.offset(offset)
-  }
-
-  Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
-    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
-  }
-
-  Tooltip.prototype.setContent = function () {
-    var $tip  = this.tip()
-    var title = this.getTitle()
-
-    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-    $tip.removeClass('fade in top bottom left right')
-  }
-
-  Tooltip.prototype.hide = function () {
-    var that = this
-    var $tip = this.tip()
-    var e    = $.Event('hide.bs.' + this.type)
-
-    function complete() {
-      if (that.hoverState != 'in') $tip.detach()
-      that.$element.trigger('hidden.bs.' + that.type)
-    }
-
-    this.$element.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    $tip.removeClass('in')
-
-    $.support.transition && this.$tip.hasClass('fade') ?
-      $tip
-        .one($.support.transition.end, complete)
-        .emulateTransitionEnd(150) :
-      complete()
-
-    this.hoverState = null
-
-    return this
-  }
-
-  Tooltip.prototype.fixTitle = function () {
-    var $e = this.$element
-    if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-    }
-  }
-
-  Tooltip.prototype.hasContent = function () {
-    return this.getTitle()
-  }
-
-  Tooltip.prototype.getPosition = function () {
-    var el = this.$element[0]
-    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-      width: el.offsetWidth,
-      height: el.offsetHeight
-    }, this.$element.offset())
-  }
-
-  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
-           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
-  }
-
-  Tooltip.prototype.getTitle = function () {
-    var title
-    var $e = this.$element
-    var o  = this.options
-
-    title = $e.attr('data-original-title')
-      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-    return title
-  }
-
-  Tooltip.prototype.tip = function () {
-    return this.$tip = this.$tip || $(this.options.template)
-  }
-
-  Tooltip.prototype.arrow = function () {
-    return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
-  }
-
-  Tooltip.prototype.validate = function () {
-    if (!this.$element[0].parentNode) {
-      this.hide()
-      this.$element = null
-      this.options  = null
-    }
-  }
-
-  Tooltip.prototype.enable = function () {
-    this.enabled = true
-  }
-
-  Tooltip.prototype.disable = function () {
-    this.enabled = false
-  }
-
-  Tooltip.prototype.toggleEnabled = function () {
-    this.enabled = !this.enabled
-  }
-
-  Tooltip.prototype.toggle = function (e) {
-    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
-    self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
-  }
-
-  Tooltip.prototype.destroy = function () {
-    clearTimeout(this.timeout)
-    this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
-  }
-
-
-  // TOOLTIP PLUGIN DEFINITION
-  // =========================
-
-  var old = $.fn.tooltip
-
-  $.fn.tooltip = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.tooltip')
-      var options = typeof option == 'object' && option
-
-      if (!data && option == 'destroy') return
-      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tooltip.Constructor = Tooltip
-
-
-  // TOOLTIP NO CONFLICT
-  // ===================
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: popover.js v3.1.1
- * http://getbootstrap.com/javascript/#popovers
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // POPOVER PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-
-  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
-    placement: 'right',
-    trigger: 'click',
-    content: '',
-    template: '
      '
-  })
-
-
-  // NOTE: POPOVER EXTENDS tooltip.js
-  // ================================
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
-
-  Popover.prototype.constructor = Popover
-
-  Popover.prototype.getDefaults = function () {
-    return Popover.DEFAULTS
-  }
-
-  Popover.prototype.setContent = function () {
-    var $tip    = this.tip()
-    var title   = this.getTitle()
-    var content = this.getContent()
-
-    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content')[ // we use append for html objects to maintain js events
-      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
-    ](content)
-
-    $tip.removeClass('fade top bottom left right in')
-
-    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
-    // this manually by checking the contents.
-    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-  }
-
-  Popover.prototype.hasContent = function () {
-    return this.getTitle() || this.getContent()
-  }
-
-  Popover.prototype.getContent = function () {
-    var $e = this.$element
-    var o  = this.options
-
-    return $e.attr('data-content')
-      || (typeof o.content == 'function' ?
-            o.content.call($e[0]) :
-            o.content)
-  }
-
-  Popover.prototype.arrow = function () {
-    return this.$arrow = this.$arrow || this.tip().find('.arrow')
-  }
-
-  Popover.prototype.tip = function () {
-    if (!this.$tip) this.$tip = $(this.options.template)
-    return this.$tip
-  }
-
-
-  // POPOVER PLUGIN DEFINITION
-  // =========================
-
-  var old = $.fn.popover
-
-  $.fn.popover = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.popover')
-      var options = typeof option == 'object' && option
-
-      if (!data && option == 'destroy') return
-      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.popover.Constructor = Popover
-
-
-  // POPOVER NO CONFLICT
-  // ===================
-
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: scrollspy.js v3.1.1
- * http://getbootstrap.com/javascript/#scrollspy
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // SCROLLSPY CLASS DEFINITION
-  // ==========================
-
-  function ScrollSpy(element, options) {
-    var href
-    var process  = $.proxy(this.process, this)
-
-    this.$element       = $(element).is('body') ? $(window) : $(element)
-    this.$body          = $('body')
-    this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process)
-    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
-    this.selector       = (this.options.target
-      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      || '') + ' .nav li > a'
-    this.offsets        = $([])
-    this.targets        = $([])
-    this.activeTarget   = null
-
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.DEFAULTS = {
-    offset: 10
-  }
-
-  ScrollSpy.prototype.refresh = function () {
-    var offsetMethod = this.$element[0] == window ? 'offset' : 'position'
-
-    this.offsets = $([])
-    this.targets = $([])
-
-    var self     = this
-    var $targets = this.$body
-      .find(this.selector)
-      .map(function () {
-        var $el   = $(this)
-        var href  = $el.data('target') || $el.attr('href')
-        var $href = /^#./.test(href) && $(href)
-
-        return ($href
-          && $href.length
-          && $href.is(':visible')
-          && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
-      })
-      .sort(function (a, b) { return a[0] - b[0] })
-      .each(function () {
-        self.offsets.push(this[0])
-        self.targets.push(this[1])
-      })
-  }
-
-  ScrollSpy.prototype.process = function () {
-    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
-    var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-    var maxScroll    = scrollHeight - this.$scrollElement.height()
-    var offsets      = this.offsets
-    var targets      = this.targets
-    var activeTarget = this.activeTarget
-    var i
-
-    if (scrollTop >= maxScroll) {
-      return activeTarget != (i = targets.last()[0]) && this.activate(i)
-    }
-
-    if (activeTarget && scrollTop <= offsets[0]) {
-      return activeTarget != (i = targets[0]) && this.activate(i)
-    }
-
-    for (i = offsets.length; i--;) {
-      activeTarget != targets[i]
-        && scrollTop >= offsets[i]
-        && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-        && this.activate( targets[i] )
-    }
-  }
-
-  ScrollSpy.prototype.activate = function (target) {
-    this.activeTarget = target
-
-    $(this.selector)
-      .parentsUntil(this.options.target, '.active')
-      .removeClass('active')
-
-    var selector = this.selector +
-        '[data-target="' + target + '"],' +
-        this.selector + '[href="' + target + '"]'
-
-    var active = $(selector)
-      .parents('li')
-      .addClass('active')
-
-    if (active.parent('.dropdown-menu').length) {
-      active = active
-        .closest('li.dropdown')
-        .addClass('active')
-    }
-
-    active.trigger('activate.bs.scrollspy')
-  }
-
-
-  // SCROLLSPY PLUGIN DEFINITION
-  // ===========================
-
-  var old = $.fn.scrollspy
-
-  $.fn.scrollspy = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.scrollspy')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-
-  // SCROLLSPY NO CONFLICT
-  // =====================
-
-  $.fn.scrollspy.noConflict = function () {
-    $.fn.scrollspy = old
-    return this
-  }
-
-
-  // SCROLLSPY DATA-API
-  // ==================
-
-  $(window).on('load', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      $spy.scrollspy($spy.data())
-    })
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: tab.js v3.1.1
- * http://getbootstrap.com/javascript/#tabs
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TAB CLASS DEFINITION
-  // ====================
-
-  var Tab = function (element) {
-    this.element = $(element)
-  }
-
-  Tab.prototype.show = function () {
-    var $this    = this.element
-    var $ul      = $this.closest('ul:not(.dropdown-menu)')
-    var selector = $this.data('target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    if ($this.parent('li').hasClass('active')) return
-
-    var previous = $ul.find('.active:last a')[0]
-    var e        = $.Event('show.bs.tab', {
-      relatedTarget: previous
-    })
-
-    $this.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    var $target = $(selector)
-
-    this.activate($this.parent('li'), $ul)
-    this.activate($target, $target.parent(), function () {
-      $this.trigger({
-        type: 'shown.bs.tab',
-        relatedTarget: previous
-      })
-    })
-  }
-
-  Tab.prototype.activate = function (element, container, callback) {
-    var $active    = container.find('> .active')
-    var transition = callback
-      && $.support.transition
-      && $active.hasClass('fade')
-
-    function next() {
-      $active
-        .removeClass('active')
-        .find('> .dropdown-menu > .active')
-        .removeClass('active')
-
-      element.addClass('active')
-
-      if (transition) {
-        element[0].offsetWidth // reflow for transition
-        element.addClass('in')
-      } else {
-        element.removeClass('fade')
-      }
-
-      if (element.parent('.dropdown-menu')) {
-        element.closest('li.dropdown').addClass('active')
-      }
-
-      callback && callback()
-    }
-
-    transition ?
-      $active
-        .one($.support.transition.end, next)
-        .emulateTransitionEnd(150) :
-      next()
-
-    $active.removeClass('in')
-  }
-
-
-  // TAB PLUGIN DEFINITION
-  // =====================
-
-  var old = $.fn.tab
-
-  $.fn.tab = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.tab')
-
-      if (!data) $this.data('bs.tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tab.Constructor = Tab
-
-
-  // TAB NO CONFLICT
-  // ===============
-
-  $.fn.tab.noConflict = function () {
-    $.fn.tab = old
-    return this
-  }
-
-
-  // TAB DATA-API
-  // ============
-
-  $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
-    e.preventDefault()
-    $(this).tab('show')
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: affix.js v3.1.1
- * http://getbootstrap.com/javascript/#affix
- * ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // AFFIX CLASS DEFINITION
-  // ======================
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, Affix.DEFAULTS, options)
-    this.$window = $(window)
-      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
-
-    this.$element     = $(element)
-    this.affixed      =
-    this.unpin        =
-    this.pinnedOffset = null
-
-    this.checkPosition()
-  }
-
-  Affix.RESET = 'affix affix-top affix-bottom'
-
-  Affix.DEFAULTS = {
-    offset: 0
-  }
-
-  Affix.prototype.getPinnedOffset = function () {
-    if (this.pinnedOffset) return this.pinnedOffset
-    this.$element.removeClass(Affix.RESET).addClass('affix')
-    var scrollTop = this.$window.scrollTop()
-    var position  = this.$element.offset()
-    return (this.pinnedOffset = position.top - scrollTop)
-  }
-
-  Affix.prototype.checkPositionWithEventLoop = function () {
-    setTimeout($.proxy(this.checkPosition, this), 1)
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var scrollHeight = $(document).height()
-    var scrollTop    = this.$window.scrollTop()
-    var position     = this.$element.offset()
-    var offset       = this.options.offset
-    var offsetTop    = offset.top
-    var offsetBottom = offset.bottom
-
-    if (this.affixed == 'top') position.top += scrollTop
-
-    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
-
-    var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
-                offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
-                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
-
-    if (this.affixed === affix) return
-    if (this.unpin) this.$element.css('top', '')
-
-    var affixType = 'affix' + (affix ? '-' + affix : '')
-    var e         = $.Event(affixType + '.bs.affix')
-
-    this.$element.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    this.affixed = affix
-    this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
-
-    this.$element
-      .removeClass(Affix.RESET)
-      .addClass(affixType)
-      .trigger($.Event(affixType.replace('affix', 'affixed')))
-
-    if (affix == 'bottom') {
-      this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })
-    }
-  }
-
-
-  // AFFIX PLUGIN DEFINITION
-  // =======================
-
-  var old = $.fn.affix
-
-  $.fn.affix = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.affix')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.affix.Constructor = Affix
-
-
-  // AFFIX NO CONFLICT
-  // =================
-
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-
-
-  // AFFIX DATA-API
-  // ==============
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-      var data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
-      if (data.offsetTop)    data.offset.top    = data.offsetTop
-
-      $spy.affix(data)
-    })
-  })
-
-}(jQuery);
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap.min.js b/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap.min.js
deleted file mode 100644
index b04a0e82..00000000
--- a/mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * Bootstrap v3.1.1 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery),+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function c(){f.trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one(a.support.transition.end,c).emulateTransitionEnd(150):c())};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),"string"==typeof b&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.isLoading=!1};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",f.resetText||d.data("resetText",d[e]()),d[e](f[b]||this.options[b]),setTimeout(a.proxy(function(){"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},b.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}a&&this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&&c;e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}if(e.hasClass("active"))return this.sliding=!1;var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});return this.$element.trigger(j),j.isDefaultPrevented()?void 0:(this.sliding=!0,f&&this.pause(),this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid.bs.carousel",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")?(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid.bs.carousel")},0)}).emulateTransitionEnd(1e3*d.css("transition-duration").slice(0,-1))):(d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid.bs.carousel")),f&&this.cycle(),this)};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("collapse in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?void this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350):d.call(this)}}},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);!e&&f.toggle&&"show"==c&&(c=!c),e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(jQuery),+function(a){"use strict";function b(b){a(d).remove(),a(e).each(function(){var d=c(a(this)),e={relatedTarget:this};d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown",e)),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown",e))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('
      ').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown",h),e.focus()}return!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=" li:not(.divider):visible a",i=f.find("[role=menu]"+h+", [role=listbox]"+h);if(i.length){var j=i.index(i.filter(":focus"));38==b.keyCode&&j>0&&j--,40==b.keyCode&&j').appendTo(document.body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),"object"==typeof c&&c);f||e.data("bs.modal",f=new b(this,g)),"string"==typeof c?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());c.is("a")&&b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
      ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this,d=this.tip();this.setContent(),this.options.animation&&d.addClass("fade");var e="function"==typeof this.options.placement?this.options.placement.call(this,d[0],this.$element[0]):this.options.placement,f=/\s?auto?\s?/i,g=f.test(e);g&&(e=e.replace(f,"")||"top"),d.detach().css({top:0,left:0,display:"block"}).addClass(e),this.options.container?d.appendTo(this.options.container):d.insertAfter(this.$element);var h=this.getPosition(),i=d[0].offsetWidth,j=d[0].offsetHeight;if(g){var k=this.$element.parent(),l=e,m=document.documentElement.scrollTop||document.body.scrollTop,n="body"==this.options.container?window.innerWidth:k.outerWidth(),o="body"==this.options.container?window.innerHeight:k.outerHeight(),p="body"==this.options.container?0:k.offset().left;e="bottom"==e&&h.top+h.height+j-m>o?"top":"top"==e&&h.top-m-j<0?"bottom":"right"==e&&h.right+i>n?"left":"left"==e&&h.left-i
      '}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;(e||"destroy"!=c)&&(e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]())})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(a(c).is("body")?window:c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);{var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})}},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);if(g&&b<=e[0])return g!=(a=f[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parentsUntil(this.options.target,".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(b.RESET).addClass("affix");var a=this.$window.scrollTop(),c=this.$element.offset();return this.pinnedOffset=c.top-a},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"top"==this.affixed&&(e.top+=d),"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top(this.$element)),"function"==typeof h&&(h=f.bottom(this.$element));var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;if(this.affixed!==i){this.unpin&&this.$element.css("top","");var j="affix"+(i?"-"+i:""),k=a.Event(j+".bs.affix");this.$element.trigger(k),k.isDefaultPrevented()||(this.affixed=i,this.unpin="bottom"==i?this.getPinnedOffset():null,this.$element.removeClass(b.RESET).addClass(j).trigger(a.Event(j.replace("affix","affixed"))),"bottom"==i&&this.$element.offset({top:c-h-this.$element.height()}))}}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(jQuery);
\ No newline at end of file
diff --git a/mindplot/src/main/javascript/libraries/hotkeys/jquery.hotkeys.js b/mindplot/src/main/javascript/libraries/hotkeys/jquery.hotkeys.js
deleted file mode 100644
index a258c396..00000000
--- a/mindplot/src/main/javascript/libraries/hotkeys/jquery.hotkeys.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * jQuery Hotkeys Plugin
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Based upon the plugin by Tzury Bar Yochay:
- * http://github.com/tzuryby/hotkeys
- *
- * Original idea by:
- * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
-*/
-
-/*
- * One small change is: now keys are passed by object { keys: '...' }
- * Might be useful, when you want to pass some other data to your handler
- */
-
-(function(jQuery){
-	
-	jQuery.hotkeys = {
-		version: "0.8",
-
-		specialKeys: {
-			8: "backspace", 9: "tab", 10: "return", 13: "enter", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
-			20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
-			37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", 
-			96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
-			104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", 
-			112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", 
-			120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 186: ";", 191: "/",
-			220: "\\", 222: "'", 224: "meta"
-		},
-	
-		shiftNums: {
-			"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", 
-			"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", 
-			".": ">",  "/": "?",  "\\": "|"
-		}
-	};
-
-	function keyHandler( handleObj ) {
-		if ( typeof handleObj.data === "string" ) {
-			handleObj.data = { keys: handleObj.data };
-		}
-
-		// Only care when a possible input has been specified
-		if ( !handleObj.data || !handleObj.data.keys || typeof handleObj.data.keys !== "string" ) {
-			return;
-		}
-
-		var origHandler = handleObj.handler,
-			keys = handleObj.data.keys.toLowerCase().split(" "),
-			textAcceptingInputTypes = ["text", "password", "number", "email", "url", "range", "date", "month", "week", "time", "datetime", "datetime-local", "search", "color", "tel"];
-	
-		handleObj.handler = function( event ) {
-			// Don't fire in text-accepting inputs that we didn't directly bind to
-			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
-				jQuery.inArray(event.target.type, textAcceptingInputTypes) > -1 ) ) {
-				return;
-			}
-
-			var special = jQuery.hotkeys.specialKeys[ event.keyCode ],
-				character = String.fromCharCode( event.which ).toLowerCase(),
-				modif = "", possible = {};
-
-			// check combinations (alt|ctrl|shift+anything)
-			if ( event.altKey && special !== "alt" ) {
-				modif += "alt+";
-			}
-
-			if ( event.ctrlKey && special !== "ctrl" ) {
-				modif += "ctrl+";
-			}
-			
-			// TODO: Need to make sure this works consistently across platforms
-			if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
-				modif += "meta+";
-			}
-
-			if ( event.shiftKey && special !== "shift" ) {
-				modif += "shift+";
-			}
-
-			if ( special ) {
-				possible[ modif + special ] = true;
-			}
-
-			if ( character ) {
-				possible[ modif + character ] = true;
-				possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;
-
-				// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
-				if ( modif === "shift+" ) {
-					possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
-				}
-			}
-
-			for ( var i = 0, l = keys.length; i < l; i++ ) {
-				if ( possible[ keys[i] ] ) {
-					return origHandler.apply( this, arguments );
-				}
-			}
-		};
-	}
-
-	jQuery.each([ "keydown", "keyup", "keypress" ], function() {
-		jQuery.event.special[ this ] = { add: keyHandler };
-	});
-
-})( this.jQuery );
diff --git a/mindplot/src/main/javascript/libraries/jquery/jquery-2.1.0.js b/mindplot/src/main/javascript/libraries/jquery/jquery-2.1.0.js
deleted file mode 100644
index f7f42277..00000000
--- a/mindplot/src/main/javascript/libraries/jquery/jquery-2.1.0.js
+++ /dev/null
@@ -1,9111 +0,0 @@
-/*!
- * jQuery JavaScript Library v2.1.0
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-01-23T21:10Z
- */
-
-(function( global, factory ) {
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-		// For CommonJS and CommonJS-like environments where a proper window is present,
-		// execute the factory and get jQuery
-		// For environments that do not inherently posses a window with a document
-		// (such as Node.js), expose a jQuery-making factory as module.exports
-		// This accentuates the need for the creation of a real window
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Can't do this because several apps including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
-//
-
-var arr = [];
-
-var slice = arr.slice;
-
-var concat = arr.concat;
-
-var push = arr.push;
-
-var indexOf = arr.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var trim = "".trim;
-
-var support = {};
-
-
-
-var
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
-	version = "2.1.0",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num != null ?
-
-			// Return a 'clean' array
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return just the object
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: arr.sort,
-	splice: arr.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray,
-
-	isWindow: function( obj ) {
-		return obj != null && obj === obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		return obj - parseFloat( obj ) >= 0;
-	},
-
-	isPlainObject: function( obj ) {
-		// Not plain objects:
-		// - Any object or value whose internal [[Class]] property is not "[object Object]"
-		// - DOM nodes
-		// - window
-		if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		// Support: Firefox <20
-		// The try/catch suppresses exceptions thrown when attempting to access
-		// the "constructor" property of certain host objects, ie. |window.location|
-		// https://bugzilla.mozilla.org/show_bug.cgi?id=814622
-		try {
-			if ( obj.constructor &&
-					!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
-				return false;
-			}
-		} catch ( e ) {
-			return false;
-		}
-
-		// If the function hasn't returned already, we're confident that
-		// |obj| is a plain object, created by {} or constructed with new Object
-		return true;
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-		// Support: Android < 4.0, iOS < 6 (functionish RegExp)
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	// Evaluates a script in a global context
-	globalEval: function( code ) {
-		var script,
-			indirect = eval;
-
-		code = jQuery.trim( code );
-
-		if ( code ) {
-			// If the code includes a valid, prologue position
-			// strict mode pragma, execute code by injecting a
-			// script tag into the document.
-			if ( code.indexOf("use strict") === 1 ) {
-				script = document.createElement("script");
-				script.text = code;
-				document.head.appendChild( script ).parentNode.removeChild( script );
-			} else {
-			// Otherwise, avoid the DOM node creation, insertion
-			// and removal by using an indirect global eval
-				indirect( code );
-			}
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	trim: function( text ) {
-		return text == null ? "" : trim.call( text );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		return arr == null ? -1 : indexOf.call( arr, elem, i );
-	},
-
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		for ( ; j < len; j++ ) {
-			first[ i++ ] = second[ j ];
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: Date.now,
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v1.10.16
- * http://sizzlejs.com/
- *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-01-13
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( documentIsHTML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document (jQuery #6963)
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== strundefined && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare,
-		doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsHTML = !isXML( doc );
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent !== parent.top ) {
-		// IE11 does not have attachEvent, so all must suffer
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", function() {
-				setDocument();
-			}, false );
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", function() {
-				setDocument();
-			});
-		}
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) {
-		div.innerHTML = "
      ";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "";
-
-			// Support: IE8, Opera 10-12
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			if ( div.querySelectorAll("[t^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] && match[4] !== undefined ) {
-				match[2] = match[4];
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (oldCache = outerCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							outerCache[ dir ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector );
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					support.getById && context.nodeType === 9 && documentIsHTML &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-				if ( !context ) {
-					return results;
-				}
-				selector = selector.slice( tokens.shift().value.length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-			while ( i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, seed );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-}
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome<14
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( indexOf.call( qualifier, elem ) >= 0 ) !== not;
-	});
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		}));
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			len = this.length,
-			ret = [],
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-});
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over  to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	init = jQuery.fn.init = function( selector, context ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return typeof rootjQuery.ready !== "undefined" ?
-				rootjQuery.ready( selector ) :
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.extend({
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			truncate = until !== undefined;
-
-		while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) {
-			if ( elem.nodeType === 1 ) {
-				if ( truncate && jQuery( elem ).is( until ) ) {
-					break;
-				}
-				matched.push( elem );
-			}
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var matched = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				matched.push( n );
-			}
-		}
-
-		return matched;
-	}
-});
-
-jQuery.fn.extend({
-	has: function( target ) {
-		var targets = jQuery( target, this ),
-			l = targets.length;
-
-		return this.filter(function() {
-			var i = 0;
-			for ( ; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					matched.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return indexOf.call( jQuery( elem ), this[ 0 ] );
-		}
-
-		// Locate the position of the desired element
-		return indexOf.call( this,
-
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem
-		);
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.unique(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {}
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return elem.contentDocument || jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var matched = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			matched = jQuery.filter( selector, matched );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				jQuery.unique( matched );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				matched.reverse();
-			}
-		}
-
-		return this.pushStack( matched );
-	};
-});
-var rnotwhite = (/\S+/g);
-
-
-
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-	// Add the callback
-	jQuery.ready.promise().done( fn );
-
-	return this;
-};
-
-jQuery.extend({
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	}
-});
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-	document.removeEventListener( "DOMContentLoaded", completed, false );
-	window.removeEventListener( "load", completed, false );
-	jQuery.ready();
-}
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		} else {
-
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
-
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		len = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < len; i++ ) {
-				fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			len ? fn( elems[0], key ) : emptyGet;
-};
-
-
-/**
- * Determines whether an object can have data
- */
-jQuery.acceptData = function( owner ) {
-	// Accepts only:
-	//  - Node
-	//    - Node.ELEMENT_NODE
-	//    - Node.DOCUMENT_NODE
-	//  - Object
-	//    - Any
-	/* jshint -W018 */
-	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-};
-
-
-function Data() {
-	// Support: Android < 4,
-	// Old WebKit does not have Object.preventExtensions/freeze method,
-	// return new empty object instead with no [[set]] accessor
-	Object.defineProperty( this.cache = {}, 0, {
-		get: function() {
-			return {};
-		}
-	});
-
-	this.expando = jQuery.expando + Math.random();
-}
-
-Data.uid = 1;
-Data.accepts = jQuery.acceptData;
-
-Data.prototype = {
-	key: function( owner ) {
-		// We can accept data for non-element nodes in modern browsers,
-		// but we should not, see #8335.
-		// Always return the key for a frozen object.
-		if ( !Data.accepts( owner ) ) {
-			return 0;
-		}
-
-		var descriptor = {},
-			// Check if the owner object already has a cache key
-			unlock = owner[ this.expando ];
-
-		// If not, create one
-		if ( !unlock ) {
-			unlock = Data.uid++;
-
-			// Secure it in a non-enumerable, non-writable property
-			try {
-				descriptor[ this.expando ] = { value: unlock };
-				Object.defineProperties( owner, descriptor );
-
-			// Support: Android < 4
-			// Fallback to a less secure definition
-			} catch ( e ) {
-				descriptor[ this.expando ] = unlock;
-				jQuery.extend( owner, descriptor );
-			}
-		}
-
-		// Ensure the cache object
-		if ( !this.cache[ unlock ] ) {
-			this.cache[ unlock ] = {};
-		}
-
-		return unlock;
-	},
-	set: function( owner, data, value ) {
-		var prop,
-			// There may be an unlock assigned to this node,
-			// if there is no entry for this "owner", create one inline
-			// and set the unlock as though an owner entry had always existed
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		// Handle: [ owner, key, value ] args
-		if ( typeof data === "string" ) {
-			cache[ data ] = value;
-
-		// Handle: [ owner, { properties } ] args
-		} else {
-			// Fresh assignments by object are shallow copied
-			if ( jQuery.isEmptyObject( cache ) ) {
-				jQuery.extend( this.cache[ unlock ], data );
-			// Otherwise, copy the properties one-by-one to the cache object
-			} else {
-				for ( prop in data ) {
-					cache[ prop ] = data[ prop ];
-				}
-			}
-		}
-		return cache;
-	},
-	get: function( owner, key ) {
-		// Either a valid cache is found, or will be created.
-		// New caches will be created and the unlock returned,
-		// allowing direct access to the newly created
-		// empty data object. A valid owner object must be provided.
-		var cache = this.cache[ this.key( owner ) ];
-
-		return key === undefined ?
-			cache : cache[ key ];
-	},
-	access: function( owner, key, value ) {
-		var stored;
-		// In cases where either:
-		//
-		//   1. No key was specified
-		//   2. A string key was specified, but no value provided
-		//
-		// Take the "read" path and allow the get method to determine
-		// which value to return, respectively either:
-		//
-		//   1. The entire cache object
-		//   2. The data stored at the key
-		//
-		if ( key === undefined ||
-				((key && typeof key === "string") && value === undefined) ) {
-
-			stored = this.get( owner, key );
-
-			return stored !== undefined ?
-				stored : this.get( owner, jQuery.camelCase(key) );
-		}
-
-		// [*]When the key is not a string, or both a key and value
-		// are specified, set or extend (existing objects) with either:
-		//
-		//   1. An object of properties
-		//   2. A key and value
-		//
-		this.set( owner, key, value );
-
-		// Since the "set" path can have two possible entry points
-		// return the expected data based on which path was taken[*]
-		return value !== undefined ? value : key;
-	},
-	remove: function( owner, key ) {
-		var i, name, camel,
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		if ( key === undefined ) {
-			this.cache[ unlock ] = {};
-
-		} else {
-			// Support array or space separated string of keys
-			if ( jQuery.isArray( key ) ) {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = key.concat( key.map( jQuery.camelCase ) );
-			} else {
-				camel = jQuery.camelCase( key );
-				// Try the string as a key before any manipulation
-				if ( key in cache ) {
-					name = [ key, camel ];
-				} else {
-					// If a key with the spaces exists, use it.
-					// Otherwise, create an array by matching non-whitespace
-					name = camel;
-					name = name in cache ?
-						[ name ] : ( name.match( rnotwhite ) || [] );
-				}
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete cache[ name[ i ] ];
-			}
-		}
-	},
-	hasData: function( owner ) {
-		return !jQuery.isEmptyObject(
-			this.cache[ owner[ this.expando ] ] || {}
-		);
-	},
-	discard: function( owner ) {
-		if ( owner[ this.expando ] ) {
-			delete this.cache[ owner[ this.expando ] ];
-		}
-	}
-};
-var data_priv = new Data();
-
-var data_user = new Data();
-
-
-
-/*
-	Implementation Summary
-
-	1. Enforce API surface and semantic compatibility with 1.9.x branch
-	2. Improve the module's maintainability by reducing the storage
-		paths to a single mechanism.
-	3. Use the same single mechanism to support "private" and "user" data.
-	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-	5. Avoid exposing implementation details on user objects (eg. expando properties)
-	6. Provide a clear path for implementation upgrade to WeakMap in 2014
-*/
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function dataAttr( elem, key, data ) {
-	var name;
-
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			data_user.set( elem, key, data );
-		} else {
-			data = undefined;
-		}
-	}
-	return data;
-}
-
-jQuery.extend({
-	hasData: function( elem ) {
-		return data_user.hasData( elem ) || data_priv.hasData( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return data_user.access( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		data_user.remove( elem, name );
-	},
-
-	// TODO: Now that all calls to _data and _removeData have been replaced
-	// with direct calls to data_priv methods, these can be deprecated.
-	_data: function( elem, name, data ) {
-		return data_priv.access( elem, name, data );
-	},
-
-	_removeData: function( elem, name ) {
-		data_priv.remove( elem, name );
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[ 0 ],
-			attrs = elem && elem.attributes;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = data_user.get( elem );
-
-				if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-						name = attrs[ i ].name;
-
-						if ( name.indexOf( "data-" ) === 0 ) {
-							name = jQuery.camelCase( name.slice(5) );
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					data_priv.set( elem, "hasDataAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				data_user.set( this, key );
-			});
-		}
-
-		return access( this, function( value ) {
-			var data,
-				camelKey = jQuery.camelCase( key );
-
-			// The calling jQuery object (element matches) is not empty
-			// (and therefore has an element appears at this[ 0 ]) and the
-			// `value` parameter was not undefined. An empty jQuery object
-			// will result in `undefined` for elem = this[ 0 ] which will
-			// throw an exception if an attempt to read a data cache is made.
-			if ( elem && value === undefined ) {
-				// Attempt to get data from the cache
-				// with the key as-is
-				data = data_user.get( elem, key );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to get data from the cache
-				// with the key camelized
-				data = data_user.get( elem, camelKey );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to "discover" the data in
-				// HTML5 custom data-* attrs
-				data = dataAttr( elem, camelKey, undefined );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// We tried really hard, but the data doesn't exist.
-				return;
-			}
-
-			// Set the data...
-			this.each(function() {
-				// First, attempt to store a copy or reference of any
-				// data that might've been store with a camelCased key.
-				var data = data_user.get( this, camelKey );
-
-				// For HTML5 data-* attribute interop, we have to
-				// store property names with dashes in a camelCase form.
-				// This might not apply to all properties...*
-				data_user.set( this, camelKey, value );
-
-				// *... In the case of properties that might _actually_
-				// have dashes, we need to also store a copy of that
-				// unchanged property.
-				if ( key.indexOf("-") !== -1 && data !== undefined ) {
-					data_user.set( this, key, value );
-				}
-			});
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			data_user.remove( this, key );
-		});
-	}
-});
-
-
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = data_priv.get( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray( data ) ) {
-					queue = data_priv.access( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return data_priv.get( elem, key ) || data_priv.access( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				data_priv.remove( elem, [ type + "queue", key ] );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = data_priv.get( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHidden = function( elem, el ) {
-		// isHidden might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-	};
-
-var rcheckableType = (/^(?:checkbox|radio)$/i);
-
-
-
-(function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) );
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	div.innerHTML = "";
-
-	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
-	// old WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	// Support: IE9-IE11+
-	div.innerHTML = "";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-})();
-var strundefined = typeof undefined;
-
-
-
-support.focusinBubbles = "onfocusin" in window;
-
-
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.get( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ?
-					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
-			};
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.hasData( elem ) && data_priv.get( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-			data_priv.remove( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG  instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			for ( ; cur !== this; cur = cur.parentNode || this ) {
-
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.disabled !== true || event.type !== "click" ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: Cordova 2.5 (WebKit) (#13255)
-		// All events should have a target; Cordova deviceready doesn't
-		if ( !event.target ) {
-			event.target = document;
-		}
-
-		// Support: Safari 6.0+, Chrome < 28
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					this.focus();
-					return false;
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = function( elem, type, handle ) {
-	if ( elem.removeEventListener ) {
-		elem.removeEventListener( type, handle, false );
-	}
-};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				// Support: Android < 4.0
-				src.defaultPrevented === undefined &&
-				src.getPreventDefault && src.getPreventDefault() ?
-			returnTrue :
-			returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-
-		if ( e && e.preventDefault ) {
-			e.preventDefault();
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( e && e.stopPropagation ) {
-			e.stopPropagation();
-		}
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// Support: Chrome 15+
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// Create "bubbling" focus and blur events
-// Support: Firefox, Chrome, Safari
-if ( !support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				data_priv.access( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					data_priv.remove( doc, fix );
-
-				} else {
-					data_priv.access( doc, fix, attaches );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-
-
-var
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-
-		// Support: IE 9
-		option: [ 1, "" ],
-
-		thead: [ 1, "", "
      " ],
-		col: [ 2, "", "
      " ],
-		tr: [ 2, "", "
      " ],
-		td: [ 3, "", "
      " ],
-
-		_default: [ 0, "", "" ]
-	};
-
-// Support: IE 9
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// Support: 1.x compatibility
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-
-	if ( match ) {
-		elem.type = match[ 1 ];
-	} else {
-		elem.removeAttribute("type");
-	}
-
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		data_priv.set(
-			elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" )
-		);
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
-
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// 1. Copy private data: events, handlers, etc.
-	if ( data_priv.hasData( src ) ) {
-		pdataOld = data_priv.access( src );
-		pdataCur = data_priv.set( dest, pdataOld );
-		events = pdataOld.events;
-
-		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
-
-			for ( type in events ) {
-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type, events[ type ][ i ] );
-				}
-			}
-		}
-	}
-
-	// 2. Copy user data
-	if ( data_user.hasData( src ) ) {
-		udataOld = data_user.access( src );
-		udataCur = jQuery.extend( {}, udataOld );
-
-		data_user.set( dest, udataCur );
-	}
-}
-
-function getAll( context, tag ) {
-	var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) :
-			context.querySelectorAll ? context.querySelectorAll( tag || "*" ) :
-			[];
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], ret ) :
-		ret;
-}
-
-// Support: IE >= 9
-function fixInput( src, dest ) {
-	var nodeName = dest.nodeName.toLowerCase();
-
-	// Fails to persist the checked state of a cloned checkbox or radio button.
-	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		dest.checked = src.checked;
-
-	// Fails to return the selected option to the default selected state when cloning options
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var i, l, srcElements, destElements,
-			clone = elem.cloneNode( true ),
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		// Support: IE >= 9
-		// Fix Cloning issues
-		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
-				!jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			for ( i = 0, l = srcElements.length; i < l; i++ ) {
-				fixInput( srcElements[ i ], destElements[ i ] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0, l = srcElements.length; i < l; i++ ) {
-					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var elem, tmp, tag, wrap, contains, j,
-			fragment = context.createDocumentFragment(),
-			nodes = [],
-			i = 0,
-			l = elems.length;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					// Support: QtWebKit
-					// jQuery.merge because push.apply(_, arraylike) throws
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || fragment.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-					tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ];
-
-					// Descend through wrappers to the right content
-					j = wrap[ 0 ];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Support: QtWebKit
-					// jQuery.merge because push.apply(_, arraylike) throws
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Remember the top-level container
-					tmp = fragment.firstChild;
-
-					// Fixes #12346
-					// Support: Webkit, IE
-					tmp.textContent = "";
-				}
-			}
-		}
-
-		// Remove wrapper from fragment
-		fragment.textContent = "";
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( fragment.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		return fragment;
-	},
-
-	cleanData: function( elems ) {
-		var data, elem, events, type, key, j,
-			special = jQuery.event.special,
-			i = 0;
-
-		for ( ; (elem = elems[ i ]) !== undefined; i++ ) {
-			if ( jQuery.acceptData( elem ) ) {
-				key = elem[ data_priv.expando ];
-
-				if ( key && (data = data_priv.cache[ key ]) ) {
-					events = Object.keys( data.events || {} );
-					if ( events.length ) {
-						for ( j = 0; (type = events[j]) !== undefined; j++ ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-					if ( data_priv.cache[ key ] ) {
-						// Discard any remaining `private` data
-						delete data_priv.cache[ key ];
-					}
-				}
-			}
-			// Discard any remaining `user` data
-			delete data_user.cache[ elem[ data_user.expando ] ];
-		}
-	}
-});
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().each(function() {
-					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-						this.textContent = value;
-					}
-				});
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	remove: function( selector, keepData /* Internal Use Only */ ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( elem.nodeType === 1 ) {
-
-				// Prevent memory leaks
-				jQuery.cleanData( getAll( elem, false ) );
-
-				// Remove any remaining nodes
-				elem.textContent = "";
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map(function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined && elem.nodeType === 1 ) {
-				return elem.innerHTML;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1>" );
-
-				try {
-					for ( ; i < l; i++ ) {
-						elem = this[ i ] || {};
-
-						// Remove element nodes and prevent memory leaks
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var arg = arguments[ 0 ];
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			arg = this.parentNode;
-
-			jQuery.cleanData( getAll( this ) );
-
-			if ( arg ) {
-				arg.replaceChild( elem, this );
-			}
-		});
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return arg && (arg.length || arg.nodeType) ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback ) {
-
-		// Flatten any nested arrays
-		args = concat.apply( [], args );
-
-		var fragment, first, scripts, hasScripts, node, doc,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[ 0 ],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction ||
-				( l > 1 && typeof value === "string" &&
-					!support.checkClone && rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[ 0 ] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							// Support: QtWebKit
-							// jQuery.merge because push.apply(_, arraylike) throws
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[ i ], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Optional AJAX dependency, but won't run scripts if not present
-								if ( jQuery._evalUrl ) {
-									jQuery._evalUrl( node.src );
-								}
-							} else {
-								jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return this;
-	}
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1,
-			i = 0;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Support: QtWebKit
-			// .get() because push.apply(_, arraylike) throws
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-
-var iframe,
-	elemdisplay = {};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		// getDefaultComputedStyle might be reliably used only on attached element
-		display = window.getDefaultComputedStyle ?
-
-			// Use of this method is a temporary fix (more like optmization) until something better comes along,
-			// since it was removed from specification and supported only in FF
-			window.getDefaultComputedStyle( elem[ 0 ] ).display : jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = (iframe || jQuery( "
-    
      
-
      
-
-
diff --git a/wise-editor/src/main/webapp/html/container.json b/wise-editor/src/main/webapp/html/container.json
deleted file mode 100644
index 950d6485..00000000
--- a/wise-editor/src/main/webapp/html/container.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "readOnly":false,
-    "zoom":1.3,
-    "size":{
-        "width":800,
-        "height":400
-    },
-    "viewPort":
-    {
-        "width":800,
-        "height":400
-    },
-    "persistenceManager": "mindplot.LocalStorageManager",
-    "mapId": "welcome",
-    "container":"mindplot"
-}
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/html/drag.html b/wise-editor/src/main/webapp/html/drag.html
deleted file mode 100644
index cc441afc..00000000
--- a/wise-editor/src/main/webapp/html/drag.html
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
-
-    
-    WiseMapping - Editor 
-    
-
-    
-    
-
-    
-    
-    
-
-    
-    
-
-    
-    
-
-
-
-
-
-
      
-    
      
-        
-    
      
-    
      Text Node !!
      
-
      
-
-
      
-
-
-
diff --git a/wise-editor/src/main/webapp/html/editor.html b/wise-editor/src/main/webapp/html/editor.html
deleted file mode 100644
index e774b233..00000000
--- a/wise-editor/src/main/webapp/html/editor.html
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-    
-    WiseMapping - Editor 
-    
-
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-
-    
-    
-
-    
-
-
-
-
-
-
-
-
      
-
-
-
diff --git a/wise-editor/src/main/webapp/html/embedded.html b/wise-editor/src/main/webapp/html/embedded.html
deleted file mode 100644
index 8a2bcae3..00000000
--- a/wise-editor/src/main/webapp/html/embedded.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-    
-    WiseMapping - Editor 
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-
-    
-
-
-
-
-
-
      
-
-
-
diff --git a/wise-editor/src/main/webapp/html/viewmode.html b/wise-editor/src/main/webapp/html/viewmode.html
deleted file mode 100644
index 700917f7..00000000
--- a/wise-editor/src/main/webapp/html/viewmode.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-    
-    WiseMapping - Editor 
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-
-    
-
-
-
-
-
-
-
      
-
-
-
diff --git a/wise-editor/src/main/webapp/index.html b/wise-editor/src/main/webapp/index.html
deleted file mode 100644
index 319686e2..00000000
--- a/wise-editor/src/main/webapp/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-    WiseMapping Editor Sample Gallery 
-    
-    
-
-
-      
      WiseMapping Editor Sample Gallery 
      
-
-
-
diff --git a/wise-editor/src/main/webapp/js/bootstrap.js b/wise-editor/src/main/webapp/js/bootstrap.js
deleted file mode 120000
index c3fdca75..00000000
--- a/wise-editor/src/main/webapp/js/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../mindplot/src/main/javascript/libraries/bootstrap/js/bootstrap.min.js
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/js/core.js b/wise-editor/src/main/webapp/js/core.js
deleted file mode 120000
index b52f4cba..00000000
--- a/wise-editor/src/main/webapp/js/core.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../core-js/target/classes/core.js
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/js/editor.js b/wise-editor/src/main/webapp/js/editor.js
deleted file mode 100644
index c84e3056..00000000
--- a/wise-editor/src/main/webapp/js/editor.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- *    Copyright [2015] [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 designer = null;
-
-
-/*
- * Disclaimer: this global variable is a temporary workaround to Mootools' Browser class
- * We need to avoid browser detection and replace it with feature detection,
- * jquery recommends: http://www.modernizr.com/
- */
-
-Browser = {
-    firefox: window.globalStorage,
-    ie: document.all && !window.opera,
-    ie6: !window.XMLHttpRequest,
-    ie7: document.all && window.XMLHttpRequest && !XDomainRequest && !window.opera,
-    ie8: document.documentMode == 8,
-    ie11: document.documentMode == 11,
-    opera: Boolean(window.opera),
-    chrome: Boolean(window.chrome),
-    safari: window.getComputedStyle && !window.globalStorage && !window.opera,
-    Platform: {
-        mac: navigator.platform.indexOf('Mac') != -1
-    }
-};
-
-function buildDesigner(options) {
-
-    var container = $("#" + options.container);
-    $assert(container, 'container could not be null');
-
-    // Register load events ...
-    designer = new mindplot.Designer(options, container);
-    designer.addEvent('loadSuccess', function () {
-        window.waitDialog.close();
-        window.waitDialog = null;
-        window.mindmapLoadReady = true;
-    });
-
-    var onerrorFn = function (message, url, lineNo) {
-
-        // Ignore errors ...
-        if (message === "Script error." && lineNo == 0) {
-            // http://stackoverflow.com/questions/5913978/cryptic-script-error-reported-in-javascript-in-chrome-and-firefox
-            return;
-        }
-
-        // Transform error ...
-        var errorMsg = message;
-        if (typeof(message) === 'object' && message.srcElement && message.target) {
-            if (message.srcElement == '[object HTMLScriptElement]' && message.target == '[object HTMLScriptElement]') {
-                errorMsg = 'Error loading script';
-            } else {
-                errorMsg = 'Event Error - target:' + message.target + ' srcElement:' + message.srcElement;
-            }
-        }
-        errorMsg = errorMsg.toString();
-
-        $.ajax({
-            method: 'post',
-            url: "/c/restful/logger/editor",
-            headers: {"Content-Type": "application/json", "Accept": "application/json"},
-            data: JSON.stringify({
-                jsErrorMsg: "Message: '" + errorMsg + "', line:'" + lineNo + "', url: :" + url,
-                jsStack: window.event.error.stack || window.errorStack,
-                userAgent: navigator.userAgent,
-                mapId: options.mapId
-            })
-        });
-
-        // Close loading dialog ...
-        if (window.waitDialog) {
-            window.waitDialog.close();
-            window.waitDialog = null;
-        }
-
-        // Open error dialog only in case of mindmap loading errors. The rest of the error are reported but not display the dialog.
-        // Remove this in the near future.
-        if (!window.mindmapLoadReady) {
-            $notifyModal($msg('UNEXPECTED_ERROR_LOADING'));
-        }
-    };
-
-    window.onerror = onerrorFn;
-
-    // Configure default persistence manager ...
-    var persistence;
-    if (options.persistenceManager) {
-        if (options.persistenceManager instanceof String) {
-            persistence = eval("new " + options.persistenceManager + "()");
-        }
-        else {
-            persistence = options.persistenceManager;
-        }
-
-    } else {
-        persistence = new mindplot.LocalStorageManager("samples/{id}.xml");
-    }
-    mindplot.PersistenceManager.init(persistence);
-
-    // Register toolbar event ...
-    if ($('#toolbar')) {
-        var menu = new mindplot.widget.Menu(designer, 'toolbar', options.mapId, "");
-
-        //  If a node has focus, focus can be move to another node using the keys.
-        designer._cleanScreen = function () {
-            menu.clear();
-        };
-    }
-
-    return designer;
-}
-
-
-function loadDesignerOptions(jsonConf) {
-    // Load map options ...
-    var result;
-    var me = this;
-    if (jsonConf) {
-        $.ajax({
-            url: jsonConf,
-            dataType: 'json',
-            async: false,
-            method: 'get',
-            success: function (options) {
-                me.options = options;
-            }
-        });
-        result = this.options;
-    }
-    else {
-        // Set workspace screen size as default. In this way, resize issues are solved.
-        var containerSize = {
-            height: parseInt(screen.height),
-            width: parseInt(screen.width)
-        };
-
-        var viewPort = {
-            height: parseInt(window.innerHeight - 70), // Footer and Header
-            width: parseInt(window.innerWidth)
-        };
-        result = {
-            readOnly: false,
-            zoom: 0.85,
-            saveOnLoad: true,
-            size: containerSize,
-            viewPort: viewPort,
-            container: 'mindplot',
-            locale: 'en'
-        };
-    }
-    return result;
-}
-
-editor = {};
-editor.WaitDialog = new Class({
-    initialize: function () {
-        this.panel = this._buildPanel();
-    },
-
-    _buildPanel: function () {
-        var result = $('#load');
-        var content = result.find('.modal-content');
-        var winH = $(window).height();
-        //Set the popup window to center
-        content.css('margin-top', winH / 2 - content.height() / 2);
-        return result;
-    },
-
-    show: function () {
-        this.panel.modal({
-            backdrop: 'static'
-        });
-    },
-
-    close: function () {
-        this.panel.modal('hide');
-    }
-});
-
-// Show loading dialog ...
-waitDialog = new editor.WaitDialog();
-waitDialog.show();
-
-// Loading libraries ...
-jQuery.getScript("js/mindplot-min.js");
diff --git a/wise-editor/src/main/webapp/js/hotkeys.js b/wise-editor/src/main/webapp/js/hotkeys.js
deleted file mode 120000
index 61be1840..00000000
--- a/wise-editor/src/main/webapp/js/hotkeys.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../mindplot/src/main/javascript/libraries/hotkeys/jquery.hotkeys.js
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/js/jquery-mousewheel.js b/wise-editor/src/main/webapp/js/jquery-mousewheel.js
deleted file mode 120000
index 4ce2ce5c..00000000
--- a/wise-editor/src/main/webapp/js/jquery-mousewheel.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../mindplot/src/main/javascript/libraries/jquery/jquery.mousewheel.min.js
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/js/jquery.js b/wise-editor/src/main/webapp/js/jquery.js
deleted file mode 120000
index 260af803..00000000
--- a/wise-editor/src/main/webapp/js/jquery.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../mindplot/src/main/javascript/libraries/jquery/jquery-2.1.0.min.js
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/js/less.js b/wise-editor/src/main/webapp/js/less.js
deleted file mode 120000
index b9ec21bf..00000000
--- a/wise-editor/src/main/webapp/js/less.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../mindplot/src/main/javascript/libraries/less/less-1.4.2.min.js
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/js/mindplot-min.js b/wise-editor/src/main/webapp/js/mindplot-min.js
deleted file mode 100644
index 304a2501..00000000
--- a/wise-editor/src/main/webapp/js/mindplot-min.js
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//  This is only a mock used for development. In production, it's replaced by the real zip file...
-//
-function JSPomLoader(pomUrl, callback) {
-    console.log("POM Load URL:" + pomUrl);
-    var jsUrls;
-    new jQuery.ajax({
-        url: pomUrl,
-        method: 'get'
-    }).done(function (data) {
-            // Collect JS Urls ...
-            var concatRoot = data.getElementsByTagName('includes');
-            var fileSetArray = Array.filter(concatRoot[0].childNodes, function (elem) {
-                return elem.nodeType == Node.ELEMENT_NODE
-            });
-
-            jsUrls = new Array();
-            Array.each(fileSetArray, function (elem) {
-                    var jsUrl = elem.firstChild.nodeValue;
-                    if (jsUrl.indexOf("${basedir}") != -1) {
-                        jsUrls.push(pomUrl.substring(0, pomUrl.lastIndexOf('/')) + jsUrl.replace("${basedir}", ""));
-                    } else {
-
-                        jsUrls.push(pomUrl.substring(0, pomUrl.lastIndexOf('/')) + "/src/main/javascript/" + jsUrl);
-                    }
-                }
-            );
-
-            // Load all JS dynamically ....
-            jsUrls = jsUrls.reverse();
-
-            function jsRecLoad(urls) {
-                if (urls.length == 0) {
-                    if ($defined(callback))
-                        callback();
-                } else {
-                    var url = urls.pop();
-                    $.ajax({
-                        url: url,
-                        crossDomain: true,
-                        dataType: "script",
-                        success:  function () {
-                            jsRecLoad(urls);
-                        },
-                        error: function(){
-                            console.error("Unexpected error loading:"+url);
-                            console.error(arguments);
-                        }
-                    });
-                }
-            }
-
-            jsRecLoad(jsUrls);
-        }
-    );
-
-}
-
-$.ajax({
-    url: "../../../../../web2d/target/classes/web2d.svg-min.js",
-    crossDomain: true,
-    dataType: "script",
-    success:  function () {
-        JSPomLoader('../../../../../mindplot/pom.xml', function () {
-        });
-    },
-    error: function(){
-        console.error("Unexpected error loading:"+url);
-        console.error(arguments);
-    }
-});
-
-
-
-
diff --git a/wise-editor/src/main/webapp/js/mootools-core.js b/wise-editor/src/main/webapp/js/mootools-core.js
deleted file mode 120000
index d7ba2354..00000000
--- a/wise-editor/src/main/webapp/js/mootools-core.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../mindplot/src/main/javascript/libraries/mootools/mootools-core-1.4.5-full-nocompat-yc.js
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/js/underscore.js b/wise-editor/src/main/webapp/js/underscore.js
deleted file mode 120000
index 4e9f6590..00000000
--- a/wise-editor/src/main/webapp/js/underscore.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../mindplot/src/main/javascript/libraries/underscorejs/underscore-min.js
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/js/underscorejs.js b/wise-editor/src/main/webapp/js/underscorejs.js
deleted file mode 120000
index 4e9f6590..00000000
--- a/wise-editor/src/main/webapp/js/underscorejs.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../mindplot/src/main/javascript/libraries/underscorejs/underscore-min.js
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/samples/complex.xml b/wise-editor/src/main/webapp/samples/complex.xml
deleted file mode 100644
index c9e716e6..00000000
--- a/wise-editor/src/main/webapp/samples/complex.xml
+++ /dev/null
@@ -1,352 +0,0 @@
-
-    
-        
-        
-            
-        
-        
-        
-        
-        
-        
-        
-            
-        
-        
-        
-        
-            
-            
-        
-        
-            
-        
-    
-    
-        
-        
-            
-        
-        
-            
-        
-        
-            
-        
-        
-            
-            
-        
-    
-    
-        
-        
-            
-        
-        
-            
-        
-        
-            
-        
-        
-        
-            
-            
-        
-    
-    
-        
-        
-            
-        
-        
-            
-            
-                
-            
-            
-                
-            
-        
-        
-            
-        
-        
-            
-            
-            
-            
-        
-        
-            
-            
-            
-            
-                
-            
-        
-        
-            
-        
-    
-    
-        
-            
-                
-                
-            
-            
-                
-                
-                
-            
-            
-            
-                
-                
-                
-                
-            
-        
-    
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-            
-        
-        
-        
-        
-        
-    
-    
-        
-        
-            
-            
-        
-        
-            
-            
-                
-            
-            
-                
-            
-        
-        
-            
-            
-        
-    
-    
-        
-        
-            
-        
-        
-        
-            
-        
-        
-            
-        
-        
-            
-        
-        
-            
-        
-        
-            
-        
-        
-            
-            
-        
-    
-    
-        
-        
-        
-        
-        
-    
-    
-        
-        
-            
-            
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-    
-    
-        
-            
-        
-        
-        
-            
-        
-        
-        
-            
-            
-        
-    
-    
-    
-        
-            
-                
-            
-            
-                
-            
-            
-                
-            
-            
-                
-            
-        
-        
-            
-        
-        
-            
-                
-                
-                
-                    
-                
-                
-                
-                    
-                
-                
-                    
-                    
-                        
-                    
-                
-            
-            
-                
-                
-                    
-                    
-                
-                
-                    
-                
-                
-                    
-                    
-                
-                
-                    
-                    
-                        
-                    
-                
-            
-            
-                
-                
-                
-                    
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-            
-            
-                
-                
-                
-                    
-                    
-                
-                
-                
-                    
-                
-                
-                    
-                
-            
-            
-                
-                
-            
-        
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/samples/emptyNodes.xml b/wise-editor/src/main/webapp/samples/emptyNodes.xml
deleted file mode 100644
index 9c08eb07..00000000
--- a/wise-editor/src/main/webapp/samples/emptyNodes.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-
-
-    
-        
-        
-            
-        
-        
-            
-            
-                
-            
-            
-                
-            
-            
-                
-            
-        
-        
-            
-            
-                
-                
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-            
-            
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                    
-                        
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                    
-                        
-                    
-                    
-                        
-                    
-                
-                
-                    
-                    
-                        
-                    
-                
-                
-                    
-                
-                
-                    
-                    
-                        
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                
-            
-        
-    
-
diff --git a/wise-editor/src/main/webapp/samples/huge.xml b/wise-editor/src/main/webapp/samples/huge.xml
deleted file mode 100644
index 1006e456..00000000
--- a/wise-editor/src/main/webapp/samples/huge.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-
-    
-        
-            
-                
-                
-                    
-                        
-                    
-                    
-                
-                
-                
-                    
-                    
-                
-                
-                    
-                        
-                            
-                        
-                        
-                    
-                    
-                        
-                        
-                        
-                    
-                    
-                        
-                        
-                        
-                    
-                
-            
-            
-                
-                
-                    
-                        
-                        
-                    
-                
-                
-                    
-                
-                
-                    
-                
-                
-                    
-                    
-                    
-                
-            
-        
-        
-            
-            
-                
-                    
-                
-                
-                    
-                    
-                
-                
-                    
-                
-                
-                    
-                
-            
-            
-                
-            
-            
-                
-                    
-                    
-                    
-                
-                
-                    
-                        
-                        
-                    
-                    
-                        
-                    
-                    
-                        
-                        
-                        
-                    
-                
-            
-            
-                
-                
-                
-                
-            
-            
-                
-                    
-                    
-                
-                
-                    
-                
-            
-            
-                
-                
-            
-            
-            
-        
-        
-            
-                
-                    
-                        
-                            
-                            
-                            
-                        
-                        
-                        
-                            
-                            
-                            
-                            
-                        
-                        
-                        
-                    
-                    
-                    
-                    
-                        
-                    
-                    
-                        
-                        
-                    
-                
-            
-        
-        
-            
-                
-                
-                
-                    
-                
-            
-            
-            
-            
-                
-                
-                
-                
-            
-            
-            
-                
-            
-            
-                
-                
-            
-            
-                
-                
-                
-            
-        
-        
-        
-            
-        
-        
-            
-            
-                
-                    
-                
-                
-                
-            
-        
-        
-            
-                
-                
-                    
-                    
-                        
-                    
-                
-                
-                    
-                
-            
-            
-                
-                
-                
-            
-        
-        
-            
-                
-                
-                
-                
-                
-            
-        
-        
-            
-                
-                
-                    
-                        
-                    
-                    
-                        
-                        
-                        
-                    
-                    
-                        
-                        
-                        
-                    
-                
-                
-                    
-                        
-                        
-                    
-                
-                
-                    
-                    
-                
-                
-                    
-                
-                
-                    
-                        
-                        
-                    
-                
-                
-                    
-                
-                
-                    
-                        
-                            
-                            
-                            
-                        
-                    
-                
-                
-                    
-                    
-                
-            
-            
-                
-                    
-                    
-                
-                
-                
-            
-            
-                
-                
-                    
-                        
-                        
-                    
-                
-            
-        
-    
-    
-        
-        
-            
-            
-        
-        
-            
-        
-        
-            
-        
-    
-    
-        
-            
-                
-            
-            
-                
-            
-            
-                
-                
-            
-            
-            
-            
-                
-            
-            
-                
-                
-            
-        
-        
-            
-                
-                
-            
-            
-                
-            
-            
-            
-                
-                
-            
-        
-        
-            
-                
-            
-            
-            
-                
-                    
-                    
-                
-                
-            
-        
-        
-            
-                
-                    
-                
-                
-            
-            
-                
-            
-            
-                
-                    
-                        
-                        
-                    
-                
-                
-                    
-                
-            
-            
-            
-            
-            
-        
-    
-
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/samples/issue.xml b/wise-editor/src/main/webapp/samples/issue.xml
deleted file mode 100644
index e957fa3d..00000000
--- a/wise-editor/src/main/webapp/samples/issue.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-    
-        
-            
-            
-                
-                
-                    
-                
-            
-            
-                
-                    
-                
-            
-            
-                
-                    
-                
-            
-        
-        
-            
-            
-                
-                
-                
-                
-            
-            
-                
-                
-                
-                
-                
-            
-            
-                
-            
-        
-        
-            
-            
-                
-            
-            
-            
-            
-        
-    
-    
-        
-        
-            
-        
-        
-            
-        
-        
-            
-        
-        
-            
-        
-        
-            
-        
-    
-    
-        
-    
-    
-    
-    
-
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/samples/sample2.xml b/wise-editor/src/main/webapp/samples/sample2.xml
deleted file mode 100644
index aad51a70..00000000
--- a/wise-editor/src/main/webapp/samples/sample2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-    
-        
-        
-        
-            
-        
-        
-            
-                
-            
-        
-        
-            
-                
-                    
-                    
-                
-            
-        
-        
-            
-            
-        
-        
-            
-        
-    
-
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/samples/sample3.xml b/wise-editor/src/main/webapp/samples/sample3.xml
deleted file mode 100644
index a5a72ca4..00000000
--- a/wise-editor/src/main/webapp/samples/sample3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-    
-    
-    
-    
-    
-    
-    
-
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/samples/sample4.xml b/wise-editor/src/main/webapp/samples/sample4.xml
deleted file mode 100644
index 8053577a..00000000
--- a/wise-editor/src/main/webapp/samples/sample4.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-    
-    
-    
-    
-    
-    
-    
-
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/samples/welcome-reloaded.xml b/wise-editor/src/main/webapp/samples/welcome-reloaded.xml
deleted file mode 100644
index cac5906b..00000000
--- a/wise-editor/src/main/webapp/samples/welcome-reloaded.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-    
-        
-            
-            
-            
-        
-        
-            
-            
-                
-            
-            
-            
-            
-        
-        
-            
-            
-            
-            
-        
-        
-            
-            
-                
-            
-            
-            
-        
-        
-            
-                
-            
-            
-            
-            
-            
-                
-            
-            
-                
-            
-        
-    
-
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/samples/welcome.xml b/wise-editor/src/main/webapp/samples/welcome.xml
deleted file mode 100644
index cac5906b..00000000
--- a/wise-editor/src/main/webapp/samples/welcome.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-    
-        
-            
-            
-            
-        
-        
-            
-            
-                
-            
-            
-            
-            
-        
-        
-            
-            
-            
-            
-        
-        
-            
-            
-                
-            
-            
-            
-        
-        
-            
-                
-            
-            
-            
-            
-            
-                
-            
-            
-                
-            
-        
-    
-
\ No newline at end of file
diff --git a/wise-ui/pom.xml b/wise-ui/pom.xml
new file mode 100644
index 00000000..6586d658
--- /dev/null
+++ b/wise-ui/pom.xml
@@ -0,0 +1,78 @@
+
+
+    4.0.0
+    org.wisemapping
+    wise-ui
+
+    war
+    WiseMapping Frontend
+
+    
+        org.wisemapping
+        wisemapping
+        ../pom.xml
+        5.0.2-SNAPSHOT
+    
+
+    
+        
+            
+                maven-antrun-plugin
+                
+                    
+                        generate-sources
+                        generate-sources
+                        
+                            
+                                
+                                
+                                
+                                    
+                                    
+                                
+                                
+                                    
+                                    
+                                    
+                                    
+                                
+
+                                
+                                
+                                
+                                    
+                                    
+                                
+                                
+                                    
+                                    
+                                    
+                                    
+                                
+                            
+                        
+                        
+                            run
+                        
+                    
+                
+            
+            
+                org.apache.maven.plugins
+                maven-war-plugin
+                3.3.1
+                
+                    false
+                    
+                        
+                            target
+                            
+                            wisemapping-*/**/dist/*
+                        
+                    
+                
+            
+        
+    
+
diff --git a/wise-webapp/doc/REST Services.md b/wise-webapp/doc/REST Services.md
index f165b0eb..ed5b0805 100644
--- a/wise-webapp/doc/REST Services.md	
+++ b/wise-webapp/doc/REST Services.md	
@@ -24,19 +24,19 @@ The following variables should be replaced:
 
 Obtaining user information by email:
  * Template Path: /service/admin/users/email/{user.email}.json
- * Example: curl "http://{host.name}:{host.port}/{context.path}/service/admin/users/email/{user.email}.json" --get --basic -u "admin@wisemapping.org:test"
+ * Example: curl "http://{host.name}:{host.port}/{context.path}/service/admin/users/email/{user.email}.json" --GET --basic -u "admin@wisemapping.org:test"
 
 Deleting a based on the user id:
  * Template Path: /service/admin/users/{userId}
- * curl "http://{host.name}:{host.port}/{context.path}/service/admin/users/{userId}" --request delete --basic -u "admin@wisemapping.org:test"
+ * curl "http://{host.name}:{host.port}/{context.path}/service/admin/users/{userId}" --request DELETE --basic -u "admin@wisemapping.org:test"
 
 Changing Password:
 Template Path: /service/admin/users/{userId}/password
- * curl "http://{host.name}:{host.port}/{context.path}/service/admin/users/{userId}/password" --request put --basic -u "admin@wisemapping.org:test" -H "Content-Type:text/plain" --data ""
+ * curl "http://{host.name}:{host.port}/{context.path}/service/admin/users/{userId}/password" --request PUT --basic -u "admin@wisemapping.org:test" -H "Content-Type:text/plain" --data ""
 
 Creating a new user:
  * Template Path: /service/admin/users/
  * Method: Post
- * curl "http://{host.name}:{host.port}/{context.path}/service/admin/users" --request post --basic -u "admin@wisemapping.org:test" -H "Content-Type:application/json" --data '{"email": "te2@mydomain.de", "lastname": "lastname", "firstname":"myfirstname","password":"password"}'
+ * curl "http://{host.name}:{host.port}/{context.path}/service/admin/users" --request POST --basic -u "admin@wisemapping.org:test" -H "Content-Type:application/json" --data '{"email": "te2@mydomain.de", "lastname": "lastname", "firstname":"myfirstname","password":"password"}'
 
 
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 74c4735e..1537ece9 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -34,26 +34,12 @@
     
 
     
-
         
             org.wisemapping
-            core-js
+            wise-ui
             ${com.wisemapping.version}
-            provided
-        
-        
-            org.wisemapping
-            wise-editor
-            ${com.wisemapping.version}
-            provided
             war
         
-        
-            org.wisemapping
-            mindplot
-            ${com.wisemapping.version}
-            provided
-        
         
             org.apache.velocity
             velocity
@@ -84,16 +70,6 @@
             ${org.springframework.addons}
             compile
         
-        
-            org.springframework.security
-            spring-security-oauth2-client
-            ${org.springframework.addons}
-        
-        
-            org.springframework.security
-            spring-security-oauth2-jose
-            ${org.springframework.addons}
-        
         
             org.springframework
             spring-beans
@@ -115,7 +91,7 @@
 
         
         
-            org.hibernate
+            org.hibernate.validator
             hibernate-validator
             6.0.21.Final
         
@@ -147,6 +123,16 @@
             org.apache.xmlgraphics
             fop
             2.4
+            
+                
+                    org.apache.xmlgraphics
+                    fop-core
+                
+                
+                    org.apache.xmlgraphics
+                    fop-events
+                
+            
         
         
             org.springframework
@@ -184,12 +170,6 @@
             ${org.springframework.version}
             runtime
         
-        
-            org.springframework
-            spring-orm
-            ${org.springframework.version}
-            compile
-        
         
             org.springframework.security
             spring-security-web
@@ -237,16 +217,10 @@
             batik-codec
             1.10
         
-        
-            javax
-            javaee-api
-            8.0.1
-            provided
-        
         
             javax.mail
             mail
-            1.4
+            1.4.3
         
         
             mysql
@@ -284,6 +258,11 @@
             jackson-databind
             2.11.3
         
+        
+            javax.servlet
+            jstl
+            1.2
+        
         
             org.slf4j
             slf4j-api
@@ -301,46 +280,17 @@
             jaxb-api
             2.3.1
         
-        
-            org.glassfish.jaxb
-            jaxb-runtime
-            2.3.1
-        
-        
-            com.sun.xml.bind
-            jaxb-core
-            2.3.0
-        
-        
-            org.jacoco
-            jacoco-maven-plugin
-            0.8.5
-        
         
             
             org.jsoup
             jsoup
             1.7.1
         
-        
-            com.mangofactory
-            swagger-springmvc
-            0.6.6
-        
-        
-            com.wordnik
-            swagger-annotations_2.9.1
-            1.2.0
-        
         
             javax.servlet
-            jstl
-            1.2
-        
-        
-            javax.servlet
-            servlet-api
-            2.5
+            javax.servlet-api
+            3.1.0
+            provided
         
         
             org.apache.httpcomponents
@@ -354,41 +304,6 @@
         
     
     
-        
-            coverage
-            
-                
-                    
-                        org.jacoco
-                        jacoco-maven-plugin
-                        0.6.4.201312101107
-                        
-                            
-                            
-                                pre-unit-test
-                                
-                                    prepare-agent
-                                
-                            
-                            
-                            
-                                post-unit-test
-                                test
-                                
-                                    report
-                                
-                            
-                        
-                    
-                
-            
-        
         
             hsqldb
             
@@ -511,54 +426,24 @@
             
                 org.apache.maven.plugins
                 maven-war-plugin
-                2.4
+                3.3.2
                 
                     wisemapping
                     
                         
                             org.wisemapping
-                            wise-editor
-                            war
-                            /
+                            wise-ui
+                            /static/mindplot/
                             
-                                **/*.css
-                                **/*.png
-                                **/*.gif
-                                **/*.ico
-                                **/*.jpg
-                                **/*.less
-                                js/editor.js
-                                js/hotkeys.js
-                                js/jquery-mousewheel.js
-                                js/underscore.js
+                                wisemapping-mindplot/package/dist/*
                             
                         
                         
                             org.wisemapping
-                            core-js
-                            jar
-                            js
+                            wise-ui
+                            /static/webapp/
                             
-                                *.js
-                            
-                        
-                        
-                            org.wisemapping
-                            mindplot
-                            jar
-                            css
-                            
-                                **/*.css
-                                **/*l
-                            
-                        
-                        
-                            org.wisemapping
-                            mindplot
-                            jar
-                            js
-                            
-                                **/*.js
+                                wisemapping-webapp/package/dist/*
                             
                         
                     
@@ -644,29 +529,6 @@
                     
                 
             
-            
-                org.apache.maven.plugins
-                maven-dependency-plugin
-                
-                    
-                        package
-                        
-                            copy
-                        
-                        
-                            
-                                
-                                    org.mortbay.jetty
-                                    jetty-runner
-                                    7.4.5.v20110725
-                                    jetty-runner.jar
-                                
-                            
-                        
-                    
-                
-            
-
             
                 org.jvnet.jaxb2.maven2
                 maven-jaxb2-plugin
diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
index 1d9072f2..e6b3bb9f 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
@@ -58,13 +58,13 @@ public interface MindmapManager {
 
     void removeCollaboration(Collaboration collaboration);
 
-    public List search(MindMapCriteria criteria);
+    List search(MindMapCriteria criteria);
 
-    public List search(MindMapCriteria criteria, int maxResult);
+    List search(MindMapCriteria criteria, int maxResult);
 
-    public List getHistoryFrom(int mindmapId);
+    List getHistoryFrom(int mindmapId);
 
-    public MindMapHistory getHistory(int historyId);
+    MindMapHistory getHistory(int historyId);
 
     void updateCollaboration(@NotNull Collaboration collaboration);
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
index 0f33201f..1d0de164 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
@@ -20,20 +20,20 @@ package com.wisemapping.dao;
 
 import com.wisemapping.model.*;
 import com.wisemapping.util.ZipUtils;
+import org.hibernate.Criteria;
 import org.hibernate.Query;
+import org.hibernate.criterion.Junction;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.criterion.SimpleExpression;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.orm.hibernate5.HibernateTemplate;
 import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.criterion.SimpleExpression;
-import org.hibernate.criterion.Junction;
-import org.hibernate.criterion.Order;
-import org.hibernate.Criteria;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Calendar;
+import java.util.List;
 
 public class MindmapManagerImpl
         extends HibernateDaoSupport
diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java b/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java
index 0aaa6899..1dac8d62 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java
@@ -18,9 +18,9 @@
 
 package com.wisemapping.dao;
 
+import com.wisemapping.model.AccessAuditory;
 import com.wisemapping.model.Collaborator;
 import com.wisemapping.model.User;
-import com.wisemapping.model.AccessAuditory;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -31,7 +31,7 @@ public interface UserManager {
 
     User getUserBy(String email);
 
-    public User getUserBy(long id);
+    User getUserBy(long id);
 
     void createUser(User user);
 
@@ -41,10 +41,10 @@ public interface UserManager {
 
     User getUserByActivationCode(long code);
 
-    public Collaborator getCollaboratorBy(String email);
+    Collaborator getCollaboratorBy(String email);
 
-    public User createUser(User user, Collaborator col);
+    User createUser(User user, Collaborator col);
 
-    public void removeUser(@NotNull User user);
+    void removeUser(@NotNull User user);
 
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
index e191eab8..dbc4a369 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
@@ -18,10 +18,12 @@
 
 package com.wisemapping.dao;
 
+import com.wisemapping.model.AccessAuditory;
 import com.wisemapping.model.Collaboration;
 import com.wisemapping.model.Collaborator;
 import com.wisemapping.model.User;
-import com.wisemapping.model.AccessAuditory;
+import com.wisemapping.security.DefaultPasswordEncoderFactories;
+import com.wisemapping.security.LegacyPasswordEncoder;
 import org.hibernate.ObjectNotFoundException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -130,7 +132,14 @@ public class UserManagerImpl
 
     public void updateUser(@NotNull User user) {
         assert user != null : "user is null";
-        user.setPassword(passwordEncoder.encode(user.getPassword()));
+
+        // Does the password need to be encrypted ?
+        final String password = user.getPassword();
+        if(password!=null && (!password.startsWith(LegacyPasswordEncoder.ENC_PREFIX) && !password.startsWith( "{"+ DefaultPasswordEncoderFactories.ENCODING_ID)))
+        {
+            user.setPassword(passwordEncoder.encode(user.getPassword()));
+        }
+
         getHibernateTemplate().update(user);
     }
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java
index 73a3c8c1..96fbe962 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java
@@ -6,7 +6,7 @@ import org.springframework.context.MessageSource;
 import java.util.Locale;
 
 abstract public class ClientException extends WiseMappingException {
-    private Severity severity;
+    private final Severity severity;
 
     public ClientException(@NotNull String message, @NotNull Severity severity) {
         super(message);
diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java
index 2203e7a4..bca586c3 100755
--- a/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java
@@ -18,11 +18,23 @@
 
 package com.wisemapping.exceptions;
 
+import com.wisemapping.service.InvalidUserEmailException;
+import org.jetbrains.annotations.NotNull;
+
 public class EmailNotExistsException
-        extends Exception
+        extends ClientException
 {
-    public EmailNotExistsException(Exception e)
+
+    private static final String MSG_KEY = "RESET_PASSWORD_INVALID_EMAIL";
+
+    public EmailNotExistsException(@NotNull InvalidUserEmailException e)
     {
-        super(e);
+        super(e.getMessage(),Severity.INFO);
+    }
+
+    @NotNull
+    @Override
+    protected String getMsgBundleKey() {
+        return MSG_KEY;
     }
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/GoogleChromeFrameRequiredException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/GoogleChromeFrameRequiredException.java
deleted file mode 100644
index 1f5c997e..00000000
--- a/wise-webapp/src/main/java/com/wisemapping/exceptions/GoogleChromeFrameRequiredException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-*    Copyright [2015] [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.
-*/
-
-package com.wisemapping.exceptions;
-
-public class GoogleChromeFrameRequiredException extends Exception {
-
-}
diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/MapCouldNotFoundException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/MapCouldNotFoundException.java
index c353ba01..4c6e33b9 100755
--- a/wise-webapp/src/main/java/com/wisemapping/exceptions/MapCouldNotFoundException.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/MapCouldNotFoundException.java
@@ -18,7 +18,8 @@
 
 package com.wisemapping.exceptions;
 
-import org.jetbrains.annotations.NotNull;
+
+import javax.validation.constraints.NotNull;
 
 public class MapCouldNotFoundException
     extends ClientException
diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java
index de7426df..995e4b50 100755
--- a/wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 public class SessionExpiredException
         extends ClientException {
     private static final String MSG_KEY = "MINDMAP_TIMESTAMP_OUTDATED";
-    private User lastUpdater;
+    private final User lastUpdater;
 
     public SessionExpiredException(@NotNull String debugInfo, @NotNull User lastUpdater) {
         super(debugInfo, Severity.FATAL);
diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java
deleted file mode 100644
index 68649ab2..00000000
--- a/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-*    Copyright [2015] [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.
-*/
-
-package com.wisemapping.exceptions;
-
-public class UnsupportedBrowserException extends Exception {
-
-}
diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java
index 3a3ed1b8..51379493 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java
@@ -34,8 +34,8 @@ public enum ExportFormat {
     WISEMAPPING("application/wisemapping+xml", "wxml");
 
 
-    private String contentType;
-    private String fileExtension;
+    private final String contentType;
+    private final String fileExtension;
 
     ExportFormat(String contentType, String fileExtension) {
         this.contentType = contentType;
diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java
index 4fb7488f..dd7edd3d 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java
@@ -19,7 +19,7 @@
 package com.wisemapping.exporter;
 
 public class ExportProperties {
-    private ExportFormat format;
+    private final ExportFormat format;
     private String version;
 
     public ExportFormat getFormat() {
@@ -71,7 +71,7 @@ public class ExportProperties {
 
         public enum Size {
             SMALL(100), MEDIUM(800), XMEDIUM(1024), LARGE(2048);
-            private int width;
+            private final int width;
 
             Size(int width) {
                 this.width = width;
diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java b/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java
index 957ceee3..86c9a5c9 100755
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java
@@ -24,6 +24,6 @@ import org.jetbrains.annotations.NotNull;
 import java.io.OutputStream;
 
 public interface Exporter {
-    public void export(@NotNull byte[] xml, @NotNull OutputStream outputStream) throws ExportException;
-    public void export(Mindmap map, OutputStream outputStream) throws ExportException;
+    void export(@NotNull byte[] xml, @NotNull OutputStream outputStream) throws ExportException;
+    void export(Mindmap map, OutputStream outputStream) throws ExportException;
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
index 39102311..070e343b 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
@@ -64,7 +64,7 @@ public class ExporterFactory {
     private static final String IMAGE_NODE_NAME = "image";
     private static final int MANGING = 50;
     private static final String UTF_8_CHARSET_NAME = "UTF-8";
-    private File baseImgDir;
+    private final File baseImgDir;
 
     public ExporterFactory(@NotNull final ServletContext servletContext) {
         this.baseImgDir = new File(servletContext.getRealPath("/"));
@@ -157,12 +157,12 @@ public class ExporterFactory {
             case FREEMIND: {
                 final FreemindExporter exporter = new FreemindExporter();
                 exporter.setVersion(new VersionNumber(properties.getVersion()));
-                exporter.export(xml.getBytes(UTF_8_CHARSET_NAME), output);
+                exporter.export(xml.getBytes(StandardCharsets.UTF_8), output);
                 break;
             }
             case MINDJET: {
                 final Exporter exporter = XSLTExporter.create(XSLTExporter.Type.MINDJET);
-                exporter.export(xml.getBytes(UTF_8_CHARSET_NAME), output);
+                exporter.export(xml.getBytes(StandardCharsets.UTF_8), output);
                 break;
             }
             default:
diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
index 8dd352bd..9e23298e 100755
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
@@ -22,15 +22,14 @@ package com.wisemapping.exporter;
 import com.wisemapping.importer.VersionNumber;
 import com.wisemapping.importer.freemind.FreemindConstant;
 import com.wisemapping.importer.freemind.FreemindIconConverter;
-import com.wisemapping.jaxb.freemind.Font;
+import com.wisemapping.jaxb.freemind.*;
+import com.wisemapping.jaxb.wisemap.Icon;
 import com.wisemapping.jaxb.wisemap.Note;
+import com.wisemapping.jaxb.wisemap.RelationshipType;
+import com.wisemapping.jaxb.wisemap.TopicType;
 import com.wisemapping.model.Mindmap;
 import com.wisemapping.model.ShapeStyle;
 import com.wisemapping.util.JAXBUtils;
-import com.wisemapping.jaxb.freemind.*;
-import com.wisemapping.jaxb.wisemap.RelationshipType;
-import com.wisemapping.jaxb.wisemap.TopicType;
-import com.wisemapping.jaxb.wisemap.Icon;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.w3c.dom.Document;
@@ -40,11 +39,11 @@ import javax.xml.bind.JAXBException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -214,7 +213,7 @@ public class FreemindExporter
         htmlContent.append("");
 
         DocumentBuilder db = getInstanceBuilder();
-        byte[] bytes = htmlContent.toString().getBytes("UTF-8");
+        byte[] bytes = htmlContent.toString().getBytes(StandardCharsets.UTF_8);
         Document document = db.parse(new ByteArrayInputStream(bytes), "UTF-8");
         richcontent.setHtml(document.getDocumentElement());
         return richcontent;
@@ -338,7 +337,7 @@ public class FreemindExporter
     //  8 Normal
     // 10 Large
     // 15 Huge
-    static private Map wiseToFreeFontSize = new HashMap();
+    static private final Map wiseToFreeFontSize = new HashMap();
 
     static {
         wiseToFreeFontSize.put(6, 10);
diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/XSLTExporter.java b/wise-webapp/src/main/java/com/wisemapping/exporter/XSLTExporter.java
index 9180e9e8..04e15571 100644
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/XSLTExporter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/XSLTExporter.java
@@ -9,11 +9,15 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayReader;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 
 public class XSLTExporter implements Exporter {
 
-    private Type type;
+    private final Type type;
 
     public XSLTExporter(@NotNull Type type) {
         this.type = type;
@@ -38,10 +42,10 @@ public class XSLTExporter implements Exporter {
             final Source xslt = new StreamSource(xsltis);
             Transformer transformer = factory.newTransformer(xslt);
 
-            final CharArrayReader reader = new CharArrayReader(mmos.toString("iso-8859-1").toCharArray());
+            final CharArrayReader reader = new CharArrayReader(mmos.toString(StandardCharsets.ISO_8859_1).toCharArray());
             final Source mmSource = new StreamSource(reader);
             transformer.transform(mmSource, new StreamResult(outputStream));
-        } catch (TransformerException | UnsupportedEncodingException e) {
+        } catch (TransformerException e) {
             throw new ExportException(e);
         }
 
@@ -57,7 +61,7 @@ public class XSLTExporter implements Exporter {
         return new XSLTExporter(type);
     }
 
-    public static enum Type {
+    public enum Type {
         TEXT("mm2text.xsl"),
         WORD("mm2wordml_utf8.xsl"),
         CSV("mm2csv.xsl"),
@@ -70,7 +74,7 @@ public class XSLTExporter implements Exporter {
             return xsltName;
         }
 
-        private String xsltName;
+        private final String xsltName;
 
         Type(@NotNull String xstFile) {
             this.xsltName = xstFile;
diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java
deleted file mode 100644
index 65d1fb65..00000000
--- a/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-*    Copyright [2015] [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.
-*/
-
-package com.wisemapping.filter;
-
-import com.wisemapping.exceptions.GoogleChromeFrameRequiredException;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import java.util.Set;
-
-public class BrowserSupportInterceptor extends HandlerInterceptorAdapter {
-    private Set exclude;
-    private static final String USER_AGENT = "wisemapping.user_agent";
-
-    public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception {
-
-        final String requestUri = request.getRequestURI();
-        if (exclude != null && !exclude.contains(requestUri)) {
-            final HttpSession session = request.getSession(false);
-
-            // Try to loaded from the request ...
-            SupportedUserAgent userAgent = null;
-            if (session != null) {
-                userAgent = (SupportedUserAgent) session.getAttribute(USER_AGENT);
-            }
-
-            // I could not loaded. I will create a new one...
-            if (userAgent == null) {
-                userAgent = SupportedUserAgent.create(request);
-                if (session != null) {
-                    session.setAttribute(USER_AGENT, userAgent);
-                }
-            }
-
-            return true;
-//            // It's a supported browser ?.
-//            if (!userAgent.isBrowserSupported()) {
-//                throw new UnsupportedBrowserException();
-//            }
-//
-//            // Is a Explorer 9 or less without Google Chrome Frame ?.
-//            if (userAgent.needsGCF()) {
-//                throw new GoogleChromeFrameRequiredException();
-//            }
-
-
-        }
-        return true;
-    }
-
-
-    public void setExclude(Set exclude) {
-        this.exclude = exclude;
-    }
-}
diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
index 00b43c15..7f26b3df 100644
--- a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
+++ b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
@@ -33,6 +33,12 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter {
     @Value("${google.analytics.account}")
     private String analyticsAccount;
 
+    @Value("${google.recaptcha2.enabled}")
+    private Boolean recaptcha2Enabled;
+
+    @Value("${google.recaptcha2.siteKey}")
+    private String recaptcha2SiteKey;
+
     @Value("${google.ads.enabled}")
     private Boolean adsEnabled;
 
@@ -50,10 +56,13 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter {
         request.setAttribute("google.analytics.enabled", analyticsEnabled);
         request.setAttribute("google.analytics.account", analyticsAccount);
         request.setAttribute("google.ads.enabled", adsEnabled);
+
+        request.setAttribute("google.recaptcha2.enabled", recaptcha2Enabled);
+        request.setAttribute("google.recaptcha2.siteKey", recaptcha2SiteKey);
+
         request.setAttribute("site.homepage", siteHomepage);
         request.setAttribute("security.type", securityType);
 
-
         // If the property could not be resolved, try to infer one from the request...
         if ("${site.baseurl}".equals(siteUrl)) {
             siteUrl = request.getRequestURL().toString().replace(request.getRequestURI(), request.getContextPath());
diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java b/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java
index cd332fae..629c92ed 100644
--- a/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java
+++ b/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java
@@ -18,7 +18,9 @@
 
 package com.wisemapping.filter;
 
-import com.wisemapping.util.*;
+import com.wisemapping.util.Browser;
+import com.wisemapping.util.UserAgent;
+import com.wisemapping.util.Version;
 import org.jetbrains.annotations.NotNull;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,7 +29,7 @@ import java.io.Serializable;
 public class SupportedUserAgent implements Serializable {
     public static final String USER_AGENT_HEADER = "User-Agent";
     transient private UserAgent userAgent;
-    private String header;
+    private final String header;
 
     private SupportedUserAgent(@NotNull final String header) {
         this.header = header;
diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java
index ec861ed3..57c903b7 100644
--- a/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java
+++ b/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java
@@ -21,11 +21,8 @@ package com.wisemapping.filter;
 import com.wisemapping.model.User;
 import com.wisemapping.security.Utils;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.propertyeditors.LocaleEditor;
-import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-import org.springframework.web.servlet.support.RequestContextUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java b/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java
index d7f73384..89ffbf2e 100755
--- a/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java
@@ -24,5 +24,5 @@ import org.jetbrains.annotations.NotNull;
 import java.io.InputStream;
 
 public interface Importer {
-    public Mindmap importMap(@NotNull String mapName, @NotNull String description, @NotNull InputStream input) throws ImporterException;
+    Mindmap importMap(@NotNull String mapName, @NotNull String description, @NotNull InputStream input) throws ImporterException;
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/JaxbCDATAMarshaller.java b/wise-webapp/src/main/java/com/wisemapping/importer/JaxbCDATAMarshaller.java
index 4af30de6..2be55d78 100644
--- a/wise-webapp/src/main/java/com/wisemapping/importer/JaxbCDATAMarshaller.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/JaxbCDATAMarshaller.java
@@ -67,7 +67,7 @@ public class JaxbCDATAMarshaller {
         final Map sortedToUnsorted = new HashMap();
         final Map unsortedToSorted = new HashMap();
 
-        private Attributes delegated;
+        private final Attributes delegated;
 
         SortedAttributesDecorator(final Attributes delegated) {
             this.delegated = delegated;
diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/VersionNumber.java b/wise-webapp/src/main/java/com/wisemapping/importer/VersionNumber.java
index ec94af46..41807f0e 100644
--- a/wise-webapp/src/main/java/com/wisemapping/importer/VersionNumber.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/VersionNumber.java
@@ -20,7 +20,8 @@ package com.wisemapping.importer;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.NoSuchElementException;
+import java.util.StringTokenizer;
 
 public class VersionNumber
         implements Comparable {
diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindConstant.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindConstant.java
index 7c8f7d35..e329f72c 100644
--- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindConstant.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindConstant.java
@@ -3,32 +3,33 @@ package com.wisemapping.importer.freemind;
 import com.wisemapping.importer.VersionNumber;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 public interface FreemindConstant {
 
-    public static final String LAST_SUPPORTED_FREEMIND_VERSION = "1.0.1";
-    public static final VersionNumber SUPPORTED_FREEMIND_VERSION = new VersionNumber(LAST_SUPPORTED_FREEMIND_VERSION);
-    public static final String CODE_VERSION = "tango";
+    String LAST_SUPPORTED_FREEMIND_VERSION = "1.0.1";
+    VersionNumber SUPPORTED_FREEMIND_VERSION = new VersionNumber(LAST_SUPPORTED_FREEMIND_VERSION);
+    String CODE_VERSION = "tango";
 
-    public static final int SECOND_LEVEL_TOPIC_HEIGHT = 25;
-    public static final int ROOT_LEVEL_TOPIC_HEIGHT = SECOND_LEVEL_TOPIC_HEIGHT;
-    public static final int CENTRAL_TO_TOPIC_DISTANCE = 200;
-    public static final int TOPIC_TO_TOPIC_DISTANCE = 90;
+    int SECOND_LEVEL_TOPIC_HEIGHT = 25;
+    int ROOT_LEVEL_TOPIC_HEIGHT = SECOND_LEVEL_TOPIC_HEIGHT;
+    int CENTRAL_TO_TOPIC_DISTANCE = 200;
+    int TOPIC_TO_TOPIC_DISTANCE = 90;
 
-    public static final int FONT_SIZE_HUGE = 15;
-    public static final int FONT_SIZE_LARGE = 10;
-    public static final int FONT_SIZE_NORMAL = 8;
-    public static final int FONT_SIZE_SMALL = 6;
+    int FONT_SIZE_HUGE = 15;
+    int FONT_SIZE_LARGE = 10;
+    int FONT_SIZE_NORMAL = 8;
+    int FONT_SIZE_SMALL = 6;
 
-    public static final String NODE_TYPE = "NODE";
-    public static final String BOLD = "bold";
-    public static final String ITALIC = "italic";
-    public static final String EMPTY_FONT_STYLE = ";;;;;";
-    public static final String EMPTY_NOTE = "";
+    String NODE_TYPE = "NODE";
+    String BOLD = "bold";
+    String ITALIC = "italic";
+    String EMPTY_FONT_STYLE = ";;;;;";
+    String EMPTY_NOTE = "";
 
-    public static final String POSITION_LEFT = "left";
-    public static final String POSITION_RIGHT = "right";
+    String POSITION_LEFT = "left";
+    String POSITION_RIGHT = "right";
 
-    public final static Charset UTF_8_CHARSET = Charset.forName("UTF-8");
+    Charset UTF_8_CHARSET = StandardCharsets.UTF_8;
 
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java
index 7df4975f..ef3255b7 100755
--- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java
@@ -18,13 +18,16 @@
 
 package com.wisemapping.importer.freemind;
 
+import com.wisemapping.model.IconFamily;
 import com.wisemapping.model.MindmapIcon;
 import com.wisemapping.model.MindmapIcons;
-import com.wisemapping.model.IconFamily;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 final public class FreemindIconConverter {
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
index be459cf1..10ce06d3 100755
--- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
@@ -21,15 +21,14 @@ package com.wisemapping.importer.freemind;
 import com.wisemapping.importer.Importer;
 import com.wisemapping.importer.ImporterException;
 import com.wisemapping.importer.VersionNumber;
+import com.wisemapping.jaxb.freemind.*;
+import com.wisemapping.jaxb.wisemap.Link;
+import com.wisemapping.jaxb.wisemap.RelationshipType;
+import com.wisemapping.jaxb.wisemap.TopicType;
 import com.wisemapping.model.Mindmap;
 import com.wisemapping.model.ShapeStyle;
 import com.wisemapping.util.JAXBUtils;
-import com.wisemapping.jaxb.freemind.*;
-import com.wisemapping.jaxb.freemind.Map;
-import com.wisemapping.jaxb.freemind.Node;
-import com.wisemapping.jaxb.wisemap.RelationshipType;
-import com.wisemapping.jaxb.wisemap.TopicType;
-import com.wisemapping.jaxb.wisemap.Link;
+import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jsoup.Jsoup;
@@ -37,18 +36,23 @@ import org.jsoup.nodes.Document;
 import org.w3c.dom.Element;
 
 import javax.xml.bind.JAXBException;
-import javax.xml.transform.*;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import java.io.InputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringWriter;
-import java.util.*;
 import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 public class FreemindImporter
         implements Importer {
+    final private Logger logger = Logger.getLogger(FreemindImporter.class);
 
     private com.wisemapping.jaxb.wisemap.ObjectFactory mindmapObjectFactory;
     private java.util.Map nodesMap = null;
@@ -56,7 +60,7 @@ public class FreemindImporter
 
     private int currentId;
 
-    public static void main(String argv[]) {
+    public static void main(String[] argv) {
 
 
         // Now, calculate the order it belongs to ...
@@ -130,12 +134,13 @@ public class FreemindImporter
             addRelationships(mindmapMap);
 
             JAXBUtils.saveMap(mindmapMap, baos);
-            wiseXml = new String(baos.toByteArray(), FreemindConstant.UTF_8_CHARSET);
+            wiseXml = baos.toString(FreemindConstant.UTF_8_CHARSET);
             result.setXmlStr(wiseXml);
             result.setTitle(mapName);
             result.setDescription(description);
 
         } catch (JAXBException |  TransformerException e) {
+            logger.debug(e);
             throw new ImporterException(e);
         }
         return result;
@@ -314,12 +319,12 @@ public class FreemindImporter
 
                 final String endarrow = arrow.getENDARROW();
                 if (endarrow != null) {
-                    relt.setEndArrow(!endarrow.toLowerCase().equals("none"));
+                    relt.setEndArrow(!endarrow.equalsIgnoreCase("none"));
                 }
 
                 final String startarrow = arrow.getSTARTARROW();
                 if (startarrow != null) {
-                    relt.setStartArrow(!startarrow.toLowerCase().equals("none"));
+                    relt.setStartArrow(!startarrow.equalsIgnoreCase("none"));
                 }
                 relt.setLineType("3");
                 relationships.add(relt);
@@ -591,8 +596,8 @@ public class FreemindImporter
     }
 
     static private class Coord {
-        private int y;
-        private int x;
+        private final int y;
+        private final int x;
 
         private Coord(@NotNull String pos) {
             final String[] split = pos.split(",");
diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java b/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
index 2c3b05ed..6891642c 100644
--- a/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
+++ b/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
@@ -21,7 +21,7 @@ package com.wisemapping.mail;
 
 import com.wisemapping.util.VelocityEngineUtils;
 import com.wisemapping.util.VelocityEngineWrapper;
-    import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.mail.javamail.MimeMessagePreparator;
@@ -35,9 +35,9 @@ public final class Mailer {
 
     private JavaMailSender mailSender;
     private VelocityEngineWrapper velocityEngineWrapper;
-    private String serverFromEmail;
-    private String supportEmail;
-    private String errorReporterEmail;
+    private final String serverFromEmail;
+    private final String supportEmail;
+    private final String errorReporterEmail;
 
     //~ Methods ..............................................................................................
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
index 617bf98a..a2328d6e 100644
--- a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
@@ -41,7 +41,7 @@ final public class NotificationService {
     @Autowired
     private Mailer mailer;
 
-    private NotifierFilter notificationFilter;
+    private final NotifierFilter notificationFilter;
 
     private String baseUrl;
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/NotifyingExceptionResolver.java b/wise-webapp/src/main/java/com/wisemapping/mail/NotifyingExceptionResolver.java
index ab798291..cecf9c86 100644
--- a/wise-webapp/src/main/java/com/wisemapping/mail/NotifyingExceptionResolver.java
+++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotifyingExceptionResolver.java
@@ -14,7 +14,7 @@ import java.util.Set;
 
 public class NotifyingExceptionResolver extends SimpleMappingExceptionResolver {
 
-    final private Logger logger = Logger.getLogger("com.wisemapping");
+    final private Logger logger = Logger.getLogger(NotifyingExceptionResolver.class);
     private Set exclude = new HashSet();
     private NotificationService notificationService;
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
index f12307fa..723cdad4 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
@@ -111,9 +111,7 @@ public class Collaboration {
         if (id != that.id) return false;
         if (collaborator != null ? !collaborator.equals(that.collaborator) : that.collaborator != null) return false;
         if (mindMap != null ? !mindMap.equals(that.mindMap) : that.mindMap != null) return false;
-        if (role != that.role) return false;
-
-        return true;
+        return role == that.role;
     }
 
     @Override
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java b/wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java
index 68a58d3d..6defdfca 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java
@@ -84,9 +84,7 @@ public class Collaborator implements Serializable {
         Collaborator that = (Collaborator) o;
 
         if (id != that.getId()) return false;
-        if (email != null ? !email.equals(that.getEmail()) : that.getEmail() != null) return false;
-
-        return true;
+        return email != null ? email.equals(that.getEmail()) : that.getEmail() == null;
     }
 
     @Override
@@ -105,9 +103,7 @@ public class Collaborator implements Serializable {
         if (that == null) return false;
 
         if (id != that.getId()) return false;
-        if (email != null ? !email.equals(that.getEmail()) : that.getEmail() != null) return false;
-
-        return true;
+        return email != null ? email.equals(that.getEmail()) : that.getEmail() == null;
 
     }
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Font.java b/wise-webapp/src/main/java/com/wisemapping/model/Font.java
index e7747f83..242021cf 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/Font.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/Font.java
@@ -27,7 +27,7 @@ public enum Font {
     TAHOMA("Tahoma"),
     ARIAL("Arial");
 
-    private String fontName;
+    private final String fontName;
 
     Font (String name)
     {
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java b/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java
index 5cd95de8..a77a57f1 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java
@@ -18,8 +18,8 @@
 
 package com.wisemapping.model;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class MindMapCriteria {
     private String title;
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
index 7ddeff07..466955de 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
@@ -27,6 +27,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -69,11 +70,7 @@ public class Mindmap {
     }
 
     public void setXmlStr(@NotNull String xml) {
-        try {
-            this.setUnzipXml(xml.getBytes(UTF_8));
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException(e);
-        }
+        this.setUnzipXml(xml.getBytes(StandardCharsets.UTF_8));
     }
 
     @NotNull
@@ -92,7 +89,7 @@ public class Mindmap {
 
     @NotNull
     public String getXmlStr() throws UnsupportedEncodingException {
-        return new String(this.getUnzipXml(), UTF_8);
+        return new String(this.getUnzipXml(), StandardCharsets.UTF_8);
     }
 
     @NotNull
@@ -170,7 +167,6 @@ public class Mindmap {
         this.isPublic = isPublic;
     }
 
-    @NotNull
     public Calendar getLastModificationTime() {
         return lastModificationTime;
     }
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java
index db269377..b0552fd2 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java
@@ -19,8 +19,8 @@
 package com.wisemapping.model;
 
 public class MindmapIcon implements Comparable{
-    private String name;
-    private IconFamily family;
+    private final String name;
+    private final IconFamily family;
 
     MindmapIcon(IconFamily family, String name) {
         this.name = name;
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
index 734f141c..28195520 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
@@ -20,9 +20,11 @@ package com.wisemapping.model;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.IllegalStateException;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 @SuppressWarnings({"UnusedDeclaration"})
 public class MindmapIcons {
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java b/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java
index afdb0a59..2c79b6af 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java
@@ -26,7 +26,7 @@ public enum ShapeStyle
     ELLIPSE("elipse"),
     IMAGE("image");
 
-    private String style;
+    private final String style;
 
     ShapeStyle(String style)
     {
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/User.java b/wise-webapp/src/main/java/com/wisemapping/model/User.java
index b3ef8aa3..c91077ee 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/User.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/User.java
@@ -77,7 +77,6 @@ public class User
     public String getPassword() {
         return password;
     }
-
     public void setPassword(String password) {
         this.password = password;
     }
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
index dfc0871c..e396ac18 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
@@ -18,17 +18,16 @@
 
 package com.wisemapping.rest;
 
-import com.mangofactory.swagger.annotations.ApiIgnore;
 import com.wisemapping.exceptions.WiseMappingException;
 import com.wisemapping.mail.NotificationService;
 import com.wisemapping.model.Collaboration;
 import com.wisemapping.model.Mindmap;
 import com.wisemapping.model.User;
 import com.wisemapping.rest.model.RestLogItem;
+import com.wisemapping.rest.model.RestUser;
 import com.wisemapping.security.Utils;
 import com.wisemapping.service.MindmapService;
 import com.wisemapping.service.UserService;
-import com.wordnik.swagger.annotations.Api;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +42,6 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
-@Api(value="UserApi",description = "Account Account Related Objects.")
 @Controller
 public class AccountController extends BaseController {
     @Qualifier("userService")
@@ -57,7 +55,7 @@ public class AccountController extends BaseController {
     @Autowired
     private NotificationService notificationService;
 
-    final Logger logger = Logger.getLogger("com.wisemapping");
+    final Logger logger = Logger.getLogger(AccountController.class);
 
 
     @RequestMapping(method = RequestMethod.PUT, value = "account/password", consumes = {"text/plain"})
@@ -72,6 +70,12 @@ public class AccountController extends BaseController {
         userService.changePassword(user);
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = "/account", produces = {"application/json", "application/xml"})
+    public RestUser fetchAccount() {
+        final User user = Utils.getUser(true);
+        return new RestUser(user);
+    }
+
     @RequestMapping(method = RequestMethod.PUT, value = "account/firstname", consumes = {"text/plain"})
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void changeFirstname(@RequestBody String firstname) {
@@ -124,7 +128,6 @@ public class AccountController extends BaseController {
     }
 
 
-    @ApiIgnore
     @RequestMapping(method = RequestMethod.POST, value = "/logger/editor", consumes = {"application/xml", "application/json"}, produces = {"application/json", "text/html", "application/xml"})
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void logError(@RequestBody RestLogItem item, @NotNull HttpServletRequest request) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java b/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
index b2df9709..0ddb6e80 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
@@ -26,21 +26,12 @@ import com.wisemapping.model.User;
 import com.wisemapping.rest.model.RestUser;
 import com.wisemapping.service.MindmapService;
 import com.wisemapping.service.UserService;
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -49,7 +40,6 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.regex.Pattern;
 
-@Api(value = "AdminApi", description = "Administrative Related Objects.")
 @Controller
 public class AdminController extends BaseController {
     @Qualifier("userService")
@@ -60,10 +50,9 @@ public class AdminController extends BaseController {
     @Autowired
     private MindmapService mindmapService;
 
-    @ApiOperation("Note: Administration permissions required.")
     @RequestMapping(method = RequestMethod.GET, value = "admin/users/{id}", produces = {"application/json", "application/xml"})
     @ResponseBody
-    public RestUser getUserById(@PathVariable @ApiParam(required = true, value = "User Id", allowableValues = "range[1," + Long.MAX_VALUE + "]") long id) throws IOException {
+    public RestUser getUserById(@PathVariable long id) throws IOException {
         final User userBy = userService.getUserBy(id);
         if (userBy == null) {
             throw new IllegalArgumentException("User could not be found");
@@ -71,7 +60,6 @@ public class AdminController extends BaseController {
         return new RestUser(userBy);
     }
 
-    @ApiOperation("Note: Administration permissions required.")
     @RequestMapping(method = RequestMethod.GET, value = "admin/users/email/{email:.+}", produces = {"application/json", "application/xml"})
     @ResponseBody
     public RestUser getUserByEmail(@PathVariable String email) throws IOException {
@@ -82,10 +70,9 @@ public class AdminController extends BaseController {
         return new RestUser(user);
     }
 
-    @ApiOperation("Note: Administration permissions required.")
     @RequestMapping(method = RequestMethod.POST, value = "admin/users", consumes = {"application/xml", "application/json"}, produces = {"application/json", "application/xml"})
     @ResponseStatus(value = HttpStatus.CREATED)
-    public void createUser(@RequestBody @ApiParam(required = true) RestUser user, HttpServletResponse response) throws WiseMappingException {
+    public void createUser(@RequestBody RestUser user, HttpServletResponse response) throws WiseMappingException {
         if (user == null) {
             throw new IllegalArgumentException("User could not be found");
         }
@@ -108,16 +95,21 @@ public class AdminController extends BaseController {
             throw new IllegalArgumentException("firstname can not be null");
         }
 
+
+        final String password = delegated.getPassword();
+        if (password == null || password.isEmpty()) {
+            throw new IllegalArgumentException("password can not be null");
+        }
+
         // Finally create the user ...
         delegated.setAuthenticationType(AuthenticationType.DATABASE);
         userService.createUser(delegated, false, true);
         response.setHeader("Location", "/service/admin/users/" + user.getId());
     }
 
-    @ApiOperation("Note: Administration permissions required.")
     @RequestMapping(method = RequestMethod.PUT, value = "admin/users/{id}/password", consumes = {"text/plain"})
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
-    public void changePassword(@RequestBody @ApiParam(required = true) String password, @PathVariable @ApiParam(required = true, value = "User Id", allowableValues = "range[1," + Long.MAX_VALUE + "]") long id) throws WiseMappingException {
+    public void changePassword(@RequestBody  String password, @PathVariable long id) throws WiseMappingException {
         if (password == null) {
             throw new IllegalArgumentException("Password can not be null");
         }
@@ -130,7 +122,6 @@ public class AdminController extends BaseController {
         userService.changePassword(user);
     }
 
-    @ApiOperation("Note: Administration permissions required.")
     @RequestMapping(method = RequestMethod.DELETE, value = "admin/users/{id}")
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void deleteUserByEmail(@PathVariable long id) throws WiseMappingException {
@@ -148,7 +139,6 @@ public class AdminController extends BaseController {
         userService.removeUser(user);
     }
 
-    @ApiOperation("Note: Administration permissions required.")
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     @RequestMapping(method = RequestMethod.GET, value = "admin/database/purge")
     public void purgeDB(@RequestParam(required = true) Integer minUid, @RequestParam(required = true) Integer maxUid, @RequestParam(required = true) Boolean apply) throws WiseMappingException, UnsupportedEncodingException {
@@ -202,7 +192,6 @@ public class AdminController extends BaseController {
         }
     }
 
-    @ApiOperation("Note: Administration permissions required.")
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     @RequestMapping(method = RequestMethod.GET, value = "admin/database/purge/history")
     public void purgeHistory(@RequestParam(required = true) Integer mapId) throws WiseMappingException, IOException {
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java b/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
index 17973e6d..bec0f7e3 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
@@ -25,6 +25,7 @@ import com.wisemapping.mail.NotificationService;
 import com.wisemapping.model.User;
 import com.wisemapping.rest.model.RestErrors;
 import com.wisemapping.security.Utils;
+import com.wisemapping.service.RegistrationException;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ import java.util.Locale;
 
 public class BaseController {
 
-    final private Logger logger = Logger.getLogger("com.wisemapping.rest");
+    final private Logger logger = Logger.getLogger(BaseController.class);
 
     @Qualifier("messageSource")
     @Autowired
@@ -110,9 +111,15 @@ public class BaseController {
     public RestErrors handleServerErrors(@NotNull Exception ex, @NotNull HttpServletRequest request) {
         final User user = Utils.getUser(false);
         notificationService.reportJavaException(ex, user, request);
-        ex.printStackTrace();
+        logger.error(ex);
+
         return new RestErrors(ex.getMessage(), Severity.SEVERE);
     }
 
-
+    @ExceptionHandler(RegistrationException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public RestErrors handleRegistrationErrors(@NotNull RegistrationException exception) {
+        return new RestErrors(exception, messageSource);
+    }
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java b/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java
index b831448b..1457aa0a 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java
@@ -18,7 +18,6 @@
 
 package com.wisemapping.rest;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
@@ -49,8 +48,8 @@ public class DebugMappingJacksonHttpMessageConverter extends MappingJackson2Http
 
 
 class WrapHttpInputMessage implements HttpInputMessage {
-    private InputStream body;
-    private HttpHeaders headers;
+    private final InputStream body;
+    private final HttpHeaders headers;
 
     WrapHttpInputMessage(InputStream is, HttpHeaders headers) {
         this.body = is;
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java b/wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java
index be42dffa..953231f5 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java
@@ -1,18 +1,13 @@
 package com.wisemapping.rest;
 
 import com.wisemapping.exceptions.LabelCouldNotFoundException;
-import com.wisemapping.exceptions.MapCouldNotFoundException;
 import com.wisemapping.exceptions.WiseMappingException;
 import com.wisemapping.model.Label;
-import com.wisemapping.model.Mindmap;
 import com.wisemapping.model.User;
 import com.wisemapping.rest.model.RestLabel;
 import com.wisemapping.rest.model.RestLabelList;
-import com.wisemapping.rest.model.RestMindmapInfo;
-import com.wisemapping.rest.model.RestMindmapList;
 import com.wisemapping.security.Utils;
 import com.wisemapping.service.LabelService;
-import com.wisemapping.service.MindmapService;
 import com.wisemapping.validator.LabelValidator;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,12 +16,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
index 29dde90a..49470e5e 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
@@ -18,41 +18,16 @@
 
 package com.wisemapping.rest;
 
-import com.mangofactory.swagger.annotations.ApiIgnore;
-import com.wisemapping.exceptions.ImportUnexpectedException;
-import com.wisemapping.exceptions.LabelCouldNotFoundException;
-import com.wisemapping.exceptions.MapCouldNotFoundException;
-import com.wisemapping.exceptions.MultipleSessionsOpenException;
-import com.wisemapping.exceptions.SessionExpiredException;
-import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.exceptions.*;
 import com.wisemapping.importer.ImportFormat;
 import com.wisemapping.importer.Importer;
 import com.wisemapping.importer.ImporterException;
 import com.wisemapping.importer.ImporterFactory;
-import com.wisemapping.model.Collaboration;
-import com.wisemapping.model.CollaborationProperties;
-import com.wisemapping.model.CollaborationRole;
-import com.wisemapping.model.Label;
-import com.wisemapping.model.MindMapHistory;
-import com.wisemapping.model.Mindmap;
-import com.wisemapping.model.User;
-import com.wisemapping.rest.model.RestCollaboration;
-import com.wisemapping.rest.model.RestCollaborationList;
-import com.wisemapping.rest.model.RestLabel;
-import com.wisemapping.rest.model.RestMindmap;
-import com.wisemapping.rest.model.RestMindmapHistory;
-import com.wisemapping.rest.model.RestMindmapHistoryList;
-import com.wisemapping.rest.model.RestMindmapInfo;
-import com.wisemapping.rest.model.RestMindmapList;
+import com.wisemapping.model.*;
+import com.wisemapping.rest.model.*;
 import com.wisemapping.security.Utils;
-import com.wisemapping.service.CollaborationException;
-import com.wisemapping.service.LabelService;
-import com.wisemapping.service.LockInfo;
-import com.wisemapping.service.LockManager;
-import com.wisemapping.service.MindmapService;
+import com.wisemapping.service.*;
 import com.wisemapping.validator.MapInfoValidator;
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiParam;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,32 +36,20 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
-@Api(value = "mindmap", description = "User Mindmap Objects.")
 @Controller
 public class MindmapController extends BaseController {
-    final Logger logger = Logger.getLogger("com.wisemapping");
+    final Logger logger = Logger.getLogger(MindmapController.class);
 
     private static final String LATEST_HISTORY_REVISION = "latest";
 
@@ -118,14 +81,13 @@ public class MindmapController extends BaseController {
         return new ModelAndView("transformViewWise", values);
     }
 
-    @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm","version"})
+    @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm"})
     @ResponseBody
-    public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id, @RequestParam(value = "version") String version) throws IOException, MapCouldNotFoundException {
+    public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id) throws IOException, MapCouldNotFoundException {
         final Mindmap mindMap = findMindmapById(id);
         final Map values = new HashMap();
         values.put("content", mindMap.getXmlStr());
         values.put("filename", mindMap.getTitle());
-        values.put("version", version);
         return new ModelAndView("transformViewFreemind", values);
     }
 
@@ -257,7 +219,6 @@ public class MindmapController extends BaseController {
         return result;
     }
 
-    @ApiIgnore
     @RequestMapping(method = RequestMethod.GET, value = {"/maps/{id}/document/xml", "/maps/{id}/document/xml-pub"}, consumes = {"text/plain"}, produces = {"application/xml; charset=UTF-8"})
     @ResponseBody
     public byte[] retrieveDocument(@PathVariable int id, @NotNull HttpServletResponse response) throws WiseMappingException, IOException {
@@ -267,7 +228,6 @@ public class MindmapController extends BaseController {
         return xmlStr.getBytes(StandardCharsets.UTF_8);
     }
 
-    @ApiIgnore
     @RequestMapping(method = RequestMethod.PUT, value = {"/maps/{id}/document/xml"}, consumes = {"text/plain"})
     @ResponseBody
     public void updateDocument(@PathVariable int id, @RequestBody String xmlDoc) throws WiseMappingException, IOException {
@@ -395,7 +355,7 @@ public class MindmapController extends BaseController {
         mindmapService.updateMindmap(mindMap, false);
     }
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/collabs", consumes = {"application/json", "application/xml"}, produces = {"application/json", "application/xml"})
+    @RequestMapping(method = RequestMethod.POST, value = "/maps/{id}/collabs/", consumes = {"application/json", "application/xml"}, produces = {"application/json", "application/xml"})
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void updateCollabs(@PathVariable int id, @NotNull @RequestBody RestCollaborationList restCollabs) throws CollaborationException, MapCouldNotFoundException {
         final Mindmap mindMap = findMindmapById(id);
@@ -435,6 +395,57 @@ public class MindmapController extends BaseController {
         }
     }
 
+    @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/collabs/", consumes = {"application/json", "application/xml"}, produces = {"application/json", "application/xml"})
+    @ResponseStatus(value = HttpStatus.NO_CONTENT)
+    public void addCollab(@PathVariable int id, @NotNull @RequestBody RestCollaborationList restCollabs) throws CollaborationException, MapCouldNotFoundException {
+        final Mindmap mindMap = findMindmapById(id);
+
+        // Only owner can change collaborators...
+        final User user = Utils.getUser();
+        if (!mindMap.hasPermissions(user, CollaborationRole.OWNER)) {
+            throw new IllegalArgumentException("No enough permissions");
+        }
+
+        // Has any role changed ?. Just removed it.
+        final Map mapsByEmail = mindMap
+                .getCollaborations()
+                .stream()
+                .collect(Collectors.toMap(collaboration -> collaboration.getCollaborator().getEmail(), collaboration -> collaboration));
+
+        restCollabs
+                .getCollaborations()
+                .forEach(collab->{
+                    final String email = collab.getEmail();
+                    if(mapsByEmail.containsKey(email)){
+                        try {
+                            mindmapService.removeCollaboration(mindMap, mapsByEmail.get(email));
+                        } catch (CollaborationException e) {
+                          logger.error(e);
+                        }
+                    }
+        });
+
+
+        // Great, let's add all the collabs again ...
+        for (RestCollaboration restCollab : restCollabs.getCollaborations()) {
+            final Collaboration collaboration = mindMap.findCollaboration(restCollab.getEmail());
+            // Validate role format ...
+            String roleStr = restCollab.getRole();
+            if (roleStr == null) {
+                throw new IllegalArgumentException(roleStr + " is not a valid role");
+            }
+
+            // Is owner ?
+            final CollaborationRole role = CollaborationRole.valueOf(roleStr.toUpperCase());
+            if (role == CollaborationRole.OWNER) {
+                throw new IllegalArgumentException("Owner can not be added as part of the collaboration list.");
+            }
+
+            mindmapService.addCollaboration(mindMap, restCollab.getEmail(), role, restCollabs.getMessage());
+        }
+    }
+
+
     @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}/collabs", produces = {"application/json", "application/xml"})
     public RestCollaborationList retrieveList(@PathVariable int id) throws MapCouldNotFoundException {
         final Mindmap mindMap = findMindmapById(id);
@@ -489,10 +500,36 @@ public class MindmapController extends BaseController {
         mindmapService.removeMindmap(mindmap, user);
     }
 
+    @RequestMapping(method = RequestMethod.DELETE, value = "/maps/{id}/collabs")
+    @ResponseStatus(value = HttpStatus.NO_CONTENT)
+    public void deleteCollabByEmail(@PathVariable int id, @RequestParam(required = false) String email) throws IOException, WiseMappingException {
+        logger.debug("Deleting permission for email:" + email);
+
+        final Mindmap mindmap = findMindmapById(id);
+        final User user = Utils.getUser();
+
+        // Only owner can change collaborators...
+        if (!mindmap.hasPermissions(user, CollaborationRole.OWNER)) {
+            throw new IllegalArgumentException("No enough permissions");
+        }
+
+        final Collaboration collab = mindmap.findCollaboration(email);
+        if(collab!=null) {
+            CollaborationRole role = collab.getRole();
+
+            // Owner collab can not be removed ...
+            if (role == CollaborationRole.OWNER) {
+                throw new IllegalArgumentException("Can not remove owner collab");
+            }
+            mindmapService.removeCollaboration(mindmap, collab);
+        }
+    }
+
     @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/starred", consumes = {"text/plain"}, produces = {"application/json", "application/xml"})
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
-    public void updateStarredState(@RequestBody @ApiParam(defaultValue = "false", allowableValues = "true,false") String value, @PathVariable int id) throws WiseMappingException {
+    public void updateStarredState(@RequestBody String value, @PathVariable int id) throws WiseMappingException {
 
+        logger.debug("Update starred:" + value);
         final Mindmap mindmap = findMindmapById(id);
         final User user = Utils.getUser();
 
@@ -506,7 +543,6 @@ public class MindmapController extends BaseController {
         mindmapService.updateCollaboration(user, collaboration);
     }
 
-    @ApiIgnore
     @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/lock", consumes = {"text/plain"}, produces = {"application/json", "application/xml"})
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void updateMapLock(@RequestBody String value, @PathVariable int id) throws IOException, WiseMappingException {
@@ -522,12 +558,11 @@ public class MindmapController extends BaseController {
         }
     }
 
-    @ApiIgnore
     @RequestMapping(method = RequestMethod.DELETE, value = "/maps/batch")
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
-    public void batchDelete(@RequestParam(required = true) String ids) throws IOException, WiseMappingException {
+    public void batchDelete(@RequestParam() String ids) throws IOException, WiseMappingException {
         final User user = Utils.getUser();
-        final String[] mapsIds = ",".split(ids);
+        final String[] mapsIds = ids.split(",");
         for (final String mapId : mapsIds) {
             final Mindmap mindmap = findMindmapById(Integer.parseInt(mapId));
             mindmapService.removeMindmap(mindmap, user);
@@ -536,7 +571,11 @@ public class MindmapController extends BaseController {
 
     @RequestMapping(method = RequestMethod.POST, value = "/maps", consumes = {"application/xml", "application/json", "application/wisemapping+xml"})
     @ResponseStatus(value = HttpStatus.CREATED)
-    public void createMap(@RequestBody RestMindmap restMindmap, @NotNull HttpServletResponse response, @RequestParam(required = false) String title, @RequestParam(required = false) String description) throws IOException, WiseMappingException {
+    public void createMap(@RequestBody(required = false) RestMindmap restMindmap, @NotNull HttpServletResponse response, @RequestParam(required = false) String title, @RequestParam(required = false) String description) throws IOException, WiseMappingException {
+        // If a default maps has not been defined, just create one ...
+        if(restMindmap==null){
+            restMindmap = new RestMindmap();
+        }
 
         // Overwrite title and description if they where specified by parameter.
         if (title != null && !title.isEmpty()) {
@@ -544,6 +583,8 @@ public class MindmapController extends BaseController {
         }
         if (description != null && !description.isEmpty()) {
             restMindmap.setDescription(description);
+        }else {
+            restMindmap.setDescription("");
         }
 
         // Validate ...
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
index 3be72bca..6842a80a 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
@@ -33,24 +33,28 @@ public abstract class MindmapFilter {
             return true;
         }
     };
+
     public static final MindmapFilter MY_MAPS = new MindmapFilter("my_maps") {
         @Override
         boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
             return mindmap.getCreator().identityEquality(user);
         }
     };
+
     public static final MindmapFilter STARRED = new MindmapFilter("starred") {
         @Override
         boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
             return mindmap.isStarred(user);
         }
     };
+
     public static final MindmapFilter SHARED_WITH_ME = new MindmapFilter("shared_with_me") {
         @Override
         boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
             return !MY_MAPS.accept(mindmap, user);
         }
     };
+
     public static final MindmapFilter PUBLIC = new MindmapFilter("public") {
         @Override
         boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
@@ -59,7 +63,7 @@ public abstract class MindmapFilter {
     };
 
     protected String id;
-    private static MindmapFilter[] values = {ALL, MY_MAPS, PUBLIC, STARRED, SHARED_WITH_ME};
+    private static final MindmapFilter[] values = {ALL, MY_MAPS, PUBLIC, STARRED, SHARED_WITH_ME};
 
     private MindmapFilter(@NotNull String id) {
         this.id = id;
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java b/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java
index 7537e535..1b5c8824 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java
@@ -24,7 +24,10 @@ import com.wisemapping.exporter.ExportProperties;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -107,7 +110,7 @@ public class TransformerController extends BaseController {
 
         // Obtains transformation type based on the last part of the URL ...
         final String requestURI = request.getRequestURI();
-        final String format = requestURI.substring(requestURI.lastIndexOf(".") + 1, requestURI.length());
+        final String format = requestURI.substring(requestURI.lastIndexOf(".") + 1);
         final ExportFormat exportFormat = ExportFormat.valueOf(format.toUpperCase());
 
         ModelAndView result;
@@ -124,9 +127,6 @@ public class TransformerController extends BaseController {
             case SVG:
                 result = this.transformSvg(svg);
                 break;
-            case FREEMIND:
-                result = this.transformFreemind(mapXml);
-                break;
             default:
                 throw new IllegalArgumentException("Unsupported export format");
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/UserController.java b/wise-webapp/src/main/java/com/wisemapping/rest/UserController.java
new file mode 100644
index 00000000..b2eef9a8
--- /dev/null
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/UserController.java
@@ -0,0 +1,119 @@
+/*
+ *    Copyright [2015] [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.
+ */
+
+package com.wisemapping.rest;
+
+import com.wisemapping.exceptions.EmailNotExistsException;
+import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.model.AuthenticationType;
+import com.wisemapping.model.User;
+import com.wisemapping.rest.model.RestUserRegistration;
+import com.wisemapping.service.*;
+import com.wisemapping.validator.Messages;
+import com.wisemapping.validator.UserValidator;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@CrossOrigin
+public class UserController extends BaseController {
+    @Qualifier("userService")
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private RecaptchaService captchaService;
+
+    @Value("${google.recaptcha2.enabled}")
+    private Boolean recatchaEnabled;
+
+    private static final Logger logger = Logger.getLogger(UserController.class);
+    private static final String REAL_IP_ADDRESS_HEADER = "X-Real-IP";
+
+    @RequestMapping(method = RequestMethod.POST, value = "/users", produces = {"application/json", "application/xml"})
+    @ResponseStatus(value = HttpStatus.CREATED)
+    public void registerUser(@RequestBody RestUserRegistration registration, @NotNull HttpServletRequest request, @NotNull HttpServletResponse response) throws WiseMappingException, BindException {
+        logger.info("Register new user:" + registration.getEmail());
+
+        // If tomcat is behind a reverse proxy, ip needs to be found in other header.
+        String remoteIp = request.getHeader(REAL_IP_ADDRESS_HEADER);
+        if(remoteIp==null || remoteIp.isEmpty()){
+            remoteIp = request.getRemoteAddr();
+        }
+        logger.debug("Remote address" + remoteIp);
+
+        verify(registration, remoteIp);
+
+        final User user = new User();
+        user.setEmail(registration.getEmail().trim());
+        user.setFirstname(registration.getFirstname());
+        user.setLastname(registration.getLastname());
+        user.setPassword(registration.getPassword());
+
+        user.setAuthenticationType(AuthenticationType.DATABASE);
+        userService.createUser(user, false, true);
+        response.setHeader("Location", "/service/users/" + user.getId());
+    }
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/users/resetPassword", produces = {"application/json", "application/xml"})
+    @ResponseStatus(value = HttpStatus.OK)
+    public void resetPassword(@RequestParam String email) throws InvalidAuthSchemaException, EmailNotExistsException {
+        try {
+            userService.resetPassword(email);
+        }catch (InvalidUserEmailException e){
+            throw new EmailNotExistsException(e);
+        }
+    }
+
+    private void verify(@NotNull final RestUserRegistration registration, @NotNull String remoteAddress) throws BindException {
+
+        final BindException errors = new RegistrationException(registration, "registration");
+        final UserValidator validator = new UserValidator();
+        validator.setUserService(userService);
+        validator.validate(registration, errors);
+
+        // If captcha is enabled, generate it ...
+        if (recatchaEnabled) {
+            final String recaptcha = registration.getRecaptcha();
+            if (recaptcha != null) {
+                final String reCaptchaResponse = captchaService.verifyRecaptcha(remoteAddress,recaptcha);
+                if (!reCaptchaResponse.isEmpty()) {
+                    errors.rejectValue("recaptcha", reCaptchaResponse);
+                }
+            } else {
+                errors.rejectValue("recaptcha", Messages.CAPTCHA_LOADING_ERROR);
+            }
+        }else {
+            logger.warn("captchaEnabled is enabled.Recommend to enable it for production environments.");
+        }
+
+        if (errors.hasErrors()) {
+            throw errors;
+        }
+    }
+}
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/ValidationException.java b/wise-webapp/src/main/java/com/wisemapping/rest/ValidationException.java
index bcaea1d1..d638e83c 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/ValidationException.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/ValidationException.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.validation.Errors;
 
 public class ValidationException extends WiseMappingException{
-    private Errors errors;
+    private final Errors errors;
 
     public ValidationException(@NotNull Errors errors) {
         super("Validation Exceptions:"+errors);
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java
index d8018654..d8923980 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java
@@ -26,9 +26,10 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-@XmlRootElement(name = "collaboration")
+@XmlRootElement(name = "collaborations")
 @XmlAccessorType(XmlAccessType.PROPERTY)
 @JsonAutoDetect(
         fieldVisibility = JsonAutoDetect.Visibility.NONE,
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java
index 69d31774..53bad2cc 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java
@@ -39,7 +39,7 @@ import java.util.Calendar;
 public class RestCollaborator {
 
     @JsonIgnore
-    private Collaborator collaborator;
+    private final Collaborator collaborator;
 
     public RestCollaborator(@NotNull Collaborator collaborator) {
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java
index ac96fa51..caac5cb1 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java
@@ -80,13 +80,13 @@ public class RestErrors {
 
     public RestErrors(@NotNull String errorMsg, @NotNull Severity severity, @Nullable String debugInfo) {
         this._debugInfo = debugInfo;
-        this.gErrors = new ArrayList();
+        this.gErrors = new ArrayList<>();
         this.gErrors.add(errorMsg);
         this.gSeverity = severity;
     }
 
     private List processGlobalErrors(@NotNull Errors errors) {
-        final List result = new ArrayList();
+        final List result = new ArrayList<>();
         final List globalErrors = errors.getGlobalErrors();
         for (ObjectError globalError : globalErrors) {
             result.add(globalError.getObjectName());
@@ -100,7 +100,7 @@ public class RestErrors {
 
     public Map getFieldErrors() {
         Locale locale = LocaleContextHolder.getLocale();
-        final Map result = new HashMap();
+        final Map result = new HashMap<>();
         if (errors != null) {
             final List fieldErrors = errors.getFieldErrors();
             for (FieldError fieldError : fieldErrors) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java
index b55a66e2..159061fa 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLabel.java
@@ -26,7 +26,7 @@ import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_
 public class RestLabel {
 
     @JsonIgnore
-    private Label label;
+    private final Label label;
 
     public RestLabel() {
         this(new Label());
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java
index afa58631..d456f88c 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java
@@ -23,11 +23,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.wisemapping.exceptions.WiseMappingException;
-import com.wisemapping.model.CollaborationProperties;
-import com.wisemapping.model.CollaborationRole;
-import com.wisemapping.model.Collaborator;
-import com.wisemapping.model.Mindmap;
-import com.wisemapping.model.User;
+import com.wisemapping.model.*;
 import com.wisemapping.util.TimeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -49,9 +45,9 @@ import java.util.Calendar;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RestMindmap {
     @JsonIgnore
-    private Collaborator collaborator;
+    private final Collaborator collaborator;
     @JsonIgnore
-    private Mindmap mindmap;
+    private final Mindmap mindmap;
     @Nullable
     private String properties;
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java
index a653d64c..3f799bb4 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java
@@ -44,10 +44,10 @@ import java.util.TimeZone;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RestMindmapHistory {
 
-    static private SimpleDateFormat sdf;
-    private int id;
-    private Calendar creation;
-    private String creator;
+    static private final SimpleDateFormat sdf;
+    private final int id;
+    private final Calendar creation;
+    private final String creator;
 
     static {
         sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java
index 41b117ff..df557bfd 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java
@@ -37,7 +37,7 @@ import java.util.List;
         isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
 public class RestMindmapHistoryList {
 
-    private List changes;
+    private final List changes;
 
     public RestMindmapHistoryList() {
         changes = new ArrayList();
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
index 7e7b981b..6a0e06d6 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
@@ -22,11 +22,7 @@ package com.wisemapping.rest.model;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.wisemapping.model.Collaboration;
-import com.wisemapping.model.Collaborator;
-import com.wisemapping.model.Label;
-import com.wisemapping.model.Mindmap;
-import com.wisemapping.model.User;
+import com.wisemapping.model.*;
 import com.wisemapping.security.Utils;
 import com.wisemapping.util.TimeUtils;
 import org.jetbrains.annotations.NotNull;
@@ -39,7 +35,7 @@ import java.util.Calendar;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-@XmlRootElement(name = "map")
+@XmlRootElement(name = "mapinfo")
 @XmlAccessorType(XmlAccessType.PROPERTY)
 @JsonAutoDetect(
         fieldVisibility = JsonAutoDetect.Visibility.NONE,
@@ -51,8 +47,8 @@ import java.util.Set;
 public class RestMindmapInfo {
 
     @JsonIgnore
-    private Mindmap mindmap;
-    private Collaborator collaborator;
+    private final Mindmap mindmap;
+    private final Collaborator collaborator;
 
     public RestMindmapInfo() {
         this(new Mindmap(), null);
@@ -152,7 +148,7 @@ public class RestMindmapInfo {
     public void setLastModificationTime(String value) {
     }
 
-    public boolean isPublic() {
+    public boolean getPublic() {
         return mindmap.isPublic();
     }
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java
index 10228d98..8edbf764 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java
@@ -19,9 +19,9 @@
 package com.wisemapping.rest.model;
 
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.wisemapping.model.Collaborator;
 import com.wisemapping.model.Mindmap;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import org.jetbrains.annotations.NotNull;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -44,7 +43,7 @@ public class RestMindmapList {
     private List mindmapsInfo;
 
     public RestMindmapList() {
-        this(Collections.emptyList(), null);
+        this(Collections.emptyList(), null);
     }
 
     public RestMindmapList(@NotNull List mindmaps, @NotNull Collaborator collaborator) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java
index 1b503d82..889396ec 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java
@@ -22,6 +22,7 @@ package com.wisemapping.rest.model;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.wisemapping.model.User;
 import org.jetbrains.annotations.NotNull;
 
@@ -29,7 +30,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.Calendar;
-import java.util.Set;
 
 
 @XmlRootElement(name = "user")
@@ -39,9 +39,10 @@ import java.util.Set;
         getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
         isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class RestUser {
 
-    private User user;
+    private final User user;
     private String password;
 
     public RestUser() {
@@ -50,20 +51,14 @@ public class RestUser {
 
     public RestUser(@NotNull User user) {
         this.user = user;
-        this.password = user.getPassword();
     }
 
-    @JsonIgnore
     public Calendar getCreationDate() {
         return user.getCreationDate();
     }
 
-    public void setTags(Set tags) {
-        user.setTags(tags);
-    }
-
-    public Set getTags() {
-        return user.getTags();
+    public String getLocale() {
+        return user.getLocale();
     }
 
     public String getFirstname() {
@@ -104,7 +99,7 @@ public class RestUser {
     }
 
     public String getPassword() {
-        return this.password;
+        return password;
     }
 
     @JsonIgnore
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUserRegistration.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUserRegistration.java
new file mode 100644
index 00000000..2099053d
--- /dev/null
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUserRegistration.java
@@ -0,0 +1,76 @@
+/*
+ *    Copyright [2015] [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.
+ */
+
+package com.wisemapping.rest.model;
+
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.wisemapping.model.User;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+
+@XmlRootElement(name = "user")
+@XmlAccessorType(XmlAccessType.PROPERTY)
+@JsonAutoDetect(
+        fieldVisibility = JsonAutoDetect.Visibility.NONE,
+        getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
+        isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class RestUserRegistration {
+
+    private String email;
+    private String firstname;
+    private String lastname;
+    private String password;
+    private String recaptcha;
+
+    @JsonIgnore
+    public User build() {
+        final User user = new User();
+        user.setFirstname(firstname);
+        user.setLastname(lastname);
+        user.setEmail(email);
+        user.setPassword(password);
+        return user;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getRecaptcha() {
+        return recaptcha;
+    }
+}
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/view/ImportTransformationView.java b/wise-webapp/src/main/java/com/wisemapping/rest/view/ImportTransformationView.java
index ef4d8574..e5d95bc0 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/view/ImportTransformationView.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/view/ImportTransformationView.java
@@ -32,12 +32,13 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 public class ImportTransformationView extends AbstractView {
 
-    private String contentType;
-    private Importer importer;
+    private final String contentType;
+    private final Importer importer;
 
     public ImportTransformationView(@NotNull final String contentType) throws ImporterException {
         ImporterFactory exporterFactory = ImporterFactory.getInstance();
@@ -51,7 +52,7 @@ public class ImportTransformationView extends AbstractView {
         final String filename = (String) viewMap.get("filename");
 
         // Convert to map ...
-        final InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
+        final InputStream is = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
         final Mindmap mindMap = importer.importMap("filename", "filename", is);
 
         // Set file name...:http://stackoverflow.com/questions/5325322/java-servlet-download-filename-special-characters/13359949#13359949
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
index ccb5e3b5..359c6ab4 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
@@ -41,9 +41,9 @@ public class TransformView extends AbstractView {
 
     @NonNls
     private static final String DEFAULT_ENCODING = "UTF-8";
-    private String contentType;
-    private ExportFormat exportFormat;
-    private NotificationService notificationService;
+    private final String contentType;
+    private final ExportFormat exportFormat;
+    private final NotificationService notificationService;
 
     @Autowired
     private Jaxb2Marshaller jaxbMarshaller;
diff --git a/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationSuccessHandler.java b/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationSuccessHandler.java
index 09e60dd7..e0a29963 100644
--- a/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationSuccessHandler.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationSuccessHandler.java
@@ -13,7 +13,7 @@ import java.io.IOException;
 
 
 public class AuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler {
-    private RequestCache cache;
+    private final RequestCache cache;
 
     public AuthenticationSuccessHandler() {
         cache = new HttpSessionRequestCache();
diff --git a/wise-webapp/src/main/java/com/wisemapping/security/DefaultPasswordEncoderFactories.java b/wise-webapp/src/main/java/com/wisemapping/security/DefaultPasswordEncoderFactories.java
index f2c40797..9395a177 100644
--- a/wise-webapp/src/main/java/com/wisemapping/security/DefaultPasswordEncoderFactories.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/DefaultPasswordEncoderFactories.java
@@ -9,7 +9,7 @@ import java.util.Map;
 
 public class DefaultPasswordEncoderFactories {
 
-    private static final String ENCODING_ID = "bcrypt";
+    public static final String ENCODING_ID = "bcrypt";
 
     static PasswordEncoder createDelegatingPasswordEncoder() {
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/security/LegacyPasswordEncoder.java b/wise-webapp/src/main/java/com/wisemapping/security/LegacyPasswordEncoder.java
index d6d176f5..4008037c 100755
--- a/wise-webapp/src/main/java/com/wisemapping/security/LegacyPasswordEncoder.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/LegacyPasswordEncoder.java
@@ -22,27 +22,16 @@ import org.apache.log4j.Logger;
 import org.springframework.security.crypto.codec.Base64;
 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.codec.Utf8;
-import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.util.Assert;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import org.springframework.security.crypto.codec.Base64;
-import org.springframework.security.crypto.codec.Hex;
-import org.springframework.security.crypto.codec.Utf8;
-import org.springframework.util.Assert;
-
 
 public class LegacyPasswordEncoder implements PasswordEncoder {
-    final private static Logger logger = Logger.getLogger("com.wisemapping.security.LegacyPasswordEncoder");
+    final private static Logger logger = Logger.getLogger(LegacyPasswordEncoder.class);
 
-    private static final String ENC_PREFIX = "ENC:";
+    public static final String ENC_PREFIX = "ENC:";
     private final ShaPasswordEncoder sha1Encoder = new ShaPasswordEncoder();
 
     @Override
@@ -67,7 +56,7 @@ public class LegacyPasswordEncoder implements PasswordEncoder {
 class ShaPasswordEncoder {
 
     private final String algorithm;
-    private boolean encodeHashAsBase64;
+    private final boolean encodeHashAsBase64;
 
 
     /**
diff --git a/wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java b/wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java
index 5abef974..76939026 100644
--- a/wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java
@@ -27,8 +27,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 public class UserDetails implements org.springframework.security.core.userdetails.UserDetails {
-	private com.wisemapping.model.User user;
-    private boolean isAdmin;
+	private final com.wisemapping.model.User user;
+    private final boolean isAdmin;
 
     public  UserDetails(@NotNull final com.wisemapping.model.User user, boolean isAdmin) {
         this.user = user;
diff --git a/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java b/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java
index 4a089628..f34fdf89 100755
--- a/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java
@@ -18,13 +18,12 @@
 
 package com.wisemapping.security.aop;
 
+import com.wisemapping.exceptions.AccessDeniedSecurityException;
 import com.wisemapping.model.Collaborator;
 import com.wisemapping.model.Mindmap;
 import com.wisemapping.model.User;
-import com.wisemapping.exceptions.AccessDeniedSecurityException;
 import com.wisemapping.security.Utils;
 import com.wisemapping.service.MindmapService;
-import com.wisemapping.service.MindmapServiceImpl;
 import org.aopalliance.intercept.MethodInvocation;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java b/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java
index aa1626e4..0ab29133 100755
--- a/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java
@@ -21,7 +21,6 @@ package com.wisemapping.security.aop;
 import com.wisemapping.model.CollaborationRole;
 import com.wisemapping.model.Mindmap;
 import com.wisemapping.model.User;
-
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.jetbrains.annotations.NotNull;
diff --git a/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java b/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java
index df1bb75b..c9ed26aa 100755
--- a/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java
@@ -18,11 +18,11 @@
 
 package com.wisemapping.security.aop;
 
+import com.wisemapping.model.CollaborationRole;
 import com.wisemapping.model.Mindmap;
+import com.wisemapping.model.User;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import com.wisemapping.model.CollaborationRole;
-import com.wisemapping.model.User;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java b/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java
index 8b323c1e..f0d61506 100755
--- a/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java
@@ -18,8 +18,8 @@
 
 package com.wisemapping.service;
 
-import javax.servlet.ServletContextListener;
 import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
 
 public class HibernateAppListener implements ServletContextListener {
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LabelService.java b/wise-webapp/src/main/java/com/wisemapping/service/LabelService.java
index 097987d8..161efa1c 100644
--- a/wise-webapp/src/main/java/com/wisemapping/service/LabelService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/LabelService.java
@@ -17,7 +17,7 @@ public interface LabelService {
     @Nullable
     Label getLabelById(int id, @NotNull final User user);
 
-    public Label getLabelByTitle(@NotNull String title, @NotNull final User user);
+    Label getLabelByTitle(@NotNull String title, @NotNull final User user);
 
     void removeLabel(@NotNull final Label label, @NotNull final User user) throws WiseMappingException;
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java b/wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java
index 497e0a14..cf211ceb 100644
--- a/wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java
@@ -28,7 +28,7 @@ public class LockInfo {
     final private User user;
     private Calendar timeout;
     private long session;
-    private static int EXPIRATION_MIN = 30;
+    private static final int EXPIRATION_MIN = 30;
     private long timestamp = -1;
     private long previousTimestamp;
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java
index 84a2badf..6f703484 100644
--- a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java
@@ -50,7 +50,7 @@ class LockManagerImpl implements LockManager {
     public static final int ONE_MINUTE_MILLISECONDS = 1000 * 60;
     final Map lockInfoByMapId;
     final static Timer expirationTimer = new Timer();
-    final private static Logger logger = Logger.getLogger("com.wisemapping.service.LockManager");
+    final private static Logger logger = Logger.getLogger(LockManagerImpl.class);
 
     @Override
     public boolean isLocked(@NotNull Mindmap mindmap) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java b/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java
index c88bcb47..2818cdd5 100755
--- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java
@@ -18,8 +18,8 @@
 
 package com.wisemapping.service;
 
-import com.wisemapping.model.*;
 import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.model.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -28,7 +28,7 @@ import java.util.List;
 
 public interface MindmapService {
 
-    static final String TAG_SEPARATOR = " ";
+    String TAG_SEPARATOR = " ";
 
     @Nullable
     Mindmap findMindmapById(int id);
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java b/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java
index 34817358..b63190cc 100644
--- a/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java
@@ -7,6 +7,7 @@ import org.apache.http.client.fluent.Form;
 import org.apache.http.client.fluent.Request;
 import org.apache.log4j.Logger;
 
+import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -22,21 +23,20 @@ public class RecaptchaService {
     private final static ObjectMapper objectMapper = new ObjectMapper();
     private String recaptchaSecret;
 
-    public String verifyRecaptcha(String ip, String recaptchaResponse) {
+    public String verifyRecaptcha(@NotNull String ip, @NotNull String recaptcha) {
 
         final List build = Form.form()
                 .add("secret", recaptchaSecret)
-                .add("response", recaptchaResponse)
+                .add("response", recaptcha)
                 .add("remoteip", ip)
                 .build();
 
         // Add logs ...
         logger.debug("Response from remoteip: " + ip);
         logger.debug("Response from recaptchaSecret: " + recaptchaSecret);
-        logger.debug("Response from recaptchaResponse: " + recaptchaResponse);
+        logger.debug("Response from recaptcha: " + recaptcha);
 
         String result = StringUtils.EMPTY;
-        HashMap bodyJson;
         try {
             final byte[] body = Request
                     .Post(GOOGLE_RECAPTCHA_VERIFY_URL)
@@ -45,16 +45,13 @@ public class RecaptchaService {
                     .returnContent()
                     .asBytes();
 
-            bodyJson = objectMapper
-                    .readValue(body, HashMap.class);
+            final Map responseBody = objectMapper.readValue(body, HashMap.class);
+            logger.warn("Response from recaptcha after parse: " + responseBody);
 
-            logger.debug("Response from recaptcha after parse: " + bodyJson);
-
-            final Boolean success = (Boolean) bodyJson.get("success");
-            if (!success) {
-                final List errorCodes = (List) bodyJson
-                        .get("error-codes");
-                result = RecaptchaUtil.RECAPTCHA_ERROR_CODE.get(errorCodes.get(0));
+            final Boolean success = (Boolean) responseBody.get("success");
+            if (success!=null && !success) {
+                final List errorCodes = (List) responseBody.get("error-codes");
+                result = RecaptchaUtil.codeToDescription(errorCodes.get(0));
             }
         } catch (IOException e) {
             logger.error(e.getMessage(), e);
@@ -73,9 +70,14 @@ public class RecaptchaService {
 
 class RecaptchaUtil {
 
-    static final Map
+    private static final Map
             RECAPTCHA_ERROR_CODE = new HashMap<>();
 
+    static String codeToDescription(final String code)
+    {
+        return  RECAPTCHA_ERROR_CODE.getOrDefault(code,"Unexpected error validating code. Please, refresh the page and try again.");
+    }
+
     static {
         RECAPTCHA_ERROR_CODE.put("missing-input-secret",
                 "The secret parameter is missing");
@@ -87,5 +89,7 @@ class RecaptchaUtil {
                 "The response parameter is invalid or malformed");
         RECAPTCHA_ERROR_CODE.put("bad-request",
                 "The request is invalid or malformed");
+        RECAPTCHA_ERROR_CODE.put("timeout-or-duplicate",
+                "Please, refresh the page and try again.");
     }
 }
\ No newline at end of file
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/RegistrationException.java b/wise-webapp/src/main/java/com/wisemapping/service/RegistrationException.java
new file mode 100644
index 00000000..56592944
--- /dev/null
+++ b/wise-webapp/src/main/java/com/wisemapping/service/RegistrationException.java
@@ -0,0 +1,9 @@
+package com.wisemapping.service;
+
+import org.springframework.validation.BindException;
+
+public class RegistrationException extends BindException {
+    public RegistrationException(Object target, String objectName) {
+        super(target, objectName);
+    }
+}
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserService.java b/wise-webapp/src/main/java/com/wisemapping/service/UserService.java
index 5424ecdd..39ffd480 100755
--- a/wise-webapp/src/main/java/com/wisemapping/service/UserService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/UserService.java
@@ -18,29 +18,29 @@
 
 package com.wisemapping.service;
 
-import com.wisemapping.model.User;
 import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.model.User;
 import org.jetbrains.annotations.NotNull;
 
 public interface UserService {
 
-    public void activateAccount(long code) throws InvalidActivationCodeException;
+    void activateAccount(long code) throws InvalidActivationCodeException;
 
-    public User createUser(@NotNull User user, boolean emailConfirmEnabled,boolean welcomeEmail) throws WiseMappingException;
+    User createUser(@NotNull User user, boolean emailConfirmEnabled, boolean welcomeEmail) throws WiseMappingException;
 
-    public void changePassword(@NotNull User user);
+    void changePassword(@NotNull User user);
 
-    public User getUserBy(String email);
+    User getUserBy(String email);
 
-    public User getUserBy(long id);
+    User getUserBy(long id);
 
-    public void updateUser(User user);
+    void updateUser(User user);
 
-    public void resetPassword(@NotNull String email) throws InvalidUserEmailException, InvalidAuthSchemaException;
+    void resetPassword(@NotNull String email) throws InvalidUserEmailException, InvalidAuthSchemaException;
 
-    public void removeUser(@NotNull User user);
+    void removeUser(@NotNull User user);
 
-    public void auditLogin(@NotNull User user);
+    void auditLogin(@NotNull User user);
     
-    public User getCasUserBy(String uid);
+    User getCasUserBy(String uid);
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
index 41641136..297ad43d 100755
--- a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
@@ -78,7 +78,7 @@ public class UserServiceImpl
 
     private String randomstring(int lo, int hi) {
         int n = rand(lo, hi);
-        byte b[] = new byte[n];
+        byte[] b = new byte[n];
         for (int i = 0; i < n; i++)
             b[i] = (byte) rand('@', 'Z');
         return new String(b);
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/Application.java b/wise-webapp/src/main/java/com/wisemapping/util/Application.java
index 23d38488..9d100f64 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/Application.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/Application.java
@@ -84,8 +84,8 @@ public enum Application {
 	private final ApplicationType applicationType;
 	private final Manufacturer manufacturer;
 
-	private Application(Manufacturer manufacturer, int versionId, String name,
-			String[] aliases, ApplicationType applicationType) {
+	Application(Manufacturer manufacturer, int versionId, String name,
+				String[] aliases, ApplicationType applicationType) {
 		this.id = (short) ((manufacturer.getId() << 8) + (byte) versionId);
 		this.name = name;
 		this.aliases = aliases;
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/ApplicationType.java b/wise-webapp/src/main/java/com/wisemapping/util/ApplicationType.java
index 78ce2982..e02a1734 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/ApplicationType.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/ApplicationType.java
@@ -50,9 +50,9 @@ public enum ApplicationType {
 	WEBMAIL("Webmail client"),
 	UNKNOWN("unknown");
 	
-	private String name;
+	private final String name;
 	
-	private ApplicationType(String name) {
+	ApplicationType(String name) {
 		this.name = name;
 	}
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/Browser.java b/wise-webapp/src/main/java/com/wisemapping/util/Browser.java
index 40c33edf..82a5d775 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/Browser.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/Browser.java
@@ -168,10 +168,10 @@ public enum Browser {
     private final Manufacturer manufacturer;
     private final RenderingEngine renderingEngine;
     private final Browser parent;
-    private List children;
+    private final List children;
     private Pattern versionRegEx;
 
-    private Browser(Manufacturer manufacturer, Browser parent, int versionId, String name, String[] aliases, String[] exclude, BrowserType browserType, RenderingEngine renderingEngine, String versionRegexString) {
+    Browser(Manufacturer manufacturer, Browser parent, int versionId, String name, String[] aliases, String[] exclude, BrowserType browserType, RenderingEngine renderingEngine, String versionRegexString) {
         this.id = (short) ((manufacturer.getId() << 8) + (byte) versionId);
         this.name = name;
         this.parent = parent;
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/BrowserType.java b/wise-webapp/src/main/java/com/wisemapping/util/BrowserType.java
index a61216f0..bee131e1 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/BrowserType.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/BrowserType.java
@@ -70,9 +70,9 @@ public enum BrowserType {
 	TOOL("Downloading tool"),
 	UNKNOWN("unknown");
 	
-	private String name;
+	private final String name;
 	
-	private BrowserType(String name) {
+	BrowserType(String name) {
 		this.name = name;
 	}
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/DeviceType.java b/wise-webapp/src/main/java/com/wisemapping/util/DeviceType.java
index 712427d4..4de82645 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/DeviceType.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/DeviceType.java
@@ -60,7 +60,7 @@ public enum DeviceType {
 	
 	String name;
 	
-	private DeviceType(String name) {
+	DeviceType(String name) {
 		this.name = name;
 	}
 	
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/Manufacturer.java b/wise-webapp/src/main/java/com/wisemapping/util/Manufacturer.java
index ea9934de..be15d19d 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/Manufacturer.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/Manufacturer.java
@@ -123,7 +123,7 @@ public enum Manufacturer {
 	private final byte id;
 	private final String name;
 	
-	private Manufacturer(int id, String name) {
+	Manufacturer(int id, String name) {
 		this.id = (byte) id;
 		this.name = name;
 	}
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/OperatingSystem.java b/wise-webapp/src/main/java/com/wisemapping/util/OperatingSystem.java
index 593ff54c..bb5d5398 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/OperatingSystem.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/OperatingSystem.java
@@ -148,11 +148,11 @@ public enum OperatingSystem {
 	private final Manufacturer manufacturer;
 	private final DeviceType deviceType;
 	private final OperatingSystem parent;
-	private List children;
+	private final List children;
 	private Pattern versionRegEx;
 	
-	private OperatingSystem(Manufacturer manufacturer, OperatingSystem parent, int versionId, String name, String[] aliases,
-		 String[] exclude, DeviceType deviceType, String versionRegexString) {
+	OperatingSystem(Manufacturer manufacturer, OperatingSystem parent, int versionId, String name, String[] aliases,
+					String[] exclude, DeviceType deviceType, String versionRegexString) {
 		this.manufacturer = manufacturer;
 		this.parent = parent;
 		this.children = new ArrayList();
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/RenderingEngine.java b/wise-webapp/src/main/java/com/wisemapping/util/RenderingEngine.java
index 84a8bc88..bb1bb548 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/RenderingEngine.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/RenderingEngine.java
@@ -78,7 +78,7 @@ public enum RenderingEngine {
 	
 	String name;
 	
-	private RenderingEngine(String name) {
+	RenderingEngine(String name) {
 		this.name = name;
 	}
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/TimeUtils.java b/wise-webapp/src/main/java/com/wisemapping/util/TimeUtils.java
index 44cb2ce1..5ac37d29 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/TimeUtils.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/TimeUtils.java
@@ -8,7 +8,7 @@ import java.util.TimeZone;
 
 final public class TimeUtils
 {
-    private static SimpleDateFormat sdf;
+    private static final SimpleDateFormat sdf;
     static {
         sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/UserAgent.java b/wise-webapp/src/main/java/com/wisemapping/util/UserAgent.java
index fb0b5780..8be0b2fb 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/UserAgent.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/UserAgent.java
@@ -215,11 +215,8 @@ public class UserAgent {
         if (id != other.id)
             return false;
         if (operatingSystem == null) {
-            if (other.operatingSystem != null)
-                return false;
-        } else if (!operatingSystem.equals(other.operatingSystem))
-            return false;
-        return true;
+            return other.operatingSystem == null;
+        } else return operatingSystem.equals(other.operatingSystem);
     }
 
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java b/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java
index d36706a6..f6cf0fcd 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java
@@ -2,10 +2,11 @@ package com.wisemapping.util;
 
 import org.apache.commons.collections.ExtendedProperties;
 import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
 import org.jetbrains.annotations.NotNull;
 
 public class VelocityEngineWrapper {
-    private VelocityEngine velocityEngine;
+    private final VelocityEngine velocityEngine;
 
     public VelocityEngineWrapper() {
         ExtendedProperties extendedProperties = new ExtendedProperties();
@@ -15,6 +16,12 @@ public class VelocityEngineWrapper {
 
         this.velocityEngine = new VelocityEngine();
         velocityEngine.setExtendedProperties(extendedProperties);
+
+        // Configure velocity to use log4j.
+        velocityEngine.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
+                "org.apache.velocity.runtime.log.SimpleLog4JLogSystem" );
+        velocityEngine.setProperty("runtime.log.logsystem.log4j.category", "org.apache.velocity");
+
     }
 
     @NotNull
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/Version.java b/wise-webapp/src/main/java/com/wisemapping/util/Version.java
index 154d9e5d..5a528815 100644
--- a/wise-webapp/src/main/java/com/wisemapping/util/Version.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/Version.java
@@ -104,11 +104,8 @@ public class Version {
 		} else if (!minorVersion.equals(other.minorVersion))
 			return false;
 		if (version == null) {
-			if (other.version != null)
-				return false;
-		} else if (!version.equals(other.version))
-			return false;
-		return true;
+			return other.version == null;
+		} else return version.equals(other.version);
 	}
 
 	
diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java b/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java
index 263f6225..b0dbfad8 100755
--- a/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java
+++ b/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java
@@ -18,9 +18,9 @@
 
 package com.wisemapping.validator;
 
+import com.wisemapping.model.Constants;
 import com.wisemapping.model.Mindmap;
 import com.wisemapping.model.User;
-import com.wisemapping.model.Constants;
 import com.wisemapping.service.MindmapService;
 import com.wisemapping.view.MindMapInfoBean;
 import org.jetbrains.annotations.NotNull;
diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java b/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
index f498bb1f..13c96cc4 100644
--- a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
+++ b/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
@@ -25,6 +25,6 @@ public interface Messages {
     String IMPORT_MAP_ERROR = "IMPORT_MAP_ERROR";
     String MAP_TITLE_ALREADY_EXISTS = "MAP_TITLE_ALREADY_EXISTS";
     String LABEL_TITLE_ALREADY_EXISTS = "LABEL_TITLE_ALREADY_EXISTS";
-    String PASSWORD_MISSMATCH = "PASSWORD_MISSMATCH";
+    String PASSWORD_MISMATCH = "PASSWORD_MISMATCH";
     String CAPTCHA_LOADING_ERROR = "CAPTCHA_LOADING_ERROR";
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java b/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java
index 10fd1144..88c48589 100644
--- a/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java
+++ b/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java
@@ -18,10 +18,10 @@
 
 package com.wisemapping.validator;
 
-import com.wisemapping.service.RecaptchaService;
+import com.wisemapping.model.Constants;
+import com.wisemapping.rest.model.RestUserRegistration;
 import com.wisemapping.service.UserService;
 import com.wisemapping.view.UserBean;
-import com.wisemapping.model.Constants;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.validation.Errors;
@@ -32,15 +32,12 @@ public class UserValidator
         implements Validator {
 
     private UserService userService;
-    private RecaptchaService captchaService;
-
-
     public boolean supports(final Class clazz) {
         return clazz.equals(UserBean.class);
     }
 
     public void validate(@Nullable Object obj, @NotNull Errors errors) {
-        UserBean user = (UserBean) obj;
+        RestUserRegistration user = (RestUserRegistration) obj;
         if (user == null) {
             errors.rejectValue("user", "error.not-specified");
         } else {
@@ -59,7 +56,6 @@ public class UserValidator
             ValidationUtils.rejectIfEmptyOrWhitespace(errors, "firstname", Messages.FIELD_REQUIRED);
             ValidationUtils.rejectIfEmptyOrWhitespace(errors, "lastname", Messages.FIELD_REQUIRED);
             ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", Messages.FIELD_REQUIRED);
-            ValidationUtils.rejectIfEmptyOrWhitespace(errors, "retypePassword", Messages.FIELD_REQUIRED);
             ValidatorUtils.rejectIfExceeded(errors,
                     "firstname",
                     "The firstname must have less than " + Constants.MAX_USER_FIRSTNAME_LENGTH + " characters.",
@@ -75,28 +71,10 @@ public class UserValidator
                     "The password must have less than " + Constants.MAX_USER_PASSWORD_LENGTH + " characters.",
                     user.getPassword(),
                     Constants.MAX_USER_PASSWORD_LENGTH);
-            ValidatorUtils.rejectIfExceeded(errors,
-                    "retypePassword",
-                    "The retypePassword must have less than " + Constants.MAX_USER_PASSWORD_LENGTH + " characters.",
-                    user.getRetypePassword(),
-                    Constants.MAX_USER_PASSWORD_LENGTH);
-
-            final String password = user.getPassword();
-            if (password != null && !password.equals(user.getRetypePassword())) {
-                errors.rejectValue("password", Messages.PASSWORD_MISSMATCH);
-            }
         }
     }
 
     public void setUserService(UserService userService) {
         this.userService = userService;
     }
-
-    public void setCaptchaService(@NotNull final RecaptchaService captchaService) {
-        this.captchaService = captchaService;
-    }
-
-    public RecaptchaService getCaptchaService() {
-        return captchaService;
-    }
 }
\ No newline at end of file
diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java b/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java
index fd329dfa..9ed6e51e 100644
--- a/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java
+++ b/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java
@@ -22,13 +22,13 @@ import org.jetbrains.annotations.Nullable;
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;
 
-import java.util.regex.Pattern;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 final public class Utils {
     //Set the email emailPattern string
 
-    static private Pattern emailPattern = Pattern.compile(".+@.+\\.[a-z]+");
+    static private final Pattern emailPattern = Pattern.compile(".+@.+\\.[a-z]+");
 
     private Utils() {
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java b/wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java
index f75ddb06..b894fad3 100755
--- a/wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java
+++ b/wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java
@@ -23,9 +23,9 @@ import com.wisemapping.model.Collaborator;
 import com.wisemapping.model.User;
 
 public class CollaboratorBean {
-    private CollaborationRole collaborationRole;
-    private boolean isUser;
-    private Collaborator collaborator;
+    private final CollaborationRole collaborationRole;
+    private final boolean isUser;
+    private final Collaborator collaborator;
 
     public CollaboratorBean(Collaborator collaborator, CollaborationRole role) {
         this.collaborator = collaborator;
diff --git a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
index 8608450a..d43723e6 100644
--- a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
+++ b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
@@ -31,10 +31,10 @@ import java.util.List;
 import java.util.Set;
 
 public class MindMapBean {
-    private Mindmap mindmap;
-    private List viewers;
-    private List collaborators;
-    private Collaborator collaborator;
+    private final Mindmap mindmap;
+    private final List viewers;
+    private final List collaborators;
+    private final Collaborator collaborator;
 
     public MindMapBean(@NotNull final Mindmap mindmap, @Nullable final Collaborator collaborator) {
         this.mindmap = mindmap;
diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/ApplicationContextInitializer.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/ApplicationContextInitializer.java
index d65e3549..5f31863b 100644
--- a/wise-webapp/src/main/java/com/wisemapping/webmvc/ApplicationContextInitializer.java
+++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/ApplicationContextInitializer.java
@@ -19,29 +19,19 @@ package com.wisemapping.webmvc;
 
 
 import org.jetbrains.annotations.NotNull;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.core.env.PropertySourcesPropertyResolver;
 import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
 import org.springframework.core.io.support.ResourcePropertySource;
 import org.springframework.web.context.ConfigurableWebApplicationContext;
 import org.springframework.web.context.support.ServletContextResource;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.Properties;
+import java.util.Objects;
 
 public class ApplicationContextInitializer implements org.springframework.context.ApplicationContextInitializer {
 
     public void initialize(@NotNull ConfigurableWebApplicationContext ctx) {
         try {
-            final Resource resource = new ServletContextResource(ctx.getServletContext(), "/WEB-INF/app.properties");
+            final Resource resource = new ServletContextResource(Objects.requireNonNull(ctx.getServletContext()), "/WEB-INF/app.properties");
             final ResourcePropertySource resourcePropertySource = new ResourcePropertySource(resource);
             ctx.getEnvironment().getPropertySources().addFirst(resourcePropertySource);
         } catch (IOException e) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/ExtensionsController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/ExtensionsController.java
deleted file mode 100644
index 3426c9af..00000000
--- a/wise-webapp/src/main/java/com/wisemapping/webmvc/ExtensionsController.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-*    Copyright [2015] [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.
-*/
-
-package com.wisemapping.webmvc;
-
-import com.wisemapping.service.MindmapService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-@Controller
-public class ExtensionsController {
-    @Qualifier("mindmapService")
-    @Autowired
-    private MindmapService mindmapService;
-
-    @RequestMapping(value = "privacyPolicy")
-    public ModelAndView privacyPolicy() {
-        return new ModelAndView("privacyPolicy");
-    }
-
-    @RequestMapping(value = "faq")
-    public ModelAndView faq() {
-        return new ModelAndView("faq");
-    }
-}
diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/LoginController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/LoginController.java
index feffe5ee..36295d53 100644
--- a/wise-webapp/src/main/java/com/wisemapping/webmvc/LoginController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/LoginController.java
@@ -44,17 +44,4 @@ public class LoginController {
         }
         return result;
     }
-
-//    @RequestMapping(value = "loginopenid", method = RequestMethod.GET)
-//    protected ModelAndView showLoginOpenIdPage() {
-//        final User user = Utils.getUser(false);
-//        ModelAndView result;
-//        if (user != null) {
-//            result = new ModelAndView("forward:/c/maps/");
-//        } else {
-//            result = new ModelAndView("loginopenid");
-//        }
-//        return result;
-//    }
-
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java
index 59260753..b1d33939 100644
--- a/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java
@@ -40,8 +40,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.util.Locale;
 
 @Controller
@@ -52,19 +50,6 @@ public class MindmapController {
     @Autowired
     private MindmapService mindmapService;
 
-    @RequestMapping(value = "maps/import")
-    public String showImportPage() {
-        return "mindmapImport";
-    }
-
-    @RequestMapping(value = "maps/{id}/details")
-    public String showDetails(@PathVariable int id, @NotNull Model model, @NotNull HttpServletRequest request) throws MapCouldNotFoundException {
-        final MindMapBean mindmap = findMindmapBean(id);
-        model.addAttribute("mindmap", mindmap);
-        model.addAttribute("baseUrl", request.getAttribute("site.baseurl"));
-        return "mindmapDetail";
-    }
-
     @RequestMapping(value = "maps/{id}/print")
     public String showPrintPage(@PathVariable int id, @NotNull Model model) throws MapCouldNotFoundException {
         final MindMapBean mindmap = findMindmapBean(id);
@@ -75,19 +60,6 @@ public class MindmapController {
         return "mindmapPrint";
     }
 
-    @RequestMapping(value = "maps/{id}/export")
-    public String showExportPage(@PathVariable int id, @NotNull Model model) throws IOException, MapCouldNotFoundException {
-        final Mindmap mindmap = findMindmap(id);
-        model.addAttribute("mindmap", mindmap);
-        return "mindmapExport";
-    }
-
-    @RequestMapping(value = "maps/{id}/exportf")
-    public String showExportPageFull(@PathVariable int id, @NotNull Model model) throws IOException, MapCouldNotFoundException {
-        showExportPage(id, model);
-        return "mindmapExportFull";
-    }
-
     @RequestMapping(value = "maps/{id}/share")
     public String showSharePage(@PathVariable int id, @NotNull Model model) throws MapCouldNotFoundException {
         final Mindmap mindmap = findMindmap(id);
@@ -101,41 +73,8 @@ public class MindmapController {
         return "mindmapShareFull";
     }
 
-    @RequestMapping(value = "maps/{id}/publish")
-    public String showPublishPage(@PathVariable int id, @NotNull Model model, @NotNull HttpServletRequest request) throws MapCouldNotFoundException {
-        final Mindmap mindmap = findMindmap(id);
-        model.addAttribute("mindmap", mindmap);
-        model.addAttribute("baseUrl", request.getAttribute("site.baseurl"));
-        return "mindmapPublish";
-    }
-
-    @RequestMapping(value = "maps/{id}/publishf")
-    public String showPublishPageFull(@PathVariable int id, @NotNull Model model, @NotNull HttpServletRequest request) throws MapCouldNotFoundException {
-        showPublishPage(id, model, request);
-        return "mindmapPublishFull";
-    }
-
-    @RequestMapping(value = "maps/{id}/history", method = RequestMethod.GET)
-    public String showHistoryPage(@PathVariable int id, @NotNull Model model) {
-        model.addAttribute("mindmapId", id);
-        return "mindmapHistory";
-    }
-
-    @RequestMapping(value = "maps/{id}/historyf", method = RequestMethod.GET)
-    public String showHistoryPageFull(@PathVariable int id, @NotNull Model model) {
-        showHistoryPage(id, model);
-        return "mindmapHistoryFull";
-    }
-
     @RequestMapping(value = "maps/")
     public String showListPage(@NotNull Model model) {
-        final Locale locale = LocaleContextHolder.getLocale();
-        // @Todo: This should be more flexible  ...
-        String localeStr = locale.toString().toLowerCase();
-        if ("es".equals(locale.getLanguage()) || "pt".equals(locale.getLanguage())) {
-            localeStr = locale.getLanguage();
-        }
-        model.addAttribute("locale", localeStr);
         return "mindmapList";
     }
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/PublicPagesController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/PublicPagesController.java
index e6fba763..55e8048f 100644
--- a/wise-webapp/src/main/java/com/wisemapping/webmvc/PublicPagesController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/PublicPagesController.java
@@ -32,22 +32,6 @@ public class PublicPagesController {
     @Autowired
     private MindmapService mindmapService;
 
-
-    @RequestMapping(value = "aboutUs")
-    public String aboutUs() {
-        return "aboutUs";
-    }
-
-    @RequestMapping(value = "termsOfUse")
-    public String showTermsOfUse() {
-        return "termsOfUse";
-    }
-
-    @RequestMapping(value = "crew")
-    public String crew() {
-        return "crew";
-    }
-
     @RequestMapping(value = "keyboard")
     public String newsPage() {
         return "keyboard";
diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
index 9b676164..81264c38 100644
--- a/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
@@ -19,33 +19,17 @@
 package com.wisemapping.webmvc;
 
 
-import com.wisemapping.exceptions.WiseMappingException;
-import com.wisemapping.model.AuthenticationType;
-import com.wisemapping.model.User;
 import com.wisemapping.security.Utils;
-import com.wisemapping.service.InvalidAuthSchemaException;
-import com.wisemapping.service.InvalidUserEmailException;
-import com.wisemapping.service.RecaptchaService;
 import com.wisemapping.service.UserService;
-import com.wisemapping.validator.Messages;
-import com.wisemapping.validator.UserValidator;
-import com.wisemapping.view.UserBean;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Properties;
-
 @Controller
 public class UsersController {
 
@@ -53,99 +37,14 @@ public class UsersController {
     @Autowired
     private UserService userService;
 
-    @Autowired
-    private RecaptchaService captchaService;
-
-    @Value("${google.recaptcha2.enabled}")
-    private boolean captchaEnabled;
-
-    @Value("${google.recaptcha2.siteKey}")
-    private String recaptchaSiteKey;
-
-    @RequestMapping(value = "user/resetPassword", method = RequestMethod.GET)
+    @RequestMapping(value = "forgot-password", method = RequestMethod.GET)
     public ModelAndView showResetPasswordPage() {
-        return new ModelAndView("forgotPassword");
+        return new ModelAndView("forgot-password");
     }
 
-    @RequestMapping(value = "user/resetPassword", method = RequestMethod.POST)
-    public ModelAndView resetPassword(@RequestParam(required = true) String email) {
-
-        ModelAndView result;
-        try {
-            userService.resetPassword(email);
-            result = new ModelAndView("forgotPasswordSuccess");
-
-        } catch (InvalidUserEmailException | InvalidAuthSchemaException e) {
-            result = new ModelAndView("forgotPasswordError");
-        }
-        return result;
+    @RequestMapping(value = "registration", method = RequestMethod.GET)
+    public ModelAndView showRegistrationPage() {
+        return new ModelAndView("registration");
     }
 
-    @RequestMapping(value = "user/registration", method = RequestMethod.GET)
-    public ModelAndView showRegistrationPage(@NotNull HttpServletRequest request) {
-        if (captchaEnabled) {
-            // If captcha is enabled, generate it ...
-            final Properties prop = new Properties();
-            prop.put("theme", "white");
-            request.setAttribute("recaptchaSiteKey", recaptchaSiteKey);
-            request.setAttribute("recaptchaEnabled", true);
-        }
-        return new ModelAndView("userRegistration", "user", new UserBean());
-    }
-
-    @RequestMapping(value = "user/registration", method = RequestMethod.POST)
-    public ModelAndView registerUser(@ModelAttribute("user") UserBean userBean, @NotNull HttpServletRequest request, @NotNull BindingResult bindingResult) throws WiseMappingException {
-        ModelAndView result;
-        validateRegistrationForm(userBean, request, bindingResult);
-        if (bindingResult.hasErrors()) {
-            result = this.showRegistrationPage(request);
-            result.addObject("user", userBean);
-        } else {
-            final User user = new User();
-
-            // trim() the email email in order to remove spaces ...
-            user.setEmail(userBean.getEmail().trim());
-            user.setFirstname(userBean.getFirstname());
-            user.setLastname(userBean.getLastname());
-            user.setPassword(userBean.getPassword());
-
-            boolean confirmRegistrationByEmail = false;
-            user.setAuthenticationType(AuthenticationType.DATABASE);
-            userService.createUser(user, confirmRegistrationByEmail, true);
-
-            // Forward to the success view ...
-            result = new ModelAndView("userRegistrationSuccess");
-            result.addObject("confirmByEmail", confirmRegistrationByEmail);
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "account/settings", method = RequestMethod.GET)
-    public String showUserSettingsPage(@NotNull Model model) {
-        model.addAttribute("user", Utils.getUser());
-        return "accountSettings";
-    }
-
-    private void validateRegistrationForm(@NotNull UserBean userBean, @NotNull HttpServletRequest request, @NotNull BindingResult bindingResult) {
-        final UserValidator userValidator = new UserValidator();
-        userValidator.setUserService(userService);
-        userValidator.setCaptchaService(captchaService);
-        userValidator.validate(userBean, bindingResult);
-
-        // If captcha is enabled, generate it ...
-        if (captchaEnabled) {
-            final String gReponse = request.getParameter("g-recaptcha-response");
-
-            if (gReponse != null) {
-                final String remoteAddr = request.getRemoteAddr();
-                final String reCaptchaResponse = captchaService.verifyRecaptcha(remoteAddr, gReponse);
-                if (!reCaptchaResponse.isEmpty()) {
-                    bindingResult.rejectValue("captcha", reCaptchaResponse);
-                }
-
-            } else {
-                bindingResult.rejectValue("captcha", Messages.CAPTCHA_LOADING_ERROR);
-            }
-        }
-    }
 }
diff --git a/wise-webapp/src/main/resources/bootstrap/12px/bootstrap3.1.tar.gz b/wise-webapp/src/main/resources/bootstrap/12px/bootstrap3.1.tar.gz
deleted file mode 100644
index 2d5fff2d..00000000
Binary files a/wise-webapp/src/main/resources/bootstrap/12px/bootstrap3.1.tar.gz and /dev/null differ
diff --git a/wise-webapp/src/main/resources/bootstrap/13px/bootstrap3.1.tar.gz b/wise-webapp/src/main/resources/bootstrap/13px/bootstrap3.1.tar.gz
deleted file mode 100644
index bce6cb66..00000000
Binary files a/wise-webapp/src/main/resources/bootstrap/13px/bootstrap3.1.tar.gz and /dev/null differ
diff --git a/wise-webapp/src/main/resources/messages_ca.properties b/wise-webapp/src/main/resources/messages_ca.properties
index 04fbce13..114996d3 100644
--- a/wise-webapp/src/main/resources/messages_ca.properties
+++ b/wise-webapp/src/main/resources/messages_ca.properties
@@ -48,7 +48,7 @@ FIELD_REQUIRED=Camp obligatory
 EMAIL_ALREADY_EXIST=correu ja existent
 NO_VALID_EMAIL_ADDRESS=correu invàlid
 USERNAME_ALREADY_EXIST=Nom d'usuari existent
-PASSWORD_MISSMATCH=La contrasenya no concorda
+PASSWORD_MISMATCH=La contrasenya no concorda
 WISEMAPPING_ACCOUNT_MESSAGE=Si us plau verifiqui la informació i llegeixi les condicions del servei.
 REGISTRATION_CLICK_ADVICE= Seleccionant "Registre" està acceptant les condicions del servei.
 REGISTRATION_TITLE_MSG=Completi el següent formulari per a convertir-se en memore de la comunitat WiseMapping. 
      El registre és de franc i només és un moment.
diff --git a/wise-webapp/src/main/resources/messages_de.properties b/wise-webapp/src/main/resources/messages_de.properties
index 62207eef..bdd2c6e9 100644
--- a/wise-webapp/src/main/resources/messages_de.properties
+++ b/wise-webapp/src/main/resources/messages_de.properties
@@ -59,7 +59,7 @@ FIELD_REQUIRED=Ein benötigtes Feld kann icht leer gelassen werden
 EMAIL_ALREADY_EXIST=Die email Adresse existiert bereits
 NO_VALID_EMAIL_ADDRESS=Ungültige email Adresse
 USERNAME_ALREADY_EXIST=Der Benutzername existiert bereits
-PASSWORD_MISSMATCH=Ihre Passwort Angaben sind nicht identisch
+PASSWORD_MISMATCH=Ihre Passwort Angaben sind nicht identisch
 CHANGE_PASSWORD_SUCCESS=Ihr Passwort wurde erfolgreich geändert 
 WISEMAPPING_ACCOUNT_MESSAGE=Bitte überprüfen Sie die eingegebenen WiseMapping Benutzerkonto Informationen und Geschäftsbedingungen
 REGISTRATION_CLICK_ADVICE= Mit der Registrierung erklären Sie ihr Einverständnis mit den Geschäftsbedingungen und Datenschutzregeln von WiseMapping.
diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties
index afa07fc6..f0a5dd70 100644
--- a/wise-webapp/src/main/resources/messages_en.properties
+++ b/wise-webapp/src/main/resources/messages_en.properties
@@ -56,12 +56,11 @@ USER_INACTIVE=Sorry, your account has not been activated yet. You'll receive a n
 CREW=The Crew
 ALREADY_A_MEMBER=Already a member?
 TERM_OF_THE_SERVICE=Terms of Service:
-FORGOT_PASSWORD_MESSAGE=Please enter an email address to help us locate your WiseMapping account.
 FIELD_REQUIRED=Required field cannot be left blank
-EMAIL_ALREADY_EXIST=Email already exists
+EMAIL_ALREADY_EXIST=There is an account already with this email.  
 NO_VALID_EMAIL_ADDRESS=Invalid email address
 USERNAME_ALREADY_EXIST=Username already exists
-PASSWORD_MISSMATCH=Your password entries did not match
+PASSWORD_MISMATCH=Your password entries did not match
 CHANGE_PASSWORD_SUCCESS=Your password has been changed successfully.
 WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service
 REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy.
@@ -185,14 +184,6 @@ INFO_UPDATE_SUCCESS=Your info has been changed successfully
 OR_GREATER=or greater
 IMPORTANT=Important
 
-BROWSER_RECOMMENDATION=Browsers are listed in order based on performance and hours of testing invested by our team.
-BROWSER_NOT_SUPPORTED_TITLE=Ups\!\!\!. Your browser is not currently supported
-BROWSER_NOT_SUPPORTED_MSG=Your browser has not been fully tested and it might not be completely functional. WiseMapping has been optimized for:
-BROWSER_NOT_SUPPORTED_TRY_AGAIN=Try again with one of the browsers previously listed.
-
-INSTALL_CFG=Sorry, Microsoft Internet Explorer 8 is partially supported
-INSTALL_CFG_REASON = Microsoft Internet Explorer 8 does not support HTML 5 SVG. SVG is the technology used be WiseMapping to render and edit mindmaps. We strongly encourage update to either Microsoft Internet Explorer 9 or use other browser such as Google Chrome, Firefox o Safari.
-INSTALL_CFG_CLICK_HERE=If you still want to use Microsoft Internet Explorer 8, click here to install Google Chrome Frame Plugin. Google Chrome Frame Plugin extends Internet Explorer capabilities adding support for HTML 5.
 SHOW_REGISTERS=Show _MENU_ entries
 LOADING=Loading ...
 NO_MATCHING_FOUND=No matching records found
@@ -259,20 +250,11 @@ ACCESS_HAS_BEEN_REVOKED= Upps. your access permissions to this map has been revo
 MAP_CAN_NOT_BE_FOUND= Upps. The map can not be found. It must have been deleted.
 LABEL_CAN_NOT_BE_FOUND= Upps. The label can not be found. It must have been deleted.
 LICENSE=License
-WELCOME_TO_WISEMAPPING=Welcome to WiseMapping
-WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: 
      • Embed mind map it in web pages and blogs
      • Link mind map and documents
      • Share your maps with friend and colleagues
      • Export your maps SVG,PNG,JPG and FreeMind
      
-OPENID_LOGIN=Open Id Login
-LOGING_OPENID_DETAILS=Do you already have an account on one of these sites?. Click the logo to log in with it here:
-WHY_OPENID=Why OpenID ?
       It's a single username and password that allows you to log in to any OpenID-enabled site. It works on thousands of websites.
      It's an open standard. 
      learn more
 DIRECT_LINK_EXPLANATION=Copy and paste the link below to share your map with colleagues
-TEMPORAL_PASSWORD_SENT=Your temporal password has been sent
-TEMPORAL_PASSWORD_SENT_DETAILS=We've sent you an email that will allow you to reset your password. Please check your email now.
-TEMPORAL_PASSWORD_SENT_SUPPORT=If you have any problem receiving the email, contact us to  support@wisemapping.com 
 MINDMAP_TIMESTAMP_OUTDATED=It's not possible to save your changes because your mindmap has been modified by '{0}'. Refresh the page and try again.
 MINDMAP_OUTDATED_BY_YOU=It's not possible to save your changes because map is out of date. Do you have multiple tabs opened ?. Refresh the page and try again.
 MINDMAP_LOCKED=Map is being edited by {0} <{1}>. Map  is opened in read only mode.
 TUTORIAL_VIDEO=Tutorial Video
-LOGIN_USING_OPENID=Do you already have an account on GMail, Yahoo, AOL or other OpenId site ?. Sign in in with it
 XLS_EXPORT_FORMAT=Microsoft Excel
 TXT_EXPORT_FORMAT=Plan Text
 OPEN_OFFICE_EXPORT_FORMAT=OpenOffice Writer
@@ -396,7 +378,7 @@ RECORD=Record
 SAVED=Saved
 SEND=Send
 FLOPPY-DISK=Floppy Disk
-TRANSFER
+TRANSFER=
 CUTLERY=Cutlery
 HEADER=Header
 COMPRESSED=Compressed
@@ -406,8 +388,11 @@ TOWER=Tower
 STATS=Stats
 COPYRIGTH-MARK=Copyright
 REGISTRATION-MARK=Registration Mark
-CLOUD-DOWNLOAD=Cloud Download
-CLOUD-UPLOAD=Cloud Updload
+
+
+# Confirmed
+RESET_PASSWORD_INVALID_EMAIL=The email provided is not a valid user account. Please, try again with an valid email.   
+
 
 
 
diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties
index 79b86c7f..9834198f 100644
--- a/wise-webapp/src/main/resources/messages_es.properties
+++ b/wise-webapp/src/main/resources/messages_es.properties
@@ -48,7 +48,7 @@ FIELD_REQUIRED=Campo requerido
 EMAIL_ALREADY_EXIST=e-mail ya existente
 NO_VALID_EMAIL_ADDRESS=e-mail invalido
 USERNAME_ALREADY_EXIST=Nombre de usuario ya existente
-PASSWORD_MISSMATCH=La contraseña no concuerda
+PASSWORD_MISMATCH=La contraseña no concuerda
 WISEMAPPING_ACCOUNT_MESSAGE=Por favor, verifique la información que ha ingresado y lea las condiciones del servicio.
 REGISTRATION_CLICK_ADVICE= Seleccionando 'Registración' esta aceptando las condiciones de uso de arriba y la politica de privacidad.
 REGISTRATION_TITLE_MSG=Complete el siguiente formulario para convertirse en un miembro de la comunidad de WiseMapping. 
      La registración es Gratis y sólo toma un momento.
diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties
index 8f93bed4..c924c418 100644
--- a/wise-webapp/src/main/resources/messages_fr.properties
+++ b/wise-webapp/src/main/resources/messages_fr.properties
@@ -64,7 +64,7 @@ FIELD_REQUIRED=Ce champ ne peut pas rester vide
 EMAIL_ALREADY_EXIST=Cet email est déjà utilisé
 NO_VALID_EMAIL_ADDRESS=Email non valide
 USERNAME_ALREADY_EXIST=Ce nom d'utilisateur est déjà utilisé
-PASSWORD_MISSMATCH=Le mot de passe saisi ne correspond pas
+PASSWORD_MISMATCH=Le mot de passe saisi ne correspond pas
 CHANGE_PASSWORD_SUCCESS=Votre mot de passe a été changé avec succès. 
 WISEMAPPING_ACCOUNT_MESSAGE=Merci de vérifier l'information de Compte WiseMapping que vous avez saisie, et de relire les conditions de service
 REGISTRATION_CLICK_ADVICE=En cliquant "M'enregistrer" ci-dessous, vous acceptez les conditions de service ci-dessus ainsi que les règles de confidentialité.
diff --git a/wise-webapp/src/main/resources/messages_it.properties b/wise-webapp/src/main/resources/messages_it.properties
index 3e33deea..744e918f 100644
--- a/wise-webapp/src/main/resources/messages_it.properties
+++ b/wise-webapp/src/main/resources/messages_it.properties
@@ -59,7 +59,7 @@ FIELD_REQUIRED=I campi richiesti non possono essere lasciati vuoti
 EMAIL_ALREADY_EXIST=Indirizzo e-mail esiste già
 NO_VALID_EMAIL_ADDRESS=Indirizzo e-mail non valido
 USERNAME_ALREADY_EXIST=Il nome utente esiste già
-PASSWORD_MISSMATCH=La password inserita non corrisponde
+PASSWORD_MISMATCH=La password inserita non corrisponde
 CHANGE_PASSWORD_SUCCESS=La password è stata cambiata correttamente
 WISEMAPPING_ACCOUNT_MESSAGE=Prego, controllare le informazioni del tuo account WiseMapping appena inserite, e prendi note dei Termini di Servizio
 REGISTRATION_CLICK_ADVICE= Cliccando su 'Registra' di seguito, si accettano i Termini di Servizio riportati e le Privacy Policy di cui sopra.
diff --git a/wise-webapp/src/main/resources/messages_pt_BR.properties b/wise-webapp/src/main/resources/messages_pt_BR.properties
index 7a3ad9a4..044e0093 100644
--- a/wise-webapp/src/main/resources/messages_pt_BR.properties
+++ b/wise-webapp/src/main/resources/messages_pt_BR.properties
@@ -57,7 +57,7 @@ FIELD_REQUIRED=Campo requierido não pode ficar vazio.
 EMAIL_ALREADY_EXIST=Email já existe
 NO_VALID_EMAIL_ADDRESS=Endereço de email Inválido
 USERNAME_ALREADY_EXIST=Nome de usuário ja existe
-PASSWORD_MISSMATCH=As senhas inseridas não conferem.
+PASSWORD_MISMATCH=As senhas inseridas não conferem.
 CHANGE_PASSWORD_SUCCESS=Sua senha foi alterada com sucesso.
 WISEMAPPING_ACCOUNT_MESSAGE=Confira a informação da conta WiseMapping que você inseriu acima e reveja os Termos de Serviço.
 REGISTRATION_CLICK_ADVICE= Clicando em Registrar abaixo você está concordando com os Termos de Seviço acima e a Política de Privacidade.
diff --git a/wise-webapp/src/main/resources/messages_zh_CN.properties b/wise-webapp/src/main/resources/messages_zh_CN.properties
index a02f6115..01c696c6 100644
--- a/wise-webapp/src/main/resources/messages_zh_CN.properties
+++ b/wise-webapp/src/main/resources/messages_zh_CN.properties
@@ -58,7 +58,7 @@ FIELD_REQUIRED=必填项不能留空白
 EMAIL_ALREADY_EXIST=邮件地址已存在
 NO_VALID_EMAIL_ADDRESS=邮件地址无效
 USERNAME_ALREADY_EXIST=用户名已存在
-PASSWORD_MISSMATCH=密码输入不匹配
+PASSWORD_MISMATCH=密码输入不匹配
 CHANGE_PASSWORD_SUCCESS=密码修改成功!
 WISEMAPPING_ACCOUNT_MESSAGE=请检查已输入的账户信息，并查阅服务条款
 REGISTRATION_CLICK_ADVICE= 点击下面的“注册”，表示你同意上面提到的服务条款和隐私政策。
diff --git a/wise-webapp/src/main/resources/messages_zh_TW.properties b/wise-webapp/src/main/resources/messages_zh_TW.properties
index 04e80663..7b85b219 100644
--- a/wise-webapp/src/main/resources/messages_zh_TW.properties
+++ b/wise-webapp/src/main/resources/messages_zh_TW.properties
@@ -59,7 +59,7 @@ FIELD_REQUIRED=必填項不能留空白
 EMAIL_ALREADY_EXIST=郵件地址已存在
 NO_VALID_EMAIL_ADDRESS=郵件地址無效
 USERNAME_ALREADY_EXIST=用戶名已存在
-PASSWORD_MISSMATCH=密碼輸入不匹配
+PASSWORD_MISMATCH=密碼輸入不匹配
 CHANGE_PASSWORD_SUCCESS=密碼修改成功!
 WISEMAPPING_ACCOUNT_MESSAGE=請檢查已輸入的帳戶資訊，並查閱服務條款
 REGISTRATION_CLICK_ADVICE= 點擊下麵的“註冊”，表示你同意上面提到的服務條款和隱私政策。
diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties
index 38b8171b..a2a35bb9 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -124,7 +124,6 @@ security.ldap.server=ldap://localhost:389
 # If anonymous password is required, change the wisemapping-security-ldap.xml removing the
 security.ldap.server.user=cn=pveiga,dc=wisemapping,dc=com
 security.ldap.server.password=password
-
 security.ldap.basedn=dc=wisemapping,dc=com
 
 
@@ -146,17 +145,5 @@ documentation.services.basePath=http://localhost:8080/service
 documentation.services.version=3.0.1
 
 
-# OAuth2 Security
-
-#spring.security.oauth2.client.registration.google.client-id=
-#spring.security.oauth2.client.registration.google.client-secret=
-
-#spring.security.oauth2.client.registration.facebook.client-id=
-#spring.security.oauth2.client.registration.facebook.client-secret=
-
-
-
-
-
 
 
diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
index 7ed90501..4cd40668 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -1,7 +1,7 @@
-log4j.rootLogger=TRACE, stdout, R
-log4j.logger.com.wisemapping=TRACE,stdout,R
-log4j.logger.org.springframework=TRACE,stdout,R
-log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext=ERROR,stdout,R
+log4j.rootLogger=DEBUG, stdout, R
+log4j.logger.com.wisemapping=DEBUG,R
+log4j.logger.org.springframework=DEBUG,R
+log4j.logger.org.hibernate.engine.internal.StatefulPersistenceContext=ERROR,R
 
 # Stdout logger �
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
index a4e3c70d..3d87c930 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
@@ -1,15 +1,16 @@
-
+
 
 
 
     
-    
     
     
     
 
+    
+    
+    
+    
 
     
     
@@ -18,24 +19,11 @@
         
     
 
-    
-        
-        
-        
-    
-
-    
-        
-        
-        
-    
 
     
         
     
 
-    
-
     
     
         
@@ -48,135 +36,4 @@
         
     
 
-    
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-    
-
-    
-        
-        
-        
-    
 
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
index eda5c590..5c907d51 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
@@ -46,6 +46,7 @@
                 com.wisemapping.rest.model.RestLockInfo
                 com.wisemapping.rest.model.RestLabel
                 com.wisemapping.rest.model.RestLabelList
+                com.wisemapping.rest.model.RestUserRegistration
             
         
     
@@ -152,10 +153,6 @@
             
         
     
-
     
     
-    
-    
-    
 
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
index 5808bbc6..8db06e2d 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@@ -8,15 +8,17 @@
           http://www.springframework.org/schema/security
           http://www.springframework.org/schema/security/spring-security.xsd">
 
+    
+    
+    
+    
+    
+
     
     
     
     
-    
 
-    
-    
-    
     
 
     
@@ -32,13 +34,21 @@
     
     
 
-
+    
     
         
 
+        
+        
+        
+
+        
+        
+
         
         
         
+
         
     
 
@@ -56,7 +66,8 @@
                         authentication-failure-url="/c/login?login_error=2"
                         login-processing-url="/c/perform-login"/>
 
-        
+        
+        
         
     
 
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
index 7d269fbf..93a978d3 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
@@ -18,24 +18,6 @@
 
     
     
-        
-            
-                
-                    /
-                    /index.jsp
-                    /c/home
-                    /c/j_spring_security
-                    /c/login
-                    /c/GCFInstall
-                    /service/
-                    /c/maps/*/embed
-                    /c/maps/*/public
-                    /c/embeddedView
-                    /c/user/resetPassword
-                    /c/user/registration
-                
-            
-        
         
         
 
@@ -47,24 +29,27 @@
         
     
 
-
     
         
         
         
             
-                browserNotSupported
-                GCFPluginRequired
                 
                 securityError
             
         
+
+        
+            
+                
+                200
+            
+        
+
         
             
                 java.lang.reflect.UndeclaredThrowableException
-                com.wisemapping.exceptions.GoogleChromeFrameRequiredException
-                com.wisemapping.exceptions.UnsupportedBrowserException
             
         
         
diff --git a/wise-webapp/src/main/webapp/bootstrap b/wise-webapp/src/main/webapp/bootstrap
deleted file mode 120000
index 722af94d..00000000
--- a/wise-webapp/src/main/webapp/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../../../../wise-editor/src/main/webapp/bootstrap/
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-colorpicker.css b/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-colorpicker.css
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-colorpicker.min.css b/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-colorpicker.min.css
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-theme.css b/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-theme.css
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-theme.css.map b/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-theme.css.map
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-theme.min.css b/wise-webapp/src/main/webapp/bootstrap/css/bootstrap-theme.min.css
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css b/wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css.map b/wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css.map
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/css/bootstrap.min.css b/wise-webapp/src/main/webapp/bootstrap/css/bootstrap.min.css
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/fonts/glyphicons-halflings-regular.eot b/wise-webapp/src/main/webapp/bootstrap/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/fonts/glyphicons-halflings-regular.svg b/wise-webapp/src/main/webapp/bootstrap/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/fonts/glyphicons-halflings-regular.ttf b/wise-webapp/src/main/webapp/bootstrap/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/fonts/glyphicons-halflings-regular.woff b/wise-webapp/src/main/webapp/bootstrap/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/alpha-horizontal.png b/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/alpha-horizontal.png
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/alpha.png b/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/alpha.png
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/hue-horizontal.png b/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/hue-horizontal.png
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/hue.png b/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/hue.png
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/saturation.png b/wise-webapp/src/main/webapp/bootstrap/img/bootstrap-colorpicker/saturation.png
new file mode 100644
index 00000000..e69de29b
diff --git a/wise-webapp/src/main/webapp/bootstrap/img/glyphicons-halflings-blue.png b/wise-webapp/src/main/webapp/bootstrap/img/glyphicons-halflings-blue.png
new file mode 100644
index 00000000..e69de29b
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap.min.css b/wise-webapp/src/main/webapp/css/bootstrap.min.css
similarity index 100%
rename from mindplot/src/main/javascript/libraries/bootstrap/css/bootstrap.min.css
rename to wise-webapp/src/main/webapp/css/bootstrap.min.css
diff --git a/wise-editor/src/main/webapp/css/compatibility.less b/wise-webapp/src/main/webapp/css/compatibility.less
similarity index 100%
rename from wise-editor/src/main/webapp/css/compatibility.less
rename to wise-webapp/src/main/webapp/css/compatibility.less
diff --git a/wise-editor/src/main/webapp/css/embedded.less b/wise-webapp/src/main/webapp/css/css/embedded.less
similarity index 100%
rename from wise-editor/src/main/webapp/css/embedded.less
rename to wise-webapp/src/main/webapp/css/css/embedded.less
diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/css/pageHeaders.css
similarity index 100%
rename from wise-webapp/src/main/webapp/css/pageHeaders.css
rename to wise-webapp/src/main/webapp/css/css/pageHeaders.css
diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/css/pageTemplate.css
similarity index 100%
rename from wise-webapp/src/main/webapp/css/pageTemplate.css
rename to wise-webapp/src/main/webapp/css/css/pageTemplate.css
diff --git a/wise-webapp/src/main/webapp/css/css/skin.less b/wise-webapp/src/main/webapp/css/css/skin.less
new file mode 100644
index 00000000..ff43407e
--- /dev/null
+++ b/wise-webapp/src/main/webapp/css/css/skin.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/css/editor.less b/wise-webapp/src/main/webapp/css/editor.less
similarity index 98%
rename from wise-editor/src/main/webapp/css/editor.less
rename to wise-webapp/src/main/webapp/css/editor.less
index 395cbabe..5d159ee3 100644
--- a/wise-editor/src/main/webapp/css/editor.less
+++ b/wise-webapp/src/main/webapp/css/editor.less
@@ -4,7 +4,7 @@
 /* Header & Toolbar Styles */
 /********************************************************************************/
 @import "header.less";
-@import "../bootstrap/css/bootstrap.min.css";
+@import "bootstrap.min.css";
 
 body {
     -webkit-touch-callout: none;
diff --git a/wise-webapp/src/main/webapp/css/embedded.less b/wise-webapp/src/main/webapp/css/embedded.less
deleted file mode 120000
index f71cb6bf..00000000
--- a/wise-webapp/src/main/webapp/css/embedded.less
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../wise-editor/src/main/webapp/css/embedded.less
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/css/header.less b/wise-webapp/src/main/webapp/css/header.less
similarity index 100%
rename from wise-editor/src/main/webapp/css/header.less
rename to wise-webapp/src/main/webapp/css/header.less
diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less
deleted file mode 100644
index 02d4c859..00000000
--- a/wise-webapp/src/main/webapp/css/mindmapList.less
+++ /dev/null
@@ -1,401 +0,0 @@
-@import "../bootstrap/css/bootstrap-colorpicker.min.css";
-@import "../bootstrap/css/bootstrap.min.css";
-@import "pageHeaders.css";
-
-@html-background: #dedederepeat-xscroll;
-@body-width: 1050px;
-
-@font-family: "Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
-
-@base-margin: 10px;
-@base-padding: @base-margin;
-@base-border-size: 1px;
-@base-color: #111;
-
-/* ----------------------------- General -------------------------------- */
-.filterList li {
-  position: relative;
-  width: 90%;
-  height: 35px;
-}
-
-.filterList {
-  width: 108%;
-}
-.active {
-  position: relative;
-  left: 8px;
-}
-.colorpicker {
-  z-index: 2000;
-}
-
-#mindmapListContainer {
-    background: #FFFFFF;
-    margin: 0 auto;
-    width: @body-width;
-    padding: @base-padding;
-}
-
-.rounded-corners(@radius: 5px){
-    border-radius: @radius;
-    -webkit-border-radius: @radius;
-    -moz-border-radius: @radius;
-}
-
-.mindmapName {
-    color: #428bca;
-}
-
-/* ------------------------------ Table --------------------------------- */
-
-@table-gap: 2%;
-@table-width: 100%;
-
-#map-table {
-    width: 100% !important;
-    border-top: 1px solid black;
-    overflow-y: auto;
-    height: 480px;
-}
-
-input#selectAll {
-    position: relative;
-    left: 4px;
-}
-
-@even-color: #FFFFFF;
-@sorting-even-color: #EAEBFF;
-@odd-color: #E2E4FF;
-@sorting-odd-color: #D3D6FF;
-
-@red: #FF0000;
-@base-border-size: 1px;
-@base-color: #111;
-@base-margin: 10px;
-
-@th-background-color: #FFFFFF;
-
-.rounded-corners(@radius: 5px){
-    border-radius: @radius;
-    -webkit-border-radius: @radius;
-    -moz-border-radius: @radius;
-}
-
-.dataTables_processing {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 250px;
-    height: 30px;
-    margin-left: -125px;
-    margin-top: -15px;
-    padding: 14px 0 2px 0;
-    border: 1px solid #ddd;
-    text-align: center;
-    color: #999;
-    font-size: 14px;
-    background-color: white;
-}
-
-.dataTables_filter {
-    float: right;
-}
-
-#mindmapListTable th {
-    padding: 4px;
-}
-
-#mindmapListTable tbody tr {
-    cursor: pointer;
-}
-
-/* Pagination Styles */
-#paginateContainer {
-    height: 40px;
-    width: 100%;
-}
-
-.dataTables_info {
-  font-size: 12px;
-  line-height: 1.428571429;
-  color: #555;
-  font-weight: 700;
-
-}
-.dataTables_length {
-    display: block;
-    height: 34px;
-    font-size: 12px;
-    line-height: 1.428571429;
-    color: #555;
-    background-color: #fff;
-    background-image: none;
-    float: right;
-}
-
-.dataTables_paginate {
-    display: none;
-}
-
-/* ---------------------------- Label --------------------------------- */
-
-.labelColor {
-    width: 12px;
-    height: 12px;
-    display: inline-block;
-    position: relative;
-    left: 3px;
-    top: 2px;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-    background-color: black;
-    float: left;
-}
-
-.colorInput {
-  border-radius: 4px !important;
-  border: 1px solid #ccc !important;
-}
-
-.labelIcon {
-  float: left;
-}
-
-.labelName {
-    display: inline-block;
-    position: relative;
-    left: 7px;
-    top: -2px;
-}
-
-.labelNameList {
-  max-width: 79px;
-  word-wrap: break-word;
-}
-
-.labelTag {
-  display: inline-block;
-  font-size: 11px;
-  line-height: 1;
-  padding: 2px 0px 0px 2px;
-  position: relative;
-  margin-right: 3px;
-  float: right;
-}
-
-.closeLabel {
-  font-size: 13px;
-  position: relative;
-  top: -1px;
-}
-
-.listSeparator {
-  height: 1px;
-  background-color: #d5d3d4;
-}
-
-.closeTag {
-  cursor: pointer;
-  z-index: 2000;
-}
-
-.tableTag {
-  padding:0px;
-  margin-bottom: 0px;
-  margin-right: 5px;
-  float: right;
-  position: relative;
-  top: 3px;
-}
-
-table.tableTag td {
-  border-radius: 1px;
-  padding-left: 4px;
-  padding-right: 3px;
-  padding-top :0px;
-  padding-bottom: 0px;
-  color: #ffffff;
-  line-height: 15px;
-}
-
-.closeTag:hover {
-  background-color: #ffffff !important;
-  color: #000000;
-}
-
-/* ---------------------------- Scrollbar for list filter --------------------------------- */
-::-webkit-scrollbar {
-  width: 8px;
-  direction:rtl;
-  text-align: left;
-  position: relative;
-  left: 10px;
-}
-::-webkit-scrollbar-track {
-  border-radius: 10px;
-  background-color: #eaeaea;
-  border-left: 1px solid #ccc;
-}
-::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #c6c6c6;
-}
-::-webkit-scrollbar-thumb:hover {
-  background-color: #08c;
-}
-
-/* ---------------------------- Sorting --------------------------------- */
-
-.sorting_asc {
-    background: @th-background-color url('../images/sort_asc.png') no-repeat center right;
-}
-
-.sorting_desc {
-    background: @th-background-color url('../images/sort_desc.png') no-repeat center right;
-}
-
-.sorting {
-    background: @th-background-color url('../images/sort_both.png') no-repeat center right;
-}
-
-.sorting_disabled {
-    background: @th-background-color;
-}
-
-.sorting_asc_disabled {
-    background: @th-background-color url('../images/sort_asc_disabled.png') no-repeat center right;
-}
-
-.sorting_desc_disabled {
-    background: @th-background-color url('../images/sort_desc_disabled.png') no-repeat center right;
-}
-
-/* ----------------------------- Misc ----------------------------------- */
-
-.dataTables_empty {
-    text-align: center;
-}
-
-.row-selected {
-    background-color: #f5f5f5;
-}
-
-.buttonsToolbar {
-    margin: 40px 0px 10px 0px
-}
-
-#tableActions {
-    float: right;
-    padding-bottom: 10px;
-    white-space: nowrap;
-}
-
-#tableActions > div {
-    float: right;
-    margin-left: 5px;
-}
-
-#pageInfo {
-    padding-top: 5px;
-    padding-left: 8px;
-    font-weight: bold;
-}
-
-#tableFooter {
-    height: 50px;
-    white-space: nowrap;
-}
-
-span.starredOff {
-    background: url('../images/star-off.png') no-repeat center left;
-    padding: 10px;
-    margin: 0 0 0 10px;
-}
-
-span.starredOff:hover {
-    background: url('../images/star-off-hover.png') no-repeat center left;
-}
-
-span.starredOn {
-    background: url('../images/star-on.png') no-repeat center left;
-    padding: 10px;
-    margin: 0 0 0 10px;
-}
-
-span.starredOn:hover {
-    background: url('../images/star-on-hover.png') no-repeat center left;
-}
-
-abbr[title] {
-    cursor: default;
-}
-
-
-#footerContainer {
-    padding-top: 10px;
-    border-top: 1px black solid;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 65px; /* Height of the footer */
-    background: #ffffff;
-}
-
-#foldersContainer {
-    padding-top: 86px;
-}
-
-#footerContainer > ul {
-   padding:0px;
-   margin:0px;
-}
-
-#footerContainer > li.active {
-   padding:0px;
-   margin:0px;
-}
-
-#foldersContainer > ul > li > a {
-  padding: 8px 15px;
-  white-space: nowrap;
-}
-
-/* ----------------------------- Icons ----------------------------------- */
-
-#defaultIcon {
-  background: #eee;
-  border: 1px solid #ccc !important;
-}
-
-#defaultIcon:hover {
-  background-color: #C8C8C8;
-}
-
-.colorInput:hover {
-  background-color: #C8C8C8;
-}
-
-.bs-glyphicons > ul {
-  padding-left: 10px;
-  overflow-x: hidden;
-}
-
-.bs-glyphicons > ul > li {
-  float: left;
-  width: 12%;
-  height: 20%;
-  padding: 10px;
-  font-size: 10px;
-  line-height: 1.4;
-  text-align: center;
-  border: 1px solid #fff;
-  background-color: #f9f9f9;
-  cursor: pointer;
-}
-
-.bs-glyphicons > ul > li:hover {
-  background-color: #C8C8C8;
-}
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/css/toolbar.less b/wise-webapp/src/main/webapp/css/toolbar.less
similarity index 86%
rename from wise-editor/src/main/webapp/css/toolbar.less
rename to wise-webapp/src/main/webapp/css/toolbar.less
index 2431dfa8..88abc787 100644
--- a/wise-editor/src/main/webapp/css/toolbar.less
+++ b/wise-webapp/src/main/webapp/css/toolbar.less
@@ -39,17 +39,17 @@ div#toolbar .buttonOn, div#toolbar .buttonOff, div#toolbar .buttonActive, div#to
 div#toolbar .buttonOn:hover {
     cursor: pointer;
     opacity: 1;
-    background: url(../images/btn-bg-hover.png) no-repeat center top;
+    background: url(../images/editor/btn-bg-hover.png) no-repeat center top;
 }
 
 div#toolbar .buttonOn {
     opacity: 0.8;
-    background: url(../images/btn-bg-normal.png) no-repeat center top;
+    background: url(../images/editor/btn-bg-normal.png) no-repeat center top;
 }
 
 div#toolbar .buttonOff {
     opacity: 0.4;
-    background: url(../images/btn-bg-normal.png) no-repeat center top;
+    background: url(../images/editor/btn-bg-normal.png) no-repeat center top;
 }
 
 div#exportAnchor {
@@ -74,24 +74,24 @@ div#toolbar .buttonExtOn, div#toolbar .buttonExtOff, div#toolbar .buttonExtActiv
 
 div#toolbar .buttonExtOn:hover {
     opacity: 1;
-    background: url(../images/btne-bg-hover.png) no-repeat center top;
+    background: url(../images/editor/btne-bg-hover.png) no-repeat center top;
 
 }
 
 div#toolbar .buttonExtActive {
     opacity: 1;
-    background: url(../images/btne-bg-selected.png) no-repeat center top;
+    background: url(../images/editor/btne-bg-selected.png) no-repeat center top;
 
 }
 
 div#toolbar .buttonExtOn {
     opacity: 0.8;
-    background: url(../images/btne-bg-normal.png) no-repeat center top;
+    background: url(../images/editor/btne-bg-normal.png) no-repeat center top;
 }
 
 div#toolbar .buttonExtOff {
     opacity: 0.4;
-    background: url(../images/btne-bg-normal.png) no-repeat center top;
+    background: url(../images/editor/tne-bg-normal.png) no-repeat center top;
 }
 
 div#exportAnchor {
diff --git a/mindplot/src/main/javascript/widget/colorPalette.css b/wise-webapp/src/main/webapp/css/widget/colorPalette.css
similarity index 100%
rename from mindplot/src/main/javascript/widget/colorPalette.css
rename to wise-webapp/src/main/webapp/css/widget/colorPalette.css
diff --git a/mindplot/src/main/javascript/widget/colorPalette.html b/wise-webapp/src/main/webapp/css/widget/colorPalette.html
similarity index 100%
rename from mindplot/src/main/javascript/widget/colorPalette.html
rename to wise-webapp/src/main/webapp/css/widget/colorPalette.html
diff --git a/wise-editor/src/main/webapp/css/widget/skin2.less b/wise-webapp/src/main/webapp/css/widget/skin2.less
similarity index 100%
rename from wise-editor/src/main/webapp/css/widget/skin2.less
rename to wise-webapp/src/main/webapp/css/widget/skin2.less
diff --git a/wise-webapp/src/main/webapp/doc/rest/css/highlight.default.css b/wise-webapp/src/main/webapp/doc/rest/css/highlight.default.css
deleted file mode 100755
index e417fc17..00000000
--- a/wise-webapp/src/main/webapp/doc/rest/css/highlight.default.css
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-
-Original style from softwaremaniacs.org (c) Ivan Sagalaev 
-
-*/
-
-pre code {
-  display: block; padding: 0.5em;
-  background: #F0F0F0;
-}
-
-pre code,
-pre .subst,
-pre .tag .title,
-pre .lisp .title,
-pre .clojure .built_in,
-pre .nginx .title {
-  color: black;
-}
-
-pre .string,
-pre .title,
-pre .constant,
-pre .parent,
-pre .tag .value,
-pre .rules .value,
-pre .rules .value .number,
-pre .preprocessor,
-pre .ruby .symbol,
-pre .ruby .symbol .string,
-pre .aggregate,
-pre .template_tag,
-pre .django .variable,
-pre .smalltalk .class,
-pre .addition,
-pre .flow,
-pre .stream,
-pre .bash .variable,
-pre .apache .tag,
-pre .apache .cbracket,
-pre .tex .command,
-pre .tex .special,
-pre .erlang_repl .function_or_atom,
-pre .markdown .header {
-  color: #800;
-}
-
-pre .comment,
-pre .annotation,
-pre .template_comment,
-pre .diff .header,
-pre .chunk,
-pre .markdown .blockquote {
-  color: #888;
-}
-
-pre .number,
-pre .date,
-pre .regexp,
-pre .literal,
-pre .smalltalk .symbol,
-pre .smalltalk .char,
-pre .go .constant,
-pre .change,
-pre .markdown .bullet,
-pre .markdown .link_url {
-  color: #080;
-}
-
-pre .label,
-pre .javadoc,
-pre .ruby .string,
-pre .decorator,
-pre .filter .argument,
-pre .localvars,
-pre .array,
-pre .attr_selector,
-pre .important,
-pre .pseudo,
-pre .pi,
-pre .doctype,
-pre .deletion,
-pre .envvar,
-pre .shebang,
-pre .apache .sqbracket,
-pre .nginx .built_in,
-pre .tex .formula,
-pre .erlang_repl .reserved,
-pre .prompt,
-pre .markdown .link_label,
-pre .vhdl .attribute,
-pre .clojure .attribute,
-pre .coffeescript .property {
-  color: #88F
-}
-
-pre .keyword,
-pre .id,
-pre .phpdoc,
-pre .title,
-pre .built_in,
-pre .aggregate,
-pre .css .tag,
-pre .javadoctag,
-pre .phpdoc,
-pre .yardoctag,
-pre .smalltalk .class,
-pre .winutils,
-pre .bash .variable,
-pre .apache .tag,
-pre .go .typename,
-pre .tex .command,
-pre .markdown .strong,
-pre .request,
-pre .status {
-  font-weight: bold;
-}
-
-pre .markdown .emphasis {
-  font-style: italic;
-}
-
-pre .nginx .built_in {
-  font-weight: normal;
-}
-
-pre .coffeescript .javascript,
-pre .javascript .xml,
-pre .tex .formula,
-pre .xml .javascript,
-pre .xml .vbscript,
-pre .xml .css,
-pre .xml .cdata {
-  opacity: 0.5;
-}
diff --git a/wise-webapp/src/main/webapp/doc/rest/css/screen.css b/wise-webapp/src/main/webapp/doc/rest/css/screen.css
deleted file mode 100755
index 1627ecd0..00000000
--- a/wise-webapp/src/main/webapp/doc/rest/css/screen.css
+++ /dev/null
@@ -1,1070 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 */
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-b,
-u,
-i,
-center,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td,
-article,
-aside,
-canvas,
-details,
-embed,
-figure,
-figcaption,
-footer,
-header,
-hgroup,
-menu,
-nav,
-output,
-ruby,
-section,
-summary,
-time,
-mark,
-audio,
-video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
-  display: block;
-}
-body {
-  line-height: 1;
-}
-ol,
-ul {
-  list-style: none;
-}
-blockquote,
-q {
-  quotes: none;
-}
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
-  content: '';
-  content: none;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.swagger-ui-wrap {
-  line-height: 1;
-  font-family: "Droid Sans", sans-serif;
-  max-width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-ui-wrap b,
-.swagger-ui-wrap strong {
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-ui-wrap q,
-.swagger-ui-wrap blockquote {
-  quotes: none;
-}
-.swagger-ui-wrap p {
-  line-height: 1.4em;
-  padding: 0 0 10px;
-  color: #333333;
-}
-.swagger-ui-wrap q:before,
-.swagger-ui-wrap q:after,
-.swagger-ui-wrap blockquote:before,
-.swagger-ui-wrap blockquote:after {
-  content: none;
-}
-.swagger-ui-wrap .heading_with_menu h1,
-.swagger-ui-wrap .heading_with_menu h2,
-.swagger-ui-wrap .heading_with_menu h3,
-.swagger-ui-wrap .heading_with_menu h4,
-.swagger-ui-wrap .heading_with_menu h5,
-.swagger-ui-wrap .heading_with_menu h6 {
-  display: block;
-  clear: none;
-  float: left;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 60%;
-}
-.swagger-ui-wrap table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.swagger-ui-wrap table thead tr th {
-  padding: 5px;
-  font-size: 0.9em;
-  color: #666666;
-  border-bottom: 1px solid #999999;
-}
-.swagger-ui-wrap table tbody tr:last-child td {
-  border-bottom: none;
-}
-.swagger-ui-wrap table tbody tr.offset {
-  background-color: #f0f0f0;
-}
-.swagger-ui-wrap table tbody tr td {
-  padding: 6px;
-  font-size: 0.9em;
-  border-bottom: 1px solid #cccccc;
-  vertical-align: top;
-  line-height: 1.3em;
-}
-.swagger-ui-wrap ol {
-  margin: 0px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: decimal;
-}
-.swagger-ui-wrap ol li {
-  padding: 5px 0px;
-  font-size: 0.9em;
-  color: #333333;
-}
-.swagger-ui-wrap ol,
-.swagger-ui-wrap ul {
-  list-style: none;
-}
-.swagger-ui-wrap h1 a,
-.swagger-ui-wrap h2 a,
-.swagger-ui-wrap h3 a,
-.swagger-ui-wrap h4 a,
-.swagger-ui-wrap h5 a,
-.swagger-ui-wrap h6 a {
-  text-decoration: none;
-}
-.swagger-ui-wrap h1 a:hover,
-.swagger-ui-wrap h2 a:hover,
-.swagger-ui-wrap h3 a:hover,
-.swagger-ui-wrap h4 a:hover,
-.swagger-ui-wrap h5 a:hover,
-.swagger-ui-wrap h6 a:hover {
-  text-decoration: underline;
-}
-.swagger-ui-wrap h1 span.divider,
-.swagger-ui-wrap h2 span.divider,
-.swagger-ui-wrap h3 span.divider,
-.swagger-ui-wrap h4 span.divider,
-.swagger-ui-wrap h5 span.divider,
-.swagger-ui-wrap h6 span.divider {
-  color: #aaaaaa;
-}
-.swagger-ui-wrap a {
-  color: #547f00;
-}
-.swagger-ui-wrap a img {
-  border: none;
-}
-.swagger-ui-wrap article,
-.swagger-ui-wrap aside,
-.swagger-ui-wrap details,
-.swagger-ui-wrap figcaption,
-.swagger-ui-wrap figure,
-.swagger-ui-wrap footer,
-.swagger-ui-wrap header,
-.swagger-ui-wrap hgroup,
-.swagger-ui-wrap menu,
-.swagger-ui-wrap nav,
-.swagger-ui-wrap section,
-.swagger-ui-wrap summary {
-  display: block;
-}
-.swagger-ui-wrap pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-}
-.swagger-ui-wrap pre code {
-  line-height: 1.6em;
-  background: none;
-}
-.swagger-ui-wrap .content > .content-type > div > label {
-  clear: both;
-  display: block;
-  color: #0F6AB4;
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-ui-wrap .content pre {
-  font-size: 12px;
-  margin-top: 5px;
-  padding: 5px;
-}
-.swagger-ui-wrap .icon-btn {
-  cursor: pointer;
-}
-.swagger-ui-wrap .info_title {
-  padding-bottom: 10px;
-  font-weight: bold;
-  font-size: 25px;
-}
-.swagger-ui-wrap p.big,
-.swagger-ui-wrap div.big p {
-  font-size: 1em;
-  margin-bottom: 10px;
-}
-.swagger-ui-wrap form.fullwidth ol li.string input,
-.swagger-ui-wrap form.fullwidth ol li.url input,
-.swagger-ui-wrap form.fullwidth ol li.text textarea,
-.swagger-ui-wrap form.fullwidth ol li.numeric input {
-  width: 500px !important;
-}
-.swagger-ui-wrap .info_license {
-  padding-bottom: 5px;
-}
-.swagger-ui-wrap .info_tos {
-  padding-bottom: 5px;
-}
-.swagger-ui-wrap .message-fail {
-  color: #cc0000;
-}
-.swagger-ui-wrap .info_contact {
-  padding-bottom: 5px;
-}
-.swagger-ui-wrap .info_description {
-  padding-bottom: 10px;
-  font-size: 15px;
-}
-.swagger-ui-wrap .markdown ol li,
-.swagger-ui-wrap .markdown ul li {
-  padding: 3px 0px;
-  line-height: 1.4em;
-  color: #333333;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input,
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input {
-  display: block;
-  padding: 4px;
-  width: auto;
-  clear: both;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title,
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title {
-  font-size: 1.3em;
-}
-.swagger-ui-wrap table.fullwidth {
-  width: 100%;
-}
-.swagger-ui-wrap .model-signature {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 1em;
-  line-height: 1.5em;
-}
-.swagger-ui-wrap .model-signature .signature-nav a {
-  text-decoration: none;
-  color: #AAA;
-}
-.swagger-ui-wrap .model-signature .signature-nav a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-ui-wrap .model-signature .signature-nav .selected {
-  color: black;
-  text-decoration: none;
-}
-.swagger-ui-wrap .model-signature .propType {
-  color: #5555aa;
-}
-.swagger-ui-wrap .model-signature pre:hover {
-  background-color: #ffffdd;
-}
-.swagger-ui-wrap .model-signature pre {
-  font-size: .85em;
-  line-height: 1.2em;
-  overflow: auto;
-  max-height: 200px;
-  cursor: pointer;
-}
-.swagger-ui-wrap .model-signature ul.signature-nav {
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-ui-wrap .model-signature ul.signature-nav li:last-child {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-ui-wrap .model-signature ul.signature-nav li {
-  float: left;
-  margin: 0 5px 5px 0;
-  padding: 2px 5px 2px 0;
-  border-right: 1px solid #ddd;
-}
-.swagger-ui-wrap .model-signature .propOpt {
-  color: #555;
-}
-.swagger-ui-wrap .model-signature .snippet small {
-  font-size: 0.75em;
-}
-.swagger-ui-wrap .model-signature .propOptKey {
-  font-style: italic;
-}
-.swagger-ui-wrap .model-signature .description .strong {
-  font-weight: bold;
-  color: #000;
-  font-size: .9em;
-}
-.swagger-ui-wrap .model-signature .description div {
-  font-size: 0.9em;
-  line-height: 1.5em;
-  margin-left: 1em;
-}
-.swagger-ui-wrap .model-signature .description .stronger {
-  font-weight: bold;
-  color: #000;
-}
-.swagger-ui-wrap .model-signature .propName {
-  font-weight: bold;
-}
-.swagger-ui-wrap .model-signature .signature-container {
-  clear: both;
-}
-.swagger-ui-wrap .body-textarea {
-  width: 300px;
-  height: 100px;
-  border: 1px solid #aaa;
-}
-.swagger-ui-wrap .markdown p code,
-.swagger-ui-wrap .markdown li code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #f0f0f0;
-  color: black;
-  padding: 1px 3px;
-}
-.swagger-ui-wrap .required {
-  font-weight: bold;
-}
-.swagger-ui-wrap input.parameter {
-  width: 300px;
-  border: 1px solid #aaa;
-}
-.swagger-ui-wrap h1 {
-  color: black;
-  font-size: 1.5em;
-  line-height: 1.3em;
-  padding: 10px 0 10px 0;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-ui-wrap .heading_with_menu {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-ui-wrap .heading_with_menu ul {
-  display: block;
-  clear: none;
-  float: right;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-top: 10px;
-}
-.swagger-ui-wrap h2 {
-  color: black;
-  font-size: 1.3em;
-  padding: 10px 0 10px 0;
-}
-.swagger-ui-wrap h2 a {
-  color: black;
-}
-.swagger-ui-wrap h2 span.sub {
-  font-size: 0.7em;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-ui-wrap h2 span.sub a {
-  color: #777777;
-}
-.swagger-ui-wrap span.weak {
-  color: #666666;
-}
-.swagger-ui-wrap .message-success {
-  color: #89BF04;
-}
-.swagger-ui-wrap caption,
-.swagger-ui-wrap th,
-.swagger-ui-wrap td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-.swagger-ui-wrap .code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea {
-  font-family: "Droid Sans", sans-serif;
-  height: 250px;
-  padding: 4px;
-  display: block;
-  clear: both;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select {
-  display: block;
-  clear: both;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 0;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0 5px 0 0;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label {
-  color: black;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li label {
-  display: block;
-  clear: both;
-  width: auto;
-  padding: 0 0 3px;
-  color: #666666;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr {
-  padding-left: 3px;
-  color: #888888;
-}
-.swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints {
-  margin-left: 0;
-  font-style: italic;
-  font-size: 0.9em;
-  margin: 0;
-}
-.swagger-ui-wrap form.formtastic fieldset.buttons {
-  margin: 0;
-  padding: 0;
-}
-.swagger-ui-wrap span.blank,
-.swagger-ui-wrap span.empty {
-  color: #888888;
-  font-style: italic;
-}
-.swagger-ui-wrap .markdown h3 {
-  color: #547f00;
-}
-.swagger-ui-wrap .markdown h4 {
-  color: #666666;
-}
-.swagger-ui-wrap .markdown pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-  margin: 0 0 10px 0;
-}
-.swagger-ui-wrap .markdown pre code {
-  line-height: 1.6em;
-}
-.swagger-ui-wrap div.gist {
-  margin: 20px 0 25px 0 !important;
-}
-.swagger-ui-wrap ul#resources {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 0.9em;
-}
-.swagger-ui-wrap ul#resources li.resource {
-  border-bottom: 1px solid #dddddd;
-}
-.swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a,
-.swagger-ui-wrap ul#resources li.resource.active div.heading h2 a {
-  color: black;
-}
-.swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a,
-.swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a {
-  color: #555555;
-}
-.swagger-ui-wrap ul#resources li.resource:last-child {
-  border-bottom: none;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading {
-  border: 1px solid transparent;
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 14px 10px 0 0;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  border-right: 1px solid #dddddd;
-  color: #666666;
-  font-size: 0.9em;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li a {
-  color: #aaaaaa;
-  text-decoration: none;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover,
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child,
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first {
-  padding-left: 0;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child,
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child,
-.swagger-ui-wrap ul#resources li.resource div.heading ul.options.first {
-  padding-left: 0;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading h2 {
-  color: #999999;
-  padding-left: 0;
-  display: block;
-  clear: none;
-  float: left;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading h2 a {
-  color: #999999;
-}
-.swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
-  color: black;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0 0 10px;
-  padding: 0;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 {
-  display: block;
-  clear: none;
-  float: left;
-  width: auto;
-  margin: 0;
-  padding: 0;
-  line-height: 1.1em;
-  color: black;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path {
-  padding-left: 10px;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a {
-  color: black;
-  text-decoration: none;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover {
-  text-decoration: underline;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  text-decoration: none;
-  color: white;
-  display: inline-block;
-  width: 50px;
-  font-size: 0.7em;
-  text-align: center;
-  padding: 7px 0 4px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  -o-border-radius: 2px;
-  -ms-border-radius: 2px;
-  -khtml-border-radius: 2px;
-  border-radius: 2px;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span {
-  margin: 0;
-  padding: 0;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 6px 10px 0 0;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  font-size: 0.9em;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a {
-  text-decoration: none;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
-  border-top: none;
-  padding: 10px;
-  -moz-border-radius-bottomleft: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-  -o-border-bottom-left-radius: 6px;
-  -ms-border-bottom-left-radius: 6px;
-  -khtml-border-bottom-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-  -moz-border-radius-bottomright: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-  -o-border-bottom-right-radius: 6px;
-  -ms-border-bottom-right-radius: 6px;
-  -khtml-border-bottom-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-  margin: 0 0 20px;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4 {
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a {
-  padding: 4px 0 0 10px;
-  display: inline-block;
-  font-size: 0.9em;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header img {
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
-  display: block;
-  clear: none;
-  float: left;
-  padding: 6px 8px;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
-  outline: 2px solid black;
-  outline-color: #cc0000;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  padding: 10px;
-  font-size: 0.9em;
-  max-height: 400px;
-  overflow-y: auto;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading {
-  background-color: #f9f2e9;
-  border: 1px solid #f0e0ca;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a {
-  background-color: #c5862b;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0e0ca;
-  color: #c5862b;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a {
-  color: #c5862b;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content {
-  background-color: #faf5ee;
-  border: 1px solid #f0e0ca;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 {
-  color: #c5862b;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #ffd20f;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #ffd20f;
-  color: #ffd20f;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a {
-  color: #ffd20f;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4 {
-  color: #ffd20f;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading {
-  background-color: #f5e8e8;
-  border: 1px solid #e8c6c7;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #a41e22;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #e8c6c7;
-  color: #a41e22;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a {
-  color: #a41e22;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  background-color: #f7eded;
-  border: 1px solid #e8c6c7;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 {
-  color: #a41e22;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a {
-  color: #c8787a;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading {
-  background-color: #e7f6ec;
-  border: 1px solid #c3e8d1;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a {
-  background-color: #10a54a;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3e8d1;
-  color: #10a54a;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a {
-  color: #10a54a;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content {
-  background-color: #ebf7f0;
-  border: 1px solid #c3e8d1;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 {
-  color: #10a54a;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading {
-  background-color: #FCE9E3;
-  border: 1px solid #F5D5C3;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
-  background-color: #D38042;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0cecb;
-  color: #D38042;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
-  color: #D38042;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content {
-  background-color: #faf0ef;
-  border: 1px solid #f0cecb;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
-  color: #D38042;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  border-top: none;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first {
-  padding-left: 0;
-}
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,
-.swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first {
-  padding-left: 0;
-}
-.swagger-ui-wrap p#colophon {
-  margin: 0 15px 40px 15px;
-  padding: 10px 0;
-  font-size: 0.8em;
-  border-top: 1px solid #dddddd;
-  font-family: "Droid Sans", sans-serif;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-ui-wrap p#colophon a {
-  text-decoration: none;
-  color: #547f00;
-}
-.swagger-ui-wrap h3 {
-  color: black;
-  font-size: 1.1em;
-  padding: 10px 0 10px 0;
-}
-.swagger-ui-wrap .markdown ol,
-.swagger-ui-wrap .markdown ul {
-  font-family: "Droid Sans", sans-serif;
-  margin: 5px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: disc;
-}
-.swagger-ui-wrap form.form_box {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-  padding: 10px;
-}
-.swagger-ui-wrap form.form_box label {
-  color: #0f6ab4 !important;
-}
-.swagger-ui-wrap form.form_box input[type=submit] {
-  display: block;
-  padding: 10px;
-}
-.swagger-ui-wrap form.form_box p.weak {
-  font-size: 0.8em;
-}
-.swagger-ui-wrap form.form_box p {
-  font-size: 0.9em;
-  padding: 0 0 15px;
-  color: #7e7b6d;
-}
-.swagger-ui-wrap form.form_box p a {
-  color: #646257;
-}
-.swagger-ui-wrap form.form_box p strong {
-  color: black;
-}
-#header {
-  background-color: #89bf04;
-  padding: 14px;
-}
-#header a#logo {
-  font-size: 1.5em;
-  font-weight: bold;
-  text-decoration: none;
-  background: transparent url(../images/logo_small.png) no-repeat left center;
-  padding: 20px 0 20px 40px;
-  color: white;
-}
-#header form#api_selector {
-  display: block;
-  clear: none;
-  float: right;
-}
-#header form#api_selector .input {
-  display: block;
-  clear: none;
-  float: left;
-  margin: 0 10px 0 0;
-}
-#header form#api_selector .input input#input_apiKey {
-  width: 200px;
-}
-#header form#api_selector .input input#input_baseUrl {
-  width: 400px;
-}
-#header form#api_selector .input a#explore {
-  display: block;
-  text-decoration: none;
-  font-weight: bold;
-  padding: 6px 8px;
-  font-size: 0.9em;
-  color: white;
-  background-color: #547f00;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -o-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -khtml-border-radius: 4px;
-  border-radius: 4px;
-}
-#header form#api_selector .input a#explore:hover {
-  background-color: #547f00;
-}
-#header form#api_selector .input input {
-  font-size: 0.9em;
-  padding: 3px;
-  margin: 0;
-}
-#content_message {
-  margin: 10px 15px;
-  font-style: italic;
-  color: #999999;
-}
-#message-bar {
-  min-height: 30px;
-  text-align: center;
-  padding-top: 10px;
-}
diff --git a/wise-webapp/src/main/webapp/doc/rest/images/throbber.gif b/wise-webapp/src/main/webapp/doc/rest/images/throbber.gif
deleted file mode 100755
index 06393889..00000000
Binary files a/wise-webapp/src/main/webapp/doc/rest/images/throbber.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/doc/rest/index.html b/wise-webapp/src/main/webapp/doc/rest/index.html
deleted file mode 100755
index 9147d5b0..00000000
--- a/wise-webapp/src/main/webapp/doc/rest/index.html
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-    WiseMapping REST API
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-
-
-
-
      
-
      
-
-
      
-    
      Welcome REST API Console
      
-    
      Use this console to learn how to use WiseMapping REST APIs. 
      
-    
      Important: Don't forget to configure your server host url in /WEB-INF/app.properties. By default it's configured to http://localhost:8080/wisemapping/
      
-    
      
-
      
-
-
      
-
      
-
-
-
-
diff --git a/wise-webapp/src/main/webapp/doc/rest/lib/backbone-min.js b/wise-webapp/src/main/webapp/doc/rest/lib/backbone-min.js
deleted file mode 100755
index c1c0d4ff..00000000
--- a/wise-webapp/src/main/webapp/doc/rest/lib/backbone-min.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Backbone.js 0.9.2
-
-// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Backbone may be freely distributed under the MIT license.
-// For all details and documentation:
-// http://backbonejs.org
-(function(){var l=this,y=l.Backbone,z=Array.prototype.slice,A=Array.prototype.splice,g;g="undefined"!==typeof exports?exports:l.Backbone={};g.VERSION="0.9.2";var f=l._;!f&&"undefined"!==typeof require&&(f=require("underscore"));var i=l.jQuery||l.Zepto||l.ender;g.setDomLibrary=function(a){i=a};g.noConflict=function(){l.Backbone=y;return this};g.emulateHTTP=!1;g.emulateJSON=!1;var p=/\s+/,k=g.Events={on:function(a,b,c){var d,e,f,g,j;if(!b)return this;a=a.split(p);for(d=this._callbacks||(this._callbacks=
-{});e=a.shift();)f=(j=d[e])?j.tail:{},f.next=g={},f.context=c,f.callback=b,d[e]={tail:g,next:j?j.next:f};return this},off:function(a,b,c){var d,e,h,g,j,q;if(e=this._callbacks){if(!a&&!b&&!c)return delete this._callbacks,this;for(a=a?a.split(p):f.keys(e);d=a.shift();)if(h=e[d],delete e[d],h&&(b||c))for(g=h.tail;(h=h.next)!==g;)if(j=h.callback,q=h.context,b&&j!==b||c&&q!==c)this.on(d,j,q);return this}},trigger:function(a){var b,c,d,e,f,g;if(!(d=this._callbacks))return this;f=d.all;a=a.split(p);for(g=
-z.call(arguments,1);b=a.shift();){if(c=d[b])for(e=c.tail;(c=c.next)!==e;)c.callback.apply(c.context||this,g);if(c=f){e=c.tail;for(b=[b].concat(g);(c=c.next)!==e;)c.callback.apply(c.context||this,b)}}return this}};k.bind=k.on;k.unbind=k.off;var o=g.Model=function(a,b){var c;a||(a={});b&&b.parse&&(a=this.parse(a));if(c=n(this,"defaults"))a=f.extend({},c,a);b&&b.collection&&(this.collection=b.collection);this.attributes={};this._escapedAttributes={};this.cid=f.uniqueId("c");this.changed={};this._silent=
-{};this._pending={};this.set(a,{silent:!0});this.changed={};this._silent={};this._pending={};this._previousAttributes=f.clone(this.attributes);this.initialize.apply(this,arguments)};f.extend(o.prototype,k,{changed:null,_silent:null,_pending:null,idAttribute:"id",initialize:function(){},toJSON:function(){return f.clone(this.attributes)},get:function(a){return this.attributes[a]},escape:function(a){var b;if(b=this._escapedAttributes[a])return b;b=this.get(a);return this._escapedAttributes[a]=f.escape(null==
-b?"":""+b)},has:function(a){return null!=this.get(a)},set:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c||(c={});if(!d)return this;d instanceof o&&(d=d.attributes);if(c.unset)for(e in d)d[e]=void 0;if(!this._validate(d,c))return!1;this.idAttribute in d&&(this.id=d[this.idAttribute]);var b=c.changes={},h=this.attributes,g=this._escapedAttributes,j=this._previousAttributes||{};for(e in d){a=d[e];if(!f.isEqual(h[e],a)||c.unset&&f.has(h,e))delete g[e],(c.silent?this._silent:
-b)[e]=!0;c.unset?delete h[e]:h[e]=a;!f.isEqual(j[e],a)||f.has(h,e)!=f.has(j,e)?(this.changed[e]=a,c.silent||(this._pending[e]=!0)):(delete this.changed[e],delete this._pending[e])}c.silent||this.change(c);return this},unset:function(a,b){(b||(b={})).unset=!0;return this.set(a,null,b)},clear:function(a){(a||(a={})).unset=!0;return this.set(f.clone(this.attributes),a)},fetch:function(a){var a=a?f.clone(a):{},b=this,c=a.success;a.success=function(d,e,f){if(!b.set(b.parse(d,f),a))return!1;c&&c(b,d)};
-a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},save:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c=c?f.clone(c):{};if(c.wait){if(!this._validate(d,c))return!1;e=f.clone(this.attributes)}a=f.extend({},c,{silent:!0});if(d&&!this.set(d,c.wait?a:c))return!1;var h=this,i=c.success;c.success=function(a,b,e){b=h.parse(a,e);if(c.wait){delete c.wait;b=f.extend(d||{},b)}if(!h.set(b,c))return false;i?i(h,a):h.trigger("sync",h,a,c)};c.error=g.wrapError(c.error,
-h,c);b=this.isNew()?"create":"update";b=(this.sync||g.sync).call(this,b,this,c);c.wait&&this.set(e,a);return b},destroy:function(a){var a=a?f.clone(a):{},b=this,c=a.success,d=function(){b.trigger("destroy",b,b.collection,a)};if(this.isNew())return d(),!1;a.success=function(e){a.wait&&d();c?c(b,e):b.trigger("sync",b,e,a)};a.error=g.wrapError(a.error,b,a);var e=(this.sync||g.sync).call(this,"delete",this,a);a.wait||d();return e},url:function(){var a=n(this,"urlRoot")||n(this.collection,"url")||t();
-return this.isNew()?a:a+("/"==a.charAt(a.length-1)?"":"/")+encodeURIComponent(this.id)},parse:function(a){return a},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return null==this.id},change:function(a){a||(a={});var b=this._changing;this._changing=!0;for(var c in this._silent)this._pending[c]=!0;var d=f.extend({},a.changes,this._silent);this._silent={};for(c in d)this.trigger("change:"+c,this,this.get(c),a);if(b)return this;for(;!f.isEmpty(this._pending);){this._pending=
-{};this.trigger("change",this,a);for(c in this.changed)!this._pending[c]&&!this._silent[c]&&delete this.changed[c];this._previousAttributes=f.clone(this.attributes)}this._changing=!1;return this},hasChanged:function(a){return!arguments.length?!f.isEmpty(this.changed):f.has(this.changed,a)},changedAttributes:function(a){if(!a)return this.hasChanged()?f.clone(this.changed):!1;var b,c=!1,d=this._previousAttributes,e;for(e in a)if(!f.isEqual(d[e],b=a[e]))(c||(c={}))[e]=b;return c},previous:function(a){return!arguments.length||
-!this._previousAttributes?null:this._previousAttributes[a]},previousAttributes:function(){return f.clone(this._previousAttributes)},isValid:function(){return!this.validate(this.attributes)},_validate:function(a,b){if(b.silent||!this.validate)return!0;var a=f.extend({},this.attributes,a),c=this.validate(a,b);if(!c)return!0;b&&b.error?b.error(this,c,b):this.trigger("error",this,c,b);return!1}});var r=g.Collection=function(a,b){b||(b={});b.model&&(this.model=b.model);b.comparator&&(this.comparator=b.comparator);
-this._reset();this.initialize.apply(this,arguments);a&&this.reset(a,{silent:!0,parse:b.parse})};f.extend(r.prototype,k,{model:o,initialize:function(){},toJSON:function(a){return this.map(function(b){return b.toJSON(a)})},add:function(a,b){var c,d,e,g,i,j={},k={},l=[];b||(b={});a=f.isArray(a)?a.slice():[a];c=0;for(d=a.length;c=b))this.iframe=i('