paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Minor fixes, some style adjustments

master
andryyy 2019-12-23 14:46:57 +01:00
parent b63cad1dd5
commit f2ae0db9a2
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/web/inc/functions.mailbox.inc.php
View File

@ -614,7 +614,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
'msg' => 'alias_invalid' 'msg' => array('alias_invalid', $address)
); );
continue; continue;
} }
@ -1713,7 +1713,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
'msg' => 'alias_invalid' 'msg' => array('alias_invalid', $address)
); );
continue; continue;
} }
@ -1733,7 +1733,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
'msg' => 'alias_invalid' 'msg' => array('alias_invalid', $address)
); );
continue; continue;
} }

7
data/web/js/build/014-mailcow.js
View File

@ -56,6 +56,13 @@ $(document).ready(function() {
'use strict'; 'use strict';
if ($('a[data-toggle="tab"]').length) { if ($('a[data-toggle="tab"]').length) {
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
$("ul.nav-tabs li a").parent().find("a").each(function(){
var t = $(this).text();
t = t.replace(/^⤏ /, '');
$(this).text(t);
});
$(this).prepend("⤏ ");
if ($(this).data('dont-remember') == 1) { if ($(this).data('dont-remember') == 1) {
return true; return true;
} }

5
data/web/js/site/admin.js
View File

@ -62,11 +62,6 @@ jQuery(function($){
draw_table = $(this).data('draw'); draw_table = $(this).data('draw');
eval(draw_table + '()'); eval(draw_table + '()');
}); });
if (localStorage.getItem("current_page") === null) {
var current_page = {};
} else {
var current_page = JSON.parse(localStorage.getItem('current_page'));
}
function table_admin_ready(ft, name) { function table_admin_ready(ft, name) {
heading = ft.$el.parents('.panel').find('.panel-heading') heading = ft.$el.parents('.panel').find('.panel-heading')
var ft_paging = ft.use(FooTable.Paging) var ft_paging = ft.use(FooTable.Paging)