Merge branch 'dev'

* Also reduce memory cost

.gitignore

@@ -21,6 +21,10 @@ cache/*
 *.crt
 *.key
 *.csr
+*.pem
+
+# Mergetool
+*.orgin
 
 # OS generated files #
 ######################
@@ -31,7 +35,7 @@ Icon?
 Thumbs.db
 
 #Ignore files generated by PyCharm
-.idea/*
+*.idea/*
 
 #Ignore files generated by vi
 *.swp

CHANGELOG.md

@@ -1,6 +1,373 @@
 # Changelog
 
+## v1.4.1 (2016-05-20)
+
+* New: HTTP Proxy checkbox in the settings. Enable this if using an SSL enabled reverse proxy in front of PlexPy.
+* Fix: Check for blank username/password on login.
+* Fix: Persist current activity artwork blur across refreshes when transcoding details are visible.
+* Fix: Send notifications to multiple XBMC/Plex Home Theater devices.
+* Fix: Reset PMS identifier when clicking verify server button in settings.
+* Fix: Crash when trying to group current activity session in database.
+* Fix: Check current activity returns sessions when refreshing.
+* Fix: Logs sorted out of order.
+* Fix: Resolution reported incorrectly in the stream info modal.
+* Fix: PlexPy crashing when hashing password in the config file.
+* Fix: CherryPy doubling the port number when accessing PlexPy locally with http_proxy enabled.
+* Change: Sort by most recent for ties in watch statistics.
+* Change: Refresh Join devices when changing the API key.
+* Change: Format the Join device IDs.
+* Change: Join notifications now sent with Python Requests module.
+* Change: Add paging for recently added in the API.
+
+
+## v1.4.0 (2016-05-15)
+
+* New: An HTML form login page with sessions support.
+* New: Guest access control for shared users using Plex.tv authentication.
+  * Enable the option in the settings and toggle guest access per user from Users > Edit mode.
+  * Guests can only view their own user data. Other user info is removed/masked.
+  * Guests can only view media from libraries that are shared with them (content rating and label filters are respected). Other libraries are removed/masked.
+  * All settings and admin controls are restricted from guests.
+  * All current activity on the server is shown, but with masked user/metadata info.
+* New: Login logs table on the User and Logs pages.
+* New: Filter the history table by user.
+* New: Filter the graphs by user. (Thanks @Otger)
+* New: Option to hash the admin passowrd in the config file.
+* New: Options to enable/disable/rearrange each section on the homepage
+* New: Toggle media types for recently added items on the homepage.
+* New: Option to enter an Imgur API client ID for uploading posters.
+  * Note: The shared Imgur client id will be removed in a future PlexPy update! Please enter your own client id in the settings to continue uploading posters!
+* New: HTML support for Email.
+* New: Posters and HTML support for Telegram.
+* New: Poster support for Slack.
+* New: Poster support for Twitter.
+* New: Re-added Plex Home Theater notification agent.
+* New: Browser notification agent (experimental).
+* New: Added {plex_url} as a notification option.
+* New: Added transcode decision to the activity header.
+* New: Documentation for APIv2 (see API.md for details).
+* New: Import a Plexivity database into PlexPy.
+* New: Prettier fallback image for art/episodes.
+* New: Prettier confirm modal dialogues.
+* New: Cache images to reduce Plex API calls. This can be disabled in the under Settings > Extra Settings. (Thanks @Hellowlol)
+* New: Scheduled backups of the config file.
+* New: Button to clear the PlexPy cache/images in the settings.
+* New: Button to manually backup the PlexPy database/config in the settings.
+* New: Button to clear the PlexPy logs in the settings.
+* New: Button to download PlexPy log file on the Logs tab.
+* New: Advanced setting in config file to change the Plex API timeout value.
+* Fix: Mixed content HTTP request in settings (for reverse proxies with SSL).
+* Fix: Rename recently "watched" music to "played".
+* Change: Current activity details now persists across refreshes.
+* Change: Smoother transitions between preview thumbnails in current activity.
+* Change: Datatables now display all columns and scroll horizontally on smaller screens.
+* Change: Ability to change the base URL for reverse proxies in the web interface.
+* Change: Added a "Verify Server" button in the settings.
+* Change: Added request status code in the logs for notifer errors.
+* Change: Remove in-memory logs and read lines from log file instead. (Thanks @Hellowlol)
+* Change: Limit number of failed attempts to write sessions to history. Default is 5 attempts.
+* Change: A bunch of UI updates.
+* Change: A bunch of backend code cleanup.
+* Removed: All unused Python packages.
+
+
+## v1.3.16 (2016-05-01)
+
+* Fix: Viewing photos crashing PlexPy.
+* Fix: Persist Users > Edit mode on datatable page change.
+* Fix: PMS update notifications broken.
+* Change: Cache notifications poster with thread ID to avoid overwritting images.
+
+
+## v1.3.15 (2016-04-18)
+
+* Fix: Slack notifications failing when using and icon URL.
+* Fix: 127.0.0.1 showing as an external IP address on the history tables.
+* Fix: Regression file sizes not shown in the media info table footer.
+* Fix: Retrieving proper PMS URL when multiple connections are published to plex.tv.
+* Fix: Some typos in the logger.
+* Fix: Some other typos in the WebUI. (Thanks @xtjoeytx)
+* Change: Optimized mobile web app icons and spash screens. (Thanks @alotufo)
+
+
+## v1.3.14 (2016-03-29)
+
+* Fix: Regression for missing notify_action for script notifications.
+* Fix: Typo for home stats cards in the settings.
+
+
+## v1.3.13 (2016-03-27)
+
+* Fix: Only mask strings longer than 5 characters in logs.
+
+
+## v1.3.12 (2016-03-27)
+
+* Fix: "Check GitHub for updates" not rescheduling when toggling setting.
+* Fix: Bug where notifications would fail if metadata is not found.
+* Fix: Bug where notifications would fail if unable to upload poster to Imgur.
+* Fix: PlexPy will now start properly for different Python environment variables.
+* New: Feature requests moved to FeatHub.
+* New: Ability to specify a GitHub API token for updates (optional).
+* New: Mask out sensitive information from the logs.
+* New: New and updated Arnold quotes. (Thanks @Vilsol & @Chrisophogus)
+* New: "First" and "Last" page buttons to datatables.
+* New: Access log file from the "Help & Info" page.
+* New: CherryPy environment options (for development). (Thanks @codedecay)
+* New: PlexPy development environment (for development only).
+* Change: Facebook posts with a posters now include a summary.
+* Change: Facebook posts now use a default poster if the poster is not found or unable to upload to Imgur.
+* Change: IFTTT events can be fromatted with the {action} name.
+* Change: Logs now use ISO date format to avoid locale encoding errors. (Thanks @alshain)
+* Remove: Non-functioning Plex notification agent.
+
+
+## v1.3.11 (2016-03-15)
+
+* Fix: Typo preventing history logging for websockets.
+
+
+## v1.3.10 (2016-03-12)
+
+* Fix: Actually allow HTML tags for Pushover.
+* Fix: PlexPy not restarting on Windows if there is a space in the folder path.
+* Fix: Reconnect websocket when changing PMS SSL setting.
+* Fix: Datatables not loading when view_offset or duration is blank.
+* Fix: Bug when checking the PMS version in the settings.
+* Fix: Auto-refreshing of log tables.
+* Fix: Logging of IPv6 addresses. (PMS version >0.9.14 only.)
+* Fix: Hide days selection from the Play Totals graph page.
+* Fix: PlexPy overwriting user's own SSL certificate/key.
+* Fix: Multiple watched notifications when using websocket.
+* Fix: Some missing python library imports.
+* Fix: Some typos in settings and PlexWatch importer.
+* New: Ability to get notified of PMS updates.
+* New: Ability to disable the link to Plex Web with Facebook notifications and use IMDB, TVDB, TMDb, or Last.fm instead.
+* New: Ability to reset Imgur poster url from the info page if the poster is changed.
+* New: Tooltips on the current activity progress bars.
+* New: Side scrolling of Recently Added/Recently Played items.
+* New: Document all date/time format options.
+* New: Button to clear notification logs.
+* New: Customizable backup, cache, and log directories.
+* Change: Retry writing sessions to history if it fails, so sessions don't get lost. (Activity pinger only, not availble for websocket.)
+* Change: Save any unknown sessions to the "Local" user.
+* Change: History table modal is filtered depending on which graph series is clicked.
+* Change: Revert back to saving the state of datatables (search, sorting, entries per page, etc.).
+* Change: Newlines are not longer stripped from notification text which allows for finer control of how notifications look.
+* Change: Updated FreeNAS/FreeBSD init scripts. (Must have updated jails.) (Thanks @chiviak)
+
+
+## v1.3.9 (2016-02-21)
+
+* Fix: Recently added notification not sent to all notification agents.
+* New: Pushover HTML support. (Thanks @elseym)
+
+
+## v1.3.8 (2016-02-21)
+
+* Fix: Regression unable to clear HTTP password.
+* Fix: Remove media tags from script arguments for server notifications.
+* Fix: Encode poster titles to UTF-8 for Imgur upload.
+* Fix: Allow notifications to send without poster if Imgur upload fails.
+* New: Notification Logs table in the Logs tab.
+* New: Toggle in settings to enable posters in notifications. (Disabled by default.)
+* Change: Save Imgur poster URL to database so upload is not needed every time.
+* Change: Notify log in database to log each event as a separate entry.
+* Change: Monitor remote access is unchecked if remote access is disabled on server.
+
+
+## v1.3.7 (2016-02-20)
+
+* Fix: Verifying server with SSL enabled.
+* Fix: Regression where {stream_duration} reported as 0.
+* Fix: Video metadata flags showing up for track info.
+* Fix: Custom library icons not applied to Library Statistics.
+* Fix: Typos in the Web UI.
+* New: ETA to Current Activity overlay.
+* New: Total duration to Libraries and Users tables.
+* New: {machine_id} to notification options.
+* New: IMDB, TVDB, TMDb, Last.fm, and Trackt IDs/URLs to notification options.
+* New: {poster_url} to notification options using Imgur.
+* New: Poster and link for Facebook notifications.
+* New: Log javascript errors from the Web UI.
+* New: Configuration and Scheduler info to the settings page.
+* New: Schedule background task to backup the PlexPy database.
+* New: URL anonymizer for external links.
+* New: Plex Media Scanner log file to Log viewer.
+* New: API v2 (sill very experimental). (Thanks @Hellowlol)
+* Change: Allow secure websocket connections.
+* Change: History grouping now accounts for the view offset.
+* Change: Subject line can be toggled off for Facebook, Slack, Telegram, and Twitter.
+* Change: Create self-signed SSL certificates when enabling HTTPS.
+* Change: Revert homepage "Last Played" to "Last Watched".
+* Change: Disable monitor remote access checkbox if remote access is not enabled on the PMS.
+* Change: Disable IP logging checkbox if PMS version is 0.9.14 or greater.
+
+
+## v1.3.6 (2016-02-03)
+
+* Fix: Regression where {duration} not reported in minutes.
+* Fix: Proper daemonizing in FreeBSD and FreeNAS init scripts.
+* Change: Update readme documentation.
+
+
+## v1.3.5 (2016-02-02)
+
+* Fix: Removing unique constraints from database.
+* Fix: Unable to expand media info table when missing "Added At" date.
+* Fix: Server verification for unpublished servers.
+* Fix: Updating PMS identifier for server change.
+* New: {stream_time}, {remaining_time}, and {progress_time} to notification options.
+* New: Powershell script support. (Thanks @Hellowlol)
+* New: Method to delete duplicate libraries.
+* Change: Daemonize before running start up tasks.
+
+
+## v1.3.4 (2016-01-29)
+
+* Fix: Activity checker not starting with library update (history not logging).
+* Fix: Libraries duplicated in database.
+* Fix: Buffer notifications even when disabled when using websockets.
+* Fix: Libraries and Users lists not refreshing.
+* Fix: Server verification in settings.
+* Fix: Empty libraries not added to database.
+* New: Unique identifiers to notification options.
+* Remove: Requirement of media type toggles for recently added notifications.
+* Remove: Built in Twitter key and secret.
+* Change: Unnecessary quoting of script arguments.
+* Change: Facebook notification instructions.
+
+
+## v1.3.3 (2016-01-26)
+
+* Fix: Plays by Month graph not loading.
+* Change: Disable caching for datatables.
+* Change: Improved updating library data in the database again.
+
+
+## v1.3.2 (2016-01-24)
+
+* Fix: 'datestamp' and 'timestamp' for server notifications.
+* Change: New method for updating library data in database.
+
+
+## v1.3.1 (2016-01-23)
+
+* Fix: Notifiers authorization popups for reverse proxies.
+* Fix: Empty brackets in titles on tables.
+* Fix: Star rating overlapping text.
+* Fix: Unable to startup when library refresh fails.
+* Fix: Unable to parse 'datestamp' and 'timestamp' format.
+* Change: Rename "Last Watched" to "Last Played".
+* Change: More descriptive libraries updating message.
+
+
+## v1.3.0 (2016-01-23)
+
+* New: Brand new Libraries section.
+* New: Lots of new library statistics.
+* New: Media info table for libraries.
+* New: Web app for Android and iOS. (Thanks @zobe123)
+* New: Slack notification agent. (Thanks @richipargo)
+* New: Facebook notification agent.
+* New: Custom script notification agent. (Thanks @Hellowlol)
+* New: Custom "From Name" to email notification agent.
+* New: Ability to test notifications / send custom one-off notifications.
+* New: 'datestamp' and 'timestamp' notification options.
+* New: More concurrent stream statistics.
+* New: Media info flags on the info pages.
+* New: Ability to fix broken metadata if the item has been moved in Plex.
+* New: Ability to rearrange the homepage statistics cards.
+* New: CentOS startup script (Thanks @PHoSawyer)
+* Fix: Server name blank after first run wizard.
+* Fix: Incorrect duration for grouped home stats.
+* Fix: Allow SSL when verifying server in settings.
+* Fix: Metadata for grouped recently added notifications.
+* Fix: Unable to access settings with missing changelog file.
+* Fix: Month name localization on play totals graphs.
+* Fix: Get new PMS identifier when changing servers.
+* Fix: Websocket log spam when there is no active session.
+* Fix: Logs and cache folder not created in the data directory.
+* Fix: Title links on sync table.
+* Fix: Other various minor bugs and graphical glitches.
+* Change: Prettier thumbnail popovers on tables.
+* Change: Star ratings to use css/font-awesome.
+* Change: More detailed logging info to warnings and errors.
+* Change: Better PlexPy process restart handling (Thanks @jackwilsdon)
+* Change: Massive behind the scenes code cleanup.
+* Remove: Built in Pushover API token (User's own API token is now required).
+
+
+## v1.2.16 (2015-12-22)
+
+* Fix Most Concurrent stream stat for emtpy databases
+* Change logs to 50 lines by default
+
+
+## v1.2.15 (2015-12-20)
+
+* Fix navbar covering current activity on smaller screens.
+* Fix metadata for grouped recently added notifications.
+* Fix Growl notification agent not working.
+* Change graph days selection.
+* Change watch statistics to match table history grouping.
+* Add automatic discovery of Pushbullet devices.
+* Add Most Concurrent Streams watch statistic.
+* Add precentage to current activity progress bars.
+* Add a bunch of stream details to notification options.
+* Add notification for Plex Remote Access/Plex Media Server back up.
+* Add CC/BCC and multiple recipients to email notification agent.
+* Add total watch time to history table footer.
+
+
+## v1.2.14 (2015-12-07)
+
+* Fix regression with PlexWatch db importer and buffer warnings.
+
+
+## v1.2.13 (2015-12-06)
+
+* Fix match newlines between tags in notification text.
+* Fix current activity not showing on PMS 0.9.12.
+
+
+## v1.2.12 (2015-12-06)
+
+* Fix for "too many open files" error.
+
+
+## v1.2.11 (2015-12-06)
+
+* Fix more regressions (sorry).
+
+
+## v1.2.10 (2015-12-06)
+
+* Fix broken count graphs regression.
+
+
+## v1.2.9 (2015-12-06)
+
+* Fix and improve text sanitization.
+
+
+## v1.2.8 (2015-12-06)
+
+* Fix sanitize player names
+* Fix recently added notification delay
+* Fix recently added metadata queries
+* Fix multiple lines in notification body text
+* Fix UTF-8 encoding in Prowl notifications subject line
+* Change to only log IPv4 addresses
+* Add global toggle for recently added notifcations
+* Add feature to delete users
+* Add channel support for Telegram notification agent
+* Add icon for Apple tvOS
+* Add icon for Microsoft Edge
+
+
 ## v1.2.7 (2015-11-27)
+
 * Fix IP address option in notifications
 
 

CONTRIBUTING.md

@@ -1,12 +1,45 @@
 # Contributing to PlexPy
 
 ## Issues
-In case you read this because you are posting an issue, please take a minute and conside the things below. The issue tracker is not a support forum. It is primarily intended to submit bugs, improvements or feature requests. However, we are glad to help you, and make sure the problem is not caused by PlexPy, but don't expect step-by-step answers.
+In case you read this because you are posting an issue, please take a minute and conside the things below. The issue tracker is not a support forum. It is primarily intended to submit bugs. However, we are glad to help you, and make sure the problem is not caused by PlexPy, but don't expect step-by-step answers.
 
-* Use the search function. Chances are that your problem is already discussed. Do not append to (closed) issues if your problem does not fit the discussion.
-* Visit the [Troubleshooting](../../wiki/TroubleShooting) wiki first.
-* Use [proper formatting](https://help.github.com/articles/github-flavored-markdown/). Paste your logs in code blocks.
-* Close your issue if you resolved it.
+##### Many issues can simply be solved by:
+
+- Making sure you update to the latest version. 
+- Turning your device off and on again.
+- Analyzing your logs, you just might find the solution yourself!
+- Using the **search** function to see if this issue has already been reported/solved.
+- Checking the [Wiki](https://github.com/drzoidberg33/plexpy/wiki) for 
+[ [Installation] ](https://github.com/drzoidberg33/plexpy/wiki/Installation) and 
+[ [FAQs] ](https://github.com/drzoidberg33/plexpy/wiki/Frequently-Asked-Questions-(FAQ)).
+- For basic questions try asking on [Gitter](https://gitter.im/drzoidberg33/plexpy) or the [Plex Forums](https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program) first before opening an issue.
+
+##### If nothing has worked:
+
+1. Open a new issue on the GitHub [issue tracker](http://github.com/drzoidberg33/plexpy/issues).
+2. Provide a clear title to easily help identify your problem.
+3. Use proper [markdown syntax](https://help.github.com/articles/github-flavored-markdown) to structure your post (i.e. code/log in code blocks).
+4. Make sure you provide the following information:
+    - [ ] Version
+    - [ ] Branch
+    - [ ] Commit hash
+    - [ ] Operating system
+    - [ ] Python version
+    - [ ] What you did?
+    - [ ] What happened?
+    - [ ] What you expected?
+    - [ ] How can we reproduce your issue?
+    - [ ] What are your (relevant) settings?
+    - [ ] Include a link to your **FULL** (not just a few lines!) log file that has the error. Please use [Gist](http://gist.github.com) or [Pastebin](http://pastebin.com/).
+5. Close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it.
+
+## Feature Requests
+
+Feature requests are handled on [FeatHub](http://feathub.com/drzoidberg33/plexpy).
+
+1. Search the existing requests to see if your suggestion has already been submitted.
+2. If a similar request exists, give it a thumbs up (+1), or add additional comments to the request.
+3. If no similar requests exist, you can create a new one. Make sure to provide a clear title to easily identify the feature request.
 
 ## Pull Requests
 If you think you can contribute code to the PlexPy repository, do not hesitate to submit a pull request.

ISSUE_TEMPLATE.md

@@ -0,0 +1,41 @@
+<!---
+Reporting Issues:
+  * To ensure that a develpoer has enough information to work with please include all of the information below.
+    Please provide as much detail as possible. Screenshots can be very useful to see the problem.
+  * Use proper markdown syntax to structure your post (i.e. code/log in code blocks).
+    See: https://help.github.com/articles/basic-writing-and-formatting-syntax/
+  * Iclude a link to your **FULL** log file that has the error(not just a few lines!).
+    Please use [Gist](http://gist.github.com) or [Pastebin](http://pastebin.com/).
+
+Feature Requests:
+  * Feature requests are handled on FeatHub: http://feathub.com/drzoidberg33/plexpy
+  * Do not post them on the GitHub issues tracker.
+-->
+
+**Version:**
+
+**Branch:**
+
+**Commit hash:**
+
+**Operating system:**
+
+**Python version:**
+
+**What you did?**
+
+**What happened?**
+
+**What you expected?**
+
+**How can we reproduce your issue?**
+<!-- Provide a detailed step-by-step. -->
+
+**What are your (relevant) settings?**
+
+**Link to logs:**
+
+
+<!--
+Close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it.
+-->

PlexPy.py

@@ -1,4 +1,9 @@
-#!/usr/bin/env python
+#!/bin/sh
+''''which python    >/dev/null 2>&1 && exec python    "$0" "$@" # '''
+''''which python2   >/dev/null 2>&1 && exec python2   "$0" "$@" # '''
+''''which python2.7 >/dev/null 2>&1 && exec python2.7 "$0" "$@" # '''
+''''exec echo "Error: Python not found!" # '''
+
 # -*- coding: utf-8 -*-
 
 # This file is part of PlexPy.
@@ -22,13 +27,14 @@ import sys
 # Ensure lib added to path, before any other imports
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'lib/'))
 
-from plexpy import webstart, logger, web_socket
-
-import locale
-import time
-import signal
 import argparse
+import locale
+import signal
+import time
+
 import plexpy
+from plexpy import config, database, logger, web_socket, webstart
+
 
 # Register signals, such as CTRL + C
 signal.signal(signal.SIGINT, plexpy.sig_handler)
@@ -76,11 +82,14 @@ def main():
         '-d', '--daemon', action='store_true', help='Run as a daemon')
     parser.add_argument(
         '-p', '--port', type=int, help='Force PlexPy to run on a specified port')
+    parser.add_argument(
+        '--dev', action='store_true', help='Start PlexPy in the development environment')
     parser.add_argument(
         '--datadir', help='Specify a directory where to store your data files')
-    parser.add_argument('--config', help='Specify a config file to use')
-    parser.add_argument('--nolaunch', action='store_true',
-                        help='Prevent browser from launching on startup')
+    parser.add_argument(
+        '--config', help='Specify a config file to use')
+    parser.add_argument(
+        '--nolaunch', action='store_true', help='Prevent browser from launching on startup')
     parser.add_argument(
         '--pidfile', help='Create a pid file (only relevant when running as a daemon)')
 
@@ -95,6 +104,10 @@ def main():
     logger.initLogger(console=not plexpy.QUIET, log_dir=False,
                       verbose=plexpy.VERBOSE)
 
+    if args.dev:
+        plexpy.DEV = True
+        logger.debug(u"PlexPy is running in the dev environment.")
+
     if args.daemon:
         if sys.platform == 'win32':
             sys.stderr.write(
@@ -135,7 +148,7 @@ def main():
     if args.config:
         config_file = args.config
     else:
-        config_file = os.path.join(plexpy.DATA_DIR, 'config.ini')
+        config_file = os.path.join(plexpy.DATA_DIR, config.FILENAME)
 
     # Try to create the DATA_DIR if it doesn't exist
     if not os.path.exists(plexpy.DATA_DIR):
@@ -151,13 +164,26 @@ def main():
             'Cannot write to the data directory: ' + plexpy.DATA_DIR + '. Exiting...')
 
     # Put the database in the DATA_DIR
-    plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, 'plexpy.db')
+    plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, database.FILENAME)
+
+    if plexpy.DAEMON:
+        plexpy.daemonize()
 
     # Read config and start logging
     plexpy.initialize(config_file)
 
-    if plexpy.DAEMON:
-        plexpy.daemonize()
+    # Start the background threads
+    plexpy.start()
+
+    # Open connection for websocket
+    if plexpy.CONFIG.MONITORING_USE_WEBSOCKET:
+        try:
+            web_socket.start_thread()
+        except:
+            logger.warn(u"Websocket :: Unable to open connection.")
+            # Fallback to polling
+            plexpy.POLLING_FAILOVER = True
+            plexpy.initialize_scheduler()
 
     # Force the http port if neccessary
     if args.port:
@@ -181,6 +207,7 @@ def main():
         'http_port': http_port,
         'http_host': plexpy.CONFIG.HTTP_HOST,
         'http_root': plexpy.CONFIG.HTTP_ROOT,
+        'http_environment': plexpy.CONFIG.HTTP_ENVIRONMENT,
         'http_proxy': plexpy.CONFIG.HTTP_PROXY,
         'enable_https': plexpy.CONFIG.ENABLE_HTTPS,
         'https_cert': plexpy.CONFIG.HTTPS_CERT,
@@ -190,21 +217,8 @@ def main():
     }
     webstart.initialize(web_config)
 
-    # Start the background threads
-    plexpy.start()
-
-    # Open connection for websocket
-    if plexpy.CONFIG.MONITORING_USE_WEBSOCKET:
-        try:
-            web_socket.start_thread()
-        except:
-            logger.warn(u"Websocket :: Unable to open connection.")
-            # Fallback to polling
-            plexpy.POLLING_FAILOVER = True
-            plexpy.initialize_scheduler()
-
     # Open webbrowser
-    if plexpy.CONFIG.LAUNCH_BROWSER and not args.nolaunch:
+    if plexpy.CONFIG.LAUNCH_BROWSER and not args.nolaunch and not plexpy.DEV:
         plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, http_port,
                               plexpy.CONFIG.HTTP_ROOT)
 

README.md

@@ -1,121 +1,79 @@
-#PlexPy
+# PlexPy
 
 [![Join the chat at https://gitter.im/drzoidberg33/plexpy](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drzoidberg33/plexpy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 A python based web application for monitoring, analytics and notifications for Plex Media Server (www.plex.tv).
 
-This project is based on code from Headphones (https://github.com/rembo10/headphones) and PlexWatchWeb (https://github.com/ecleese/plexWatchWeb).
+This project is based on code from [Headphones](https://github.com/rembo10/headphones) and [PlexWatchWeb](https://github.com/ecleese/plexWatchWeb).
 
-* PlexPy forum thread: https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program
+* PlexPy [forum thread](https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program)
 
+## Features
 
-###Support
------------
-* PlexPy Wiki: https://github.com/drzoidberg33/plexpy/wiki
+* Responsive web design viewable on desktop, tablet and mobile web browsers.
+* Themed to complement Plex/Web.
+* Easy configuration setup (no separate web server required).
+* Monitor current Plex Media Server activity.
+* Fully customizable notifications for stream activity and recently added media.
+* Top statistics on home page with configurable duration and measurement metric.
+* Global watching history with search/filtering & dynamic column sorting.
+* Full user list with general information and comparison stats.
+* Individual user information including devices IP addresses.
+* Complete library statistics and media file information.
+* Rich analytics presented using Highcharts graphing.
+* Beautiful content information pages.
+* Full sync list data on all users syncing items from your library.
+* And many more!!
 
+## Installation and Support
 
-###Features
------------
-* Responsive web design viewable on desktop, tablet and mobile web browsers
-
-* Themed to complement Plex/Web
-
-* Easy configuration setup via html form
-
-* Current Plex Media Server viewing activity including:
-	* number of current users
-	* title
-	* progress
-	* platform
-	* user
-	* state (playing, paused, buffering, etc)
-	* stream type (direct, transcoded)
-	* video type & resolution
-	* audio type & channel count.
-	
-* Top statistics on home page with configurable duration and measurement metric:
-	* Most watched TV
-	* Most popular TV
-	* Most watched Movie
-	* Most popular Movie
-	* Most active user
-	* Most active platform
-
-* Recently added media and how long ago it was added
-
-* Global watching history with search/filtering & dynamic column sorting
-	* date
-	* user
-	* platform
-	* ip address
-	* title
-	* stream information details
-	* start time
-	* paused duration length
-	* stop time
-	* duration length
-	* watched progress
-	* show/hide columns
-	* delete mode - allows deletion of specific history items
-
-* Full user list with general information and comparison stats 
-
-* Individual user information
-	* username and gravatar (if available)
-	* daily, weekly, monthly, all time stats for play count and duration length
-	* individual platform stats for each user
-	* public ip address history with last seen date and geo tag location
-	* recently watched content
-	* watching history
-	* synced items
-	* assign users custom friendly names within PlexPy
-	* assign users custom avatar URL within PlexPy
-	* disable history logging per user
-	* disable notifications per user
-	* option to purge all history per user.
-
-* Rich analytics presented using Highcharts graphing
-	* user-selectable time periods of 30, 90 or 365 days
-	* daily watch count and duration
-	* totals by day of week and hours of the day
-	* totals by top 10 platform
-	* totals by top 10 users
-	* detailed breakdown by transcode decision
-	* source and stream resolutions
-	* transcode decision counts by user and platform
-	* total monthly counts
-	
-* Content information pages
-	* movies (includes watching history)
-	* tv shows (includes watching history)
-	* tv seasons
-	* tv episodes (includes watching history)
-
-* Full sync list data on all users syncing items from your library
-
-## Installation and Notes
-
-* [Installation page](../../wiki/Installation) shows you how to install PlexPy.
-* [Usage guide](../../wiki/Usage-guide) introduces you to PlexPy.
-* [Troubleshooting page](../../wiki/TroubleShooting) in the wiki can help you with common problems.
-
-**Issues** can be reported on the GitHub issue tracker considering these rules:
-
-1. Analyze your log, you just might find the solution yourself!
-2. You read the wiki and searched existing issues, but this is not solving your problem.
-3. Post the issue with a clear title, description and the HP log and use [proper markdown syntax](https://help.github.com/articles/github-flavored-markdown) to structure your text (code/log in code blocks). 
-4. Close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it.
-
-**Feature requests** can be reported on the GitHub issue tracker too:
-
-1. Search for similar existing 'issues', feature requests can be recognized by the label 'Request'.
-2. If a similar Request exists, post a comment (+1, or add a new idea to the existing request), otherwise you can create a new one.
-
-If you **comply with these rules** you can [post your request/issue](http://github.com/drzoidberg33/plexpy/issues).
+* [Installation Guides](https://github.com/drzoidberg33/plexpy/wiki/Installation) shows you how to install PlexPy.
+* [FAQs](https://github.com/drzoidberg33/plexpy/wiki/Frequently-Asked-Questions-(FAQ)) in the wiki can help you with common problems.
 
 **Support** the project by implementing new features, solving support tickets and provide bug fixes.
 
+## Issues
+
+##### Many issues can simply be solved by:
+
+- Making sure you update to the latest version. 
+- Turning your device off and on again.
+- Analyzing your logs, you just might find the solution yourself!
+- Using the **search** function to see if this issue has already been reported/solved.
+- Checking the [Wiki](https://github.com/drzoidberg33/plexpy/wiki) for 
+[ [Installation] ](https://github.com/drzoidberg33/plexpy/wiki/Installation) and 
+[ [FAQs] ](https://github.com/drzoidberg33/plexpy/wiki/Frequently-Asked-Questions-(FAQ)).
+- For basic questions try asking on [Gitter](https://gitter.im/drzoidberg33/plexpy) or the [Plex Forums](https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program) first before opening an issue.
+
+##### If nothing has worked:
+
+1. Open a new issue on the GitHub [issue tracker](http://github.com/drzoidberg33/plexpy/issues).
+2. Provide a clear title to easily help identify your problem.
+3. Use proper [markdown syntax](https://help.github.com/articles/github-flavored-markdown) to structure your post (i.e. code/log in code blocks).
+4. Make sure you provide the following information:
+    - [ ] Version
+    - [ ] Branch
+    - [ ] Commit hash
+    - [ ] Operating system
+    - [ ] Python version
+    - [ ] What you did?
+    - [ ] What happened?
+    - [ ] What you expected?
+    - [ ] How can we reproduce your issue?
+    - [ ] What are your (relevant) settings?
+    - [ ] Include a link to your **FULL** (not just a few lines!) log file that has the error. Please use [Gist](http://gist.github.com) or [Pastebin](http://pastebin.com/).
+5. Close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it.
+
+## Feature Requests
+
+Feature requests are handled on [FeatHub](http://feathub.com/drzoidberg33/plexpy).
+
+1. Search the existing requests to see if your suggestion has already been submitted.
+2. If a similar request exists, give it a thumbs up (+1), or add additional comments to the request.
+3. If no similar requests exist, you can create a new one. Make sure to provide a clear title to easily identify the feature request.
+
 ## License
+
 This is free software under the GPL v3 open source license. Feel free to do with it what you wish, but any modification must be open sourced. A copy of the license is included.
 
-This software includes Highsoft software libraries which you may freely distribute for non-commercial use. Commerical users must licence this software, for more information visit https://shop.highsoft.com/faq/non-commercial#non-commercial-redistribution.
+This software includes Highsoft software libraries which you may freely distribute for non-commercial use. Commerical users must licence this software, for more information visit https://shop.highsoft.com/faq/non-commercial#non-commercial-redistribution.

data/interfaces/default/app_import.html

@@ -2,11 +2,18 @@
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title">Import PlexWatch Database</h4>
+            <h4 class="modal-title">Import ${app} Database</h4>
         </div>
         <div class="modal-body" id="modal-text">
             <p class="help-block">
-                Please ensure your PlexWatch database is at version 0.3.2 or higher.
+                <%
+                    v = ''
+                    if app == 'PlexWatch':
+                        v = '0.3.2'
+                    elif app == 'Plexivity':
+                        v = '0.9.8'
+                %>
+                <strong>Please ensure your ${app} database is at version ${v} or higher.</strong>
             </p>
             <div class="form-group">
                 <label for="db_location">Database Location</label>
@@ -15,7 +22,7 @@
                         <input type="text" class="form-control" id="db_location" name="db_location" value="" required>
                     </div>
                 </div>
-                <p class="help-block">Enter the path and file name for the PlexWatch database you wish to import.</p>
+                <p class="help-block">Enter the path and file name for the ${app} database you wish to import.</p>
             </div>
             <div class="form-group">
                 <label for="table_name">Table Name</label>
@@ -41,7 +48,7 @@
         </div>
         <div class="modal-footer">
             <div>
-                <span id="status-message"></span>
+                <span id="status-message" style="padding-right: 25px;"></span>
                 <input type="button" id="import_db" class="btn btn-bright" value="Import">
             </div>
         </div>
@@ -54,8 +61,13 @@
         var table_name = $("#table_name").val();
         var import_ignore_interval = $("#import_ignore_interval").val();
         $.ajax({
-            url: 'get_plexwatch_export_data',
-            data: {database_path: database_path, table_name:table_name, import_ignore_interval:import_ignore_interval},
+            url: 'import_database',
+            data: {
+                app: "${app}",
+                database_path: database_path,
+                table_name: table_name,
+                import_ignore_interval: import_ignore_interval
+            },
             cache: false,
             async: true,
             success: function(data) {

data/interfaces/default/base.html

@@ -1,6 +1,7 @@
 <%
-import plexpy
-from plexpy import version
+    import plexpy
+    from plexpy import version
+    from plexpy.helpers import anon_url
 %>
 <!doctype html>
 
@@ -11,37 +12,145 @@ from plexpy import version
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link href="interfaces/default/css/bootstrap3/bootstrap.css" rel="stylesheet">
-    <link href="interfaces/default/css/plexpy.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
-    <link href="interfaces/default/css/font-awesome.min.css" rel="stylesheet">
+    <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
+    <link href="${http_root}css/pnotify.custom.min.css" rel="stylesheet" />
+    <link href="${http_root}css/plexpy.css" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600" rel="stylesheet" type="text/css">
+    <link href="${http_root}css/font-awesome.min.css" rel="stylesheet">
     ${next.headIncludes()}
 
-    <link rel="icon" type="image/x-icon" href="interfaces/default/images/favicon.ico"/>
-    <!-- touch icons -->
-    <link rel="shortcut icon" href="interfaces/default/images/favicon.png">
-    <link rel="apple-touch-icon" href="interfaces/default/images/icon_iphone.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="interfaces/default/images/icon_ipad.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="interfaces/default/images/icon_iphone@2x.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="interfaces/default/images/icon_ipad@2x.png">
+    <link rel="icon" type="image/x-icon" href="${http_root}images/favicon.ico"/>
+    <link rel="shortcut icon" href="${http_root}images/favicon.png">
+
+    <!-- Allow web app to be run in full-screen mode. -->
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <!-- Configure the status bar. -->
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <!-- Set the viewport. -->
+    <meta name="viewport" content="initial-scale=1">
+    <!-- Disable automatic phone number detection. -->
+    <meta name="format-detection" content="telephone=no">
+
+    <!-- ICONS -->
+    <!-- IE10 icon --> 
+    <meta name="application-name" content="PlexPy" />
+    <meta name="msapplication-config" content="${http_root}xml/IEconfig.xml"/>
+    <!-- Android >M39 icon -->
+    <link rel="manifest" href="${http_root}json/Android-manifest.json">
+    <!-- iPad retina icon -->
+    <link href="${http_root}images/res/ios/icon-76@2x.png" sizes="152x152" rel="apple-touch-icon-precomposed">
+    <!-- iPad retina icon (iOS < 7) -->
+    <link href="${http_root}images/res/ios/icon-72@2x.png" sizes="144x144" rel="apple-touch-icon-precomposed">
+    <!-- iPad non-retina icon -->
+    <link href="${http_root}images/res/ios/icon-76.png" sizes="76x76" rel="apple-touch-icon-precomposed">
+    <!-- iPad non-retina icon (iOS < 7) -->
+    <link href="${http_root}images/res/ios/icon-72.png" sizes="72x72" rel="apple-touch-icon-precomposed">
+    <!-- iPhone 6 Plus icon -->
+    <link href="${http_root}images/res/ios/icon-60@2x.png" sizes="120x120" rel="apple-touch-icon-precomposed">
+    <!-- iPhone retina icon (iOS < 7) -->
+    <link href="${http_root}images/res/ios/icon@2x.png" sizes="114x114" rel="apple-touch-icon-precomposed">
+    <!-- iPhone non-retina icon (iOS < 7) -->
+    <link href="${http_root}images/res/ios/icon.png" sizes="57x57" rel="apple-touch-icon-precomposed">
+    <!-- iPhone / iPod Touch  -->
+    <link href="${http_root}images/res/ios/icon-60@3x.png" sizes="180x180" rel="apple-touch-icon-precomposed">
+    <link href="${http_root}images/res/ios/icon-60.png" sizes="60x60" rel="apple-touch-icon-precomposed">
+    <!-- Spotlight Icon -->
+    <link href="${http_root}images/res/ios/icon-40.png" sizes="40x40" rel="apple-touch-icon-precomposed">
+    <link href="${http_root}images/res/ios/icon-40@2x.png" sizes="80x80" rel="apple-touch-icon-precomposed">
+    <!-- iPhone Spotlight and Settings Icon -->
+    <link href="${http_root}images/res/ios/icon-small.png" sizes="29x29" rel="apple-touch-icon-precomposed">
+    <link href="${http_root}images/res/ios/icon-small@2x.png" sizes="58x58" rel="apple-touch-icon-precomposed">
+    <!-- iPad Spotlight and Settings Icon -->
+    <link href="${http_root}images/res/ios/icon-50.png" sizes="50x50" rel="apple-touch-icon-precomposed">
+    <link href="${http_root}images/res/ios/icon-50@2x.png" sizes="100x100" rel="apple-touch-icon-precomposed">
+            
+    <!-- STARTUP IMAGES -->
+    <!-- iPad retina portrait startup image -->
+    <link href="${http_root}images/res/screen/ios/Default-Portrait@2x~ipad.png"
+          media="(device-width: 768px) and (device-height: 1024px)
+                 and (-webkit-device-pixel-ratio: 2)
+                 and (orientation: portrait)"
+          rel="apple-touch-startup-image">
+
+    <!-- iPad retina landscape startup image -->
+    <link href="${http_root}images/res/screen/ios/Default-Landscape@2x~ipad.png"
+          media="(device-width: 768px) and (device-height: 1024px)
+                 and (-webkit-device-pixel-ratio: 2)
+                 and (orientation: landscape)"
+          rel="apple-touch-startup-image">
+
+    <!-- iPad non-retina portrait startup image -->
+    <link href="${http_root}images/res/screen/ios/Default-Portrait~ipad.png"
+          media="(device-width: 768px) and (device-height: 1024px)
+                 and (-webkit-device-pixel-ratio: 1)
+                 and (orientation: portrait)"
+          rel="apple-touch-startup-image">
+
+    <!-- iPad non-retina landscape startup image -->
+    <link href="${http_root}images/res/screen/ios/Default-Landscape~ipad.png"
+          media="(device-width: 768px) and (device-height: 1024px)
+                 and (-webkit-device-pixel-ratio: 1)
+                 and (orientation: landscape)"
+          rel="apple-touch-startup-image">
+
+    <!-- iPhone 6 Plus portrait startup image -->
+    <link href="${http_root}images/res/screen/ios/Default-736h.png"
+          media="(device-width: 414px) and (device-height: 736px)
+                 and (-webkit-device-pixel-ratio: 3)
+                 and (orientation: portrait)"
+          rel="apple-touch-startup-image">
+
+    <!-- iPhone 6 Plus landscape startup image -->
+    <link href="${http_root}images/res/screen/ios/Default-Landscape-736h.png"
+          media="(device-width: 414px) and (device-height: 736px)
+                 and (-webkit-device-pixel-ratio: 3)
+                 and (orientation: landscape)"
+          rel="apple-touch-startup-image">
+
+    <!-- iPhone 6 startup image -->
+    <link href="${http_root}images/res/screen/ios/Default-667h.png"
+          media="(device-width: 375px) and (device-height: 667px)
+                 and (-webkit-device-pixel-ratio: 2)"
+          rel="apple-touch-startup-image">
+
+    <!-- iPhone 5 startup image -->
+    <link href="${http_root}images/res/screen/ios/Default-568h@2x~iphone5.jpg"
+          media="(device-width: 320px) and (device-height: 568px)
+                 and (-webkit-device-pixel-ratio: 2)"
+          rel="apple-touch-startup-image">
+
+    <!-- iPhone < 5 retina startup image -->
+    <link href="${http_root}images/res/screen/ios/Default@2x~iphone.png"
+          media="(device-width: 320px) and (device-height: 480px)
+                 and (-webkit-device-pixel-ratio: 2)"
+          rel="apple-touch-startup-image">
+
+    <!-- iPhone < 5 non-retina startup image -->
+    <link href="${http_root}images/res/screen/ios/Default~iphone.png"
+          media="(device-width: 320px) and (device-height: 480px)
+                 and (-webkit-device-pixel-ratio: 1)"
+          rel="apple-touch-startup-image">
+
 </head>
 
 <body class="content">
 <div class="container">
     <div id="ajaxMsg" class="ajaxMsg"></div>
+    % if _session['user_group'] == 'admin':
     % if plexpy.CONFIG.CHECK_GITHUB and not plexpy.CURRENT_VERSION:
     <div id="updatebar" style="display: none;">
-        You're running an unknown version of PlexPy. <a href="update">Update</a> or
-        <a href="#" id="updateDismiss">Close</a>
+        You're running an unknown version of PlexPy.<br />
+        <a href="update">Update</a> or <a href="#" id="updateDismiss">Close</a>
     </div>
     % elif plexpy.CONFIG.CHECK_GITHUB and plexpy.CURRENT_VERSION != plexpy.LATEST_VERSION and plexpy.COMMITS_BEHIND > 0 and plexpy.INSTALL_TYPE != 'win':
     <div id="updatebar" style="display: none;">
-        A <a
-            href="https://github.com/${plexpy.CONFIG.GIT_USER}/plexpy/compare/${plexpy.CURRENT_VERSION}...${plexpy.LATEST_VERSION}" target="_blank">
-        newer version</a> is available. You're ${plexpy.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or
-        <a href="#" id="updateDismiss">Close</a>
+        A <a href="${anon_url('https://github.com/%s/plexpy/compare/%s...%s' % (plexpy.CONFIG.GIT_USER, plexpy.CURRENT_VERSION, plexpy.LATEST_VERSION))}" target="_blank">
+        newer version</a> is available.<br />
+        You're ${plexpy.COMMITS_BEHIND} commits behind.<br />
+        <a href="update">Update</a> or <a href="#" id="updateDismiss">Close</a>
     </div>
     % endif
+    % endif
     <nav class="navbar navbar-fixed-top">
         <div class="container-fluid">
             <div class="navbar-header">
@@ -52,12 +161,12 @@ from plexpy import version
                     <span class="icon-bar"></span>
                 </button>
                 <a class="navbar-brand" href="home">
-                    <img alt="PlexPy" src="interfaces/default/images/logo-plexpy@2x.png" height="40">
+                    <img alt="PlexPy" src="${http_root}images/logo-plexpy@2x.png" height="40">
                 </a>
             </div>
             <div class="collapse navbar-collapse navbar-right" id="navbar-collapse-1">
                 <ul class="nav navbar-nav">
-                    <li>
+                    <li class="hidden-sm hidden-xs">
                         <form action="search" method="post" class="form" id="search_form">
                             <div class="input-group">
                                 <span class="input-textbox">
@@ -69,56 +178,148 @@ from plexpy import version
                             </div>
                         </form>
                     </li>
-                    % if title=="Home":
-                        <li class="active"><a href="home"><i class="fa fa-lg fa-home"></i></a></li>
+                    % if title == "Home":
+                    <li class="active"><a href="home"><i class="fa fa-lg fa-home"></i></a></li>
                     % else:
-                        <li><a href="home"><i class="fa fa-lg fa-home"></i></a></li>
+                    <li><a href="home"><i class="fa fa-lg fa-home"></i></a></li>
                     % endif
-                    % if title=="Users" or title=="User":
-                        <li class="active"><a href="users">Users</a></li>
+                    % if title == "Libraries" or title == "Library" or title == "Info":
+                    <li class="active"><a href="libraries">Libraries</a></li>
                     % else:
-                        <li><a href="users">Users</a></li>
+                    <li><a href="libraries">Libraries</a></li>
                     % endif
-                    % if title=="History":
+                    % if title == "Users" or title == "User":
+                    <li class="active"><a href="users">Users</a></li>
+                    % else:
+                    <li><a href="users">Users</a></li>
+                    % endif
+                    % if title == "History":
                     <li class="active"><a href="history">History</a></li>
                     % else:
                     <li><a href="history">History</a></li>
                     % endif
-                    % if title=="Graphs":
-                        <li class="active"><a href="graphs">Graphs</a></li>
+                    % if title == "Graphs":
+                    <li class="active"><a href="graphs">Graphs</a></li>
                     % else:
-                        <li><a href="graphs">Graphs</a></li>
+                    <li><a href="graphs">Graphs</a></li>
                     % endif
-                    % if title=="Synced Items":
-                        <li class="active"><a href="sync">Synced Items</a></li>
+                    % if title == "Synced Items":
+                    <li class="active"><a href="sync">Synced Items</a></li>
                     % else:
-                        <li><a href="sync">Synced Items</a></li>
+                    <li><a href="sync">Synced Items</a></li>
                     % endif
-                    % if title=="Log":
-                        <li class="active"><a href="logs">Logs</a></li>
+                    % if title == "Settings":
+                    <li class="dropdown active">
                     % else:
-                        <li><a href="logs">Logs</a></li>
-                    % endif
-                    % if title=="Settings":
-                        <li class="active"><a href="settings">Settings</a></li>
-                    % else:
-                        <li><a href="settings">Settings</a></li>
+                    <li class="dropdown">
                     % endif
+                        <% href = 'settings' if _session['user_group'] == 'admin' else '#' %>
+                        <a href="#" class="dropdown-toggle" aria-haspopup="true" data-toggle="dropdown" data-hover="dropdown" data-href="${href}"><i class="fa fa-lg fa-cogs"></i> <span class="caret"></span></a>
+                        <ul class="dropdown-menu" id="settings-dropdown-menu">
+                            % if _session['user_group'] == 'admin':
+                            <li><a href="settings"><i class="fa fa-fw fa-cogs"></i> Settings</a></li>
+                            <li role="separator" class="divider"></li>
+                            <li><a href="logs"><i class="fa fa-fw fa-list-alt"></i> View Logs</a></li>
+                            <li role="separator" class="divider"></li>
+                            <li><a href="${anon_url('https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DG783BMSCU3V4')}" target="_blank"><i class="fa fa-fw fa-paypal"></i> Paypal</a></li>
+                            <li><a href="${anon_url('http://swiftpanda16.tip.me/')}" target="_blank"><i class="fa fa-fw fa-btc"></i> Bitcoin</a></li>
+                            <li role="separator" class="divider"></li>
+                            % if plexpy.CONFIG.CHECK_GITHUB:
+                            <li><a href="#" id="nav-update"><i class="fa fa-fw fa-arrow-circle-up"></i> Check for Updates</a></li>
+                            % endif
+                            <li><a href="#" id="nav-restart"><i class="fa fa-fw fa-refresh"></i> Restart</a></li>
+                            <li><a href="#" id="nav-shutdown"><i class="fa fa-fw fa-power-off"></i> Shutdown</a></li>
+                            % else:
+                            <li><a href="#" data-target="#admin-login-modal" data-toggle="modal"><i class="fa fa-fw fa-lock"></i> Admin Login</a></li>
+                            <li role="separator" class="divider"></li>
+                            % endif
+                            % if _session['expiry']:
+                            <li><a href="${http_root}auth/logout"><i class="fa fa-fw fa-sign-out"></i> Sign Out</a></li>
+                            % endif
+                        </ul>
+                    </li>
                 </ul>
             </div>
         </div>
     </nav>
 </div>
 
+<div id="confirm-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                <h4 class="modal-title">Confirm</h4>
+            </div>
+            <div class="modal-body">
+                <div id="confirm-message" style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-button">Confirm</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+% if _session['user_group'] != 'admin':
+<div id="admin-login-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="admin-login-modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <form action="${http_root}auth/login" method="post">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                    <h4 class="modal-title">Admin Login</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="col-md-6" style="margin: auto;">
+                        <div class="form-group">
+                            <label for="username" class="control-label">
+                                Username
+                            </label>
+                            <input type="text" id="username" name="username" class="form-control" autocorrect="off" autocapitalize="off">
+                        </div>
+                        <div class="form-group">
+                            <label for="password" class="control-label">
+                                Password
+                            </label>
+                            <input type="password" id="password" name="password" class="form-control">
+                        </div>
+                        <div class="form-footer">
+                            <div class="remember-group">
+                                <label class="control-label">
+                                    <input type="checkbox" id="remember_me" name="remember_me" title="for 30 days" value="1" checked="checked" /> Remember me
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-bright login-button"><i class="fa fa-sign-in"></i>&nbsp; Sign In</button>
+                </div>
+                <input type="hidden" id="admin_login" name="admin_login" value="1" />
+            </form>
+        </div>
+    </div>
+</div>
+% endif
+
 ${next.headerIncludes()}
 <div class="body-container">
     ${next.body()}
 </div>
 
-<script src="interfaces/default/js/jquery-2.1.4.min.js"></script>
-<script src="interfaces/default/js/bootstrap3/bootstrap.min.js"></script>
-<script src="interfaces/default/js/script.js"></script>
+<script src="${http_root}js/jquery-2.1.4.min.js"></script>
+<script src="${http_root}js/bootstrap.min.js"></script>
+<script src="${http_root}js/bootstrap-hover-dropdown.min.js"></script>
+<script src="${http_root}js/pnotify.custom.min.js"></script>
+<script src="${http_root}js/script.js"></script>
+% if _session['user_group'] == 'admin' and plexpy.CONFIG.BROWSER_ENABLED:
+<script src="${http_root}js/ajaxNotifications.js"></script>
+% endif
 <script>
+    % if _session['user_group'] == 'admin':
     $('#updateDismiss').click(function() {
         $('#updatebar').slideUp('slow');
         // Set cookie to remember dismiss decision for 1 hour.
@@ -128,28 +329,77 @@ ${next.headerIncludes()}
     if (!getCookie('updateDismiss')) {
         $('#updatebar').show();
     }
-</script>
-<script>
+
+    $("#nav-shutdown").click(function() {
+        $("#confirm-message").text("Are you sure you want to shutdown PlexPy?");
+        $('#confirm-modal').modal();
+        $('#confirm-modal').one('click', '#confirm-button', function () {
+            window.location.href = "shutdown";
+        });
+    });
+
+    $("#nav-restart").click(function() {
+        $("#confirm-message").text("Are you sure you want to restart PlexPy?");
+        $('#confirm-modal').modal();
+        $('#confirm-modal').one('click', '#confirm-button', function () {
+            window.location.href = "restart";
+        });
+    });
+
+    $("#nav-update").first().one("click", function () {
+        // Allow the update bar to show again if previously dismissed.
+        setCookie('updateDismiss', 'true', 0);
+        $(this).html('<i class="fa fa-spin fa-refresh"></i> Checking');
+        window.location.href = "checkGithub";
+    });
+    % endif
+
+    $('.dropdown-toggle').click(function (e) {
+        if (!(('ontouchstart' in window) || (navigator.MaxTouchPoints > 0) || (navigator.msMaxTouchPoints > 0))) {
+            window.location.href = $(this).data('href');
+        }
+    });
+
     $('#search_form').submit(function (e) {
         if ($('#query').hasClass('active') && $('#query').val().trim() != '') {
             $.ajax({
                 type: 'post',
                 url: 'search',
-                data: { 'query': $('#query').val() }
+                data: { query: $('#query').val() }
             })
         } else {
             e.preventDefault();
             $('#search_button').removeClass('btn-inactive');
-            $('#query').clearQueue().val('').animate({ right: '0', width: '250px' }).addClass('active').focus();
+            $('#query').clearQueue().val('').animate({ right: '0', width: '200px' }).addClass('active').focus();
         }
     })
     $('#query').on('blur', function (e) {
         if ($(this).val().trim() == '') {
-            $(this).delay(200).animate({ right: '-250px', width: '0' }, function () {
+            $(this).delay(200).animate({ right: '-200px', width: '0' }, function () {
                 $('#search_button').addClass('btn-inactive');
             }).removeClass('active');
         }
     });
+
+    $(document).ready(function () {
+        // Work around for iOS web app links opening in Safari
+        if (("standalone" in window.navigator) && window.navigator.standalone) {
+            // For iOS Apps
+            $('a').on('click', function (e) {
+                e.preventDefault();
+                var new_location = $(this).attr('href');
+                if (new_location != undefined && new_location.substr(0, 1) != '#' && $(this).attr('data-method') == undefined) {
+                    window.location = new_location;
+                }
+            });
+        }
+    });
+
+    % if _session['user_group'] != 'admin':
+    $('#admin-login-modal').on('shown.bs.modal', function () {
+        $('#admin-login-modal #username').focus()
+    })
+    % endif
 </script>
 ${next.javascriptIncludes()}
 </body>

data/interfaces/default/css/pnotify.custom.min.css

@@ -0,0 +1 @@
+.ui-pnotify{top:36px;right:36px;position:absolute;height:auto;z-index:2}body>.ui-pnotify{position:fixed;z-index:100040}.ui-pnotify-modal-overlay{background-color:rgba(0,0,0,.4);top:0;left:0;position:absolute;height:100%;width:100%;z-index:1}body>.ui-pnotify-modal-overlay{position:fixed;z-index:100039}.ui-pnotify.ui-pnotify-in{display:block!important}.ui-pnotify.ui-pnotify-move{transition:left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-slow{transition:opacity .6s linear;opacity:0}.ui-pnotify.ui-pnotify-fade-slow.ui-pnotify.ui-pnotify-move{transition:opacity .6s linear,left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-normal{transition:opacity .4s linear;opacity:0}.ui-pnotify.ui-pnotify-fade-normal.ui-pnotify.ui-pnotify-move{transition:opacity .4s linear,left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-fast{transition:opacity .2s linear;opacity:0}.ui-pnotify.ui-pnotify-fade-fast.ui-pnotify.ui-pnotify-move{transition:opacity .2s linear,left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-in{opacity:1}.ui-pnotify .ui-pnotify-shadow{-webkit-box-shadow:0 6px 28px 0 rgba(0,0,0,.1);-moz-box-shadow:0 6px 28px 0 rgba(0,0,0,.1);box-shadow:0 6px 28px 0 rgba(0,0,0,.1)}.ui-pnotify-container{background-position:0 0;padding:.8em;height:100%;margin:0}.ui-pnotify-container:after{content:" ";visibility:hidden;display:block;height:0;clear:both}.ui-pnotify-container.ui-pnotify-sharp{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.ui-pnotify-title{display:block;margin-bottom:.4em;margin-top:0}.ui-pnotify-text{display:block}.ui-pnotify-icon,.ui-pnotify-icon span{display:block;float:left;margin-right:.2em}.ui-pnotify.stack-bottomleft,.ui-pnotify.stack-topleft{left:25px;right:auto}.ui-pnotify.stack-bottomleft,.ui-pnotify.stack-bottomright{bottom:25px;top:auto}.ui-pnotify.stack-modal{left:50%;right:auto;margin-left:-150px}.ui-pnotify-closer,.ui-pnotify-sticker{float:right;margin-left:.2em}.ui-pnotify-container{position:relative;left:0}@media (max-width:480px){.ui-pnotify-mobile-able.ui-pnotify{position:fixed;top:0;right:0;left:0;width:auto!important;font-size:1.2em;-webkit-font-smoothing:antialiased;-moz-font-smoothing:antialiased;-ms-font-smoothing:antialiased;font-smoothing:antialiased}.ui-pnotify-mobile-able.ui-pnotify .ui-pnotify-shadow{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-bottom-width:5px}.ui-pnotify-mobile-able .ui-pnotify-container{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.ui-pnotify-mobile-able.ui-pnotify.stack-bottomleft,.ui-pnotify-mobile-able.ui-pnotify.stack-topleft{left:0;right:0}.ui-pnotify-mobile-able.ui-pnotify.stack-bottomleft,.ui-pnotify-mobile-able.ui-pnotify.stack-bottomright{left:0;right:0;bottom:0;top:auto}.ui-pnotify-mobile-able.ui-pnotify.stack-bottomleft .ui-pnotify-shadow,.ui-pnotify-mobile-able.ui-pnotify.stack-bottomright .ui-pnotify-shadow{border-top-width:5px;border-bottom-width:1px}}

data/interfaces/default/current_activity.html

@@ -68,20 +68,23 @@ DOCUMENTATION :: END
 % if data['stream_count'] != '0':
 % for a in data['sessions']:
 <div class="dashboard-instance" id="instance-${a['session_key']}">
-    % if a['media_type'] == 'movie' or a['media_type'] == 'episode' or a['media_type'] == 'track':
-    <a href="info?item_id=${a['rating_key']}">
+    % if (a['media_type'] == 'movie' or a['media_type'] == 'episode' or a['media_type'] == 'track') and a['rating_key']:
+    <a href="info?rating_key=${a['rating_key']}">
+    % else:
+    <a href="#">
     % endif
         <div class="dashboard-activity-poster">
-            % if a['media_type'] == 'movie' and not a['indexes']:
-            <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
-            % elif a['media_type'] == 'episode' and not a['indexes']:
-            <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
+            % if not a['art'].startswith('interfaces') or not a['thumb'].startswith('interfaces'):
+            % if (a['media_type'] == 'movie' and not a['indexes']) or (a['indexes'] and not a['view_offset']):
+            <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280&fallback=art);"></div>
+            % elif (a['media_type'] == 'episode' and not a['indexes']) or (a['indexes'] and not a['view_offset']):
+            <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280&fallback=art);"></div>
             % elif a['indexes']:
-            <div class="dashboard-activity-poster-face bif" style="background-image: url(pms_image_proxy?img=${a['bif_thumb']}&width=500&height=280); display: none;"></div>
+            <div class="dashboard-activity-poster-face bif" style="background-image: url(pms_image_proxy?img=${a['bif_thumb']}&width=500&height=280&fallback=art); display: none;"></div>
             % else:
                 % if a['media_type'] == 'track':
-                <div class="dashboard-activity-cover-face-bg" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300);"></div>
-                <div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300);"></div>
+                <div class="dashboard-activity-cover-face-bg" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300&fallback=cover);"></div>
+                <div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300&fallback=cover);"></div>
                 % elif a['media_type'] == 'clip':
                     % if a['art'][:4] == 'http':
                     <div class="dashboard-activity-poster-face" style="background-image: url(${a['art']});"></div>
@@ -89,17 +92,20 @@ DOCUMENTATION :: END
                     <div class="dashboard-activity-poster-face" style="background-image: url(${a['thumb']});"></div>
                     % else:
                         % if a['art']:
-                        <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
+                        <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280&fallback=art);"></div>
                         % else:
-                        <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=280);"></div>
+                        <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=280&fallback=art);"></div>
                         % endif
                     % endif
                 % elif a['media_type'] == 'photo':
-                <div class="dashboard-activity-poster-face bif" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=500);"></div>
+                <div class="dashboard-activity-poster-face bif" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=500&fallback=cover);"></div>
                 % else:
                 <div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300&fallback=cover);"></div>
                 % endif
             % endif
+            % else:
+            <div class="dashboard-activity-poster-face" style="background-image: url(${a['art']});"></div>
+            % endif
             <div class="dashboard-activity-button-info">
                 <button type="button" class="btn btn-activity-info btn-lg" data-target="#stream-${a['session_key']}">
                     <i class="fa fa-info-circle"></i>
@@ -198,6 +204,13 @@ DOCUMENTATION :: END
                     % else:
                     <span>IP: N/A</span>
                     % endif
+                    <br />
+                    ETA:
+                    <span id="stream-eta-${a['session_key']}">
+                        <script>
+                            $("#stream-eta-${a['session_key']}").html(moment().add(parseInt(${a['duration']}) - parseInt(${a['view_offset']}), 'milliseconds').format(time_format));
+                        </script>
+                    </span>
                 </div>
                 <div class="dashboard-activity-poster-info-time">
                     <span class="progress_time">${a['view_offset']}</span>/<span class="progress_time">${a['duration']}</span>
@@ -205,19 +218,25 @@ DOCUMENTATION :: END
             </div>
             % endif
         </div>
-    % if a['media_type'] == 'movie' or a['media_type'] == 'episode' or a['media_type'] == 'track':
+    % if (a['media_type'] == 'movie' or a['media_type'] == 'episode' or a['media_type'] == 'track') and a['rating_key']:
+    </a>
+    % else:
     </a>
     % endif
     <div class="dashboard-activity-progress">
         <div class="dashboard-activity-progress-bar">
-            <div class="bufferbar" style="width: ${a['transcode_progress']}%">${a['transcode_progress']}%</div>
-            <div class="bar" style="width: ${a['progress_percent']}%">${a['progress_percent']}%</div>
+            <div class="bufferbar" style="width: ${a['transcode_progress']}%" data-toggle="tooltip" title="Transcoder Progress">${a['transcode_progress']}%</div>
+            <div class="bar" style="width: ${a['progress_percent']}%" data-toggle="tooltip" title="Stream Progress">${a['progress_percent']}%</div>
         </div>
     </div>
     <div class="dashboard-activity-metadata-wrapper">
+        % if a['user_id']:
         <a href="user?user_id=${a['user_id']}">
             <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${a['user_thumb']});"></div>
         </a>
+        % else:
+        <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${a['user_thumb']});"></div>
+        % endif
         <div class="dashboard-activity-metadata-title">
             % if a['state'] == 'playing':
             <i class="fa fa-play"></i>&nbsp;
@@ -226,38 +245,44 @@ DOCUMENTATION :: END
             % elif a['state'] == 'buffering':
             <i class="fa fa-spinner"></i>&nbsp;
             % endif
+            % if a['rating_key']:
             % if a['media_type'] == 'episode':
-            <a href="info?item_id=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
+            <a href="info?rating_key=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
             % elif a['media_type'] == 'movie':
-            <a href="info?item_id=${a['rating_key']}" title="${a['title']}">${a['title']}</a>
+            <a href="info?rating_key=${a['rating_key']}" title="${a['title']}">${a['title']}</a>
             % elif a['media_type'] == 'clip':
             <span title="${a['title']}">${a['title']}</span>
             % elif a['media_type'] == 'track':
-            <a href="info?item_id=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
+            <a href="info?rating_key=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
             % elif a['media_type'] == 'photo':
             <span title="${a['parent_title']}">${a['parent_title']}</span>
             % else:
             <span title="${a['title']}">${a['title']}</span>
             % endif
+            % else:
+            ${a['title']}
+            % endif
         </div>
         <div class="dashboard-activity-metadata-subtitle">
+            % if a['rating_key']:
             % if a['media_type'] == 'episode':
             <span title="S${a['parent_media_index']} &middot; E${a['media_index']}">S${a['parent_media_index']} &middot; E${a['media_index']}</span>
             % elif a['media_type'] == 'movie':
             <span title="${a['year']}">${a['year']}</span>
             % elif a['media_type'] == 'track':
-            <a href="info?item_id=${a['parent_rating_key']}" title="${a['parent_title']}">${a['parent_title']}</a>
+            <a href="info?rating_key=${a['parent_rating_key']}" title="${a['parent_title']}">${a['parent_title']}</a>
             % elif a['media_type'] == 'photo':
             <span title="${a['title']}">${a['title']}</span>
             % else:
             <span title="${a['year']}">${a['year']}</span>
             % endif
+            % endif
         </div>
         <div class="dashboard-activity-metadata-user">
             % if a['user_id']:
             <a href="user?user_id=${a['user_id']}" title="${a['friendly_name']}">${a['friendly_name']}</a>
             % else:
-            <a href="user?user=${a['user']}" title="${a['friendly_name']}">${a['friendly_name']}</a>
+            ${a['friendly_name']}
             % endif
         </div>
 </div>
@@ -280,6 +305,15 @@ DOCUMENTATION :: END
         e.preventDefault();
         $($(this).attr('data-target')).toggle();
     });
+
+    // Add hover class to dashboard-instance
+    $('.dashboard-activity-poster, .dashboard-activity-progress-bar').hover(function() {
+        $(this).closest('.dashboard-instance').addClass('hover');
+    }, function() {
+        $(this).closest('.dashboard-instance').removeClass('hover');
+    });
+
+    $('.bar, .bufferbar').tooltip({container: 'body', placement: 'right', delay: 50});
 </script>
 % else:
 <div class="text-muted">Nothing is currently being watched.</div><br>

data/interfaces/default/current_activity_header.html

@@ -15,11 +15,24 @@ DOCUMENTATION :: END
 </%doc>
 
 % if data != None:
-% if data == '0':
-<h3>Activity</h3>
+<%
+    s = '('
+    if data['direct_play']:
+        s += str(data['direct_play']) + ' direct play' + ('s' if data['direct_play'] > 1 else '') + ', '
+    if data['direct_stream']:
+        s += str(data['direct_stream']) + ' direct stream' + ('s' if data['direct_stream'] > 1 else '') + ', '
+    if data['transcode']:
+        s += str(data['transcode']) + ' transcode' + ('s' if data['transcode'] > 1 else '') + ', '
+    s = s.rstrip(', ')
+    s += ')'
+%>
+	% if data['stream_count'] == '0':
+	<h3>Activity</h3>
+	% elif data['stream_count'] == '1':
+	<h3>Activity &nbsp;&nbsp;<small>${data['stream_count']} stream ${s}</small></h3>
+	% else:
+	<h3>Activity &nbsp;&nbsp;<small>${data['stream_count']} streams ${s}</small></h3>
+	% endif
 % else:
-<h3>Activity <small>${data} stream(s)</small></h3>
+<h3>Activity</h3>
 % endif
-% else:
-<h3>Activity</h3>
-% endif

data/interfaces/default/current_activity_instance.html

@@ -0,0 +1,311 @@
+<%doc>
+USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
+
+For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
+
+Filename:           current_activity_instance.html
+Version:            0.1
+Variable names:     data {dict}
+
+data :: Usable parameters
+
+== Global keys ==
+session_key                 Returns a unique session id for the active stream
+rating_key                  Returns the unique identifier for the media item.
+media_index                 Returns the index of the media item.
+parent_media_index          Returns the index of the media item's parent.
+media_type                  Returns the type of session. Either 'track', 'episode' or 'movie'.
+thumb                       Returns the location of the item's thumbnail. Use with pms_image_proxy.
+bif_thumb                   Returns the location of the item's bif thumbnail. Use with pms_image_proxy.
+art                         Returns the location of the item's artwork
+progress_percent            Returns the current progress of the item. 0 to 100.
+user                        Returns the name of the user owning the session.
+user_id                     Returns the Plex user id if available.
+machine_id                  Returns the machine id of the players being used.
+friendly_name               Returns the friendlly name of the user owning the session.
+user_thumb                  Returns the profile picture of the user owning the session.
+state                       Returns the state of the current session. Either 'playing', 'paused' or 'buffering'.
+title                       Returns the name of the episode, movie or music track.
+year                        Returns the year of the episode, movie, or clip.
+ip_address                  Returns the ip address of the stream.
+player                      Returns the name of the platform used to play the stream.
+platform                    Returns the type of platform used to play the stream.
+throttled                   Returns true if the transcode session is throttled.
+transcode_progress          Returns the current transcode progress of the item. 0 to 100.
+transcode_speed             Returns the current transcode speed of the item.
+audio_decision              Returns the audio transcode decision. Either 'transcode', 'copy' or 'direct play'.
+audio_codec                 Returns the name of the audio codec.
+audio_channels              Returns the number of audio channels.
+grandparent_title           Returns the title of the item's grandparent.
+parent_title                Returns the title of the item's parent.
+video_decision              Returns the video transcode decision. Either 'transcode', 'copy' or 'direct play'.
+video_codec                 Returns the name of the video codec.
+height                      Returns the value of the video height.
+width                       Returns the value of the video width.
+container                   Returns the value of the media container.
+bitrate                     Returns the value of the media bitrate.
+video_resolution            Returns the value of the video resolution.
+video_framerate             Returns the value of the video framerate.
+video_aspect_ratio          Returns the value of the video aspect ratio.
+transcode_audio_channels    Returns the amount of audio channels if there is a transcode session.
+transcode_audio_codec       Returns the name of the audio codec if there is a transcode session.
+transcode_video_codec       Returns the name of the video codec if there is a transcode session.
+transcode_width             Returns the video width if there is a transcode session.
+transcode_height            Returns the video height if there is a transcode session.
+transcode_container         Returns the value of media container if there is a transcode session.
+transcode_protocol          Returns the value of media protocol if there is a transcode session.
+indexes                     Returns true if the media has media indexes and are enabled
+
+DOCUMENTATION :: END
+</%doc>
+
+% if data is not None:
+<%
+    from plexpy import helpers
+    data['indexes'] = helpers.cast_to_int(data['indexes'])
+%>
+<div class="dashboard-instance" id="instance-${data['session_key']}" data-id="${data['session_key']}">
+    <div class="dashboard-hover-container">
+        % if (data['media_type'] == 'movie' or data['media_type'] == 'episode' or data['media_type'] == 'track') and data['rating_key']:
+        <a href="info?rating_key=${data['rating_key']}">
+            % else:
+            <a href="#">
+                % endif
+                <div class="dashboard-activity-poster" id="poster-${data['session_key']}">
+                    % if not data['art'].startswith('interfaces') or not data['thumb'].startswith('interfaces'):
+                    % if (data['media_type'] == 'movie' and not data['indexes']) or (data['indexes'] and not data['view_offset']):
+                    <div id="bif-${data['session_key']}" class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${data['art']}&width=500&height=280&fallback=art);"></div>
+                    % elif (data['media_type'] == 'episode' and not data['indexes']) or (data['indexes'] and not data['view_offset']):
+                    <div id="bif-${data['session_key']}" class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${data['art']}&width=500&height=280&fallback=art);"></div>
+                    % elif data['indexes']:
+                    <div id="bif-${data['session_key']}" class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${data['bif_thumb']}&width=500&height=280&fallback=art); display: none;"></div>
+                    % else:
+                    % if data['media_type'] == 'track':
+                    <div class="dashboard-activity-cover-face-bg" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=300&fallback=cover);"></div>
+                    <div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=300&fallback=cover);"></div>
+                    % elif data['media_type'] == 'clip':
+                    % if data['art'].startswith('http'):
+                    <div class="dashboard-activity-poster-face" style="background-image: url(${data['art']});"></div>
+                    % elif data['thumb'].startswith('http'):
+                    <div class="dashboard-activity-poster-face" style="background-image: url(${data['thumb']});"></div>
+                    % else:
+                    % if data['art']:
+                    <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${data['art']}&width=500&height=280&fallback=art);"></div>
+                    % else:
+                    <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=280&fallback=art);"></div>
+                    % endif
+                    % endif
+                    % elif data['media_type'] == 'photo':
+                    <div id="bif-${data['session_key']}" class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=500&fallback=cover);"></div>
+                    % else:
+                    <div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=300&fallback=cover);"></div>
+                    % endif
+                    % endif
+                    % else:
+                    <div class="dashboard-activity-poster-face" style="background-image: url(${data['art']});"></div>
+                    % endif
+                    <div class="dashboard-activity-button-info">
+                        <button type="button" class="btn btn-activity-info btn-lg" data-target="#stream-${data['session_key']}" data-id="${data['session_key']}">
+                            <i class="fa fa-info-circle"></i>
+                        </button>
+                    </div>
+                    <div id="stream-${data['session_key']}" class="dashboard-activity-info-details-overlay">
+                        <div class="dashboard-activity-info-details-content">
+                            <div id="platform-${data['session_key']}" title="${data['platform']}">
+                                <script>
+                                    $("#platform-${data['session_key']}").html("<div class='dashboard-activity-info-platform-box' style='background-image: url(" + getPlatformImagePath('${data['platform']}') + ");'>");
+                                </script>
+                            </div>
+                            <div class="dashboard-activity-info-platform">
+                                <strong>${data['player']}</strong><br />
+                                <span id="overlay-play-state-${data['session_key']}">
+                                    % if data['state'] == 'playing':
+                                    State &nbsp;<strong>Playing</strong>
+                                    % elif data['state'] == 'paused':
+                                    State &nbsp;<strong>Paused</strong>
+                                    % elif data['state'] == 'buffering':
+                                    State &nbsp;<strong>Buffering</strong>
+                                    % endif
+                                </span>
+                            </div>
+                            % if data['media_type'] == 'track':
+                            % if data['audio_decision'] == 'direct play':
+                            Stream &nbsp;<strong>Direct Play</strong>
+                            % elif data['audio_decision'] == 'copy':
+                            Stream &nbsp;<strong>Direct Stream</strong>
+                            % else:
+                            Stream &nbsp;<strong>
+                                Transcoding
+                                <span id="transcode-state-${data['session_key']}">
+                                    (Speed: ${data['transcode_speed']})
+                                    % if data['throttled'] == '1':
+                                    (Throttled)
+                                    % endif
+                                </span>
+                            </strong>
+                            % endif
+                            <br />
+                            % if data['audio_decision'] == 'direct play':
+                            Audio &nbsp;<strong>Direct Play (${data['audio_codec']}) (${data['audio_channels']}ch)</strong>
+                            % elif data['audio_decision'] == 'copy':
+                            Audio &nbsp;<strong>Direct Stream (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
+                            % elif data['audio_decision'] == 'transcode':
+                            Audio &nbsp;<strong>Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
+                            % endif
+                            % elif data['media_type'] == 'episode' or data['media_type'] == 'movie' or data['media_type'] == 'clip':
+                            % if data['video_decision'] == 'direct play' and data['audio_decision'] == 'direct play':
+                            Stream &nbsp;<strong>Direct Play</strong>
+                            % elif data['video_decision'] == 'copy' and data['audio_decision'] == 'copy':
+                            Stream &nbsp;<strong>Direct Stream</strong>
+                            % else:
+                            Stream &nbsp;<strong>
+                                Transcoding
+                                <span id="transcode-state-${data['session_key']}">
+                                    (Speed: ${data['transcode_speed']})
+                                    % if data['throttled'] == '1':
+                                    (Throttled)
+                                    % endif
+                                </span>
+                            </strong>
+                            % endif
+                            <br />
+                            % if data['video_decision'] == 'direct play':
+                            Video &nbsp;<strong>Direct Play (${data['video_codec']}) (${data['width']}x${data['height']})</strong>
+                            % elif data['video_decision'] == 'copy':
+                            Video &nbsp;<strong>Direct Stream (${data['transcode_video_codec']}) (${data['width']}x${data['height']})</strong>
+                            % elif data['video_decision'] == 'transcode':
+                            Video &nbsp;<strong>Transcode (${data['transcode_video_codec']}) (${data['transcode_width']}x${data['transcode_height']})</strong>
+                            % endif
+                            <br />
+                            % if data['audio_decision'] == 'direct play':
+                            Audio &nbsp;<strong>Direct Play (${data['audio_codec']}) (${data['audio_channels']}ch)</strong>
+                            % elif data['audio_decision'] == 'copy':
+                            Audio &nbsp;<strong>Direct Stream (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
+                            % elif data['audio_decision'] == 'transcode':
+                            Audio &nbsp;<strong>Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
+                            % endif
+                            % elif data['media_type'] == 'photo':
+                            % if data['video_decision'] == 'direct play':
+                            Stream &nbsp;<strong>Direct Play</strong>
+                            % elif data['video_decision'] == 'copy':
+                            Stream &nbsp;<strong>Direct Stream</strong>
+                            % else:
+                            Stream &nbsp;<strong>
+                                <span id="transcode-state-${data['session_key']}">
+                                    (Speed: ${data['transcode_speed']})
+                                    % if data['throttled'] == '1':
+                                    (Throttled)
+                                    % endif
+                                </span>
+                            </strong>
+                            % endif
+                            % endif
+                            <br>
+                        </div>
+                    </div>
+                    % if data['media_type'] != 'photo':
+                    <div class="dashboard-activity-poster-info-bar">
+                        <div class="dashboard-activity-poster-info-ip-address">
+                            % if data['ip_address']:
+                            <span>IP: ${data['ip_address']}</span>
+                            % else:
+                            <span>IP: N/A</span>
+                            % endif
+                            <br />
+                            ETA:
+                            <span id="stream-eta-${data['session_key']}">
+                                <script>
+                                    $("#stream-eta-${data['session_key']}").html(moment().add(parseInt("${data['duration']}") - parseInt("${data['view_offset']}"), 'milliseconds').format(time_format));
+                                </script>
+                            </span>
+                        </div>
+                        <div class="dashboard-activity-poster-info-time">
+                            <span class="progress_time" id="stream-view-offset-${data['session_key']}">
+                                <script>
+                                    $("#stream-view-offset-${data['session_key']}").html(millisecondsToMinutes(parseInt("${data['view_offset']}"), false));
+                                </script>
+                            </span>/<span class="progress_time" id="stream-duration-${data['session_key']}">
+                                <script>
+                                    $("#stream-duration-${data['session_key']}").html(millisecondsToMinutes(parseInt("${data['duration']}"), false));
+                                </script>
+                            </span>
+                        </div>
+                    </div>
+                    % endif
+                </div>
+                % if (data['media_type'] == 'movie' or data['media_type'] == 'episode' or data['media_type'] == 'track') and data['rating_key']:
+            </a>
+            % else:
+        </a>
+        % endif
+        <div class="dashboard-activity-progress">
+            <div class="dashboard-activity-progress-bar">
+                <div id="bufferbar-${data['session_key']}" class="bufferbar" style="width: ${data['transcode_progress']}%" data-toggle="tooltip" title="Transcoder Progress">${data['transcode_progress']}%</div>
+                <div id="bar-${data['session_key']}" class="bar" style="width: ${data['progress_percent']}%" data-toggle="tooltip" title="Stream Progress">${data['progress_percent']}%</div>
+            </div>
+        </div>
+    </div>
+    <div class="dashboard-activity-metadata-wrapper">
+        % if data['user_id']:
+        <a href="user?user_id=${data['user_id']}">
+            <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${data['user_thumb']});"></div>
+        </a>
+        % else:
+        <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${data['user_thumb']});"></div>
+        % endif
+        <div class="dashboard-activity-metadata-title">
+            <span id="play-state-${data['session_key']}">
+                % if data['state'] == 'playing':
+                <i class="fa fa-fw fa-play"></i>&nbsp;
+                % elif data['state'] == 'paused':
+                <i class="fa fa-fw fa-pause"></i>&nbsp;
+                % elif data['state'] == 'buffering':
+                <i class="fa fa-fw fa-spinner"></i>&nbsp;
+                % endif
+            </span>
+            % if data['rating_key']:
+            % if data['media_type'] == 'episode':
+            <a href="info?rating_key=${data['grandparent_rating_key']}" title="${data['grandparent_title']}">${data['grandparent_title']}</a>
+                 - <a href="info?rating_key=${data['rating_key']}" title="${data['title']}">${data['title']}</a>
+            % elif data['media_type'] == 'movie':
+            <a href="info?rating_key=${data['rating_key']}" title="${data['title']}">${data['title']}</a>
+            % elif data['media_type'] == 'clip':
+            <span title="${data['title']}">${data['title']}</span>
+            % elif data['media_type'] == 'track':
+            <a href="info?rating_key=${data['grandparent_rating_key']}" title="${data['grandparent_title']}">${data['grandparent_title']}</a>
+                 - <a href="info?rating_key=${data['rating_key']}" title="${data['title']}">${data['title']}</a>
+            % elif data['media_type'] == 'photo':
+            <span title="${data['parent_title']}">${data['parent_title']}</span>
+            % else:
+            <span title="${data['title']}">${data['title']}</span>
+            % endif
+            % else:
+            ${data['title']}
+            % endif
+        </div>
+        <div class="dashboard-activity-metadata-subtitle">
+            % if data['rating_key']:
+            % if data['media_type'] == 'episode':
+            <a href="info?rating_key=${data['parent_rating_key']}" title="Season ${data['parent_media_index']}" class="text-muted">S${data['parent_media_index']}</a>
+                &middot; <a href="info?rating_key=${data['rating_key']}" title="Episode ${data['media_index']}" class="text-muted">E${data['media_index']}</a>
+            % elif data['media_type'] == 'movie':
+            <span title="${data['year']}">${data['year']}</span>
+            % elif data['media_type'] == 'track':
+            <a href="info?rating_key=${data['parent_rating_key']}" title="${data['parent_title']}">${data['parent_title']}</a>
+            % elif data['media_type'] == 'photo':
+            <span title="${data['title']}">${data['title']}</span>
+            % else:
+            <span title="${data['year']}">${data['year']}</span>
+            % endif
+            % endif
+        </div>
+        <div class="dashboard-activity-metadata-user">
+            % if data['user_id']:
+            <a href="user?user_id=${data['user_id']}" title="${data['friendly_name']}">${data['friendly_name']}</a>
+            % else:
+            ${data['friendly_name']}
+            % endif
+        </div>
+    </div>
+</div>
+% endif

data/interfaces/default/edit_library.html

@@ -0,0 +1,179 @@
+<%doc>
+USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
+
+For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
+
+Filename:           edit_library.html
+Version:            0.1
+Variable names:     data [list]
+
+data :: Usable parameters
+
+== Global keys ==
+section_id          Returns the library id of the library.
+section_name        Returns the name of the library.
+section_type        Returns the type of the library.
+library_thumb       Returns the thumbnail for the library.
+custom_thumb        Returns the custom thumbnail for the library.
+library_art         Returns the artwork for the library.
+count               Returns the item count for the library.
+parent_count        Returns the parent item count for the library.
+child_count         Returns the child item count for the library.
+do_notify           Returns bool value for whether to send notifications for the library.
+keep_history        Returns bool value for whether to keep history for the library.
+
+DOCUMENTATION :: END
+</%doc>
+
+<%!
+    from plexpy import helpers
+%>
+
+% if data != None:
+<div class="modal-dialog" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+            <h4 class="modal-title">Edit library <strong>${data['section_name']}</strong></h4>
+        </div>
+        <div class="modal-body" id="modal-text">
+            <fieldset>
+                <div class="form-group">
+                    <label for="profile_url">Library Picture URL</label>
+                    <div class="row">
+                        <div class="col-md-8">
+                            <input type="text" class="form-control" id="custom_thumb_url" name="custom_thumb_url" value="${data['library_thumb']}">
+                        </div>
+                    </div>
+                    <p class="help-block">Change the library's picture in PlexPy. To reset to default, leave this field empty and save.</p>
+                </div>
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="do_notify" name="do_notify" value="1" ${helpers.checked(data['do_notify'])}> Enable notifications
+                    </label>
+                    <p class="help-block">Uncheck this if you do not want to receive notifications for this library's activity.</p>
+                </div>
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="keep_history" name="keep_history" value="1" ${helpers.checked(data['keep_history'])}> Keep history
+                    </label>
+                    <p class="help-block">Uncheck this if you do not want to keep any history on this library's activity.</p>
+                </div>
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="do_notify_created" name="do_notify_created" value="1" ${helpers.checked(data['do_notify_created'])}> Enable recently added notifications
+                    </label>
+                    <p class="help-block">Uncheck this if you do not want to receive recently added notifications for this library.</p>
+                </div>
+                % if data['section_id']:
+                <div class="form-group">
+                    <button class="btn btn-danger" id="delete-all-history">Purge</button>
+                    <p class="help-block">DANGER ZONE! Click the purge button to remove all history logged for this library. This is permanent!</p>
+                </div>
+                % endif
+            </fieldset>
+        </div>
+        <div class="modal-footer">
+            <div>
+                <span id="edit-library-status-message"></span>
+                <input type="button" id="save_library" class="btn btn-bright" value="Save">
+            </div>
+        </div>
+    </div>
+</div>
+<div id="confirm-modal-purge" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-purge">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                <h4 class="modal-title" id="myModalLabel">Confirm Purge</h4>
+            </div>
+            <div class="modal-body" style="text-align: center;">
+                <p>Are you REALLY sure you want to purge all history for this library?</p>
+                <p>This is permanent and cannot be undone!</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-purge">Purge</button>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    // Save library options
+    $("#save_library").on('click', function () {
+        var custom_thumb = $("#custom_thumb_url").val();
+        var do_notify = 0;
+        var do_notify_created = 0;
+        var keep_history = 0;
+        if ($("#do_notify").is(":checked")) {
+            do_notify = 1;
+        }
+        if ($("#do_notify_created").is(":checked")) {
+            do_notify_created = 1;
+        }
+        if ($("#keep_history").is(":checked")) {
+            keep_history = 1;
+        }
+
+        $.ajax({
+            url: 'edit_library',
+            data: {
+                section_id: '${data["section_id"]}',
+                custom_thumb: custom_thumb,
+                do_notify: do_notify,
+                do_notify_created: do_notify_created,
+                keep_history: keep_history
+            },
+            cache: false,
+            async: true,
+            success: function (data) {
+                location.reload();
+            }
+        });
+    });
+
+    $("#delete-all-history").on('click', function() {
+        $('#confirm-modal-purge').modal();
+        $('#confirm-modal-purge').one('click', '#confirm-purge', function () {
+            $.ajax({
+                url: 'delete_all_library_history',
+                data: { section_id: '${data["section_id"]}' },
+                cache: false,
+                async: true,
+                success: function(data) {
+                    location.reload();
+                }
+            });
+        });
+    });
+        
+    $(document).ready(function() {
+        // Move #confirm-modal to parent container
+        if (!($('#edit-library-modal').next().is('#confirm-modal-purge'))) {
+            $('#confirm-modal-purge').appendTo($('#edit-library-modal').parent());
+        }
+        $('#edit-library-modal > #confirm-modal-purge').remove();
+
+        $('#edit-library-modal').css('z-index', '1050');
+        $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1049');
+        $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack');
+
+        $('#confirm-modal-purge').on('show.bs.modal', function () {
+            // Fix position to match parent modal
+            var currentPadding = parseInt($('body').css('padding-right'));
+            $(this).children('.modal-dialog').css('left', -currentPadding/2);
+            $('#edit-library-modal').css('overflow-y', 'hidden');
+        });
+        $('#confirm-modal-purge').on('shown.bs.modal', function () {
+            $(this).css('z-index', '1060');
+            $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1059');
+            $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack'); 
+        });
+        $('#confirm-modal-purge').on('hidden.bs.modal', function () {
+            $('body').addClass('modal-open');
+            $('#edit-library-modal').css('overflow-y', 'auto');
+        });
+    });
+</script>
+% endif

data/interfaces/default/edit_user.html

@@ -10,21 +10,31 @@ Variable names:     data [list]
 data :: Usable parameters
 
 == Global keys ==
-user                Return the real Plex username
-user_id             Return the Plex user_id
-friendly_name       Returns the friendly edited Plex username
-do_notify           Returns bool value for whether the user should trigger notifications
-keep_history        Returns bool value for whether the user's activity should be logged
+user_id             Returns the user id of the user.
+username            Returns the user's username.
+friendly_name       Returns the friendly name of the user.
+email               Returns the user's email address.
+user_thumb          Returns the thumbnail for the user.
+is_home_user        Returns bool value for whether the user is part of a Plex Home.
+is_allow_sync       Returns bool value for whether the user has sync rights.
+is_restricted       Returns bool value for whether the user account is restricted.
+do_notify           Returns bool value for whether to send notifications for the user.
+keep_history        Returns bool value for whether to keep history for the user.
+allow_guest         Returns bool value for whether to allow guest access for the user.
 
 DOCUMENTATION :: END
 </%doc>
 
-% if data is not None:
+<%!
+    from plexpy import helpers
+%>
+
+% if data != None:
 <div class="modal-dialog" role="document">
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title">Edit user <strong>${data['user']}</strong></h4>
+            <h4 class="modal-title">Edit user <strong>${data['username']}</strong></h4>
         </div>
         <div class="modal-body" id="modal-text">
             <fieldset>
@@ -41,22 +51,28 @@ DOCUMENTATION :: END
                     <label for="profile_url">Profile Picture URL</label>
                     <div class="row">
                         <div class="col-md-8">
-                            <input type="text" class="form-control" id="profile_url" name="profile_url" value="${data['thumb']}">
+                            <input type="text" class="form-control" id="custom_avatar_url" name="custom_avatar_url" value="${data['user_thumb']}">
                         </div>
                     </div>
-                    <p class="help-block">Change the users profile picture in PlexPy. To reset to default, leave this field empty and save then perform a user refresh.</p>
+                    <p class="help-block">Change the users profile picture in PlexPy. To reset to default, leave this field empty and save.</p>
                 </div>
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" id="do_notify" name="do_notify" value="1" ${data['do_notify']}> Enable notifications
+                        <input type="checkbox" id="do_notify" name="do_notify" value="1" ${helpers.checked(data['do_notify'])}> Enable notifications
                     </label>
                     <p class="help-block">Uncheck this if you do not want to receive notifications for this user's activity.</p>
                 </div>
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" id="keep_history" name="keep_history" value="1" ${data['keep_history']}> Keep history
+                        <input type="checkbox" id="keep_history" name="keep_history" value="1" ${helpers.checked(data['keep_history'])}> Keep history
                     </label>
-                    <p class="help-block">Uncheck this if you do not want this keep any history on this user's activity.</p>
+                    <p class="help-block">Uncheck this if you do not want to keep any history on this user's activity.</p>
+                </div>
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="allow_guest" name="allow_guest" value="1" ${helpers.checked(data['allow_guest'])}> Allow Guest Access
+                    </label>
+                    <p class="help-block">Uncheck this if you do not want to allow this user to login to PlexPy.</p>
                 </div>
                 % if data['user_id']:
                 <div class="form-group">
@@ -69,12 +85,12 @@ DOCUMENTATION :: END
         <div class="modal-footer">
             <div>
                 <span id="edit-user-status-message"></span>
-                <input type="button" id="save_user_name" class="btn btn-bright" value="Save">
+                <input type="button" id="save_user" class="btn btn-bright" value="Save">
             </div>
         </div>
     </div>
 </div>
-<div id="confirm-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+<div id="confirm-modal-purge" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-purge">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
@@ -93,56 +109,47 @@ DOCUMENTATION :: END
     </div>
 </div>
 <script>
-    // Set new friendly name
-    $("#save_user_name").click(function() {
+    // Set user options
+    $("#save_user").on('click', function () {
         var friendly_name = $("#friendly_name").val();
-        var thumb = $("#profile_url").val();
+        var custom_thumb = $("#custom_avatar_url").val();
         var do_notify = 0;
         var keep_history = 0;
+        var allow_guest = 0;
         if ($("#do_notify").is(":checked")) {
             do_notify = 1;
         }
         if ($("#keep_history").is(":checked")) {
             keep_history = 1;
         }
+        if ($("#allow_guest").is(":checked")) {
+            allow_guest = 1;
+        }
 
-        % if data['user_id']:
-            $.ajax({
-                url: 'edit_user',
-                data: {user_id: '${data['user_id']}', friendly_name: friendly_name, do_notify: do_notify, keep_history: keep_history, thumb: thumb},
-                cache: false,
-                async: true,
-                success: function(data) {
-                    $("#edit-user-status-message").html(data);
-                    if ($.trim(friendly_name) !== '') {
-                        $(".set-username").html(friendly_name);
-                    }
-                    $("#user-profile-thumb").attr('src', thumb);
-                }
-            });
-        % else:
-            $.ajax({
-                url: 'edit_user',
-                data: {user: '${data['user']}', friendly_name: friendly_name, do_notify: do_notify, keep_history: keep_history, thumb: thumb},
-                cache: false,
-                async: true,
-                success: function(data) {
-                    $("#edit-user-status-message").html(data);
-                    if ($.trim(friendly_name) !== '') {
-                        $(".set-username").html(friendly_name);
-                    }
-                    $("#user-profile-thumb").attr('src', thumb);
-                }
-            });
-        % endif
+        $.ajax({
+            url: 'edit_user',
+            data: {
+                user_id: '${data["user_id"]}',
+                friendly_name: friendly_name,
+                custom_thumb: custom_thumb,
+                do_notify: do_notify,
+                keep_history: keep_history,
+                allow_guest: allow_guest
+            },
+            cache: false,
+            async: true,
+            success: function(data) {
+                location.reload();
+            }
+        });
     });
 
     $("#delete-all-history").on('click', function() {
-        $('#confirm-modal').modal();
-        $('#confirm-modal').one('click', '#confirm-purge', function () {
+        $('#confirm-modal-purge').modal();
+        $('#confirm-modal-purge').one('click', '#confirm-purge', function () {
             $.ajax({
                 url: 'delete_all_user_history',
-                data: {user_id: '${data['user_id']}'},
+                data: { user_id: '${data["user_id"]}' },
                 cache: false,
                 async: true,
                 success: function(data) {
@@ -153,31 +160,31 @@ DOCUMENTATION :: END
     });
         
     $(document).ready(function() {
-        // Move #confirm-modal to parent container
-        if(!($('#edit-user-modal').next().is('#confirm-modal'))) {
-            $('#confirm-modal').appendTo($('#edit-user-modal').parent()); }
-        $('#edit-user-modal > #confirm-modal').remove();
+        // Move #confirm-modal-purge to parent container
+        if (!($('#edit-user-modal').next().is('#confirm-modal-purge'))) {
+            $('#confirm-modal-purge').appendTo($('#edit-user-modal').parent());
+        }
+        $('#edit-user-modal > #confirm-modal-purge').remove();
 
         $('#edit-user-modal').css('z-index', '1050');
         $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1049');
         $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack');
 
-        $('#confirm-modal').on('show.bs.modal', function () {
+        $('#confirm-modal-purge').on('show.bs.modal', function () {
             // Fix position to match parent modal
             var currentPadding = parseInt($('body').css('padding-right'));
             $(this).children('.modal-dialog').css('left', -currentPadding/2);
             $('#edit-user-modal').css('overflow-y', 'hidden');
         });
-        $('#confirm-modal').on('shown.bs.modal', function () {
+        $('#confirm-modal-purge').on('shown.bs.modal', function () {
             $(this).css('z-index', '1060');
             $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1059');
             $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack'); 
         });
-        $('#confirm-modal').on('hidden.bs.modal', function() {
+        $('#confirm-modal-purge').on('hidden.bs.modal', function () {
             $('body').addClass('modal-open');
             $('#edit-user-modal').css('overflow-y', 'auto');
         });
     });
 </script>
-
 % endif

data/interfaces/default/graphs.html

@@ -1,8 +1,8 @@
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
-<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
 </%def>
 
 <%def name="body()">
@@ -12,111 +12,141 @@
             <span><i class="fa fa-bar-chart"></i> Graphs</span>
         </div>
         <div class="button-bar hidden-xs">
+            <div class="btn-group" id="user-selection">
+                <label>
+                    <select name="graph-user" id="graph-user" class="btn" style="color: inherit;">
+                        <option value="">All Users</option>
+                        <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
+                    </select>
+                </label>
+            </div>
             <div class="btn-group" data-toggle="buttons" id="yaxis-selection">
+                % if config['graph_type'] == 'duration':
+                <label class="btn btn-dark">
+                    <input type="radio" name="yaxis-options" id="yaxis-count" value="plays" autocomplete="off"> Play Count
+                </label>
+                <label class="btn btn-dark active">
+                    <input type="radio" name="yaxis-options" id="yaxis-duration" value="duration" autocomplete="off" checked> Play Duration
+                </label>
+                % else:
                 <label class="btn btn-dark active">
                     <input type="radio" name="yaxis-options" id="yaxis-count" value="plays" autocomplete="off" checked> Play Count
                 </label>
                 <label class="btn btn-dark">
                     <input type="radio" name="yaxis-options" id="yaxis-duration" value="duration" autocomplete="off"> Play Duration
                 </label>
+                % endif
             </div>
-            <div class="btn-group" data-toggle="buttons" id="days-selection">
-                <label class="btn btn-dark">
-                    <input type="radio" name="date-options" id="graph-7" value="7" autocomplete="off"> 7 days
-                </label>
-                <label class="btn btn-dark active">
-                    <input type="radio" name="date-options" id="graph-30" value="30" autocomplete="off" checked> 30 days
-                </label>
-                <label class="btn btn-dark">
-                    <input type="radio" name="date-options" id="graph-90" value="90" autocomplete="off"> 90 days
-                </label>
-                <label class="btn btn-dark">
-                    <input type="radio" name="date-options" id="graph-365" value="365" autocomplete="off"> 1 year
+            <div class="btn-group" id="days-selection">
+                <label>
+                    <input type="number" name="graph-days" id="graph-days" value="${config['graph_days']}" min="1" /> days
                 </label>
             </div>
         </div>
     </div>
     <div class='table-card-back'>
         <ul class="nav nav-pills" role="tablist" id="graph-tabs">
+            % if config['graph_tab'] == 'tabs-3':
+            <li role="presentation"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by period</a></li>
+            <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
+            <li role="presentation" class="active"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
+            % elif config['graph_tab'] == 'tabs-2':
+            <li role="presentation"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by period</a></li>
+            <li role="presentation" class="active"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
+            <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
+            % else:
             <li role="presentation" class="active"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by period</a></li>
             <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
             <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
+            % endif
         </ul>
         <div class="tab-content">
+            % if config['graph_tab'] != 'tabs-2' and config['graph_tab'] != 'tabs-3':
             <div role="tabpanel" class="tab-pane active" id="tabs-1">
-                <div class="row">
-                    <div class="col-md-12">
-                        <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text">Play count</span> <small>Last <span class="days">30</span> days</small></h4>
-                        <p class="help-block">
-                            The total play count or duration of tv, movies, and music played per day. Click a graph point to open up a list of items played for that specific date.
-                        </p>
-                        <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_day">
-                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
-                                <br>
+            % else:
+            <div role="tabpanel" class="tab-pane" id="tabs-1">
+            % endif
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text">Play count</span> <small>Last <span class="days">30</span> days</small></h4>
+                            <p class="help-block">
+                                The total play count or duration of tv, movies, and music played per day. Click a graph point to open up a list of items played for that specific date.
+                            </p>
+                            <div class="graphs-instance">
+                                <div class="watch-chart" id="chart_div_plays_by_day">
+                                    <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
+                                    <br>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-6">
+                            <h4><i class="fa fa-calendar"></i> <span class="yaxis-text">Play count</span> by day of week <small>Last <span class="days">30</span> days</small></h4>
+                            <p class="help-block">
+                                The combined total of tv, movies, and music played per day of the week.
+                            </p>
+                            <div class="graphs-instance">
+                                <div class="watch-chart" id="chart_div_plays_by_dayofweek" style="float: left;">
+                                    <div class="graphs-load">
+                                        <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                                    </div>
+                                    <br>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <h4><i class="fa fa-clock-o"></i> <span class="yaxis-text">Play count</span> by hour of day <small>Last <span class="days">30</span> days</small></h4>
+                            <p class="help-block">
+                                The combined total of tv, movies, and music played per hour of the day.
+                            </p>
+                            <div class="graphs-instance">
+                                <div class="watch-chart" id="chart_div_plays_by_hourofday">
+                                    <div class="graphs-load">
+                                        <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                                    </div>
+                                    <br>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-6">
+                            <h4><i class="fa fa-television"></i> <span class="yaxis-text">Play count</span> by top 10 platforms <small>Last <span class="days">30</span> days</small></h4>
+                            <p class="help-block">
+                                The combined total of tv, movies, and music played by top 10 most active platforms.
+                            </p>
+                            <div class="graphs-instance">
+                                <div class="watch-chart" id="chart_div_plays_by_platform" style="float: left;">
+                                    <div class="graphs-load">
+                                        <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                                    </div>
+                                    <br>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <h4><i class="fa fa-user"></i> <span class="yaxis-text">Play count</span> by top 10 users <small>Last <span class="days">30</span> days</small></h4>
+                            <p class="help-block">
+                                The combined total of tv, movies, and music played by top 10 most active users.
+                            </p>
+                            <div class="graphs-instance">
+                                <div class="watch-chart" id="chart_div_plays_by_user">
+                                    <div class="graphs-load">
+                                        <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                                    </div>
+                                    <br>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-md-6">
-                        <h4><i class="fa fa-calendar"></i> <span class="yaxis-text">Play count</span> by day of week <small>Last <span class="days">30</span> days</small></h4>
-                        <p class="help-block">
-                            The combined total of tv, movies, and music played per day of the week.
-                        </p>
-                        <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_dayofweek" style="float: left;">
-                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
-                                </div>
-                                <br>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <h4><i class="fa fa-clock-o"></i> <span class="yaxis-text">Play count</span> by hour of day <small>Last <span class="days">30</span> days</small></h4>
-                        <p class="help-block">
-                            The combined total of tv, movies, and music played per hour of the day.
-                        </p>
-                        <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_hourofday">
-                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
-                                </div>
-                                <br>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-md-6">
-                        <h4><i class="fa fa-television"></i> <span class="yaxis-text">Play count</span> by top 10 platforms <small>Last <span class="days">30</span> days</small></h4>
-                        <p class="help-block">
-                            The combined total of tv, movies, and music played by top 10 most active platforms.
-                        </p>
-                        <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_platform" style="float: left;">
-                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
-                                </div>
-                                <br>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <h4><i class="fa fa-user"></i> <span class="yaxis-text">Play count</span> by top 10 users <small>Last <span class="days">30</span> days</small></h4>
-                        <p class="help-block">
-                            The combined total of tv, movies, and music played by top 10 most active users.
-                        </p>
-                        <div class="graphs-instance">
-                            <div class="watch-chart" id="chart_div_plays_by_user">
-                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
-                                </div>
-                                <br>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
 
+            % if config['graph_tab'] == 'tabs-2':
+            <div role="tabpanel" class="tab-pane active" id="tabs-2">
+            % else:
             <div role="tabpanel" class="tab-pane" id="tabs-2">
+            % endif
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-video-camera"></i> Daily Stream type breakdown <small>Last <span class="days">30</span> days</small></h4>
@@ -189,7 +219,11 @@
                 </div>
             </div>
 
+            % if config['graph_tab'] == 'tabs-3':
+            <div role="tabpanel" class="tab-pane active" id="tabs-3">
+            % else:
             <div role="tabpanel" class="tab-pane" id="tabs-3">
+            % endif
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-calendar"></i> Plays by Month <small>Last 12 months</small></h4>
@@ -214,16 +248,18 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="interfaces/default/js/moment-with-locale.js"></script>
-<script src="interfaces/default/js/moment-duration-format.js"></script>
-<script src="interfaces/default/js/highcharts/js/highcharts.js"></script>
-<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
-<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
-<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
+<script src="${http_root}js/moment-with-locale.js"></script>
+<script src="${http_root}js/moment-duration-format.js"></script>
+<script src="${http_root}js/highcharts/js/highcharts.js"></script>
+<script src="${http_root}js/jquery.dataTables.min.js"></script>
+<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
+<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
 
 <script>
+    var selected_user_id = null
+
     // Modal popup dialog
-    function selectHandler(selectedDate) {
+    function selectHandler(selectedDate, selectedSeries) {
 
         try
         {
@@ -233,10 +269,26 @@
             var y = dateValue.getFullYear();
             var dateString = '' + y + '-' + (m<=9 ? '0' + m : m) + '-' + (d <= 9 ? '0' + d : d);
 
+            var media_type = null;
+            var transcode_decision = null;
+            switch(selectedSeries) {
+                case "TV": media_type = 'episode'; break;
+                case "Movies": media_type = 'movie'; break;
+                case "Music": media_type = 'track'; break;
+                case "Direct Play": transcode_decision = 'direct play'; break;
+                case "Direct Stream": transcode_decision = 'copy'; break;
+                case "Transcode": transcode_decision = 'transcode'; break;
+            }
+            
             $.ajax({
-                "url": "history_table_modal",
+                url: "history_table_modal",
                 type: 'post',
-                data:  { 'start_date': dateString },
+                data:  {
+                    user_id: selected_user_id,
+                    start_date: dateString,
+                    media_type: media_type,
+                    transcode_decision: transcode_decision
+                },
                 complete: function(xhr, status) {
                     $('#history-modal').modal('show');
                     $("#history-modal").html(xhr.responseText);
@@ -245,64 +297,60 @@
         }
         catch(err)
         {
-          console.log("Failed to retrieve data");
+          console.log("Failed to retrieve history modal data.");
         }
     }
 </script>
-<script src="interfaces/default/js/graphs/plays_by_day.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_dayofweek.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_hourofday.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_platform.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_user.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_stream_type.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_source_resolution.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_stream_resolution.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_platform_by_stream_type.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_user_by_stream_type.js"></script>
-<script src="interfaces/default/js/graphs/plays_by_month.js"></script>
+<script src="${http_root}js/graphs/plays_by_day.js"></script>
+<script src="${http_root}js/graphs/plays_by_dayofweek.js"></script>
+<script src="${http_root}js/graphs/plays_by_hourofday.js"></script>
+<script src="${http_root}js/graphs/plays_by_platform.js"></script>
+<script src="${http_root}js/graphs/plays_by_user.js"></script>
+<script src="${http_root}js/graphs/plays_by_stream_type.js"></script>
+<script src="${http_root}js/graphs/plays_by_source_resolution.js"></script>
+<script src="${http_root}js/graphs/plays_by_stream_resolution.js"></script>
+<script src="${http_root}js/graphs/plays_by_platform_by_stream_type.js"></script>
+<script src="${http_root}js/graphs/plays_by_user_by_stream_type.js"></script>
+<script src="${http_root}js/graphs/plays_by_month.js"></script>
 <script>
     $(document).ready(function () {
 
-        // Save graph state to cookies
-        $('input[name=yaxis-options]').change(function() {
-            setCookie('graphType', $(this).val(), 365, '/');
-        });
-        $('input[name=date-options]').change(function() {
-            setCookie('graphDate', $(this).val(), 365, '/');
-        });
-        $('a[data-toggle=tab]').click(function() {
-            setCookie('graphTab', $(this).attr('href'), 365, '/');
-        });
+        // Initial values for graph from config
+        var yaxis = "${config['graph_type']}";
+        var current_range = ${config['graph_days']};
+        var current_tab = "${'#' + config['graph_tab']}";
         
-        // Initial values for graph if no saved state
-        var yaxis = 'plays';
-        var current_range = 30;
-        var current_tab = '#tabs-1';
-            
-        // Read saved graph state from cookies and set initial values
-        if(getCookie('graphType')) {
-            var yaxis = getCookie('graphType');
-            $('input[name=yaxis-options][value=' + yaxis + ']').prop('checked', true).trigger('click');
-        }
-        if(getCookie('graphDate')) {
-            var current_range = getCookie('graphDate');
-            $('input[name=date-options][value=' + current_range + ']').prop('checked', true).trigger('click');
-            $('.days').html(current_range);
-        }
-        if(getCookie('graphTab')) {
-            var current_tab = getCookie('graphTab');
-            $('a[data-toggle=tab][href=' + current_tab + ']').trigger('click');
-        }
+        $('.days').html(current_range);
+        
+        // Load user ids and names (for the selector)
+        $.ajax({
+            url: 'get_user_names',
+            type: 'get',
+            dataType: "json",
+            success: function (data) {
+                var select = $('#graph-user');
+                data.sort(function(a, b) {
+                    return a.friendly_name.localeCompare(b.friendly_name);
+                });
+                data.forEach(function(item) {
+                    select.append('<option value="' + item.user_id + '">' +
+                        item.friendly_name + '</option>');
+                });
+            }
+        });
+
 
         var music_visible = (${config['music_logging_enable']} == 1 ? true : false);
 
         function loadGraphsTab1(time_range, yaxis) {
+            $('#days-selection').show();
+
             setGraphFormat(yaxis);
 
             $.ajax({
                 url: "get_plays_by_date",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     var dateArray = [];
@@ -329,7 +377,7 @@
             $.ajax({
                 url: "get_plays_by_dayofweek",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     hc_plays_by_dayofweek_options.xAxis.categories = data.categories;
@@ -342,7 +390,7 @@
             $.ajax({
                 url: "get_plays_by_hourofday",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     hc_plays_by_hourofday_options.xAxis.categories = data.categories;
@@ -355,7 +403,7 @@
             $.ajax({
                 url: "get_plays_by_top_10_platforms",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     hc_plays_by_platform_options.xAxis.categories = data.categories;
@@ -368,7 +416,7 @@
             $.ajax({
                 url: "get_plays_by_top_10_users",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id  },
                 dataType: "json",
                 success: function(data) {
                     hc_plays_by_user_options.xAxis.categories = data.categories;
@@ -380,12 +428,14 @@
         }
 
         function loadGraphsTab2(time_range, yaxis) {
+            $('#days-selection').show();
+
             setGraphFormat(yaxis);
 
             $.ajax({
                 url: "get_plays_by_stream_type",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     var dateArray = [];
@@ -411,7 +461,7 @@
             $.ajax({
                 url: "get_plays_by_source_resolution",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     hc_plays_by_source_resolution_options.xAxis.categories = data.categories;
@@ -423,7 +473,7 @@
             $.ajax({
                 url: "get_plays_by_stream_resolution",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     hc_plays_by_stream_resolution_options.xAxis.categories = data.categories;
@@ -435,7 +485,7 @@
             $.ajax({
                 url: "get_stream_type_by_top_10_platforms",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     hc_plays_by_platform_by_stream_type_options.xAxis.categories = data.categories;
@@ -447,7 +497,7 @@
             $.ajax({
                 url: "get_stream_type_by_top_10_users",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis },
+                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     hc_plays_by_user_by_stream_type_options.xAxis.categories = data.categories;
@@ -458,12 +508,14 @@
         }
 
         function loadGraphsTab3(yaxis) {
+            $('#days-selection').hide();
+
             setGraphFormat(yaxis);
 
             $.ajax({
                 url: "get_plays_per_month",
                 type: 'get',
-                data: { y_axis: yaxis },
+                data: { y_axis: yaxis, user_id: selected_user_id },
                 dataType: "json",
                 success: function(data) {
                     hc_plays_by_month_options.yAxis.min = 0;
@@ -476,48 +528,82 @@
         }
 
         // Set initial state
-        loadGraphsTab1(current_range, yaxis);
+        if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
+        if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
+        if (current_tab == '#tabs-3') { loadGraphsTab3(yaxis); }
 
         // Tab1 opened
         $('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
-            $('#days-selection').show();
             loadGraphsTab1(current_range, yaxis);
+            $.ajax({
+                url: 'set_graph_config',
+                data: { graph_tab: current_tab.replace('#','') },
+                async: true
+            });
         })
 
         // Tab2 opened
         $('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
-            $('#days-selection').show();
             loadGraphsTab2(current_range, yaxis);
+            $.ajax({
+                url: 'set_graph_config',
+                data: { graph_tab: current_tab.replace('#','') },
+                async: true
+            });
         })
 
         // Tab3 opened
         $('#graph-tabs a[href="#tabs-3"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
-            $('#days-selection').hide();
-            console.log('loading....');
             loadGraphsTab3(yaxis);
+            $.ajax({
+                url: 'set_graph_config',
+                data: { graph_tab: current_tab.replace('#','') },
+                async: true
+            });
         })
 
-
         // Date range changed
-        $('#days-selection').on('change', function() {
-            current_range = $('input[name=date-options]:checked', '#days-selection').val();
+        $('#graph-days').on('change', function() {
+            current_range = $(this).val();
+            if (current_range < 1) {
+                $(this).val(7);
+                current_range = 7;
+            }
             if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
             if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
             $('.days').html(current_range);
+            $.ajax({
+                url: 'set_graph_config',
+                data: { graph_days: current_range},
+                async: true
+            });
         });
 
+        // User changed
+        $('#graph-user').on('change', function() {
+            selected_user_id = $(this).val() || null;
+            if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
+            if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
+            if (current_tab == '#tabs-3') { loadGraphsTab3(yaxis); }
+        });
+        
         // Y-axis changed
         $('#yaxis-selection').on('change', function() {
             yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val();
             if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
             if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
             if (current_tab == '#tabs-3') { loadGraphsTab3(yaxis); }
+            $.ajax({
+                url: 'set_graph_config',
+                data: { graph_type: yaxis},
+                async: true
+            });
         });
 
         function setGraphFormat(type) {
@@ -549,7 +635,7 @@
 
                 $('.yaxis-text').html('Play count');
             } else {
-                yaxis_format = function() { return moment.duration(this.value, 'seconds').format("m [mins]"); };
+                yaxis_format = function() { return moment.duration(this.value, 'seconds').format("H [h] m [m]"); };
                 tooltip_format = function() {
                                     if (moment(this.x, 'X').isValid() && (this.x > 946684800)) {
                                         var s = '<b>'+ moment(this.x).format("ddd MMM D") +'</b>';

data/interfaces/default/history.html

@@ -1,42 +1,69 @@
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
-<link rel="stylesheet" href="interfaces/default/css/dataTables.colVis.css">
-<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
+<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
+<link rel="stylesheet" href="${http_root}css/plexpy-dataTables.css">
 </%def>
 
 <%def name="body()">
-
 <div class='container-fluid'>
     <div class='table-card-header'>
         <div class="header-bar">
             <span><i class="fa fa-history"></i> History</span>
         </div>
         <div class="button-bar">
-            <div class="colvis-button-bar hidden-xs"></div>
-            <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                <i class="fa fa-trash-o"></i> Delete mode
-            </button>
+            % if _session['user_group'] == 'admin':
             <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
+            <div class="btn-group">
+                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
+                    <i class="fa fa-trash-o"></i> Delete mode
+                </button>&nbsp
+            </div>
+            % endif
+            % if _session['user_group'] == 'admin':
+            <div class="btn-group" id="user-selection">
+                <label>
+                    <select name="history-user" id="history-user" class="btn" style="color: inherit;">
+                        <option value="">All Users</option>
+                        <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
+                    </select>
+                </label>
+            </div>
+            % endif
+            <div class="btn-group" data-toggle="buttons" id="media_type-selection">
+                <label class="btn btn-dark active">
+                    <input type="radio" name="media_type-filter" id="history-all" value="" autocomplete="off"> All
+                </label>
+                <label class="btn btn-dark">
+                    <input type="radio" name="media_type-filter" id="history-movies" value="movie" autocomplete="off"> Movies
+                </label>
+                <label class="btn btn-dark">
+                    <input type="radio" name="media_type-filter" id="history-tv_shows" value="episode" autocomplete="off"> TV Shows
+                </label>
+                <label class="btn btn-dark">
+                    <input type="radio" name="media_type-filter" id="history-music" value="track" autocomplete="off"> Music
+                </label>
+            </div>
+            <div class="btn-group colvis-button-bar"></div>
         </div>
     </div>
-    <div class='table-card-back'>
-        <table class="display" id="history_table" width="100%">
+    <div class="table-card-back">
+        <table class="display history_table" id="history_table" width="100%">
             <thead>
             <tr>
-                <th align='left' id="delete_row">Delete</th>
-                <th align='left' id="time">Time</th>
-                <th align='left' id="friendly_name">User</th>
-                <th align='left' id="ip_address">IP Address</th>
-                <th align='left' id="platform">Platform</th>
-                <th align='left' id="device">Player</th>
-                <th align='left' id="title">Title</th>
-                <th align='left' id="started">Started</th>
-                <th align='left' id="paused_counter">Paused</th>
-                <th align='left' id="stopped">Stopped</th>
-                <th align='left' id="duration">Duration</th>
-                <th align='left' id="percent_complete"></th>
+                <th align="left" id="delete_row">Delete</th>
+                <th align="left" id="time">Time</th>
+                <th align="left" id="friendly_name">User</th>
+                <th align="left" id="ip_address">IP Address</th>
+                <th align="left" id="platform">Platform</th>
+                <th align="left" id="device">Player</th>
+                <th align="left" id="title">Title</th>
+                <th align="left" id="started">Started</th>
+                <th align="left" id="paused_counter">Paused</th>
+                <th align="left" id="stopped">Stopped</th>
+                <th align="left" id="duration">Duration</th>
+                <th align="left" id="percent_complete"></th>
             </tr>
             </thead>
             <tbody>
@@ -46,7 +73,7 @@
         </div>
         <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
         </div>
-        <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+        <div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -69,22 +96,40 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
-<script src="interfaces/default/js/dataTables.colVis.js"></script>
-<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
-<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
-<script src="interfaces/default/js/moment-with-locale.js"></script>
-<script src="interfaces/default/js/tables/history_table.js"></script>
+<script src="${http_root}js/jquery.dataTables.min.js"></script>
+<script src="${http_root}js/dataTables.colVis.js"></script>
+<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
+<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
+<script src="${http_root}js/moment-with-locale.js"></script>
+<script src="${http_root}js/tables/history_table.js"></script>
 <script>
     $(document).ready(function () {
-        function loadHistoryTable(media_type) {
+        // Load user ids and names (for the selector)
+        $.ajax({
+            url: 'get_user_names',
+            type: 'get',
+            dataType: "json",
+            success: function (data) {
+                var select = $('#history-user');
+                data.sort(function (a, b) {
+                    return a.friendly_name.localeCompare(b.friendly_name);
+                });
+                data.forEach(function (item) {
+                    select.append('<option value="' + item.user_id + '">' +
+                        item.friendly_name + '</option>');
+                });
+            }
+        });
+
+        function loadHistoryTable(media_type, selected_user_id) {
             history_table_options.ajax = {
                 url: 'get_history',
                 type: 'post',
                 data: function (d) {
                     return {
-                        'json_data': JSON.stringify(d),
-                        'media_type': media_type
+                        json_data: JSON.stringify(d),
+                        media_type: media_type,
+                        user_id: selected_user_id
                     };
                 }
             }
@@ -94,21 +139,6 @@
 
             clearSearchButton('history_table', history_table);
 
-            $('#history_table_filter').prepend('<div class="btn-group" data-toggle="buttons" id="media_type-selection" style="padding-right: 15px;"> \
-                <label class="btn btn-dark active"> \
-                    <input type="radio" name="media_type-filter" id="history-all" value="all" autocomplete="off"> All \
-                </label> \
-                <label class="btn btn-dark"> \
-                    <input type="radio" name="media_type-filter" id="history-movies" value="movie" autocomplete="off"> Movies \
-                </label> \
-                <label class="btn btn-dark"> \
-                    <input type="radio" name="media_type-filter" id="history-tv_shows" value="episode" autocomplete="off"> TV Shows \
-                </label> \
-                <label class="btn btn-dark"> \
-                    <input type="radio" name="media_type-filter" id="history-music" value="track" autocomplete="off"> Music \
-                </label> \
-            </div>');
-
             $('#media_type-selection').on('change', function () {
                 $('#media_type-selection > label').removeClass('active');
                 selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
@@ -116,19 +146,26 @@
                 media_type = $(selected_filter).val();
                 history_table.draw();
             });
+
+            $('#history-user').on('change', function () {
+                selected_user_id = $(this).val() || null;
+                history_table.draw();
+            });
         }
 
-        var media_type = 'all';
-        loadHistoryTable(media_type);
+        var media_type = null;
+        var selected_user_id = "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
+        loadHistoryTable(media_type, selected_user_id);
 
+        % if _session['user_group'] == 'admin':
         $('#row-edit-mode').on('click', function() {
             $('#row-edit-mode-alert').fadeIn(200);
 
             if ($(this).hasClass('active')) {
                 if (history_to_delete.length > 0) {
                     $('#deleteCount').text(history_to_delete.length);
-                    $('#confirm-modal').modal();
-                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                    $('#confirm-modal-delete').modal();
+                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
                         for (var i = 0; i < history_to_delete.length; i++) {
                             $.ajax({
                                 url: 'delete_history_rows',
@@ -157,6 +194,7 @@
                 });
             }
         });
+        % endif
     });
 </script>
 </%def>

data/interfaces/default/history_table_modal.html

@@ -5,19 +5,19 @@
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
             <h4 class="modal-title" id="myModalLabel">
                 <strong><span id="modal_header_ip_address">
-                    <i class="fa fa-history"></i> History for <span id="date-header">${data}</span>
+                    <i class="fa fa-history"></i> History for <span id="date-header">${data['start_date']}</span>
                 </span></strong>
             </h4>
         </div>
         <div class="modal-body" id="modal-text">
-            <table class="display" id="history_table" width="100%">
+            <table class="display history_table" id="history_table_modal" width="100%">
                 <thead>
                 <tr>
-                    <th align='left' id="started">Started</th>
-                    <th align='left' id="stopped">Stopped</th>
-                    <th align='left' id="friendly_name">User</th>
-                    <th align='left' id="player">Player</th>
-                    <th align='left' id="title">Title</th>
+                    <th align="left" id="started">Started</th>
+                    <th align="left" id="stopped">Stopped</th>
+                    <th align="left" id="friendly_name">User</th>
+                    <th align="left" id="player">Player</th>
+                    <th align="left" id="title">Title</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -29,24 +29,28 @@
 </div>
 <div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
 </div>
-<script src="interfaces/default/js/tables/history_table_modal.js"></script>
+<script src="${http_root}js/tables/history_table_modal.js"></script>
 <script>
     $(document).ready(function() {
-        $('#date-header').html(moment('${data}','YYYY-MM-DD').format('ddd MMM Do YYYY'));
+        $('#date-header').html(moment('${data["start_date"]}','YYYY-MM-DD').format('ddd MMM Do YYYY'));
         history_table_modal_options.ajax = {
-            "url": "get_history",
-            type: "post",
+            url: 'get_history',
+            type: 'post',
             data: function ( d ) {
-                return { 'json_data': JSON.stringify( d ),
-                         'grouping': false,
-                         'start_date': '${data}'
-                       };
+                return {
+                    json_data: JSON.stringify(d),
+                    grouping: false,
+                    user_id: "${data['user_id']}",
+                    start_date: "${data['start_date']}",
+                    media_type: "${data.get('media_type')}",
+                    transcode_decision: "${data.get('transcode_decision')}"
+            };
             }
         }
 
-        history_table = $('#history_table').DataTable(history_table_modal_options);
+        history_table = $('#history_table_modal').DataTable(history_table_modal_options);
         
-        clearSearchButton('history_table', history_table);
+        clearSearchButton('history_table_modal', history_table);
 
         // Move #info-modal to parent container
         if (!($('#history-modal').next().is('#info-modal'))) {

data/interfaces/default/home_stats.html

@@ -39,11 +39,16 @@ 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' or 'last_watched' ==
-platform_type           Returns the platform name for the associated stat.
+player                  Returns the player name for the associated stat.
 
 == Only if 'stat_id' is 'last_watched' ==
 last_watch              Returns the time the media item was last watched.
 
+== Only if 'stat_id' is 'most_concurrent' ==
+count                   Returns the count of the most concurrent streams.
+started                 Returns the start time of the most concurrent streams.
+stopped                 Returns the stop time of the most concurrent streams.
+
 DOCUMENTATION :: END
 </%doc>
 
@@ -65,8 +70,8 @@ DOCUMENTATION :: END
 %>
 
 % if data:
-% if data[0]['stat_id']:
 <ul class="list-unstyled">
+    % if any(top_stat['rows'] for top_stat in data):
     % for top_stat in data:
     % if top_stat['stat_id'] == 'top_tv' and top_stat['rows']:
     <div class="home-platforms-instance">
@@ -77,9 +82,13 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        % if top_stat['rows'][0]['rating_key']:
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
+                        % else:
+                        ${top_stat['rows'][0]['title']}
+                        % endif
                     </h4>
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
@@ -89,31 +98,41 @@ DOCUMENTATION :: END
                     % endif
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            % if top_stat['rows'][0]['rating_key']:
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['grandparent_thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
                 </div>
                 % else:
                 <div class="home-platforms-instance-poster">
-                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                    <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                 </div>
                 % endif
             </a>
-            %if len(top_stat['rows']) > 1:
+            % else:
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+            </div>
+            % endif
+            % if len(top_stat['rows']) > 1:
             <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
             <ul class="list-unstyled">
                 <div class="slider">
                     <div class="home-platforms-instance-list">
                         % for row in top_stat['rows']:
-                        %if loop.index > 0:
+                        % if loop.index > 0:
                         <li>
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        % if top_stat['rows'][loop.index]['rating_key']:
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
+                                        % else:
+                                        ${top_stat['rows'][loop.index]['title']}
+                                        % endif
                                     </h5>
                                 </div>
                                 <div class="home-platforms-instance-list-playcount">
@@ -125,17 +144,23 @@ DOCUMENTATION :: END
                                     % endif
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
-                            % if top_stat['rows'][loop.index]['grandparent_thumb']:
-                            <div class="home-platforms-instance-list-poster">
-                                <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
-                            </div>
+                            % if top_stat['rows'][loop.index]['rating_key']:
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                % if top_stat['rows'][loop.index]['grandparent_thumb']:
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
+                                </div>
+                                % else:
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+                                </div>
+                                % endif
+                            </a>
                             % else:
-                            <div class="home-platforms-instance-poster2">
-                                <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                            <div class="home-platforms-instance-list-poster">
+                                <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                             </div>
                             % endif
-                            </a>
                             <div class="home-platforms-instance-list-number">
                                 <h4>${loop.index + 1}</h4>
                             </div>
@@ -157,39 +182,53 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        % if top_stat['rows'][0]['rating_key']:
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
+                        % else:
+                        ${top_stat['rows'][0]['title']}
+                        % endif
                     </h4>
                     <h3>${top_stat['rows'][0]['users_watched']}</h3>
                     <p> users</p>
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            % if top_stat['rows'][0]['rating_key']:
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['grandparent_thumb'] != '':
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
                 </div>
                 % else:
                 <div class="home-platforms-instance-poster">
-                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                    <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                 </div>
                 % endif
             </a>
-            %if len(top_stat['rows']) > 1:
+            % else:
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+            </div>
+            % endif
+            % if len(top_stat['rows']) > 1:
             <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
             <ul class="list-unstyled">
                 <div class="slider">
                     <div class="home-platforms-instance-list">
                         % for row in top_stat['rows']:
-                        %if loop.index > 0:
+                        % if loop.index > 0:
                         <li>
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        % if top_stat['rows'][loop.index]['rating_key']:
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
+                                        % else:
+                                        ${top_stat['rows'][loop.index]['title']}
+                                        % endif
                                     </h5>
                                 </div>
                                 <div class="home-platforms-instance-list-playcount">
@@ -197,17 +236,23 @@ DOCUMENTATION :: END
                                     <p> users</p>
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            % if top_stat['rows'][loop.index]['rating_key']:
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['grandparent_thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
                                 </div>
                                 % else:
-                                <div class="home-platforms-instance-poster2">
-                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                                 </div>
                                 % endif
                             </a>
+                            % else:
+                            <div class="home-platforms-instance-list-poster">
+                                <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+                            </div>
+                            % endif
                             <div class="home-platforms-instance-list-number">
                                 <h4>${loop.index + 1}</h4>
                             </div>
@@ -229,9 +274,13 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        % if top_stat['rows'][0]['rating_key']:
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
+                        % else:
+                        ${top_stat['rows'][0]['title']}
+                        % endif
                     </h4>
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
@@ -241,31 +290,41 @@ DOCUMENTATION :: END
                     % endif
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            % if top_stat['rows'][0]['rating_key']:
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['thumb']}&width=300&height=450&fallback=poster);"></div>
                 </div>
                 % else:
                 <div class="home-platforms-instance-poster">
-                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                    <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                 </div>
                 % endif
             </a>
-            %if len(top_stat['rows']) > 1:
+            % else:
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+            </div>
+            % endif
+            % if len(top_stat['rows']) > 1:
             <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
             <ul class="list-unstyled">
                 <div class="slider">
                     <div class="home-platforms-instance-list">
                         % for row in top_stat['rows']:
-                        %if loop.index > 0:
+                        % if loop.index > 0:
                         <li>
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        % if top_stat['rows'][loop.index]['rating_key']:
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
+                                        % else:
+                                        ${top_stat['rows'][loop.index]['title']}
+                                        % endif
                                     </h5>
                                 </div>
                                 <div class="home-platforms-instance-list-playcount">
@@ -277,17 +336,23 @@ DOCUMENTATION :: END
                                     % endif
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            % if top_stat['rows'][loop.index]['rating_key']:
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['thumb']}&width=300&height=450&fallback=poster);"></div>
                                 </div>
                                 % else:
-                                <div class="home-platforms-instance-poster2">
-                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                                 </div>
                                 % endif
                             </a>
+                            % else:
+                            <div class="home-platforms-instance-list-poster">
+                                <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+                            </div>
+                            % endif
                             <div class="home-platforms-instance-list-number">
                                 <h4>${loop.index + 1}</h4>
                             </div>
@@ -309,39 +374,53 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        % if top_stat['rows'][0]['rating_key']:
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
+                        % else:
+                        ${top_stat['rows'][0]['title']}
+                        % endif
                     </h4>
                     <h3>${top_stat['rows'][0]['users_watched']}</h3>
                     <p> users</p>
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            % if top_stat['rows'][0]['rating_key']:
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['thumb']}&width=300&height=450&fallback=poster);"></div>
                 </div>
                 % else:
                 <div class="home-platforms-instance-poster">
-                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                    <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                 </div>
                 % endif
             </a>
-            %if len(top_stat['rows']) > 1:
+            % else:
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+            </div>
+            % endif
+            % if len(top_stat['rows']) > 1:
             <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
             <ul class="list-unstyled">
                 <div class="slider">
                     <div class="home-platforms-instance-list">
                         % for row in top_stat['rows']:
-                        %if loop.index > 0:
+                        % if loop.index > 0:
                         <li>
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        % if top_stat['rows'][loop.index]['rating_key']:
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
+                                        % else:
+                                        ${top_stat['rows'][loop.index]['title']}
+                                        % endif
                                     </h5>
                                 </div>
                                 <div class="home-platforms-instance-list-playcount">
@@ -349,17 +428,23 @@ DOCUMENTATION :: END
                                     <p> users</p>
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            % if top_stat['rows'][loop.index]['rating_key']:
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['thumb']}&width=300&height=450&fallback=poster);"></div>
                                 </div>
                                 % else:
-                                <div class="home-platforms-instance-poster2">
-                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                                 </div>
                                 % endif
                             </a>
+                            % else:
+                            <div class="home-platforms-instance-list-poster">
+                                <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+                            </div>
+                            % endif
                             <div class="home-platforms-instance-list-number">
                                 <h4>${loop.index + 1}</h4>
                             </div>
@@ -381,9 +466,13 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        % if top_stat['rows'][0]['rating_key']:
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
+                        % else:
+                        ${top_stat['rows'][0]['title']}
+                        % endif
                     </h4>
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
@@ -393,31 +482,41 @@ DOCUMENTATION :: END
                     % endif
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            % if top_stat['rows'][0]['rating_key']:
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['grandparent_thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
                 </div>
                 % else:
                 <div class="home-platforms-instance-poster">
-                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                    <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                 </div>
                 % endif
             </a>
-            %if len(top_stat['rows']) > 1:
+            % else:
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+            </div>
+            % endif
+            % if len(top_stat['rows']) > 1:
             <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
             <ul class="list-unstyled">
                 <div class="slider">
                     <div class="home-platforms-instance-list">
                         % for row in top_stat['rows']:
-                        %if loop.index > 0:
+                        % if loop.index > 0:
                         <li>
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        % if top_stat['rows'][loop.index]['rating_key']:
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
+                                        % else:
+                                        ${top_stat['rows'][loop.index]['title']}
+                                        % endif
                                     </h5>
                                 </div>
                                 <div class="home-platforms-instance-list-playcount">
@@ -429,17 +528,23 @@ DOCUMENTATION :: END
                                     % endif
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            % if top_stat['rows'][loop.index]['rating_key']:
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['grandparent_thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
                                 </div>
                                 % else:
-                                <div class="home-platforms-instance-poster2">
-                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                                 </div>
                                 % endif
                             </a>
+                            % else:
+                            <div class="home-platforms-instance-list-poster">
+                                <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+                            </div>
+                            % endif
                             <div class="home-platforms-instance-list-number">
                                 <h4>${loop.index + 1}</h4>
                             </div>
@@ -461,39 +566,53 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-playcount">
                     <h4>
-                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                        % if top_stat['rows'][0]['rating_key']:
+                        <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
+                        % else:
+                        ${top_stat['rows'][0]['title']}
+                        % endif
                     </h4>
                     <h3>${top_stat['rows'][0]['users_watched']}</h3>
                     <p> users</p>
                 </div>
             </div>
-            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+            % if top_stat['rows'][0]['rating_key']:
+            <a href="info?rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['grandparent_thumb'] != '':
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
                 </div>
                 % else:
                 <div class="home-platforms-instance-poster">
-                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                    <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                 </div>
                 % endif
             </a>
-            %if len(top_stat['rows']) > 1:
+            % else:
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+            </div>
+            % endif
+            % if len(top_stat['rows']) > 1:
             <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
             <ul class="list-unstyled">
                 <div class="slider">
                     <div class="home-platforms-instance-list">
                         % for row in top_stat['rows']:
-                        %if loop.index > 0:
+                        % if loop.index > 0:
                         <li>
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        % if top_stat['rows'][loop.index]['rating_key']:
+                                        <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
+                                        % else:
+                                        ${top_stat['rows'][loop.index]['title']}
+                                        % endif
                                     </h5>
                                 </div>
                                 <div class="home-platforms-instance-list-playcount">
@@ -501,17 +620,23 @@ DOCUMENTATION :: END
                                     <p> users</p>
                                 </div>
                             </div>
-                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            % if top_stat['rows'][loop.index]['rating_key']:
+                            <a href="info?rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['grandparent_thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
                                 </div>
                                 % else:
-                                <div class="home-platforms-instance-poster2">
-                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                                 </div>
                                 % endif
                             </a>
+                            % else:
+                            <div class="home-platforms-instance-list-poster">
+                                <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+                            </div>
+                            % endif
                             <div class="home-platforms-instance-list-number">
                                 <h4>${loop.index + 1}</h4>
                             </div>
@@ -535,11 +660,11 @@ DOCUMENTATION :: END
                     <h4>
                         % if top_stat['rows'][0]['user_id']:
                         <a href="user?user_id=${top_stat['rows'][0]['user_id']}" title="${top_stat['rows'][0]['friendly_name']}">
-                        % else:
-                        <a href="user?user=${top_stat['rows'][0]['user']}" title="${top_stat['rows'][0]['friendly_name']}">
-                        % endif
                             ${top_stat['rows'][0]['friendly_name']}
                         </a>
+                        % else:
+                        ${top_stat['rows'][0]['friendly_name']}
+                        % endif
                     </h4>
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
@@ -551,8 +676,6 @@ DOCUMENTATION :: END
             </div>
             % if top_stat['rows'][0]['user_id']:
             <a href="user?user_id=${top_stat['rows'][0]['user_id']}" title="${top_stat['rows'][0]['friendly_name']}">
-            % else:
-            <a href="user?user=${top_stat['rows'][0]['user']}" title="${top_stat['rows'][0]['friendly_name']}">
             % endif
                 % if top_stat['rows'][0]['user_thumb'] != '':
                 <div class="home-platforms-instance-poster">
@@ -560,28 +683,30 @@ DOCUMENTATION :: END
                 </div>
                 % else:
                 <div class="home-platforms-instance-poster">
-                    <div class="home-platforms-instance-oval" style="background-image: url(interfaces/default/images/gravatar-default.png);"></div>
+                    <div class="home-platforms-instance-oval" style="background-image: url(${http_root}images/gravatar-default.png);"></div>
                 </div>
                 % endif
+            % if top_stat['rows'][0]['user_id']:
             </a>
-            %if len(top_stat['rows']) > 1:
+            % endif
+            % if len(top_stat['rows']) > 1:
             <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
             <ul class="list-unstyled">
                 <div class="slider">
                     <div class="home-platforms-instance-list">
                         % for row in top_stat['rows']:
-                        %if loop.index > 0:
+                        % if loop.index > 0:
                         <li>
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
                                         % if top_stat['rows'][loop.index]['user_id']:
                                         <a href="user?user_id=${top_stat['rows'][loop.index]['user_id']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
-                                        % else:
-                                        <a href="user?user=${top_stat['rows'][loop.index]['user']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
-                                        % endif
                                             ${top_stat['rows'][loop.index]['friendly_name']}
                                         </a>
+                                        % else:
+                                        ${top_stat['rows'][loop.index]['friendly_name']}
+                                        % endif
                                     </h5>
                                 </div>
                                 <div class="home-platforms-instance-list-playcount">
@@ -595,8 +720,6 @@ DOCUMENTATION :: END
                             </div>
                             % if top_stat['rows'][loop.index]['user_id']:
                             <a href="user?user_id=${top_stat['rows'][loop.index]['user_id']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
-                            % else:
-                            <a href="user?user=${top_stat['rows'][loop.index]['user']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
                             % endif
                                 % if top_stat['rows'][loop.index]['user_thumb'] != '':
                                 <div class="home-platforms-instance-poster">
@@ -604,10 +727,12 @@ DOCUMENTATION :: END
                                 </div>
                                 % else:
                                 <div class="home-platforms-instance-poster">
-                                    <div class="home-platforms-instance-list-oval" style="background-image: url(interfaces/default/images/gravatar-default.png);"></div>
+                                    <div class="home-platforms-instance-list-oval" style="background-image: url(${http_root}images/gravatar-default.png);"></div>
                                 </div>
                                 % endif
-                                </a>
+                            % if top_stat['rows'][loop.index]['user_id']:
+                            </a>
+                            % endif
                             <div class="home-platforms-instance-list-number">
                                 <h4>${loop.index + 1}</h4>
                             </div>
@@ -639,16 +764,16 @@ DOCUMENTATION :: END
             </div>
             <div id="platform-stat" class="home-platforms-instance-poster" title="${top_stat['rows'][0]['platform_type']}">
                 <script>
-                    $("#platform-stat").html("<div class='home-platforms-instance-box' style='background-image: url(" + getPlatformImagePath('${top_stat['rows'][0]['platform_type']}') + ");'>");
+                    $("#platform-stat").html("<div class='home-platforms-instance-box' style='background-image: url(" + getPlatformImagePath("${top_stat['rows'][0]['platform_type']}") + ");'>");
                 </script>
             </div>
-            %if len(top_stat['rows']) > 1:
+            % if len(top_stat['rows']) > 1:
             <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
             <ul class="list-unstyled">
                 <div class="slider">
                     <div class="home-platforms-instance-list">
                         % for row in top_stat['rows']:
-                        %if loop.index > 0:
+                        % if loop.index > 0:
                         <li>
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
@@ -667,7 +792,7 @@ DOCUMENTATION :: END
                             </div>
                             <div class="home-platforms-instance-poster" id="home-platforms-instance-poster-${loop.index + 1}" title="${top_stat['rows'][loop.index]['platform_type']}">
                                 <script>
-                                    $("#home-platforms-instance-poster-${loop.index + 1}").html("<div class='home-platforms-instance-list-box' style='background-image: url(" + getPlatformImagePath('${top_stat['rows'][loop.index]['platform_type']}') + ");'>");
+                                    $("#home-platforms-instance-poster-${loop.index + 1}").html("<div class='home-platforms-instance-list-box' style='background-image: url(" + getPlatformImagePath("${top_stat['rows'][loop.index]['platform_type']}") + ");'>");
                                 </script>
                             </div>
                             <div class="home-platforms-instance-list-number">
@@ -691,85 +816,105 @@ DOCUMENTATION :: END
                 </div>
                 <div class="home-platforms-instance-last-user">
                     <h4>
-                        <a href="info?source=history&item_id=${top_stat['rows'][0]['row_id']}" title="${top_stat['rows'][0]['title']}">
+                        % if top_stat['rows'][0]['rating_key']:
+                        <a href="info?source=history&rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
+                        % else:
+                        ${top_stat['rows'][0]['title']}
+                        % endif
                     </h4>
                     <h5>
                         % if top_stat['rows'][0]['user_id']:
                         <a href="user?user_id=${top_stat['rows'][0]['user_id']}" title="${top_stat['rows'][0]['friendly_name']}">
-                        % else:
-                        <a href="user?user=${top_stat['rows'][0]['user']}" title="${top_stat['rows'][0]['friendly_name']}">
-                        % endif
                             ${top_stat['rows'][0]['friendly_name']}
                         </a>
+                        % else:
+                        ${top_stat['rows'][0]['friendly_name']}
+                        % endif
                     </h5>
                     <p>
                         <span id="last-watch-stat">
                             <script>
                                 $('#last-watch-stat').text(moment(${top_stat['rows'][0]['last_watch']},"X").format(date_format));
                             </script>
-                        </span> - ${top_stat['rows'][0]['platform_type']}
+                        </span> - ${top_stat['rows'][0]['player']}
                     </p>
                 </div>
             </div>
-            <a href="info?source=history&item_id=${top_stat['rows'][0]['row_id']}" title="${top_stat['rows'][0]['title']}">
+            % if top_stat['rows'][0]['rating_key']:
+            <a href="info?source=history&rating_key=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
                 % if top_stat['rows'][0]['thumb']:
                 <div class="home-platforms-instance-poster">
                     <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['thumb']}&width=300&height=450&fallback=poster);"></div>
                 </div>
                 % else:
                 <div class="home-platforms-instance-poster">
-                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                    <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                 </div>
                 % endif
             </a>
-            %if len(top_stat['rows']) > 1:
+            % else:
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+            </div>
+            % endif
+            % if len(top_stat['rows']) > 1:
             <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
             <ul class="list-unstyled">
                 <div class="slider">
                     <div class="home-platforms-instance-list">
                         % for row in top_stat['rows']:
-                        %if loop.index > 0:
+                        % if loop.index > 0:
                         <li>
                             <div class="home-platforms-instance-list-info">
                                 <div class="home-platforms-instance-list-name">
                                     <h5>
-                                        <a href="info?source=history&item_id=${top_stat['rows'][loop.index]['row_id']}" title="${top_stat['rows'][loop.index]['title']}">
+                                        % if top_stat['rows'][loop.index]['rating_key']:
+                                        <a href="info?source=history&rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                             ${top_stat['rows'][loop.index]['title']}
                                         </a>
+                                        % else:
+                                        ${top_stat['rows'][loop.index]['title']}
+                                        % endif
                                     </h5>
                                 </div>
                                 <div class="home-platforms-instance-list-last-user">
                                     <h5>
                                         % if top_stat['rows'][loop.index]['user_id']:
                                         <a href="user?user_id=${top_stat['rows'][loop.index]['user_id']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
-                                        % else:
-                                        <a href="user?user=${top_stat['rows'][loop.index]['user']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
-                                        % endif
                                             ${top_stat['rows'][loop.index]['friendly_name']}
                                         </a>
+                                        % else:
+                                        ${top_stat['rows'][loop.index]['friendly_name']}
+                                        % endif
                                     </h5>
                                     <p>
                                         <span id="home-platforms-instance-list-last-watch-${loop.index + 1}">
                                             <script>
                                                 $('#home-platforms-instance-list-last-watch-${loop.index + 1}').text(moment(${top_stat['rows'][loop.index]['last_watch']},"X").format(date_format));
                                             </script>
-                                        </span> - ${top_stat['rows'][loop.index]['platform_type']}
+                                        </span> - ${top_stat['rows'][loop.index]['player']}
                                     </p>
                                 </div>
                             </div>
-                            <a href="info?source=history&item_id=${top_stat['rows'][loop.index]['row_id']}" title="${top_stat['rows'][loop.index]['title']}">
+                            % if top_stat['rows'][loop.index]['rating_key']:
+                            <a href="info?source=history&rating_key=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
                                 % if top_stat['rows'][loop.index]['thumb']:
                                 <div class="home-platforms-instance-list-poster">
                                     <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['thumb']}&width=300&height=450&fallback=poster);"></div>
                                 </div>
                                 % else:
-                                <div class="home-platforms-instance-poster2">
-                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
                                 </div>
                                 % endif
                             </a>
+                            % else:
+                            <div class="home-platforms-instance-list-poster">
+                                <div class="home-platforms-list-poster-face" style="background-image: url(${http_root}images/poster.png);"></div>
+                            </div>
+                            % endif
                             <div class="home-platforms-instance-list-number">
                                 <h4>${loop.index + 1}</h4>
                             </div>
@@ -782,8 +927,74 @@ DOCUMENTATION :: END
             % endif
         </li>
     </div>
+    % elif top_stat['stat_id'] == 'most_concurrent' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Most Concurrent Streams</h4>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
+                        <span id="most-concurrent-start">
+                            <script>
+                                $('#most-concurrent-start').text(moment(${top_stat['rows'][0]['started']},"X").format(date_format + ' ' + time_format));
+                            </script>
+                        </span>
+                    </h4>
+                    <h3>${top_stat['rows'][0]['count']}</h3>
+                    <p> streams</p>
+                </div>
+            </div>
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-instance-box" style="background-image: url(${http_root}images/home-stat_most-concurrent.png);"></div>
+            </div>
+            % if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        % if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5>
+                                        ${top_stat['rows'][loop.index]['title']}
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-playcount">
+                                    <h3>${top_stat['rows'][loop.index]['count']}</h3>
+                                    <p> streams
+                                        % if top_stat['rows'][loop.index]['started']:
+                                        - <span id="most-concurrent-start-${loop.index + 1}">
+                                            <script>
+                                                $('#most-concurrent-start-${loop.index + 1}').text(moment(${top_stat['rows'][loop.index]['started']},"X").format(date_format + ' ' + time_format));
+                                            </script>
+                                        </span>
+                                        % else:
+                                        - N/A
+                                        % endif
+                                    </p>
+                                </div>
+                            </div>
+                            <div class="home-platforms-instance-poster">
+                                <div class="home-platforms-instance-list-box" style="background-image: url(${http_root}images/home-stat_most-concurrent.png);"></div>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
+                    </div>
+                </div>
+            </ul>
+            % endif
+        </li>
+    </div>
     % endif
     % endfor
+    % else:
+    <div class="text-muted">No stats to show for the selected period.</div><br>
+    % endif
 </ul>
 <script>
     var topZIndex = 2;
@@ -799,9 +1010,5 @@ DOCUMENTATION :: END
     });
 </script>
 % else:
-<div class="text-muted">No stats for selected period.</div><br>
-% endif
-% else:
-<div class="text-muted">Unable to retrieve data from database. Please check your <a href="settings">settings</a>.
-</div><br>
+<div class="text-muted">No stats to show for the selected period.</div><br>
 % endif