michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

finalize packed filter

Browse Source
This commit is contained in:
Gnadelwartz
2018-02-02 17:22:02 +01:00
parent b0c1eea7b2
commit 8192e45651
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
software/ipkg-edit_pack.cgi
View File

@@ -45,8 +45,10 @@ print &ui_buttons_end();
if ($in{'search'}) {
&ui_print_footer("search.cgi?search=$in{'search'}", $text{'search_return'});
}
elsif ($in{'filter'}) {
&ui_print_footer("ipkg-tree.cgi?filter=$in{'filter'}#$pinfo[1]", $text{'index_treturn'});
}
else {
&ui_print_footer("ipkg-tree.cgi#$pinfo[1]", $text{'index_treturn'});
}
}

22
software/ipkg-tree.cgi
View File

@@ -27,7 +27,7 @@ if ( $in{'mode'} eq "closeall" ) {
&save_heiropen([ ]);
}
if ( $in{'mode'} eq "openall" ) {
if ( $in{'mode'} eq "openall" || $in{'filter'} ) {
for($i=0; $i<$n; $i++) {
@w = split(/\//, $packages{$i,'class'});
for($j=0; $j<@w; $j++) {
@@ -64,22 +64,22 @@ $heiropen{""} = 1;
print &ui_form_start("ipkg-tree.cgi");
print &ui_submit($text{'IPKG_filter'});
print &ui_textbox("filter", $in{'filter'}, 50);
print &ui_hidden("mode", "openall");
print &ui_form_end(),"<p>\n";
print &ui_link("ipkg-tree.cgi?mode=closeall", $text{'index_close'});
print &ui_link("ipkg-tree.cgi?mode=openall", $text{'index_open'});
print &ui_link("ipkg-tree.cgi", $text{'IPKG_filterclear'}) if ($in{'filter'});
print "<table width=\"95%\">\n";
&traverse("", 0);
print "</table>\n";
print &ui_form_start("ipkg-tree.cgi");
print &ui_submit($text{'IPKG_filter'});
print &ui_textbox("filter", $in{'filter'}, 50);
print &ui_hidden("mode", "openall");
print &ui_form_end(),"<p>\n";
print &ui_link("ipkg-tree.cgi?mode=closeall", $text{'index_close'});
print &ui_link("ipkg-tree.cgi?mode=openall", $text{'index_open'});
print &ui_link("ipkg-tree.cgi", $text{'IPKG_filterclear'}) if ($in{'filter'});
print "<p>\n";
&ui_print_footer("", $text{'index_return'});
@@ -91,11 +91,15 @@ local($s, $act, $i);
# Show the icon and class name
print "<tr style=\"border-top: 1px solid lightgrey\"> <td>", $spacer x $_[1];
if ($_[0]) {
print "<a name=\"$_[0]\"></a>\n";
$act = $heiropen{$_[0]} ? "close" : "open";
my $link = "ipkg-$act.cgi?what=".&urlize($_[0]);
if ($in{'filter'}) {
print "<img border=0 src='images/close.gif'>";
} else {
print "<a name=\"$_[0]\"></a>\n";
$act = $heiropen{$_[0]} ? "close" : "open";
my $link = "ipkg-$act.cgi?what=".&urlize($_[0]);
print &ui_link($link, "<img border=0 src='images/$act.gif'>");
}
$_[0] =~ /([^\/]+)$/;
print &ui_link($link, "<img border=0 src='images/$act.gif'>");
print "&nbsp; $1</td>\n";
}
else {
@@ -110,8 +114,8 @@ if ($heiropen{$_[0]}) {
next if ($vers[$i] == '');
print "<tr> <td nowrap>", $spacer x ($_[1]+1);
print "<img border=0 src=images/pack.gif>&nbsp;\n";
print &ui_link("ipkg-edit_pack.cgi?package=". &urlize($pack[$i]).
"&version=". &urlize($vers[$i]),
print &ui_link("ipkg-edit_pack.cgi?package=". &urlize($pack[$i]).
"&version=". &urlize($vers[$i]). "&filter=". &urlize($in{'filter'}),
"<b>".&html_escape($pack[$i]. ($vers[$i] ? " $vers[$i]" : ""))."</b>" );
print "</td> <td>",&html_escape($desc[$i]),"</td>\n";
print "</tr>\n";

3
software/lang/de
View File

@@ -414,4 +414,5 @@ IPKG_install_package=Installieren
IPKG_install_packagedesc=Installiere dieses Paket auf Deinem System
IPKG_noupgrade=Nichts zu aktualisieren
IPKG-edit_title=Verwalte IPKG Paket
IPKG_filter=Filtern nach ...
IPKG_filter=Filtere Pakete
IPKG_filterclear=Filter l&ouml;schen

3
software/lang/en
View File

@@ -446,4 +446,5 @@ IPKG_install_package=Install
IPKG_install_packagedesc=Install this package on your system
IPKG_noupgrade=Nothing to upgrade
IPKG-edit_title=Manage IPKG Package
IPKG_filter=Filter ...
IPKG_filter=Filter Packages
IPKG_filterclear=Clear Filter