rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add container and white space fixes

This commit is contained in:
lvuch 2017-07-05 20:12:38 -07:00
parent 1ebe26905d
commit e5cab9a7b5
14 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/admin-tab/auth/azuread/controller.js
View File

@ -125,13 +125,4 @@ export default Ember.Controller.extend({
});
},
},
headerText: Ember.computed('access.enabled', 'intl.locale', function() {
let out = this.get('intl').findTranslationByKey('authPage.azuread.header.disabled');
if (this.get('access.enabled')) {
out = this.get('intl').findTranslationByKey('authPage.azuread.header.enabled');
}
return this.get('intl').formatHtmlMessage(out);
}),
});

14
app/admin-tab/auth/azuread/template.hbs
View File

@ -1,12 +1,18 @@
<section>
<h2>{{headerText}}</h2>
<div>
{{#if access.enabled}}
<p>{{t 'authPage.azuread.header.enabled'}}</p>
{{t 'authPage.azuread.subtext.enabled' appName=settings.appName}}
{{else}}
{{t 'authPage.azuread.subtext.disabled' appName=settings.appName}}
{{/if}}
<div class="banner bg-warning">
<div class="banner-icon">
<span class="icon icon-alert"></span>
</div>
<div class="banner-message">
<p>{{t 'authPage.azuread.header.disabled'}}</p>
</div>
</div>
<p>{{t 'authPage.azuread.subtext.disabled' appName=settings.appName}}</p>
{{/if}}
</section>
{{#if access.enabled}}

9
app/admin-tab/auth/github/template.hbs
View File

@ -1,6 +1,7 @@
<section>
<section class="box">
{{#if access.enabled}}
<b>{{t 'authPage.github.header.enabled.label' github=(t providerName)}}</b>
<h3>{{t 'authPage.github.header.enabled.label' github=(t providerName)}}</h3>
<hr/>
{{else}}
<div class="banner bg-warning">
<div class="banner-icon"><span class="icon icon-alert"></span></div>
@ -11,9 +12,9 @@
{{/if}}
<div>
{{#if access.enabled}}
{{t (concat-str 'authPage.github.header.enabled.' model.accessMode character='') appName=settings.appName github=(t providerName) users=numUsers orgs=numOrgs}}
<p>{{t (concat-str 'authPage.github.header.enabled.' model.accessMode character='') appName=settings.appName github=(t providerName) users=numUsers orgs=numOrgs}}</p>
{{else}}
{{t 'authPage.github.header.disabled.warning' appName=settings.appName}}
<p>{{t 'authPage.github.header.disabled.warning' appName=settings.appName}}</p>
{{/if}}
</div>
</section>

2
app/components/badge-state/component.js
View File

@ -2,6 +2,6 @@ import Ember from 'ember';
export default Ember.Component.extend({
tagName: 'SPAN',
classNames: ['badge-state','inline-block'],
classNames: ['badge-state','vertical-middle'],
classNameBindings: ['model.stateBackground'],
});

3
app/components/container-dot/component.js
View File

@ -5,7 +5,8 @@ export default Ember.Component.extend({
resourceActions : Ember.inject.service('resource-actions'),
tooltipService : Ember.inject.service('tooltip'),
model : null,
tagName : 'span',
tagName : 'div',
classNames : ['vertical-middle'],
type : 'tooltip-action-menu',
template : null,

2
app/components/container-dots/template.hbs
View File

@ -1,6 +1,6 @@
{{#if groupByDeploymentUnit}}
{{#each grouped as |group|}}
<div class="dot-group">
<div class="dot-group bg-default">
{{#each group as |item|}}
{{container-dot model=item}}
{{/each}}

4
app/components/service-row/template.hbs
View File

@ -70,8 +70,10 @@
</td>
<td class="text-center">
{{#if (and expanded model.canScale)}}
<div class="btn-group">
<button class="btn btn-xs bg-primary" {{action "scaleDown" target=model}}><i class="icon icon-minus"/></button>
<button class="btn btn-xs bg-primary" {{action "scaleUp" target=model}}><i class="icon icon-plus"/></button>
<button style="margin-left:2px;" class="btn btn-xs bg-primary" {{action "scaleUp" target=model}}><i class="icon icon-plus"/></button>
</div>
{{/if}}
</td>
<td>{{! actions}}</td>

4
app/components/tooltip-element/component.js
View File

@ -3,9 +3,9 @@ import Ember from 'ember';
const DELAY = 100;
export default Ember.Component.extend({
classNameBindings : ['inlineBlock:inline-block','clip:clip'],
classNameBindings : ['inlineBlock:vertical-middle','clip:clip'],
tooltipService : Ember.inject.service('tooltip'),
inlineBlock : true,
inlineBlock : false,
clip : false,
model : null,
size : 'default',

2
app/styles/base/_helpers.scss
View File

@ -141,7 +141,7 @@
display: table-cell !important;
}
.vertical-center {
.vertical-middle {
display: inline-block;
vertical-align: middle;
}

2
app/styles/components/_nav.scss
View File

@ -32,7 +32,7 @@ nav {
> a {
color: $header-link;
display: block;
padding: 10px;
padding: 11px;
border-bottom: solid $nav-spacing transparent;
border-top: solid $nav-spacing transparent;

2
app/styles/components/_tabs.scss
View File

@ -76,7 +76,7 @@ $close-text-shadow : 0 1px 0 white !default;
}
a {
display: block;
padding: 15px 10px;
padding: 19px 10px;
text-decoration: none;
border-bottom: solid 2px transparent;
color: $text-muted;

4
app/styles/layout/_header.scss
View File

@ -7,7 +7,7 @@ header {
.header {
border-bottom: solid 2px $border;
margin: 0 0 30px 0;
margin: 0 0 15px 0;
h1 {
margin: 0;
@ -21,7 +21,7 @@ header {
.right-buttons {
@include clearfix;
float: right;
padding: 11px 0;
padding: 15px 0;
> .resource-actions {
.btn.btn-sm {

4
app/styles/pages/_host.scss
View File

@ -5,8 +5,8 @@
}
.dot-group {
float: left;
border: 1px solid #aaa;
display: inline-block;
border: 1px solid $border;
margin: 0 5px 0 0;
padding: 2px;
}

2
translations/en-us.yaml
View File

@ -308,7 +308,7 @@ authPage:
azuread:
header:
enabled: 'Azure AD Authentication is <b>enabled</b>'
disabled: 'Azure AD Authentication is <b class="text-warning">not configured</b>'
disabled: 'Azure AD Authentication is not configured'
subtext:
enabled: '{appName} is configured to allow access to accounts in Azure AD'
disabled: '{appName} can be configured to restrict access to a set of accounts defined in the {appName} database. This is not currently set up, so anybody that reach this page (or the API) has full control over the system.'