From 9844bccd65defb357202cd14a35b802e0358c0b1 Mon Sep 17 00:00:00 2001
From: MOIS3Y <s.zhukovskii@ispsystem.com>
Date: Sun, 10 Sep 2023 12:54:54 +0900
Subject: [PATCH] Fix: width ticket page and account update form

---
 logs_collector/account/forms.py               |  1 -
 .../templates/account/profile_update.html     |  4 +-
 .../collector/templates/collector/ticket.html | 74 +++++++++----------
 3 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/logs_collector/account/forms.py b/logs_collector/account/forms.py
index 5d7941b..b3e159a 100644
--- a/logs_collector/account/forms.py
+++ b/logs_collector/account/forms.py
@@ -31,7 +31,6 @@ class UserProfileForm(forms.ModelForm):
                 ),
                 PrependedText('first_name', 'First name:'),
                 PrependedText('last_name', 'Last name:'),
-                css_class='col-lg-6'
             ),
             Submit('submit', 'Save', css_class='btn btn-primary'),
         )
diff --git a/logs_collector/account/templates/account/profile_update.html b/logs_collector/account/templates/account/profile_update.html
index 29f6dcb..acf51dc 100644
--- a/logs_collector/account/templates/account/profile_update.html
+++ b/logs_collector/account/templates/account/profile_update.html
@@ -7,7 +7,9 @@
     <h5 class="card-title">Profile</h5>
     <hr />
     <div class="row">
-      {% crispy form %}
+      <div class="col-lg-6">
+        {% crispy form %}
+      </div>
     </div>
   </div>
 {% endblock profile_update %}
diff --git a/logs_collector/collector/templates/collector/ticket.html b/logs_collector/collector/templates/collector/ticket.html
index 366552a..1c9e763 100644
--- a/logs_collector/collector/templates/collector/ticket.html
+++ b/logs_collector/collector/templates/collector/ticket.html
@@ -4,46 +4,44 @@
 {% block title %} {{ title }} {% endblock title %}
 {% block main %} 
 <div class="container mt-3">
-  <div class="row">
-    {% csrf_token %}
-    <div class="card">
-      <div class="card-body" aria-current="true">
-          {% include 'collector/includes/ticket_info.html' %}
-        <div class="col-xl-6 mt-1 mb-2">
-          {% if ticket.note %}
-            <div class="card">
-                <div class="card-header">
-                  Note:
+  {% csrf_token %}
+  <div class="card">
+    <div class="card-body" aria-current="true">
+        {% include 'collector/includes/ticket_info.html' %}
+      <div class="col-xl-6 mt-1 mb-2">
+        {% if ticket.note %}
+          <div class="card">
+              <div class="card-header">
+                Note:
+              </div>
+              <div class="card-body">
+                <div class="card-text">
+                  {{ ticket.note | markdown | safe }}
                 </div>
-                <div class="card-body">
-                  <div class="card-text">
-                    {{ ticket.note | markdown | safe }}
-                  </div>
-                </div>
-            </div>
-          {% endif %}
-        </div>
-        <!-- Logs -->
-        {% if ticket.archive_set.all %}
-            <ul class="list-group col-xl-6 mb-2 mt-2">
-              {% for archive in ticket.archive_set.all %}
-                {% include 'collector/includes/ticket_archives.html' %}
-              {% endfor %}
-            </ul>
+              </div>
+          </div>
         {% endif %}
-        <!-- Card buttons -->
-        <div class="d-flex w-100 justify-content-between">
-          <a
-            href="{% url 'collector:update' ticket.platform.name ticket.number %}"
-            class="btn btn-outline-warning mb-1 mt-1"
-          ><i class="bi bi-pencil-square"></i> Edit</a>
-          <button
-            class="btn btn-outline-danger mb-1 mt-1"
-            data-bs-toggle="modal"
-            data-bs-target="#modal-ticket-del-{{ ticket.number }}"
-          ><i class="bi bi-trash"></i> Delete
-        </button>
-        </div>
+      </div>
+      <!-- Logs -->
+      {% if ticket.archive_set.all %}
+          <ul class="list-group col-xl-6 mb-2 mt-2">
+            {% for archive in ticket.archive_set.all %}
+              {% include 'collector/includes/ticket_archives.html' %}
+            {% endfor %}
+          </ul>
+      {% endif %}
+      <!-- Card buttons -->
+      <div class="d-flex w-100 justify-content-between">
+        <a
+          href="{% url 'collector:update' ticket.platform.name ticket.number %}"
+          class="btn btn-outline-warning mb-1 mt-1"
+        ><i class="bi bi-pencil-square"></i> Edit</a>
+        <button
+          class="btn btn-outline-danger mb-1 mt-1"
+          data-bs-toggle="modal"
+          data-bs-target="#modal-ticket-del-{{ ticket.number }}"
+        ><i class="bi bi-trash"></i> Delete
+      </button>
       </div>
     </div>
   </div>