diff --git a/couchpotato/core/media/movie/_base/static/list.js b/couchpotato/core/media/movie/_base/static/list.js index 35a9da0..35d256f 100644 --- a/couchpotato/core/media/movie/_base/static/list.js +++ b/couchpotato/core/media/movie/_base/static/list.js @@ -153,7 +153,7 @@ var MovieList = new Class({ if(!self.navigation_counter) return; self.counter_count = count; - self.navigation_counter.set('text', (count || 0) + ' movies'); + self.navigation_counter.set('text', count === 1 ? '1 movie' : (count || 0) + ' movies'); if (self.empty_message) { self.empty_message.destroy(); diff --git a/couchpotato/static/scripts/combined.plugins.min.js b/couchpotato/static/scripts/combined.plugins.min.js index 0ad38f6..d415259 100644 --- a/couchpotato/static/scripts/combined.plugins.min.js +++ b/couchpotato/static/scripts/combined.plugins.min.js @@ -549,7 +549,7 @@ var MovieList = new Class({ var self = this; if (!self.navigation_counter) return; self.counter_count = count; - self.navigation_counter.set("text", (count || 0) + " movies"); + self.navigation_counter.set("text", count === 1 ? "1 movie" : (count || 0) + " movies"); if (self.empty_message) { self.empty_message.destroy(); self.empty_message = null; @@ -1938,10 +1938,11 @@ var Movie = new Class({ var self = this; if (e.target.getParents(".actions").length == 0 && e.target != self.select_checkbox) { e.stopPropagation(); + self.addActions(); self.openDetails(); } }, - onMouseenter: function() { + addActions: function() { var self = this; if (self.actions.length <= 0) { self.options.actions.each(function(a) { @@ -1953,7 +1954,11 @@ var Movie = new Class({ self.actions.push(action); }); } + }, + onMouseenter: function() { + var self = this; if (App.mobile_screen) return; + self.addActions(); if (self.list.current_view == "thumb") { dynamics.css(self.el, { scale: 1, diff --git a/couchpotato/static/style/combined.min.css b/couchpotato/static/style/combined.min.css index 4b764a1..f270213 100644 --- a/couchpotato/static/style/combined.min.css +++ b/couchpotato/static/style/combined.min.css @@ -92,6 +92,7 @@ } .big_search{background:#eaeaea} .page.movies{bottom:auto;z-index:21;height:80px} +.page.movies .scroll_content{overflow:inherit} .page.movies_manage,.page.movies_wanted{top:80px;padding:0;transition:top 300ms cubic-bezier(.9,0,.1,1)} @media (max-width:480px){.page.movies{height:44px} .page.movies_manage,.page.movies_wanted{top:44px}