Changeset 42d565b in Git for src/main/resources/templates/discussionsList.html

Timestamp:

02/06/22 21:38:16 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

7f36551

Parents:

5b447b0 (diff), 2efe93e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Mato-77 <56981531+Mato-77@…> (02/06/22 21:38:16)

git-committer:

GitHub <noreply@…> (02/06/22 21:38:16)

Message:

Merge pull request #1 from partaloski/master

Fixed and added a better front end, improved clarity

File:

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

src/main/resources/templates/discussionsList.html

@@ -10 +10 @@
                         <thead>
                         <tr>
-                            <th scope="col">Наменета</th>
                             <th scope="col">Наслов</th>
                             <th scope="col">Опис</th>
@@ -29 +28 @@
                         <tr th:each="disc : ${discussions}" class="movie">
                             <td th:text="${disc.getMovie() != null ? disc.getMovie().getTitle() : disc.getPerson().getName() + ' ' + disc.getPerson().getSurname()}"></td>
-                            <td th:text="${disc.getTitle()}"></td>
+                            <td>
+                                <a th:text="${disc.getTitle()}" th:href="@{'/discussions/{id}' (id=${disc.getDiscussionId()})}"></a>
+                            </td>
                             <td th:text="${disc.getText()}"></td>
                             <td th:text="${disc.getDate()}"></td>
                             <td th:text="${disc.getUser().getUsername()}"></td>
-                            <td th:if="${disc.getUser().equals(user)}"><a class="btn btn-primary" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Промени</a> </td>
-                            <td th:if="${disc.getUser().equals(user)}"><a class="btn btn-primary button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a> </td>
+                            <td th:if="${disc.getUser().equals(user)}"><a class="btn btn-warning" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Измени</a> </td>
+                            <td th:if="${disc.getUser().equals(user)}"><a class="btn btn-danger button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a> </td>
 
                             <th:block sec:authorize="isAuthenticated()">
-                            <td th:if="${!disc.getUser().equals(user)}"><a class="btn btn-primary" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> </td>
+                            <td th:if="${!disc.getUser().equals(user)}"><a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> </td>
                             <td th:if="${!disc.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>