Changeset 0226942 in Git for src/main/resources/templates/fragments

Timestamp:

02/08/22 22:07:07 (3 years ago)

Author:

GitHub <noreply@…>

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)

Message:

Merge pull request #3 from partaloski/master

Added new core functionalities, fixed bugs and improved visual clarity

Location:

src/main/resources/templates/fragments

Files:

• header.html (modified) (2 diffs)
• searchBarGenre.html (modified) (1 diff)
• searchBarName.html (modified) (1 diff)

src/main/resources/templates/fragments/header.html

@@ -2 +2 @@
     <nav class="navbar navbar-expand-md navbar-dark bg-dark">
         <div class="container">
-            <a class="navbar-brand" href="/movies">Форум за филмови</a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
                     aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
@@ -28 +27 @@
                     </li>
                 </ul>
-                <form class="form-inline my-2 my-lg-0">
+                <form class="form-inline my-2 my-lg-0 hidden">
                     <div class="input-group input-group-sm">
                         <input type="text" class="form-control" aria-label="Small"

src/main/resources/templates/fragments/searchBarGenre.html

@@ -1 @@
-<div>
-      <label for="searchGenre" style="width: 150px;">Пребарај по жанр</label>
-        <input id="searchGenre" type="text" placeholder="жанр">
-        <button class="search-button">Пребарај</button>
+<div xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" style="width:60%; margin: auto; margin-bottom: 10px">
+        <select th:if="${genres!=null}" id="searchGenre" class="form-control" style="float: left; display: block; width: 50%">
+            <option value="" selected>Сите</option>
+            <option th:each="genre: ${genres}" th:value="${genre.getGenreType()}" th:text="${genre.getGenreType()}"></option>
+        </select>
+        <div class="input-group-append" style="width: 40%">
+            <button class="btn btn-secondary  search-button" style="width: 100%">Филтрирај по жанр</button>
+        </div>
 </div>

src/main/resources/templates/fragments/searchBarName.html

@@ -1 @@
-<div>
-    <label for="searchTitle" style="width: 150px;">Прабарај по име</label>
-    <input id="searchTitle" type="text" placeholder="име">
-    <button class="search-button-title">Пребарај</button>
+<div style="width:60%; margin: auto;">
+    <input id="searchTitle" class="form-control" style="float: left; display: block; width: 50%" type="text" placeholder="...">
+
+    <div class="input-group-append" style="width: 40%">
+        <button class="btn btn-secondary search-button-title" style="width: 100%">Филтрирај по Наслов</button>
+    </div>
+
 </div>