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

Conflicts:
	mindplot/src/main/javascript/widget/LinkEditor.js
This commit is contained in:
Ezequiel Bergamaschi 2014-04-03 22:42:21 -03:00
commit 5803d46fa6
6 changed files with 47 additions and 27 deletions

View File

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

View File

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

View File

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

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long