From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 6/8] extrahd.cgi: Display mount status next to the corresponding drive
Date: Fri, 23 Jun 2023 06:01:22 +0200 [thread overview]
Message-ID: <20230623040124.3826-6-stefan.schantl@ipfire.org> (raw)
In-Reply-To: <20230623040124.3826-1-stefan.schantl@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2112 bytes --]
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
| 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
--git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index 533d0cdce..a4d6e2e3a 100644
--- a/html/cgi-bin/extrahd.cgi
+++ b/html/cgi-bin/extrahd.cgi
@@ -302,14 +302,31 @@ END
print <<END
</select></td>
- <td align="center"><input type='text' name='PATH' value=$mountpoint $disabled></td>
+ <td align="center"><input type='text' name='PATH' value='$mountpoint' $disabled></td>
<td align="center">
<input type='hidden' name='DEVICE' value='/dev/$partition' />
<input type='hidden' name='UUID' value='$uuids{$partition}' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'add'}' />
END
-; unless($disabled) {
- print"<input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/add.gif' />\n";
+;
+ # Check if the mountpoint refers to a known configured drive.
+ if(&is_configured($mountpoint)) {
+ print "<input type='hidden' name='ACTION' value='$Lang::tr{'delete'}'>\n";
+ print "<input type='hidden' name='PATH' value='$mountpoint'>\n";
+
+ # Check if the device is mounted properly.
+ if(&is_mounted($mountpoint)) {
+ print "<img src='/images/updbooster/updxl-led-green.gif' alt='MOUNTED' title='MOUNTED'> \n";
+ } else {
+ print "<img src='/images/updbooster/updxl-led-red.gif' alt='NOT MOUNTED' title='NOT MOUNTED'> \n";
+ }
+
+ print "<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif'>\n";
+ } else {
+ unless($disabled) {
+ print "<input type='hidden' name='ACTION' value='$Lang::tr{'add'}'>\n";
+ print "<img src='/images/updbooster/updxl-led-gray.gif' alt='UNCONFIGURED' title='UNCONFIGURED'> \n";
+ print "<input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/add.gif'>\n";
+ }
}
print <<END
--
2.39.2
next prev parent reply other threads:[~2023-06-23 4:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 4:01 [PATCH 1/8] extrahd.cgi: Add various perl functions deal with block devices Stefan Schantl
2023-06-23 4:01 ` [PATCH 2/8] extrahd.cgi: Refactor code to use new introduced perl functions Stefan Schantl
2023-06-23 4:01 ` [PATCH 3/8] extrahd.cgi: Abort if a device could not be umounted Stefan Schantl
2023-06-23 4:01 ` [PATCH 4/8] extrahd.cgi: Store configured drives in a hash Stefan Schantl
2023-06-23 4:01 ` [PATCH 5/8] extrahd.cgi: Add is_configured function Stefan Schantl
2023-06-23 4:01 ` Stefan Schantl [this message]
2023-06-23 4:01 ` [PATCH 7/8] extrahd.cgi: Re-order sanity check logic Stefan Schantl
2023-06-23 4:01 ` [PATCH 8/8] extrahd.cgi: Add missing translation strings Stefan Schantl
2023-06-25 3:43 ` [PATCH 1/8] extrahd.cgi: Add various perl functions deal with block devices jon
2023-07-01 9:19 ` Michael Tremer
2023-07-01 14:54 ` Stefan Schantl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230623040124.3826-6-stefan.schantl@ipfire.org \
--to=stefan.schantl@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox