Update UI

JamalIrby · Sep 12, 2022 · 6d3434b · 6d3434b
1 parent ac3c5a8
commit 6d3434b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/main/templates/main/assignment-view.html b/main/templates/main/assignment-view.html
@@ -62,7 +62,7 @@ <h6 class="text-muted fw-bold fst-italic mt-3">Showing all submissions:</h6>
                <th class="text-center" scope="col">Student name</th>
                <th class="text-center" scope="col">Submitted file</th>
                <th class="text-center" scope="col">Submitted on</th>
-               <th class="text-center" style="width:15%" scope="col">Grade</th>
+               <th class="text-center" scope="col" style="min-width: 150px;">Grade</th>
             </tr>
          </thead>
          <tbody>
@@ -80,7 +80,7 @@ <h6 class="text-muted fw-bold fst-italic mt-3">Showing all submissions:</h6>
                   href="{{submission.file.url}}">Download</a></td>
                <td class="text-center">{{submission.submission_date}}</td>
                {% if submission %}
-               <td class="text-center">
+               <td class="text-center" style="min-width: 150px;">
                   <form action="{% url 'gradeSubmission' course.code assignment.id submission.id %}"
                      method="post">
                      {% csrf_token %}
@@ -95,7 +95,7 @@ <h6 class="text-muted fw-bold fst-italic mt-3">Showing all submissions:</h6>
                      </div>
                </td>
                {% else %}
-               <td class="text-center">
+               <td class="text-center" style="min-width: 150px;">
                <form action="{% url 'gradeSubmission' course.code assignment.id submission.id %}"
                   method="post">
                {% csrf_token %}

diff --git a/main/templates/main/faculty_course.html b/main/templates/main/faculty_course.html
@@ -88,17 +88,15 @@ <h5 class="fw-bold" style="color: rgb(10, 10, 48);"><img src="{% static 'images/
       <div>
          {% for announcement in announcements %}
          <!-- individual announcement starts -->
-         <h6 class="fw-bold">{{announcement.title}}</h6>
-         <div class="fs-6 text-break opacity-75">{{announcement.description}}</div>
-         <div class="d-flex justify-content-between mb-2">
+         <div class="d-flex justify-content-start align-items-center">
+            <h6 class="fw-bold" style="margin-bottom:0">{{announcement.title}}</h6>
             <div>
-               <button type="button" class="btn btn-sm btn-outline-danger" data-bs-toggle="modal"
+               <button type="button" class="btn btn-sm btn-outline-danger" style="border:none" data-bs-toggle="modal"
                   data-bs-target="#announcement{{announcement.id}}">
                   <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
                      <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
                      <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
                   </svg>
-                  Delete
                </button>
                <!-- Popup -->
                <div class="modal fade" id="announcement{{announcement.id}}" data-bs-backdrop="static" data-bs-keyboard="false"
@@ -122,15 +120,19 @@ <h6 class="fw-bold">{{announcement.title}}</h6>
                      </div>
                   </div>
                </div>
-               <a class="btn btn-sm btn-outline-primary px-3"
+               <a class="btn btn-sm btn-outline-primary" style="border:none"
                   href="{% url 'editAnnouncement' course.code announcement.id %}">
                   <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="currentColor" class="bi bi-pencil-square" viewBox="0 0 16 16">
                      <path d="M15.502 1.94a.5.5 0 0 1 0 .706L14.459 3.69l-2-2L13.502.646a.5.5 0 0 1 .707 0l1.293 1.293zm-1.75 2.456-2-2L4.939 9.21a.5.5 0 0 0-.121.196l-.805 2.414a.25.25 0 0 0 .316.316l2.414-.805a.5.5 0 0 0 .196-.12l6.813-6.814z"/>
                      <path fill-rule="evenodd" d="M1 13.5A1.5 1.5 0 0 0 2.5 15h11a1.5 1.5 0 0 0 1.5-1.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 1-.5.5h-11a.5.5 0 0 1-.5-.5v-11a.5.5 0 0 1 .5-.5H9a.5.5 0 0 0 0-1H2.5A1.5 1.5 0 0 0 1 2.5v11z"/>
                   </svg>
-                  &nbsp; Edit
                </a>
             </div>
+         </div>
+
+         <div class="fs-6 text-break opacity-75">{{announcement.description}}</div>
+         <div class="d-flex justify-content-between mb-2">
+            <span></span>
             <div class="add-announcement" style="color:grey;">
                {{announcement.post_date}}
             </div>