Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

settings.js file added to control icon/languages in the nav bar #1

Merged
merged 1 commit into from Mar 24, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion static/js/router.js
Expand Up @@ -6,6 +6,9 @@ define([
'Underscore',
'Backbone',

// Settings
'settings',

// Views
'views/topnav',
'views/jquerysearchresults',
Expand All @@ -26,6 +29,7 @@ define([
// Templates
'text!templates/mdnpage.html',
], function(doc, $, _, Backbone,
Settings,
TopNavView, JQuerySearchResultsView, LanguageView, PageScrapedLanguageView,
FullWindowView,
MozDevCSSPropCollection, MDNHtmlElementsCollection, MDNJsObjsCollection,
Expand Down Expand Up @@ -108,7 +112,8 @@ define([
var self = this;
this.renderTopNav = _.once(function() {
self.topNavView = new TopNavView({
el: $('#topbar-inner')
el: $('#topbar-inner'),
settings: Settings
});
self.topNavView.render();
self.topNavView.bind('changeLanguage', self.changeLanguage);
Expand Down
18 changes: 18 additions & 0 deletions static/js/settings.js
@@ -0,0 +1,18 @@
define([],function(){

var Settings = {

logo: '/images/mdn-icon-48.png',

languages: [
{ lang: 'css', name: 'CSS' },
{ lang: 'html', name: 'HTML' },
{ lang: 'javascript', name: 'JavaScript' }
]

}

return Settings;

});

2 changes: 1 addition & 1 deletion static/js/views/topnav.js
Expand Up @@ -59,7 +59,7 @@ define([
},

render: function() {
$(this.el).html(this.template({}));
$(this.el).html(this.template({ settings: this.options.settings }));
return this;
},
});
Expand Down
17 changes: 8 additions & 9 deletions static/templates/topnav.html
@@ -1,15 +1,14 @@
<!-- nav -->
<div class="container-fluid">
<a class="brand pointer">dochub</a>
<% if(settings.logo){ %>
<img class="brand" src="<%= settings.logo %>" />
<% } else { %>
<a class="brand pointer">dochub</a>
<% } %>
<ul id="nav-list" class="nav">
<li class="active"><a id="nav-css" data-lang="css" class="pointer">CSS</a></li>
<li><a id="nav-html" data-lang="html" class="pointer">HTML</a></li>
<li><a id="nav-javascript" data-lang="javascript" class="pointer">JavaScript</a></li>
<li><a id="nav-dom" data-lang="dom" class="pointer">DOM</a></li>
<li><a id="nav-jquery" data-lang="jquery" class="pointer">jQuery</a></li>
<li><a id="nav-php" data-lang="php" class="pointer">PHP</a></li>
<li><a id="nav-python" data-lang="python" class="pointer">Python</a></li>
<li><a id="nav-xslt" data-lang="xslt" class="pointer">XPath/XSLT</a></li>
<% for (var i = 0; i< settings.languages.length; i++) { %>
<li><a id="nav-<%= settings.languages[i].lang %>" data-lang="<%= settings.languages[i].lang %>" class="pointer"><%= settings.languages[i].name %></a></li>
<% } %>
</ul>
<ul id="secondary-nav" class="secondary-nav">
<li><a id="nav-about" href="#about">About</a></li>
Expand Down