Skip to content

Commit

Permalink
Merge pull request #110 from drzoidberg33/revert-108-info-pages
Browse files Browse the repository at this point in the history 
Revert "Info pages"
  • Loading branch information
@drzoidberg33
drzoidberg33 committed Aug 22, 2015
2 parents 3d57060 + 2d19acc commit 0f04a6d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 54 deletions.
20 changes: 3 additions & 17 deletions data/interfaces/default/css/plexpy.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ select {
outline: none;
}
select.input-sm {
margin: 5px 0 5px 0;
margin: 5px 0 5px 0;
border: 2px solid #444;
background: #333;
-webkit-border-radius: 2px;
Expand All @@ -34,8 +34,8 @@ select.input-sm {
}
img {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
.navbar {
background: #000;
Expand Down Expand Up @@ -792,11 +792,6 @@ input[type="color"],
width: 174px;
height: 260px;
}
.summary-content-poster a:hover .poster-face {
webkit-box-shadow: inset 0 0 0 2px #e9a049;
-moz-box-shadow: inset 0 0 0 2px #e9a049;
box-shadow: inset 0 0 0 2px #e9a049;
}
.summary-content-poster img {
bottom: 0;
overflow: hidden;
Expand Down Expand Up @@ -848,13 +843,6 @@ input[type="color"],
line-height: 32px;
float: left;
}
.summary-content-title h1 a{
color: #F9AA03;
}
.summary-content-title h1 a:hover{
color: #F9AA03;
text-decoration: underline;
}
.summary-content-details-wrapper {
width: 100%;
padding-bottom: 15px;
Expand Down Expand Up @@ -921,8 +909,6 @@ input[type="color"],
}
.summary-content-people-wrapper {
margin-top: 25px;
margin-right: 25px;
float: left;
}
.summary-content-people-wrapper hidden-phone hidden-tablet {
overflow: hidden;
Expand Down
56 changes: 23 additions & 33 deletions data/interfaces/default/info.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,10 @@
<div class="row">
<div class="col-md-9">
<div class="summary-content-poster hidden-xs hidden-sm">
% if data['type'] == 'episode':
<a href="info?item_id=${data['parent_rating_key']}">
% if data['parent_thumb']:
<div class="poster-face" style="background-image: url(pms_image_proxy?img=${data['parent_thumb']}&width=300&height=450&fallback=poster);"></div>
% else:
<div class="poster-face" style="background-image: url(pms_image_proxy?img=${data['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
%endif
</a>
% elif data['type'] == 'season':
<a href="info?item_id=${data['parent_rating_key']}">
<div class="poster-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster);"></div>
</a>
% if data['type'] == 'episode' and data['parent_thumb']:
<div class="poster-face" style="background-image: url(pms_image_proxy?img=${data['parent_thumb']}&width=300&height=450&fallback=poster);"></div>
% elif data['type'] == 'episode':
<div class="poster-face" style="background-image: url(pms_image_proxy?img=${data['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
% else:
<div class="poster-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster);"></div>
% endif
Expand All @@ -75,10 +67,10 @@
% if data['type'] == 'movie':
<h1>${data['title']}</h1>
% elif data['type'] == 'season':
<h1><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a> (${data['title']})</h1>
<h1>${data['parent_title']} (${data['title']})</h1>
% elif data['type'] == 'episode':
<h1><a href="info?item_id=${data['grandparent_rating_key']}">${data['grandparent_title']}</a> - ${data['title']}
(<a href="info?item_id=${data['parent_rating_key']}">Season ${data['parent_index']}</a>, Episode ${data['index']})</h1>
<h1>${data['grandparent_title']} - ${data['title']}
(Season ${data['parent_index']}, Episode ${data['index']})</h1>
% else:
<h1>${data['title']}</h1>
% endif
Expand Down Expand Up @@ -123,6 +115,20 @@ <h1>${data['title']}</h1>
</div>
<div class="col-md-3">
<div class="summary-content-people-wrapper hidden-xs hidden-sm">
% if (data['type'] == 'movie' or data['type'] == 'show') and data['genres']:
<div class="summary-content-genres">
<strong>Genres</strong>
<ul>
% for genre in data['genres']:
% if loop.index < 5:
<li>
${genre}
</li>
% endif
% endfor
</ul>
</div>
% endif
% if (data['type'] == 'episode' or data['type'] == 'movie') and data['writers']:
<div class="summary-content-writers">
<strong>Written by</strong>
Expand Down Expand Up @@ -152,22 +158,6 @@ <h1>${data['title']}</h1>
</div>
% endif
</div>
<div class="summary-content-people-wrapper hidden-xs hidden-sm">
% if (data['type'] == 'movie' or data['type'] == 'show') and data['genres']:
<div class="summary-content-genres">
<strong>Genres</strong>
<ul>
% for genre in data['genres']:
% if loop.index < 5:
<li>
${genre}
</li>
% endif
% endfor
</ul>
</div>
% endif
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -342,8 +332,8 @@ <h3>Error retrieving item data. This media may not be available in the Plex Medi
</script>
% endif
<script>
$("#airdate").html(moment($("#airdate").text()).format('MMM DD, YYYY'));
$("#runtime").html(millisecondsToMinutes($("#runtime").text(), true));
$("#airdate").html(moment($("#airdate")).format('MMM DD, YYYY'));
$("#runtime").html(millisecondsToMinutes($("#runtime").html(), true));
</script>
% endif
</%def>
5 changes: 1 addition & 4 deletions plexpy/pmsconnect.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file is part of PlexPy.
# This file is part of PlexPy.
#
# PlexPy is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -334,8 +334,6 @@ def get_metadata_details(self, rating_key=''):
elif metadata_type == 'episode':
metadata = {'type': metadata_type,
'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
Expand Down Expand Up @@ -396,7 +394,6 @@ def get_metadata_details(self, rating_key=''):
show_details = self.get_metadata_details(parent_rating_key)
metadata = {'type': metadata_type,
'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
Expand Down

0 comments on commit 0f04a6d

Please sign in to comment.