Skip to content

Commit

Permalink
Merge branch 'master-ci' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed May 9, 2022
2 parents 0b93d9a + 7c50847 commit 45200ee
Show file tree
Hide file tree
Showing 12 changed files with 973 additions and 773 deletions.
4 changes: 2 additions & 2 deletions bb_dashboard/templates/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ <h4 class="card-title">Unit List</h4>
<!-- Specific Page JS goes HERE -->
{% block javascripts %}

<script>
<script> nonce = "{{request.csp_nonce}}"
window.onload = function () {
$(document).ready(function () {
// Javascript method's body can be found in assets/js/demos.js
Expand All @@ -317,4 +317,4 @@ <h4 class="card-title">Unit List</h4>

</script>

{% endblock javascripts %}
{% endblock javascripts %}
170 changes: 84 additions & 86 deletions bb_dashboard/templates/includes/scripts-sidebar.html
View file
Original file line number Diff line number Diff line change
@@ -1,113 +1,111 @@
<script> nonce = "{{request.csp_nonce}}"
$(document).ready(function () {
$().ready(function () {
$sidebar = $('.sidebar');
$navbar = $('.navbar');
$main_panel = $('.main-panel');

<script>
$(document).ready(function() {
$().ready(function() {
$sidebar = $('.sidebar');
$navbar = $('.navbar');
$main_panel = $('.main-panel');
$full_page = $('.full-page');

$full_page = $('.full-page');
$sidebar_responsive = $('body > .navbar-collapse');
sidebar_mini_active = true;
white_color = false;

$sidebar_responsive = $('body > .navbar-collapse');
sidebar_mini_active = true;
white_color = false;
window_width = $(window).width();

window_width = $(window).width();
fixed_plugin_open = $('.sidebar .sidebar-wrapper .nav li.active a p').html();

fixed_plugin_open = $('.sidebar .sidebar-wrapper .nav li.active a p').html();


$('.fixed-plugin a').click(function (event) {
if ($(this).hasClass('switch-trigger')) {
if (event.stopPropagation) {
event.stopPropagation();
} else if (window.event) {
window.event.cancelBubble = true;
}
}
});

$('.fixed-plugin a').click(function(event) {
if ($(this).hasClass('switch-trigger')) {
if (event.stopPropagation) {
event.stopPropagation();
} else if (window.event) {
window.event.cancelBubble = true;
}
}
});
$('.fixed-plugin .background-color span').click(function () {
$(this).siblings().removeClass('active');
$(this).addClass('active');

$('.fixed-plugin .background-color span').click(function() {
$(this).siblings().removeClass('active');
$(this).addClass('active');
var new_color = $(this).data('color');

var new_color = $(this).data('color');
if ($sidebar.length != 0) {
$sidebar.attr('data', new_color);
}

if ($sidebar.length != 0) {
$sidebar.attr('data', new_color);
}
if ($main_panel.length != 0) {
$main_panel.attr('data', new_color);
}

if ($main_panel.length != 0) {
$main_panel.attr('data', new_color);
}
if ($full_page.length != 0) {
$full_page.attr('filter-color', new_color);
}

if ($full_page.length != 0) {
$full_page.attr('filter-color', new_color);
}
if ($sidebar_responsive.length != 0) {
$sidebar_responsive.attr('data', new_color);
}
});

if ($sidebar_responsive.length != 0) {
$sidebar_responsive.attr('data', new_color);
}
});
$('.switch-sidebar-mini input').on("switchChange.bootstrapSwitch", function () {
var $btn = $(this);

$('.switch-sidebar-mini input').on("switchChange.bootstrapSwitch", function() {
var $btn = $(this);
if (sidebar_mini_active == true) {
$('body').removeClass('sidebar-mini');
sidebar_mini_active = false;
blackDashboard.showSidebarMessage('Sidebar mini deactivated...');
} else {
$('body').addClass('sidebar-mini');
sidebar_mini_active = true;
blackDashboard.showSidebarMessage('Sidebar mini activated...');
}

if (sidebar_mini_active == true) {
$('body').removeClass('sidebar-mini');
sidebar_mini_active = false;
blackDashboard.showSidebarMessage('Sidebar mini deactivated...');
} else {
$('body').addClass('sidebar-mini');
sidebar_mini_active = true;
blackDashboard.showSidebarMessage('Sidebar mini activated...');
}

// we simulate the window Resize so the charts will get updated in realtime.
var simulateWindowResize = setInterval(function() {
window.dispatchEvent(new Event('resize'));
}, 180);

// we stop the simulation of Window Resize after the animations are completed
setTimeout(function() {
clearInterval(simulateWindowResize);
}, 1000);
});
// we simulate the window Resize so the charts will get updated in realtime.
var simulateWindowResize = setInterval(function () {
window.dispatchEvent(new Event('resize'));
}, 180);

$('.switch-change-color input').on("switchChange.bootstrapSwitch", function() {
var $btn = $(this);
// we stop the simulation of Window Resize after the animations are completed
setTimeout(function () {
clearInterval(simulateWindowResize);
}, 1000);
});

if (white_color == true) {
$('.switch-change-color input').on("switchChange.bootstrapSwitch", function () {
var $btn = $(this);

$('body').addClass('change-background');
setTimeout(function() {
$('body').removeClass('change-background');
$('body').removeClass('white-content');
}, 900);
white_color = false;
} else {
if (white_color == true) {

$('body').addClass('change-background');
setTimeout(function() {
$('body').removeClass('change-background');
$('body').addClass('white-content');
}, 900);
$('body').addClass('change-background');
setTimeout(function () {
$('body').removeClass('change-background');
$('body').removeClass('white-content');
}, 900);
white_color = false;
} else {

white_color = true;
}
$('body').addClass('change-background');
setTimeout(function () {
$('body').removeClass('change-background');
$('body').addClass('white-content');
}, 900);

white_color = true;
}

});

$('.light-badge').click(function() {
$('body').addClass('white-content');
});
});

$('.light-badge').click(function () {
$('body').addClass('white-content');
});

$('.dark-badge').click(function() {
$('body').removeClass('white-content');
$('.dark-badge').click(function () {
$('body').removeClass('white-content');
});
});
});
});
</script>

</script>
6 changes: 3 additions & 3 deletions bb_dashboard/templates/includes/scripts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
<script src="{% static 'js/colo/onboarding.js' %}"></script>

<!-- ----------------------------- Billing JS ------------------------------ -->
<script src="{% static 'js/billing/method.js' %}"></script>
<script src="{% static 'js/billing/manual_payment.js' %}"></script>
<script nonce="{{request.csp_nonce}}" src="{% static 'js/billing/method.js' %}"></script>
<script nonce="{{request.csp_nonce}}" src="{% static 'js/billing/manual_payment.js' %}"></script>

<!-- ----------------------------- Profile JS ------------------------------ -->
<script src="{% static 'js/profile/ssh-key.js' %}"></script>

<script>
<script> nonce = "{{request.csp_nonce}}"
// Set your publishable key: remember to change this to your live publishable key in production
// See your keys here: https://dashboard.stripe.com/apikeys
const stripe = Stripe('{{ stripe_pk }}');
Expand Down
6 changes: 3 additions & 3 deletions bb_dashboard/templates/layouts/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<link href="{% static 'css/tellme.css' %}" rel="stylesheet">


<script src=" {% static 'js/csrf.js' %}"></script>
<script nonce="{{request.csp_nonce}}" src=" {% static 'js/csrf.js' %}"></script>

<script src="https://accounts.google.com/gsi/client" async defer></script>
<script src="https://js.stripe.com/v3/"></script>
<script nonce="{{request.csp_nonce}}" src="https://accounts.google.com/gsi/client" async defer></script>
<script nonce="{{request.csp_nonce}}" src="https://js.stripe.com/v3/"></script>

<link href="{% static 'css/spinner.css' %}" rel="stylesheet" />

Expand Down
2 changes: 1 addition & 1 deletion bb_public/static/css/ai/main.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url("fontawesome-all.min.css");
/* @import url("fontawesome-all.min.css"); */
@import url("https://fonts.googleapis.com/css?family=Roboto:100,300,100italic,300italic");

/*
Expand Down
Loading

0 comments on commit 45200ee

Please sign in to comment.