From 2e088af833079973438e1c124daffc950a53f1f2 Mon Sep 17 00:00:00 2001
From: Jack Pearkes <jackpearkes@gmail.com>
Date: Fri, 22 Aug 2014 17:00:26 -0700
Subject: [PATCH] ui: more touches on create acl

---
 ui/index.html                     | 11 +++++++++--
 ui/javascripts/app/controllers.js |  1 +
 ui/styles/_buttons.scss           | 31 ++++++++++++++++++-------------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index f34a0ff03a..dfb89f9a36 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -77,11 +77,18 @@
   <script type="text/x-handlebars" id="actionbar">
     <div class="row">
       <div class="action-bar">
-        <div {{ bind-attr class="searchBar:col-md-12:col-md-5" }} >
+        <div {{ bind-attr class="searchBar:col-md-10:col-md-5" }} >
           <div class="form-group">
             {{ input type="text" value=filter class="form-control form-control-mini" placeholder=filterText}}
           </div>
         </div>
+        {{#if newAclButton }}
+          <div class="col-md-2">
+            <div class="form-group">
+              {{#link-to 'acls' class='btn btn-mini btn-default btn-noactive pull-right'}}New ACL{{/link-to}}
+            </div>
+          </div>
+        {{/if}}
         {{#if statuses}}
         <div class="col-md-5">
           <div class="form-group">
@@ -591,7 +598,7 @@
               <div {{ bind-attr class=":panel-bar isLoading:bg-orange:bg-light-gray" }}></div>
                 <div class="panel-heading">
                   <h4 class="panel-title">
-                    Create ACL
+                    New ACL
                   </h4>
                 </div>
 
diff --git a/ui/javascripts/app/controllers.js b/ui/javascripts/app/controllers.js
index f90b8960d8..e364bbd1d6 100644
--- a/ui/javascripts/app/controllers.js
+++ b/ui/javascripts/app/controllers.js
@@ -320,6 +320,7 @@ App.AclsController = Ember.ArrayController.extend({
   queryParams: ["filter"],
   filterText: "Filter by name or ID",
   searchBar: true,
+  newAclButton: true,
   types: ["management", "client"],
 
   dc: Ember.computed.alias("controllers.dc"),
diff --git a/ui/styles/_buttons.scss b/ui/styles/_buttons.scss
index 4f7d6a5f79..179c3a2b1e 100644
--- a/ui/styles/_buttons.scss
+++ b/ui/styles/_buttons.scss
@@ -29,6 +29,17 @@
         box-shadow: none;
     }
 
+    &.btn-primary {
+        color: $purple-dark;
+        background-color: transparent;
+        border: 2px solid $purple;
+
+        &:hover {
+            background-color: $light-purple;
+            color: darken($purple, 10%);
+        }
+    }
+
     &.btn-warning {
         color: $orange-faded;
         background-color: transparent;
@@ -73,6 +84,13 @@
             background-color: $light-purple;
             color: darken($purple, 10%);
         }
+
+        &.btn-noactive {
+            color: inherit;
+            background-color: inherit;
+            border: 2px solid #ccc;
+        }
+
     }
 
     &.btn-mini {
@@ -88,16 +106,3 @@
     }
 
 }
-
-.active {
-    .btn {
-        color: $purple-dark;
-        background-color: transparent;
-        border: 2px solid $purple;
-
-        &:hover {
-            background-color: $light-purple;
-            color: darken($purple, 10%);
-        }
-    }
-}