chteufleur
/
MedicalTrainingTracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add to navbar direct link to progression pages.

This commit is contained in:
Geoffrey POUZET 2020-10-30 16:56:01 +01:00
parent b437c8e68f
commit a9f937a561
4 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/messages.properties
View File

@ -114,3 +114,15 @@ register.placeholder.password_check=Password
register.title=Sign up register.title=Sign up
progression.value.NOT_USED=Not usefull progression.value.NOT_USED=Not usefull
authentication.remember_me=Remember me authentication.remember_me=Remember me
navbar.progression.by_me.NOT_TRAINED=By me - Not trained
navbar.progression.by_me.CURRENTLY_TRAINING=By me - Currently training
navbar.progression.by_me.TRAINED=By me - Done
navbar.progression.by_me.NOT_USED=By me - Not usefull
navbar.progression.by_someone_else.NOT_TRAINED=By someone else - Not trained
navbar.progression.by_someone_else.CURRENTLY_TRAINING=By someone else - Currently training
navbar.progression.by_someone_else.TRAINED=By someone else - Done
navbar.progression.by_someone_else.NOT_USED=By someone else - Not usefull
navbar.progression.by_veterinary.NOT_TRAINED=By veterinary - Not trained
navbar.progression.by_veterinary.CURRENTLY_TRAINING=By veterinary - Currently training
navbar.progression.by_veterinary.TRAINED=By veterinary - Done
navbar.progression.by_veterinary.NOT_USED=By veterinary - Not usefull

12
src/main/resources/messages_en.properties
View File

@ -114,3 +114,15 @@ register.placeholder.password_check=Password
register.title=Sign up register.title=Sign up
progression.value.NOT_USED=Not usefull progression.value.NOT_USED=Not usefull
authentication.remember_me=Remember me authentication.remember_me=Remember me
navbar.progression.by_me.NOT_TRAINED=By me - Not trained
navbar.progression.by_me.CURRENTLY_TRAINING=By me - Currently training
navbar.progression.by_me.TRAINED=By me - Done
navbar.progression.by_me.NOT_USED=By me - Not usefull
navbar.progression.by_someone_else.NOT_TRAINED=By someone else - Not trained
navbar.progression.by_someone_else.CURRENTLY_TRAINING=By someone else - Currently training
navbar.progression.by_someone_else.TRAINED=By someone else - Done
navbar.progression.by_someone_else.NOT_USED=By someone else - Not usefull
navbar.progression.by_veterinary.NOT_TRAINED=By veterinary - Not trained
navbar.progression.by_veterinary.CURRENTLY_TRAINING=By veterinary - Currently training
navbar.progression.by_veterinary.TRAINED=By veterinary - Done
navbar.progression.by_veterinary.NOT_USED=By veterinary - Not usefull

12
src/main/resources/messages_fr.properties
View File

@ -114,3 +114,15 @@ register.placeholder.password_check=Mot de passe
register.title=Cr\u00e9ation du compte register.title=Cr\u00e9ation du compte
progression.value.NOT_USED=Non utile progression.value.NOT_USED=Non utile
authentication.remember_me=Se souvenir de moi authentication.remember_me=Se souvenir de moi
navbar.progression.by_me.NOT_TRAINED=Par moi - Non entrainn\u00e9
navbar.progression.by_me.CURRENTLY_TRAINING=Par moi - En cours
navbar.progression.by_me.TRAINED=Par moi - Fait
navbar.progression.by_me.NOT_USED=Par moi - Non utile
navbar.progression.by_someone_else.NOT_TRAINED=Par quelqu'un d'autre - Non entrainn\u00e9
navbar.progression.by_someone_else.CURRENTLY_TRAINING=Par quelqu'un d'autre - En cours
navbar.progression.by_someone_else.TRAINED=Par quelqu'un d'autre - Fait
navbar.progression.by_someone_else.NOT_USED=Par quelqu'un d'autre - Non utile
navbar.progression.by_veterinary.NOT_TRAINED=Par le v\u00e9t\u00e9rinaire - Non entrainn\u00e9
navbar.progression.by_veterinary.CURRENTLY_TRAINING=Par le v\u00e9t\u00e9rinaire - En cours
navbar.progression.by_veterinary.TRAINED=Par le v\u00e9t\u00e9rinaire - Fait
navbar.progression.by_veterinary.NOT_USED=Par le v\u00e9t\u00e9rinaire - Non utile

24
src/main/webapp/vue/base/navbar.jsp
View File

@ -33,14 +33,28 @@
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<% if (authentication != null) { %> <% if (authentication != null) { %>
<c:forEach items="${MODEL_MAP_ANIMAL_LIST}" var="animal"> <c:forEach items="${MODEL_MAP_ANIMAL_LIST}" var="animal">
<li <c:if test="${MODEL_MAP_ANIMAL.getId() == animal.getId()}">class="active"</c:if>><a href="${animalURL}/${animal.getId()}/cares_and_behaviors">${animal.getName()}</a></li> <!--<li <c:if test="${MODEL_MAP_ANIMAL.getId() == animal.getId()}">class="active"</c:if>><a href="${animalURL}/${animal.getId()}/cares_and_behaviors">${animal.getName()}</a></li>-->
<!-- <li class="dropdown <c:if test="${MODEL_MAP_ANIMAL.getId() == animal.getId()}">active</c:if>" > <li class="dropdown <c:if test="${MODEL_MAP_ANIMAL.getId() == animal.getId()}">active</c:if>" >
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">${animal.getName()} <span class="caret"></span></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">${animal.getName()} <span class="caret"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="${animalURL}/${animal.getId()}/cares_and_behaviors"><fmt:message key="navbar.cares_and_behaviors"></fmt:message></a></li> <li><a href="${animalURL}/${animal.getId()}/cares_and_behaviors">Soins et comportements</a></li>
<li><a href="${animalURL}/${animal.getId()}/progressions">Progressions</a></li> <li role="separator" class="divider"></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_me/NOT_TRAINED"><fmt:message key="navbar.progression.by_me.NOT_TRAINED"></fmt:message></a></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_me/CURRENTLY_TRAINING"><fmt:message key="navbar.progression.by_me.CURRENTLY_TRAINING"></fmt:message></a></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_me/TRAINED"><fmt:message key="navbar.progression.by_me.TRAINED"></fmt:message></a></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_me/NOT_USED"><fmt:message key="navbar.progression.by_me.NOT_USED"></fmt:message></a></li>
<li role="separator" class="divider"></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_someone_else/NOT_TRAINED"><fmt:message key="navbar.progression.by_someone_else.NOT_TRAINED"></fmt:message></a></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_someone_else/CURRENTLY_TRAINING"><fmt:message key="navbar.progression.by_someone_else.CURRENTLY_TRAINING"></fmt:message></a></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_someone_else/TRAINED"><fmt:message key="navbar.progression.by_someone_else.TRAINED"></fmt:message></a></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_someone_else/NOT_USED"><fmt:message key="navbar.progression.by_someone_else.NOT_USED"></fmt:message></a></li>
<li role="separator" class="divider"></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_veterinary/NOT_TRAINED"><fmt:message key="navbar.progression.by_veterinary.NOT_TRAINED"></fmt:message></a></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_veterinary/CURRENTLY_TRAINING"><fmt:message key="navbar.progression.by_veterinary.CURRENTLY_TRAINING"></fmt:message></a></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_veterinary/TRAINED"><fmt:message key="navbar.progression.by_veterinary.TRAINED"></fmt:message></a></li>
<li><a href="${animalURL}/${animal.getId()}/progression_by_veterinary/NOT_USED"><fmt:message key="navbar.progression.by_veterinary.NOT_USED"></fmt:message></a></li>
</ul> </ul>
</li>--> </li>
</c:forEach> </c:forEach>
<% }%> <% }%>
</ul> </ul>