Skip to content

Commit 26210f5

Browse files
committed
fix(frontend): use same design for all menus
1 parent b5b4be6 commit 26210f5

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

modules/core/functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ function schedule_dropdown($output, $send_now = false) {
706706
$txt = '';
707707
if ($send_now) {
708708
$txt .= '<div class="dropdown d-inline-block">
709-
<button type="button" class="btn btn-light btn-sm dropdown-toggle" id="dropdownMenuNexterDate" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">'.$output->trans('Reschedule').'</button>';
709+
<a class="hlink text-decoration-none dropdown-toggle" id="dropdownMenuNexterDate" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">'.$output->trans('Reschedule').'</a>';
710710
}
711711
$txt .= '<ul class="dropdown-menu nexter_dropdown schedule_dropdown" aria-labelledby="dropdownMenuNexterDate">';
712712
foreach ($values as $format) {

modules/imap/functions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,11 +1484,11 @@ function snooze_dropdown($output, $unsnooze = false) {
14841484
$values = nexter_formats();
14851485

14861486
$txt = '<div class="dropdown d-inline-block">
1487-
<button type="button" class="btn btn-outline-success btn-sm dropdown-toggle" id="dropdownMenuSnooze" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-bs-auto-close="outside">'.$output->trans('Snooze').'</button>
1487+
<a class="hlink text-decoration-none dropdown-toggle" id="dropdownMenuSnooze" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-bs-auto-close="outside">'.$output->trans('Snooze').'</a>
14881488
<ul class="dropdown-menu" aria-labelledby="dropdownMenuSnooze">';
14891489
foreach ($values as $format) {
14901490
$labels = get_scheduled_date($format, true);
1491-
$txt .= '<li><a href="#" class="nexter_date_helper_snooze dropdown-item d-flex justify-content-between gap-5" data-value="'.$format.'"><span>'.$output->trans($labels[0]).'</span> <span class="text-end">'.$labels[1].'</span></a></li>';
1491+
$txt .= '<li><a href="#" class="nexter_date_helper_snooze dropdown-item gap-5" data-value="'.$format.'"><span>'.$output->trans($labels[0]).'</span> <span class="text-end">'.$labels[1].'</span></a></li>';
14921492
}
14931493
$txt .= '<li><hr class="dropdown-divider"></li>';
14941494
$txt .= '<li><label for="nexter_input_date_snooze" class="nexter_date_picker_snooze dropdown-item cursor-pointer">'.$output->trans('Pick a date').'</label>';
@@ -1506,7 +1506,7 @@ function snooze_dropdown($output, $unsnooze = false) {
15061506
function tags_dropdown($context, $headers) {
15071507
$folders = $context->get('tags', array());
15081508
$txt = '<div class="dropdown d-inline-block">
1509-
<button type="button" class="btn btn-outline-success btn-sm dropdown-toggle" id="dropdownMenuTag" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">'.$context->trans('Tags').'</button>
1509+
<a class="hlink text-decoration-none dropdown-toggle" id="dropdownMenuTag" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">'.$context->trans('Tags').'</a>
15101510
<ul class="dropdown-menu" aria-labelledby="dropdownMenuTag">';
15111511

15121512
$tags = !empty($headers['X-Cypht-Tags']) ? explode(',', $headers['X-Cypht-Tags']) : array();

modules/imap/output_modules.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,10 +396,9 @@ protected function output() {
396396

397397
$settings = $this->get('user_settings', array());
398398
if(array_key_exists('enable_snooze_setting', $settings) && $settings['enable_snooze_setting']) {
399-
$txt .= ' | ' . snooze_dropdown($this, isset($headers['X-Snoozed']));
399+
$txt .= snooze_dropdown($this, isset($headers['X-Snoozed']));
400400
}
401401
if ($this->get('sieve_filters_enabled') && !$is_draft) {
402-
$txt .= snooze_dropdown($this, isset($headers['X-Snoozed']));
403402
$server_id = $this->get('msg_server_id');
404403
$imap_server = $this->get('imap_accounts')[$server_id];
405404
if ($this->get('sieve_filters_client')) {

0 commit comments

Comments
 (0)