From 382ba2313568c56e38adc876ea9fd79c3740ca50 Mon Sep 17 00:00:00 2001 From: iliajie Date: Wed, 3 Aug 2022 01:19:51 +0300 Subject: [PATCH] Fix to use a new set `svg` icons for servers --- cfengine/list_hosts.cgi | 2 +- cluster-software/edit_pack.cgi | 2 +- cluster-software/index.cgi | 2 +- cluster-useradmin/edit_group.cgi | 4 ++-- cluster-useradmin/edit_user.cgi | 4 ++-- cluster-useradmin/index.cgi | 2 +- cluster-usermin/edit_mod.cgi | 2 +- cluster-usermin/index.cgi | 2 +- cluster-webmin/edit_group.cgi | 2 +- cluster-webmin/edit_mod.cgi | 2 +- cluster-webmin/edit_user.cgi | 2 +- cluster-webmin/index.cgi | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cfengine/list_hosts.cgi b/cfengine/list_hosts.cgi index ead8e3df9..209a89c19 100755 --- a/cfengine/list_hosts.cgi +++ b/cfengine/list_hosts.cgi @@ -16,7 +16,7 @@ foreach $h (@hosts) { next if (!$s); push(@titles, &server_name($s)); push(@links, "edit_host.cgi?id=$h->{'id'}"); - push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.gif"); + push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.svg"); $gothost{$h->{'id'}}++; } if (@links) { diff --git a/cluster-software/edit_pack.cgi b/cluster-software/edit_pack.cgi index ed0c63f52..71f310a6a 100755 --- a/cluster-software/edit_pack.cgi +++ b/cluster-software/edit_pack.cgi @@ -84,7 +84,7 @@ print &ui_buttons_end(); # Show hosts with the package print &ui_hr(); print &ui_subheading($text{'edit_hosts'}); -@icons = map { "/servers/images/$_->{'type'}.gif" } @got; +@icons = map { "/servers/images/$_->{'type'}.svg" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; @titles = map { ($_->{'desc'} ? $_->{'desc'} : $_->{'realhost'} ? "$_->{'realhost'}:$_->{'port'}" : diff --git a/cluster-software/index.cgi b/cluster-software/index.cgi index e0cf823a6..e79e5f87e 100755 --- a/cluster-software/index.cgi +++ b/cluster-software/index.cgi @@ -30,7 +30,7 @@ foreach $h (@hosts) { "$s->{'host'}:$s->{'port'}")."
". &text('index_count', $count)); push(@links, "edit_host.cgi?id=$h->{'id'}"); - push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.gif"); + push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.svg"); push(@installed, $count); $gothost{$h->{'id'}}++; } diff --git a/cluster-useradmin/edit_group.cgi b/cluster-useradmin/edit_group.cgi index 49796cfce..7a2a656f4 100755 --- a/cluster-useradmin/edit_group.cgi +++ b/cluster-useradmin/edit_group.cgi @@ -94,8 +94,8 @@ foreach $h (@hosts) { if ($og) { local ($s) = grep { $_->{'id'} == $h->{'id'} } @servers; push(@icons, &get_webprefix() ? - (&get_webprefix()."/servers/images/".$s->{'type'}.".gif") : - ("../servers/images/".$s->{'type'}.".gif")); + (&get_webprefix()."/servers/images/".$s->{'type'}.".svg") : + ("../servers/images/".$s->{'type'}.".svg")); push(@links, "edit_host.cgi?id=$h->{'id'}"); push(@titles, $s->{'desc'} ? $s->{'desc'} : $s->{'host'}); } diff --git a/cluster-useradmin/edit_user.cgi b/cluster-useradmin/edit_user.cgi index c0fdfe869..10bb5c35b 100755 --- a/cluster-useradmin/edit_user.cgi +++ b/cluster-useradmin/edit_user.cgi @@ -409,8 +409,8 @@ foreach $h (@hosts) { if ($ou) { local ($s) = grep { $_->{'id'} == $h->{'id'} } @servers; push(@icons, &get_webprefix() ? - (&get_webprefix()."/servers/images/".$s->{'type'}.".gif") : - ("../servers/images/".$s->{'type'}.".gif")); + (&get_webprefix()."/servers/images/".$s->{'type'}.".svg") : + ("../servers/images/".$s->{'type'}.".svg")); push(@links, "edit_host.cgi?id=$h->{'id'}"); push(@titles, $s->{'desc'} ? $s->{'desc'} : $s->{'host'}); } diff --git a/cluster-useradmin/index.cgi b/cluster-useradmin/index.cgi index d71793e0e..3cb333126 100755 --- a/cluster-useradmin/index.cgi +++ b/cluster-useradmin/index.cgi @@ -27,7 +27,7 @@ foreach $h (@hosts) { push(@titles, &server_name($s)); push(@links, $link); push(@icons, &get_webprefix()."/servers/images/". - $s->{'type'}.".gif"); + $s->{'type'}.".svg"); push(@installed, @{$h->{'packages'}}); $gothost{$h->{'id'}}++; } diff --git a/cluster-usermin/edit_mod.cgi b/cluster-usermin/edit_mod.cgi index 345a410d8..5c294939c 100755 --- a/cluster-usermin/edit_mod.cgi +++ b/cluster-usermin/edit_mod.cgi @@ -186,7 +186,7 @@ print "\n"; # Show hosts with the module or theme print &ui_hr(); print &ui_subheading($text{'edit_hosts'}); -@icons = map { "/servers/images/$_->{'type'}.gif" } @got; +@icons = map { "/servers/images/$_->{'type'}.svg" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; @titles = map { &server_name($_). ($_->{'module'}->{'version'} ? " ($text{'host_version2'} $_->{'module'}->{'version'})" : "") } @got; diff --git a/cluster-usermin/index.cgi b/cluster-usermin/index.cgi index 0859ff7a7..848a6b1f1 100755 --- a/cluster-usermin/index.cgi +++ b/cluster-usermin/index.cgi @@ -25,7 +25,7 @@ foreach $h (@hosts) { push(@titles, &server_name($s)."
". &text('index_version', $h->{'version'})); push(@links, "edit_host.cgi?id=$h->{'id'}"); - push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.gif"); + push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.svg"); $gothost{$h->{'id'}}++; } if (@links) { diff --git a/cluster-webmin/edit_group.cgi b/cluster-webmin/edit_group.cgi index 9831d3570..7a3dabcde 100755 --- a/cluster-webmin/edit_group.cgi +++ b/cluster-webmin/edit_group.cgi @@ -147,7 +147,7 @@ print "\n"; # Show hosts with the group print &ui_hr(); print &ui_subheading($text{'group_hosts'}); -@icons = map { "/servers/images/$_->{'type'}.gif" } @got; +@icons = map { "/servers/images/$_->{'type'}.svg" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; @titles = map { &server_name($_) } @got; &icons_table(\@links, \@titles, \@icons); diff --git a/cluster-webmin/edit_mod.cgi b/cluster-webmin/edit_mod.cgi index ad768a1b3..80d1b669c 100755 --- a/cluster-webmin/edit_mod.cgi +++ b/cluster-webmin/edit_mod.cgi @@ -235,7 +235,7 @@ print "\n"; # Show hosts with the module or theme print &ui_hr(); print &ui_subheading($text{'edit_hosts'}); -@icons = map { "/servers/images/$_->{'type'}.gif" } @got; +@icons = map { "/servers/images/$_->{'type'}.svg" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; @titles = map { &server_name($_). ($_->{'module'}->{'version'} ? " ($text{'host_version2'} $_->{'module'}->{'version'})" : "") } @got; diff --git a/cluster-webmin/edit_user.cgi b/cluster-webmin/edit_user.cgi index eb10bdf7a..29b587697 100755 --- a/cluster-webmin/edit_user.cgi +++ b/cluster-webmin/edit_user.cgi @@ -211,7 +211,7 @@ print "\n"; # Show hosts with the user print &ui_hr(); print &ui_subheading($text{'user_hosts'}); -@icons = map { "/servers/images/$_->{'type'}.gif" } @got; +@icons = map { "/servers/images/$_->{'type'}.svg" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; @titles = map { &server_name($_) } @got; &icons_table(\@links, \@titles, \@icons); diff --git a/cluster-webmin/index.cgi b/cluster-webmin/index.cgi index c4ad74a17..bde267cdc 100755 --- a/cluster-webmin/index.cgi +++ b/cluster-webmin/index.cgi @@ -27,7 +27,7 @@ foreach $h (@hosts) { push(@titles, &server_name($s)."
". &text('index_version', $h->{'version'})); push(@links, "edit_host.cgi?id=$h->{'id'}"); - push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.gif"); + push(@icons, "@{[&get_webprefix()]}/servers/images/$s->{'type'}.svg"); $gothost{$h->{'id'}}++; } if (@links) {