From bc5c768c4158d9759c9b5fded8271cb2b543d189 Mon Sep 17 00:00:00 2001
From: Jack Pearkes <jackpearkes@gmail.com>
Date: Fri, 25 Apr 2014 13:35:21 -0400
Subject: [PATCH] ui: more refactoring for nested resources

---
 ui/index.html         |  4 +--
 ui/javascripts/app.js | 67 -------------------------------------------
 2 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 4ebe2d8a25..dce0041d15 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -209,7 +209,7 @@
   <script type="text/x-handlebars" id="index">
     <div class="col-md-8 col-md-offset-2 vertical-center">
       {{#each item in model}}
-        <a {{action 'selectDc' item}}>
+        {{#link-to 'dc' item }}
             <div class="panel panel-success panel-link panel-short">
               <div class="panel-bar"></div>
               <div class="panel-heading">
@@ -220,7 +220,7 @@
                 </h3>
               </div>
             </div>
-        </a>
+        {{/link-to}}
       {{/each}}
     </div>
   </script>
diff --git a/ui/javascripts/app.js b/ui/javascripts/app.js
index 3b497012fa..21f944e1fc 100755
--- a/ui/javascripts/app.js
+++ b/ui/javascripts/app.js
@@ -19,29 +19,6 @@ App.Router.map(function() {
   this.route("kv", { path: "/:dc/kv" });
 });
 
-//
-// The main controller for the application. To use this in other
-// controller you have to use the needs api
-//
-App.ApplicationController = Ember.Controller.extend({
-  //
-  // Sets the current datacenter to be used when linking. DC is
-  // a required parameter in the routes, above, and we need
-  // to know our scope. This is so #link-to 'node' dc node-name
-  // works.
-  //
-  setDc: function(dc) {
-    localStorage.setItem("current_dc", dc);
-  },
-
-  //
-  // Retrieves the current datacenter set by this.setDc from
-  // localstorage. returns null if the dc has not been set.
-  //
-  getDc: function() {
-    return localStorage.getItem("current_dc");
-  }.property("getDc")
-});
 
 //
 // Superclass to be used by all of the main routes below. All routes
@@ -85,20 +62,6 @@ App.IndexRoute = Ember.Route.extend({
 // The index is for choosing datacenters.
 //
 App.IndexController = Ember.Controller.extend({
-  needs: ['application'],
-
-  actions: {
-    //
-    // selectDc is called with the datacenter name to be set for
-    // future actions within the application. It's a namespace, essentially.
-    //
-    // See ApplicationController#setDc
-    //
-    selectDc: function(dc) {
-      this.get('controllers.application').setDc(dc)
-      this.transitionToRoute('services', dc)
-    }
-  }
 });
 
 //
@@ -263,36 +226,6 @@ App.ServicesShowView = Ember.View.extend({
 // path: /:dc
 //
 App.DcController = Ember.Controller.extend({
-  needs: ['application']
-})
-
-//
-//
-// path: /:dc/services
-//
-App.ServicesController = Ember.Controller.extend({
-  needs: ['application']
-})
-
-//
-// path: /:dc/services/:name
-//
-App.ServicesShowController = Ember.Controller.extend({
-  needs: ['application']
-})
-
-//=
-// path: /:dc/nodes
-//
-App.NodesController = Ember.Controller.extend({
-  needs: ['application']
-})
-
-//
-// path: /:dc/nodes/:name
-//
-App.NodesShowController = Ember.Controller.extend({
-  needs: ['application']
 })
 
 //