From c4416572cf4e131d1d9a4847f5e153d85d1c2b69 Mon Sep 17 00:00:00 2001
From: Tim <timvdwest@gmail.com>
Date: Fri, 14 Aug 2015 20:15:30 +0200
Subject: [PATCH] Remove unnecessary transparency on update notification and
 column selection. Keep the update message closed for 1 hour if close button
 is clicked. Will reset if manual update check is done. Don't ignore user
 logging when doing import (we still need an option in the import to override
 this).

---
 data/interfaces/default/base.html             | 19 +++++++++++++++----
 .../default/css/dataTables.colVis.css         |  2 +-
 data/interfaces/default/css/plexpy.css        |  2 +-
 data/interfaces/default/settings.html         |  2 ++
 plexpy/monitor.py                             |  2 +-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html
index 03d71e57..3bffc64a 100644
--- a/data/interfaces/default/base.html
+++ b/data/interfaces/default/base.html
@@ -30,16 +30,16 @@ from plexpy import version
 <div class="container">
     <div id="ajaxMsg" class="ajaxMsg"></div>
     % if plexpy.CONFIG.CHECK_GITHUB and not plexpy.CURRENT_VERSION:
-    <div id="updatebar">
+    <div id="updatebar" style="display: none;">
         You're running an unknown version of PlexPy. <a href="update">Update</a> or
-        <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
+        <a href="#" id="updateDismiss">Close</a>
     </div>
     % elif plexpy.CONFIG.CHECK_GITHUB and plexpy.CURRENT_VERSION != plexpy.LATEST_VERSION and plexpy.COMMITS_BEHIND > 0 and plexpy.INSTALL_TYPE != 'win':
-    <div id="updatebar">
+    <div id="updatebar" style="display: none;">
         A <a
             href="https://github.com/${plexpy.CONFIG.GIT_USER}/plexpy/compare/${plexpy.CURRENT_VERSION}...${plexpy.LATEST_VERSION}">
         newer version</a> is available. You're ${plexpy.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or
-        <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
+        <a href="#" id="updateDismiss">Close</a>
     </div>
     % endif
     <nav class="navbar navbar-fixed-top">
@@ -104,6 +104,17 @@ ${next.body()}
 <script src="interfaces/default/js/jquery-2.1.4.min.js"></script>
 <script src="interfaces/default/js/bootstrap3/bootstrap.min.js"></script>
 <script src="interfaces/default/js/script.js"></script>
+<script>
+    $('#updateDismiss').click(function() {
+        $('#updatebar').slideUp('slow');
+        // Set cookie to remember dismiss decision for 1 hour.
+        setCookie('updateDismiss', 'true', 1/24);
+    });
+
+    if (!getCookie('updateDismiss')) {
+        $('#updatebar').show();
+    }
+</script>
 ${next.javascriptIncludes()}
 </body>
 </html>
diff --git a/data/interfaces/default/css/dataTables.colVis.css b/data/interfaces/default/css/dataTables.colVis.css
index 89d48d59..7998bb4d 100644
--- a/data/interfaces/default/css/dataTables.colVis.css
+++ b/data/interfaces/default/css/dataTables.colVis.css
@@ -72,7 +72,7 @@ ul.ColVis_collection {
 	width: 150px;
 	padding: 8px 8px 4px 8px;
 	margin: 10px 0px 0px 0px;
-	background-color: rgba( 88, 88, 88, 0.8 );
+	background-color: #444;
 	overflow: hidden;
 	z-index: 2002;
 }
diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index 011d4569..36ead7e8 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -1501,7 +1501,7 @@ input[type="color"],
     z-index: 9999;
 }
 #updatebar {
-    background-color: rgba(255,255,255,0.075);
+    background-color: #444;
     color: #999999;
     display: none;
     font-size: 14px;
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 215048fc..d53f0417 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -844,6 +844,8 @@ $(document).ready(function() {
     });
 
     $("#menu_link_update_check").click(function() {
+        // Allow the update bar to show again if previously dismissed.
+        setCookie('updateDismiss', 'true', 0);
         $(this).html('<i class="fa fa-spin fa-refresh"></i> Checking</button>');
         $(this).prop('disabled', true);
         window.location.href = "checkGithub";
diff --git a/plexpy/monitor.py b/plexpy/monitor.py
index 35ae683f..418b00e5 100644
--- a/plexpy/monitor.py
+++ b/plexpy/monitor.py
@@ -222,7 +222,7 @@ class MonitorProcessing(object):
                                  (session['rating_key'], str(int(stopped) - session['started']),
                                   import_ignore_interval))
 
-            if not user_details['keep_history']:
+            if not user_details['keep_history'] and not is_import:
                 logging_enabled = False
                 logger.debug(u"PlexPy Monitor :: History logging for user '%s' is disabled." % session['user'])