From 1584b35e3bff3346199869e5b250d19dc1eeb3fb Mon Sep 17 00:00:00 2001
From: Jack Pearkes <jackpearkes@gmail.com>
Date: Fri, 7 Aug 2015 16:40:28 -0700
Subject: [PATCH] revert 8bf8871, fc2aad3, 503d338.

some misplaced UI development changes
---
 ui/Gemfile.lock              |  3 ---
 ui/development_config.json   |  3 ++-
 ui/index.html                | 10 +++-------
 ui/javascripts/app/router.js |  3 ---
 ui/styles/_nav.scss          |  4 ----
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/ui/Gemfile.lock b/ui/Gemfile.lock
index bd84eaad4..f79b05b48 100644
--- a/ui/Gemfile.lock
+++ b/ui/Gemfile.lock
@@ -20,6 +20,3 @@ DEPENDENCIES
   sass
   therubyracer
   uglifier
-
-BUNDLED WITH
-   1.10.3
diff --git a/ui/development_config.json b/ui/development_config.json
index 4bbc9abf0..3f7ca6b24 100644
--- a/ui/development_config.json
+++ b/ui/development_config.json
@@ -4,7 +4,8 @@
   "ui_dir": ".",
   "bootstrap": true,
   "server": true,
-  "advertise_addr": "127.0.0.1",
+  "acl_datacenter": "dc1",
+  "acl_master_token": "dev",
   "http_api_response_headers": {
     "Access-Control-Allow-Origin": "*"
   }
diff --git a/ui/index.html b/ui/index.html
index 2a4352faa..27a8ad3e6 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -143,15 +143,11 @@
           {{#link-to 'kv' class='btn btn-default col-xs-12'}}Key/Value{{/link-to}}
         </div>
 
-        <div class="col-md-1 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-2 col-xs-offset-1">
-          {{#link-to 'acls' class='btn btn-small btn-default col-xs-12'}}ACL{{/link-to}}
+        <div class="col-md-2 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-2 col-xs-offset-1">
+          {{#link-to 'acls' class='btn btn-default col-xs-12'}}ACL{{/link-to}}
         </div>
 
-        <div class="col-md-1 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-0 col-xs-offset-1">
-          {{#link-to 'map' class='btn btn-small btn-default col-xs-12'}}Map{{/link-to}}
-        </div>
-
-        <div class="col-md-2 col-sm-2 col-xs-6 col-md-offset-0 col-sm-offset-2 col-xs-offset-1">
+        <div class="col-md-2 col-sm-2 col-xs-6 col-md-offset-0 col-sm-offset-4 col-xs-offset-1">
           <a {{bind-attr class=":col-xs-12 :btn hasFailingChecks:btn-warning:btn-success"}} {{action "toggle"}}> <span class="elip-overflow">{{model}} <span class="caret"></span></span> </a>
 
           {{#if isDropdownVisible}}
diff --git a/ui/javascripts/app/router.js b/ui/javascripts/app/router.js
index fa31dbbdb..f79df94ff 100644
--- a/ui/javascripts/app/router.js
+++ b/ui/javascripts/app/router.js
@@ -41,9 +41,6 @@ App.Router.map(function() {
       this.route("show", { path: "/:id" });
     });
 
-    // Map
-    this.resource("map", { path: "/map" });
-
     // Shows a page explaining that ACLs haven't been set-up
     this.route("aclsdisabled", { path: "/aclsdisabled" });
     // Shows a page explaining that the ACL key being used isn't
diff --git a/ui/styles/_nav.scss b/ui/styles/_nav.scss
index 47b307408..dc932af3f 100644
--- a/ui/styles/_nav.scss
+++ b/ui/styles/_nav.scss
@@ -19,10 +19,6 @@
     .btn {
         margin-top: 20px;
         min-width: 100px;
-
-        &.btn-small {
-            min-width: 70px;
-        }
     }
 
     .btn-dropdown {