Yoji SHIDARA
null+****@clear*****
Mon Oct 1 18:25:47 JST 2012
Yoji SHIDARA 2012-10-01 18:25:47 +0900 (Mon, 01 Oct 2012) New Revision: 363e67be15804b05002b9e32eaad436c5a31895a https://github.com/groonga/gcs/commit/363e67be15804b05002b9e32eaad436c5a31895a Log: Move domain operations into tabs Modified files: public/js/gcs/controllers.js public/js/gcs/views.js views/index.jade Modified: public/js/gcs/controllers.js (+3 -0) =================================================================== --- public/js/gcs/controllers.js 2012-10-01 17:47:29 +0900 (3290570) +++ public/js/gcs/controllers.js 2012-10-01 18:25:47 +0900 (093f031) @@ -113,6 +113,7 @@ App.IndexController = Ember.ArrayController.extend({ }); App.DomainController = Ember.ObjectController.extend({ + selectedAction: null }); App.DomainShowController = Ember.ObjectController.extend({ @@ -152,6 +153,7 @@ App.Router = Ember.Router.extend({ connectOutlets: function(router) { var domainController = router.get('domainController'); var domain = domainController.get('content'); + domainController.set('selectedAction', 'About'); domainController.connectOutlet('domainShow', domain); } }), @@ -161,6 +163,7 @@ App.Router = Ember.Router.extend({ var domainController = router.get('domainController'); var domain = domainController.get('content'); var domainSearchController = router.get('domainSearchController'); + domainController.set('selectedAction', 'Search'); domainSearchController.set('domain', domain); domainSearchController.set('query', null); domainSearchController.reset(); Modified: public/js/gcs/views.js (+10 -1) =================================================================== --- public/js/gcs/views.js 2012-10-01 17:47:29 +0900 (dcb1b6e) +++ public/js/gcs/views.js 2012-10-01 18:25:47 +0900 (66c397b) @@ -29,7 +29,16 @@ App.IndexView = Ember.View.extend({ }); App.DomainView = Ember.View.extend({ - templateName: 'domain' + templateName: 'domain', + selectedActionBinding: 'controller.selectedAction', + + NavItemView: Ember.View.extend({ + tagName: 'li', + classNameBindings: 'isActive:active'.w(), + isActive: function() { + return this.get('item') === this.get('parentView.selectedAction'); + }.property('item', 'parentView.selectedAction') + }) }); App.DomainShowView = Ember.View.extend({ Modified: views/index.jade (+12 -3) =================================================================== --- views/index.jade 2012-10-01 17:47:29 +0900 (9ab8949) +++ views/index.jade 2012-10-01 18:25:47 +0900 (63f101a) @@ -29,8 +29,6 @@ html li.nav-header Domains {{#each App.domains}} li <a href {{action showDomain this}}>{{name}}</a> - ul.nav.nav-list - li <a href {{action showSearch this}}>search</a> {{/each}} .span10 {{outlet}} @@ -43,8 +41,20 @@ html th Configuration Endpoint td {{App.configurationEndpoint}} + script(data-template-name="domain-action-tabs", type="text/x-handlebars") + ul.nav.nav-tabs + script(data-template-name="domain", type="text/x-handlebars") h1 Domain '{{name}}' + + ul.nav.nav-tabs + {{#view view.NavItemView item="About"}} + <a href {{action showDomain this.content}}>About</a> + {{/view}} + {{#view view.NavItemView item="Search"}} + <a href {{action showSearch this.content}}>Search</a> + {{/view}} + {{outlet}} script(data-template-name="domain-show", type="text/x-handlebars") @@ -65,7 +75,6 @@ html {{/each}} script(data-template-name="domain-search", type="text/x-handlebars") - h2 Search {{#view App.SearchFormView}} {{view Ember.TextField valueBinding="query"}} input(type="hidden", name="start", value="") -------------- next part -------------- HTML����������������������������...下载
