Styling fixes

couchpotato/static/scripts/block/menu.js

@@ -15,19 +15,21 @@ Block.Menu = new Class({
 			self.wrapper = new Element('div.wrapper').adopt(
 				self.more_option_ul = new Element('ul')
 			),
-			new Element('a.button.onlay' + (self.options.button_class ? '.' + self.options.button_class : ''), {
+			self.button = new Element('a.button' + (self.options.button_class ? '.' + self.options.button_class : ''), {
 				'events': {
 					'click': function(){
 						self.el.toggleClass('show')
 						self.fireEvent(self.el.hasClass('show') ? 'open' : 'close')
 
-						if(self.el.hasClass('show'))
-							this.addEvent('outerClick', function(){
-								self.el.removeClass('show')
-								this.removeEvents('outerClick');
+						if(self.el.hasClass('show')){
+							self.el.addEvent('outerClick', self.removeOuterClick.bind(self))
+							this.addEvent('outerClick', function(e){
+								if(e.target.get('tag') != 'input')
+									self.removeOuterClick()
 							})
+						}
 						else
-							this.removeEvents('outerClick');
+							self.removeOuterClick()
 
 					}
 				}
@@ -36,6 +38,15 @@ Block.Menu = new Class({
 
 	},
 
+	removeOuterClick: function(){
+		var self = this;
+
+		self.el.removeClass('show')
+		self.el.removeEvents('outerClick');
+
+		self.button.removeEvents('outerClick');
+	},
+
 	addLink: function(tab, position){
 		var self = this;
 		var el = new Element('li').adopt(tab).inject(self.more_option_ul, position || 'bottom');

couchpotato/static/scripts/block/navigation.js

@@ -67,12 +67,12 @@ Block.Navigation = new Class({
 		if(!self.added){
 
 			new Element('li.separator').inject(self.nav);
-			body.getElements('.header .more_menu.menu li a').each(function(el, nr){
-				if([0, 1, 2, 5].indexOf(nr) > -1){
-					self.nav.grab(
-						new Element('li').grab(el.clone().cloneEvents(el))
-					);
-				}
+			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;