From d71e12ea6e97c604690dcd8695e9a01136abe59f Mon Sep 17 00:00:00 2001
From: Tim <timvdwest@gmail.com>
Date: Sat, 8 Aug 2015 17:56:38 +0200
Subject: [PATCH] Load datatables javascript and css with the main graphs page
 to speed up history table calls. Fix styling on recently added error.

---
 data/interfaces/default/graphs.html              | 8 +++++++-
 data/interfaces/default/history_table_modal.html | 7 -------
 data/interfaces/default/recently_added.html      | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html
index 754d96c5..9ced5250 100644
--- a/data/interfaces/default/graphs.html
+++ b/data/interfaces/default/graphs.html
@@ -1,6 +1,8 @@
 <%inherit file="base.html"/>
 
 <%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 name="body()">
@@ -132,6 +134,10 @@
 <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/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>
     // Modal popup dialog
     function selectHandler(selectedDate) {
@@ -149,8 +155,8 @@
                 type: 'post',
                 data:  { 'start_date': dateString },
                 complete: function(xhr, status) {
-                    $("#history-modal").html(xhr.responseText);
                     $('#history-modal').modal('show');
+                    $("#history-modal").html(xhr.responseText);
                 }
             });
         }
diff --git a/data/interfaces/default/history_table_modal.html b/data/interfaces/default/history_table_modal.html
index e5d4f260..5fdb1fcd 100644
--- a/data/interfaces/default/history_table_modal.html
+++ b/data/interfaces/default/history_table_modal.html
@@ -1,7 +1,4 @@
 % 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-content">
         <div class="modal-header">
@@ -31,11 +28,7 @@
     </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>
     $(document).ready(function() {
         history_table_modal_options.ajax = {
diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html
index 1967822a..fc51c8ab 100644
--- a/data/interfaces/default/recently_added.html
+++ b/data/interfaces/default/recently_added.html
@@ -58,6 +58,6 @@ DOCUMENTATION :: END
     </ul>
 </div>
 % 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>
 % endif
\ No newline at end of file