Merge remote-tracking branch 'origin/feature/remove_mootols' into feature/remove_mootols

Conflicts:
	mindplot/src/main/javascript/widget/LinkEditor.js

mindplot/src/main/javascript/widget/LinkEditor.js

@@ -28,19 +28,23 @@ mindplot.widget.LinkEditor = new Class({
 
     _buildPanel:function (model) {
         var result = $('<div></div>').css("padding-top", "5px");
-        var form = $('<form></form>').attr('action','none').attr('id','linkFormId');
+        var form = $('<form></form>').attr({
+            'action':'none',
+            'id':'linkFormId'
+        });
         var text = $('<p></p>').text("Paste your url here:");
         text.css('margin','0px 0px 10px');
 
         form.append(text);
 
         // Add Input
-        var input = $('<input>').attr(
-            'placeholder','http://www.example.com/').attr(
-            'type','url').attr( //FIXME: THIS not work on IE, see workaround below
-            'required','true').attr(
-            'autofocus','autofocus'
-            );
+
+        var input = $('<input>').attr({
+            'placeholder':'http://www.example.com/',
+            'type':'url', //FIXME: THIS not work on IE, see workaround below
+            'required':'true',
+            'autofocus':'autofocus'
+        });
         input.css('width','70%').css('margin','0px 20px');
 
         if (model.getValue() != null){
@@ -48,9 +52,10 @@ mindplot.widget.LinkEditor = new Class({
 //            type:Browser.ie ? 'text' : 'url', // IE workaround
 
         // Open Button
-        var open = $('<input/>').attr(
-                'type','button').attr(
-                'value',$msg('OPEN_LINK'));
+        var open = $('<input/>').attr({
+                'type':'button',
+                'value':$msg('OPEN_LINK')
+        });
 
         open.click(function(){
             alert('clicked!');

mindplot/src/main/javascript/widget/NoteEditor.js

@@ -62,20 +62,27 @@ mindplot.widget.NoteEditor = new Class({
 //            }
 //        });
 //        this.setContent(panel);
-        this.appendToContent(panel);
+        this.setContent(panel);
     },
 
     _buildPanel:function (model) {
         var result = $('<div></div>').css("padding-top", "5px");
-        var form = $('<form></form>').attr('action','none').attr('id','noteFormId');
+        var form = $('<form></form>').attr({
+            'action':'none',
+            'id':'noteFormId'
+        });
 
         // Add textarea
-
-        var textArea = $('<textarea></textarea>').attr(
-                'placeholder',$msg('WRITE_YOUR_TEXT_HERE')).attr(
-                'required','true').attr(
-                'autofocus','autofocus');
-        textArea.css( 'width','100%').css('height',80).css('resize','none');
+        var textArea = $('<textarea></textarea>').attr({
+                'placeholder':$msg('WRITE_YOUR_TEXT_HERE'),
+                'required':'true',
+                'autofocus':'autofocus'
+        });
+        textArea.css({
+            'width':'100%',
+            'height':80,
+            'resize':'none'
+        });
         form.append(textArea);
 
 //        var textArea = new Element('textarea',
@@ -114,8 +121,10 @@ mindplot.widget.NoteEditor = new Class({
 
         // Add buttons ...
         var buttonContainer = $('<div></div>');
-        buttonContainer.css('paddingTop','5').css('textAlign','center');
-//        var buttonContainer = new Element('div').setStyles({paddingTop:5, textAlign:'right'});
+        buttonContainer.css({
+            'paddingTop':'5',
+            'textAlign':'center'
+        });
 
         // Create accept button ...
         var okButton = $('<input>');
@@ -147,7 +156,13 @@ mindplot.widget.NoteEditor = new Class({
               'value',$msg('CANCEL')).attr(
               'class','btn-secondary');
         cancelButton.css('margin','5px');
-        cancelButton.click(function () {this.close();});
+//        cancelButton.on('click','input', function (e) {
+//            console.log('this is the click');
+//            e.preventDefault();
+//        });
+        $(document).on('click', "input.btn-secondary", function () {
+            $(modal-dialog).hide();
+        });
         buttonContainer.append(cancelButton);
 
         form.append(buttonContainer);

wise-editor/src/main/webapp/bootstrap/css/bootstrap.css

@@ -5187,8 +5187,8 @@ button.close {
 }
 @media (min-width: 768px) {
   .modal-dialog {
-    width: 450px;
-    margin: 200px auto;
+    width: 600px;
+    margin: 30px auto;
   }
   .modal-content {
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);

wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css

@@ -5187,8 +5187,8 @@ button.close {
 }
 @media (min-width: 768px) {
   .modal-dialog {
-    width: 450px;
-    margin: 200px auto;
+    width: 600px;
+    margin: 30px auto;
   }
   .modal-content {
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);