anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Load datatables javascript and css with the main graphs page to speed up history table calls.

Browse Source 
Fix styling on recently added error.
This commit is contained in:
Tim
2015-08-08 17:56:38 +02:00
parent 4588507426
commit d71e12ea6e
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/interfaces/default/graphs.html
View File

@@ -1,6 +1,8 @@
<%inherit file="base.html"/> <%inherit file="base.html"/>
<%def name="headIncludes()"> <%def name="headIncludes()">
<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
</%def> </%def>
<%def name="body()"> <%def name="body()">
@@ -132,6 +134,10 @@
<script src="interfaces/default/js/moment-with-locale.js"></script> <script src="interfaces/default/js/moment-with-locale.js"></script>
<script src="interfaces/default/js/moment-duration-format.js"></script> <script src="interfaces/default/js/moment-duration-format.js"></script>
<script src="interfaces/default/js/highcharts/js/highcharts.js"></script> <script src="interfaces/default/js/highcharts/js/highcharts.js"></script>
<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
<script> <script>
// Modal popup dialog // Modal popup dialog
function selectHandler(selectedDate) { function selectHandler(selectedDate) {
@@ -149,8 +155,8 @@
type: 'post', type: 'post',
data: { 'start_date': dateString }, data: { 'start_date': dateString },
complete: function(xhr, status) { complete: function(xhr, status) {
$("#history-modal").html(xhr.responseText);
$('#history-modal').modal('show'); $('#history-modal').modal('show');
$("#history-modal").html(xhr.responseText);
} }
}); });
} }

7
data/interfaces/default/history_table_modal.html
View File

@@ -1,7 +1,4 @@
% if data: % if data:
<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@@ -31,11 +28,7 @@
</div> </div>
</div> </div>
<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
<script src="interfaces/default/js/tables/history_table_modal.js"></script> <script src="interfaces/default/js/tables/history_table_modal.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
history_table_modal_options.ajax = { history_table_modal_options.ajax = {

2
data/interfaces/default/recently_added.html
View File

@@ -58,6 +58,6 @@ DOCUMENTATION :: END
</ul> </ul>
</div> </div>
% else: % else:
<div class="muted">There was an error communicating with your Plex Server. Please check your <a href="settings">settings</a>. <div class="text-muted">There was an error communicating with your Plex Server. Please check your <a href="settings">settings</a>.
</div><br> </div><br>
% endif % endif