git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "02ae5285"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "649a5c01"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I870ad468fba026cc5abf3c5699ed1e12ff28b32b
diff --git a/mailcow/src/mailcow-dockerized/data/web/js/build/014-mailcow.js b/mailcow/src/mailcow-dockerized/data/web/js/build/014-mailcow.js
index 7f78c7f..90d8350 100644
--- a/mailcow/src/mailcow-dockerized/data/web/js/build/014-mailcow.js
+++ b/mailcow/src/mailcow-dockerized/data/web/js/build/014-mailcow.js
@@ -93,10 +93,20 @@
}).remove();
// selectpicker
- $('select').selectpicker();
+ $('select').selectpicker({
+ 'styleBase': 'btn btn-xs-lg',
+ 'noneSelectedText': lang_footer.nothing_selected
+ });
- // haveibeenpwned?
- $('[data-hibp]').after('<p class="small haveibeenpwned">↪ Check against haveibeenpwned.com</p><span class="hibp-out"></span>');
+ // haveibeenpwned and passwd policy
+ $.ajax({
+ url: '/api/v1/get/passwordpolicy/html',
+ type: 'GET',
+ success: function(res) {
+ $(".hibp-out").after(res);
+ }
+ });
+ $('[data-hibp]').after('<p class="small haveibeenpwned"><i class="bi bi-shield-fill-exclamation"></i> ' + lang_footer.hibp_check + '</p><span class="hibp-out"></span>');
$('[data-hibp]').on('input', function() {
out_field = $(this).next('.haveibeenpwned').next('.hibp-out').text('').attr('class', 'hibp-out');
});
@@ -188,7 +198,9 @@
} else if ($(this).hasClass('btn')) {
$(this).attr("disabled", true);
} else if ($(this).attr('data-provide') == 'slider') {
- $(this).slider("disable");
+ $(this).attr('disabled', true);
+ } else if ($(this).is(':checkbox')) {
+ $(this).attr("disabled", true);
}
$(this).data("toggle", "tooltip");
$(this).attr("title", lang_acl.prohibited);
@@ -214,7 +226,7 @@
$('#containerName').text(container);
$('#triggerRestartContainer').click(function(){
$(this).prop("disabled",true);
- $(this).html('<span class="glyphicon glyphicon-refresh glyphicon-spin"></span> ');
+ $(this).html('<i class="bi bi-arrow-repeat icon-spin"></i> ');
$('#statusTriggerRestartContainer').html(lang_footer.restarting_container);
$.ajax({
method: 'get',
@@ -229,15 +241,36 @@
$('#statusTriggerRestartContainer').append(data);
var htmlResponse = $.parseHTML(data)
if ($(htmlResponse).find('span').hasClass('text-success')) {
- $('#triggerRestartContainer').html('<span class="glyphicon glyphicon-ok"></span> ');
+ $('#triggerRestartContainer').html('<i class="bi bi-check-lg"></i> ');
setTimeout(function(){
- $('#RestartContainer').modal('toggle');
+ $('#RestartContainer').modal('toggle');
window.location = window.location.href.split("#")[0];
}, 1200);
} else {
- $('#triggerRestartContainer').html('<span class="glyphicon glyphicon-remove"></span> ');
+ $('#triggerRestartContainer').html('<i class="bi bi-slash-lg"></i> ');
}
})
});
})
+
+ // responsive tabs
+ $('.responsive-tabs').tabCollapse({
+ tabsClass: 'hidden-xs',
+ accordionClass: 'js-tabcollapse-panel-group visible-xs'
+ });
+ $(document).on("shown.bs.collapse shown.bs.tab", function (e) {
+ var target = $(e.target);
+ if($(window).width() <= 767) {
+ var offset = target.offset().top - 112;
+ $("html, body").stop().animate({
+ scrollTop: offset
+ }, 100);
+ }
+ if(target.hasClass('panel-collapse')){
+ var id = e.target.id.replace(/-collapse$/g, '');
+ if(id){
+ localStorage.setItem('lastTag', '#'+id);
+ }
+ }
+ });
});