Merge branch 'develop' into features/background

assets/app.js

@@ -16,8 +16,6 @@ import 'bootstrap-star-rating/themes/krajee-fa/theme.css';
 import './js/suivifilms2';
 import './js/addCollectionWidget';
 import './js/filtre';
-import 'bootstrap-table/dist/bootstrap-table.js'
-import 'bootstrap-table/dist/bootstrap-table.min.css'
 
 jQuery(function() {
     $('.add-another-collection-widget').addCollection();

package.json

@@ -6,7 +6,6 @@
         "@symfony/webpack-encore": "^2.1.0",
         "bootstrap": "^5.1.3",
         "bootstrap-star-rating": "^4.1.2",
-        "bootstrap-table": "^1.20.2",
         "core-js": "^3.0.0",
         "font-awesome": "^4.7.0",
         "jquery": "^3.6.0",

templates/videotheque/liste_tableaux.html.twig

@@ -31,10 +31,14 @@
 	</div>
 	<div class="row">
 		<table
+<<<<<<< HEAD
 			class="table table-bordered table-hover table-sm align-middle bg-light" id="tableau-films"
 			data-toggle="table"
 			data-pagination="false"
 		>
+=======
+			class="table table-bordered table-hover table-sm align-middle bg-light" id="tableau-films">
+>>>>>>> develop
 			<thead class="">
 				<tr>
 					{% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
@@ -42,12 +46,12 @@
 						<th style="width:1em;"></th>
 						<th>Ajouté par</th>
 					{% endif %}
-					<th data-sortable="true">Titre</th>
-					<th data-sortable="true">Genre</th>
-					<th data-sortable="true">Réalisateur</th>
-					<th data-sortable="true" style="width:5em;">Note</th>
-					<th data-sortable="true" style="width:5em;">Année</th>
-					<th data-sortable="true" style="width:6em;">Sortie</th>
+					<th>Titre</th>
+					<th>Genre</th>
+					<th>Réalisateur</th>
+					<th style="width:5em;">Note</th>
+					<th style="width:5em;">Année</th>
+					<th style="width:6em;">Sortie</th>
 				</tr>
 			</thead>
 			<tbody id="tableFilms">

yarn.lock

@@ -1726,11 +1726,6 @@ bootstrap-star-rating@^4.1.2:
   dependencies:
     opencollective-postinstall "^2.0.2"
 
-bootstrap-table@^1.20.2:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/bootstrap-table/-/bootstrap-table-1.20.2.tgz#187fcd1812fa3422f964e3b32e3fc3d266108a83"
-  integrity sha512-6j9zfjjK6VZyJj8KsH+LnGczqglmMvMctGAoEAKDvrQ92ExQbA3mHGYPQr9iPrzoyeGL8+6Dyx6LqJbWmWmBoA==
-
 bootstrap@^5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34"