Commit 176b81b3 authored by roxane.carraux's avatar roxane.carraux
Browse files

cards more clear

parent 7af39047

src/main/resources/templates/ProfileHelpProposition.html

+24 −13
Original line number Diff line number Diff line
@@ -14,19 +14,30 @@ 
			<div class="col s12 m6">

				<div class="card  teal lighten-1">

					<div class="card-content white-text">

							<h5><strong>Matière </strong></h5>

                            <span class="card-title" th:text="${help.matiere}"></span>



                            <h5><strong>Commentaire </strong></h5>

                            <p th:text="${help.comment}"></p>



                            <h5><strong>Date et heure de début</strong></h5>

                            <p>

                                <span th:text="${#dates.format(help.dateBegin, 'dd-MM-yyyy')}"></span>

                                <span th:text="${#dates.format(help.timeBegin, 'HH:mm')}"></span>

                            </p>

                            <h5><strong>Date et heure de fin</strong></h5>



                            <p>

                                <span th:text="${#dates.format(help.dateEnd, 'dd-MM-yyyy')}"></span>

                                <span th:text="${#dates.format(help.timeEnd, 'HH:mm')}"></span>

                            </p>

						<p th:text="${help.mentor.id}"></p>

						<p th:if="${help.poulain != null}" th:text=" ${help.poulain.id}"></p>

						<p th:unless="${help.poulain != null}">null</p>

                          

                            <h5><strong>Mentor</strong></h5>

                            <p th:text="${help.mentor.username}"></p>



							<h5><strong>Poulain</strong></h5>

							<p th:if="${help.poulain != null}" th:text=" ${help.poulain.username}"></p>

							<p th:unless="${help.poulain != null}">Pas encore de poulain assigné</p>

					</div>

				</div>

			</div>

src/main/resources/templates/ProfileHelpRequest.html

+16 −3
Original line number Diff line number Diff line
@@ -16,18 +16,31 @@ 
				<div class="card teal lighten-1">

					<div class="card-content white-text">

						<span class="card-title" th:text="${help.matiere}"></span>

				

						<h5><strong>Matière </strong></h5>

						<span class="card-title" th:text="${help.matiere}"></span>



						<h5><strong>Commentaire </strong></h5>

						<p th:text="${help.comment}"></p>



						<h5><strong>Date et heure de début</strong></h5>

						<p>

							<span th:text="${#dates.format(help.dateBegin, 'dd-MM-yyyy')}"></span>

							<span th:text="${#dates.format(help.timeBegin, 'HH:mm')}"></span>

						</p>

						<h5><strong>Date et heure de fin</strong></h5>



						<p>

							<span th:text="${#dates.format(help.dateEnd, 'dd-MM-yyyy')}"></span>

							<span th:text="${#dates.format(help.timeEnd, 'HH:mm')}"></span>

						</p>

						<p th:text="${help.poulain.id}"></p>

						<p th:if="${help.mentor != null}" th:text=" ${help.mentor.id}"></p>

						<p th:unless="${help.mentor != null}">null</p>

					  

						<h5><strong>Poulain</strong></h5>

						<p th:text="${help.poulain.username}"></p>



						<h5><strong>Mentor</strong></h5>

						<p th:if="${help.mentor != null}" th:text=" ${help.mentor.username}"></p>

						<p th:unless="${help.mentor != null}">Pas encore de mentor assigné</p>

					</div>

				</div>

			</div>

src/main/resources/templates/allHelpProposition.html

+13 −4
Original line number Diff line number Diff line
@@ -14,21 +14,30 @@ 
                <div class="col s12 m6">

                    <div class="card-panel teal lighten-1">

                        <div class="card-content white-text">

                            <h5><strong>Matière </strong></h5>

                            <span class="card-title" th:text="${help.matiere}"></span>



                            <h5><strong>Commentaire </strong></h5>

                            <p th:text="${help.comment}"></p>



                            <h5><strong>Date et heure de début</strong></h5>

                            <p>

                                <span th:text="${#dates.format(help.dateBegin, 'dd-MM-yyyy')}"></span>

                                <span th:text="${#dates.format(help.timeBegin, 'HH:mm')}"></span>

                            </p>

                            <h5><strong>Date et heure de fin</strong></h5>



                            <p>

                                <span th:text="${#dates.format(help.dateEnd, 'dd-MM-yyyy')}"></span>

                                <span th:text="${#dates.format(help.timeEnd, 'HH:mm')}"></span>

                            </p>

                            <p th:text="${help.mentor.id}"></p>

                            <p th:if="${help.poulain != null}" th:text=" ${help.poulain.id}"></p>

                          

                            <h5><strong>Mentor</strong></h5>

                            <p th:text="${help.mentor.username}"></p>



                            <p th:if="${help.poulain != null}" th:text=" ${help.poulain.id}"></p>

                            <form th:unless="${help.poulain != null}" action="#" th:action="@{/editProposition/{id}(id=${help.id})}">

                                <input class="waves-effect waves-light btn right  teal darken-2" type="submit" value="Se proposer"/>

                                <input class="waves-effect waves-light right btn teal darken-2" type="submit" value="Se proposer"/>

                            </form>

                            

                        </div>

src/main/resources/templates/allHelpRequest.html

+15 −5
Original line number Diff line number Diff line
@@ -15,21 +15,31 @@ 
			<div class="col s12 m6">

				<div class="card teal lighten-1">

					<div class="card-content white-text">

			

						<h5><strong>Matière </strong></h5>

						<span class="card-title" th:text="${help.matiere}"></span>



						<h5><strong>Commentaire </strong></h5>

						<p th:text="${help.comment}"></p>



						<h5><strong>Date et heure de début</strong></h5>

						<p>

							<span th:text="${#dates.format(help.dateBegin, 'dd-MM-yyyy')}"></span>

							<span th:text="${#dates.format(help.timeBegin, 'HH:mm')}"></span>

						</p>

						<h5><strong>Date et heure de fin</strong></h5>



						<p>

							<span th:text="${#dates.format(help.dateEnd, 'dd-MM-yyyy')}"></span>

							<span th:text="${#dates.format(help.timeEnd, 'HH:mm')}"></span>

						</p>

						<p th:text="${help.poulain.id}"></p>

						<p th:if="${help.mentor != null}" th:text=" ${help.mentor.id}"></p>

					  

						<form th:unless="${help.mentor != null}" action="#" th:action="@{/editRequest/{id}(id=${help.id})}">

							<input class="waves-effect waves-light btn right  teal darken-2" type="submit" value="Se proposer"/>

						<h5><strong>Poulain</strong></h5>

						<p th:text="${help.poulain.username}"></p>



						<p th:if="${help.mentor != null}" th:text=" ${help.mentor.id}"></p>

						<form th:unless="${help.mentor != null}" action="#" th:action="@{/editProposition/{id}(id=${help.id})}">

							<input class="waves-effect waves-light right btn teal darken-2" type="submit" value="Se proposer"/>

						</form>



					</div>