github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-11 15:56:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

A bunch of UI updates

Browse source
This commit is contained in:
JonnyWong16 2016-04-23 00:11:30 -07:00
parent 11aa7d0140
commit d8ad9adabd
14 changed files with 425 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

55
data/interfaces/default/base.html
View file

@ -14,7 +14,7 @@ from plexpy.helpers import anon_url
<meta name="author" content=""> <meta name="author" content="">
<link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet"> <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
<link href="${http_root}css/plexpy.css" rel="stylesheet"> <link href="${http_root}css/plexpy.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,800" rel="stylesheet" type="text/css">
<link href="${http_root}css/font-awesome.min.css" rel="stylesheet"> <link href="${http_root}css/font-awesome.min.css" rel="stylesheet">
${next.headIncludes()} ${next.headIncludes()}
@ -205,16 +205,23 @@ from plexpy.helpers import anon_url
% else: % else:
<li><a href="sync">Synced Items</a></li> <li><a href="sync">Synced Items</a></li>
% endif % endif
% if title == "Log":
<li class="active"><a href="logs">Logs</a></li>
% else:
<li><a href="logs">Logs</a></li>
% endif
% if title == "Settings": % if title == "Settings":
<li class="active"><a href="settings">Settings</a></li> <li class="dropdown active">
% else: % else:
<li><a href="settings">Settings</a></li> <li class="dropdown">
% endif % endif
<a href="settings" class="dropdown-toggle disabled" aria-haspopup="true" data-toggle="dropdown" data-hover="dropdown"><i class="fa fa-lg fa-cogs"></i> <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="logs"><i class="fa fa-list-alt"></i> View Logs</a></li>
<li role="separator" class="divider"></li>
% if plexpy.CONFIG.CHECK_GITHUB:
<li><a href="#" id="nav-update"><i class="fa fa-arrow-circle-up"></i> Check for Updates</a></li>
% endif
<li><a href="#" id="nav-restart"><i class="fa fa-refresh"></i> Restart</a></li>
<li><a href="#" id="nav-shutdown"><i class="fa fa-power-off"></i> Shutdown</a></li>
<li><a href="${http_root}auth/login"><i class="fa fa-sign-out"></i> Logout</a></li>
</ul>
</li>
</ul> </ul>
</div> </div>
</div> </div>
@ -239,6 +246,25 @@ ${next.headerIncludes()}
if (!getCookie('updateDismiss')) { if (!getCookie('updateDismiss')) {
$('#updatebar').show(); $('#updatebar').show();
} }
$("#nav-shutdown").click(function () {
var r = confirm("Are you sure you want to shutdown PlexPy?");
if (r == true) {
window.location.href = "shutdown";
}
});
$("#nav-restart").click(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";
});
</script> </script>
<script> <script>
$('#search_form').submit(function (e) { $('#search_form').submit(function (e) {
@ -263,8 +289,8 @@ ${next.headerIncludes()}
}); });
</script> </script>
<script> <script>
// Work around for iOS web app links opening in Safari
$(document).ready(function () { $(document).ready(function () {
// Work around for iOS web app links opening in Safari
if (("standalone" in window.navigator) && window.navigator.standalone) { if (("standalone" in window.navigator) && window.navigator.standalone) {
// For iOS Apps // For iOS Apps
$('a').on('click', function (e) { $('a').on('click', function (e) {
@ -275,6 +301,17 @@ ${next.headerIncludes()}
} }
}); });
} }
// hack alert: if we don't have a touchscreen, and we are already hovering the mouse, then click should link instead of toggle
if ((navigator.maxTouchPoints || 0) < 2) {
$('.dropdown-toggle').on('click', function () {
var $this = $(this);
if ($this.attr('aria-expanded') === 'true') {
window.location.href = $this.attr('href');
}
});
}
}); });
</script> </script>
${next.javascriptIncludes()} ${next.javascriptIncludes()}

165
data/interfaces/default/css/plexpy.css
View file

@ -1,5 +1,5 @@
body { body {
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', Arial, sans-serif;
color: #fff; color: #fff;
margin-top: 50px; margin-top: 50px;
overflow: hidden; overflow: hidden;
@ -9,7 +9,7 @@ a {
} }
a:hover, a:hover,
a:focus { a:focus {
color: #f9aa03; color: #e9a049;
text-decoration: none; text-decoration: none;
outline: none; outline: none;
} }
@ -89,7 +89,7 @@ img {
.nav > li.active > a, .nav > li.active > a,
.nav > li.active > a:hover, .nav > li.active > a:hover,
.nav > li.active > a:focus { .nav > li.active > a:focus {
color: #f9aa03; color: #f9be03;
background-color: #282828; background-color: #282828;
} }
.navbar-toggle { .navbar-toggle {
@ -99,6 +99,36 @@ img {
.navbar-toggle:focus { .navbar-toggle:focus {
background-color: #2f2f2f; background-color: #2f2f2f;
} }
@media screen and (min-width: 768px) {
.dropdown:hover > .dropdown-menu {
display: block;
}
}
.dropdown-menu {
background-color: #282828;
}
.dropdown-menu .divider {
background-color: #777;
}
.dropdown-menu > li > a {
color: #999;
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
color: #fff;
background-color: #2f2f2f;
}
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
color: #fff;
background-color: #2f2f2f;
}
.dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:focus {
color: #999;
}
.icon-bar { .icon-bar {
background-color: #999; background-color: #999;
} }
@ -109,7 +139,13 @@ img {
color: #eee; color: #eee;
} }
.padded-header h3 { .padded-header h3 {
font-size: 20px; font-size: 16px;
font-weight: bold;
text-transform: uppercase;
}
.padded-header h3 small {
font-size: 13px;
text-transform: none;
} }
.btn { .btn {
outline:0px !important; outline:0px !important;
@ -183,8 +219,8 @@ fieldset[disabled] .btn-dark.active {
} }
.btn-bright { .btn-bright {
color: #fff; color: #fff;
background-color: #eb8600; background-color: #cc7b19;
border-color: transparent; box-shadow: inset 0 1px 0 #e7993b;
} }
.btn-bright:focus, .btn-bright:focus,
.btn-bright.focus { .btn-bright.focus {
@ -193,14 +229,15 @@ fieldset[disabled] .btn-dark.active {
} }
.btn-bright:hover { .btn-bright:hover {
color: #fff; color: #fff;
background-color: #E69400; background-color: #e59029;
border-color: #f9aa03; box-shadow: inset 0 1px 0 #ebac60;
} }
.btn-bright:active, .btn-bright:active,
.btn-bright.active, .btn-bright.active,
.open > .dropdown-toggle.btn-bright { .open > .dropdown-toggle.btn-bright {
color: #fff; color: #fff;
background-color: #eb8600; background-color: #cc7b19;
box-shadow: inset 0 1px 0 #e7993b;
} }
.btn-bright:active:hover, .btn-bright:active:hover,
.btn-bright.active:hover, .btn-bright.active:hover,
@ -212,7 +249,8 @@ fieldset[disabled] .btn-dark.active {
.btn-bright.active.focus, .btn-bright.active.focus,
.open > .dropdown-toggle.btn-bright.focus { .open > .dropdown-toggle.btn-bright.focus {
color: #fff; color: #fff;
background-color: #eb8600; background-color: #cc7b19;
box-shadow: inset 0 1px 0 #e7993b;
} }
.btn-bright:active, .btn-bright:active,
.btn-bright.active, .btn-bright.active,
@ -237,12 +275,13 @@ fieldset[disabled] .btn-bright:active,
.btn-bright.disabled.active, .btn-bright.disabled.active,
.btn-bright[disabled].active, .btn-bright[disabled].active,
fieldset[disabled] .btn-bright.active { fieldset[disabled] .btn-bright.active {
background-color: #c9302c; background-color: #cc7b19;
border-color: #ac2925; border-color: #b56d16;
} }
.btn-bright .badge { .btn-bright .badge {
color: #fff; color: #fff;
background-color: #eb8600; background-color: #cc7b19;
box-shadow: inset 0 1px 0 #e7993b;
} }
.btn-danger.btn-edit { .btn-danger.btn-edit {
color: #d7d7d7; color: #d7d7d7;
@ -377,7 +416,7 @@ textarea.form-control:focus {
.pagination > li > span:hover, .pagination > li > span:hover,
.pagination > li > a:focus, .pagination > li > a:focus,
.pagination > li > span:focus { .pagination > li > span:focus {
background-color: #F9AA03; background-color: #cc7b19;
border: 1px solid #444444; border: 1px solid #444444;
} }
.pagination > .active > a, .pagination > .active > a,
@ -389,7 +428,7 @@ textarea.form-control:focus {
z-index: 2; z-index: 2;
color: #fff; color: #fff;
cursor: default; cursor: default;
background-color: #F9AA03; background-color: #cc7b19;
border-color: #444444; border-color: #444444;
} }
.pagination > .disabled > span, .pagination > .disabled > span,
@ -407,7 +446,7 @@ textarea.form-control:focus {
.nav-pills > li.active > a:hover, .nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus { .nav-pills > li.active > a:focus {
color: #fff; color: #fff;
background-color: #af6c17; background-color: #cc7b19;
} }
.nav-pills > li > a { .nav-pills > li > a {
border-radius: 3px; border-radius: 3px;
@ -871,16 +910,16 @@ a .dashboard-activity-metadata-user-thumb:hover {
color: #999; color: #999;
} }
.dashboard-activity-metadata-user a:hover { .dashboard-activity-metadata-user a:hover {
color: #F9AA03; color: #e9a049;
} }
.dashboard-activity-metadata-title a:hover { .dashboard-activity-metadata-title a:hover {
color: #F9AA03; color: #e9a049;
} }
.dashboard-activity-metadata-progress-wrapper { .dashboard-activity-metadata-progress-wrapper {
margin-bottom: 20px; margin-bottom: 20px;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
color: #F9AA03; color: #e9a049;
} }
.dashboard-recent-media-row { .dashboard-recent-media-row {
width: 100%; width: 100%;
@ -957,6 +996,7 @@ a:hover .dashboard-recent-media-cover {
.dashboard-recent-media-overlay-text { .dashboard-recent-media-overlay-text {
color: #aaa; color: #aaa;
font-size: 12px; font-size: 12px;
font-weight: bold;
float: left; float: left;
position: absolute; position: absolute;
left: 8px; left: 8px;
@ -974,9 +1014,9 @@ a:hover .dashboard-recent-media-cover {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
font-size: 13px; font-size: 13px;
font-weight: bold;
margin: 0; margin: 0;
line-height: 15px; line-height: 15px;
font-weight: normal;
width: 150px; width: 150px;
white-space: nowrap; white-space: nowrap;
text-align: left; text-align: left;
@ -985,13 +1025,11 @@ a:hover .dashboard-recent-media-cover {
.dashboard-recent-media-metacontainer h3.text-muted { .dashboard-recent-media-metacontainer h3.text-muted {
color: #777; color: #777;
} }
.dashboard-recent-media-metacontainer .text-muted { .dashboard-recent-media-metacontainer h3.text-muted a {
padding: 5px 3px 0 3px; color: #777;
text-overflow: ellipsis; }
overflow: hidden; .dashboard-recent-media-metacontainer h3.text-muted a:hover {
position: relative; color: #e9a049;
white-space: nowrap;
text-align: left;
} }
.art-face { .art-face {
background-repeat: no-repeat; background-repeat: no-repeat;
@ -1057,7 +1095,7 @@ a:hover .dashboard-recent-media-cover {
color: #999; color: #999;
} }
.summary-navbar-list .breadcrumb a:hover { .summary-navbar-list .breadcrumb a:hover {
color: #F9AA03; color: #f9be03;
} }
.summary-content-title-wrapper { .summary-content-title-wrapper {
height: 150px; height: 150px;
@ -1071,7 +1109,7 @@ a:hover .dashboard-recent-media-cover {
.summary-content-title h1 { .summary-content-title h1 {
margin-top: 0; margin-top: 0;
margin-bottom: 10px; margin-bottom: 10px;
color: #F9AA03; color: #f9be03;
font-size: 28px; font-size: 28px;
line-height: 40px; line-height: 40px;
float: left; float: left;
@ -1082,11 +1120,10 @@ a:hover .dashboard-recent-media-cover {
width: 100%; width: 100%;
} }
.summary-content-title h1 a { .summary-content-title h1 a {
color: #F9AA03; color: #f9be03;
} }
.summary-content-title h1 a:hover { .summary-content-title h1 a:hover {
color: #F9AA03; color: #fff;
text-decoration: underline;
} }
.summary-content-title h2 { .summary-content-title h2 {
margin-top: 0; margin-top: 0;
@ -1335,7 +1372,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
.star-rating .star-icon { .star-rating .star-icon {
width: auto; width: auto;
margin-left: 2px; margin-left: 2px;
color: #F9AA03; color: #f9be03;
} }
.star-rating .star-icon-o { .star-rating .star-icon-o {
width: auto; width: auto;
@ -1438,6 +1475,7 @@ a:hover .item-children-poster {
.item-children-overlay-text { .item-children-overlay-text {
color: #aaa; color: #aaa;
font-size: 12px; font-size: 12px;
font-weight: bold;
float: left; float: left;
position: absolute; position: absolute;
left: 8px; left: 8px;
@ -1465,9 +1503,9 @@ a:hover .item-children-poster {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
font-size: 13px; font-size: 13px;
font-weight: bold;
margin: 0; margin: 0;
line-height: 15px; line-height: 15px;
font-weight: normal;
white-space: nowrap; white-space: nowrap;
text-align: left; text-align: left;
clear: both; clear: both;
@ -1475,6 +1513,12 @@ a:hover .item-children-poster {
.item-children-instance-text-wrapper h3.text-muted { .item-children-instance-text-wrapper h3.text-muted {
color: #777; color: #777;
} }
.item-children-instance-text-wrapper h3.text-muted a {
color: #777;
}
.item-children-instance-text-wrapper h3.text-muted a:hover {
color: #e9a049;
}
.item-children-list-item-odd { .item-children-list-item-odd {
border-top: 0px solid #343434; border-top: 0px solid #343434;
border-bottom: 0px solid #343434; border-bottom: 0px solid #343434;
@ -1519,7 +1563,7 @@ a:hover .item-children-poster {
margin-right: 20px; margin-right: 20px;
} }
#new_title h3 { #new_title h3 {
color: #F9AA03; color: #f9be03;
font-size: 14px; font-size: 14px;
line-height: 1.42857143; line-height: 1.42857143;
font-weight: bold; font-weight: bold;
@ -1582,10 +1626,15 @@ a:hover .item-children-poster {
top: 15px; top: 15px;
left: -5px; left: -5px;
} }
.user-info-nav > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus { .user-info-nav > .active > a {
color: #F9AA03; color: #cc7b19;
}
.nav-tabs > .active > a:hover,
.nav-tabs > .active > a:focus {
color: #e9a049;
} }
.user-info-nav a:hover { .user-info-nav a:hover {
color: #e9a049;
text-decoration: none; text-decoration: none;
} }
.user-info-nav ul { .user-info-nav ul {
@ -1640,7 +1689,7 @@ a:hover .item-children-poster {
.user-overview-stats-instance h3 { .user-overview-stats-instance h3 {
font-size: 30px; font-size: 30px;
font-weight: bold; font-weight: bold;
color: #F9AA03; color: #f9be03;
line-height: 22px; line-height: 22px;
position: relative; position: relative;
top: 5px; top: 5px;
@ -1692,8 +1741,8 @@ a:hover .item-children-poster {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
font-size: 13px; font-size: 14px;
line-height: 15px; line-height: 16px;
font-weight: normal; font-weight: normal;
width: 140px; width: 140px;
margin-left: 10px; margin-left: 10px;
@ -1702,7 +1751,7 @@ a:hover .item-children-poster {
.user-player-instance-playcount h3 { .user-player-instance-playcount h3 {
font-size: 30px; font-size: 30px;
font-weight: bold; font-weight: bold;
color: #F9AA03; color: #f9be03;
line-height: 22px; line-height: 22px;
position: relative; position: relative;
top: 5px; top: 5px;
@ -1784,8 +1833,8 @@ a:hover .item-children-poster {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
font-size: 13px; font-size: 14px;
line-height: 15px; line-height: 16px;
font-weight: bold; font-weight: bold;
width: 100%; width: 100%;
padding: 0 0 0 20px; padding: 0 0 0 20px;
@ -1810,7 +1859,7 @@ a:hover .item-children-poster {
.home-platforms-instance-playcount h3 { .home-platforms-instance-playcount h3 {
font-size: 30px; font-size: 30px;
font-weight: bold; font-weight: bold;
color: #F9AA03; color: #f9be03;
line-height: 22px; line-height: 22px;
position: relative; position: relative;
top: 5px; top: 5px;
@ -1919,7 +1968,7 @@ a:hover .item-children-poster {
height: 60px; height: 60px;
} }
.home-platforms-instance-list-number { .home-platforms-instance-list-number {
background-color: #eb8600; background-color: #f9be03;
float: left; float: left;
position: absolute; position: absolute;
top: -10px; top: -10px;
@ -1976,7 +2025,7 @@ a:hover .item-children-poster {
.home-platforms-instance-list-playcount h3 { .home-platforms-instance-list-playcount h3 {
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
color: #F9AA03; color: #f9be03;
line-height: 22px; line-height: 22px;
position: relative; position: relative;
margin: 0 5px 0 0; margin: 0 5px 0 0;
@ -2071,10 +2120,10 @@ a:hover .item-children-poster {
transition: all 0.3s ease; transition: all 0.3s ease;
} }
.home-platforms-instance-list-chevron i:hover { .home-platforms-instance-list-chevron i:hover {
color: #eb8600; color: #f9be03;
} }
.home-platforms-instance-list-chevron.active i.fa-chevron-down{ .home-platforms-instance-list-chevron.active i.fa-chevron-down{
color: #eb8600; color: #f9be03;
-webkit-transform: rotate(180deg); -webkit-transform: rotate(180deg);
-ms-transform: rotate(180deg); -ms-transform: rotate(180deg);
-o-transform: rotate(180deg); -o-transform: rotate(180deg);
@ -2173,6 +2222,7 @@ a .home-platforms-instance-list-oval:hover,
} }
.header-bar span { .header-bar span {
font-size: 22px; font-size: 22px;
font-weight: bold;
line-height: 34px; line-height: 34px;
} }
.button-bar { .button-bar {
@ -2200,6 +2250,7 @@ a .home-platforms-instance-list-oval:hover,
border-top: 1px solid #2d2d2d; border-top: 1px solid #2d2d2d;
} }
.nav-settings > li > a { .nav-settings > li > a {
border-bottom: 1px solid #232323;
display: block; display: block;
padding: 15px 15px 15px 15px; padding: 15px 15px 15px 15px;
color: #999; color: #999;
@ -2215,7 +2266,7 @@ a .home-platforms-instance-list-oval:hover,
.nav-settings > .active > a, .nav-settings > .active > a,
.nav-settings > .active > a:hover, .nav-settings > .active > a:hover,
.nav-settings > .active > a:focus { .nav-settings > .active > a:focus {
color: #eb8600; color: #f9be03;
background-color: #2f2f2f; background-color: #2f2f2f;
} }
.stacked-configs, .stacked-configs,
@ -2257,7 +2308,7 @@ a .home-platforms-instance-list-oval:hover,
color: #eee; color: #eee;
} }
.stacked-configs > li > span > a.active { .stacked-configs > li > span > a.active {
color: #eb8600; color: #f9be03;
} }
.accordion { .accordion {
width: 100%; width: 100%;
@ -2299,10 +2350,10 @@ a .home-platforms-instance-list-oval:hover,
background: #2f2f2f; background: #2f2f2f;
} }
.accordion li.open .link { .accordion li.open .link {
color: #eb8600; color: #f9be03;
} }
.accordion li.open i { .accordion li.open i {
color: #eb8600; color: #f9be03;
} }
.accordion li.open i.fa-chevron-down { .accordion li.open i.fa-chevron-down {
-webkit-transform: rotate(180deg); -webkit-transform: rotate(180deg);
@ -2330,7 +2381,7 @@ a .home-platforms-instance-list-oval:hover,
transition: all 0.25s ease; transition: all 0.25s ease;
} }
.submenu a:hover { .submenu a:hover {
background: #eb8600; background: #f9be03;
color: #FFF; color: #FFF;
} }
.ajaxMsg { .ajaxMsg {
@ -2532,7 +2583,7 @@ a .home-platforms-instance-list-oval:hover,
margin-right: 3px; margin-right: 3px;
} }
#updatebar a:hover { #updatebar a:hover {
color: #F9AA03; color: #e9a049;
} }
.body-container { .body-container {
position: absolute; position: absolute;
@ -2593,13 +2644,13 @@ table.display tr.shown + tr .pagination > .active > a:hover {
table.display tr.shown + tr table[id^='history_child'] td:hover a, table.display tr.shown + tr table[id^='history_child'] td:hover a,
table.display tr.shown + tr table[id^='media_info_child'] > tr > td:hover a, table.display tr.shown + tr table[id^='media_info_child'] > tr > td:hover a,
table.display tr.shown + tr table[id^='media_info_child'] tr.shown + tr table[id^='media_info_child'] td:hover a { table.display tr.shown + tr table[id^='media_info_child'] tr.shown + tr table[id^='media_info_child'] td:hover a {
color: #F9AA03; color: #cc7b19;
} }
table.display tr.shown + tr .pagination > .disabled > a { table.display tr.shown + tr .pagination > .disabled > a {
color: #444444; color: #444444;
} }
table.display tr.shown + tr .pagination > li > a:hover { table.display tr.shown + tr .pagination > li > a:hover {
color: #23527c; color: #e9a049;
} }
table[id^='history_child'] { table[id^='history_child'] {
margin-top: 0; margin-top: 0;
@ -2791,6 +2842,8 @@ a.no-highlight:hover {
#recently-added-row-scroller, #recently-added-row-scroller,
#recently-watched-row-scroller { #recently-watched-row-scroller {
position: relative; position: relative;
height: 265px;
margin-bottom: 25px;
} }
@media (min-width: 768px) { @media (min-width: 768px) {

4
data/interfaces/default/current_activity_header.html
View file

@ -18,9 +18,9 @@ DOCUMENTATION :: END
% if data == '0': % if data == '0':
<h3>Activity</h3> <h3>Activity</h3>
% elif data == '1': % elif data == '1':
<h3>Activity <small>${data} stream</small></h3> <h3>Activity &nbsp;&nbsp;<small>${data} stream</small></h3>
% else: % else:
<h3>Activity <small>${data} streams</small></h3> <h3>Activity &nbsp;&nbsp;<small>${data} streams</small></h3>
% endif % endif
% else: % else:
<h3>Activity</h3> <h3>Activity</h3>

27
data/interfaces/default/index.html
View file

@ -5,6 +5,8 @@
<%def name="body()"> <%def name="body()">
<div class="container-fluid"> <div class="container-fluid">
% for section in config['home_sections']:
% if section == 'current_activity':
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="padded-header" id="current-activity-header"> <div class="padded-header" id="current-activity-header">
@ -16,11 +18,11 @@
</div> </div>
</div> </div>
</div> </div>
% if config['home_stats_cards']: % elif section == 'watch_stats':
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="padded-header"> <div class="padded-header">
<h3>Watch Statistics <small>Last ${config['home_stats_length']} days</small></h3> <h3>Watch Statistics &nbsp;&nbsp;<small>Last ${config['home_stats_length']} days</small></h3>
</div> </div>
<div id="home-stats" class="home-platforms"> <div id="home-stats" class="home-platforms">
<div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Loading stats...</div> <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Loading stats...</div>
@ -28,12 +30,11 @@
</div> </div>
</div> </div>
</div> </div>
% endif % elif section == 'library_stats':
% if config['home_library_cards']:
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="padded-header" id="library-statistics-header"> <div class="padded-header" id="library-statistics-header">
<h3>Library Statistics <small>${config['pms_name']}</small></h3> <h3>Library Statistics &nbsp;&nbsp;<small>${config['pms_name']}</small></h3>
</div> </div>
<div id="library-stats" class="library-platforms"> <div id="library-stats" class="library-platforms">
<div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Loading stats...</div> <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Loading stats...</div>
@ -41,7 +42,7 @@
</div> </div>
</div> </div>
</div> </div>
% endif % elif section == 'recently_added':
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="padded-header"> <div class="padded-header">
@ -53,7 +54,10 @@
<a href="#" id="recently-added-page-right" class="paginate btn-gray disabled" data-id="-1"><i class="fa fa-lg fa-chevron-right"></i></a> <a href="#" id="recently-added-page-right" class="paginate btn-gray disabled" data-id="-1"><i class="fa fa-lg fa-chevron-right"></i></a>
</li> </li>
</ul> </ul>
<h3>Recently Added</h3> <h3>Recently Added &nbsp;&nbsp;<small>
<a href="#" class="toggle-recently-added-type" data-type="movie">Movies</a> &nbsp;
<a href="#" class="toggle-recently-added-type" data-type="season">TV Shows</a> &nbsp;
<a href="#" class="toggle-recently-added-type" data-type="album">Music</a></small></h3>
</div> </div>
<div id="recentlyAdded" style="margin-right: -15px;"> <div id="recentlyAdded" style="margin-right: -15px;">
<div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Looking for new items...</div> <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Looking for new items...</div>
@ -61,6 +65,8 @@
</div> </div>
</div> </div>
</div> </div>
% endif
% endfor
</div> </div>
</%def> </%def>
@ -186,6 +192,13 @@
$("#recently-added-page-right").removeClass("disabled"); $("#recently-added-page-right").removeClass("disabled");
} }
}); });
$('.toggle-recently-added-type').click(function () {
var media_type = $(this).data('type');
var margin_right = $(this).hasClass('text-muted') ? '25px' : 0;
$('.dashboard-recent-media-instance li[data-type=' + media_type + ']').animate({ width: 'toggle', marginRight: margin_right }, 1000);
$(this).toggleClass('text-muted').blur();
});
</script> </script>
</%def> </%def>

2
data/interfaces/default/info.html
View file

@ -119,7 +119,7 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
% elif data['media_type'] == 'artist' or data['media_type'] == 'album' or data['media_type'] == 'track': % elif data['media_type'] == 'artist' or data['media_type'] == 'album' or data['media_type'] == 'track':
<div class="summary-poster-face-track" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=500&fallback=poster);"> <div class="summary-poster-face-track" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=500&fallback=cover);">
<div class="summary-poster-face-overlay"> <div class="summary-poster-face-overlay">
<span></span> <span></span>
</div> </div>

26
data/interfaces/default/library_recently_added.html
View file

@ -57,17 +57,25 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
</div> </div>
</a>
<div class="dashboard-recent-media-metacontainer"> <div class="dashboard-recent-media-metacontainer">
% if item['media_type'] == 'episode': % if item['media_type'] == 'episode':
<h3 title="${item['grandparent_title']}">${item['grandparent_title']}</h3> <h3 title="${item['grandparent_title']}">
<h3 title="${item['title']}">${item['title']}</h3> <a href="info?rating_key=${item['grandparent_rating_key']}">${item['grandparent_title']}</a>
<h3 class="text-muted">S${item['parent_media_index']} &middot; E${item['media_index']}</h3> </h3>
<h3 title="${item['title']}">
<a href="info?rating_key=${item['rating_key']}">${item['title']}</a>
</h3>
<h3 class="text-muted">
<a href="info?rating_key=${item['parent_rating_key']}">S${item['parent_media_index']}</a> &middot; <a href="info?rating_key=${item['rating_key']}">E${item['media_index']}</a>
</h3>
% elif item['media_type'] == 'movie': % elif item['media_type'] == 'movie':
<h3 title="${item['title']}">${item['title']}</h3> <h3 title="${item['title']}">
<a href="info?rating_key=${item['rating_key']}">${item['title']}</a>
</h3>
<h3 class="text-muted">${item['year']}</h3> <h3 class="text-muted">${item['year']}</h3>
% endif % endif
</div> </div>
</a>
% elif item['media_type'] == 'album': % elif item['media_type'] == 'album':
<a href="info?rating_key=${item['rating_key']}"> <a href="info?rating_key=${item['rating_key']}">
<div class="dashboard-recent-media-cover"> <div class="dashboard-recent-media-cover">
@ -82,8 +90,12 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
<div class="dashboard-recent-media-metacontainer"> <div class="dashboard-recent-media-metacontainer">
<h3 title="${item['parent_title']}">${item['parent_title']}</h3> <h3 title="${item['parent_title']}">
<h3 class="text-muted">${item['title']}</h3> <a href="info?rating_key=${item['parent_rating_key']}">${item['parent_title']}</a>
</h3>
<h3 class="text-muted">
<a class="text-muted" href="info?rating_key=${item['rating_key']}">${item['title']}</a>
</h3>
</div> </div>
</a> </a>
% endif % endif

4
data/interfaces/default/login.html
View file

@ -9,6 +9,8 @@
<meta name="author" content=""> <meta name="author" content="">
<link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet"> <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
<link href="${http_root}css/plexpy.css" rel="stylesheet"> <link href="${http_root}css/plexpy.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,800" rel="stylesheet" type="text/css">
<link href="${http_root}css/font-awesome.min.css" rel="stylesheet">
<link rel="icon" type="image/x-icon" href="${http_root}images/favicon.ico"/> <link rel="icon" type="image/x-icon" href="${http_root}images/favicon.ico"/>
<link rel="shortcut icon" href="${http_root}images/favicon.ico"> <link rel="shortcut icon" href="${http_root}images/favicon.ico">
</head> </head>
@ -40,7 +42,7 @@
<input type="password" id="password" name="password" class="form-control"> <input type="password" id="password" name="password" class="form-control">
</div> </div>
<div class="form-footer"> <div class="form-footer">
<button type="submit" class="btn btn-lg btn-bright login-button">Sign In</button> <button type="submit" class="btn btn-bright login-button"><i class="fa fa-sign-in"></i>&nbsp; Sign In</button>
<div class="remember-group"> <div class="remember-group">
<label class="control-label"> <label class="control-label">
<input type="checkbox" id="remember_me" name="remember_me" title="for 30 days" value=1 checked="checked" /> Remember me <input type="checkbox" id="remember_me" name="remember_me" title="for 30 days" value=1 checked="checked" /> Remember me

47
data/interfaces/default/recently_added.html
View file

@ -36,8 +36,8 @@ DOCUMENTATION :: END
<ul class="dashboard-recent-media list-unstyled"> <ul class="dashboard-recent-media list-unstyled">
% for item in data: % for item in data:
<div class="dashboard-recent-media-instance"> <div class="dashboard-recent-media-instance">
<li> <li data-type="${item['media_type']}">
% if item['media_type'] == 'season' or item['media_type'] == 'movie': % if item['media_type'] == 'movie':
<a href="info?rating_key=${item['rating_key']}"> <a href="info?rating_key=${item['rating_key']}">
<div class="dashboard-recent-media-poster"> <div class="dashboard-recent-media-poster">
<div class="dashboard-recent-media-poster-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=450&fallback=poster);"> <div class="dashboard-recent-media-poster-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=450&fallback=poster);">
@ -50,16 +50,35 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
</div> </div>
</a>
<div class="dashboard-recent-media-metacontainer"> <div class="dashboard-recent-media-metacontainer">
% if item['media_type'] == 'season': <h3 title="${item['title']}">
<h3 title="${item['parent_title']}">${item['parent_title']}</h3> <a href="info?rating_key=${item['rating_key']}">${item['title']}</a>
<h3 class="text-muted">${item['title']}</h3> </h3>
% elif item['media_type'] == 'movie':
<h3 title="${item['title']}">${item['title']}</h3>
<h3 class="text-muted">${item['year']}</h3> <h3 class="text-muted">${item['year']}</h3>
% endif </div>
% elif item['media_type'] == 'season':
<a href="info?rating_key=${item['rating_key']}">
<div class="dashboard-recent-media-poster">
<div class="dashboard-recent-media-poster-face" style="background-image: url(pms_image_proxy?img=${item['parent_thumb']}&width=300&height=450&fallback=poster);">
<div class="dashboard-recent-media-overlay">
<div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
<script>
$('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
</script>
</div>
</div>
</div>
</div> </div>
</a> </a>
<div class="dashboard-recent-media-metacontainer">
<h3 title="${item['parent_title']}">
<a href="info?rating_key=${item['parent_rating_key']}">${item['parent_title']}</a>
</h3>
<h3 class="text-muted">
<a class="text-muted" href="info?rating_key=${item['rating_key']}">${item['title']}</a>
</h3>
</div>
% elif item['media_type'] == 'album': % elif item['media_type'] == 'album':
<a href="info?rating_key=${item['rating_key']}"> <a href="info?rating_key=${item['rating_key']}">
<div class="dashboard-recent-media-cover"> <div class="dashboard-recent-media-cover">
@ -73,11 +92,15 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
</div> </div>
<div class="dashboard-recent-media-metacontainer">
<h3 title="${item['parent_title']}">${item['parent_title']}</h3>
<h3 class="text-muted">${item['title']}</h3>
</div>
</a> </a>
<div class="dashboard-recent-media-metacontainer">
<h3 title="${item['parent_title']}">
<a href="info?rating_key=${item['parent_rating_key']}">${item['parent_title']}</a>
</h3>
<h3 class="text-muted">
<a class="text-muted" href="info?rating_key=${item['rating_key']}">${item['title']}</a>
</h3>
</div>
% endif % endif
</li> </li>
</div> </div>

115
data/interfaces/default/settings.html
View file

@ -20,7 +20,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<div class="col-md-12"> <div class="col-md-12">
<div class='card-back-full'> <div class='card-back-full'>
<div class="header-bar"> <div class="header-bar">
<span><i class="fa fa-cog"></i> Settings</span> <span><i class="fa fa-cogs"></i> Settings</span>
</div> </div>
<div class="button-bar"> <div class="button-bar">
% if config['check_github']: % if config['check_github']:
@ -131,10 +131,15 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<td>Gitter Chat:</td> <td>Gitter Chat:</td>
<td><a class="no-highlight" href="${anon_url('https://gitter.im/drzoidberg33/plexpy')}" target="_blank">https://gitter.im/drzoidberg33/plexpy</a></td> <td><a class="no-highlight" href="${anon_url('https://gitter.im/drzoidberg33/plexpy')}" target="_blank">https://gitter.im/drzoidberg33/plexpy</a></td>
</tr> </tr>
<tr>
<td>Donations:</td>
<td><a class="no-highlight" href="${anon_url('https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DG783BMSCU3V4')}" target="_blank">Paypal</a> |
<a class="no-highlight" href="${anon_url('http://swiftpanda16.tip.me/')}" target="_blank">Bitcoin</a></td>
</tr>
</tbody> </tbody>
</table> </table>
<div class="padded-header"> <div class="padded-header">
<h3>PlexPy Scheduler</h3> <h3>PlexPy Scheduled Tasks</h3>
</div> </div>
<div id="plexpy-scheduler-table"> <div id="plexpy-scheduler-table">
<div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading scheduler table...</div> <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading scheduler table...</div>
@ -228,7 +233,49 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p> <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
</div> </div>
<div role="tabpanel" class="tab-pane" id="tabs-2"> <div role="tabpanel" class="tab-pane" id="tabs-2">
<div class="padded-header">
<h3>Homepage</h3>
</div>
<label for="sortable_home_stats_cards">Sections</label>
<p class="help-block">
Select the sections to show on the homepage.<br>
Drag the items below to reorder your homepage content.
</p>
<div class="row">
<div class="col-md-6">
<ul class="list-unstyled" id="sortable_home_sections" data-parsley-trigger="change">
<li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div>
<label>
<input type="checkbox" id="hsec-current_activity" name="hsec-current_activity" value="current_activity"> Current Activity
</label>
</li>
<li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div>
<label>
<input type="checkbox" id="hsec-watch_stats" name="hsec-watch_stats" value="watch_stats"> Watch Statistics
</label>
</li>
<li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div>
<label>
<input type="checkbox" id="hsec-library_stats" name="hsec-library_stats" value="library_stats"> Library Statistics
</label>
</li>
<li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div>
<label>
<input type="checkbox" id="hsec-recently_added" name="hsec-recently_added" value="recently_added"> Recently Added
</label>
</li>
</ul>
<input type="text" id="home_sections" name="home_sections" style="display: none;"/>
</div>
</div>
<div class="padded-header"> <div class="padded-header">
<h3>Watch Statistics</h3> <h3>Watch Statistics</h3>
</div> </div>
@ -236,24 +283,12 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<div class="form-group"> <div class="form-group">
<label for="sortable_home_stats_cards">Cards</label> <label for="sortable_home_stats_cards">Cards</label>
<p class="help-block"> <p class="help-block">
Select the cards to show in the watch statistics on the home page. Select none to disable.<br> Select the cards to show in the watch statistics on the home page.
Drag the items below to reorder your homepage content. Drag the items below to reorder your homepage content.
</p> </p>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<ul class="list-unstyled" id="sortable_home_stats_cards" data-parsley-trigger="change"> <ul class="list-unstyled" id="sortable_home_stats_cards" data-parsley-trigger="change">
<li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div>
<label>
<input type="checkbox" id="hscard-top_tv" name="hscard-top_tv" value="top_tv"> Most Watched TV
</label>
</li>
<li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div>
<label>
<input type="checkbox" id="hscard-popular_tv" name="hscard-popular_tv" value="popular_tv"> Most Popular TV
</label>
</li>
<li class="card card-sortable"> <li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div> <div class="card-handle"><i class="fa fa-bars"></i></div>
<label> <label>
@ -266,6 +301,18 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<input type="checkbox" id="hscard-popular_movies" name="hscard-popular_movies" value="popular_movies"> Most Popular Movie <input type="checkbox" id="hscard-popular_movies" name="hscard-popular_movies" value="popular_movies"> Most Popular Movie
</label> </label>
</li> </li>
<li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div>
<label>
<input type="checkbox" id="hscard-top_tv" name="hscard-top_tv" value="top_tv"> Most Watched TV
</label>
</li>
<li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div>
<label>
<input type="checkbox" id="hscard-popular_tv" name="hscard-popular_tv" value="popular_tv"> Most Popular TV
</label>
</li>
<li class="card card-sortable"> <li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div> <div class="card-handle"><i class="fa fa-bars"></i></div>
<label> <label>
@ -341,17 +388,17 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<div class="form-group"> <div class="form-group">
<label for="home_library_cards">Cards</label> <label for="home_library_cards">Cards</label>
<p class="help-block"> <p class="help-block">
Select the cards to show in the library statistics on the home page. Select none to disable.<br> Select the cards to show in the library statistics on the home page.
Drag the items below to reorder your homepage content. Drag the items below to reorder your homepage content.
</p> </p>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<ul class="list-unstyled" id="sortable_home_library_cards" data-parsley-trigger="change"> <ul class="list-unstyled" id="sortable_home_library_cards" data-parsley-trigger="change"></ul>
</ul>
<input type="text" id="home_library_cards" name="home_library_cards" style="display: none;" /> <input type="text" id="home_library_cards" name="home_library_cards" style="display: none;" />
</div> </div>
</div> </div>
</div> </div>
<p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p> <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
</div> </div>
@ -2002,15 +2049,11 @@ $(document).ready(function() {
$("#menu_link_update_check").click(function() { $("#menu_link_update_check").click(function() {
// Allow the update bar to show again if previously dismissed. // Allow the update bar to show again if previously dismissed.
setCookie('updateDismiss', 'true', 0); setCookie('updateDismiss', 'true', 0);
$(this).html('<i class="fa fa-spin fa-refresh"></i> Checking</button>'); $(this).html('<i class="fa fa-spin fa-refresh"></i> Checking');
$(this).prop('disabled', true); $(this).prop('disabled', true);
window.location.href = "checkGithub"; window.location.href = "checkGithub";
}); });
$("#modal_link_restart").click(function() {
window.location.href = "restart";
});
if ($("#api_enabled").is(":checked")) { if ($("#api_enabled").is(":checked")) {
$("#apioptions").show(); $("#apioptions").show();
} else { } else {
@ -2301,6 +2344,31 @@ $(document).ready(function() {
var accordion_timeline = new Accordion($('#accordion-timeline'), false); var accordion_timeline = new Accordion($('#accordion-timeline'), false);
var accordion_scripts = new Accordion($('#accordion-scripts'), false); var accordion_scripts = new Accordion($('#accordion-scripts'), false);
// Sortable home_sections
function set_home_sections() {
var home_sections = [];
var hsecs = $('[id^=hsec-]').serializeArray();
$.each(hsecs, function(i, sec) {
home_sections.push(sec.value);
});
$('#home_sections').val(home_sections);
};
var sec_cards = ${config['home_sections'] | n};
sec_cards.reverse().forEach(function (item) {
$('#hsec-' + item).prop('checked', !$(this).prop('checked'))
$('#hsec-' + item).closest('li.card').prependTo('#sortable_home_sections');
});
Sortable.create(sortable_home_sections, {
animation: 250,
onSort: function(elem, ui) {
set_home_sections();
}
});
$('[id^=hsec-]').change(function() { set_home_sections(); });
set_home_sections()
// Sortable home_stats_cards // Sortable home_stats_cards
function set_home_stats_cards() { function set_home_stats_cards() {
@ -2328,7 +2396,6 @@ $(document).ready(function() {
$('[id^=hscard-]').change(function() { set_home_stats_cards(); }); $('[id^=hscard-]').change(function() { set_home_stats_cards(); });
set_home_stats_cards() set_home_stats_cards()
// Sortable home_library_cards // Sortable home_library_cards
function set_home_library_cards() { function set_home_library_cards() {
var home_library_cards = []; var home_library_cards = [];

34
data/interfaces/default/user_recently_watched.html
View file

@ -45,17 +45,25 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
</div> </div>
</a>
<div class="dashboard-recent-media-metacontainer"> <div class="dashboard-recent-media-metacontainer">
% if item['media_type'] == 'episode': % if item['media_type'] == 'episode':
<h3 title="${item['grandparent_title']}">${item['grandparent_title']}</h3> <h3 title="${item['grandparent_title']}">
<h3 title="${item['title']}">${item['title']}</h3> <a href="info?rating_key=${item['grandparent_rating_key']}">${item['grandparent_title']}</a>
<h3 class="text-muted">S${item['parent_media_index']} &middot; E${item['media_index']}</h3> </h3>
<h3 title="${item['title']}">
<a href="info?source=history&rating_key=${item['rating_key']}">${item['title']}</a>
</h3>
<h3 class="text-muted">
<a href="info?rating_key=${item['parent_rating_key']}">S${item['parent_media_index']}</a> &middot; <a href="info?source=history&rating_key=${item['rating_key']}">E${item['media_index']}</a>
</h3>
% elif item['media_type'] == 'movie': % elif item['media_type'] == 'movie':
<h3 title="${item['title']}">${item['title']}</h3> <h3 title="${item['title']}">
<a href="info?source=history&rating_key=${item['rating_key']}">${item['title']}</a>
</h3>
<h3 class="text-muted">${item['year']}</h3> <h3 class="text-muted">${item['year']}</h3>
% endif % endif
</div> </div>
</a>
% elif item['media_type'] == 'track': % elif item['media_type'] == 'track':
<a href="info?source=history&rating_key=${item['rating_key']}"> <a href="info?source=history&rating_key=${item['rating_key']}">
<div class="dashboard-recent-media-cover"> <div class="dashboard-recent-media-cover">
@ -69,12 +77,18 @@ DOCUMENTATION :: END
</div> </div>
</div> </div>
</div> </div>
<div class="dashboard-recent-media-metacontainer">
<h3 title="${item['grandparent_title']}">${item['grandparent_title']}</h3>
<h3 title="${item['title']}">${item['title']}</h3>
<h3 class="text-muted">${item['parent_title']}</h3>
</div>
</a> </a>
<div class="dashboard-recent-media-metacontainer">
<h3 title="${item['grandparent_title']}">
<a href="info?rating_key=${item['grandparent_rating_key']}">${item['grandparent_title']}</a>
</h3>
<h3 title="${item['title']}">
<a href="info?source=history&rating_key=${item['rating_key']}">${item['title']}</a>
</h3>
<h3 class="text-muted">
<a href="info?rating_key=${item['parent_rating_key']}">${item['parent_title']}</a></a>
</h3>
</div>
% endif % endif
</li> </li>
% endfor % endfor

15
plexpy/config.py
View file

@ -132,11 +132,12 @@ _CONFIG_DEFINITIONS = {
'GROWL_ON_EXTUP': (int, 'Growl', 0), 'GROWL_ON_EXTUP': (int, 'Growl', 0),
'GROWL_ON_INTUP': (int, 'Growl', 0), 'GROWL_ON_INTUP': (int, 'Growl', 0),
'GROWL_ON_PMSUPDATE': (int, 'Growl', 0), 'GROWL_ON_PMSUPDATE': (int, 'Growl', 0),
'HOME_SECTIONS': (list, 'General', ['current_activity','watch_stats','library_stats','recently_added']),
'HOME_LIBRARY_CARDS': (list, 'General', ['first_run']), 'HOME_LIBRARY_CARDS': (list, 'General', ['first_run']),
'HOME_STATS_LENGTH': (int, 'General', 30), 'HOME_STATS_LENGTH': (int, 'General', 30),
'HOME_STATS_TYPE': (int, 'General', 0), 'HOME_STATS_TYPE': (int, 'General', 0),
'HOME_STATS_COUNT': (int, 'General', 5), 'HOME_STATS_COUNT': (int, 'General', 5),
'HOME_STATS_CARDS': (list, 'General', ['top_tv', 'popular_tv', 'top_movies', 'popular_movies', 'top_music', \ 'HOME_STATS_CARDS': (list, 'General', ['top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', \
'popular_music', 'last_watched', 'top_users', 'top_platforms', 'most_concurrent']), 'popular_music', 'last_watched', 'top_users', 'top_platforms', 'most_concurrent']),
'HTTPS_CREATE_CERT': (int, 'General', 1), 'HTTPS_CREATE_CERT': (int, 'General', 1),
'HTTPS_CERT': (str, 'General', ''), 'HTTPS_CERT': (str, 'General', ''),
@ -605,3 +606,15 @@ class Config(object):
if self.CONFIG_VERSION == '3': if self.CONFIG_VERSION == '3':
if self.HTTP_ROOT == '/': self.HTTP_ROOT = '' if self.HTTP_ROOT == '/': self.HTTP_ROOT = ''
self.CONFIG_VERSION = '4' self.CONFIG_VERSION = '4'
if self.CONFIG_VERSION == '4':
print not len(self.HOME_STATS_CARDS) and 'watch_stats' in self.HOME_SECTIONS
if not len(self.HOME_STATS_CARDS) and 'watch_stats' in self.HOME_SECTIONS:
home_sections = self.HOME_SECTIONS
home_sections.remove('watch_stats')
self.HOME_SECTIONS = home_sections
if not len(self.HOME_LIBRARY_CARDS) and 'library_stats' in self.HOME_SECTIONS:
home_sections = self.HOME_SECTIONS
home_sections.remove('library_stats')
self.HOME_SECTIONS = home_sections
self.CONFIG_VERSION = '4'

5
plexpy/libraries.py
View file

@ -711,7 +711,8 @@ class Libraries(object):
try: try:
if str(section_id).isdigit(): if str(section_id).isdigit():
query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \ query = 'SELECT session_history.id, session_history.media_type, ' \
'session_history.rating_key, session_history.parent_rating_key, session_history.grandparent_rating_key, ' \
'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \ 'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \
'year, started, user ' \ 'year, started, user ' \
'FROM session_history_metadata ' \ 'FROM session_history_metadata ' \
@ -738,6 +739,8 @@ class Libraries(object):
recent_output = {'row_id': row['id'], recent_output = {'row_id': row['id'],
'media_type': row['media_type'], 'media_type': row['media_type'],
'rating_key': row['rating_key'], 'rating_key': row['rating_key'],
'parent_rating_key': row['parent_rating_key'],
'grandparent_rating_key': row['grandparent_rating_key'],
'title': row['title'], 'title': row['title'],
'parent_title': row['parent_title'], 'parent_title': row['parent_title'],
'grandparent_title': row['grandparent_title'], 'grandparent_title': row['grandparent_title'],

5
plexpy/users.py
View file

@ -439,7 +439,8 @@ class Users(object):
try: try:
if str(user_id).isdigit(): if str(user_id).isdigit():
query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \ query = 'SELECT session_history.id, session_history.media_type, ' \
'session_history.rating_key, session_history.parent_rating_key, session_history.grandparent_rating_key, ' \
'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \ 'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \
'year, started, user ' \ 'year, started, user ' \
'FROM session_history_metadata ' \ 'FROM session_history_metadata ' \
@ -466,6 +467,8 @@ class Users(object):
recent_output = {'row_id': row['id'], recent_output = {'row_id': row['id'],
'media_type': row['media_type'], 'media_type': row['media_type'],
'rating_key': row['rating_key'], 'rating_key': row['rating_key'],
'parent_rating_key': row['parent_rating_key'],
'grandparent_rating_key': row['grandparent_rating_key'],
'title': row['title'], 'title': row['title'],
'parent_title': row['parent_title'], 'parent_title': row['parent_title'],
'grandparent_title': row['grandparent_title'], 'grandparent_title': row['grandparent_title'],

19
plexpy/webserve.py
View file

@ -150,6 +150,7 @@ class WebInterface(object):
@require() @require()
def home(self): def home(self):
config = { config = {
"home_sections": plexpy.CONFIG.HOME_SECTIONS,
"home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH, "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH,
"home_stats_cards": plexpy.CONFIG.HOME_STATS_CARDS, "home_stats_cards": plexpy.CONFIG.HOME_STATS_CARDS,
"home_library_cards": plexpy.CONFIG.HOME_LIBRARY_CARDS, "home_library_cards": plexpy.CONFIG.HOME_LIBRARY_CARDS,
@ -1290,6 +1291,7 @@ class WebInterface(object):
"notify_on_pmsupdate_subject_text": plexpy.CONFIG.NOTIFY_ON_PMSUPDATE_SUBJECT_TEXT, "notify_on_pmsupdate_subject_text": plexpy.CONFIG.NOTIFY_ON_PMSUPDATE_SUBJECT_TEXT,
"notify_on_pmsupdate_body_text": plexpy.CONFIG.NOTIFY_ON_PMSUPDATE_BODY_TEXT, "notify_on_pmsupdate_body_text": plexpy.CONFIG.NOTIFY_ON_PMSUPDATE_BODY_TEXT,
"notify_scripts_args_text": plexpy.CONFIG.NOTIFY_SCRIPTS_ARGS_TEXT, "notify_scripts_args_text": plexpy.CONFIG.NOTIFY_SCRIPTS_ARGS_TEXT,
"home_sections": json.dumps(plexpy.CONFIG.HOME_SECTIONS),
"home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH, "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH,
"home_stats_type": checked(plexpy.CONFIG.HOME_STATS_TYPE), "home_stats_type": checked(plexpy.CONFIG.HOME_STATS_TYPE),
"home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT, "home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT,
@ -1309,15 +1311,15 @@ class WebInterface(object):
checked_configs = [ checked_configs = [
"launch_browser", "enable_https", "https_create_cert", "api_enabled", "freeze_db", "check_github", "launch_browser", "enable_https", "https_create_cert", "api_enabled", "freeze_db", "check_github",
"grouping_global_history", "grouping_user_history", "grouping_charts", "pms_use_bif", "pms_ssl", "grouping_global_history", "grouping_user_history", "grouping_charts", "group_history_tables",
"pms_use_bif", "pms_ssl", "pms_is_remote", "home_stats_type",
"movie_notify_enable", "tv_notify_enable", "music_notify_enable", "monitoring_use_websocket", "movie_notify_enable", "tv_notify_enable", "music_notify_enable", "monitoring_use_websocket",
"tv_notify_on_start", "movie_notify_on_start", "music_notify_on_start", "tv_notify_on_start", "movie_notify_on_start", "music_notify_on_start",
"tv_notify_on_stop", "movie_notify_on_stop", "music_notify_on_stop", "tv_notify_on_stop", "movie_notify_on_stop", "music_notify_on_stop",
"tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause", "tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause",
"refresh_libraries_on_startup", "refresh_users_on_startup", "refresh_libraries_on_startup", "refresh_users_on_startup",
"ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable", "ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable",
"pms_is_remote", "home_stats_type", "group_history_tables", "notify_consecutive", "notify_upload_posters", "notify_consecutive", "notify_upload_posters", "notify_recently_added", "notify_recently_added_grandparent",
"notify_recently_added", "notify_recently_added_grandparent",
"monitor_pms_updates", "monitor_remote_access", "get_file_sizes", "log_blacklist", "http_hash_password" "monitor_pms_updates", "monitor_remote_access", "get_file_sizes", "log_blacklist", "http_hash_password"
] ]
for checked_config in checked_configs: for checked_config in checked_configs:
@ -1380,8 +1382,15 @@ class WebInterface(object):
kwargs.get('https_key') != plexpy.CONFIG.HTTPS_KEY: kwargs.get('https_key') != plexpy.CONFIG.HTTPS_KEY:
https_changed = True https_changed = True
# Remove config with 'hsec-' prefix and change home_sections to list
if kwargs.get('home_sections'):
for k in kwargs.keys():
if k.startswith('hsec-'):
del kwargs[k]
kwargs['home_sections'] = kwargs['home_sections'].split(',')
# Remove config with 'hscard-' prefix and change home_stats_cards to list # Remove config with 'hscard-' prefix and change home_stats_cards to list
if kwargs.get('home_stats_cards', ''): if kwargs.get('home_stats_cards'):
for k in kwargs.keys(): for k in kwargs.keys():
if k.startswith('hscard-'): if k.startswith('hscard-'):
del kwargs[k] del kwargs[k]
@ -1391,7 +1400,7 @@ class WebInterface(object):
kwargs['home_stats_cards'] = plexpy.CONFIG.HOME_STATS_CARDS kwargs['home_stats_cards'] = plexpy.CONFIG.HOME_STATS_CARDS
# Remove config with 'hlcard-' prefix and change home_library_cards to list # Remove config with 'hlcard-' prefix and change home_library_cards to list
if kwargs.get('home_library_cards', ''): if kwargs.get('home_library_cards'):
for k in kwargs.keys(): for k in kwargs.keys():
if k.startswith('hlcard-'): if k.startswith('hlcard-'):
del kwargs[k] del kwargs[k]