diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index c471c3b3..0d66fac7 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -7,7 +7,7 @@ from plexpy import version - PlexPy - ${title} + PlexPy - ${title} | ${server_name} diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 2571667a..e2e11185 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -341,6 +341,24 @@ input[type="color"], border-radius: 3px; transition: background-color .3s; } +textarea.form-control { + height: initial; + margin: 5px 0 5px 0; + color: #fff; + border: 0px solid #444; + background: #555; + padding: 6px 12px; + background-color: #555; + border-radius: 3px; + transition: background-color .3s; + resize: none; +} +textarea.form-control:focus { + outline: 0; + color: #555; + background-color: #fff; + transition: background-color .3s; +} .pagination > li > a, .pagination > li > span { position: relative; diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 5f8caeba..1eb26c1d 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -33,7 +33,7 @@
-

Library Statistics

+

Library Statistics ${config['pms_name']}

Loading stats...
@@ -98,27 +98,6 @@ }); } - function getLibraryStatsHeader() { - $.ajax({ - "url": "get_servers_info", - type: "post", - cache: false, - async: true, - data: { }, - complete: function (xhr, status) { - server_info = $.parseJSON(xhr.responseText); - var server_name = 'Server name not found'; - for (var i in server_info) { - if (server_info[i].machine_identifier == '${config['pms_identifier']}') { - server_name = server_info[i].name - break; - } - } - $('#library-statistics-header h3').append(' ' + server_name + '') - } - }); - } - function getLibraryStats() { $.ajax({ url: 'library_stats', @@ -170,7 +149,6 @@ }); getHomeStats(); - getLibraryStatsHeader(); getLibraryStats(); diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index 8fc15536..50348c46 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -232,7 +232,9 @@ function getPlatformImagePath(platformName) { function isPrivateIP(ip_address) { if (ip_address.indexOf(".") > -1) { - var parts = ip_address.split('.'); + // get IPv4 mapped address (xxx.xxx.xxx.xxx) from IPv6 addresss (::ffff:xxx.xxx.xxx.xxx) + var parts = ip_address.split(":"); + var parts = parts[parts.length - 1].split('.'); if (parts[0] === '10' || (parts[0] === '172' && (parseInt(parts[1], 10) >= 16 && parseInt(parts[1], 10) <= 31)) || (parts[0] === '192' && parts[1] === '168')) { diff --git a/data/interfaces/default/notification_triggers_modal.html b/data/interfaces/default/notification_triggers_modal.html index bbe798fc..82971ac2 100644 --- a/data/interfaces/default/notification_triggers_modal.html +++ b/data/interfaces/default/notification_triggers_modal.html @@ -64,6 +64,20 @@ from plexpy import helpers

Trigger notification when a media item is added to the Plex Media Server.

+
+ +

Trigger notification when the Plex Media Server cannot be reached externally.

+
+
+ +

Trigger notification when the Plex Media Server cannot be reached internally.

+
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 76a8551f..2a4f45d1 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -403,6 +403,12 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

Instead of polling the server at regular intervals let the server tell us when something happens. This is currently experimental. Encrypted websocket is not currently supported.

+
+ +

Enable to have PlexPy check if remote access to the Plex Media Server goes down. (Must have remote access set up in Plex.)

+

History Logging

@@ -483,7 +489,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
-

Notification Tuning

+

Current Activity Notifications

@@ -502,12 +508,27 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

Disable to prevent consecutive notifications (i.e. both watched & stopped notifications).

+ +
+

Recently Added Notifications

+
+

Enable to only get one notification for recently added Episodes or Tracks. Movies are unaffected.

+
+ +
+
+ +
+ +
+

Set the delay for recently added notifications to allow metadata to be processes. Minimum 60 seconds.

+

Custom Notification Messages

@@ -523,7 +544,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()