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

Merge pull request #2512 from n313893254/16818 

Member list is cutting off on screen
This commit is contained in:
Westly Wright 2018-12-14 10:45:47 -07:00 committed by GitHub
parent b359a47b2f a34bc3b7c6
commit d9e5167fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/styles/_rancher.scss
View File

@ -60,6 +60,7 @@
@import "app/styles/components/nav-boxes";
@import "app/styles/components/pipeline";
@import "app/styles/components/logging";
@import "app/styles/components/identity-block";
// Vendor
// Pretty much what it says. Vendor specific changes/overrides or includes.

8
app/styles/components/_identity-block.scss Normal file
View File

@ -0,0 +1,8 @@
.identity-block {
width: 30vw;
.gh-block-name > div {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}

102
lib/shared/addon/components/identity-block/template.hbs
View File

@ -1,55 +1,57 @@
{{yield}}
{{#if avatar}}
<div class="gh-avatar">
{{#if principal.avatarSrc}}
{{#if (and principal.profileURL link)}}
<a href="{{principal.profileURL}}" target="_blank">
<img src="{{principal.avatarSrc}}" width="{{size}}" height="{{size}}">
</a>
{{else}}
<img src="{{principal.avatarSrc}}" width="{{size}}" height="{{size}}">
{{/if}}
{{else}}
<div class="gh-placeholder">
{{#unless loading}}
<img src="{{avatarSrc}}" width="{{size}}" height="{{size}}">
{{/unless}}
</div>
{{/if}}
</div>
{{/if}}
<div class="gh-block-content">
<div class="gh-block-name">
{{#if loading}}
{{t 'identityBlock.loading'}}
{{else}}
{{#if (and principal.profileURL link)}}
<a href="{{principal.profileURL}}" target="_blank">{{login}}</a>
{{else}}
{{#if principal.displayName}}
<div>
{{principal.displayName}} {{#if principal.loginName }}<small>(&nbsp;{{principal.loginName}}&nbsp;)</small>{{/if}}
</div>
{{else if principal.loginName}}
{{principal.loginName}}
{{else if unknownUser}}
<span class="text-error">{{t 'generic.unknownUser'}}</span>
<div class="identity-block">
{{#if avatar}}
<div class="gh-avatar">
{{#if principal.avatarSrc}}
{{#if (and principal.profileURL link)}}
<a href="{{principal.profileURL}}" target="_blank">
<img src="{{principal.avatarSrc}}" width="{{size}}" height="{{size}}">
</a>
{{else}}
&nbsp;
<img src="{{principal.avatarSrc}}" width="{{size}}" height="{{size}}">
{{/if}}
{{else}}
<div class="gh-placeholder">
{{#unless loading}}
<img src="{{avatarSrc}}" width="{{size}}" height="{{size}}">
{{/unless}}
</div>
{{/if}}
</div>
{{/if}}
<div class="gh-block-content">
<div class="gh-block-name">
{{#if loading}}
{{t 'identityBlock.loading'}}
{{else}}
{{#if (and principal.profileURL link)}}
<a href="{{principal.profileURL}}" target="_blank">{{login}}</a>
{{else}}
{{#if principal.displayName}}
<div>
{{principal.displayName}}{{#if principal.loginName }}<small>(&nbsp;{{principal.loginName}}&nbsp;)</small>{{/if}}
</div>
{{else if principal.loginName}}
{{principal.loginName}}
{{else if unknownUser}}
<span class="text-error">{{t 'generic.unknownUser'}}</span>
{{else}}
&nbsp;
{{/if}}
{{/if}}
{{/if}}
{{/if}}
</div>
<div class="gh-block-detail text-small clip">
{{#if principal.displayType}}
{{principal.displayType}}
{{else if unknownUser}}
<span class="clip">
{{principalId}}
</span>
{{else}}
&nbsp;
{{/if}}
</div>
</div>
<div class="gh-block-detail text-small clip">
{{#if principal.displayType}}
{{principal.displayType}}
{{else if unknownUser}}
<span class="clip">
{{principalId}}
</span>
{{else}}
&nbsp;
{{/if}}
</div>
</div>
</div>