diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index 9a75b2e0..4d9bef17 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -264,6 +264,9 @@ fieldset[disabled] .btn-bright.active {
.modal-body i {
color: #F9AA03;
}
+.modal-body i.fa {
+ color: #fff;
+}
.modal-body strong {
color: #F9AA03;
}
@@ -641,13 +644,14 @@ input[type="color"],
font-size: 13px;
margin: 0;
line-height: 15px;
- font-weight: bold;
+ font-weight: normal;
width: 153px;
white-space: nowrap;
text-align: center;
clear: both;
}
-.dashboard-recent-media-metacontainer text-muted {
+.dashboard-recent-media-metacontainer .text-muted {
+ padding-top: 5px;
text-overflow: ellipsis;
overflow: hidden;
position: relative;
@@ -1151,7 +1155,7 @@ input[type="color"],
position: relative;
font-size: 13px;
line-height: 15px;
- font-weight: bold;
+ font-weight: normal;
width: 140px;
margin-left: 10px;
}
diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html
index 3037d4f8..75482622 100644
--- a/data/interfaces/default/recently_added.html
+++ b/data/interfaces/default/recently_added.html
@@ -50,6 +50,7 @@ DOCUMENTATION :: END
diff --git a/data/interfaces/default/user_recently_watched.html b/data/interfaces/default/user_recently_watched.html
index 1b413439..2cf7b57c 100644
--- a/data/interfaces/default/user_recently_watched.html
+++ b/data/interfaces/default/user_recently_watched.html
@@ -18,6 +18,7 @@ time Returns the last watched time of the media.
title Returns the name of the movie or episode.
== Only if 'type' is 'episode ==
+parent_title Returns the name of the TV Show a season belongs too.
parent_index Returns the season number.
index Returns the episode number.
@@ -39,8 +40,9 @@ DOCUMENTATION :: END
% if item['type'] == 'episode':
+
${item['parent_title']}
${item['title']}
- (Season ${item['parentIndex']}, Episode ${item['index']})
+ (Season ${item['parent_index']}, Episode ${item['index']})
% elif item['type'] == 'movie':
${item['title']}
(${item['year']})
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 97a58c24..3f8e89ef 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -381,21 +381,21 @@ class DataFactory(object):
try:
if user_id:
query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \
- 'thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
+ 'grandparent_title, thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
'FROM session_history_metadata ' \
'JOIN session_history ON session_history_metadata.id = session_history.id ' \
'WHERE user_id = ? AND session_history.media_type != "track" ORDER BY started DESC LIMIT ?'
result = monitor_db.select(query, args=[user_id, limit])
elif user:
query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \
- 'thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
+ 'grandparent_title, thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
'FROM session_history_metadata ' \
'JOIN session_history ON session_history_metadata.id = session_history.id ' \
'WHERE user = ? AND session_history.media_type != "track" ORDER BY started DESC LIMIT ?'
result = monitor_db.select(query, args=[user, limit])
else:
query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \
- 'thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
+ 'grandparent_title, thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
'FROM session_history_metadata WHERE session_history.media_type != "track"' \
'JOIN session_history ON session_history_metadata.id = session_history.id ' \
'ORDER BY started DESC LIMIT ?'
@@ -406,20 +406,21 @@ class DataFactory(object):
for row in result:
if row[1] == 'episode':
- thumb = row[5]
+ thumb = row[6]
else:
- thumb = row[4]
+ thumb = row[5]
recent_output = {'row_id': row[0],
'type': row[1],
'rating_key': row[2],
'title': row[3],
+ 'parent_title': row[4],
'thumb': thumb,
- 'index': row[6],
- 'parentIndex': row[7],
- 'year': row[8],
- 'time': row[9],
- 'user': row[10]
+ 'index': row[7],
+ 'parent_index': row[8],
+ 'year': row[9],
+ 'time': row[10],
+ 'user': row[11]
}
recently_watched.append(recent_output)