Home Information - Your home, your data, organized.
Python
Improved styling of collectionn views.
Anthony Cassandra285492f60fcc
diff --git a/src/hi/apps/collection/templates/collection/panes/collection_view.html b/src/hi/apps/collection/templates/collection/panes/collection_view.htmlindex 0bf90aba..76361e64 100644--- a/src/hi/apps/collection/templates/collection/panes/collection_view.html+++ b/src/hi/apps/collection/templates/collection/panes/collection_view.html@@ -1,21 +1,21 @@<div id="hi-collection-view-main" class="hi-collection-view draggable-container">- <h5><sub>COLLECTION:</sub> {{ collection.name }}</h5>-+ <div class="h4"><small>Collection:</small> {{ collection.name }}</div>+{% if collection.collection_view_type.is_grid %}<div class="row">{% for entity_status_data in entity_status_data_list %}<div id="{{ entity_status_data.entity.html_id }}"- class="{% if entity_status_data_list|length == 1 %}col-12{% elif entity_status_data_list|length <= 4 %}col-6{% else %}col-4{% endif %} {% if request.view_parameters.is_editing %}draggable{% endif %}"+ class="{% if entity_status_data_list|length == 1 %}col-12{% elif entity_status_data_list|length <= 4 %}col-6{% else %}col-4{% endif %} {% if request.view_parameters.is_editing %}draggable{% endif %} mb-2"{% if request.view_parameters.is_editing %}draggable="true"{% endif %} >{% include "entity/panes/entity_status_card.html" with entity_status_data=entity_status_data %}</div>{% empty %}<div><em>No entities in collection.</em></div>- {% endfor %}+ {% endfor %}</div>-+{% else %}-+{% for entity_status_data in entity_status_data_list %}<div id="{{ entity_status_data.entity.html_id }}"class="{% if request.view_parameters.is_editing %}draggable{% endif %}"@@ -29,4 +29,3 @@{% endif %}</div>-diff --git a/src/hi/apps/control/templates/control/panes/controller_data.html b/src/hi/apps/control/templates/control/panes/controller_data.htmlindex 5cb90a35..2025131d 100644--- a/src/hi/apps/control/templates/control/panes/controller_data.html+++ b/src/hi/apps/control/templates/control/panes/controller_data.html@@ -6,7 +6,7 @@method="post"class="form" data-async="#hi-controller-{{ controller_data.controller.id }}-{{ unique_id }}" data-mode="replace">{% csrf_token %}-+{% include_with_fallback controller_data.controller.entity_state.entity_state_type.controller_template_name "control/panes/controller_default.html" %}{% if controller_data.error_list %}<div class="text-danger">diff --git a/src/hi/apps/entity/enums.py b/src/hi/apps/entity/enums.pyindex 110e2b6a..bff382d2 100644--- a/src/hi/apps/entity/enums.py+++ b/src/hi/apps/entity/enums.py@@ -149,6 +149,10 @@ class EntityStateType(LabeledEnum):"""return f'control/panes/controller_{self.name.lower()}.html'+ @property+ def suppress_display_name(self):+ return bool( self in { EntityStateType.VIDEO_STREAM })+class EntityStateValue(LabeledEnum):diff --git a/src/hi/apps/entity/models.py b/src/hi/apps/entity/models.pyindex 825dc63b..88fb4e4f 100644--- a/src/hi/apps/entity/models.py+++ b/src/hi/apps/entity/models.py@@ -207,7 +207,7 @@ class EntityState( models.Model ):choices_map = EntityStateValue.entity_state_value_choices()return choices_map.get( self.entity_state_type, [] )-+class EntityStateDelegation(models.Model):"""An EntityState associated with a Sensor or Controller is often servingdiff --git a/src/hi/apps/entity/templates/entity/modals/entity_edit.html b/src/hi/apps/entity/templates/entity/modals/entity_edit.htmlindex 93ce3766..d7fcd1ff 100644--- a/src/hi/apps/entity/templates/entity/modals/entity_edit.html+++ b/src/hi/apps/entity/templates/entity/modals/entity_edit.html@@ -1,7 +1,7 @@{% extends "modals/action_done.html" %}{% block title_text %}-{{ entity.name }}+{{ entity.name }}: Edit{% endblock %}{% block body %}diff --git a/src/hi/apps/entity/templates/entity/modals/entity_status.html b/src/hi/apps/entity/templates/entity/modals/entity_status.htmlindex 2951383f..c352ca06 100644--- a/src/hi/apps/entity/templates/entity/modals/entity_status.html+++ b/src/hi/apps/entity/templates/entity/modals/entity_status.html@@ -1,28 +1,30 @@-{% extends "modals/action_done.html" %}+{% extends "modals/action_3.html" %}{% block title_text %}-{{ entity.name }}+{{ entity.name }}: Status{% endblock %}{% block body %}-{% include "entity/panes/entity_state_status_card.html" with entity_state_status_data_list=entity_state_status_data_list %}+{% endblock %}-<div class="d-flex justify-content-between">- <div>- <a class="btn btn-primary"- href="{% url 'entity_edit' entity_id=entity.id %}"- data-async="modal">- EDIT- </a>- </div>- <div>- <a class="btn btn-primary"- href="{% url 'entity_state_history' entity_id=entity.id %}"- data-async="modal">- HISTORY- </a>- </div>-</div>+{% block action_left %}+<a class="btn btn-primary"+ href="{% url 'entity_edit' entity_id=entity.id %}"+ data-async="modal">+ EDIT+</a>+{% endblock %}++{% block action_center %}+<a class="btn btn-primary"+ href="{% url 'entity_state_history' entity_id=entity.id %}"+ data-async="modal">+ HISTORY+</a>+{% endblock %}+{% block action_right %}+<a id="hi-modal-done" role="button" {% if autofocus %}autofocus="autofocus"{% endif %}+ class="btn btn-lg btn-secondary" href="#" data-dismiss="modal">DONE</a>{% endblock %}diff --git a/src/hi/apps/entity/templates/entity/panes/entity_state_status_card.html b/src/hi/apps/entity/templates/entity/panes/entity_state_status_card.htmlindex 3fdbe0a5..6970b3dc 100644--- a/src/hi/apps/entity/templates/entity/panes/entity_state_status_card.html+++ b/src/hi/apps/entity/templates/entity/panes/entity_state_status_card.html@@ -1,9 +1,34 @@-<ul>+<div>{% for entity_state_status_data in entity_state_status_data_list %}- <li>State: {{ entity_state_status_data.entity_state.name }}- {% include "entity/panes/entity_state_status_data.html" with entity_state_status_data=entity_state_status_data %}- </li>+ <div class="d-flex justify-content-start py-1">+ <div class="align-self-center text-center pr-3" style="min-width: 10rem">++ {% if entity_state_status_data.controller_data_list %}++ {% for controller_data in entity_state_status_data.controller_data_list %}+ {% include "control/panes/controller_data.html" with controller_data=controller_data %}+ {% endfor %}++ {% else %}++ {% with sensor_response=entity_state_status_data.latest_sensor_response %}+ {% if sensor_response %}+ {% include "sense/panes/sensor_response.html" with sensor_response=sensor_response %}+ {% else %}+ <div><em>No sensors or controllers.</em></div>+ {% endif %}+ {% endwith %}++ {% endif %}+ </div>+ {% if not entity_state_status_data.entity_state.entity_state_type.suppress_display_name %}+ <div class="align-self-center">+ {{ entity_state_status_data.entity_state.name }}+ </div>+ {% endif %}+ </div>+{% empty %}- <div><em>No state info.</em></div>+ <div><em>No status data available.</em></div>{% endfor %}-</ul>+</div>diff --git a/src/hi/apps/entity/templates/entity/panes/entity_state_status_data.html b/src/hi/apps/entity/templates/entity/panes/entity_state_status_data.htmldeleted file mode 100644index e4dcc9d6..00000000--- a/src/hi/apps/entity/templates/entity/panes/entity_state_status_data.html+++ /dev/null@@ -1,17 +0,0 @@-{% if entity_state_status_data.controller_data_list %}--{% for controller_data in entity_state_status_data.controller_data_list %}-{% include "control/panes/controller_data.html" with controller_data=controller_data %}-{% endfor %}--{% else %}--{% with sensor_response=entity_state_status_data.latest_sensor_response %}-{% if sensor_response %}-{% include "sense/panes/sensor_response.html" with sensor_response=sensor_response %}-{% else %}-<div><em>No sensors or controllers.</em></div>-{% endif %}-{% endwith %}--{% endif %}diff --git a/src/hi/apps/entity/templates/entity/panes/entity_state_status_row.html b/src/hi/apps/entity/templates/entity/panes/entity_state_status_row.htmldeleted file mode 100644index 39758841..00000000--- a/src/hi/apps/entity/templates/entity/panes/entity_state_status_row.html+++ /dev/null@@ -1,8 +0,0 @@-{% for entity_state_status_data in entity_state_status_data_list %}-<div class="col-3">State: {{ entity_state_status_data.entity_state.name }}- {% include "entity/panes/entity_state_status_data.html" with entity_state_status_data=entity_state_status_data %}-</div>--{% empty %}-<div class="col-4"><em>No state info.</em></div>-{% endfor %}diff --git a/src/hi/apps/entity/templates/entity/panes/entity_status_card.html b/src/hi/apps/entity/templates/entity/panes/entity_status_card.htmlindex 21a6f3f0..99f25f5c 100644--- a/src/hi/apps/entity/templates/entity/panes/entity_status_card.html+++ b/src/hi/apps/entity/templates/entity/panes/entity_status_card.html@@ -1,25 +1,6 @@<div>- {% with entity=entity_status_data.entity %}- <div class="d-flex justify-content-start">- <div class="display-only-svg-icon pr-2">- {% include "entity/panes/entity_display_only_svg_icon.html" with svg_icon_item=entity_status_data.display_only_svg_icon_item %}- </div>- <div>- {% if request.view_parameters.is_editing %}- <a href="{% url 'entity_details' entity_id=entity.id %}"- data-async="true">- {{ entity.name }}- </a>- {% else %}- <a href="{% url 'entity_status' entity_id=entity.id %}"- data-async="true">- {{ entity.name }}- </a>- {% endif %}- </div>+ {% include "entity/panes/entity_status_title.html" with entity_status_data=entity_status_data %}+ <div>+ {% include "entity/panes/entity_state_status_card.html" with entity_state_status_data_list=entity_status_data.entity_state_status_data_list %}</div>- {% endwith %}-- {% include "entity/panes/entity_state_status_card.html" with entity_state_status_data_list=entity_status_data.entity_state_status_data_list %}-</div>diff --git a/src/hi/apps/entity/templates/entity/panes/entity_status_row.html b/src/hi/apps/entity/templates/entity/panes/entity_status_row.htmlindex 4a54609d..0ef58da5 100644--- a/src/hi/apps/entity/templates/entity/panes/entity_status_row.html+++ b/src/hi/apps/entity/templates/entity/panes/entity_status_row.html@@ -1,27 +1,8 @@-<div class="row">- {% with entity=entity_status_data.entity %}+<div class="row border-top my-2 py-1"><div class="col-3">- <div class="d-flex justify-content-start">- <div class="display-only-svg-icon pr-2">- {% include "entity/panes/entity_display_only_svg_icon.html" with svg_icon_item=entity_status_data.display_only_svg_icon_item %}- </div>- <div>- {% if request.view_parameters.is_editing %}- <a href="{% url 'entity_details' entity_id=entity.id %}"- data-async="true">- {{ entity.name }}- </a>- {% else %}- <a href="{% url 'entity_status' entity_id=entity.id %}"- data-async="true">- {{ entity.name }}- </a>- {% endif %}- </div>- </div>+ {% include "entity/panes/entity_status_title.html" with entity_status_data=entity_status_data %}+ </div>+ <div class="col-9">+ {% include "entity/panes/entity_state_status_card.html" with entity_state_status_data_list=entity_status_data.entity_state_status_data_list %}</div>- {% endwith %}-- {% include "entity/panes/entity_state_status_row.html" with entity_state_status_data_list=entity_status_data.entity_state_status_data_list %}-</div>diff --git a/src/hi/apps/entity/templates/entity/panes/entity_status_title.html b/src/hi/apps/entity/templates/entity/panes/entity_status_title.htmlnew file mode 100644index 00000000..ac89d5e6--- /dev/null+++ b/src/hi/apps/entity/templates/entity/panes/entity_status_title.html@@ -0,0 +1,20 @@+{% with entity=entity_status_data.entity %}+<div class="d-flex justify-content-start">+ <div class="display-only-svg-icon pr-2">+ {% include "entity/panes/entity_display_only_svg_icon.html" with svg_icon_item=entity_status_data.display_only_svg_icon_item %}+ </div>+ <div>+ {% if request.view_parameters.is_editing %}+ <a href="{% url 'entity_details' entity_id=entity.id %}"+ data-async="true">+ {{ entity.name }}+ </a>+ {% else %}+ <a href="{% url 'entity_edit' entity_id=entity.id %}"+ data-async="true">+ {{ entity.name }}+ </a>+ {% endif %}+ </div>+</div>+{% endwith %}diff --git a/src/hi/apps/sense/templates/sense/panes/sensor_value_default.html b/src/hi/apps/sense/templates/sense/panes/sensor_value_default.htmlindex 0ed7a856..869f84f1 100644--- a/src/hi/apps/sense/templates/sense/panes/sensor_value_default.html+++ b/src/hi/apps/sense/templates/sense/panes/sensor_value_default.html@@ -1 +1 @@-<div status="{{ sensor_response.value }}">{{ sensor_response.value }}</div>+<div class="px-2" status="{{ sensor_response.value }}">{{ sensor_response.value }}</div>diff --git a/src/hi/static/css/main.css b/src/hi/static/css/main.cssindex 4e510696..01091bc2 100644--- a/src/hi/static/css/main.css+++ b/src/hi/static/css/main.css@@ -424,6 +424,14 @@ g[status="low"] {filter: drop-shadow(0 0 5px var(--status-bad-color));}+div[status] {+ color: var(--black);+ background-color: var(--white);+ border-color: var(--black);+ border-style: solid;+ border-width: 2px;+ border-radius: 8px;+}div[status="active"] {color: var(--on-status-active-color);background-color: var(--status-active-color);@@ -448,6 +456,7 @@ div[status="closed"] {color: var(--on-status-idle-color);background-color: var(--status-idle-color);}+div[status="RAID_OK"],div[status="connected"] {color: var(--on-status-ok-color);background-color: var(--status-ok-color);diff --git a/src/hi/templates/modals/action_3.html b/src/hi/templates/modals/action_3.htmlnew file mode 100644index 00000000..9114c8ea--- /dev/null+++ b/src/hi/templates/modals/action_3.html@@ -0,0 +1,16 @@+{% extends "modals/base.html" %}++{% block footer %}+<div class="align-self-center">+ {% block action_left %}+ {% endblock %}+</div>+<div class="align-self-center">+ {% block action_center %}+ {% endblock %}+</div>+<div class="align-self-center">+ {% block action_right %}+ {% endblock %}+</div>+{% endblock %}