diff --git a/src/web/file_cmds.py b/src/web/file_cmds.py index c750a15f..a88fc419 100644 --- a/src/web/file_cmds.py +++ b/src/web/file_cmds.py @@ -67,9 +67,10 @@ def list_images(): files = [] for f in result.image_files_info.image_files: - # Add flag for whether an image file has an associated *.properties file + # Add properties meta data for the image, if applicable if f.name in prop_files: - prop = True + process = read_drive_properties(f"{cfg_dir}/{f.name}.{PROPERTIES_SUFFIX}") + prop = process["conf"] else: prop = False size_mb = "{:,.1f}".format(f.size / 1024 / 1024) @@ -309,10 +310,9 @@ def write_drive_properties(file_name, conf): def read_drive_properties(path_name): """ - Reads drive properties to any dir. - Either ones deployed to the images dir, or the canonical database. - Takes file path and bas (str) as argument - Returns dict with boolean status and str msg + Reads drive properties from json formatted file. + Takes (str) path_name as argument. + Returns dict with boolean status, str msg, dict conf """ from json import load try: diff --git a/src/web/static/style.css b/src/web/static/style.css index 08fdcece..cf7ebf5c 100644 --- a/src/web/static/style.css +++ b/src/web/static/style.css @@ -48,7 +48,7 @@ td.inactive { background-color:tan; } -summary { +summary.heading { color: black; font-size: large; font-weight: bold; diff --git a/src/web/templates/index.html b/src/web/templates/index.html index 013d73cd..e092d363 100644 --- a/src/web/templates/index.html +++ b/src/web/templates/index.html @@ -2,7 +2,7 @@ {% block content %}
- Current RaSCSI Configuration + Current RaSCSI Configuration