Ignore:
Timestamp:
02/08/23 14:41:27 (22 months ago)
Author:
milamihajlovska <mila.mihajlovska01@…>
Branches:
master
Children:
2c7a732
Parents:
39a45e6 (diff), 90317ea (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.
Message:

Merge branch 'master' of https://github.com/DenicaKj/MovieZone

Location:
src/main/resources/templates
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • src/main/resources/templates/events.html

    r39a45e6 r632e3d8  
    194194        border-radius: 20px;
    195195    }
     196    .form-group{
     197        width: 200px;
     198    }
    196199</style>
     200<div>
     201    <form th:action="@{'/home/events'}"
     202          th:method="GET">
     203
     204        <div class="form-group">
     205            <label style="color: white;font-size: 20px;font-weight: bold">Кино</label>
     206            <select name="id_cinema" class="form-control" id="id_cinema">
     207                <option
     208                        th:selected="${cinemas.get(1)}"
     209                        th:each="cinema : ${cinemas}"
     210                        th:value="${cinema.getId_cinema()}"
     211                        th:text="${cinema.getName()}">
     212                </option>
     213            </select>
     214
     215        </div>
     216        <button class="button" type="submit">Filter</button>
     217    </form>
     218
    197219<div xmlns:th="http://www.thymeleaf.org">
     220    <h1 style="color: white">Настани</h1>
    198221    <div class="main">
    199222        <div th:each="event : ${events}" class="container">
     
    208231                        <span th:text="${event.getDuration()}"></span>
    209232                    </div>
    210                     <form th:action="@{'/home/getFilm/{id}' (id=${event.getId_event()})}"
     233                    <form th:action="@{'/home/getEvent/{id}' (id=${event.getId_event()})}"
    211234                          th:method="GET">
    212235                        <button class="button" type="submit">Датали</button>
     
    218241    </div>
    219242</div>
     243</div>
  • src/main/resources/templates/films.html

    r39a45e6 r632e3d8  
    219219
    220220<div xmlns:th="http://www.thymeleaf.org">
    221     <div class="main">
     221    <div class="main" style="width: available;height: available">
    222222        <div    th:if="${films.isEmpty()} == false"
    223223                th:each="film : ${films}" class="container">
  • src/main/resources/templates/projections.html

    r39a45e6 r632e3d8  
    198198    <div class="main">
    199199
    200 <!--<div th:each="projection: ${projections}">-->
    201 
    202         <div th:each="projection: ${projections}" class="container">
     200
     201        <div th:each="film: ${films}" class="container">
    203202            <div class="card">
    204203                <div class="imgBx">
    205                     <img th:src="@{${projection.film.getUrl()}}"/>
     204                    <img th:src="@{${film.getUrl()}}"/>
    206205                </div>
    207206                <div class="contentBx">
    208                     <h2  th:text="${projection.film.getName()}"></h2>
     207                    <h2  th:text="${film.getName()}"></h2>
    209208                    <div class="size">
    210209                        <h3>Duration :</h3>
    211                         <span th:text="${projection.film.getDuration()}"></span>
     210                        <span th:text="${film.getDuration()}"></span>
    212211                    </div>
    213212                    <div class="color">
    214213                        <h3>Genre:</h3>
    215                         <span th:text="${projection.film.getGenre()}"></span>
     214                        <span th:text="${film.getGenre()}"></span>
    216215                    </div>
    217216                </div>
  • src/main/resources/templates/workers.html

    r39a45e6 r632e3d8  
    11<div xmlns:th="http://www.thymeleaf.org">
    2   <section class="jumbotron text-center">
    3     <div class="container">
    4       <h1 class="jumbotron-heading">Вработени</h1>
    5     </div>
    6   </section>
    7 
     2  <h1 style="color: white">Вработени</h1>
    83  <div class="container mb-4">
    94    <div class="row">
Note: See TracChangeset for help on using the changeset viewer.