Browse Source

Merge branch 'refs/heads/develop' into desktop

tags/build/2.0.7.1
Ruud 12 years ago
parent
commit
6702683da3
  1. 6
      couchpotato/core/plugins/movie/static/list.js
  2. 2
      couchpotato/core/plugins/searcher/main.py
  3. 2
      couchpotato/static/scripts/page/home.js

6
couchpotato/core/plugins/movie/static/list.js

@ -144,7 +144,7 @@ var MovieList = new Class({
var self = this;
var chars = '#ABCDEFGHIJKLMNOPQRSTUVWXYZ';
self.current_view = self.getSavedView();
self.current_view = self.getSavedView() || 'details';
self.el.addClass(self.current_view+'_list')
self.navigation = new Element('div.alph_nav').adopt(
@ -429,12 +429,12 @@ var MovieList = new Class({
.addClass(new_view+'_list')
self.current_view = new_view;
Cookie.write(self.options.identifier+'_view', new_view, {duration: 1000});
Cookie.write(self.options.identifier+'_view2', new_view, {duration: 1000});
},
getSavedView: function(){
var self = this;
return Cookie.read(self.options.identifier+'_view') || 'details';
return Cookie.read(self.options.identifier+'_view2');
},
search: function(){

2
couchpotato/core/plugins/searcher/main.py

@ -165,7 +165,7 @@ class Searcher(Plugin):
# See if better quality is available
for release in movie['releases']:
if release['quality']['order'] < quality_type['quality']['order'] and release['status_id'] not in [available_status.get('id'), ignored_status.get('id')]:
if release['quality']['order'] <= quality_type['quality']['order'] and release['status_id'] not in [available_status.get('id'), ignored_status.get('id')]:
has_better_quality += 1
# Don't search for quality lower then already available.

2
couchpotato/static/scripts/page/home.js

@ -37,7 +37,7 @@ Page.Home = new Class({
'identifier': 'soon',
'limit': 18,
'title': 'Available soon',
'description': 'These are being searches for and should be available soon as they will be released on DVD in the next few weeks.',
'description': 'These are being searched for and should be available soon as they will be released on DVD in the next few weeks.',
'on_empty_element': new Element('div').adopt(
new Element('h1', {'text': 'Available soon'}),
new Element('span', {'text': 'There are no movies available soon. Add some movies, so you have something to watch later.'})

Loading…
Cancel
Save