Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-11-22 16:33:17 +00:00
Code Issues Projects Releases Wiki Activity

Tweak help text and disk status message in Web UI (#337)

Browse Source 
* Bring back data important to the user to a more prominent location

* Tweak labels

* More help text

* Tweak messages shown in UI to better align with current develop
This commit is contained in:
Daniel Markstedt 2021-10-19 17:44:16 -07:00 committed by GitHub
parent 84ba78327b
commit 1cae11bcac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/web/templates/index.html
View File

@ -174,21 +174,19 @@
{% endfor %}
</tbody>
</table>
<p><small>Available disk space on the Pi: {{free_disk}} MB</small></p>
<hr/>
<details>
<summary>Attach Ethernet Adapter</summary>
<ul>
<li>Emulates a SCSI DaynaPORT Ethernet Adapter. <a href="https://github.com/akuker/RASCSI/wiki/Dayna-Port-SCSI-Link#-macintosh-setup-instructions">Host drivers required.</a></li>
<li>If you have a DHCP setup, ignore the Static IP fields.</li>
<li>
{% if bridge_configured %}
Bridge is currently configured!
{% else %}
Bridge is automatically configured when a network adapter is attached.
{% endif %}
</li>
<li>Emulates a SCSI DaynaPORT Ethernet Adapter. <a href="https://github.com/akuker/RASCSI/wiki/Dayna-Port-SCSI-Link#-macintosh-setup-instructions">Host drivers and configuration required</a>.</li>
<li>If you have a DHCP setup, choose only the interface, and ignore the Static IP fields when attaching.</li>
<li>Configure network forwarding by running easyinstall.sh, or follow the <a href="https://github.com/akuker/RASCSI/wiki/Dayna-Port-SCSI-Link#manual-setup">manual steps in the wiki</a>.</li>
{% if bridge_configured %}
<li>The <tt>rascsi_bridge</tt> interface is active and ready to be used by DaynaPORT!</li>
{% endif %}
</ul>
</details>
<table style="border: none">
@ -331,7 +329,6 @@
<li>The Generic image type is recommended for most systems</li>
<li>APPLE GENUINE and NEC GENUINE image types will make RaSCSI masquerade as a particular drive type that are recognized by Mac and PC98 systems, respectively.</li>
<li>SASI images should only be used on early X68000 or UNIX workstation systems that use this pre-SCSI standard.</li>
<li>Available disk space on the Pi: {{free_disk}} MB</li>
</ul>
</details>
<table style="border: none">

8
src/web/web.py
View File

@ -378,8 +378,8 @@ def attach():
flash(f"Attached {file_name} to SCSI ID {scsi_id} LUN {un}!")
if int(file_size) % int(expected_block_size):
flash(f"The image file size {file_size} bytes is not a multiple of \
{expected_block_size}. The image may be corrupted \
so proceed with caution.", "error")
{expected_block_size} and RaSCSI will ignore the trailing data. \
The image may be corrupted so proceed with caution.", "error")
return redirect(url_for("index"))
else:
flash(f"Failed to attach {file_name} to SCSI ID {scsi_id} LUN {un}!", "error")
@ -448,12 +448,12 @@ def device_info():
flash(f"Type: {device['device_type']}")
flash(f"Status: {device['status']}")
flash(f"File: {device['image']}")
flash(f"File Size: {device['size']} bytes")
flash(f"Parameters: {device['params']}")
flash(f"Vendor: {device['vendor']}")
flash(f"Product: {device['product']}")
flash(f"Revision: {device['revision']}")
flash(f"Block Size: {device['block_size']}")
flash(f"Block Size: {device['block_size']} bytes")
flash(f"Image Size: {device['size']} bytes")
return redirect(url_for("index"))
else:
flash(f"Failed to get device info for SCSI ID {scsi_id} LUN {un}!", "error")