diff --git a/Tautulli.py b/Tautulli.py index 65ad9a93..25d6eebc 100755 --- a/Tautulli.py +++ b/Tautulli.py @@ -106,6 +106,9 @@ def main(): logger.initLogger(console=not plexpy.QUIET, log_dir=False, verbose=plexpy.VERBOSE) + if os.getenv('TAUTULLI_DOCKER', False) == 'True': + plexpy.DOCKER = True + if args.dev: plexpy.DEV = True logger.debug(u"Tautulli is running in the dev environment.") diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css index 5791371e..8bb82543 100644 --- a/data/interfaces/default/css/tautulli.css +++ b/data/interfaces/default/css/tautulli.css @@ -676,7 +676,9 @@ textarea.form-control:focus { color: #F9AA03; margin: 5px 40px 5px 0; } -.form-control[readonly] { +.form-control[disabled], +.form-control[readonly], +fieldset[disabled] .form-control { background-color: #555; } .form-control[readonly]:focus { @@ -2151,6 +2153,10 @@ div.advanced-setting { li.advanced-setting { border-left: 1px solid #cc7b19; } +.docker-setting { + color: #cc7b19; + margin-left: 10px; +} .user-info-wrapper { } .user-info-poster-face { @@ -4174,4 +4180,4 @@ a[data-tab-destination] { position: absolute; top: 0; z-index: 9999; -} \ No newline at end of file +} diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 0a82c28f..81ed0006 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -7,6 +7,9 @@ from plexpy import common, notifiers, newsletters from plexpy.helpers import anon_url, checked + docker_setting = 'disabled' if plexpy.DOCKER else '' + docker_msg = '(Controlled by Docker Container)' if plexpy.DOCKER else '' + available_notification_agents = sorted(notifiers.available_notification_agents(), key=lambda k: k['label'].lower()) available_newsletter_agents = sorted(newsletters.available_newsletter_agents(), key=lambda k: k['label'].lower()) %> @@ -230,12 +233,12 @@ % if plexpy.INSTALL_TYPE == 'git':
The git tracking remote and branch (default "origin/master"). Select to switch the git branch (requires restart).
Optional: The path to your git environment variable. Leave blank for default.
@@ -445,19 +448,19 @@Launch browser pointed to Tautulli on startup.
localhost or an IP address to bind the web server to. Default 0.0.0.0 to bind to all interfaces.
Optional: Enter the full path to your custom newsletter templates folder. Leave blank for default.
Enter the full path to where newsletter files will be saved.
@@ -1233,10 +1236,10 @@