Bootstrap5 (#21)

* first changes for bootstrap 5 * clean up * update color mode * login side update * update sidebar and theme color * sidebar fixes * fix icon modals * changes for bootstrap 5 * hight fix and cleanup * clean up * bootstrap 5 fixes * clean up * scroll fix * fix plist editor for bootstrap 5 * clean up * remove old typeahead * clean up * fix modal safe and cancel * clean up * fix save and discard modal * improve global view * fix action buttons * clean up * clean up * update repot * clean up * fix report view for bootstrap 5 * fix menu bar * add cache * fix report detail display issues --------- Co-authored-by: Steve Kueng
SteveKueng · Oct 4, 2023 · fb817ee · fb817ee
1 parent 306c70f
commit fb817ee
Show file tree

Hide file tree

Showing 1,504 changed files with 22,219 additions and 112,093 deletions.
diff --git a/app/icons/static/icons/js/icons.js b/app/icons/static/icons/js/icons.js
@@ -1,10 +1,5 @@
 function do_resize() {
- $('#item_editor').height($(window).height() - 270);
- //ace editor is dumb and needs the height specifically as well
- $('#plist').height($(window).height() - 300);
- $('#item_list').height($(window).height() - 90);
- $('.dataTables_scrollBody').height($(window).height() - 170);
- //$('.modal-body').height($(window).height() - 270);
+ $('#item_list').height($(window).height() - 150);
 }
 
 $(window).resize(do_resize);
@@ -14,12 +9,12 @@ var file;
 $(document).on('hide.bs.modal','#iconItem', function () {
  // check for unsaved changes
  if ($('#save_and_cancel').length && !$('#save_and_cancel').hasClass('hidden')) {
- $('#iconItem').data('bs.modal').isShown = false;
+ ($('#iconItem').data('bs.modal') || {})._isShown = false;
  $("#saveOrCancelConfirmationModal").modal("show");
  event.preventDefault();
  return;
  } else {
- $('#iconItem').data('bs.modal').isShown = true;
+ ($('#iconItem').data('bs.modal') || {})._isShown = true;
  window.location.hash = '';
  current_pathname = "";
  }
@@ -63,7 +58,6 @@ function initIconsTable() {
  column_rows.push(json[i]);
  }
  }
- //console.log(column_rows);
  return column_rows;
  },
  complete: function(jqXHR, textStatus){

diff --git a/app/icons/templates/icons/icons.html b/app/icons/templates/icons/icons.html
@@ -3,14 +3,12 @@
 
 {% block extra_style %}
 {% load static %}
-<link rel="stylesheet" href="{% get_static_prefix %}css/bootstrap-chosen.css" type="text/css" media="all" />
 {% endblock extra_style %}
 
 {% block java_script %}
 {% load static %}
 <script type='text/javascript' src='{% get_static_prefix %}icons/js/icons.js'></script>
 <script type='text/javascript' src='{% get_static_prefix %}js/mwa_editor_shared.js'></script>
-<script type='text/javascript' src='{% get_static_prefix %}js/chosen.jquery.min.js'></script>
 {% endblock java_script %}
 
 {% block content %}
@@ -20,7 +18,7 @@
  <div class="form-group">
  {% if perms.pkgsinfo.add_pkginfofile %}
  <div class="btn-group">
- <button type="button" class="btn btn-success" data-toggle="modal" data-target="#newIconModal">
+ <button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#newIconModal">
  New icon
  </button>
  </div>
@@ -46,8 +44,8 @@
 <!--
 Bootstrap modal for upload new icon
 -->
-<div class="modal fade" data-backdrop="static" id="newIconModal">
- <div class="modal-dialog">
+<div class="modal" id="newIconModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="newIconModalLabel" aria-hidden="true">
+ <div class="modal-dialog modal-lg">
  <div class="modal-content">
  <div class="modal-header">
  <h4 class="modal-title">Upload new icon</h4>
@@ -71,7 +69,7 @@ <h4 class="modal-title">Upload new icon</h4>
  </div>
  </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>
  <button type="button" data-new="manifest" class="btn btn-primary" onclick="uploadIcon()">Upload</button>
  </div>
  </div><!-- /.modal-content -->
@@ -80,14 +78,14 @@ <h4 class="modal-title">Upload new icon</h4>
 <!--
 Bootstrap modal for showing icon edit
 -->
-<div class="modal fade" id="iconItem">
- <div class="modal-dialog">
+<div class="modal" id="iconItem" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="iconItemLabel" aria-hidden="true">
+ <div class="modal-dialog modal-lg">
  <div class="modal-content">
  <div class="modal-header">
  <h4 id="pathname"></h4>
- <div class='pull-right' id='delete_btn' style="margin-top:-40px;">
+ <div class='pull-right' id='delete_btn'>
  {% if perms.pkgsinfo.delete_pkginfofile %}
- <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#deleteConfirmationModal">Delete</button>
+ <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteConfirmationModal">Delete</button>
  {% endif %}
  </div>
  </div>
@@ -106,7 +104,7 @@ <h4 id="pathname"></h4>
  <div class="modal-footer">
  {% if perms.pkgsinfo.change_pkginfofile %}
  <div class='pull-right hidden' id='save_and_cancel'>
- <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#cancelEditConfirmationModal">Cancel</button>
+ <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#cancelEditConfirmationModal">Cancel</button>
  <button type="button" class="btn btn-success" onClick="saveIconItem()">Save</button>
  </div>
  {% endif %}
@@ -122,7 +120,7 @@ <h4 id="pathname"></h4>
  <!--
  Bootstrap modal for confirming icons deletion
  -->
- <div class="modal fade" id="deleteConfirmationModal" data-backdrop="false">
+ <div class="modal" id="deleteConfirmationModal" data-backdrop="false">
  <div class="modal-dialog">
  <div class="modal-content">
  <div class="modal-header">
@@ -134,16 +132,16 @@ <h4 class="modal-title">Delete icon?</h4>
  <br>
  </div>
  <div class="modal-footer">
- <button type="button" class="btn btn-danger" data-dismiss="modal" onClick="deleteIconItem()">Delete</button>
- <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+ <button type="button" class="btn btn-danger" data-bs-dismiss="modal" onClick="deleteIconItem()">Delete</button>
+ <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
  </div>
  </div><!-- /.modal-content -->
  </div><!-- /.modal-dialog -->
  </div><!-- /.modal -->
  <!--
  Bootstrap modal for confirming canceling editing
  -->
- <div class="modal fade" id="cancelEditConfirmationModal" data-backdrop="false">
+ <div class="modal" id="cancelEditConfirmationModal" data-bs-backdrop="false">
  <div class="modal-dialog">
  <div class="modal-content">
  <div class="modal-header">
@@ -153,16 +151,16 @@ <h4 class="modal-title">Discard your changes?</h4>
  <p>Really discard your changes to <strong id="pathname"></strong>?</p>
  </div>
  <div class="modal-footer">
- <button type="button" class="btn btn-danger" data-dismiss="modal" onClick="cancelEdit()">Discard Changes</button>
- <button type="button" class="btn btn-default" data-dismiss="modal">Continue Editing</button>
+ <button type="button" class="btn btn-danger" data-bs-dismiss="modal" onClick="cancelEdit()">Discard Changes</button>
+ <button type="button" class="btn btn-default" data-bs-dismiss="modal">Continue Editing</button>
  </div>
  </div><!-- /.modal-content -->
  </div><!-- /.modal-dialog -->
  </div><!-- /.modal -->
  <!--
  Bootstrap modal for saving or canceling when loading a different icon
  -->
- <div class="modal fade" id="saveOrCancelConfirmationModal" data-backdrop="false">
+ <div class="modal" id="saveOrCancelConfirmationModal" data-bs-backdrop="false">
  <div class="modal-dialog">
  <div class="modal-content">
  <div class="modal-header">
@@ -172,9 +170,9 @@ <h4 class="modal-title">Save your changes?</h4>
  <p>Save your changes to <strong id="pathname"></strong> before proceeding?</p>
  </div>
  <div class="modal-footer">
- <button type="button" class="btn btn-danger" data-dismiss="modal" onClick="cancelEdit()">Discard Changes</button>
- <button type="button" class="btn btn-success" data-dismiss="modal" onClick="saveIconItem()">Save Changes</button>
- <button type="button" class="btn btn-default" data-dismiss="modal">Continue Editing</button>
+ <button type="button" class="btn btn-danger" data-bs-dismiss="modal" onClick="cancelEdit()">Discard Changes</button>
+ <button type="button" class="btn btn-success" data-bs-dismiss="modal" onClick="saveIconItem()">Save Changes</button>
+ <button type="button" class="btn btn-default" data-bs-dismiss="modal">Continue Editing</button>
  </div>
  </div><!-- /.modal-content -->
  </div><!-- /.modal-dialog -->
@@ -183,7 +181,7 @@ <h4 class="modal-title">Save your changes?</h4>
 <!--
 Bootstrap modal for showing process progress
 -->
-<div class="modal fade" data-backdrop="static" id="process_progress">
+<div class="modal" data-backdrop="static" id="process_progress">
  <div class="modal-dialog">
  <div class="modal-content">
  <div class="modal-header">
@@ -203,7 +201,7 @@ <h4 class="modal-title" id="process_progress_title_text">Processing...</h4>
 <!--
 Bootstrap modal for errors
 -->
-<div class="modal fade" data-backdrop="static" id="errorModal">
+<div class="modal" data-backdrop="static" id="errorModal">
  <div class="modal-dialog">
  <div class="modal-content">
  <div class="modal-header">
@@ -218,7 +216,7 @@ <h4 class="modal-title text-danger">
  </form>
  </div>
  <div class="modal-footer">
- <button type="button" class="btn btn-danger" data-dismiss="modal">OK</button>
+ <button type="button" class="btn btn-danger" data-bs-dismiss="modal">OK</button>
  </div>
  </div><!-- /.modal-content -->
  </div><!-- /.modal-dialog -->

diff --git a/app/inventory/templates/inventory/items.html b/app/inventory/templates/inventory/items.html
@@ -9,7 +9,7 @@
 {% block page_title %}<a href="{% url 'inventory.views.items' %}" class="navbar-brand" >Inventory</a>{% endblock %}
 
 {% block content %}
-<table id='inventory-items-table' class='table table-condensed table-hov'>
+<table id='inventory-items-table' class='table table-striped table-condensed table-hov'>
  <thead>
  <tr><th>Name</th><th>Version(s)</th></tr>
  </thead>

diff --git a/app/inventory/templates/inventory/machinetable.html b/app/inventory/templates/inventory/machinetable.html
@@ -1,6 +1,6 @@
 {% if machine_list|length %}
  <p/>
- <table class='clientlist table table-condensed'>
+ <table class='clientlist table table-striped table-condensed'>
  <thead>
  <tr>
  <th>Hostname</th>