diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 665029c0..d5a9cc85 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -1597,6 +1597,29 @@ a .season-episodes-card-overlay:hover { left: 0px; margin-right: 5px; } +.home-platforms-instance-last-user { + float: left; + position: relative; + padding: 6px 0 0 20px; + width: 100%; +} +.home-platforms-instance-last-user h5 { + font-size: 12px; + position: relative; + margin: 0 0 3px 0; + float: left; +} +.home-platforms-instance-last-user p { + color: #aaa; + font-size: 12px; + float: left; + clear: left; + position: relative; + width: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .home-platforms-instance-poster { margin-left: 0px; position: absolute; @@ -1724,6 +1747,29 @@ a .season-episodes-card-overlay:hover { left: 0px; margin-right: 5px; } +.home-platforms-instance-list-last-user { + float: left; + position: relative; + padding: 0 0 0 10px; + width: 100%; +} +.home-platforms-instance-list-last-user h5 { + font-size: 12px; + position: relative; + margin: 0 0 2px 0; + float: left; +} +.home-platforms-instance-list-last-user p { + color: #aaa; + font-size: 12px; + float: left; + clear: left; + position: relative; + width: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .home-platforms-instance-list-poster { position: absolute; left: 20px; @@ -1769,7 +1815,7 @@ a .season-episodes-card-overlay:hover { } .home-platforms-instance-list-chevron { position: absolute; - top: 100px; + top: 105px; right: 0; cursor: pointer; } diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index a61a2456..1225d6fe 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -68,21 +68,22 @@ DOCUMENTATION :: END % endif
+ % if a['type'] == 'movie' and not a['indexes']:
+ % elif a['type'] == 'episode' and not a['indexes']: +
% elif a['indexes']: - + % else: - % if a['type'] == 'episode': -
- % elif a['type'] == 'track': + % if a['type'] == 'track':
% elif a['type'] == 'clip':
% else: -
+
% endif % endif
@@ -209,11 +210,6 @@ DOCUMENTATION :: END $(this).html(millisecondsToMinutes($(this).text(), false)); }); - // Tooltips - $('.dashboard-activity-metadata-platform').each(function() { - $(this).tooltip(); - }); - // Show/Hide activity info $('.btn-activity-info').on('click', function(e) { e.preventDefault(); @@ -227,4 +223,4 @@ DOCUMENTATION :: END
There was an error communicating with your Plex Server. Please check your settings.

-% endif \ No newline at end of file +% endif diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html index 870b2075..175b3887 100644 --- a/data/interfaces/default/home_stats.html +++ b/data/interfaces/default/home_stats.html @@ -17,6 +17,9 @@ data[array_index]['rows'] :: Usable parameters row_id Return the db row id for a metadata item if one exists +== Only if 'stat_id' is 'top_tv' or 'popular_tv' or 'top_movies' or 'popular_movies' or 'last_watched' == +thumb Return the thumb for the media item. + == Only if 'stat_id' is 'top_tv' or 'popular_tv' == grandparent_thumb Returns location of the item's thumbnail. Use with pms_image_proxy. rating_key Returns the unique identifier for the media item. @@ -29,15 +32,18 @@ total_duration Returns the total duration for the associated stat. == Only of 'stat_id' is 'popular_tv' or 'popular_movies' == users_watched Returns the count for the associated stat. -== Only if 'stat_id' is 'top_user' == -thumb Returns url of the user's gravatar. Returns '' if none exists. +== Only if 'stat_id' is 'top_user' or 'last_watched' == +user_thumb Returns url of the user's gravatar. Returns '' if none exists. user Returns the username for the associated stat. user_id Returns the user id for the associated stat. friendly_name Returns the friendly name of the user for the associated stat. -== Only if 'stat_id' is 'top_platform' == +== Only if 'stat_id' is 'top_platform' or 'last_watched' == platform_type Returns the platform name for the associated stat. +== Only if 'stat_id' is 'last_watched' == +last_watch Returns the time the media item was last watched. + DOCUMENTATION :: END @@ -395,9 +401,9 @@ DOCUMENTATION :: END % else: % endif - % if top_stat['rows'][0]['thumb'] != '': + % if top_stat['rows'][0]['user_thumb'] != '':
-
+
% else:
@@ -439,9 +445,9 @@ DOCUMENTATION :: END % else: % endif - % if top_stat['rows'][loop.index]['thumb'] != '': + % if top_stat['rows'][loop.index]['user_thumb'] != '':
-
+
% else:
@@ -479,7 +485,9 @@ DOCUMENTATION :: END
-
+
%if len(top_stat['rows']) > 1:
@@ -521,9 +529,106 @@ DOCUMENTATION :: END % endif
- + % elif top_stat['stat_id'] == 'last_watched' and top_stat['rows']: +
+
  • +
    +
    +

    Last Watched

    +
    + + ${top_stat['rows'][0]['title']} + +
    +
    +
    +
    + % if top_stat['rows'][0]['user_id']: + + % else: + + % endif + ${top_stat['rows'][0]['friendly_name']} + +
    +

    + + + - ${top_stat['rows'][0]['platform_type']} +

    +
    +
    + + % if top_stat['rows'][0]['thumb']: +
    +
    +
    + % else: +
    +
    +
    + % endif +     + %if len(top_stat['rows']) > 1: +
    + + % endif +
    • +
    % endif % endfor diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 8a31845c..9c1c361f 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -110,6 +110,17 @@ }); }); + var date_format = 'YYYY-MM-DD'; + var time_format = 'hh:mm a'; + $.ajax({ + url: 'get_date_formats', + type: 'GET', + success: function(data) { + date_format = data.date_format; + time_format = data.time_format; + } + }); + getHomeStats(${config['home_stats_length']}, ${config['home_stats_type']}, ${config['home_stats_count']}); diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 04185bf5..08c5005b 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -73,7 +73,7 @@ DOCUMENTATION :: END Season ${data['parent_index']} - ${data['title']} + Episode ${data['index']} - ${data['title']} % endif
    diff --git a/data/interfaces/default/stream_data.html b/data/interfaces/default/stream_data.html index 6aba69ec..c0cf86fd 100644 --- a/data/interfaces/default/stream_data.html +++ b/data/interfaces/default/stream_data.html @@ -54,6 +54,7 @@ DOCUMENTATION :: END

    Stream Details

    + % if data['media_type'] != 'track':
    Video
    + % endif
    Audio
    + % if data['media_type'] != 'track':

    Video Source Details

    + % endif

    Audio Source Details