Skip to content

Commit b8b8f43

Browse files
krokykroky
authored
Merge pull request #1537 from Shadow243/fixed-icons-issues
Fixed icons issues
2 parents 59b9181 + 609926f commit b8b8f43

File tree

15 files changed

+88
-77
lines changed

15 files changed

+88
-77
lines changed

‎modules/contacts/modules.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ protected function output() {
187187
if (array_key_exists('contact_auto_collect', $settings) && $settings['contact_auto_collect']) {
188188
$checked = ' checked="checked"';
189189
} else {
190-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
190+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
191191
}
192192

193193
return '<tr class="general_setting"><td><label for="contact_auto_collect">' .

‎modules/core/message_list_functions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ function message_since_dropdown($since, $name, $output_mod, $original_default_va
467467
if ($val == $since) {
468468
$res .= ' selected="selected"';
469469
if ($val != $original_default_value) {
470-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span>';
470+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_select"></i></span>';
471471
}
472472

473473
}

‎modules/core/output_modules.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ protected function output() {
715715
if ($start_page == $val) {
716716
$res .= 'selected="selected" ';
717717
if ($start_page != DEFAULT_START_PAGE) {
718-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span>';
718+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_select"></i></span>';
719719
}
720720
}
721721
$res .= 'value="'.$val.'">'.$this->trans($label).'</option>';
@@ -752,7 +752,7 @@ protected function output() {
752752
if ($default_sort_order == $val) {
753753
$res .= 'selected="selected" ';
754754
if ($default_sort_order != 'arrival') {
755-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span>';
755+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_select"></i></span>';
756756
}
757757
}
758758
$res .= 'value="'.$val.'">'.$this->trans($label).'</option>';
@@ -789,7 +789,7 @@ protected function output() {
789789
if ($list_style == $val) {
790790
$res .= 'selected="selected" ';
791791
if ($list_style != DEFAULT_LIST_STYLE) {
792-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span>';
792+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_select"></i></span>';
793793
}
794794
}
795795
$res .= 'value="'.$val.'">'.$this->trans($label).'</option>';
@@ -807,7 +807,7 @@ protected function output() {
807807
$settings = $this->get('user_settings');
808808
if (array_key_exists('mailto_handler', $settings) && $settings['mailto_handler']) {
809809
$checked = ' checked="checked"';
810-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
810+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
811811
}
812812
else {
813813
$checked = '';
@@ -826,7 +826,7 @@ protected function output() {
826826
$settings = $this->get('user_settings');
827827
if (array_key_exists('no_folder_icons', $settings) && $settings['no_folder_icons']) {
828828
$checked = ' checked="checked"';
829-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
829+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
830830
}
831831
else {
832832
$checked = '';
@@ -851,7 +851,7 @@ protected function output() {
851851
$checked = '';
852852
}
853853
if(isset($settings['no_password_save']) && $settings['no_password_save'] !== DEFAULT_NO_PASSWORD_SAVE) {
854-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
854+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
855855
}
856856
return '<tr class="general_setting"><td><label class="form-check-label" for="no_password_save">'.$this->trans('Don\'t save account passwords between logins').'</label></td>'.
857857
'<td><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="no_password_save" name="no_password_save" data-default-value="'.(DEFAULT_NO_PASSWORD_SAVE ? 'true' : 'false') . '" />'.$reset.'</td></tr>';
@@ -865,15 +865,15 @@ class Hm_Output_delete_prompt_setting extends Hm_Output_Module {
865865
protected function output() {
866866
$settings = $this->get('user_settings');
867867
$reset = '';
868-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
868+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
869869
if (array_key_exists('disable_delete_prompt', $settings) && $settings['disable_delete_prompt']) {
870870
$checked = ' checked="checked"';
871871
}
872872
else {
873873
$checked = '';
874874
}
875875
if(isset($settings['disable_delete_prompt']) && $settings['disable_delete_prompt'] !== DEFAULT_DISABLE_DELETE_PROMPT) {
876-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
876+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
877877
}
878878
return '<tr class="general_setting"><td><label class="form-check-label" for="disable_delete_prompt">'.$this->trans('Disable prompts when deleting').'</label></td>'.
879879
'<td><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="disable_delete_prompt" name="disable_delete_prompt" data-default-value="'.(DEFAULT_DISABLE_DELETE_PROMPT ? 'true' : 'false') . '" />'.$reset.'</td></tr>';
@@ -892,7 +892,7 @@ protected function output() {
892892
$checked = ' checked="checked"';
893893
}
894894
else {
895-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
895+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
896896
}
897897
return '<tr class="general_setting"><td><label class="form-check-label" for="allow_delete_attachment">'.$this->trans('Allow delete attachment').'</label></td>'.
898898
'<td><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="allow_delete_attachment" name="allow_delete_attachment" data-default-value="false" />'.$reset.'</td></tr>';
@@ -1000,7 +1000,7 @@ protected function output() {
10001000
$sources = $settings['unread_per_source'];
10011001
}
10021002
if ($sources != DEFAULT_UNREAD_PER_SOURCE) {
1003-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input"></i></span>';
1003+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_input"></i></span>';
10041004
}
10051005
return '<tr class="unread_setting"><td><label for="unread_per_source">'.
10061006
$this->trans('Max messages per source').'</label></td>'.
@@ -1044,7 +1044,7 @@ protected function output() {
10441044
$sources = $settings['flagged_per_source'];
10451045
}
10461046
if ($sources != DEFAULT_FLAGGED_PER_SOURCE) {
1047-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input"></i></span>';
1047+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_input"></i></span>';
10481048
}
10491049
return '<tr class="flagged_setting"><td><label for="flagged_per_source">'.
10501050
$this->trans('Max messages per source').'</label></td>'.
@@ -1091,7 +1091,7 @@ protected function output() {
10911091
$sources = $settings['all_email_per_source'];
10921092
}
10931093
if ($sources != DEFAULT_ALL_EMAIL_PER_SOURCE) {
1094-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input"></i></span>';
1094+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_input"></i></span>';
10951095
}
10961096
return '<tr class="email_setting"><td><label for="all_email_per_source">'.
10971097
$this->trans('Max messages per source').'</label></td>'.
@@ -1115,7 +1115,7 @@ protected function output() {
11151115
$sources = $settings['all_per_source'];
11161116
}
11171117
if ($sources != DEFAULT_ALL_PER_SOURCE) {
1118-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input"></i></span>';
1118+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_input"></i></span>';
11191119
}
11201120
return '<tr class="all_setting"><td><label for="all_per_source">'.
11211121
$this->trans('Max messages per source').'</label></td>'.
@@ -1191,7 +1191,7 @@ protected function output() {
11911191
if ($id == $mylang) {
11921192
$res .= 'selected="selected" ';
11931193
if ($id != 'en') {
1194-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span>';
1194+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_select"></i></span>';
11951195
}
11961196
}
11971197
$res .= 'value="'.$id.'">'.$lang.'</option>';
@@ -1226,7 +1226,7 @@ protected function output() {
12261226
if ($zone == $myzone) {
12271227
$res .= 'selected="selected" ';
12281228
if ($zone != $this->get('default_timezone','UTC')) {
1229-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_timezone"></i></span>';
1229+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_timezone"></i></span>';
12301230
}
12311231
}
12321232
$res .= 'value="'.$zone.'">'.$zone.'</option>';
@@ -1247,7 +1247,7 @@ protected function output() {
12471247
$reset = '';
12481248
if (array_key_exists('show_list_icons', $settings) && $settings['show_list_icons']) {
12491249
$checked = ' checked="checked"';
1250-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
1250+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
12511251
}
12521252
return '<tr class="general_setting"><td><label class="form-check-label" for="show_list_icons">'.
12531253
$this->trans('Show icons in message lists').'</label></td>'.
@@ -2048,7 +2048,7 @@ protected function output() {
20482048
$sources = $settings['junk_per_source'];
20492049
}
20502050
if ($sources != DEFAULT_JUNK_PER_SOURCE) {
2051-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input"></i></span>';
2051+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_input"></i></span>';
20522052
}
20532053
return '<tr class="junk_setting"><td><label for="junk_per_source">'.
20542054
$this->trans('Max messages per source').'</label></td>'.
@@ -2107,7 +2107,7 @@ protected function output() {
21072107
$sources = $settings['trash_per_source'];
21082108
}
21092109
if ($sources != DEFAULT_TRASH_PER_SOURCE) {
2110-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input"></i></span>';
2110+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_input"></i></span>';
21112111
}
21122112
return '<tr class="trash_setting"><td><label for="trash_per_source">'.
21132113
$this->trans('Max messages per source').'</label></td>'.
@@ -2164,7 +2164,7 @@ protected function output() {
21642164
$sources = $settings['snoozed_per_source'];
21652165
}
21662166
if ($sources != DEFAULT_SNOOZED_PER_SOURCE) {
2167-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input"></i></span>';
2167+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_input"></i></span>';
21682168
}
21692169
return '<tr class="snoozed_setting"><td><label for="snoozed_per_source">'.
21702170
$this->trans('Max messages per source for Snoozed').'</label></td>' .
@@ -2221,7 +2221,7 @@ protected function output() {
22212221
$sources = $settings['drafts_per_source'];
22222222
}
22232223
if ($sources != DEFAULT_DRAFT_PER_SOURCE) {
2224-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input"></i></span>';
2224+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_input"></i></span>';
22252225
}
22262226
return '<tr class="drafts_setting"><td><label for="drafts_per_source">'.
22272227
$this->trans('Max messages per source').'</label></td>'.
@@ -2260,7 +2260,7 @@ protected function output() {
22602260
$reset = '';
22612261
if (array_key_exists('warn_for_unsaved_changes', $settings) && $settings['warn_for_unsaved_changes']) {
22622262
$checked = ' checked="checked"';
2263-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
2263+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
22642264
}
22652265
return '<tr class="general_setting"><td><label class="form-check-label" for="warn_for_unsaved_changes">'.
22662266
$this->trans('Warn for unsaved changes').'</label></td>'.

‎modules/feeds/modules.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ protected function output() {
835835
$settings = $this->get('user_settings');
836836
if (array_key_exists('unread_exclude_feeds', $settings) && $settings['unread_exclude_feeds']) {
837837
$checked = ' checked="checked"';
838-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_checkbox"></i></span>';
838+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
839839
}
840840
else {
841841
$checked = '';
@@ -898,7 +898,7 @@ protected function output() {
898898
$limit = $settings['feed_limit'];
899899
}
900900
if ($limit != DEFAULT_FEED_LIMIT) {
901-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_input"></i></span>';
901+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_input"></i></span>';
902902
}
903903
return '<tr class="feeds_setting"><td><label for="feed_limit">'.$this->trans('Max feed items to display').'</label></td>'.
904904
'<td class="d-flex"><input class="form-control form-control-sm w-auto" type="text" id="feed_limit" name="feed_limit" size="2" value="'.$this->html_safe($limit).'" data-default-value="'.DEFAULT_FEED_LIMIT.'" />'.$reset.'</td></tr>';

‎modules/idle_timer/modules.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ protected function output() {
107107
if ($idle_time == $val) {
108108
$res .= 'selected="selected" ';
109109
if ($idle_time != '0') {
110-
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-repeat refresh_list reset_default_value_select"></i></span>';
110+
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_select"></i></span>';
111111
}
112112
}
113113
$res .= 'value="'.$val.'">'.$this->trans($label).'</option>';

0 commit comments

Comments
 (0)