From 5893920d69070384dbe99d0e2e0c4f1f2a6d20da Mon Sep 17 00:00:00 2001
From: MOIS3Y <s.zhukovskii@ispsystem.com>
Date: Sun, 10 Sep 2023 16:35:30 +0900
Subject: [PATCH] Modify: ticket and archive cards

---
 .../collector/includes/modal_ticket.html      |  2 +-
 .../collector/includes/ticket_archives.html   | 59 +++++++++----------
 .../collector/includes/ticket_info.html       | 20 +++++--
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/logs_collector/collector/templates/collector/includes/modal_ticket.html b/logs_collector/collector/templates/collector/includes/modal_ticket.html
index d8ba4b3..418d288 100644
--- a/logs_collector/collector/templates/collector/includes/modal_ticket.html
+++ b/logs_collector/collector/templates/collector/includes/modal_ticket.html
@@ -9,7 +9,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title" id="LabelTicket">
-          Delete ticket #{{ ticket.number }} ?
+          Delete ticket {{ ticket.number }}?
         </h5>
         <button
           type="button"
diff --git a/logs_collector/collector/templates/collector/includes/ticket_archives.html b/logs_collector/collector/templates/collector/includes/ticket_archives.html
index 2e55656..135d39a 100644
--- a/logs_collector/collector/templates/collector/includes/ticket_archives.html
+++ b/logs_collector/collector/templates/collector/includes/ticket_archives.html
@@ -2,37 +2,32 @@
 <li 
   id="li-archive-{{ archive.id }}"
   class="list-group-item list-group-item-action">
-  <smal>
-    <b>File:</b>
-    <span style="word-wrap: break-word">{{ archive.file.name|clean_filename }}</span>
-  </small>
-  <small>
-    <br>
-    <b>MD5:</b>
-    <span style="word-wrap: break-word">{{ archive.md5 }}</span>
-  </small>
-  <small>
-    <br>
-    <b>Uploaded:</b>
-    <span style="word-wrap: break-word">{{ archive.time_update|date:"D d.m.y H:i" }}</span>
-  </small>
-    <br>
-  <small>
-    <b>Size:</b>
-    <span style="word-wrap: break-word">{{ archive.size|filesizeformat }}</span>
-  </small>
-  <div class="row">
-    <div class="d-flex justify-content-sm-start justify-content-between" >
-      <a
-        class="btn btn-outline-success btn-sm mt-2"
-        href="{{ archive.get_absolute_url }}"
-      ><i class="bi bi-download"></i> GET</a>
-      <button
-        button type="button"
-        class="btn btn-outline-danger btn-sm ms-2 mt-2"
-        data-bs-toggle="modal"
-        data-bs-target="#modal-archive-del-{{ archive.id }}"
-      ><i class="bi bi-trash"></i> DEL</button>
-    </div>
+  <div class="input-group input-group-sm mb-1">
+    <span class="input-group-text" style="width: 60px">File</span>
+    <input type="text" class="form-control" value="{{ archive.file.name|clean_filename }}" disabled readonly>
+  </div>
+  <div class="input-group input-group-sm mb-1">
+    <span class="input-group-text" style="width: 60px">MD5</span>
+    <input type="text" class="form-control" value="{{ archive.md5 }}" disabled readonly>
+  </div>
+  <div class="input-group input-group-sm mb-1">
+    <span class="input-group-text" style="width: 60px">Time</span>
+    <input type="text" class="form-control" value="{{ archive.time_update|date:"D d.m.y H:i" }}" disabled readonly>
+  </div>
+  <div class="input-group input-group-sm mb-1">
+    <span class="input-group-text" style="width: 60px">Size</span>
+    <input type="text" class="form-control" value="{{ archive.size|filesizeformat }}" disabled readonly>
+  </div>
+  <div class="d-flex justify-content-sm-start justify-content-between" >
+    <a
+      class="btn btn-outline-success btn-sm mt-2"
+      href="{{ archive.get_absolute_url }}"
+    ><i class="bi bi-download"></i> GET</a>
+    <button
+      button type="button"
+      class="btn btn-outline-danger btn-sm ms-2 mt-2"
+      data-bs-toggle="modal"
+      data-bs-target="#modal-archive-del-{{ archive.id }}"
+    ><i class="bi bi-trash"></i> DEL</button>
   </div>
 </li>
diff --git a/logs_collector/collector/templates/collector/includes/ticket_info.html b/logs_collector/collector/templates/collector/includes/ticket_info.html
index c799c28..9374b20 100644
--- a/logs_collector/collector/templates/collector/includes/ticket_info.html
+++ b/logs_collector/collector/templates/collector/includes/ticket_info.html
@@ -1,9 +1,9 @@
 <div class="d-sm-flex w-100 justify-content-between mb-2">
-  <h4 class="card-title mb-1">Ticket: {{ ticket.number }}</h4>
+  <h4 class="card-title mb-1"><i class="bi bi-bookmarks"></i> Ticket: {{ ticket.number }}</h4>
   <small><i class="bi bi-clock-history"></i> {{ ticket.time_create|date:"D d.m.y H:i" }}</small>
 </div>
-<div class="form-check form-switch form-check-reverse d-flex w-100 justify-content-left">
-  <label class="form-check-label" for="ticket-state">Resolved:</label>
+<div class="form-check form-switch form-check-reverse d-flex w-100 justify-content-left mb-2">
+  <label class="form-check-label" for="ticket-state"><i class="bi bi-award"></i> Resolved:</label>
   <input 
     class="form-check-input ms-2 mb-2"
     type="checkbox"
@@ -14,8 +14,18 @@
     {% if ticket.resolved %} checked {% endif %}>
 </div>
 <div class="col-xl-6 mb-2">
-  <h6 class="card-title mb-1">Platform: {{ ticket.platform.pretty_name }}</h6>
-  <h6 class="card-title mb-3">Owner: {{ ticket.user.username }}</h6>
+  <h6 class="card-title mb-1">
+    <small class="me-1"><i class="bi bi-box"></i></small>
+    Platform: {{ ticket.platform.pretty_name }}
+  </h6>
+  <h6 class="card-title mb-1">
+    <small class="me-1"><i class="bi bi-person-circle"></i></small>
+    User: {{ ticket.user.username }}
+  </h6>
+  <h6 class="card-title mb-3">
+    <small class="me-1"><i class="bi bi-clock-history"></i></small>
+    Last modified: {{ ticket.time_update|date:"d.m.y H:i" }}
+  </h6>
   <!-- Token -->
   <div class="input-group input-group mb-3">
     <span class="input-group-text" id="inputGroup-sizing-sm"><i class="bi bi-key"></i></span>