From 7321505d1beacfa5c213b3154d576d7dd9f6c509 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sun, 9 Oct 2011 17:18:58 +0200 Subject: [PATCH] Plot in search results. --- couchpotato/core/plugins/movie/static/search.css | 21 +++++++++++++++++---- couchpotato/core/plugins/movie/static/search.js | 16 +++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/couchpotato/core/plugins/movie/static/search.css b/couchpotato/core/plugins/movie/static/search.css index f65235f..053ecaa 100644 --- a/couchpotato/core/plugins/movie/static/search.css +++ b/couchpotato/core/plugins/movie/static/search.css @@ -1,6 +1,7 @@ /* @override http://localhost:5000/static/movie_plugin/search.css http://192.168.1.20:5000/static/movie_plugin/search.css + http://127.0.0.1:5000/static/movie_plugin/search.css */ .search_form { @@ -27,7 +28,6 @@ } .search_form .results_container { - padding: 10px 0; position: absolute; background: #5c697b; margin: 6px 0 0 -246px; @@ -54,9 +54,15 @@ position: absolute; width: 0px; left: 50%; - margin: -19px 0 0 110px; + margin: -9px 0 0 110px; } + .search_form .results { + max-height: 550px; + overflow-x: hidden; + padding: 10px 0; + } + .search_form .results .movie { overflow: hidden; min-height: 140px; @@ -113,12 +119,12 @@ margin: -143px 0 0 0; min-height: 140px; background: #5c697b; + cursor: pointer; border-bottom: 1px solid #333; border-top: 1px solid rgba(255,255,255, 0.15); } - - .search_form .results .movie:first-child .data { border-top: 0; } + .search_form .results .movie:last-child .data { border-bottom: 0; } .search_form .results .movie .thumbnail { @@ -141,6 +147,13 @@ vertical-align: top; padding: 15px 0; } + + .search_form .results .movie .info .tagline { + max-height: 70px; + overflow: hidden; + display: inline-block; + } + .search_form .results .movie .add +.info { margin-left: 20%; } diff --git a/couchpotato/core/plugins/movie/static/search.js b/couchpotato/core/plugins/movie/static/search.js index b89f27e..b92ee74 100644 --- a/couchpotato/core/plugins/movie/static/search.js +++ b/couchpotato/core/plugins/movie/static/search.js @@ -25,6 +25,11 @@ Block.Search = new Class({ self.result_container = new Element('div.results_container', { 'tween': { 'duration': 200 + }, + 'events': { + 'mousewheel': function(e){ + (e).stopPropagation(); + } } }).adopt( new Element('div.pointer'), @@ -182,17 +187,18 @@ Block.Search.Item = new Class({ self.title = new Element('h2', { 'text': info.titles[0] }).adopt( - self.year = info.year ? new Element('span', { + self.year = info.year ? new Element('span.year', { 'text': info.year }) : null ), - self.tagline = new Element('span', { - 'text': info.tagline + self.tagline = new Element('span.tagline', { + 'text': info.tagline ? info.tagline : info.plot, + 'title': info.tagline ? info.tagline : info.plot }), - self.director = self.info.director ? new Element('span', { + self.director = self.info.director ? new Element('span.director', { 'text': 'Director:' + info.director }) : null, - self.starring = info.actors ? new Element('span', { + self.starring = info.actors ? new Element('span.actors', { 'text': 'Starring:' }) : null )