Commit e24b879a0a2f10cd2e8ef21d4b3c914132154cd5

Anon Ray
Mon Jan 20 18:14:43 IST 2014

Tree SHA1: 3bad627
Parent SHA1: 9fa0b56 (Add Header and Footer config in the editor)
raw diff | raw patch

FIX: Navigation Menu highlight issue

  - Fix the highlighting issue in navigation menu when navigating to different
    pages.
  - Fix some small UI issues in the editor

Diff rendering mode:
inline
side by side


54	54	//console.log('rendering custom menu..');
55	55	this.$el.append(this.model.get('html'));
56	56	}
57		this.$links = $('.nav li');
	57	this.$links = $('.nav > li');
58	58	if(!this.$links) {
59	59	throw new Error('Ill-formed menu! Please check you have <ul> element' +
60	60	'inside your menu with class nav and <li> elements inside it');
…	…
81	81	}));*/
82	82	}, this);
83	83	},
	84	//FIXIT: sometimes clicking on nav link, this function does not handle the
	85	//event directly. it is passed to showPage function of router, which calls
	86	//this function. so this function is without an event object is some cases.
	87	//Fix it always receive the click event.
84	88	navClicked: function(event) {
85	89	this.$links.removeClass('active');
86		if(!event) {
87		var fragment = location.hash.split('/')[1];
88		//var pos = _.indexOf(M.pages.models, M.pages.where({'name': fragment})[0]);
89		//console.log(fragment);
90		var pos = _.indexOf(this.model.get('menuOrder'), fragment);
91		//console.log(pos);
92		if(!fragment) {
93		pos = 0;
	90	if(this.model.get('customMenu') === false) {
	91	if(!event) {
	92	var fragment = location.hash.split('/')[1];
	93	//var pos = _.indexOf(M.pages.models, M.pages.where({'name': fragment})[0]);
	94	var pos = _.indexOf(this.model.get('menuOrder'), fragment);
	95	if(!fragment) {
	96	pos = 0;
	97	}
	98	$(this.$links[pos]).addClass('active');
94	99	}
95		$(this.$links[pos]).addClass('active');
	100	else {
	101	$(event.currentTarget).parent().addClass('active');
	102	}
96	103	}
97		else {
98		//console.log();
99		$(event.currentTarget).parent().addClass('active');
	104	else if(this.model.get('customMenu') === true) {
	105	// get the URL fragment
	106	var fragment = location.hash.split('/')[1];
	107	// find out where it is in the nav menu
	108	var link = $('.nav').find('a[href="#/'+ fragment +'"]')[0];
	109	// find its <li> parent all the way up in the main ul.nav
	110	$(link).closest('ul.nav > li').addClass('active');
100	111	}
101	112	}
102	113	});


49	49	<script type="text/template" id="menu-config-template">
50	50	<div class="page">
51	51	<div class="menu-config">
52		<h4> Menu Config </h4>
	52	<h4> Configure Navigation Menu </h4>
53	53
54	54	<div class="row">
55		<div class="form-group col-lg-12" id="menu-order-wrap">
	55	<div class="form-group col-lg-6">
56	56	<div class="input-group">
57		<span class="input-group-addon"> <strong> Menu Order</strong></span>
58		<input class="form-control" id="menu-order" type="text"
59		placeholder="list,page,slugs,for,menu,order" value="<%= menu_order %>">
	57	<span class="input-group-addon">
	58	<input id="custom-menu" type="checkbox">
	59	</span>
	60	<span class="input-group-addon"><strong>Custom Menu
	61	</strong></span>
60	62	</div>
61	63	<span class="help-block">
62		<small>csv list of page slugs to come up in the navigation menu
63		in that order
	64	<small>
	65	activate to write your own custom menu
64	66	</small>
65	67	</span>
66	68	</div>
67	69	</div>
68	70
69	71	<div class="row">
70		<div class="form-group col-lg-6">
	72	<div class="form-group col-lg-12" id="menu-order-wrap">
71	73	<div class="input-group">
72		<span class="input-group-addon">
73		<input id="custom-menu" type="checkbox">
74		</span>
75		<span class="input-group-addon"><strong>Custom Menu
76		</strong></span>
	74	<span class="input-group-addon"> <strong> Menu Order</strong></span>
	75	<input class="form-control" id="menu-order" type="text"
	76	placeholder="list,page,slugs,for,menu,order" value="<%= menu_order %>">
77	77	</div>
78	78	<span class="help-block">
79		<small>
80		activate to write your own custom menu
	79	<small>csv list of page slugs to come up in the navigation menu
	80	in that order
81	81	</small>
82	82	</span>
83	83	</div>
…	…
110	110
111	111	<script type="text/template" id="header-config-template">
112	112	<div class="page">
113		<h4> Configure your header here </h4>
	113	<div><h4> Write HTML for your header here </h4></div>
114	114	<div id="header-input" class="ace-mouchak">
115	115	<%= M.escapeHtml(header) %>
116	116	</div>
…	…
123	123
124	124	<script type="text/template" id="footer-config-template">
125	125	<div class="page">
126		<h4> Configure your footer here </h4>
	126	<div><h4> Write HTML for your footer here </h4></div>
127	127	<div id="footer-input" class="ace-mouchak">
128	128	<%= M.escapeHtml(footer) %>
129	129	</div>
…	…
140	140	<div id="pagelist"></div>
141	141	<button class="btn btn-primary" id="addPage">Add Page</button>
142	142	<hr>
143		<p> <a href="#" id="menu-config"> Site Menu </a> </p>
144		<p> <a href="#" id="header-config"> Header Config </a> </p>
145		<p> <a href="#" id="footer-config"> Footer Config </a> </p>
	143	<p> <a href="#" id="header-config"> Header </a> </p>
	144	<p> <a href="#" id="footer-config"> Footer </a> </p>
	145	<p> <a href="#" id="menu-config"> Navigation Menu </a> </p>
146	146	<p><a href="{{ url_for('index') }}"> Go to site </a></p>
147	147	</div>
148	148	</script>

Commit e24b879a0a2f10cd2e8ef21d4b3c914132154cd5

Gitorious