Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Truncated organisations name #14583 (#14615)

Browse source 
- truncate to max length 40
- add CSS ellipsis
This commit is contained in:
vnkmpf 2021-02-09 20:51:01 +01:00 committed by GitHub
parent b337c606d3
commit 3a4801d195
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 39 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/repo/create.tmpl
View file

@ -20,18 +20,18 @@
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
<span class="text" title="{{.ContextUser.Name}}"> <span class="text" title="{{.ContextUser.Name}}">
{{avatar .ContextUser 28 "mini"}} {{avatar .ContextUser 28 "mini"}}
{{.ContextUser.ShortName 20}} {{.ContextUser.ShortName 40}}
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu"> <div class="menu">
<div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"> <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
{{avatar .SignedUser 28 "mini"}} {{avatar .SignedUser 28 "mini"}}
{{.SignedUser.ShortName 20}} {{.SignedUser.ShortName 40}}
</div> </div>
{{range .Orgs}} {{range .Orgs}}
<div class="item" data-value="{{.ID}}" title="{{.Name}}"> <div class="item" data-value="{{.ID}}" title="{{.Name}}">
{{avatar . 28 "mini"}} {{avatar . 28 "mini"}}
{{.ShortName 20}} {{.ShortName 40}}
</div> </div>
{{end}} {{end}}
</div> </div>

6
templates/repo/migrate/git.tmpl
View file

@ -49,18 +49,18 @@
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
<span class="text" title="{{.ContextUser.Name}}"> <span class="text" title="{{.ContextUser.Name}}">
{{avatar .ContextUser}} {{avatar .ContextUser}}
{{.ContextUser.ShortName 20}} {{.ContextUser.ShortName 40}}
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu" title="{{.SignedUser.Name}}"> <div class="menu" title="{{.SignedUser.Name}}">
<div class="item" data-value="{{.SignedUser.ID}}"> <div class="item" data-value="{{.SignedUser.ID}}">
{{avatar .SignedUser}} {{avatar .SignedUser}}
{{.SignedUser.ShortName 20}} {{.SignedUser.ShortName 40}}
</div> </div>
{{range .Orgs}} {{range .Orgs}}
<div class="item" data-value="{{.ID}}" title="{{.Name}}"> <div class="item" data-value="{{.ID}}" title="{{.Name}}">
{{avatar .}} {{avatar .}}
{{.ShortName 20}} {{.ShortName 40}}
</div> </div>
{{end}} {{end}}
</div> </div>

6
templates/repo/migrate/gitea.tmpl
View file

@ -83,18 +83,18 @@
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
<span class="text" title="{{.ContextUser.Name}}"> <span class="text" title="{{.ContextUser.Name}}">
{{avatar .ContextUser}} {{avatar .ContextUser}}
{{.ContextUser.ShortName 20}} {{.ContextUser.ShortName 40}}
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu" title="{{.SignedUser.Name}}"> <div class="menu" title="{{.SignedUser.Name}}">
<div class="item" data-value="{{.SignedUser.ID}}"> <div class="item" data-value="{{.SignedUser.ID}}">
{{avatar .SignedUser}} {{avatar .SignedUser}}
{{.SignedUser.ShortName 20}} {{.SignedUser.ShortName 40}}
</div> </div>
{{range .Orgs}} {{range .Orgs}}
<div class="item" data-value="{{.ID}}" title="{{.Name}}"> <div class="item" data-value="{{.ID}}" title="{{.Name}}">
{{avatar .}} {{avatar .}}
{{.ShortName 20}} {{.ShortName 40}}
</div> </div>
{{end}} {{end}}
</div> </div>

6
templates/repo/migrate/github.tmpl
View file

@ -83,18 +83,18 @@
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
<span class="text" title="{{.ContextUser.Name}}"> <span class="text" title="{{.ContextUser.Name}}">
{{avatar .ContextUser 28 "mini"}} {{avatar .ContextUser 28 "mini"}}
{{.ContextUser.ShortName 20}} {{.ContextUser.ShortName 40}}
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu" title="{{.SignedUser.Name}}"> <div class="menu" title="{{.SignedUser.Name}}">
<div class="item" data-value="{{.SignedUser.ID}}"> <div class="item" data-value="{{.SignedUser.ID}}">
{{avatar .SignedUser 28 "mini"}} {{avatar .SignedUser 28 "mini"}}
{{.SignedUser.ShortName 20}} {{.SignedUser.ShortName 40}}
</div> </div>
{{range .Orgs}} {{range .Orgs}}
<div class="item" data-value="{{.ID}}" title="{{.Name}}"> <div class="item" data-value="{{.ID}}" title="{{.Name}}">
{{avatar . 28 "mini"}} {{avatar . 28 "mini"}}
{{.ShortName 20}} {{.ShortName 40}}
</div> </div>
{{end}} {{end}}
</div> </div>

6
templates/repo/migrate/gitlab.tmpl
View file

@ -83,18 +83,18 @@
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
<span class="text" title="{{.ContextUser.Name}}"> <span class="text" title="{{.ContextUser.Name}}">
{{avatar .ContextUser 28 "mini"}} {{avatar .ContextUser 28 "mini"}}
{{.ContextUser.ShortName 20}} {{.ContextUser.ShortName 40}}
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu" title="{{.SignedUser.Name}}"> <div class="menu" title="{{.SignedUser.Name}}">
<div class="item" data-value="{{.SignedUser.ID}}"> <div class="item" data-value="{{.SignedUser.ID}}">
{{avatar .SignedUser 28 "mini"}} {{avatar .SignedUser 28 "mini"}}
{{.SignedUser.ShortName 20}} {{.SignedUser.ShortName 40}}
</div> </div>
{{range .Orgs}} {{range .Orgs}}
<div class="item" data-value="{{.ID}}" title="{{.Name}}"> <div class="item" data-value="{{.ID}}" title="{{.Name}}">
{{avatar . 28 "mini"}} {{avatar . 28 "mini"}}
{{.ShortName 20}} {{.ShortName 40}}
</div> </div>
{{end}} {{end}}
</div> </div>

6
templates/repo/migrate/gogs.tmpl
View file

@ -85,18 +85,18 @@
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
<span class="text" title="{{.ContextUser.Name}}"> <span class="text" title="{{.ContextUser.Name}}">
{{avatar .ContextUser}} {{avatar .ContextUser}}
{{.ContextUser.ShortName 20}} {{.ContextUser.ShortName 40}}
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu" title="{{.SignedUser.Name}}"> <div class="menu" title="{{.SignedUser.Name}}">
<div class="item" data-value="{{.SignedUser.ID}}"> <div class="item" data-value="{{.SignedUser.ID}}">
{{avatar .SignedUser}} {{avatar .SignedUser}}
{{.SignedUser.ShortName 20}} {{.SignedUser.ShortName 40}}
</div> </div>
{{range .Orgs}} {{range .Orgs}}
<div class="item" data-value="{{.ID}}" title="{{.Name}}"> <div class="item" data-value="{{.ID}}" title="{{.Name}}">
{{avatar .}} {{avatar .}}
{{.ShortName 20}} {{.ShortName 40}}
</div> </div>
{{end}} {{end}}
</div> </div>

6
templates/repo/pulls/fork.tmpl
View file

@ -15,20 +15,20 @@
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
<span class="text" title="{{.ContextUser.Name}}"> <span class="text" title="{{.ContextUser.Name}}">
{{avatar .ContextUser 28 "mini"}} {{avatar .ContextUser 28 "mini"}}
{{.ContextUser.ShortName 20}} {{.ContextUser.ShortName 40}}
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu"> <div class="menu">
{{if .CanForkToUser}} {{if .CanForkToUser}}
<div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"> <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
{{avatar .SignedUser 28 "mini"}} {{avatar .SignedUser 28 "mini"}}
{{.SignedUser.ShortName 20}} {{.SignedUser.ShortName 40}}
</div> </div>
{{end}} {{end}}
{{range .Orgs}} {{range .Orgs}}
<div class="item" data-value="{{.ID}}" title="{{.Name}}"> <div class="item" data-value="{{.ID}}" title="{{.Name}}">
{{avatar . 28 "mini"}} {{avatar . 28 "mini"}}
{{.ShortName 20}} {{.ShortName 40}}
</div> </div>
{{end}} {{end}}
</div> </div>

8
templates/user/dashboard/navbar.tmpl
View file

@ -4,7 +4,7 @@
<div class="ui floating dropdown link jump"> <div class="ui floating dropdown link jump">
<span class="text"> <span class="text">
{{avatar .ContextUser}} {{avatar .ContextUser}}
{{.ContextUser.ShortName 20}} {{.ContextUser.ShortName 40}}
{{if .ContextUser.IsOrganization}} {{if .ContextUser.IsOrganization}}
<span class="org-visibility"> <span class="org-visibility">
{{if .ContextUser.Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} {{if .ContextUser.Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
@ -20,12 +20,12 @@
<div class="scrolling menu items"> <div class="scrolling menu items">
<a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{else if .PageIsMilestonesDashboard}}milestones{{end}}"> <a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{else if .PageIsMilestonesDashboard}}milestones{{end}}">
{{avatar .SignedUser}} {{avatar .SignedUser}}
{{.SignedUser.ShortName 20}} {{.SignedUser.ShortName 40}}
</a> </a>
{{range .Orgs}} {{range .Orgs}}
<a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" title="{{.Name}}" href="{{AppSubUrl}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}"> <a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" title="{{.Name}}" href="{{AppSubUrl}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}">
{{avatar .}} {{avatar .}}
{{.ShortName 20}} {{.ShortName 40}}
<span class="org-visibility"> <span class="org-visibility">
{{if .Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} {{if .Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
{{if .Visibility.IsPrivate}}<div class="ui red tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} {{if .Visibility.IsPrivate}}<div class="ui red tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
@ -94,7 +94,7 @@
{{end}} {{end}}
<div class="item"> <div class="item">
<a class="ui blue basic button" href="{{.ContextUser.HomeLink}}" title='{{.i18n.Tr "home.view_home" .ContextUser.Name}}'> <a class="ui blue basic button" href="{{.ContextUser.HomeLink}}" title='{{.i18n.Tr "home.view_home" .ContextUser.Name}}'>
{{.i18n.Tr "home.view_home" (.ContextUser.ShortName 20)}} {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 40)}}
</a> </a>
</div> </div>
</div> </div>

6
templates/user/project.tmpl
View file

@ -15,18 +15,18 @@
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
<span class="text" title="{{.ContextUser.Name}}"> <span class="text" title="{{.ContextUser.Name}}">
{{avatar .ContextUser 28 "mini"}} {{avatar .ContextUser 28 "mini"}}
{{.ContextUser.ShortName 20}} {{.ContextUser.ShortName 40}}
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu"> <div class="menu">
<div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"> <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
{{avatar .SignedUser 28 "mini"}} {{avatar .SignedUser 28 "mini"}}
{{.SignedUser.ShortName 20}} {{.SignedUser.ShortName 40}}
</div> </div>
{{range .Orgs}} {{range .Orgs}}
<div class="item" data-value="{{.ID}}" title="{{.Name}}"> <div class="item" data-value="{{.ID}}" title="{{.Name}}">
{{avatar . 28 "mini"}} {{avatar . 28 "mini"}}
{{.ShortName 20}} {{.ShortName 40}}
</div> </div>
{{end}} {{end}}
</div> </div>

7
web_src/less/_base.less
View file

@ -347,6 +347,9 @@ a.muted:hover,
.ui.selection.dropdown .menu > .item { .ui.selection.dropdown .menu > .item {
border-color: var(--color-secondary); border-color: var(--color-secondary);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.ui.selection.visible.dropdown > .text:not(.default) { .ui.selection.visible.dropdown > .text:not(.default) {
@ -387,6 +390,10 @@ a.muted:hover,
.ui.menu .ui.dropdown .menu > .item { .ui.menu .ui.dropdown .menu > .item {
color: var(--color-text) !important; color: var(--color-text) !important;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
display: block;
} }
.ui.menu .ui.dropdown .menu > .item:hover { .ui.menu .ui.dropdown .menu > .item:hover {

4
web_src/less/_form.less
View file

@ -278,6 +278,10 @@ textarea:focus,
form { form {
.dropdown .text { .dropdown .text {
margin-right: 0 !important; margin-right: 0 !important;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.header { .header {