[OSIS-9160] Dissertation Migration BS5 #151
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mdartic
requested changes
Jun 14, 2024
| {% endblock %} | ||
| {% block script %} | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script> |
There was a problem hiding this comment.
Normal que ce ne soit pas la version minifiée ?
templates/dissertations_list.html
Outdated
| <script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script> |
| @@ -406,7 +408,7 @@ <h3 class="panel-title">{% trans 'Your dissertations history' %}</h3> | |||
|
|
|||
| "sProcessing": "{% trans 'Processing...'%}", | |||
| "sSearch": "{% trans 'Search:'%}", | |||
| "sLengthMenu": "{% trans 'Show _MENU_ entries'%}", | |||
| "sLengthMenu": "_MENU_ éléments", | |||
There was a problem hiding this comment.
Tu l'as mis en français on dirait, je pense que tu dois garder l'ancienne trad° ?
| <script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script> |
| @@ -323,7 +330,7 @@ <h5>{% trans 'Advanced search' %} | |||
|
|
|||
| "sProcessing": "{% trans 'Processing...'%}", | |||
| "sSearch": "{% trans 'Search:'%}", | |||
| "sLengthMenu": " _MENU_ éléments", | |||
| "sLengthMenu": "_MENU_ éléments", | |||
There was a problem hiding this comment.
Là cette trad me paraît correcte, la version anglaise doit donc être en ano.
| <script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script> |
| <script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script> |
| <script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script> |
| <script type="text/javascript" src="{% static 'js/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script> |
templates/manager_students_list.html
Outdated
| <script type="text/javascript" src="{% static 'js/bootstrap.min.js'%}"></script> | ||
| <script type="text/javascript" src="{% static 'js/dataTables.bootstrap.min.js'%}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/jquery.dataTables.min.js' %}"></script> | ||
| <script type="text/javascript" src="{% static 'js/bootstrap5/dataTables.bootstrap5.js' %}"></script> |
|
@leboiss up ? |
J'ai ajouté le fichier dataTable.bootstrap5.min.js il est dans cette PR Concernant les traductions il n'y a pas d'anomalies, sur certaines pages il y a avait marqué "Afficher" devant un select pour définir combien d'éléments on souhaite afficher mais il n'était pas présent sur d'autres pages, j'ai uniformisé les pages en enlevant ce texte |
leboiss
force-pushed
the
feature/OSIS-9160
branch
from
25e6098
to
1ab8741
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Référence Jira : OSIS-9160
Cette Pr est lié à la PR suivante
dev...feature/OSIS-9160