data-dismiss to data-bs-dismiss (and other updates)

scipost_django/comments/templates/comments/_comment_identifier.html

@@ -46,7 +46,7 @@
 	      {% if perms.scipost.can_view_profiles %}
 		&emsp;(<a href="{% url 'profiles:profile_detail' pk=comment.author.profile.id %}">view Profile</a>)
 	      {% endif %}
-	      <button type="button" class="btn btn-secondary float-right" data-dismiss="modal">Close</button>
+	      <button type="button" class="btn btn-secondary float-right" data-bs-dismiss="modal">Close</button>
 	    </div>
 	  </div>
 	</div>

scipost_django/journals/templates/journals/_publication_summary.html

@@ -70,7 +70,7 @@
     <div class="modal-content">
       <div class="modal-body">
         <div class="pb-4">
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
@@ -86,7 +86,7 @@
     <div class="modal-content">
       <div class="modal-body">
         <div class="pb-4">
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>

scipost_django/proceedings/templates/proceedings/proceedings_details.html

@@ -87,7 +87,7 @@
       <div class="modal-content">
         <div class="modal-body">
           <div class="pb-4">
-            <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
             </button>
           </div>

scipost_django/profiles/templates/profiles/_profile_card.html

@@ -46,13 +46,13 @@
 		  <td class="d-flex">
                     <form method="post" action="{% url 'profiles:toggle_email_status' profile_mail.id %}">{% csrf_token %}<button type="submit" class="btn btn-link py-0">{{ profile_mail.still_valid|yesno:'Deprecate,Mark valid' }}</button></form>
 		    <form method="post" action="{% url 'profiles:email_make_primary' profile_mail.id %}">{% csrf_token %}<button type="submit" class="btn btn-link py-0">Make primary</button></form>
-		    <a type="button" class="btn py-0" data-bs-toggle="modal" data-target="#confirmDeleteEmailModal"><span class="text-danger">{% include 'bi/trash-fill.html' %}</span></a>
+		    <a type="button" class="btn py-0" data-bs-toggle="modal" data-bs-target="#confirmDeleteEmailModal"><span class="text-danger">{% include 'bi/trash-fill.html' %}</span></a>
 		    <div class="modal" id="confirmDeleteEmailModal" tabindex="-1" role="dialog">
 		      <div class="modal-dialog" role="document">
 			<div class="modal-content">
 			  <div class="modal-header">
 			    <h4 class="modal-title">Confirm email deletion</h4>
-			    <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
+			    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
 			      <span aria-hidden="true">&times;</span>
 			    </button>
 			  </div>
@@ -60,7 +60,7 @@
 			    Are you sure you want to delete {{ profile_mail.email }}?
 			  </div>
 			  <div class="modal-footer">
-			    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+			    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
 			    <form method="post" action="{% url 'profiles:delete_profile_email' profile_mail.id %}">{% csrf_token %}<button type="submit" class="btn btn-danger">Confirm</button></form>
 			  </div>
 			</div>

scipost_django/scipost/templates/scipost/messages.html

 <div class="alert-fixed-container">
   {% for message in messages %}
     <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
-      <button type="button" class="btn-close" data-dismiss="alert" aria-label="Close">
+      <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
         <span aria-hidden="true">&times;</span>
       </button>
       {{ message|safe|escape }}

scipost_django/scipost/templates/scipost/navbar.html

@@ -240,6 +240,6 @@
           </li>
         {% endif %}
       </ul>
-          </div>
     </div>
+  </div>
 </nav>

scipost_django/scipost/templates/tags/bootstrap/form.html

 {% if form.non_field_errors %}
   {% for non_field_error in form.non_field_errors %}
     <div class="alert alert-danger">
-      <a class="close" data-dismiss="alert">&times;</a>
+      <a class="close" data-bs-dismiss="alert">&times;</a>
       {{ non_field_error }}
     </div>
   {% endfor %}

scipost_django/submissions/templates/submissions/_report_public_without_comments.html

@@ -46,7 +46,7 @@
 		    {% if perms.scipost.can_view_profiles %}
 		      &emsp;(<a href="{% url 'profiles:profile_detail' pk=report.author.profile.id %}">view Profile</a>)
 		    {% endif %}
-		    <button type="button" class="btn btn-secondary float-right" data-dismiss="modal">Close</button>
+		    <button type="button" class="btn btn-secondary float-right" data-bs-dismiss="modal">Close</button>
 		  </div>
 		</div>
 	      </div>

scipost_django/templates/rest_framework/api.html

@@ -39,7 +39,7 @@
       {% block style %}
 	<link rel="stylesheet" href="{% static 'flags/sprite-hq.css' %}">
 
-	{% render_bundle 'main' %}
+	{% render_bundle 'base' %}
 
 	<link rel="shortcut icon" href="{% static 'scipost/images/scipost_favicon.png' %}"/>
 
@@ -114,7 +114,7 @@
 		{% endif %}
 
 		{% if delete_form %}
-		  <button class="btn btn-danger button-form js-tooltip" title="Make a DELETE request on the {{ name }} resource" data-bs-toggle="modal" data-target="#deleteModal">DELETE</button>
+		  <button class="btn btn-danger button-form js-tooltip" title="Make a DELETE request on the {{ name }} resource" data-bs-toggle="modal" data-bs-target="#deleteModal">DELETE</button>
 
 		  <!-- Delete Modal -->
 		  <div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -124,7 +124,7 @@
 			  <h4 class="text-center">Are you sure you want to delete this {{ name }}?</h4>
 			</div>
 			<div class="modal-footer">
-			  <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+			  <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
 			  <form class="button-form" action="{{ request.get_full_path }}" data-method="DELETE">
 			    <button class="btn btn-danger">Delete</button>
 			  </form>
@@ -149,7 +149,7 @@
 		{% endif %}
 
 		{% if filter_form %}
-		  <button style="float: right; margin-right: 10px" data-bs-toggle="modal" data-target="#filtersModal" class="btn btn-default">
+		  <button style="float: right; margin-right: 10px" data-bs-toggle="modal" data-bs-target="#filtersModal" class="btn btn-default">
 		    <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
 		    {% trans "Filters" %}
 		  </button>
@@ -187,10 +187,10 @@
                     {% if post_form %}
                       <ul class="nav nav-tabs form-switcher">
 			<li>
-                          <a name='html-tab' href="#post-object-form" data-toggle="tab">HTML form</a>
+                          <a name='html-tab' href="#post-object-form" data-bs-toggle="tab">HTML form</a>
 			</li>
 			<li>
-                          <a name='raw-tab' href="#post-generic-content-form" data-toggle="tab">Raw data</a>
+                          <a name='raw-tab' href="#post-generic-content-form" data-bs-toggle="tab">Raw data</a>
 			</li>
                       </ul>
                     {% endif %}
@@ -233,10 +233,10 @@
                     {% if put_form %}
                       <ul class="nav nav-tabs form-switcher">
 			<li>
-                          <a name='html-tab' href="#put-object-form" data-toggle="tab">HTML form</a>
+                          <a name='html-tab' href="#put-object-form" data-bs-toggle="tab">HTML form</a>
 			</li>
 			<li>
-                          <a  name='raw-tab' href="#put-generic-content-form" data-toggle="tab">Raw data</a>
+                          <a  name='raw-tab' href="#put-generic-content-form" data-bs-toggle="tab">Raw data</a>
 			</li>
                       </ul>
                     {% endif %}
@@ -295,10 +295,10 @@
              csrfToken: "{% if request %}{{ csrf_token }}{% endif %}"
 	 };
 	</script>
-	<script nonce="{{ request.csp_nonce }}" src="{% static "rest_framework/js/jquery-3.3.1.min.js" %}"></script>
+	<!--	<script nonce="{{ request.csp_nonce }}" src="{% static "rest_framework/js/jquery-3.3.1.min.js" %}"></script> -->
 	<script nonce="{{ request.csp_nonce }}" src="{% static "rest_framework/js/ajax-form.js" %}"></script>
 	<script nonce="{{ request.csp_nonce }}" src="{% static "rest_framework/js/csrf.js" %}"></script>
-	<script nonce="{{ request.csp_nonce }}" src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>
+	<!-- <script nonce="{{ request.csp_nonce }}" src="{% static "rest_framework/js/bootstrap.min.js" %}"></script> -->
 	<script nonce="{{ request.csp_nonce }}" src="{% static "rest_framework/js/prettify-min.js" %}"></script>
 	<script nonce="{{ request.csp_nonce }}" src="{% static "rest_framework/js/default.js" %}"></script>
 	<script nonce="{{ request.csp_nonce }}">