Merge branch 'refs/heads/develop' into redesign

Conflicts:
	couchpotato/static/scripts/couchpotato.js

couchpotato/static/scripts/couchpotato.js

@@ -1,4 +1,4 @@
-var CouchPotato = new Class({
+var CouchPotato = new Class({
 
 	Implements: [Events, Options],
 
@@ -137,19 +137,34 @@
 	createPages: function(){
 		var self = this;
 
+		var pages = [];
 		Object.each(Page, function(page_class, class_name){
 			var pg = new Page[class_name](self, {});
 			self.pages[class_name] = pg;
 
-			self.fireEvent('load'+class_name);
-
-			$(pg).inject(self.pages);
+			pages.include({
+				'order': pg.order,
+				'name': class_name,
+				'class': pg
+			});
 		});
 
+		pages.stableSort(self.sortPageByOrder).each(function(page){
+			page['class'].load();
+			self.fireEvent('load'+page.name);
+			$(page['class']).inject(self.content);
+		});
+
+		delete pages;
+
 		self.fireEvent('load');
 
 	},
 
+	sortPageByOrder: function(a, b){
+		return (a.order || 100) - (b.order || 100)
+	},
+
 	openPage: function(url) {
 		var self = this;
 

couchpotato/static/scripts/page.js

@@ -6,6 +6,7 @@ var PageBase = new Class({
 
 	},
 
+	order: 1,
 	has_tab: true,
 	name: '',
 
@@ -16,6 +17,10 @@ var PageBase = new Class({
 
 		// Create main page container
 		self.el = new Element('div.page.'+self.name);
+	},
+
+	load: function(){
+		var self = this;
 
 		// Create tab for page
 		if(self.has_tab){
@@ -26,6 +31,7 @@ var PageBase = new Class({
 				'text': self.name.capitalize()
 			});
 		}
+
 	},
 
 	open: function(action, params){

couchpotato/static/scripts/page/home.js

@@ -104,7 +104,7 @@ Page.Home = new Class({
 
 		// Make all thumbnails the same size
 		self.soon_list.addEvent('loaded', function(){
-			var images = $(self.soon_list).getElements('.poster'),
+			var images = $(self.soon_list).getElements('.poster, .no_thumbnail'),
 				timer,
 				highest = 100;
 

couchpotato/static/scripts/page/settings.js

@@ -2,6 +2,7 @@ Page.Settings = new Class({
 
 	Extends: PageBase,
 
+	order: 50,
 	name: 'settings',
 	title: 'Change settings.',
 	wizard_only: false,
@@ -112,7 +113,7 @@ Page.Settings = new Class({
 	},
 
     sortByOrder: function(a, b){
-			return (a.order || 100) - (b.order || 100)
+		return (a.order || 100) - (b.order || 100)
 	},
 
 	create: function(json){