From 2d19accdd1c147bddcfa35b1ffdbde8bc8b75a0f Mon Sep 17 00:00:00 2001
From: drzoidberg33 <timvdwest@gmail.com>
Date: Sun, 23 Aug 2015 00:08:55 +0200
Subject: [PATCH] Revert "Info pages"

---
 data/interfaces/default/css/plexpy.css | 20 ++-------
 data/interfaces/default/info.html      | 56 +++++++++++---------------
 plexpy/pmsconnect.py                   |  5 +--
 3 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index 7bbf8d46..7d715a3c 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index 8eba3f9b..b2ba2b98 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -54,18 +54,10 @@ DOCUMENTATION :: END
                         <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
@@ -75,10 +67,10 @@ DOCUMENTATION :: END
                                         % 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
@@ -123,6 +115,20 @@ DOCUMENTATION :: END
                             </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>
@@ -152,22 +158,6 @@ DOCUMENTATION :: END
                                     </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>
@@ -342,8 +332,8 @@ DOCUMENTATION :: END
 </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>
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index 7fb15618..54d2093f 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -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
@@ -334,8 +334,6 @@ class PmsConnect(object):
         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'),
@@ -396,7 +394,6 @@ class PmsConnect(object):
             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'),