VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix offsets and use a better structure for holding data

Browse Source
This commit is contained in:
iliajie
2023-05-13 12:45:04 +03:00
parent 5d955fe3c8
commit 2081cf7002
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
useradmin/user-lib.pl
View File

@ -2325,12 +2325,12 @@ while(@ginfo = &my_getgrent()) {
&my_endgrent(); &my_endgrent();
my $upagination = scalar(@{$users}) > $config{'display_max'}; my $upagination = scalar(@{$users}) > $config{'display_max'};
if ($upagination) { if ($upagination) {
my $upagination_opts = \%in; my $upopts = \%in;
$upagination_opts->{'top_offset_px'} = 125; $upopts->{'paginations'}->{'offset'}->{'top'} = 155;
$upagination_opts->{'bottom_offset_px'} = 125; $upopts->{'paginations'}->{'offset'}->{'bottom'} = 170;
$upagination_opts->{'_form-exports'} = $upopts->{'paginations'}->{'form'} =
{ 'mode' => 'users', 'colspan' => 6 }; { 'mode' => 'users', 'colspan' => 6 };
$upagination = &ui_paginations($users, $upagination_opts); $upagination = &ui_paginations($users, $upopts);
} }
# Work out if any users can be edited # Work out if any users can be edited
@ -2358,7 +2358,7 @@ if ($anyedit) {
push(@linksrow, @$links); push(@linksrow, @$links);
if ($upagination) { if ($upagination) {
push(@{$rightlinks}, push(@{$rightlinks},
" $upagination->{'search-form-data'}"); " $upagination->{'search'}->{'form-data'}");
} }
local @grid = ( &ui_links_row(\@linksrow), &ui_links_row($rightlinks) ); local @grid = ( &ui_links_row(\@linksrow), &ui_links_row($rightlinks) );
print &ui_grid_table(\@grid, 2, 100, [ "align=left", "align=right" ]); print &ui_grid_table(\@grid, 2, 100, [ "align=left", "align=right" ]);
@ -2415,10 +2415,10 @@ if (@$users) {
} }
} }
else { else {
print $upagination->{'search-no-results'}; print $upagination->{'search'}->{'no-results'};
} }
print &ui_columns_end(); print &ui_columns_end();
print $upagination->{'paginator-form-data'} print $upagination->{'paginator'}->{'form-data'}
if ($upagination); if ($upagination);
print &ui_links_row(\@linksrow); print &ui_links_row(\@linksrow);
if ($anyedit) { if ($anyedit) {
@ -2426,8 +2426,8 @@ if ($anyedit) {
print &ui_form_end(); print &ui_form_end();
} }
if ($upagination) { if ($upagination) {
print $upagination->{'paginator-form'}; print $upagination->{'paginator'}->{'form'};
print $upagination->{'search-form'}; print $upagination->{'search'}->{'form'};
} }
} }
@ -2455,11 +2455,11 @@ $anyedit = 0 if ($noboxes);
my $gpagination = scalar(@{$groups}) > $config{'display_max'}; my $gpagination = scalar(@{$groups}) > $config{'display_max'};
if ($gpagination) { if ($gpagination) {
my $gpagination_opts = \%in; my $gpopts = \%in;
$gpagination_opts->{'top_offset_px'} = 125; $gpopts->{'paginations'}->{'offset'}->{'top'} = 155;
$gpagination_opts->{'bottom_offset_px'} = 125; $gpopts->{'paginations'}->{'offset'}->{'bottom'} = 170;
$gpagination_opts->{'_form-exports'} = { 'mode' => 'groups', 'colspan' => 4 }; $gpopts->{'paginations'}->{'form'} = { 'mode' => 'groups', 'colspan' => 4 };
$gpagination = &ui_paginations($groups, $gpagination_opts); $gpagination = &ui_paginations($groups, $gpopts);
} }
local @linksrow; local @linksrow;
@ -2471,7 +2471,7 @@ if ($anyedit && $access{'gdelete'}) {
push(@linksrow, @$links); push(@linksrow, @$links);
if ($gpagination) { if ($gpagination) {
push(@{$rightlinks}, push(@{$rightlinks},
" $gpagination->{'search-form-data'}"); " $gpagination->{'search'}->{'form-data'}");
} }
local @grid = ( &ui_links_row(\@linksrow), &ui_links_row($rightlinks) ); local @grid = ( &ui_links_row(\@linksrow), &ui_links_row($rightlinks) );
print &ui_grid_table(\@grid, 2, 100, [ "align=left", "align=right" ]); print &ui_grid_table(\@grid, 2, 100, [ "align=left", "align=right" ]);
@ -2509,10 +2509,10 @@ if (@$groups) {
} }
} }
else { else {
print $gpagination->{'search-no-results'}; print $gpagination->{'search'}->{'no-results'};
} }
print &ui_columns_end(); print &ui_columns_end();
print $gpagination->{'paginator-form-data'} print $gpagination->{'paginator'}->{'form-data'}
if ($gpagination); if ($gpagination);
print &ui_links_row(\@linksrow); print &ui_links_row(\@linksrow);
if ($anyedit && $access{'gdelete'}) { if ($anyedit && $access{'gdelete'}) {
@ -2520,8 +2520,8 @@ if ($anyedit && $access{'gdelete'}) {
print &ui_form_end(); print &ui_form_end();
} }
if ($gpagination) { if ($gpagination) {
print $gpagination->{'paginator-form'}; print $gpagination->{'paginator'}->{'form'};
print $gpagination->{'search-form'}; print $gpagination->{'search'}->{'form'};
} }
} }