Changeset 0226942 in Git for target/classes/templates
- Timestamp:
- 02/08/22 22:07:07 (3 years ago)
- Branches:
- main
- Children:
- 967b414
- Parents:
- ad4243e (diff), c02189f (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/08/22 22:07:07)
- git-committer:
- GitHub <noreply@…> (02/08/22 22:07:07)
- Location:
- target/classes/templates
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
target/classes/templates/discussion.html
rad4243e r0226942 1 1 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml"> 2 2 <div style="width: 85%; text-align: justify; margin: auto; clear: both"> 3 <div >4 <h1 th:text="${disc.getTitle()}" style="width: 80%; float: left"></h1>3 <div style="background-color: rgba(128,128,128, 0.2); border-radius: 20px; padding: 20px"> 4 <h1 th:text="${disc.getTitle()}" style="width: 80%; display: inline; height: fit-content; clear: both"></h1> 5 5 </div> 6 <hr> <br><br>6 <hr> 7 7 <div> 8 8 <h5 th:text="${disc.getText()}" style="width: 90%; margin: auto; background-color: lightblue; border-radius: 4px; padding: 20px"></h5> 9 9 </div> 10 <br><br><br> 10 <br> 11 <h4> 12 <span th:if="${!disc.getUser().equals(user)}" sec:authorize="isAuthenticated()"> 13 <a class='btn btn-success button-like-discussion' th:if="${!likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >❤</a> 14 <a class='btn btn-danger button-unlike-discussion' th:if="${likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >💔</a> 15 </span> 16 <span>Број на допаѓања:</span> 17 <span th:text="${likes}" id="likes_count"></span> 18 </h4> 19 <br> 11 20 <h6 style="width: 60%; float:left;"> 12 21 <span th:text="${'Поставено од: '+disc.getUser().getUsername()}"></span> … … 17 26 </h6> 18 27 <div style="float: right" sec:authorize="isAuthenticated()"> 19 <a th:if="${disc.getUser().equals(user)}" class="btn btn-warning" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Промени</a> 20 <a th:if="${disc.getUser().equals(user)}" class="btn btn-danger button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a> 21 <a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> 22 </div> 28 <a th:if="${disc.getUser().equals(user)}" class="btn btn-warning" th:href="@{'/discussions/add/{id}' (id=${disc.getDiscussionId()})}">Промени</a> 29 <a th:if="${disc.getUser().equals(user)}" class="btn btn-danger button-delete-discussion" th:discussion-id="${disc.getDiscussionId()}">Избриши</a> 30 <a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> 31 32 </div><br> 23 33 </div> 24 34 <table class="table table-striped" style="width: 70%; margin: auto;"> -
target/classes/templates/discussionsList.html
rad4243e r0226942 4 4 </div> 5 5 <div class="container mb-4"> 6 <div class="row">7 6 <div class="col-12" th:if="${discussions.size() > 0}"> 8 7 <div class="table-responsive"> … … 10 9 <thead> 11 10 <tr> 11 <th scope="col">За</th> 12 12 <th scope="col">Наслов</th> 13 <th scope="col"> Опис</th>13 <th scope="col">Допаѓања</th> 14 14 <th scope="col">Датум</th> 15 15 <th scope="col">Корисник</th> … … 27 27 <tbody> 28 28 <tr th:each="disc : ${discussions}" class="movie"> 29 <td th:text="${disc.getMovie() != null ? disc.getMovie().getTitle() :disc.getPerson().getName() + ' ' + disc.getPerson().getSurname()}"></td>29 <td th:text="${disc.getMovie() != null ? 'Филмот ' + disc.getMovie().getTitle() : 'Актерот ' + disc.getPerson().getName() + ' ' + disc.getPerson().getSurname()}"></td> 30 30 <td> 31 31 <a th:text="${disc.getTitle()}" th:href="@{'/discussions/{id}' (id=${disc.getDiscussionId()})}"></a> 32 32 </td> 33 <td th:text="${disc.getText()}"></td> 33 <td th:each="like : ${likes}" th:if="${like.getDiscussionId().equals(disc.getDiscussionId())}" th:text="${like.getLikes()}" class="likes_count"> 34 </td> 34 35 <td th:text="${disc.getDate()}"></td> 35 36 <td th:text="${disc.getUser().getUsername()}"></td> … … 40 41 <td th:if="${!disc.getUser().equals(user)}"><a class="btn btn-success" th:href="@{'/replies/add/{discussionId}' (discussionId=${disc.getDiscussionId()})}">Реплицирај</a> </td> 41 42 <td th:if="${!disc.getUser().equals(user)}"> 42 <a class= "btn btn-success">👍</a>43 <a class= "btn btn-danger">👎</a>43 <a class='btn btn-success button-like-discussion-alt' th:if="${!likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >❤</a> 44 <a class='btn btn-danger button-unlike-discussion-alt' th:if="${likedDiscussions.contains(disc)}" th:discussion-id="${disc.getDiscussionId()}" th:user-id="${user.getUserId()}" >💔</a> 44 45 </td> 45 46 </th:block> 46 47 47 48 48 </tr> … … 51 51 </div> 52 52 </div> 53 </div>54 53 </div> 55 54 -
target/classes/templates/fragments/header.html
rad4243e r0226942 2 2 <nav class="navbar navbar-expand-md navbar-dark bg-dark"> 3 3 <div class="container"> 4 <a class="navbar-brand" href="/movies">Форум за филмови</a>5 4 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" 6 5 aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation"> … … 28 27 </li> 29 28 </ul> 30 <form class="form-inline my-2 my-lg-0 ">29 <form class="form-inline my-2 my-lg-0 hidden"> 31 30 <div class="input-group input-group-sm"> 32 31 <input type="text" class="form-control" aria-label="Small" -
target/classes/templates/fragments/searchBarGenre.html
rad4243e r0226942 1 <div> 2 <label for="searchGenre" style="width: 150px;">Пребарај по жанр</label> 3 <input id="searchGenre" type="text" placeholder="жанр"> 4 <button class="search-button">Пребарај</button> 1 <div xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" style="width:60%; margin: auto; margin-bottom: 10px"> 2 <select th:if="${genres!=null}" id="searchGenre" class="form-control" style="float: left; display: block; width: 50%"> 3 <option value="" selected>Сите</option> 4 <option th:each="genre: ${genres}" th:value="${genre.getGenreType()}" th:text="${genre.getGenreType()}"></option> 5 </select> 6 <div class="input-group-append" style="width: 40%"> 7 <button class="btn btn-secondary search-button" style="width: 100%">Филтрирај по жанр</button> 8 </div> 5 9 </div> -
target/classes/templates/fragments/searchBarName.html
rad4243e r0226942 1 <div> 2 <label for="searchTitle" style="width: 150px;">Прабарај по име</label> 3 <input id="searchTitle" type="text" placeholder="име"> 4 <button class="search-button-title">Пребарај</button> 1 <div style="width:60%; margin: auto;"> 2 <input id="searchTitle" class="form-control" style="float: left; display: block; width: 50%" type="text" placeholder="..."> 3 4 <div class="input-group-append" style="width: 40%"> 5 <button class="btn btn-secondary search-button-title" style="width: 100%">Филтрирај по Наслов</button> 6 </div> 7 5 8 </div> -
target/classes/templates/movieShow.html
rad4243e r0226942 13 13 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml" style="width: 80%; margin: auto"> 14 14 <div> 15 <div style="width: 30%; margin-right: 10px; padding:20px; border-right: 3px solid black; border-radius: 10px; float:left"> 16 <img th:src="${movie.getImageUrl()}" style="width: 90%; height: auto"> 15 <div style="width: 30%; margin-right: 10px; padding:20px; border-right: 3px solid black; border-radius: 10px; float:left" id="image-movie-section"> 16 <img th:src="${movie.getImageUrl()}" style="width: 90%; height: auto; clear: both; margin-bottom: 20px"> 17 <div id="admin-buttons"> 18 <a class="btn btn-primary" th:href="@{'/discussions/all/{id}?type=M' (id=${movie.getMovieId()})}" >Прегледај дискусии</a> 19 <th:block sec:authorize="isAuthenticated()" > 20 <div> 21 <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> 22 <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> 23 </div> 24 <a class="btn btn-secondary button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a> 25 <a class="btn btn-warning" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Промени</a> 26 <a class="btn btn-danger button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a> 27 </th:block> 28 </div> 17 29 </div> 18 30 … … 26 38 </h3> 27 39 <h3 th:text="${'IMDB оцена: ' + movie.getImdbRating()}"></h3> 28 <h3 th:text="${'Прикажан на: ' + movie.get AiringDate()}"></h3>40 <h3 th:text="${'Прикажан на: ' + movie.getDateFormatted()}"></h3> 29 41 30 42 <div style="background-color: rgba(200,200,200,0.5); border-radius: 10px; padding:15px; "> … … 33 45 </div> 34 46 35 <div> 47 <div id="likes-showcase"> 48 <h4 style="text-align: center"> 49 <span>Филмот му се допаднал на </span> 50 <strong th:text="${likes}" id="movie_likes_count"></strong> 51 <span> корисници</span> 52 </h4> 53 </div> 54 55 <div class="person-movies-list genres-listing"> 36 56 <h3>Жанрови:</h3> 37 57 <ul> … … 39 59 </ul> 40 60 </div> 41 <div >61 <div class="person-movies-list"> 42 62 <h3>Актери:</h3> 43 63 <ul> … … 48 68 </div> 49 69 </div> 50 <div id="admin-buttons"> 51 <a class="btn btn-primary" th:href="@{'/discussions/all/{id}?type=M' (id=${movie.getMovieId()})}" >Прегледај дискусии</a> 52 <th:block sec:authorize="isAuthenticated()" > 53 <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> 54 <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> 55 <a class="btn btn-success button-add-grade-movie" th:movie-id="${movie.getMovieId()}">Остави оценка</a> 56 <a class="btn btn-warning" th:href="@{'/movies/{id}/edit' (id=${movie.getMovieId()})}">Промени</a> 57 <a class="btn btn-danger button-delete-movie" th:movie-id="${movie.getMovieId()}">Избриши филм</a> 58 </th:block> 59 </div> 70 60 71 <hr> 61 72 <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px"> … … 70 81 </div> 71 82 <div style="width: 30%; float:right; background-color: darkorange; border-radius: 10px 30px; color: whitesmoke; padding: 10px;"> 72 <h2 style="text-align: center"> Rated:</h2>73 <p th:text="${rating.getStarsRated() + ' out of 10 stars'}" style="text-align: center"></p>83 <h2 style="text-align: center">Оценет:</h2> 84 <p th:text="${rating.getStarsRated() + ' од 10'}" style="text-align: center"></p> 74 85 </div> 75 86 </div> … … 77 88 <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px"> 78 89 <h2> 79 <span>Бројот на лајкови кои филмот ги добил:</span> 80 <span th:text="${movie.getLikes().size()}"></span> 90 <span>Лајковите кои филмот ги добил:</span> 81 91 </h2> 82 92 <hr> -
target/classes/templates/moviesList.html
rad4243e r0226942 2 2 3 3 <div style="width: 70%; margin: auto"> 4 <div th:replace="fragments/searchBarName"></div> 4 <div th:replace="fragments/searchBarName"></div><br> 5 5 <div th:replace="fragments/searchBarGenre"></div> 6 6 </div> -
target/classes/templates/moviesListPaged.html
rad4243e r0226942 1 1 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml"> 2 3 <div style="width: 70%; margin: auto"> 4 <div th:replace="fragments/searchBarName"></div> 5 <div th:replace="fragments/searchBarGenre"></div> 6 2 <div style="margin:auto; width: 60%"> 3 <div style="width: 30%; margin: auto; height: 100%; margin-bottom: 10px"> 4 <a class="btn btn-outline-dark" style="height: 100%; width: 100%; font-size: 125%" id="button_toggle_filters">Прикажи филтрирање</a> 5 </div> 6 <div style="width: 100%; margin: auto; transition: 200ms" id="filters_div" class="invisible-search"> 7 <div th:replace="fragments/searchBarName"></div><br> 8 <div th:replace="fragments/searchBarGenre"></div> 9 </div> 7 10 </div> 8 9 11 <div id="paging-section"> 10 12 <div id="inner-paging" class="input-group"> … … 25 27 </div> 26 28 </div> 27 </div><br> <br><br>29 </div><br> 28 30 29 31 <div class="container mb-4"> … … 34 36 <div class="row" th:each="row: ${movie_rows}" > 35 37 <div class="col-md-3 elements" th:each="movie: ${row}" > 38 <span th:each="genre: ${movie.getGenres()}" th:text="${genre?.getGenre()?.getGenreType()}" hidden class="card-genre"></span> 36 39 <div class="card-body card bg-image" th:style="'background:url(' + ${movie.getImageUrl()} + ') no-repeat center #eee;'"> 37 40 <a class="card-text-center" style="color: white" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}" > 38 41 <h3 class="card-title title" th:text="${movie.getTitle()}"></h3> 39 42 <span th:each="genre: ${movie.getGenres()}" th:text="${genre?.getGenre()?.getGenreType()}" hidden class="card-genre"></span> 40 41 43 </a> 42 <h3 class="card-text bottom" th:text="${'Rated '+movie.getImdbRating()}"></h3> 44 <span class="card-text bottom"> 45 <h3 th:text="${'Оценет '+movie.getImdbRating() + '/10'}"></h3> 46 </span> 43 47 <th:block sec:authorize="isAuthenticated()"> 44 48 <a class="bottom-heart btn btn-success button-add-favourite-list" th:movie-id="${movie.getMovieId()}" th:user-id="${user.getUserId()}" th:if="${!likedMovies.contains(movie)}">❤</a> -
target/classes/templates/personShow.html
rad4243e r0226942 1 1 2 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml" style="width: 80%; margin: auto"> 3 <div> 4 2 <div xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml" style="width: 70%; margin: auto"> 3 <div style="clear: both; margin-bottom: 10px; display: inline-block"> 5 4 <div style="width: 60%; margin-left: 10px; padding:20px; float:left"> 6 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> 7 6 <hr> 8 <h3 th:text="${' Born on: ' + person.getDateOfBirth()}"></h3>7 <h3 th:text="${'Роден на: ' + person.getDateFormatted()}"></h3> 9 8 <div style="background-color: rgba(200,200,200,0.5); border-radius: 10px; padding:15px; "> 10 <h3> Description:</h3>9 <h3>Краток Опис:</h3> 11 10 <p th:text="${person.getDescription()}" style="text-align: justify"></p> 12 11 </div> 13 12 14 <div th:if="${person.getType() == 'D'}"> 15 <h3 >Directed movies:</h3> 13 <div th:if="${person.getType().toString().contains('D')}" class="person-movies-list"> 14 <h3 >Режисирани филмови:</h3> 15 <hr> 16 16 <ul> 17 <li th:each="movie: ${ actor.getMovies()}"><a th:text="${movie.getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}" ></a></li>17 <li th:each="movie: ${person.getMovies()}"><a th:text="${movie.getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovieId()})}" ></a></li> 18 18 </ul> 19 19 </div> 20 <div th:if="${person.getType() == 'A'}"> 21 <h3 >Acted in movies:</h3> 20 <div th:if="${person.getType().toString().contains('A')}" class="person-movies-list"> 21 <h3 >Се појавува во филмовите:</h3> 22 <hr> 22 23 <ul> 23 <li th:each="movie: ${ actor.getMovieActors()}" ><a th:text="${movie.getMovie().getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovie().getMovieId()})}" ></a></li>24 <li th:each="movie: ${person.getMovieActors()}" ><a th:text="${movie.getMovie().getTitle()}" th:href="@{'/movies/{id}' (id=${movie.getMovie().getMovieId()})}" ></a></li> 24 25 </ul> 25 26 </div> 26 27 27 </div> 28 <div style="width: 30%; margin-left: 10px; padding:20px; border-left: 3px solid black; border-radius: 10px; float: left">28 <div style="width: 30%; margin-left: 10px; padding:20px; border-left: 3px solid black; border-radius: 10px; float:right"> 29 29 <img th:src="${person.getImageUrl()}" style="width: 90%; height: auto"> 30 30 </div> 31 31 </div> 32 <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px"> 32 <br> 33 <div style="clear:both; display: inline-block; width: 100%; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px"> 33 34 <h2> 34 <span>Бројот на оцени кои филмот ги добил:</span>35 <span th:text="${ movie.getRates().size()}"></span>35 <span>Бројот на оцени кои личноста ги има добиено:</span> 36 <span th:text="${person.getPersonRates().size()}"></span> 36 37 </h2> 37 38 <hr> 38 <div th:each="rating: ${ movie.getRates()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 130px;">39 <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;"> 39 40 <div style="width: 60%; float:left;"> 40 41 <p th:text="${rating.getReason()}" style="text-align: justify"></p> 41 42 </div> 42 43 <div style="width: 30%; float:right; background-color: darkorange; border-radius: 10px 30px; color: whitesmoke; padding: 10px;"> 43 <h2 style="text-align: center"> Rated:</h2>44 <p th:text="${rating.getStarsRated() + ' out of 10 stars'}" style="text-align: center"></p>44 <h2 style="text-align: center">Оценет со :</h2> 45 <p th:text="${rating.getStarsRated() + ' од 10'}" style="text-align: center"></p> 45 46 </div> 46 47 </div> 47 48 </div> 48 <div style="width: 45%; margin: 25px; float:left; background-color: rgb(200,200,200); padding: 10px; border-radius: 5px"> 49 <h2> 50 <span>Бројот на лајкови кои филмот ги добил:</span> 51 <span th:text="${movie.getLikes().size()}"></span> 52 </h2> 53 <hr> 54 <div th:each="liked: ${movie.getLikes()}" style="margin-bottom: 10px; border: 2px solid gray; border-radius: 10px; background-color: lightblue; padding: 10px; border-radius: 10px; min-height: 60px;"> 55 <div style="width: 100%; float:left;"> 56 <h3 style="text-align: center"> 57 <span th:text="${liked.getUser().getName() + ' ' + liked.getUser().getSurname()}"></span> 58 <span style="color: green; font-size: 100%" >✔</span> 59 </h3> 60 </div> 61 </div> 62 </div> 49 63 50 </div> -
target/classes/templates/personsList.html
rad4243e r0226942 5 5 </div> 6 6 <div class="container mb-4"> 7 <div class="row">8 7 <div class="col-12" th:if="${persons.size() > 0}"> 9 8 <div class="table-responsive"> … … 47 46 <th:block sec:authorize="isAuthenticated()"> 48 47 <td> 49 <a class="btn btn- primary button-add-grade-person" th:person-id="${person.getPersonId()}">Остави оценка</a>48 <a class="btn btn-secondary button-add-grade-person" th:person-id="${person.getPersonId()}">Остави оценка</a> 50 49 51 50 </td> 52 51 <td> 53 <a class="btn btn- primary" th:href="@{'persons/edit/{personId}' (personId = ${person.getPersonId()})}">Промени</a>52 <a class="btn btn-warning" th:href="@{'persons/edit/{personId}' (personId = ${person.getPersonId()})}">Промени</a> 54 53 </td> 55 54 <td> 56 <a class="btn btn- primarybutton-delete-actor" th:person-id="${person.getPersonId()}">Избриши</a>55 <a class="btn btn-danger button-delete-actor" th:person-id="${person.getPersonId()}">Избриши</a> 57 56 58 57 </td> 59 60 <a class="bottom-heart btn btn-success button-add-favourite-list"61 th:movie-id="${person.getMovieId()}"62 th:user-id="${user.getUserId()}"63 th:if="${!likedPersons.contains(movie)}">❤</a>64 65 <a class="bottom-heart btn btn-danger button-remove-favourite-list"66 th:movie-id="${person.getMovieId()}" th:user-id="${user.getUserId()}"67 th:if="${likedPersons.contains(movie)}">💔</a>68 58 69 59 … … 75 65 </div> 76 66 </div> 77 </div>78 67 </div> 79 68 -
target/classes/templates/template.html
rad4243e r0226942 16 16 </head> 17 17 <body> 18 <section class="jumbotron text-center"> 19 <div class="container"> 20 <!--<img th:src="@{/img/logo.png}" style="opacity: 0.3; z-index: 5; position: absolute; margin: auto; height: 225px; width: auto; left: 42%; top: 2%">--> 21 <h1 class="jumbotron-heading" style="z-index: -1">weDiscussMovies</h1> 18 <section class="jumbotron text-center" style="background: url('/img/cover.jpg') center; background-repeat: no-repeat; background-size: 100% auto; height: 280px; margin-bottom: 0px "> 19 <div class="container" > 20 <h1 class="jumbotron-heading" style="z-index: -1"></h1> 22 21 </div> 23 22 </section>
Note:
See TracChangeset
for help on using the changeset viewer.