Yoji SHIDARA
null+****@clear*****
Mon Oct 15 15:58:17 JST 2012
Yoji SHIDARA 2012-10-15 15:58:17 +0900 (Mon, 15 Oct 2012) New Revision: 52760f56186e4afcf37b5c704bd0036faede070b https://github.com/groonga/gcs-console/commit/52760f56186e4afcf37b5c704bd0036faede070b Log: Reorganize navigation Modified files: routes/index.js views/application.jade views/domain.jade Modified: routes/index.js (+8 -2) =================================================================== --- routes/index.js 2012-10-15 15:41:19 +0900 (212922d) +++ routes/index.js 2012-10-15 15:58:17 +0900 (94d259e) @@ -6,13 +6,19 @@ exports.index = function(req, res) { res.render('index'); }; -exports.domain = function(req, res) { +function prepareCurrentDomain(req, res) { var domain = _.where(res.locals.domains, {DomainName: req.params.name})[0]; + domain.isSelected = true; + return domain; +} + +exports.domain = function(req, res) { + var domain = prepareCurrentDomain(req, res); res.render('domain-show', {domain: domain}); }; exports.domainSearch = function(req, res) { - var domain = _.where(res.locals.domains, {DomainName: req.params.name})[0]; + var domain = prepareCurrentDomain(req, res); var query = req.query.query; var size = 10; var start = 0; // TODO support paginate Modified: views/application.jade (+2 -5) =================================================================== --- views/application.jade 2012-10-15 15:41:19 +0900 (c02a27d) +++ views/application.jade 2012-10-15 15:58:17 +0900 (52004b7) @@ -10,13 +10,10 @@ block application ul.nav.nav-list li.nav-header Domains each domain in domains - li + li(class=domain.isSelected?'active':null) + - console.log(domain.isSelected) a(href="/domain/"+domain.DomainName) = domain.DomainName - li - ul.nav.nav-list - li - a(href="/domain/"+domain.DomainName+"/search") search .span9 block content Modified: views/domain.jade (+3 -3) =================================================================== --- views/domain.jade 2012-10-15 15:41:19 +0900 (20b6ba6) +++ views/domain.jade 2012-10-15 15:58:17 +0900 (b55deb7) @@ -1,8 +1,8 @@ extends application block content - h2 - |Domain - = domain.DomainName + p.btn-group + a(href="/domain/"+domain.DomainName).btn About + a(href="/domain/"+domain.DomainName+"/search").btn Search block domain-content -------------- next part -------------- HTML����������������������������...Download
