michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix clear search button to look inbuilt into search field

Browse Source
This commit is contained in:
iliajie
2023-05-11 13:20:06 +03:00
parent 2bbf06af99
commit cc24384fea
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gray-theme/unauthenticated/gray-theme.css
View File

@@ -585,11 +585,29 @@ body > .mode > b[data-mode="server-manager"] > a > .ff-cloudmin {
float:right;
margin-bottom: 3px;
}
.ui_form_elements_wrapper_search * {
line-height: initial !important;
}
.ui_form_elements_wrapper_search [data-class="ui_textbox_pagination_search"] {
padding-right: 17px;
}
.ui_form_elements_wrapper_search [data-class="ui_textbox_pagination_search"] + .ui_reset:active,
.ui_form_elements_wrapper_search [data-class="ui_textbox_pagination_search"] + .ui_reset:focus,
.ui_form_elements_wrapper_search [data-class="ui_textbox_pagination_search"] + .ui_reset {
position: absolute;
right: 17px;
min-height: 17px;
background-color: transparent;
border-color: transparent;
cursor: pointer;
outline: none;
}
.ui_form_elements_wrapper_search [data-class="ui_textbox_pagination_search"]:not([value=""]) + .ui_reset {
color: #dd4242;
}
.ui_form_elements_wrapper_paginator {
float:right;
margin-top: 3px;

30
ui-lib.pl
View File

@@ -2865,12 +2865,14 @@ if (ref($arr) eq 'ARRAY' && $arr->[0]) {
# Can pagination be done automatically
# depending on the client screen height?
my $items_per_page_client = int($opts->{'client_height'} || get_http_cookie('client_height'));
my $items_per_page =
$tconfig{'paginate-noauto'} ?
$items_per_page :
(int($ENV{'HTTP_X_CLIENT_HEIGHT'}) ||
(int($opts->{'client_height'}) ?
((int(($opts->{'client_height'} - $top_offset_px - $bottom_offset_px) / $row_size_px))) : $items_per_page));
($items_per_page_client ?
((int(($items_per_page_client -
$top_offset_px - $bottom_offset_px) / $row_size_px))) : $items_per_page));
# If caller wants specific pagination number,
# e.g. a module config, use that instead
if ($exported_form && $exported_form->{'paginate'}) {
@@ -2907,13 +2909,6 @@ if (ref($arr) eq 'ARRAY' && $arr->[0]) {
my $paginator_id = 'paginator-form';
my $paginator_data = "$paginator_id-data";
# As clicking on pagination arrows send
# current screen height to the server
my $screenClickHeightGetter =
"onclick='this.href=this.href+\"&client_height=\"+document.documentElement.clientHeight'";
my $screenChangeHeightGetter =
"onchange='form.client_height.value=document.documentElement.clientHeight'";
# Paginator form
$rv{$paginator_id} =
&ui_form_start($pagination_target, &quote_escape($pagination_action), undef, "id='$paginator_id${id}'");
@@ -2958,13 +2953,12 @@ if (ref($arr) eq 'ARRAY' && $arr->[0]) {
&ui_link("$pagination_target?page${id}=$curent_page_prev_urlize".
"&search${id}=$search_term_urlize&paginate${id}=$items_per_page_urlize$exported_form_query",
'<span>&nbsp;&#x23F4;&nbsp;</span>',
"@{[&html_escape($link_page_cls)]} @{[&html_escape($link_page_cls)]}_left$page_prev_disabled",
$screenClickHeightGetter);
"@{[&html_escape($link_page_cls)]} @{[&html_escape($link_page_cls)]}_left$page_prev_disabled");
# Page number input selector
$rv{$paginator_data} .=
&ui_textbox("page${id}", $curent_page, $total_pages_length, undef, $total_pages_length,
"data-class='@{[&quote_escape($link_search_cls)]}' form='$paginator_id${id}' $screenChangeHeightGetter");
"data-class='@{[&quote_escape($link_search_cls)]}' form='$paginator_id${id}'");
# Out of pages text
$rv{$paginator_data} .=
@@ -2976,8 +2970,7 @@ if (ref($arr) eq 'ARRAY' && $arr->[0]) {
&ui_link("$pagination_target?page${id}=$curent_page_next_urlize".
"&search${id}=$search_term_urlize&paginate${id}=$items_per_page_urlize$exported_form_query",
'<span>&nbsp;&#x25B8;&nbsp;</span>',
"@{[&html_escape($link_page_cls)]} @{[&html_escape($link_page_cls)]}_right$page_next_disabled",
$screenClickHeightGetter);
"@{[&html_escape($link_page_cls)]} @{[&html_escape($link_page_cls)]}_right$page_next_disabled");
# Dynamically adding external form elements
if ($exported_form) {
@@ -3004,18 +2997,19 @@ if (ref($arr) eq 'ARRAY' && $arr->[0]) {
# Paginator search form data
$rv{$search_data} .= &ui_hidden("paginate${id}", $items_per_page, "$search_id${id}");
$rv{$search_data} .= &ui_hidden("page${id}", 1, "$search_id${id}");
my $search_placeholder_length = length($search_placeholder);
$search_placeholder_length < 12 ? 12 : $search_placeholder_length;
my $search_placeholder_length = length($search_term) || length($search_placeholder);
$search_placeholder_length = $search_placeholder_length < 8 ? 8 : $search_placeholder_length;
$search_placeholder_length = 24 if ($search_placeholder_length >= 24);
# Search box
$rv{$search_data} .=
&ui_textbox("search${id}", $search_term, $search_placeholder_length, undef, undef,
"data-class='@{[&quote_escape($link_search_cls)]}_search' ".
"placeholder='@{[&quote_escape($search_placeholder)]}' form='$search_id${id}' $screenChangeHeightGetter");
"placeholder='@{[&quote_escape($search_placeholder)]}' form='$search_id${id}'");
# Search reset using JS
$rv{$search_data} .=
&ui_reset($text{'reset'}, undef,
&ui_reset('&#x26CC;', undef,
"onclick='document.getElementById(\"$search_id${id}\").search${id}.value = \"\";".
"document.getElementById(\"$search_id${id}\").submit()'");