Skip to content

Commit 9329700

Browse files
author
Kristan Kenney
committed
Fix regressions in UI
1 parent 2a147cd commit 9329700

File tree

2 files changed

+8
-40
lines changed

2 files changed

+8
-40
lines changed

‎web/templates/admin/list_mail.html‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,6 @@
106106
<div class="clearfix l-unit__stat-col--left text-right compact-5">
107107
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
108108
<div class="actions-panel clearfix">
109-
<<<<<<< HEAD
110-
=======
111-
<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Add Mail Account')?>"><i class="fas fa-plus-circle status-icon green status-icon dim"></i></a></div>
112-
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('mail accounts')?>"><i class="fas fa-users status-icon blue status-icon dim"></i></a></div>
113-
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&dns=1&token=<?=$_SESSION['token']?>" title="<?=_('DNS records mail')?>"><i class="fas fa-atlas status-icon blue status-icon dim"></i></a></div>
114-
<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
115-
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$webmail;?>.<?=$key?>/" target="_blank" title="<?=_('open webmail')?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></a></div>
116-
<?php } ?>
117-
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Domain')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
118-
>>>>>>> main
119-
120109
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
121110
<!-- Restrict ability to edit, delete, or suspend domain items when impersonating 'admin' account -->
122111
<div class="actions-panel__col actions-panel__edit shortcut-l" key-action="href"><a href="?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('mail accounts')?>"><i class="fas fa-users status-icon blue status-icon dim"></i></a></div>
@@ -127,8 +116,10 @@
127116
<? } else { ?>
128117
<? if ($data[$key]['SUSPENDED'] == 'no') {?>
129118
<div class="actions-panel__col actions-panel__logs shortcut-n" key-action="href"><a href="/add/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Add Mail Account')?>"><i class="fas fa-plus-circle status-icon green status-icon dim"></i></a></div>
130-
<? if (!empty($data[$key]['WEBMAIL'])) {?>
131-
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$webmail;?>.<?=$key?>/" target="_blank" title="<?=_('open webmail')?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></a></div>
119+
<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
120+
<? if (!empty($data[$key]['WEBMAIL'])) {?>
121+
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$webmail;?>.<?=$key?>/" target="_blank" title="<?=_('open webmail')?>"><i class="fas fa-paper-plane status-icon lightblue status-icon dim"></i></a></div>
122+
<? } ?>
132123
<? } ?>
133124
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Domain')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
134125
<? } ?>

‎web/templates/admin/list_mail_acc.html‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,17 @@
110110
<div class="clearfix l-unit__stat-col--left text-right compact-4">
111111
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
112112
<div class="actions-panel clearfix">
113-
<<<<<<< HEAD
114113
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
115114
<!-- Restrict the ability to edit, delete, or suspend domain items when impersonating 'admin' account -->
116115
<? if ($data[$key]['SUSPENDED'] == 'no') {?>
117116
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=_('open webmail')?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
118117
<? } ?>
119118
<? } else { ?>
120119
<? if ($data[$key]['SUSPENDED'] == 'no') {?>
121-
<? if (!empty($data[$key]['WEBMAIL'])) {?>
122-
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=_('open webmail')?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
120+
<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
121+
<? if (!empty($data[$key]['WEBMAIL'])) {?>
122+
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=_('open webmail')?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
123+
<? } ?>
123124
<? } ?>
124125
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Account')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
125126
<? } ?>
@@ -142,30 +143,6 @@
142143
</a>
143144
</div>
144145
<? } ?>
145-
=======
146-
<div class="actions-panel__col actions-panel__edit" key-action="href"><a href="http://<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain'])?>/?_user=<?=$key?>@<?=htmlspecialchars($_GET['domain'])?>" target="_blank" title="<?=_('open webmail')?>"><i class="fas fa-envelope-open-text status-icon maroon status-icon dim"></i></a></div>
147-
<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
148-
<div class="actions-panel__col actions-panel__logs shortcut-enter" key-action="href"><a href="/edit/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Mail Account')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
149-
<?php } ?>
150-
<div class="actions-panel__col actions-panel__suspend shortcut-s" key-action="js">
151-
<a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>" title="<?=_($spnd_action)?>">
152-
<i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
153-
<input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?php echo $key ?>&token=<?=$_SESSION['token']?>" />
154-
<div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
155-
<p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
156-
</div>
157-
</a>
158-
</div>
159-
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
160-
<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('delete')?>">
161-
<i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
162-
<input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" />
163-
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
164-
<p class="confirmation"><?=sprintf(_('DELETE_MAIL_ACCOUNT_CONFIRMATION'),$key)?></p>
165-
</div>
166-
</a>
167-
</div>
168-
>>>>>>> main
169146
</div>
170147
</div>
171148
<!-- END QUICK ACTION TOOLBAR AREA -->

0 commit comments

Comments
 (0)