Changes in src/main/resources/templates/movieShow.html [c02189f:2efe93e] in Git

File:

• src/main/resources/templates/movieShow.html (modified) (7 diffs)

src/main/resources/templates/movieShow.html

@@ -13 +13 @@
 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml" style="width: 80%; margin: auto">
     <div>
-        <div style="width: 30%; margin-right: 10px; padding:20px; border-right: 3px solid black; border-radius: 10px; float:left" id="image-movie-section">
-            <img th:src="${movie.getImageUrl()}" style="width: 90%; height: auto; clear: both; margin-bottom: 20px">
-            <div id="admin-buttons">
-                <a class="btn btn-primary" th:href="@{'/discussions/all/{id}?type=M' (id=${movie.getMovieId()})}" >Прегледај дискусии</a>
-                <th:block sec:authorize="isAuthenticated()" >
-                    <div>
-                        <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-danger button-remove-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${likedMovies.contains(movie)}">💔</a>
-                    </div>
-                    <a class="btn btn-secondary button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a>
-                    <a class="btn btn-warning" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Промени</a>
-                    <a class="btn btn-danger button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a>
-                </th:block>
-            </div>
+        <div style="width: 30%; margin-right: 10px; padding:20px; border-right: 3px solid black; border-radius: 10px; float:left">
+            <img th:src="${movie.getImageUrl()}" style="width: 90%; height: auto">
         </div>
 
@@ -38 +26 @@
             </h3>
             <h3 th:text="${'IMDB оцена: ' + movie.getImdbRating()}"></h3>
-            <h3 th:text="${'Прикажан на: ' + movie.getDateFormatted()}"></h3>
+            <h3 th:text="${'Прикажан на: ' + movie.getAiringDate()}"></h3>
 
             <div style="background-color: rgba(200,200,200,0.5); border-radius: 10px; padding:15px; ">
@@ -45 +33 @@
             </div>
 
-            <div id="likes-showcase">
-                <h4 style="text-align: center">
-                    <span>Филмот му се допаднал на </span>
-                    <strong th:text="${likes}" id="movie_likes_count"></strong>
-                    <span> корисници</span>
-                </h4>
-            </div>
-
-            <div class="person-movies-list genres-listing">
+            <div>
                 <h3>Жанрови:</h3>
                 <ul>
@@ -59 +39 @@
                 </ul>
             </div>
-            <div class="person-movies-list">
+            <div>
                 <h3>Актери:</h3>
                 <ul>
@@ -68 +48 @@
         </div>
     </div>
-
+    <div id="admin-buttons">
+        <a class="btn btn-primary" th:href="@{'/discussions/all/{id}?type=M' (id=${movie.getMovieId()})}" >Прегледај дискусии</a>
+        <th:block sec:authorize="isAuthenticated()" >
+            <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>
+            <a class="btn btn-success button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a>
+            <a class="btn btn-warning" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Промени</a>
+            <a class="btn btn-danger button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a>
+        </th:block>
+    </div>
     <hr>
     <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
@@ -81 +70 @@
                 </div>
                 <div style="width: 30%; float:right; background-color: darkorange; border-radius: 10px 30px; color: whitesmoke; padding: 10px;">
-                    <h2 style="text-align: center">Оценет:</h2>
-                    <p th:text="${rating.getStarsRated() + ' од 10'}" style="text-align: center"></p>
+                    <h2 style="text-align: center">Rated:</h2>
+                    <p th:text="${rating.getStarsRated() + ' out of 10 stars'}" style="text-align: center"></p>
                 </div>
         </div>
@@ -88 +77 @@
     <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px">
         <h2>
-            <span>Лајковите кои филмот ги добил:</span>
+            <span>Бројот на лајкови кои филмот ги добил:</span>
+            <span th:text="${movie.getLikes().size()}"></span>
         </h2>
         <hr>