ereuse
/
devicehub-django
8
0
Fork 0
Code Issues 5 Pull Requests 2 Packages Projects Releases Wiki Activity

WIP: rework/properties #31

Draft
rskthomas wants to merge 19 commits from rework/properties into main
pull from: rework/properties
merge into: ereuse:main
Conversation 0 Commits 19 Files Changed 25 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b7d7b9041d - Show all commits

4
device/templates/details.html
View File

@ -15,7 +15,7 @@
<a href="#details" class="nav-link active" data-bs-toggle="tab" data-bs-target="#details">{% trans 'General details' %}</a> <a href="#details" class="nav-link active" data-bs-toggle="tab" data-bs-target="#details">{% trans 'General details' %}</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#annotations" class="nav-link" data-bs-toggle="tab" data-bs-target="#annotations">{% trans 'User properties' %}</a> <a href="#user_properties" class="nav-link" data-bs-toggle="tab" data-bs-target="#user_properties">{% trans 'User properties' %}</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#documents" class="nav-link" data-bs-toggle="tab" data-bs-target="#documents">{% trans 'Documents' %}</a> <a href="#documents" class="nav-link" data-bs-toggle="tab" data-bs-target="#documents">{% trans 'Documents' %}</a>
@ -100,7 +100,7 @@
{% endfor %} {% endfor %}
</div> </div>
<div class="tab-pane fade" id="annotations"> <div class="tab-pane fade" id="user_properties">
<div class="btn-group mt-1 mb-3"> <div class="btn-group mt-1 mb-3">
<a href="{% url 'device:add_user_property' object.pk %}" class="btn btn-primary"> <a href="{% url 'device:add_user_property' object.pk %}" class="btn btn-primary">
<i class="bi bi-plus"></i> <i class="bi bi-plus"></i>

4
evidence/templates/ev_details.html
View File

@ -45,7 +45,7 @@
</th> </th>
</tr> </tr>
</thead> </thead>
{% for snap in object.annotations %} {% for snap in object.properties %}
<tbody> <tbody>
{% if snap.type == 0 %} {% if snap.type == 0 %}
<tr> <tr>
@ -94,7 +94,7 @@
</div> </div>
{% if form.tag.value %} {% if form.tag.value %}
<div class="col-1"> <div class="col-1">
<a class="btn btn-yellow" href="{% url 'evidence:delete_annotation' form.pk %}">{% translate "Delete" %}</a> <a class="btn btn-yellow" href="{% url 'evidence:delete_user_property' form.pk %}">{% translate "Delete" %}</a>
</div> </div>
{% endif %} {% endif %}
</div> </div>