diff --git a/device/templates/details.html b/device/templates/details.html
index 8ee3ec4..6d994fd 100644
--- a/device/templates/details.html
+++ b/device/templates/details.html
@@ -62,361 +62,19 @@
-
-
-
-
-
{% trans 'Details' %}
-
-
-
{% trans 'Phid' %}
-
{{ object.id }}
-
-
- {% if object.is_eraseserver %}
-
-
{% trans 'Is an erase server' %}
-
{% trans 'Yes' %}
-
- {% endif %}
-
-
-
{% trans 'Type' %}
-
{{ object.type }}
-
-
- {% if object.is_websnapshot and object.last_user_evidence %}
- {% for k, v in object.last_user_evidence.items %}
-
-
{{ k }}
-
{{ v|default:'' }}
-
- {% endfor %}
- {% else %}
-
-
{% trans 'Manufacturer' %}
-
{{ object.manufacturer|default:'' }}
-
-
-
-
{% trans 'Model' %}
-
{{ object.model|default:'' }}
-
-
-
-
{% trans 'Serial Number' %}
-
{{ object.serial_number|default:'' }}
-
- {% endif %}
-
-
-
{% trans 'Identifiers' %}
-
- {% for chid in object.hids %}
-
{{ chid|default:'' }}
- {% endfor %}
-
-
-
-
-
-
-
-
{% trans 'Current State' %}
-
-
-
-
-
- {% trans 'State' %} |
- {% trans 'User' %} |
- {% trans 'Date' %} |
-
-
-
- {% if device_states %}
-
- {{ device_states.0.state }} |
- {{ device_states.0.user.responsable_person|default:device_states.0.user.username }} |
- {{ device_states.0.date|date:"SHORT_DATETIME_FORMAT" }} |
-
- {% else %}
-
- {% trans 'No state recorded.' %} |
-
- {% endif %}
-
-
-
+ {% include 'tabs/general_details.html' %}
-
- {% if last_note %}
-
-
{% trans 'Note' %}
-
{{ object.last_state.note }}
-
- {% endif %}
-
-
-
-
-
-
+ {% include 'tabs/log.html' %}
-
-
{% trans 'Log' %}
-
-
-
-
- {% trans 'Date' %} |
- {% trans 'User' %} |
- {% trans 'State' %} |
- {% trans 'Actions' %} |
-
-
-
- {% for state_change in device_states %}
-
- {{ state_change.date|date:"SHORT_DATETIME_FORMAT" }} |
- {{ state_change.user.responsable_person|default:state_change.user.username }} |
- {{ state_change.state }} |
-
- {% if state_change.date|timesince < '1 hour' %}
-
-
-
-
-
-
-
-
-
-
- {% trans 'Are you sure you want to undo this state?' %}
- {{ state_change.state }} - {{ state_change.date|date:"SHORT_DATETIME_FORMAT" }}
-
-
-
-
-
- {% endif %}
- |
-
- {% empty %}
-
- {% trans 'No state changes recorded.' %} |
-
- {% endfor %}
-
-
-
-
+ {% include 'tabs/user_properties.html' %}
-
-
+ {% include 'tabs/documents.html' %}
-
{% trans 'User properties' %}
-
-
-
-
- {% trans 'Key' %}
- |
-
- {% trans 'Value' %}
- |
-
- {% trans 'Created on' %}
- |
- |
-
-
-
- {% for a in object.get_user_properties %}
-
- {{ a.key }} |
- {{ a.value }} |
- {{ a.created }} |
-
-
-
-
-
- |
-
- {% endfor %}
-
-
-
+ {% include 'tabs/lots.html' %}
-
-{% for a in object.get_user_properties %}
-
-
-
-
-
-
{% trans "Key:" %} {{ a.key }}
-
{% trans "Value:" %} {{ a.value }}
-
{% trans "Created on:" %} {{ a.created }}
-
-
-
-
-
-{% endfor %}
+ {% include 'tabs/evidences.html' %}
-
-{% for a in object.get_user_properties %}
-
-{% endfor %}
-
-
-
-
-
{% trans 'Documents' %}
-
-
-
-
- {% trans 'Key' %}
- |
-
- {% trans 'Value' %}
- |
-
- {% trans 'Created on' %}
- |
- |
- |
-
-
-
- {% for a in object.get_user_documents %}
-
- {{ a.key }} |
- {{ a.value }} |
- {{ a.created }} |
- |
- |
-
- {% endfor %}
-
-
-
-
-
- {% for tag in lot_tags %}
-
{{ tag }}
- {% for lot in object.lots %}
- {% if lot.type == tag %}
-
- {% endif %}
- {% endfor %}
- {% endfor %}
-
-
-
-
{% trans 'Components last evidence' %}
-
- {% for c in object.components %}
-
-
-
{{ c.type }}
- {{ evidence.created }}
-
-
- {% for k, v in c.items %}
- {% if k not in 'actions,type' %}
- {{ k }}: {{ v }}
- {% endif %}
- {% endfor %}
-
-
- {% endfor %}
-
-
-
-
-
{% trans 'List of evidences' %}
-
- {% for snap in object.evidences %}
-
- {% endfor %}
-
-
-
{% if state_definitions %}
diff --git a/device/templates/tabs/components.html b/device/templates/tabs/components.html
new file mode 100644
index 0000000..db95f43
--- /dev/null
+++ b/device/templates/tabs/components.html
@@ -0,0 +1,27 @@
+
+{% load i18n %}
+
+
+ {% for tag in lot_tags %}
+
{{ tag }}
+
+ {% for lot in object.lots %}
+ {% if lot.type == tag %}
+
+ {% endif %}
+ {% endfor %}
+ {% endfor %}
+
diff --git a/device/templates/tabs/user_properties.html b/device/templates/tabs/user_properties.html
new file mode 100644
index 0000000..7058d67
--- /dev/null
+++ b/device/templates/tabs/user_properties.html
@@ -0,0 +1,132 @@
+
+{% load i18n %}
+
+