Development

This commit is contained in:
Matthew Grotke 2026-05-27 22:20:33 -04:00
parent ba16b123df
commit 513de6b62b

View file

@ -1246,7 +1246,7 @@ def _render_item(item, tokens, inherited_req=None):
'<tr>' '<tr>'
'<td class="identity-input-label">Hostname (Opt):</td>' '<td class="identity-input-label">Hostname (Opt):</td>'
'<td>' '<td>'
'<div class="form-group" style="margin:0">' '<div class="form-group field-wrap" style="margin:0">'
'<input type="text" class="form-input inline-edit-input identity-host-input"' '<input type="text" class="form-input inline-edit-input identity-host-input"'
' data-validate="networkname"/>' ' data-validate="networkname"/>'
'<p class="form-hint field-dyn-hint hidden"></p>' '<p class="form-hint field-dyn-hint hidden"></p>'
@ -1291,6 +1291,7 @@ def _render_item(item, tokens, inherited_req=None):
return ( return (
'<div class="form-group">' '<div class="form-group">'
'<label class="form-label">Subnet</label>' '<label class="form-label">Subnet</label>'
'<div class="field-wrap">'
'<div class="subnet-row-wrap">' '<div class="subnet-row-wrap">'
f'<input type="text" name="{subnet_name}" value="{e(subnet_val)}" placeholder="{subnet_ph}" class="form-input"/>' f'<input type="text" name="{subnet_name}" value="{e(subnet_val)}" placeholder="{subnet_ph}" class="form-input"/>'
'<span class="subnet-sep">/</span>' '<span class="subnet-sep">/</span>'
@ -1299,6 +1300,7 @@ def _render_item(item, tokens, inherited_req=None):
f'<span class="subnet-dotted">{e(dotted)}</span>' f'<span class="subnet-dotted">{e(dotted)}</span>'
'<p class="form-hint field-dyn-hint hidden"></p>' '<p class="form-hint field-dyn-hint hidden"></p>'
'</div>' '</div>'
'</div>'
) )
if t == 'editable_list': if t == 'editable_list':
@ -1396,11 +1398,17 @@ def _render_field(item, tokens):
depends = item.get('depends', []) depends = item.get('depends', [])
validate_attr = f' data-validate="{e(validate)}"' if validate else '' validate_attr = f' data-validate="{e(validate)}"' if validate else ''
depends_attr = f' data-depends="{e(",".join(depends))}"' if depends else '' depends_attr = f' data-depends="{e(",".join(depends))}"' if depends else ''
dyn_hint = '<p class="form-hint field-dyn-hint hidden"></p>' if validate else '' if validate:
return (
f'<div class="form-group"><label class="form-label">{label}</label>'
f'<div class="field-wrap"><select name="{name}" class="form-select"{validate_attr}{depends_attr}>{opts_html}</select>'
f'<p class="form-hint field-dyn-hint hidden"></p></div>'
f'{hint_html}</div>'
)
return ( return (
f'<div class="form-group"><label class="form-label">{label}</label>' f'<div class="form-group"><label class="form-label">{label}</label>'
f'<select name="{name}" class="form-select"{validate_attr}{depends_attr}>{opts_html}</select>' f'<select name="{name}" class="form-select"{validate_attr}{depends_attr}>{opts_html}</select>'
f'{hint_html}{dyn_hint}</div>' f'{hint_html}</div>'
) )
if input_type == 'number': if input_type == 'number':
@ -1419,12 +1427,12 @@ def _render_field(item, tokens):
return ( return (
'<div class="form-group" style="display:flex;align-items:center;gap:0.75em">' '<div class="form-group" style="display:flex;align-items:center;gap:0.75em">'
f'<label class="form-label" style="margin:0;white-space:nowrap">{label}</label>' f'<label class="form-label" style="margin:0;white-space:nowrap">{label}</label>'
f'<div style="width:6rem">{inp}{dyn_hint_html}</div>' f'<div class="field-wrap" style="width:6rem">{inp}{dyn_hint_html}</div>'
f'{hint_html}</div>' f'{hint_html}</div>'
) )
return ( return (
f'<div class="form-group"><label class="form-label">{label}</label>' f'<div class="form-group"><label class="form-label">{label}</label>'
f'{inp}{dyn_hint_html}{hint_html}</div>' f'<div class="field-wrap">{inp}{dyn_hint_html}</div>{hint_html}</div>'
) )
if input_type == 'textarea': if input_type == 'textarea':
@ -1550,12 +1558,19 @@ def _render_field(item, tokens):
depends = item.get('depends', []) depends = item.get('depends', [])
validate_attr = f' data-validate="{e(validate)}"' if validate else '' validate_attr = f' data-validate="{e(validate)}"' if validate else ''
depends_attr = f' data-depends="{e(",".join(depends))}"' if depends else '' depends_attr = f' data-depends="{e(",".join(depends))}"' if depends else ''
dyn_hint = '<p class="form-hint field-dyn-hint hidden"></p>' if validate else '' if validate:
return (
f'<div class="form-group"><label class="form-label">{label}</label>'
f'<div class="field-wrap"><input type="{e(input_type)}" name="{name}" value="{e(value)}"'
f' placeholder="{placeholder}" class="form-input"{readonly}{validate_attr}{depends_attr}/>'
f'<p class="form-hint field-dyn-hint hidden"></p></div>'
f'{hint_html}</div>'
)
return ( return (
f'<div class="form-group"><label class="form-label">{label}</label>' f'<div class="form-group"><label class="form-label">{label}</label>'
f'<input type="{e(input_type)}" name="{name}" value="{e(value)}"' f'<input type="{e(input_type)}" name="{name}" value="{e(value)}"'
f' placeholder="{placeholder}" class="form-input"{readonly}{validate_attr}{depends_attr}/>' f' placeholder="{placeholder}" class="form-input"{readonly}{validate_attr}{depends_attr}/>'
f'{hint_html}{dyn_hint}</div>' f'{hint_html}</div>'
) )