Skip to content
GitLab
Commit 56805b52 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'display_perms_on_mail_user_list' into 'master' 

Display perms on mail user list

It's useful when you need to disable some accounts, or you need to look for disabled accounts
parents d57ffdc6 94dfb178
Hide whitespace changes
Inline Side-by-side
interface/web/mail/lib/lang/en_mail_user_list.lng
View file @ 56805b52
......@@ -5,4 +5,8 @@ $wb["autoresponder_txt"] = 'Autoresponder';
$wb["add_new_record_txt"] = 'Add new Mailbox';
$wb["name_txt"] = 'Realname';
$wb["login_txt"] = 'Login';
$wb["postfix_txt"] = 'Receiving';
$wb["disablesmtp_txt"] = 'SMTP (sending)';
$wb["disableimap_txt"] = 'IMAP';
$wb["disablepop3_txt"] = 'POP3';
?>
\ No newline at end of file
interface/web/mail/lib/lang/es_mail_user_list.lng
View file @ 56805b52
......@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
$wb['add_new_record_txt'] = 'Añadir nuevo buzón';
$wb['name_txt'] = 'Nombre';
$wb['login_txt'] = 'Iniciar sesión';
$wb['postfix_txt'] = 'Recepción';
$wb['disablesmtp_txt'] = 'SMTP (envío)';
$wb['disableimap_txt'] = 'IMAP';
$wb['disablepop3_txt'] = 'POP3';
?>
interface/web/mail/list/mail_user.list.php
View file @ 56805b52
......@@ -89,4 +89,40 @@ $liste["item"][] = array( 'field' => "autoresponder",
'width' => "",
'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
$liste["item"][] = array( 'field' => "postfix",
'datatype' => "VARCHAR",
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
'suffix' => "",
'width' => "",
'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
$liste["item"][] = array( 'field' => "disablesmtp",
'datatype' => "VARCHAR",
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
'suffix' => "",
'width' => "",
'value' => array('n' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'y' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
$liste["item"][] = array( 'field' => "disableimap",
'datatype' => "VARCHAR",
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
'suffix' => "",
'width' => "",
'value' => array('n' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'y' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
$liste["item"][] = array( 'field' => "disablepop3",
'datatype' => "VARCHAR",
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
'suffix' => "",
'width' => "",
'value' => array('n' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'y' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
?>
interface/web/mail/templates/mail_user_list.htm
View file @ 56805b52
......@@ -38,6 +38,10 @@
<tmpl_if name="enable_custom_login"><th class="tbl_col_login" scope="col"><tmpl_var name="login_txt"></th></tmpl_if>
<th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
<th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
<th class="tbl_col_postfix" scope="col"><tmpl_var name="postfix_txt"></th>
<th class="tbl_col_disablesmtp" scope="col"><tmpl_var name="disablesmtp_txt"></th>
<th class="tbl_col_disableimap" scope="col"><tmpl_var name="disableimap_txt"></th>
<th class="tbl_col_disablepop3" scope="col"><tmpl_var name="disablepop3_txt"></th>
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
<tr class="filter">
......@@ -45,6 +49,10 @@
<tmpl_if name="enable_custom_login"><td class="tbl_col_login"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
<td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
<td class="tbl_col_autoresponder"><select name="search_autoresponder">{tmpl_var name='search_autoresponder'}</select></td>
<td class="tbl_col_postfix"><select name="search_postfix">{tmpl_var name='search_postfix'}</select></th>
<td class="tbl_col_disablesmtp"><select name="search_disablesmtp">{tmpl_var name='search_disablesmtp'}</select></th>
<td class="tbl_col_disableimap"><select name="search_disableimap">{tmpl_var name='search_disableimap'}</select></th>
<td class="tbl_col_disablepop3"><select name="search_disablepop3">{tmpl_var name='search_disablepop3'}</select></th>
<td class="tbl_col_buttons">
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
</td>
......@@ -61,6 +69,10 @@
</tmpl_if>
<td class="tbl_col_name"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
<td class="tbl_col_autoresponder"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
<td class="tbl_col_postfix"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="postfix"}</a></td>
<td class="tbl_col_disablesmtp"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="disablesmtp"}</a></td>
<td class="tbl_col_disableimap"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="disableimap"}</a></td>
<td class="tbl_col_disablepop3"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="disablepop3"}</a></td>
<td class="tbl_col_buttons">
<tmpl_if name="mailboxlist_webmail_link">
<a class="button icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name="webmail_txt"}</span></a>
......@@ -71,13 +83,13 @@
</tmpl_loop>
<tmpl_unless name="records">
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
<td colspan="<tmpl_if name="enable_custom_login">5<tmpl_else>4</tmpl_if>">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
<td colspan="<tmpl_if name="enable_custom_login">9<tmpl_else>8</tmpl_if>">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
</tr>
</tmpl_unless>
</tbody>
<tfoot>
<tr>
<td class="tbl_footer tbl_paging" colspan="<tmpl_if name="enable_custom_login">5<tmpl_else>4</tmpl_if>"><tmpl_var name="paging"></td>
<td class="tbl_footer tbl_paging" colspan="<tmpl_if name="enable_custom_login">9<tmpl_else>8</tmpl_if>"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
......
interface/web/themes/blue/css/styles.css
View file @ 56805b52
......@@ -373,7 +373,15 @@ table.list td[class$="_pid"],
table.list th[class$="_active"],
table.list td[class$="_active"],
table.list th.tbl_col_autoresponder,
table.list td.tbl_col_autoresponder {
table.list td.tbl_col_autoresponder,
table.list th.tbl_col_postfix,
table.list td.tbl_col_postfix,
table.list th.tbl_col_disablesmtp,
table.list td.tbl_col_disablesmtp,
table.list th.tbl_col_disableimap,
table.list td.tbl_col_disableimap,
table.list th.tbl_col_disablepop3,
table.list td.tbl_col_disablepop3 {
width: 70px;
text-align: center;
}
......
interface/web/themes/default/css/styles.css
View file @ 56805b52
......@@ -373,7 +373,15 @@ table.list td[class$="_pid"],
table.list th[class$="_active"],
table.list td[class$="_active"],
table.list th.tbl_col_autoresponder,
table.list td.tbl_col_autoresponder {
table.list td.tbl_col_autoresponder,
table.list th.tbl_col_postfix,
table.list td.tbl_col_postfix,
table.list th.tbl_col_disablesmtp,
table.list td.tbl_col_disablesmtp,
table.list th.tbl_col_disableimap,
table.list td.tbl_col_disableimap,
table.list th.tbl_col_disablepop3,
table.list td.tbl_col_disablepop3 {
width: 70px;
text-align: center;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment