From b84f214030f25680e8548b7487bdbd547acf8a8f Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 27 Sep 2015 12:06:59 -0700 Subject: [PATCH] Align expand history icon --- data/interfaces/default/css/plexpy.css | 1 - data/interfaces/default/js/tables/history_table.js | 5 +++-- plexpy/datafactory.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 2d623547..7398da6f 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -2378,7 +2378,6 @@ a .home-platforms-instance-list-oval:hover, width: 100%; } } - table.display tr.shown + tr div.slider { display: none; } diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index e6712654..2c499b0c 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -48,10 +48,11 @@ history_table_options = { $(td).html('Currently watching...'); } else if (rowData['group_count'] > 1) { date = moment(cellData, "X").format(date_format); - expand_history = ''; + expand_history = ''; $(td).html('
' + expand_history + ' ' + date + '
'); } else { - $(td).html(moment(cellData, "X").format(date_format)); + date = moment(cellData, "X").format(date_format); + $(td).html('
 ' + date + '
'); } }, "searchable": false, diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 29549960..b6be65b8 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -59,7 +59,7 @@ class DataFactory(object): '((CASE WHEN view_offset IS NULL THEN 0.1 ELSE view_offset * 1.0 END) / \ (CASE WHEN session_history_metadata.duration IS NULL THEN 1.0 ELSE session_history_metadata.duration * 1.0 END) * 100) AS percent_complete', 'session_history_media_info.video_decision', - 'COUNT(*) AS group_count' + 'COUNT(*) AS group_count', 'session_history_media_info.audio_decision', 'session_history.user_id as user_id' ] @@ -128,7 +128,7 @@ class DataFactory(object): "thumb": thumb, "video_decision": item["video_decision"], "watched_status": watched_status, - "group_count": item["group_count"] + "group_count": item["group_count"], "audio_decision": item["audio_decision"], "user_id": item["user_id"] }