Movie lists

couchpotato/static/scripts/block/header.js

@@ -0,0 +1,66 @@
+var BlockHeader = new Class({
+
+	Extends: BlockNavigation,
+
+	create: function(){
+		var self = this;
+
+		self.parent();
+
+		self.el.adopt(
+			self.foldout = new Element('a.foldout.icon2.menu', {
+				'events': {
+					'click': self.toggleMenu.bind(self)
+				}
+			}).grab(new Element('span.overlay')),
+			self.logo = new Element('a.logo', {
+				'html': '<span>Couch</span><span>Potato</span>',
+				'href': App.createUrl('')
+			}),
+			self.nav
+		);
+
+		new ScrollSpy({
+			min: 400,
+			onLeave: function(){
+				self.backtotop.fade('out');
+			},
+			onEnter: function(){
+				self.backtotop.fade('in');
+			}
+		});
+
+		self.nav.addEvents({
+			'click:relay(a)': function(){
+				if($(document.body).getParent().hasClass('menu_shown'))
+					self.toggleMenu();
+			}
+		});
+
+	},
+
+	toggleMenu: function(){
+		var self = this,
+			body = $(document.body),
+			html = body.getParent();
+
+		// Copy over settings menu
+		if(!self.added){
+
+			new Element('li.separator').inject(self.nav);
+			body.getElements('.header .more_menu.menu li a, .header .more_menu.menu li span.separator').each(function(el, nr){
+				if(nr <= 2) return;
+				if(el.get('tag') == 'a')
+					self.nav.grab(new Element('li').grab(el.clone().cloneEvents(el)));
+				else
+					self.nav.grab(new Element('li.separator'));
+			});
+
+			self.added = true;
+		}
+
+		html.toggleClass('menu_shown');
+
+	}
+
+});

couchpotato/static/scripts/block/navigation.js

@@ -5,47 +5,10 @@ var BlockNavigation = new Class({
 	create: function(){
 		var self = this;
 
-		self.el = new Element('div.navigation').adopt(
-			self.foldout = new Element('a.foldout.icon2.menu', {
-				'events': {
-					'click': self.toggleMenu.bind(self)
-				}
-			}).grab(new Element('span.overlay')),
-			self.logo = new Element('a.logo', {
-				'html': '<span>Couch</span><span>Potato</span>',
-				'href': App.createUrl('')
-			}),
-			self.nav = new Element('ul'),
-			self.backtotop = new Element('a.backtotop', {
-				'text': 'back to top',
-				'events': {
-					'click': function(){
-						window.scroll(0,0);
-					}
-				},
-				'tween': {
-					'duration': 100
-				}
-			})
+		self.el = new Element('div.navigation').grab(
+			self.nav = new Element('ul')
 		);
 
-		new ScrollSpy({
-			min: 400,
-			onLeave: function(){
-				self.backtotop.fade('out');
-			},
-			onEnter: function(){
-				self.backtotop.fade('in');
-			}
-		});
-
-		self.nav.addEvents({
-			'click:relay(a)': function(){
-				if($(document.body).getParent().hasClass('menu_shown'))
-					self.toggleMenu();
-			}
-		});
-
 	},
 
 	addTab: function(name, tab){
@@ -57,30 +20,6 @@ var BlockNavigation = new Class({
 
 	},
 
-	toggleMenu: function(){
-		var self = this,
-			body = $(document.body),
-			html = body.getParent();
-
-		// Copy over settings menu
-		if(!self.added){
-
-			new Element('li.separator').inject(self.nav);
-			body.getElements('.header .more_menu.menu li a, .header .more_menu.menu li span.separator').each(function(el, nr){
-				if(nr <= 2) return;
-				if(el.get('tag') == 'a')
-					self.nav.grab(new Element('li').grab(el.clone().cloneEvents(el)));
-				else
-					self.nav.grab(new Element('li.separator'));
-			});
-
-			self.added = true;
-		}
-
-		html.toggleClass('menu_shown');
-
-	},
-
 	activate: function(name){
 		var self = this;
 

couchpotato/static/scripts/couchpotato.js

@@ -23,8 +23,6 @@
 
 		self.c = $(document.body);
 
-		self.route = new Route(self.defaults);
-
 		self.createLayout();
 		self.createPages();
 
@@ -79,7 +77,7 @@
 
 		self.c.adopt(
 			$(self.block.header).addClass('header').adopt(
-				self.block.navigation = new BlockNavigation(self, {}),
+				self.block.navigation = new BlockHeader(self, {}),
 				self.block.search = new BlockSearch(self, {}),
 				self.block.more = new BlockMenu(self, {'button_class': 'icon2.cog'})
 			),
@@ -170,13 +168,15 @@
 	},
 
 	openPage: function(url) {
-		var self = this;
+		var self = this,
+			route = new Route(self.defaults);
 
-		self.route.parse();
-		var page_name = self.route.getPage().capitalize(),
-			action = self.route.getAction(),
-			params = self.route.getParams(),
-			current_url = self.route.getCurrentUrl(),
+		route.parse(rep(History.getPath()));
+
+		var page_name = route.getPage().capitalize(),
+			action = route.getAction(),
+			params = route.getParams(),
+			current_url = route.getCurrentUrl(),
 			page;
 
 		if(current_url == self.current_url)
@@ -439,24 +439,19 @@ window.App = new CouchPotato();
 
 var Route = new Class({
 
-	defaults: {},
+	defaults: null,
 	page: '',
 	action: 'index',
 	params: {},
 
 	initialize: function(defaults){
 		var self = this;
-		self.defaults = defaults;
+		self.defaults = defaults || {};
 	},
 
-	parse: function(){
+	parse: function(path){
 		var self = this;
 
-		var rep = function (pa) {
-			return pa.replace(Api.getOption('url'), '/').replace(App.getOption('base_url'), '/');
-		};
-
-		var path = rep(History.getPath());
 		if(path == '/' && location.hash){
 			path = rep(location.hash.replace('#', '/'));
 		}
@@ -464,7 +459,7 @@ var Route = new Class({
 		var url = self.current.split('/');
 
 		self.page = (url.length > 0) ? url.shift() : self.defaults.page;
-		self.action = (url.length > 0) ? url.shift() : self.defaults.action;
+		self.action = (url.length > 0) ? url.join('/') : self.defaults.action;
 
 		self.params = Object.merge({}, self.defaults.params);
 		if(url.length > 1){
@@ -624,3 +619,7 @@ var createSpinner = function(target, options){
 
 	return new Spinner(opts).spin(target);
 };
+
+var rep = function (pa) {
+	return pa.replace(Api.getOption('url'), '/').replace(App.getOption('base_url'), '/');
+};

couchpotato/static/scripts/page.js

@@ -10,11 +10,13 @@ var PageBase = new Class({
 	has_tab: true,
 	name: '',
 
+	parent_page: null,
 	sub_pages: null,
 
-	initialize: function(options) {
+	initialize: function(parent_page, options) {
 		var self = this;
 
+		self.parent_page = parent_page;
 		self.setOptions(options);
 
 		// Create main page container
@@ -26,9 +28,17 @@ var PageBase = new Class({
 
 		// Create tab for page
 		if(self.has_tab){
-			var nav = App.getBlock('navigation');
+			var nav;
+
+			if(self.parent_page && self.parent_page.navigation){
+				nav = self.parent_page.navigation;
+			}
+			else {
+				nav = App.getBlock('navigation');
+			}
+
 			self.tab = nav.addTab(self.name, {
-				'href': App.createUrl(self.name),
+				'href': App.createUrl(self.getPageUrl()),
 				'title': self.title,
 				'text': self.name.capitalize()
 			});
@@ -73,7 +83,13 @@ var PageBase = new Class({
 		//p('Opening: ' +self.getName() + ', ' + action + ', ' + Object.toQueryString(params));
 
 		try {
-			var elements = self[action+'Action'](params);
+			var elements
+			if(!self[action+'Action']){
+				elements = self['defaultAction'](action, params);
+			}
+			else {
+				elements = self[action+'Action'](params);
+			}
 			if(elements !== undefined){
 				self.el.empty();
 				self.el.adopt(elements);
@@ -93,6 +109,11 @@ var PageBase = new Class({
 			History.push(url);
 	},
 
+	getPageUrl: function(){
+		var self = this;
+		return (self.parent_page && self.parent_page.getPageUrl ? self.parent_page.getPageUrl() + '/' : '') + self.name;
+	},
+
 	errorAction: function(e){
 		p('Error, action not found', e);
 	},