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

Timestamp:

02/09/22 03:21:13 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

6f91f99

Parents:

0226942 (diff), 3fe36de (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/09/22 03:21:13)

git-committer:

GitHub <noreply@…> (02/09/22 03:21:13)

Message:

Merge pull request #4 from partaloski/master

Added User profiles, improved clarity, improved UI

File:

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

src/main/resources/templates/discussion.html

@@ -19 +19 @@
         <br>
         <h6 style="width: 60%; float:left;">
+            <a th:href="@{'/profiles/{id}' (id=${disc.getUser().getUserId()})}" >
             <span th:text="${'Поставено од: '+disc.getUser().getUsername()}"></span>
+            </a>
             <span th:text="${', на датум '+ disc.getDate()}"></span>
             <br>
@@ -48 +50 @@
             <td th:text="${reply.getText()}"></td>
             <td th:text="${reply.getDate()}"></td>
-            <td th:text="${reply.getUser().getUsername()}"></td>
+            <td >
+                <a th:href="@{'/profiles/{id}' (id=${reply.getUser().getUserId()})}" th:text="${reply.getUser().getUsername()}"></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>