diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index 18601b60..1caa1d3b 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -76,11 +76,11 @@ DOCUMENTATION :: END
% if not a['art'].startswith('interfaces') or not a['thumb'].startswith('interfaces'): % if (a['media_type'] == 'movie' and not a['indexes']) or (a['indexes'] and not a['view_offset']): -
+
% elif (a['media_type'] == 'episode' and not a['indexes']) or (a['indexes'] and not a['view_offset']): -
+
% elif a['indexes']: - + % else: % if a['media_type'] == 'track':
@@ -92,9 +92,9 @@ DOCUMENTATION :: END
% else: % if a['art']: -
+
% else: -
+
% endif % endif % elif a['media_type'] == 'photo': diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 9ea2452a..139b1915 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -113,7 +113,7 @@ DOCUMENTATION :: END % endif % if data['media_type'] == 'episode': -
+
diff --git a/data/interfaces/default/info_children_list.html b/data/interfaces/default/info_children_list.html index decb2049..74065872 100644 --- a/data/interfaces/default/info_children_list.html +++ b/data/interfaces/default/info_children_list.html @@ -41,9 +41,9 @@ DOCUMENTATION :: END %if data['children_type'] == 'season':
% if child['thumb']: -
+
% else: -
+
% endif
@@ -54,7 +54,7 @@ DOCUMENTATION :: END
% elif data['children_type'] == 'episode':
-
+
Episode ${child['media_index']} @@ -67,7 +67,7 @@ DOCUMENTATION :: END
% elif data['children_type'] == 'album':
-
+

${child['title']}

diff --git a/data/interfaces/default/info_search_results_list.html b/data/interfaces/default/info_search_results_list.html index a233e735..e397ac94 100644 --- a/data/interfaces/default/info_search_results_list.html +++ b/data/interfaces/default/info_search_results_list.html @@ -64,7 +64,7 @@ DOCUMENTATION :: END
  • -
    +

    ${child['title']}

    @@ -86,7 +86,7 @@ DOCUMENTATION :: END
  • -
    +

    ${child['title']}

    @@ -108,7 +108,7 @@ DOCUMENTATION :: END
  • -
    +

    ${child['parent_title']}

    @@ -130,7 +130,7 @@ DOCUMENTATION :: END
  • -
    +

    ${child['grandparent_title']}

    @@ -153,7 +153,7 @@ DOCUMENTATION :: END
  • -
    +

    ${child['title']}

    @@ -174,7 +174,7 @@ DOCUMENTATION :: END
  • -
    +

    ${child['parent_title']}

    @@ -196,7 +196,7 @@ DOCUMENTATION :: END
  • -
    +
    Track ${child['media_index']} diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index 7749ef4e..adba1965 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -149,7 +149,7 @@ history_table_options = { } else if (rowData['media_type'] === 'track') { if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + thumb_popover = '' + cellData + parent_info + '' $(td).html(''); } else { $(td).html('' + cellData + ''); diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js index 268f1dc1..d2a827c5 100644 --- a/data/interfaces/default/js/tables/history_table_modal.js +++ b/data/interfaces/default/js/tables/history_table_modal.js @@ -113,7 +113,7 @@ history_table_modal_options = { } else if (rowData['media_type'] === 'track') { if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + thumb_popover = '' + cellData + parent_info + '' $(td).html(''); } else { $(td).html('' + cellData + ''); diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js index 84bbfae8..a70fc766 100644 --- a/data/interfaces/default/js/tables/libraries.js +++ b/data/interfaces/default/js/tables/libraries.js @@ -44,7 +44,7 @@ libraries_list_table_options = { if (rowData['library_thumb'].substring(0, 4) == "http") { $(td).html('
    '); } else { - $(td).html('
    '); + $(td).html('
    '); } } else { $(td).html('
    '); @@ -152,7 +152,7 @@ libraries_list_table_options = { } else if (rowData['media_type'] === 'track') { if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + thumb_popover = '' + cellData + parent_info + '' $(td).html(''); } else if (rowData['media_type']) { $(td).html('' + cellData + ''); diff --git a/data/interfaces/default/js/tables/media_info_table.js b/data/interfaces/default/js/tables/media_info_table.js index 3a6d38e6..72d43d8b 100644 --- a/data/interfaces/default/js/tables/media_info_table.js +++ b/data/interfaces/default/js/tables/media_info_table.js @@ -87,19 +87,19 @@ media_info_table_options = { $(td).html(''); } else if (rowData['media_type'] === 'episode') { media_type = ''; - thumb_popover = 'E' + rowData['media_index'] + ' - ' + cellData + '' + thumb_popover = 'E' + rowData['media_index'] + ' - ' + cellData + '' $(td).html(''); } else if (rowData['media_type'] === 'artist') { media_type = ''; - thumb_popover = '' + cellData + '' + thumb_popover = '' + cellData + '' $(td).html(''); } else if (rowData['media_type'] === 'album') { media_type = ''; - thumb_popover = '' + cellData + '' + thumb_popover = '' + cellData + '' $(td).html(''); } else if (rowData['media_type'] === 'track') { media_type = ''; - thumb_popover = 'T' + rowData['media_index'] + ' - ' + cellData + '' + thumb_popover = 'T' + rowData['media_index'] + ' - ' + cellData + '' $(td).html(''); } else { $(td).html(cellData); diff --git a/data/interfaces/default/js/tables/user_ips.js b/data/interfaces/default/js/tables/user_ips.js index f0a2a16c..ba41200e 100644 --- a/data/interfaces/default/js/tables/user_ips.js +++ b/data/interfaces/default/js/tables/user_ips.js @@ -100,7 +100,7 @@ user_ip_table_options = { } else if (rowData['media_type'] === 'track') { if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + thumb_popover = '' + cellData + parent_info + '' $(td).html(''); } else if (rowData['media_type']) { $(td).html('' + cellData + ''); diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js index 3e079d92..e2469d4d 100644 --- a/data/interfaces/default/js/tables/users.js +++ b/data/interfaces/default/js/tables/users.js @@ -174,7 +174,7 @@ users_list_table_options = { } else if (rowData['media_type'] === 'track') { if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; } media_type = ''; - thumb_popover = '' + cellData + parent_info + '' + thumb_popover = '' + cellData + parent_info + '' $(td).html(''); } else if (rowData['media_type']) { $(td).html('' + cellData + ''); diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 9ebae138..e5cde339 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -1905,6 +1905,14 @@ class WebInterface(object): return fallback_image except IOError, e: logger.error(u"Unable to read fallback %s image: %s" % (fallback, e)) + elif fallback == 'art': + logger.info(u"Trying fallback image...") + try: + fallback_image = open(self.interface_dir + common.DEFAULT_ART, 'rb') + cherrypy.response.headers['Content-type'] = 'image/png' + return fallback_image + except IOError, e: + logger.error(u"Unable to read fallback %s image: %s" % (fallback, e)) return None