diff --git a/dhcp-hosts.dpto2 b/dhcp-hosts.dpto2 index 025aa50..1e4939b 100644 --- a/dhcp-hosts.dpto2 +++ b/dhcp-hosts.dpto2 @@ -98,7 +98,7 @@ ff:ff:ff:ff:ff:fe,10.6.122.95 00:23:54:8c:65:13,10.6.122.96,set:client0023548c6513 ff:ff:ff:ff:ff:fe,10.6.122.97 ff:ff:ff:ff:ff:fe,10.6.122.98 -# {"color": "purple", "reserved-by": "Zelda"} +# {"color": "red", "reserved-by": "Zelda"} ff:ff:ff:ff:ff:fe,10.6.122.99 ff:ff:ff:ff:ff:fe,10.6.122.100 # {"reserved-by": "Andy"} diff --git a/templates/ip.html b/templates/ip.html index f8304e2..524d9ea 100644 --- a/templates/ip.html +++ b/templates/ip.html @@ -12,25 +12,27 @@ {% if meta.locked %} -
Esta dirección está reservada por Ilúvatar
+
+
Esta dirección está reservada por Ilúvatar
+
{% endif %}
{% if meta.locked %} -
+
{% endif %}
-
- - -
-
+
+ + +
+
-
- {% set meta_color = "black" %} - {% if meta.color %}{% set meta_color = meta.color %}{% endif %} +
+ {% set meta_color = "black" %} + {% if meta.color %}{% set meta_color = meta.color %}{% endif %} - {% for color in valid_colors %} - - {% endfor %} - + {% for color in valid_colors %} + + {% endfor %} + +
-
@@ -132,7 +134,11 @@ $("#dhcp-specific-fieldset").prop("disabled", !$("#dhcp-client-specific").prop("checked")); }) $(".color-sample").click(function() { - if ($("#label-fieldset").prop("disabled")) + var disabled = false; + $(this).parents("fieldset").each(function() { + disabled = $(this).prop("disabled") || disabled; + }); + if (disabled) return; $(".color-sample").removeClass("selected"); $(this).addClass("selected");