Merge pull request #299 from josdem/feature/282

[small]feature/282
josdem · Aug 21, 2024 · 6871402 · 6871402
2 parents f52993d + 42b60e4
commit 6871402
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ ext {
 }
 
 group = 'com.josdem.vetlog'
-version = '1.6.7'
+version = '1.6.8'
 
 configurations {
   compileOnly {

diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html
@@ -20,7 +20,7 @@
       <div class="col-md-12 col-sm-12 text-center">
         <a th:href="#{app.mailto}"><p style="font-size:18px" th:text="#{app.contact.us}"/></a>
         <br/><br/>
-        <p>© Copyright 2023, Vetlog.</p>
+        <p>© Copyright 2024, Vetlog.</p>
         <a th:href="#{home.footer.link}"><p th:text="#{home.footer.name}"/></a>
       </div>
     </div>

diff --git a/src/main/resources/templates/pet/listForAdoption.html b/src/main/resources/templates/pet/listForAdoption.html
@@ -1,10 +1,19 @@
 <!DOCTYPE html>
-<html xmlns:th="https://www.thymeleaf.org">
+<html xmlns:th="https://www.thymeleaf.org" th:lang="${#locale.language}">
 <head>
     <title th:text="#{pet.view.list.title}"></title>
     <head th:insert="~{fragments/include}"/>
     <script th:src="@{/assets/servizi-dog-theme/node_modules/jquery/dist/jquery.min.js}"></script>
     <script th:src="@{/assets/servizi-dog-theme/node_modules/bootstrap/dist/js/bootstrap.min.js}"></script>
+    <style>
+      .thumbnail {
+        width: 350px;
+        height: 750px;
+        margin: 10px;
+      }
+
+
+    </style>
 </head>
 <body>
 <div th:insert="~{fragments/header}"/>
@@ -13,16 +22,14 @@
 <br/><br/>
 <div class="container">
     <div class="row">
-        <div th:if="${pets.isEmpty()}">
-            <div align="center">
+        <div align="center">
+            <div th:if="${pets.isEmpty()}">
                 <p th:text="#{pet.list.empty}"/>
             </div>
-        </div>
-        <div th:each="pet : ${pets}">
-            <div class="col-sm-6 col-md-4">
+            <div th:each="pet : ${pets}">
                 <div class="thumbnail">
                     <div th:if="${!pet.images.isEmpty()}">
-                        <div th:id="carousel-example-generic + ${pet.id}"  class="carousel slide" data-ride="carousel">
+                        <div th:id="carousel-example-generic + ${pet.id}" class="carousel slide" data-ride="carousel">
                             <!-- Indicators -->
                             <ol class="carousel-indicators">
                                 <li th:attr="data-target='#carousel-example-generic' + ${pet.id}" data-slide-to="0" class="active"></li>
@@ -33,20 +40,20 @@
                             <!-- Wrapper for slides -->
                             <div class="carousel-inner" role="listbox">
                                 <div th:each="image : ${pet.images}" class="item"
-                                     th:classappend="|${pet.images.indexOf(image) == 0 ? 'active' : ''}|"
-                                     align="center">
-                                    <img style="width:350px;height:300px;"
-                                         th:attr="src=@{${gcpImageUrl} + ${image.uuid}}"/>
+                                     th:classappend="|${pet.images.indexOf(image) == 0 ? 'active' : ''}|">
+                                    <img style="width:350px;height:300px;" th:attr="src=@{${gcpImageUrl} + ${image.uuid}}" th:alt="pet"/>
                                 </div>
                             </div>
 
                             <!-- Controls -->
-                            <a class="left carousel-control" th:href="@{'#carousel-example-generic' + ${pet.id}}" role="button"
+                            <a class="left carousel-control" th:href="@{'#carousel-example-generic' + ${pet.id}}"
+                               role="button"
                                data-slide="prev">
                                 <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
                                 <span class="sr-only">Previous</span>
                             </a>
-                            <a class="right carousel-control" th:href="@{'#carousel-example-generic' + ${pet.id}}" role="button"
+                            <a class="right carousel-control" th:href="@{'#carousel-example-generic' + ${pet.id}}"
+                               role="button"
                                data-slide="next">
                                 <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
                                 <span class="sr-only">Next</span>
@@ -55,22 +62,16 @@
                     </div>
                     <div class="caption">
                         <h3 th:text="${pet.name}"></h3>
-                        <p>
-                        <ul>
-                            <li th:text="${@dateFormatter.formatToDate(pet.birthDate, #locale)}"/>
-                            <li th:text="${pet.breed.name}"/>
-                            <li th:text="${pet.dewormed}? #{pet.dewormed} : #{pet.not.dewormed}"/>
-                            <li th:text="${pet.sterilized}? #{pet.sterilized} : #{pet.not.sterilized}"/>
-                            <li th:text="${pet.vaccinated}? #{pet.vaccinated} : #{pet.not.vaccinated}"/>
-                        </ul>
-                        </p>
+                        <p th:text="${@dateFormatter.formatToDate(pet.birthDate, #locale)}"/>
+                        <p th:text="${pet.breed.name}"/>
+                        <p th:text="${pet.dewormed}? #{pet.dewormed} : #{pet.not.dewormed}"/>
+                        <p th:text="${pet.sterilized}? #{pet.sterilized} : #{pet.not.sterilized}"/>
+                        <p th:text="${pet.vaccinated}? #{pet.vaccinated} : #{pet.not.vaccinated}"/>
                         <p th:text="${pet.adoption?.description}"/>
                         <br/>
-                        <center>
-                            <a th:href="@{/telephone/adopt(uuid=${pet.uuid})}" class="btn btn-success">
-                                <p th:text="#{pet.adoption.interested}"/>
-                            </a>
-                        </center>
+                        <a th:href="@{/telephone/adopt(uuid=${pet.uuid})}" class="btn btn-success">
+                            <p th:text="#{pet.adoption.interested}"/>
+                        </a>
                     </div>
                 </div>
             </div>