status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: add 'map' route and button, tighten up the nav to give space

This commit is contained in:
Jack Pearkes 2015-08-07 16:36:02 -07:00
parent 47ea4939de
commit 503d3384d4
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/index.html
View File

@ -143,11 +143,15 @@
{{#link-to 'kv' class='btn btn-default col-xs-12'}}Key/Value{{/link-to}} {{#link-to 'kv' class='btn btn-default col-xs-12'}}Key/Value{{/link-to}}
</div> </div>
<div class="col-md-2 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-2 col-xs-offset-1"> <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-default col-xs-12'}}ACL{{/link-to}} {{#link-to 'acls' class='btn btn-small btn-default col-xs-12'}}ACL{{/link-to}}
</div> </div>
<div class="col-md-2 col-sm-2 col-xs-6 col-md-offset-0 col-sm-offset-4 col-xs-offset-1"> <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">
<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> <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}} {{#if isDropdownVisible}}

3
ui/javascripts/app/router.js
View File

@ -41,6 +41,9 @@ App.Router.map(function() {
this.route("show", { path: "/:id" }); this.route("show", { path: "/:id" });
}); });
// Map
this.resource("map", { path: "/map" });
// Shows a page explaining that ACLs haven't been set-up // Shows a page explaining that ACLs haven't been set-up
this.route("aclsdisabled", { path: "/aclsdisabled" }); this.route("aclsdisabled", { path: "/aclsdisabled" });
// Shows a page explaining that the ACL key being used isn't // Shows a page explaining that the ACL key being used isn't

4
ui/styles/_nav.scss
View File

@ -19,6 +19,10 @@
.btn { .btn {
margin-top: 20px; margin-top: 20px;
min-width: 100px; min-width: 100px;
&.btn-small {
min-width: 70px;
}
} }
.btn-dropdown { .btn-dropdown {