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

ui: mobile fixes for acl

pull/302/head
Jack Pearkes 2014-08-22 17:14:26 -07:00
parent 2e088af833
commit 1d34ede602
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/index.html
View File

@ -43,8 +43,13 @@
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12"> <div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12">
<div class="text-center vertical-center"> <div class="text-center vertical-center">
<p class="bold">Access Denied</p> <p class="bold">Access Denied</p>
<p>Your ACL token, <code>foobarbaz</code>, does not {{#if aclToken}}
<p>Your ACL token, <code>{{aclToken}}</code>, does not
have the appropriate permissions to perform the expected action.</p> have the appropriate permissions to perform the expected action.</p>
{{else}}
<p>The default agent token does not
have the appropriate permissions to perform the expected action.</p>
{{/if}}
<p>Learn more in the <a href="http://www.consul.io/docs/internals/acl.html">ACL documentation</a>.</p> <p>Learn more in the <a href="http://www.consul.io/docs/internals/acl.html">ACL documentation</a>.</p>
</div> </div>
</div> </div>
@ -130,7 +135,7 @@
{{#link-to 'acls' class='btn 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-2 col-sm-2 col-xs-6 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">
<a {{bind-attr class=":col-xs-12 :btn isDropDownVisible:btn-primary:btn-default"}} {{action "toggle"}}> <span class="elip-overflow">{{model}} <span class="caret"></span></span> </a> <a {{bind-attr class=":col-xs-12 :btn isDropDownVisible:btn-primary:btn-default"}} {{action "toggle"}}> <span class="elip-overflow">{{model}} <span class="caret"></span></span> </a>
{{#if isDropdownVisible}} {{#if isDropdownVisible}}
@ -143,7 +148,7 @@
</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-1 col-sm-2 col-xs-2 col-md-offset-0 col-sm-offset-0 col-xs-offset-0">
{{#link-to 'settings' class='btn btn-default col-xs-6 icon'}}<span class="wrap">&#9881;</span>{{/link-to}} {{#link-to 'settings' class='btn btn-default col-xs-6 icon'}}<span class="wrap">&#9881;</span>{{/link-to}}
</div> </div>
</div> </div>

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

@ -5,8 +5,10 @@ App.ApplicationController = Ember.ObjectController.extend({
}); });
App.DcController = Ember.Controller.extend({ App.DcController = Ember.Controller.extend({
needs: ["application"],
// Whether or not the dropdown menu can be seen // Whether or not the dropdown menu can be seen
isDropdownVisible: false, isDropdownVisible: false,
aclToken: Ember.computed.alias("application.settings.token"),
datacenter: function() { datacenter: function() {
return this.get('content'); return this.get('content');

14
ui/styles/_buttons.scss
View File

@ -106,3 +106,17 @@
} }
} }
.topbar {
.btn.icon {
min-width: 50px;
font-size: 30px;
height: 33px;
padding: 0;
.wrap {
position: absolute;
top: -8px;
left: 14px;
}
}
}

14
ui/styles/base.scss
View File

@ -99,20 +99,6 @@ a {
background-color: $gray-background; background-color: $gray-background;
} }
.topbar {
.btn.icon {
min-width: 50px;
font-size: 30px;
height: 33px;
padding: 0;
.wrap {
position: absolute;
top: -8px;
left: 14px;
}
}
}
.action-bar { .action-bar {
min-height: 50px; min-height: 50px;
padding-top: 10px; padding-top: 10px;