Changeset 967b414 in Git for target/classes/templates/personShow.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:

• target/classes/templates/personShow.html (modified) (3 diffs)

target/classes/templates/personShow.html

@@ -5 +5 @@
             <h1 th:text="${person.getName() + ' ' + person.getSurname()}" style="text-align: center; padding:10px; background-color: rgba(64,64,64,0.5); color:white; border-radius: 10px 0px"></h1>
             <hr>
-            <h3 th:text="${'Роден на: ' + person.getDateFormatted()}"></h3>
+            <h3 th:text="${'Роден/а на: ' + person.getDateFormatted()}"></h3>
             <div style="background-color: rgba(200,200,200,0.5); border-radius: 10px; padding:15px; ">
                 <h3>Краток Опис:</h3>
@@ -24 +24 @@
                     <li th:each="movie: ${person.getMovieActors()}" ><a th:text="${movie.getMovie().getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovie().getMovieId()})}" ></a></li>
                 </ul>
-            </div>
+            </div><br>
+            <ul style="list-style-type: none; width: 100%; margin: auto" id="buttons-person">
+                <li><a class="btn btn-primary" th:href="@{'discussions/all/{id}?type=P' (id=${person.getPersonId()})}" >Прегледај дискусии</a></li>
+                <th:block sec:authorize="isAuthenticated()">
+                    <li><a class="btn btn-secondary button-add-grade-person" th:person-id="${person.getPersonId()}" th:if="${!person.hasGradeFromUser(user)}">Остави оценка</a></li>
+                    <li><a class="btn btn-secondary button-add-grade-person" th:person-id="${person.getPersonId()}" th:if="${person.hasGradeFromUser(user)}">Промени оценка</a></li>
+                    <li><a class="btn btn-warning" th:href="@{'persons/edit/{personId}' (personId = ${person.getPersonId()})}">Промени</a></li>
+                    <li><a class="btn btn-danger button-delete-actor" th:person-id="${person.getPersonId()}">Избриши</a></li>
+                </th:block>
+            </ul>
         </div>
         <div style="width: 30%; margin-left: 10px; padding:20px; border-left: 3px solid black; border-radius: 10px; float:right">
@@ -39 +48 @@
         <div th:each="rating: ${person.getPersonRates()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 130px;">
             <div style="width: 60%; float:left;">
+                <a th:href="@{'/profiles/{id}' (id=${rating.getUser().getUserId()})}">
+                    <h4 th:text="${'Oд: '+rating.getUser().getName() + ' ' + rating.getUser().getSurname()}"> </h4>
+                </a>
                 <p th:text="${rating.getReason()}" style="text-align: justify"></p>
             </div>