From 07eb1f7f4c266ac754d4a2238f436410f23218a2 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Mon, 5 May 2014 22:01:11 +0200
Subject: [PATCH] Allow page ordering

---
 .../_base/static/{2_manage.js => manage.js}   |  1 +
 .../_base/static/{1_wanted.js => wanted.js}   |  1 +
 couchpotato/core/plugins/log/static/log.js    |  1 +
 .../plugins/userscript/static/userscript.js   |  1 +
 .../core/plugins/wizard/static/wizard.js      |  1 +
 couchpotato/static/scripts/couchpotato.js     | 21 ++++++++++++++++---
 couchpotato/static/scripts/page.js            |  6 ++++++
 couchpotato/static/scripts/page/settings.js   |  3 ++-
 8 files changed, 31 insertions(+), 4 deletions(-)
 rename couchpotato/core/media/movie/_base/static/{2_manage.js => manage.js} (99%)
 rename couchpotato/core/media/movie/_base/static/{1_wanted.js => wanted.js} (99%)

diff --git a/couchpotato/core/media/movie/_base/static/2_manage.js b/couchpotato/core/media/movie/_base/static/manage.js
similarity index 99%
rename from couchpotato/core/media/movie/_base/static/2_manage.js
rename to couchpotato/core/media/movie/_base/static/manage.js
index be99a845..e8618999 100644
--- a/couchpotato/core/media/movie/_base/static/2_manage.js
+++ b/couchpotato/core/media/movie/_base/static/manage.js
@@ -2,6 +2,7 @@ Page.Manage = new Class({
 
 	Extends: PageBase,
 
+	order: 20,
 	name: 'manage',
 	title: 'Do stuff to your existing movies!',
 
diff --git a/couchpotato/core/media/movie/_base/static/1_wanted.js b/couchpotato/core/media/movie/_base/static/wanted.js
similarity index 99%
rename from couchpotato/core/media/movie/_base/static/1_wanted.js
rename to couchpotato/core/media/movie/_base/static/wanted.js
index ca57f957..461a64e1 100644
--- a/couchpotato/core/media/movie/_base/static/1_wanted.js
+++ b/couchpotato/core/media/movie/_base/static/wanted.js
@@ -2,6 +2,7 @@ Page.Wanted = new Class({
 
 	Extends: PageBase,
 
+	order: 10,
 	name: 'wanted',
 	title: 'Gimmy gimmy gimmy!',
 	folder_browser: null,
diff --git a/couchpotato/core/plugins/log/static/log.js b/couchpotato/core/plugins/log/static/log.js
index c5effeba..a08b105b 100644
--- a/couchpotato/core/plugins/log/static/log.js
+++ b/couchpotato/core/plugins/log/static/log.js
@@ -2,6 +2,7 @@ Page.Log = new Class({
 
 	Extends: PageBase,
 
+	order: 60,
 	name: 'log',
 	title: 'Show recent logs.',
 	has_tab: false,
diff --git a/couchpotato/core/plugins/userscript/static/userscript.js b/couchpotato/core/plugins/userscript/static/userscript.js
index 2ef1ea6a..d8caeb3f 100644
--- a/couchpotato/core/plugins/userscript/static/userscript.js
+++ b/couchpotato/core/plugins/userscript/static/userscript.js
@@ -2,6 +2,7 @@ Page.Userscript = new Class({
 
 	Extends: PageBase,
 
+	order: 80,
 	name: 'userscript',
 	has_tab: false,
 
diff --git a/couchpotato/core/plugins/wizard/static/wizard.js b/couchpotato/core/plugins/wizard/static/wizard.js
index b43e3985..fdd7b743 100644
--- a/couchpotato/core/plugins/wizard/static/wizard.js
+++ b/couchpotato/core/plugins/wizard/static/wizard.js
@@ -2,6 +2,7 @@ Page.Wizard = new Class({
 
 	Extends: Page.Settings,
 
+	order: 70,
 	name: 'wizard',
 	has_tab: false,
 	wizard_only: true,
diff --git a/couchpotato/static/scripts/couchpotato.js b/couchpotato/static/scripts/couchpotato.js
index ffc0e9aa..e08e2c3d 100644
--- a/couchpotato/static/scripts/couchpotato.js
+++ b/couchpotato/static/scripts/couchpotato.js
@@ -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.content);
+			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;
 
diff --git a/couchpotato/static/scripts/page.js b/couchpotato/static/scripts/page.js
index 58ba5acd..57b8b108 100644
--- a/couchpotato/static/scripts/page.js
+++ b/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){
diff --git a/couchpotato/static/scripts/page/settings.js b/couchpotato/static/scripts/page/settings.js
index 09155486..de5ffcbc 100644
--- a/couchpotato/static/scripts/page/settings.js
+++ b/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){