Changeset f25e8dd in Git for src/main/resources/templates/discussion.html

Timestamp:

02/05/22 22:48:19 (3 years ago)

Author:

Petar Partaloski <ppartaloski@…>

Branches:

main

Children:

2efe93e

Parents:

5b447b0

Message:

Fixed and added a better front end, improved clarity

File:

• src/main/resources/templates/discussion.html (modified) (2 diffs)

src/main/resources/templates/discussion.html

@@ -1 +1 @@
 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
-    <div th:text="${disc.getMovie() != null ? disc.getMovie().getTitle() : disc.getPerson().getName() + ' ' + disc.getPerson().getSurname()}"></div>
-    <div th:text="${disc.getTitle()}"></div>
-    <div th:text="${disc.getText()}"></div>
-    <div th:text="${disc.getDate()}"></div>
-    <div th:text="${disc.getUser().getUsername()}"></div>
-    <div th:if="${disc.getUser().equals(user)}"><a class="btn btn-primary" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Промени</a> </div>
-    <div th:if="${disc.getUser().equals(user)}"><a class="btn btn-primary button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a> </div>
-    <table class="table table-striped">
+    <div style="width: 85%; text-align: justify; margin: auto; clear: both">
+        <div>
+            <h1 th:text="${disc.getTitle()}" style="width: 80%; float: left"></h1>
+        </div>
+        <hr><br><br>
+        <div>
+            <h5 th:text="${disc.getText()}" style="width: 90%; margin: auto; background-color: lightblue; border-radius: 4px; padding: 20px"></h5>
+        </div>
+        <br><br><br>
+        <h6 style="width: 60%; float:left;">
+            <span th:text="${'Поставено од: '+disc.getUser().getUsername()}"></span>
+            <span th:text="${', на датум '+ disc.getDate()}"></span>
+            <br>
+            <span>Поставено за </span>
+            <span th:text="${disc.getMovie() != null ? 'Филмот ' + disc.getMovie().getTitle() : 'Актерот ' + disc.getPerson().getName() + ' ' + disc.getPerson().getSurname()}" ></span>
+        </h6>
+        <div style="float: right"  sec:authorize="isAuthenticated()">
+        <a th:if="${disc.getUser().equals(user)}" class="btn btn-warning" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Промени</a>
+        <a th:if="${disc.getUser().equals(user)}" class="btn btn-danger button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a>
+        <a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a>
+        </div>
+    </div>
+    <table class="table table-striped" style="width: 70%; margin: auto;">
         <thead>
         <tr>
-
-            <th scope="col">Опис</th>
-            <th scope="col">Датум</th>
-            <th scope="col">Корисник</th>
+            <th scope="col">Реплика</th>
+            <th scope="col">Поставена на</th>
+            <th scope="col">Поставена од</th>
             <th:block  sec:authorize="isAuthenticated()">
-
                 <th scope="col"></th>
                 <th scope="col"></th>
             </th:block>
-
         </tr>
         </thead>
@@ -27 +39 @@
             <td th:text="${reply.getDate()}"></td>
             <td th:text="${reply.getUser().getUsername()}"></td>
-            <td th:if="${reply.getUser().equals(user)}"><a class="btn btn-primary" th:href="@{'/replies/edit/{discussionId}/{replyId}' (discussionId=${disc.getDiscussionId()},replyId=${reply.getReplyId()})}">Промени</a> </td>
-            <td th:if="${reply.getUser().equals(user)}"><a class="btn btn-primary button-delete-reply" th:reply-id="${reply.getReplyId()}" th:dicsussion-id="${disc.getDiscussionId()}">Избриши</a> </td>
-
+            <td th:if="${reply.getUser().equals(user)}"><a class="btn btn-warning" th:href="@{'/replies/edit/{discussionId}/{replyId}' (discussionId=${disc.getDiscussionId()},replyId=${reply.getReplyId()})}">Промени</a> </td>
+            <td th:if="${reply.getUser().equals(user)}"><a class="btn btn-danger button-delete-reply" th:reply-id="${reply.getReplyId()}" th:dicsussion-id="${disc.getDiscussionId()}">Избриши</a> </td>
             <th:block sec:authorize="isAuthenticated()">
-                <td th:if="${!reply.getUser().equals(user)}"><a class="btn btn-primary" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> </td>
                 <td th:if="${!reply.getUser().equals(user)}">
-                    <a class="btn btn-primary">Ми се допаѓа</a>
-                    <a class="btn btn-primary">Не ми се допаѓа</a>
+                    <a class="btn btn-success">👍 </a>
+                    <a class="btn btn-danger">👎</a>
                 </td>
             </th:block>
-
-
         </tr>
         </tbody>