Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c194661fa3 | ||
|
|
e539c60e9b |
@@ -67,7 +67,6 @@ function plugin_switchIdent_addCbLarry($wrapper, $sw) {
|
||||
|
||||
$sw.css({
|
||||
'font-weight': 'bold',
|
||||
'max-width': '200px',
|
||||
'text-overflow': 'ellipsis'
|
||||
});
|
||||
|
||||
@@ -104,7 +103,6 @@ function plugin_switchIdent_addCbElastic($wrapper, $sw) {
|
||||
'font-weight': 'bold',
|
||||
'color': 'inherit',
|
||||
'box-shadow': 'none',
|
||||
'max-width': '200px',
|
||||
'text-overflow': 'ellipsis',
|
||||
'padding': '0 1.2em 0 0.25em'
|
||||
});
|
||||
|
||||
@@ -27,6 +27,32 @@
|
||||
background-size: 10px 6px;
|
||||
}
|
||||
|
||||
/*
|
||||
* Prevent flash of original username before JS prepends the switcher.
|
||||
* The JS hides these elements at DOMReady, but the CSS rules below hide them
|
||||
* earlier (during initial render) — only loaded when the switcher will actually
|
||||
* be shown, so users without secondary accounts keep the default username display.
|
||||
*/
|
||||
|
||||
/* Elastic skin: switcher is prepended inside .header-title.username.
|
||||
Hide the original username via visibility on the parent (affects the text
|
||||
node), then re-show the wrapper. Unlike color/font-size, this preserves the
|
||||
parent's flex/line-height context, keeping the wrapper vertically centered. */
|
||||
.header-title.username {
|
||||
visibility: hidden;
|
||||
}
|
||||
.header-title.username > *:not(.ident-switch-wrapper) {
|
||||
display: none;
|
||||
}
|
||||
.header-title.username > .ident-switch-wrapper {
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
/* Larry skin: switcher is prepended next to .username inside #topline .topright */
|
||||
#topline .topright > .username {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Unread badge */
|
||||
.ident-switch-badge {
|
||||
flex-shrink: 0;
|
||||
|
||||
@@ -158,10 +158,6 @@ class ident_switch extends rcube_plugin
|
||||
default => null,
|
||||
};
|
||||
|
||||
if ($rc->task === 'mail') {
|
||||
$this->include_stylesheet('ident_switch.css');
|
||||
}
|
||||
|
||||
return $args;
|
||||
}
|
||||
|
||||
@@ -188,7 +184,9 @@ class ident_switch extends rcube_plugin
|
||||
$iid = intval($iid_s);
|
||||
}
|
||||
|
||||
$accNames = [$_SESSION['global_alias'] ?? $rc->user->data['username']];
|
||||
$primaryIdentity = $rc->user->get_identity();
|
||||
$primaryName = !empty($primaryIdentity['name']) ? $primaryIdentity['name'] : null;
|
||||
$accNames = [$_SESSION['global_alias'] ?? $primaryName ?? $rc->user->data['username']];
|
||||
$accValues = [-1];
|
||||
$accSelected = -1;
|
||||
$iidMap = [0 => -1]; // primary account: iid 0 → select value -1
|
||||
@@ -216,6 +214,7 @@ class ident_switch extends rcube_plugin
|
||||
return;
|
||||
}
|
||||
|
||||
$this->include_stylesheet('ident_switch.css');
|
||||
$this->include_script('ident_switch-switch.js');
|
||||
|
||||
// Pass config to JS environment
|
||||
|
||||
@@ -177,6 +177,9 @@ class IdentSwitchChecker
|
||||
$host = 'tls://' . $host;
|
||||
}
|
||||
|
||||
$primaryIdentity = $rc->user->get_identity();
|
||||
$primaryName = !empty($primaryIdentity['name']) ? $primaryIdentity['name'] : null;
|
||||
|
||||
return [
|
||||
'iid' => 0,
|
||||
'imap_host' => $host,
|
||||
@@ -185,7 +188,7 @@ class IdentSwitchChecker
|
||||
'username' => $rc->user->data['username'],
|
||||
'password' => $_SESSION['password' . $postfix],
|
||||
'email' => $rc->user->data['username'],
|
||||
'label' => $_SESSION['global_alias'] ?? $rc->user->data['username'],
|
||||
'label' => $_SESSION['global_alias'] ?? $primaryName ?? $rc->user->data['username'],
|
||||
'notify_basic' => null,
|
||||
'notify_sound' => null,
|
||||
'notify_desktop' => null,
|
||||
|
||||
Reference in New Issue
Block a user