From 81a8d93336aa757887d13831ccde798a7a778c9e Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 23 Aug 2015 15:58:16 -0700 Subject: [PATCH 01/10] Fix size of posters pulled from Plex --- data/interfaces/default/home_stats.html | 8 ++++---- data/interfaces/default/info.html | 8 ++++---- data/interfaces/default/recently_added.html | 4 ++-- data/interfaces/default/user_recently_watched.html | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html index 2a05ca34..fbe42b5b 100644 --- a/data/interfaces/default/home_stats.html +++ b/data/interfaces/default/home_stats.html @@ -83,7 +83,7 @@ DOCUMENTATION :: END % if a['rows'][0]['grandparent_thumb']:
-
+
% else:
@@ -111,7 +111,7 @@ DOCUMENTATION :: END % if a['rows'][0]['grandparent_thumb'] != '':
-
+
% else:
@@ -143,7 +143,7 @@ DOCUMENTATION :: END % if a['rows'][0]['thumb']:
-
+
% else:
@@ -171,7 +171,7 @@ DOCUMENTATION :: END % if a['rows'][0]['thumb']:
-
+
% else:
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 8eba3f9b..4f86ac12 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -57,17 +57,17 @@ DOCUMENTATION :: END % if data['type'] == 'episode': % if data['parent_thumb']: -
+
% else: -
+
%endif % elif data['type'] == 'season': -
+
% else: -
+
% endif
diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html index 75482622..dd68e5a1 100644 --- a/data/interfaces/default/recently_added.html +++ b/data/interfaces/default/recently_added.html @@ -32,7 +32,7 @@ DOCUMENTATION :: END % if item['type'] == 'season' or item['type'] == 'movie':
-
+
% if item['type'] == 'season': @@ -47,7 +47,7 @@ DOCUMENTATION :: END % elif item['type'] == 'album':
-
+

${item['parent_title']}

diff --git a/data/interfaces/default/user_recently_watched.html b/data/interfaces/default/user_recently_watched.html index 2cf7b57c..c57ebdfc 100644 --- a/data/interfaces/default/user_recently_watched.html +++ b/data/interfaces/default/user_recently_watched.html @@ -36,7 +36,7 @@ DOCUMENTATION :: END
  • -
    +
    % if item['type'] == 'episode': From ff6d43c3988c160ad63c6691bab6ab7a8d65b481 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 23 Aug 2015 17:06:05 -0700 Subject: [PATCH 02/10] Fixed numbers swapped --- data/interfaces/default/home_stats.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html index fbe42b5b..7cd47371 100644 --- a/data/interfaces/default/home_stats.html +++ b/data/interfaces/default/home_stats.html @@ -171,7 +171,7 @@ DOCUMENTATION :: END % if a['rows'][0]['thumb']:
    -
    +
    % else:
    From 31805e39e64e9d6ee6f2c74f579b8babc32895b9 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 23 Aug 2015 17:46:44 -0700 Subject: [PATCH 03/10] Change class name for consistency --- data/interfaces/default/css/plexpy.css | 2 +- data/interfaces/default/user_platform_stats.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index f7343fff..9f1fc18a 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -1245,7 +1245,7 @@ input[type="color"], } .user-platforms-instance li { } -.user-platforms-instance-poster { +.user-platforms-instance-box { float: left; width: 75px; border-radius: 3px; diff --git a/data/interfaces/default/user_platform_stats.html b/data/interfaces/default/user_platform_stats.html index c281b48b..afd1d6b3 100644 --- a/data/interfaces/default/user_platform_stats.html +++ b/data/interfaces/default/user_platform_stats.html @@ -34,7 +34,7 @@ DOCUMENTATION :: END
    % endfor % else: From 77f5224e13248c4113861fccab44954c9c06df6b Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 23 Aug 2015 23:23:23 -0700 Subject: [PATCH 04/10] Moved settings around to more logical locations --- data/interfaces/default/settings.html | 69 +++++++++++++-------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index dcc8e164..3145c4ae 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -83,6 +83,25 @@ available_notification_agents = notifiers.available_notification_agents()

    Set your preferred time format. Click here to see the parameter list.

    • +
    +

    Homepage Statistics

    +
    + +
    + +
    +
    + +
    +
    +

    Specify the number of days for the statistics on the home page. Default is 30 days.

    +
    +
    + +

    Use play duration instead of play count to generate statistics.

    +

    @@ -221,9 +240,24 @@ available_notification_agents = notifiers.available_notification_agents()

    Force PlexPy to connect to your Plex Server via SSL. Your server needs to have remote access enabled.

    +
    +

    Plex Logs

    +
    + +
    + +
    +
    + +
    +
    +

    Set the folder where your Plex Server logs are. This is required if you enable IP logging.
    Click here for help.

    +
    + +
    @@ -278,41 +312,6 @@ available_notification_agents = notifiers.available_notification_agents()

    If you have media indexing enabled on your server, use these on the activity pane.

    -
    -

    Homepage Statistics

    -
    - -
    - -
    -
    - -
    -
    -

    Specify the number of days for the statistics on the home page. Default is 30 days.

    -
    -
    - -

    Use play duration instead of play count to generate statistics.

    -
    - -
    -

    Plex Logs

    -
    - -
    - -
    -
    - -
    -
    -

    Set the folder where your Plex Server logs are. This is required if you enable IP logging.
    Click here for help.

    -
    - -

    PlexWatch Import Tool

    From 79757da2b1e0ee065a19fe226e965c2e95490b41 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 23 Aug 2015 23:25:55 -0700 Subject: [PATCH 05/10] Update user images --- data/interfaces/default/css/plexpy.css | 37 ++++++++++++++++++++-- data/interfaces/default/js/tables/users.js | 5 ++- data/interfaces/default/user.html | 3 +- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 9f1fc18a..0957937f 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -431,6 +431,19 @@ input[type="color"], -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); } +.users-poster-face { + overflow: hidden; + float: left; + background-size: contain; + height: 40px; + width: 40px; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; + border-radius: 50%; + webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); +} .users-poster-face img { bottom: 0; overflow: hidden; @@ -1127,6 +1140,16 @@ input[type="color"], .user-info-poster-face { float: left; margin-top: 15px; + margin-right: 15px; + background-size: contain; + height: 80px; + width: 80px; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; + border-radius: 50%; + webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); } .user-info-poster-face img { bottom: 0; @@ -1249,9 +1272,9 @@ input[type="color"], float: left; width: 75px; border-radius: 3px; - -webkit-box-shadow: 0 0 5px rgba(0,0,0,0.5); - -moz-box-shadow: 0 0 5px rgba(0,0,0,0.5); - box-shadow: 0 0 5px rgba(0,0,0,0.5); + webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); background-size: contain; position: relative; height: 80px; @@ -1308,7 +1331,12 @@ input[type="color"], bottom: 35px; height: 80px; width: 80px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; border-radius: 3px; + webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); } .home-platforms-instance-oval { background-size: contain; @@ -1320,6 +1348,9 @@ input[type="color"], -webkit-border-radius: 50%; -moz-border-radius: 50%; border-radius: 50%; + webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); + box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1); } .home-platforms-instance-name { float: left; diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js index b3f54778..b2974cff 100644 --- a/data/interfaces/default/js/tables/users.js +++ b/data/interfaces/default/js/tables/users.js @@ -36,15 +36,14 @@ users_list_table_options = { "data": "user_thumb", "createdCell": function (td, cellData, rowData, row, col) { if (cellData === '') { - $(td).html('User Logo'); + $(td).html('
    '); } else { - $(td).html('User Logo'); + $(td).html('
    '); } }, "orderable": false, "searchable": false, "width": "5%", - "className": "users-poster-face" }, { "targets": [2], diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html index 4727be64..0572aa08 100644 --- a/data/interfaces/default/user.html +++ b/data/interfaces/default/user.html @@ -40,8 +40,7 @@ from plexpy import helpers