luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

revert 8bf8871, fc2aad3, 503d338. 

some misplaced UI development changes
This commit is contained in:
Jack Pearkes 2015-08-07 16:40:28 -07:00
parent 5bbc336a25
commit 1584b35e3b
5 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/Gemfile.lock
View File

@ -20,6 +20,3 @@ DEPENDENCIES
sass sass
therubyracer therubyracer
uglifier uglifier
BUNDLED WITH
1.10.3

3
ui/development_config.json
View File

@ -4,7 +4,8 @@
"ui_dir": ".", "ui_dir": ".",
"bootstrap": true, "bootstrap": true,
"server": true, "server": true,
"advertise_addr": "127.0.0.1", "acl_datacenter": "dc1",
"acl_master_token": "dev",
"http_api_response_headers": { "http_api_response_headers": {
"Access-Control-Allow-Origin": "*" "Access-Control-Allow-Origin": "*"
} }

10
ui/index.html
View File

@ -143,15 +143,11 @@
{{#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-1 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-2 col-xs-offset-1"> <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-small btn-default col-xs-12'}}ACL{{/link-to}} {{#link-to 'acls' class='btn btn-default col-xs-12'}}ACL{{/link-to}}
</div> </div>
<div class="col-md-1 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-0 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">
{{#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,9 +41,6 @@ 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,10 +19,6 @@
.btn { .btn {
margin-top: 20px; margin-top: 20px;
min-width: 100px; min-width: 100px;
&.btn-small {
min-width: 70px;
}
} }
.btn-dropdown { .btn-dropdown {