Skip to content

Update to Bootstrap 4 #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
keshav234156 wants to merge 2 commits into from
Closed

Update to Bootstrap 4 #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79262d3
update bootstrap
keshav234156 Jul 13, 2020
7acf0d7
fix test
keshav234156 Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,30 @@ module.exports = function(grunt) {
}
},

jasmine: {
publiclabeditor: {
src: 'dist/*.js',
options: {
specs: 'spec/javascripts/*spec.js',
vendor: [
'node_modules/jquery/dist/jquery.min.js',
'node_modules/bootstrap/dist/js/bootstrap.min.js',
'node_modules/blueimp-file-upload/js/vendor/jquery.ui.widget.js',
'node_modules/blueimp-file-upload/js/jquery.iframe-transport.js',
'node_modules/blueimp-file-upload/js/jquery.fileupload.js',
'node_modules/typeahead.js/dist/typeahead.jquery.js',
'node_modules/typeahead.js/dist/bloodhound.js',
'node_modules/bootstrap-tokenfield/dist/bootstrap-tokenfield.js',
'node_modules/jasmine-jquery/lib/jasmine-jquery.js',
'node_modules/jasmine-ajax/lib/mock-ajax.js',
'https://maps.googleapis.com/maps/api/js?libraries=places&language=en&key=AIzaSyDWgc7p4WWFsO3y0MTe50vF4l4NUPcPuwE',
'node_modules/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js',
'node_modules/leaflet/dist/leaflet.js'
]
jasmine: {
publiclabeditor: {
src: 'dist/*.js',
options: {
specs: 'spec/javascripts/*spec.js',
vendor: [
'node_modules/jquery/dist/jquery.min.js',
'node_modules/popper.js/dist/umd/popper.min.js',
'node_modules/bootstrap/dist/js/bootstrap.min.js',
'node_modules/blueimp-file-upload/js/vendor/jquery.ui.widget.js',
'node_modules/blueimp-file-upload/js/jquery.iframe-transport.js',
'node_modules/blueimp-file-upload/js/jquery.fileupload.js',
'node_modules/typeahead.js/dist/typeahead.jquery.js',
'node_modules/typeahead.js/dist/bloodhound.js',
'node_modules/bootstrap-tokenfield/dist/bootstrap-tokenfield.js',
'node_modules/jasmine-jquery/lib/jasmine-jquery.js',
'node_modules/jasmine-ajax/lib/mock-ajax.js',
'https://maps.googleapis.com/maps/api/js?libraries=places&language=en&key=AIzaSyDWgc7p4WWFsO3y0MTe50vF4l4NUPcPuwE',
'node_modules/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js',
'node_modules/leaflet/dist/leaflet.js'
]
}
}
}
}
}

});

Expand Down
26 changes: 13 additions & 13 deletions dist/PublicLab.Editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21946,12 +21946,13 @@ module.exports = PublicLab.History = Class.extend({
// before a day's log entries:
if (i === 0 || (i > 0 && log.formattedDate != _history.log[i - 1].formattedDate)) {
dateClasses.push(log.dateClass);
html += '<p class="day day-' + log.dateClass + '"><em>' + log.formattedDate + '</em> | <a class="count"></a> | <a class="btn btn-xs btn-default clear">clear</a></p>';
html += '<p class="day day-' + log.dateClass + '"><em>' + log.formattedDate + '</em> | <a class="count"></a> | <a class="btn btn-xs btn-outline-secondary clear">clear</a></p>';

}

html += '<p style="display:none;" class="log day-' + log.dateClass + ' ' + className + '">';
html += '<b>' + i + '</b>: ';
html += '<a class="btn btn-xs btn-default revert">revert</a> <a class="btn btn-xs btn-default clear">clear</a> | Preview: ';
html += '<a class="btn btn-xs btn-outline-secondary revert">revert</a> <a class="btn btn-xs btn-outline-secondary clear">clear</a> | Preview: ';
html += time;
html += ' -- <i class="preview">' + log.text.substr(0, 30) + '...</i>';
html += '</p>';
Expand Down Expand Up @@ -22388,7 +22389,7 @@ module.exports = function(textarea, _editor, _module) {
require("../modules/PublicLab.RichTextModule.Embed.js")(_module, wysiwyg);

wysiwyg.stylePrompt = function() {
$(".wk-prompt button, span.wk-prompt-browse").addClass("btn btn-default");
$(".wk-prompt button, span.wk-prompt-browse").addClass("btn btn-outline-secondary");
$(".wk-prompt input")
.addClass("input form-control")
.css("margin-bottom", "5px");
Expand All @@ -22404,7 +22405,7 @@ module.exports = function(textarea, _editor, _module) {
);
$(".wk-commands, .wk-switchboard").addClass("btn-group");
$(".wk-commands button, .wk-switchboard button").addClass(
"btn btn-default"
"btn btn-light"
);

$(".wk-commands button.woofmark-command-quote").addClass("hidden-xs");
Expand Down Expand Up @@ -22883,9 +22884,8 @@ module.exports = function initAutoCenter(_module, wysiwyg) {
// $('.woofmark-mode-markdown').removeClass('disabled')

// create a menu option for auto center:
$('.wk-commands').append('<a class="woofmark-command-autocenter btn btn-default" data-toggle="autocenter" title="<center> In Rich mode, insert spaces for images."><i class="fa fa-align-center"></i></a>');
// since chunk.selection returns null for images

$('.wk-commands').append('<button class="woofmark-command-autocenter btn btn-default" data-toggle="autocenter" title="<center> In Rich mode, insert spaces for images."><i class="fa fa-align-center"></i></button>');
//since chunk.selection returns null for images
$(document).ready(function() {
$('[data-toggle="autocenter"]').tooltip();
});
Expand Down Expand Up @@ -22914,10 +22914,10 @@ module.exports = function initAutoCenter(_module, wysiwyg) {

module.exports = function initEmbed(_module, wysiwyg) {
// create a menu option for embeds:
$('.wk-commands').append('<a class="woofmark-command-embed btn btn-default" data-toggle="youtube" title="Youtube link <iframe>"><i class="fa fa-youtube"></i></a>');

$(document).ready(function() {
$('[data-toggle="youtube"]').tooltip();
$('.wk-commands').append('<button class="woofmark-command-embed btn btn-default" data-toggle="youtube" title="Youtube link <iframe>"><i class="fa fa-youtube"></i></button>');
$(document).ready(function(){
$('[data-toggle="youtube"]').tooltip();
});

$('.wk-commands .woofmark-command-embed').click(function() {
Expand Down Expand Up @@ -22945,7 +22945,7 @@ module.exports = function initEmbed(_module, wysiwyg) {

module.exports = function initHorizontalRule(_module, wysiwyg) {
// create a menu option for horizontal rules:
$('.wk-commands').append('<a class="woofmark-command-horizontal-rule btn btn-default" data-toggle="horizontal" title="Horizontal line <hr>"><i class="fa fa-ellipsis-h"></i></a>');
$('.wk-commands').append('<button class="woofmark-command-horizontal-rule btn btn-default" data-toggle="horizontal" title="Horizontal line <hr>"><i class="fa fa-ellipsis-h"></i></button>');

$(document).ready(function() {
$('[data-toggle="horizontal"]').tooltip();
Expand Down Expand Up @@ -23005,7 +23005,7 @@ module.exports = function initTables(_module, wysiwyg) {


// create a submenu for sizing tables
$('.wk-commands').append('<a class="woofmark-command-table btn btn-default" data-toggle="table" title="Table <table>"><i class="fa fa-table"></i></a>');
$('.wk-commands').append('<button class="woofmark-command-table btn btn-default" data-toggle="table" title="Table <table>"><i class="fa fa-table"></i></button>');

$(document).ready(function() {
$('[data-toggle="table"]').tooltip();
Expand Down
34 changes: 24 additions & 10 deletions examples/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
rel="stylesheet"
/>
<script src="../node_modules/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js"></script>

<link
href="../node_modules/bootstrap/dist/css/bootstrap.min.css"
rel="stylesheet"
Expand All @@ -39,8 +38,8 @@
/>

<link href="../dist/PublicLab.Editor.css" rel="stylesheet" />

<script src="../node_modules/jquery/dist/jquery.min.js"></script>
<script src="../node_modules/popper.js/dist/umd/popper.min.js" type="text/javascript"></script>
<script src="../node_modules/bootstrap/dist/js/bootstrap.min.js"></script>

<!-- required for TagsModule -->
Expand Down Expand Up @@ -72,6 +71,8 @@ <h1>Share</h1>

<!-- selector module -->
<div class="container ple-type">
<div class="row">
<div class="col-md-5 col-md-push-4"></div>
<div class="col-md-5 col-md-push-4">
<div class="row">
<div class="col-xs-10">
Expand All @@ -93,6 +94,7 @@ <h1>Share</h1>
</div>
</div>
</div>
</div>
</div>
<!-- end selector module -->
<p>
Expand All @@ -107,6 +109,7 @@ <h1>Share</h1>
<div class="ple-content">
<!-- title module -->
<div class="ple-module-title ple-module container">
<div class="row">
<div class="ple-module-guide col-md-3"><h2>1</h2></div>

<div class="ple-module-content col-md-9">
Expand All @@ -116,11 +119,13 @@ <h1>Share</h1>
placeholder="Title"
/>
</div>
</div>
</div>
<!-- end title module -->

<!-- main_image module -->
<div class="ple-module-main_image ple-module container">
<div class="row">
<div class="ple-module-guide col-md-3"><h2>2</h2></div>

<div class="ple-module-content col-md-9 container">
Expand Down Expand Up @@ -152,15 +157,17 @@ <h1>Share</h1>
</p>
</div>
</div>
</div>
</div>
<!-- end main_image module -->

<!-- Map Module start -->
<div class="ple-module-map ple-module container">
<div class="row">
<div class="ple-module-guide col-md-3"><h2>3</h2></div>

<div class="ple-module-content col-md-9">
<button id="location_button" class="btn btn-lg btn-default">
<button id="location_button" class="btn btn-lg btn-outline-secondary">
<i class="fa fa-map-marker" aria-hidden="true"></i> Add a location
</button>
<p class="ple-help">
Expand Down Expand Up @@ -212,7 +219,7 @@ <h4><b>By entering co-ordinates :</b></h4>
</div>
</div>
<br>
<p><button class="btn btn-lg btn-default" onclick="locateUserHandler()">
<p><button class="btn btn-lg btn-outline-secondary" onclick="locateUserHandler()">
<div id="ldi-geocode-button">
<i class="fa fa-compass"></i> Use current location
</div>
Expand All @@ -228,11 +235,13 @@ <h4><b>By entering co-ordinates :</b></h4>
</div>
</div>
</div>
</div>
</div>
<!-- Map Module end -->

<!-- body module -->
<div class="ple-module-body ple-module container">
<div class="row">
<div class="ple-module-guide col-md-3"><h2>4</h2></div>

<div class="ple-module-content col-md-9 container">
Expand Down Expand Up @@ -262,11 +271,13 @@ <h4><b>By entering co-ordinates :</b></h4>
````</textarea
>
</div>
</div>
</div>
<!-- end body module -->

<!-- tags module -->
<div class="ple-module-tags ple-module container">
<div class="row">
<div class="ple-module-guide col-md-3"><h2>5</h2></div>

<div class="ple-module-content col-md-9">
Expand All @@ -276,35 +287,38 @@ <h4><b>By entering co-ordinates :</b></h4>
placeholder="balloon-mapping, water-quality..."
/>
</div>
</div>
</div>
<!-- end tags module -->

<!-- multi module -->
<div class="ple-module-multi ple-module container">
<div class="row">
<div class="ple-module-guide col-md-3"><p>Extras</p></div>

<div class="ple-module-content col-md-9">
<div class="btn-group">
<a class="btn btn-lg btn-default">
<a class="btn btn-lg btn-outline-secondary">
<i class="fa fa-comment-o"></i> Invite responses
<i class="fa fa-caret-down"></i>
</a>
<a class="btn btn-lg btn-default">
<a class="btn btn-lg btn-outline-secondary">
<i class="fa fa-envelope-o"></i> Event
<i class="fa fa-caret-down"></i>
</a>
<a class="btn btn-lg btn-default">
<a class="btn btn-lg btn-outline-secondary">
<i class="fa fa-map-o"></i> Map
</a>
<a class="btn btn-lg btn-default">
<a class="btn btn-lg btn-outline-secondary">
<i class="fa fa-line-chart"></i> Chart
</a>
<a class="btn btn-lg btn-default">
<a class="btn btn-lg btn-outline-secondary">
More <i class="fa fa-caret-down"></i>
</a>
</div>
</div>
</div>
</div>
<!-- end multi module -->
</div>
<div class="bug-btn-wrapper">
Expand All @@ -323,7 +337,7 @@ <h4><b>By entering co-ordinates :</b></h4>
-->
</div>

<button class="btn btn-lg btn-default btn-more">...</button>
<button class="btn btn-lg btn-outline-secondary btn-more">...</button>

<span>
&nbsp; By publishing, you agree to
Expand Down
Loading