github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-07 21:51:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix datatables modal popups from 464d2a5

Browse source
This commit is contained in:
JonnyWong16 2016-03-04 22:18:34 -08:00
parent bea82c6640
commit a4d6c6c0d8
8 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/history.html
View file

@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class='table-card-back'> <div class='table-card-back'>
<table class="display" id="history_table" width="100%"> <table class="display history_table" id="history_table" width="100%">
<thead> <thead>
<tr> <tr>
<th align="left" id="delete_row">Delete</th> <th align="left" id="delete_row">Delete</th>

6
data/interfaces/default/history_table_modal.html
View file

@ -10,7 +10,7 @@
</h4> </h4>
</div> </div>
<div class="modal-body" id="modal-text"> <div class="modal-body" id="modal-text">
<table class="display" id="history_table" width="100%"> <table class="display history_table" id="history_table_modal" width="100%">
<thead> <thead>
<tr> <tr>
<th align="left" id="started">Started</th> <th align="left" id="started">Started</th>
@ -45,9 +45,9 @@
} }
} }
history_table = $('#history_table').DataTable(history_table_modal_options); history_table = $('#history_table_modal').DataTable(history_table_modal_options);
clearSearchButton('history_table', history_table); clearSearchButton('history_table_modal', history_table);
// Move #info-modal to parent container // Move #info-modal to parent container
if (!($('#history-modal').next().is('#info-modal'))) { if (!($('#history-modal').next().is('#info-modal'))) {

2
data/interfaces/default/info.html
View file

@ -364,7 +364,7 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
<div class="table-card-back"> <div class="table-card-back">
<table class="display" id="history_table-RK-${data['rating_key']}" width="100%"> <table class="display history_table" id="history_table-RK-${data['rating_key']}" width="100%">
<thead> <thead>
<tr> <tr>
<th align="left" id="delete">Delete</th> <th align="left" id="delete">Delete</th>

10
data/interfaces/default/js/tables/history_table.js
View file

@ -107,7 +107,7 @@ history_table_options = {
} }
}, },
"width": "10%", "width": "10%",
"className": "no-wrap hidden-md hidden-sm hidden-xs modal-control" "className": "no-wrap hidden-md hidden-sm hidden-xs"
}, },
{ {
"targets": [5], "targets": [5],
@ -307,7 +307,7 @@ history_table_options = {
} }
// Parent table platform modal // Parent table platform modal
$('#history_table').on('click', '> tbody > tr > td.modal-control', function () { $('.history_table').on('click', '> tbody > tr > td.modal-control', function () {
var tr = $(this).closest('tr'); var tr = $(this).closest('tr');
var row = history_table.row( tr ); var row = history_table.row( tr );
var rowData = row.data(); var rowData = row.data();
@ -327,7 +327,7 @@ $('#history_table').on('click', '> tbody > tr > td.modal-control', function () {
}); });
// Parent table ip address modal // Parent table ip address modal
$('#history_table').on('click', '> tbody > tr > td.modal-control-ip', function () { $('.history_table').on('click', '> tbody > tr > td.modal-control-ip', function () {
var tr = $(this).closest('tr'); var tr = $(this).closest('tr');
var row = history_table.row( tr ); var row = history_table.row( tr );
var rowData = row.data(); var rowData = row.data();
@ -350,7 +350,7 @@ $('#history_table').on('click', '> tbody > tr > td.modal-control-ip', function (
}); });
// Parent table delete mode // Parent table delete mode
$('#history_table').on('click', '> tbody > tr > td.delete-control > button', function () { $('.history_table').on('click', '> tbody > tr > td.delete-control > button', function () {
var tr = $(this).closest('tr'); var tr = $(this).closest('tr');
var row = history_table.row( tr ); var row = history_table.row( tr );
var rowData = row.data(); var rowData = row.data();
@ -399,7 +399,7 @@ $('#history_table').on('click', '> tbody > tr > td.delete-control > button', fun
}); });
// Parent table expand detailed history // Parent table expand detailed history
$('#history_table').on('click', '> tbody > tr > td.expand-history a', function () { $('.history_table').on('click', '> tbody > tr > td.expand-history a', function () {
var tr = $(this).closest('tr'); var tr = $(this).closest('tr');
var row = history_table.row(tr); var row = history_table.row(tr);
var rowData = row.data(); var rowData = row.data();

2
data/interfaces/default/js/tables/history_table_modal.js
View file

@ -148,7 +148,7 @@ history_table_modal_options = {
} }
} }
$('#history_table').on('click', 'td.modal-control', function () { $('.history_table').on('click', 'td.modal-control', function () {
var tr = $(this).parents('tr'); var tr = $(this).parents('tr');
var row = history_table.row(tr); var row = history_table.row(tr);
var rowData = row.data(); var rowData = row.data();

8
data/interfaces/default/js/tables/user_ips.js
View file

@ -56,7 +56,7 @@ user_ip_table_options = {
} }
}, },
"width": "15%", "width": "15%",
"className": "no-wrap hidden-md hidden-sm hidden-xs modal-control" "className": "no-wrap hidden-md hidden-sm hidden-xs"
}, },
{ {
"targets": [3], "targets": [3],
@ -146,11 +146,11 @@ user_ip_table_options = {
} }
} }
$('#user_ip_table').on('mouseenter', 'td.modal-control span', function () { $('.user_ip_table').on('mouseenter', 'td.modal-control span', function () {
$(this).tooltip(); $(this).tooltip();
}); });
$('#user_ip_table').on('click', 'td.modal-control', function () { $('.user_ip_table').on('click', 'td.modal-control', function () {
var tr = $(this).parents('tr'); var tr = $(this).parents('tr');
var row = user_ip_table.row(tr); var row = user_ip_table.row(tr);
var rowData = row.data(); var rowData = row.data();
@ -169,7 +169,7 @@ $('#user_ip_table').on('click', 'td.modal-control', function () {
showStreamDetails(); showStreamDetails();
}); });
$('#user_ip_table').on('click', 'td.modal-control-ip', function () { $('.user_ip_table').on('click', 'td.modal-control-ip', function () {
var tr = $(this).parents('tr'); var tr = $(this).parents('tr');
var row = user_ip_table.row( tr ); var row = user_ip_table.row( tr );
var rowData = row.data(); var rowData = row.data();

2
data/interfaces/default/library.html
View file

@ -186,7 +186,7 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
<div class="table-card-back"> <div class="table-card-back">
<table class="display" id="history_table-SID-${data['section_id']}" width="100%"> <table class="display history_table" id="history_table-SID-${data['section_id']}" width="100%">
<thead> <thead>
<tr> <tr>
<th align="left" id="delete">Delete</th> <th align="left" id="delete">Delete</th>

4
data/interfaces/default/user.html
View file

@ -148,7 +148,7 @@ from plexpy import helpers
</div> </div>
</div> </div>
<div class="table-card-back"> <div class="table-card-back">
<table id="user_ip_table-UID-${data['user_id']}" class="display" width="100%"> <table class="display user_ip_table" id="user_ip_table-UID-${data['user_id']}" width="100%">
<thead> <thead>
<tr> <tr>
<th align="left">Last Seen</th> <th align="left">Last Seen</th>
@ -186,7 +186,7 @@ from plexpy import helpers
</div> </div>
</div> </div>
<div class="table-card-back"> <div class="table-card-back">
<table class="display" id="history_table-UID-${data['user_id']}" width="100%"> <table class="display history_table" id="history_table-UID-${data['user_id']}" width="100%">
<thead> <thead>
<tr> <tr>
<th align="left" id="delete">Delete</th> <th align="left" id="delete">Delete</th>