Changeset f25e8dd in Git for src/main/resources/templates/moviesList.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/moviesList.html (modified) (5 diffs)

src/main/resources/templates/moviesList.html

@@ -1 +1 @@
 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
-    <div th:replace="fragments/searchBarGenre">
 
+    <div style="width: 70%; margin: auto">
+        <div th:replace="fragments/searchBarName"></div>
+        <div th:replace="fragments/searchBarGenre"></div>
     </div>
 
@@ -16 +18 @@
                         <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 scope="col">Жанрови</th>
                             <th scope="col">Актери</th>
                             <th scope="col">Режисер</th>
@@ -37 +39 @@
                         <tbody>
                         <tr th:each="movie : ${movies}" class="elements">
-                            <td th:text="${movie.getTitle()}"></td>
-                            <td th:text="${movie.getDescription()}"></td>
+                            <td><a th:text="${movie.getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}"></a></td>
+                            <!--<td th:text="${movie.getDescription()}"></td>-->
                             <td th:text="${movie.getAiringDate()}"></td>
                             <td th:text="${movie.getLikes() != null  ? movie.getLikes().size() : 0}">
@@ -47 +49 @@
                             </td>
                             <td>
-                                <div th:each="a: ${movie.getActors()}" th:text="${a.getPerson().getName()} "></div>
+                                <div th:each="ac: ${movie.getActors()}">
+                                    <a th:href="@{'/persons/{id}' (id=${ac.getPerson().getPersonId()})}" th:text="${ac.getPerson().getName() + ' ' + ac.getPerson().getSurname()}"></a>
+                                </div>
                             </td>
-                            <td th:text="${movie.getDirector() != null ? movie.getDirector()?.getName() + ' '+ movie.getDirector()?.getSurname() : 'Не е додаен директор'}"></td>
+                            <td th:if="${movie.getDirector() != null}">
+                                <a th:href="@{'/persons/{id}' (id=${movie.getDirector().getPersonId()})}" th:text="${movie.getDirector().getName() + ' ' + movie.getDirector().getSurname()}"></a>
+                            </td>
+                            <td th:if="${movie.getDirector() == null}">
+                                Филмот нема режисер.
+                            </td>
                             <td>
                                 <a class="btn btn-primary" th:href="@{'discussions/all/{id}?type=M' (id=${movie.getMovieId()})}" >Прегледај дискусии</a>
@@ -55 +64 @@
                             <th:block sec:authorize="isAuthenticated()">
                             <td>
-                                <a class="btn btn-primary button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">Додади во омилена листа</a>
-                                <a class="btn btn-primary button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">Избриши од омилена листа</a>
+                                <a class="btn btn-success button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">Додади во омилена листа</a>
+                                <a class="btn btn-warning button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">Избриши од омилена листа</a>
 
                             </td>
                             <td>
-                                <a class="btn btn-primary button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a>
+                                <a class="btn btn-success button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a>
                             </td>
                             <td>
-                                <a class="btn btn-primary" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Промени</a>
+                                <a class="btn btn-warning" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Измени</a>
                             </td>
                             <td>
-                                <a class="btn btn-primary button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a>
+                                <a class="btn btn-danger button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a>
                             </td>
                             </th:block>