mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-08-19 21:03:21 -07:00
Merge pull request #139 from JonnyWong16/miscellaneous-fixes
Create body container so scrollbar is beneath navbar
This commit is contained in:
drzoidberg33
commit
88a651645a
3 changed files with 78 additions and 14 deletions
|
|
@ -1,4 +1,4 @@
|
|||
<%
|
||||
<%
|
||||
import plexpy
|
||||
from plexpy import version
|
||||
%>
|
||||
|
|
@ -52,7 +52,7 @@ 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="40px">
|
||||
<img alt="PlexPy" src="interfaces/default/images/logo-plexpy@2x.png" height="40">
|
||||
</a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse navbar-right" id="navbar-collapse-1">
|
||||
|
|
@ -99,7 +99,9 @@ from plexpy import version
|
|||
</div>
|
||||
|
||||
${next.headerIncludes()}
|
||||
${next.body()}
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -39,6 +39,9 @@ img {
|
|||
}
|
||||
.navbar {
|
||||
background: #000;
|
||||
-webkit-box-shadow: 0 0 0 3px rgba(0,0,0,.2);
|
||||
-moz-box-shadow: 0 0 0 3px rgba(0,0,0,.2);
|
||||
box-shadow: 0 0 0 3px rgba(0,0,0,.2);
|
||||
}
|
||||
.navbar-brand {
|
||||
padding: 5px 5px;
|
||||
|
|
@ -1167,6 +1170,34 @@ a .season-episodes-card-overlay:hover {
|
|||
left: 8px;
|
||||
bottom: 5px;
|
||||
}
|
||||
.settings-alert {
|
||||
float: left;
|
||||
padding: 0;
|
||||
margin: 5px 0;
|
||||
border: 0;
|
||||
position: relative;
|
||||
}
|
||||
.settings-alert ul {
|
||||
padding: 0;
|
||||
}
|
||||
.settings-alert ul li {
|
||||
list-style: none;
|
||||
padding: 5px 12px 5px 35px;
|
||||
margin: 0;
|
||||
border: 1px solid #ebccd1;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.settings-alert ul li:before {
|
||||
content: "\f071";
|
||||
font-family: FontAwesome;
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
text-decoration: inherit;
|
||||
font-size: 18px;
|
||||
position: absolute;
|
||||
top: 5px;
|
||||
left: 12px;
|
||||
}
|
||||
.user-info-wrapper {
|
||||
height: 113px;
|
||||
}
|
||||
|
|
@ -1824,7 +1855,29 @@ a .home-platforms-instance-box:hover {
|
|||
position: relative;
|
||||
margin-right: 3px;
|
||||
}
|
||||
|
||||
#updatebar a:hover {
|
||||
color: #F9AA03;
|
||||
}
|
||||
.body-container {
|
||||
position: absolute;
|
||||
top: 50px;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
|
||||
}
|
||||
::-webkit-scrollbar {
|
||||
width: 15px;
|
||||
}
|
||||
::-webkit-scrollbar-track {
|
||||
background-color: rgba(0,0,0,.2);
|
||||
}
|
||||
::-webkit-scrollbar-thumb {
|
||||
min-height: 50px;
|
||||
background-color: rgba(255,255,255,.15);
|
||||
border: 3px solid transparent;
|
||||
border-radius: 8px;
|
||||
background-clip: padding-box;
|
||||
}
|
||||
|
|
@ -91,8 +91,9 @@ available_notification_agents = notifiers.available_notification_agents()
|
|||
<label for="home_stats_length">Time Frame</label>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="home_stats_length" name="home_stats_length" value="${config['home_stats_length']}" size="3" data-parsley-min="0" data-parsley-trigger="change" required>
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="home_stats_length" name="home_stats_length" value="${config['home_stats_length']}" size="3" data-parsley-min="0" data-parsley-trigger="change" data-parsley-errors-container="#home_stats_length_error" required>
|
||||
</div>
|
||||
<div id="home_stats_length_error" class="alert alert-danger settings-alert"></div>
|
||||
</div>
|
||||
<p class="help-block">Specify the number of days for the statistics on the home page. Default is 30 days.</p>
|
||||
</div>
|
||||
|
|
@ -122,8 +123,9 @@ available_notification_agents = notifiers.available_notification_agents()
|
|||
<label for="http_port">HTTP Port</label>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="http_port" name="http_port" value="${config['http_port']}" data-parsley-trigger="change" required>
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="http_port" name="http_port" value="${config['http_port']}" data-parsley-trigger="change" data-parsley-errors-container="#http_port_error" required>
|
||||
</div>
|
||||
<div id="http_port_error" class="alert alert-danger settings-alert"></div>
|
||||
</div>
|
||||
<p class="help-block">Port to bind web server to. Note that ports below 1024 may require root.</p>
|
||||
</div>
|
||||
|
|
@ -223,8 +225,9 @@ available_notification_agents = notifiers.available_notification_agents()
|
|||
<label for="pms_port">Plex Port</label>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<input data-parsley-type="integer" class="pms-settings form-control" type="text" id="pms_port" name="pms_port" value="${config['pms_port']}" size="30" data-parsley-trigger="change" required>
|
||||
<input data-parsley-type="integer" class="pms-settings form-control" type="text" id="pms_port" name="pms_port" value="${config['pms_port']}" size="30" data-parsley-trigger="change" data-parsley-errors-container="#pms_port_error" required>
|
||||
</div>
|
||||
<div id="pms_port_error" class="alert alert-danger settings-alert"></div>
|
||||
</div>
|
||||
<p class="help-block">Port that Plex Media Server is listening on.</p>
|
||||
</div>
|
||||
|
|
@ -286,8 +289,9 @@ available_notification_agents = notifiers.available_notification_agents()
|
|||
<label for="refresh_users_interval">User list Refresh Interval</label>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="refresh_users_interval" name="refresh_users_interval" value="${config['refresh_users_interval']}" size="5" data-parsley-range="[1,24]" data-parsley-trigger="change" required>
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="refresh_users_interval" name="refresh_users_interval" value="${config['refresh_users_interval']}" size="5" data-parsley-range="[1,24]" data-parsley-trigger="change" data-parsley-errors-container="#refresh_users_interval_error" required>
|
||||
</div>
|
||||
<div id="refresh_users_interval_error" class="alert alert-danger settings-alert"></div>
|
||||
</div>
|
||||
<p class="help-block">The interval (in hours) PlexPy will request an updated friends list from Plex.tv. 1 minimum, 24 maximum.</p>
|
||||
</div>
|
||||
|
|
@ -328,8 +332,9 @@ available_notification_agents = notifiers.available_notification_agents()
|
|||
<label for="monitoring_interval">Monitoring Interval</label>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="monitoring_interval" name="monitoring_interval" value="${config['monitoring_interval']}" size="5" data-parsley-min="30" data-parsley-trigger="change" required>
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="monitoring_interval" name="monitoring_interval" value="${config['monitoring_interval']}" size="5" data-parsley-min="30" data-parsley-trigger="change" data-parsley-errors-container="#monitoring_interval_error" required>
|
||||
</div>
|
||||
<div id="monitoring_interval_error" class="alert alert-danger settings-alert"></div>
|
||||
</div>
|
||||
<p class="help-block">The interval (in seconds) PlexPy will ping your Plex Server. Min 30 seconds, Recommended 60 seconds.</p>
|
||||
</div>
|
||||
|
|
@ -344,11 +349,12 @@ available_notification_agents = notifiers.available_notification_agents()
|
|||
<p class="help-block">Keep records of all video items played from your Plex Media Server.</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="monitoring_interval">Ignore Interval</label>
|
||||
<label for="logging_ignore_interval">Ignore Interval</label>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="logging_ignore_interval" name="logging_ignore_interval" value="${config['logging_ignore_interval']}" size="5" data-parsley-min="0" data-parsley-trigger="change" required>
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="logging_ignore_interval" name="logging_ignore_interval" value="${config['logging_ignore_interval']}" size="5" data-parsley-min="0" data-parsley-trigger="change" data-parsley-errors-container="#logging_ignore_interval_error" required>
|
||||
</div>
|
||||
<div id="logging_ignore_interval_error" class="alert alert-danger settings-alert"></div>
|
||||
</div>
|
||||
<p class="help-block">The interval (in seconds) PlexPy will wait for a video item to be active before logging it. 0 to disable.</p>
|
||||
</div>
|
||||
|
|
@ -380,8 +386,9 @@ available_notification_agents = notifiers.available_notification_agents()
|
|||
<label for="buffer_threshold">Buffer Threshold</label>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="buffer_threshold" name="buffer_threshold" value="${config['buffer_threshold']}" data-parsley-range="[0,50]" data-parsley-trigger="change" required>
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="buffer_threshold" name="buffer_threshold" value="${config['buffer_threshold']}" data-parsley-range="[0,50]" data-parsley-trigger="change" data-parsley-errors-container="#buffer_threshold_error" required>
|
||||
</div>
|
||||
<div id="buffer_threshold_error" class="alert alert-danger settings-alert"></div>
|
||||
</div>
|
||||
<p class="help-block">How many buffer events should we wait before triggering the first warning. Buffer events increment on each monitor ping if play state is buffering. 0 to disable buffer warnings.</p>
|
||||
</div>
|
||||
|
|
@ -389,8 +396,9 @@ available_notification_agents = notifiers.available_notification_agents()
|
|||
<label for="buffer_wait">Buffer Wait</label>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="buffer_wait" name="buffer_wait" value="${config['buffer_wait']}" data-parsley-min="0" data-parsley-trigger="change" required>
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="buffer_wait" name="buffer_wait" value="${config['buffer_wait']}" data-parsley-min="0" data-parsley-trigger="change" data-parsley-errors-container="#buffer_wait_error" required>
|
||||
</div>
|
||||
<div id="buffer_wait_error" class="alert alert-danger settings-alert"></div>
|
||||
</div>
|
||||
<p class="help-block">The value (in seconds) PlexPy should wait before triggering the next buffer warning. 0 to always trigger.</p>
|
||||
</div>
|
||||
|
|
@ -421,8 +429,9 @@ available_notification_agents = notifiers.available_notification_agents()
|
|||
<label for="notify_watched_percent">Watched Percent</label>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="notify_watched_percent" name="notify_watched_percent" value="${config['notify_watched_percent']}" size="5" data-parsley-range="[50,95]" data-parsley-trigger="change" required>
|
||||
<input type="text" class="form-control" data-parsley-type="integer" id="notify_watched_percent" name="notify_watched_percent" value="${config['notify_watched_percent']}" size="5" data-parsley-range="[50,95]" data-parsley-trigger="change" data-parsley-errors-container="#notify_watched_percent_error" required>
|
||||
</div>
|
||||
<div id="notify_watched_percent_error" class="alert alert-danger settings-alert"></div>
|
||||
</div>
|
||||
<p class="help-block">Set the progress percentage of when a watched notification should be triggered. Minimum 50, Maximum 95.</p>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue