From 1c3a3876e380fc457938d0ceb5fca8ae6de94365 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Fri, 25 Sep 2015 00:26:54 -0700 Subject: [PATCH] Update styles for confirm modal box --- data/interfaces/default/css/plexpy.css | 7 ++++++ data/interfaces/default/info.html | 25 ++++++++++++++++--- .../default/info_search_results_list.html | 19 +++----------- plexpy/datafactory.py | 4 ++- 4 files changed, 36 insertions(+), 19 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 2edde3f0..2caf485c 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -1418,6 +1418,13 @@ a:hover .item-children-poster { width: 40px; margin-right: 20px; } +#new_title h3 { + color: #F9AA03; + font-size: 14px; + line-height: 1.42857143; + font-weight: bold; + margin: 0; +} .settings-alert { float: left; padding: 0; diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index b036b91f..17473a4a 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -41,6 +41,7 @@ parent_title Returns the name of the album. grandparent_title Returns the name of the show, or artist. media_index Returns the index number of the episode, or track. parent_media_index Returns the index number of the season. +year Returns the release year of the movie, or show. media_type Returns the type of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'. rating_key Returns the unique identifier for the media item. @@ -454,8 +455,26 @@ DOCUMENTATION :: END
-

Are you REALLY sure you want to replace ${query['title']} with

-

+

Are you REALLY sure you want to replace +

+ % if query['media_type'] == 'movie': + ${query['title']}
${query['year']} + % elif query['media_type'] == 'show': + ${query['grandparent_title']}
${query['year']} + % elif query['media_type'] == 'season': + ${query['grandparent_title']}
S${query['parent_media_index']} + % elif query['media_type'] == 'episode': + ${query['grandparent_title']}
${query['title']}
S${query['parent_media_index']} · E${query['media_index']} + % elif query['media_type'] == 'artist': + ${query['grandparent_title']} + % elif query['media_type'] == 'album': + ${query['grandparent_title']}
${query['parent_title']} + % elif query['media_type'] == 'track': + ${query['grandparent_title']}
${query['title']}
${query['parent_title']} + % endif +

+

with

+

This is permanent and cannot be undone!

@@ -613,7 +632,7 @@ DOCUMENTATION :: END var new_rating_key = $(this).attr("id"); var new_href = $(this).attr("href"); - $('#new_title').text($(this).find('.item-children-instance-text-wrapper').text()); + $('#new_title').html($(this).find('.item-children-instance-text-wrapper').html()); $('#confirm-modal').modal(); $('#confirm-modal').one('click', '#confirm-update', function () { diff --git a/data/interfaces/default/info_search_results_list.html b/data/interfaces/default/info_search_results_list.html index cce48281..c1d91765 100644 --- a/data/interfaces/default/info_search_results_list.html +++ b/data/interfaces/default/info_search_results_list.html @@ -108,16 +108,11 @@ DOCUMENTATION :: END
  • -
    -
    -
    - Season ${child['index']} -
    -
    -
    +

    ${child['parent_title']}

    +

    S${child['parent_index']}
    • @@ -135,18 +130,12 @@ DOCUMENTATION :: END
  • -
    -
    -
    - Episode ${child['index']} -
    -
    -
    +

    ${child['grandparent_title']}

    ${child['title']}

    -

    S${child['parent_index']}

    +

    S${child['parent_index']} · E${child['index']}
    • diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 2dfda9cb..119662e3 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -784,7 +784,7 @@ class DataFactory(object): if rating_key: query = 'SELECT rating_key, parent_rating_key, grandparent_rating_key, title, parent_title, grandparent_title, ' \ - 'media_index, parent_media_index, media_type ' \ + 'media_index, parent_media_index, year, media_type ' \ 'FROM session_history_metadata ' \ 'WHERE rating_key = ? ' \ 'OR parent_rating_key = ? ' \ @@ -804,6 +804,7 @@ class DataFactory(object): grandparent_title = item['grandparent_title'] media_index = item['media_index'] parent_media_index = item['parent_media_index'] + year = item['year'] if str(item['rating_key']) == rating_key: query_string = item['title'] @@ -832,6 +833,7 @@ class DataFactory(object): 'grandparent_title': grandparent_title, 'media_index': media_index, 'parent_media_index': parent_media_index, + 'year': year, 'media_type': media_type, 'rating_key': rating_key }