Removed bootbox jquery package

Fixed confirmation dialog boxes for history and mass update views
Changed text color from white to dark for episode statuses view
Added css for jquery confirm package

package.json

@@ -23,7 +23,6 @@
  "babel-loader": "^7.1.5",
  "babel-plugin-add-module-exports": "^0.2.1",
  "babel-preset-env": "^1.7.0",
- "bootbox": "^4.4.0",
  "bootstrap": "^4.1.1",
  "clean-webpack-plugin": "^0.1.19",
  "css-loader": "^1.0.0",

sickrage/core/webserver/views/manage/episode_statuses.mako

@@ -98,7 +98,7 @@
  <br/>
  <div class="row">
  <div class="col-md-12">
- <table class="table manageTable">
+ <table class="table">
  % for cur_indexer_id in sorted_show_ids:
  <tr id="${cur_indexer_id}">
  <th>
@@ -108,20 +108,19 @@
  name="${cur_indexer_id}-all" checked/>
  </th>
  <th colspan="2" style="width: 100%; text-align: left;">
- <a class="whitelink"
- href="${srWebRoot}/home/displayShow?show=${cur_indexer_id}">
+ <a class="text-white" href="${srWebRoot}/home/displayShow?show=${cur_indexer_id}">
  ${show_names[cur_indexer_id]}
  </a>
- (${ep_counts[cur_indexer_id]})
+ (<span class="text-info">${ep_counts[cur_indexer_id]}</span>)
  <input type="button" class="btn btn-sm get_more_eps"
  id="${cur_indexer_id}" value="${_('Expand')}"/>
  </th>
  </tr>
  % endfor
  <tr>
- <td style="padding:0;"></td>
- <td style="padding:0;"></td>
- <td style="padding:0;"></td>
+ <td></td>
+ <td></td>
+ <td></td>
  </tr>
  </table>
  </div>

sickrage/core/webserver/views/manage/subtitles_missed.mako

@@ -74,7 +74,7 @@
  <button type="button" class="btn unselectAllShows">${_('Clear all')}</button>
  </div>
  <br>
- <table class="table manageTable" cellspacing="1" border="0" cellpadding="0">
+ <table class="table">
  % for cur_indexer_id in sorted_show_ids:
  <tr id="${cur_indexer_id}">
  <th style="width: 1%;">

src/js/core.js

@@ -7,7 +7,6 @@ import 'jquery-ui/ui/widgets/dialog';
 import 'jquery-ui/ui/widgets/autocomplete';
 import 'tooltipster';
 import 'jquery-backstretch';
-import 'bootbox';
 import 'pnotify/dist/es/PNotifyMobile';
 import 'pnotify/dist/es/PNotifyButtons';
 import 'pnotify/dist/es/PNotifyDesktop';
@@ -267,16 +266,19 @@ $(document).ready(function ($) {
  };
 
  $('a.shutdown').confirm({
+ theme: 'dark',
  title: gt('Shutdown'),
  content: gt('Are you sure you want to shutdown SiCKRAGE ?')
  });
 
  $('a.restart').confirm({
+ theme: 'dark',
  title: gt('Restart'),
  content: gt('Are you sure you want to restart SiCKRAGE ?')
  });
 
  $('a.submiterrors').confirm({
+ theme: 'dark',
  title: gt('Submit Errors'),
  content: gt('Are you sure you want to submit these errors ?') + '<br><br><span class="red-text">' + gt('Make sure SiCKRAGE is updated and trigger') + '<br>' + gt('this error with debug enabled before submitting') + '</span>'
  });
@@ -1146,11 +1148,13 @@ $(document).ready(function ($) {
  });
 
  $('a.clearhistory').confirm({
+ theme: 'dark',
  title: gt('Clear History'),
  content: gt('Are you sure you want to clear all download history ?')
  });
 
  $('a.trimhistory').confirm({
+ theme: 'dark',
  title: gt('Trim History'),
  content: gt('Are you sure you want to trim all download history older than 30 days ?')
  });
@@ -1653,6 +1657,7 @@ $(document).ready(function ($) {
  SICKRAGE.ajax_search.init();
 
  $("a.removeshow").confirm({
+ theme: 'dark',
  title: gt("Remove Show"),
  content: gt('Are you sure you want to remove') + '<span class="footerhighlight">' + $('#showtitle').data('showname') + '</span>' + gt(' from the database?') + '<br><br><input type="checkbox" id="deleteFiles" name="deleteFiles"/>&nbsp;<label for="deleteFiles" class="red-text">' + gt('Check to delete files as well. IRREVERSIBLE') + '</label>',
  buttons: {
@@ -2412,6 +2417,7 @@ $(document).ready(function ($) {
  $('#config-menus a[href="' + window.location.hash + '"]').tab('show')
 
  $('a.resetConfig').confirm({
+ theme: 'dark',
  title: gt('Reset Config to Defaults'),
  content: gt('Are you sure you want to reset config to defaults?')
  });
@@ -4660,7 +4666,7 @@ $(document).ready(function ($) {
  episode_statuses: function () {
  function makeRow(indexerId, season, episode, name, checked) {
  var row = '';
- row += ' <tr class="' + $('#row_class').val() + ' show-' + indexerId + '">';
+ row += ' <tr class="text-dark ' + $('#row_class').val() + ' show-' + indexerId + '">';
  row += ' <td class="tableleft" align="center"><input type="checkbox" class="' + indexerId + '-epcheck" name="' + indexerId + '-' + season + 'x' + episode + '"' + (checked ? ' checked' : '') + '></td>';
  row += ' <td>' + season + 'x' + episode + '</td>';
  row += ' <td class="tableright" style="width: 100%">' + name + '</td>';
@@ -4795,11 +4801,21 @@ $(document).ready(function ($) {
  return;
  }
 
- $.bootbox.confirm(gt("You have selected to delete " + checkArr.length + " show(s). Are you sure you wish to continue? All files will be removed from your system."), function (result) {
- if (result) {
- window.location.href = 'massUpdate?toDelete=' + checkArr.join('|');
+ $.confirm({
+ theme: 'dark',
+ title: gt("Mass Delete"),
+ content: gt("You have selected to delete " + checkArr.length + " show(s). Are you sure you wish to continue? All files will be removed from your system."),
+ buttons: {
+ confirm: function () {
+ window.location.href = 'massUpdate?toDelete=' + checkArr.join('|');
+ },
+ cancel: {
+ action: function () {
+ }
+ }
  }
  });
+
  });
 
  $('#submitMassRemove').on('click', function () {

src/scss/core.scss

@@ -3,6 +3,7 @@
 @import "~jquery-ui/themes/base/all.css";
 @import "~tooltipster/dist/css/tooltipster.bundle.css";
 @import "~pnotify/dist/PNotifyBrightTheme.css";
+@import "~jquery-confirm/css/jquery-confirm.css";
 
 $fa-font-path: "[email protected]/fontawesome-free/webfonts";
 @import "[email protected]/fontawesome-free/scss/fontawesome";