github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: more touches on create acl

pull/302/head
Jack Pearkes 2014-08-22 17:00:26 -07:00
parent 9eedf3b001
commit 2e088af833
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/index.html
View File

@ -77,11 +77,18 @@
<script type="text/x-handlebars" id="actionbar"> <script type="text/x-handlebars" id="actionbar">
<div class="row"> <div class="row">
<div class="action-bar"> <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"> <div class="form-group">
{{ input type="text" value=filter class="form-control form-control-mini" placeholder=filterText}} {{ input type="text" value=filter class="form-control form-control-mini" placeholder=filterText}}
</div> </div>
</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}} {{#if statuses}}
<div class="col-md-5"> <div class="col-md-5">
<div class="form-group"> <div class="form-group">
@ -591,7 +598,7 @@
<div {{ bind-attr class=":panel-bar isLoading:bg-orange:bg-light-gray" }}></div> <div {{ bind-attr class=":panel-bar isLoading:bg-orange:bg-light-gray" }}></div>
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
Create ACL New ACL
</h4> </h4>
</div> </div>

1
ui/javascripts/app/controllers.js
View File

@ -320,6 +320,7 @@ App.AclsController = Ember.ArrayController.extend({
queryParams: ["filter"], queryParams: ["filter"],
filterText: "Filter by name or ID", filterText: "Filter by name or ID",
searchBar: true, searchBar: true,
newAclButton: true,
types: ["management", "client"], types: ["management", "client"],
dc: Ember.computed.alias("controllers.dc"), dc: Ember.computed.alias("controllers.dc"),

31
ui/styles/_buttons.scss
View File

@ -29,6 +29,17 @@
box-shadow: none; 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 { &.btn-warning {
color: $orange-faded; color: $orange-faded;
background-color: transparent; background-color: transparent;
@ -73,6 +84,13 @@
background-color: $light-purple; background-color: $light-purple;
color: darken($purple, 10%); color: darken($purple, 10%);
} }
&.btn-noactive {
color: inherit;
background-color: inherit;
border: 2px solid #ccc;
}
} }
&.btn-mini { &.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%);
}
}
}