Truncated organisations name #14583 (#14615)

- truncate to max length 40
- add CSS ellipsis

diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index ad795387df25cfb0425a4cd62b4e8207e2fc1823..8e4e0c748b32878f99480386b985b966bbd6e234 100644 (file)
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -20,18 +20,18 @@
                                                        <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
                                                        <span class="text" title="{{.ContextUser.Name}}">
                                                                {{avatar .ContextUser 28 "mini"}}
-                                                               {{.ContextUser.ShortName 20}}
+                                                               {{.ContextUser.ShortName 40}}
                                                        </span>
                                                        {{svg "octicon-triangle-down" 14 "dropdown icon"}}
                                                        <div class="menu">
                                                                <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
                                                                        {{avatar .SignedUser 28 "mini"}}
-                                                                       {{.SignedUser.ShortName 20}}
+                                                                       {{.SignedUser.ShortName 40}}
                                                                </div>
                                                                {{range .Orgs}}
                                                                        <div class="item" data-value="{{.ID}}" title="{{.Name}}">
                                                                                {{avatar . 28 "mini"}}
-                                                                               {{.ShortName 20}}
+                                                                               {{.ShortName 40}}
                                                                        </div>
                                                                {{end}}
                                                        </div>

diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl
index 7fb8f3d585d976c3c327579154edadd02f975e9b..f200281cbe8469a227ba5d664ad4ee2bebe89373 100644 (file)
--- a/templates/repo/migrate/git.tmpl
+++ b/templates/repo/migrate/git.tmpl
@@ -49,18 +49,18 @@
                                                        <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
                                                        <span class="text" title="{{.ContextUser.Name}}">
                                                                {{avatar .ContextUser}}
-                                                               {{.ContextUser.ShortName 20}}
+                                                               {{.ContextUser.ShortName 40}}
                                                        </span>
                                                        {{svg "octicon-triangle-down" 14 "dropdown icon"}}
                                                        <div class="menu" title="{{.SignedUser.Name}}">
                                                                <div class="item" data-value="{{.SignedUser.ID}}">
                                                                        {{avatar .SignedUser}}
-                                                                       {{.SignedUser.ShortName 20}}
+                                                                       {{.SignedUser.ShortName 40}}
                                                                </div>
                                                                {{range .Orgs}}
                                                                        <div class="item" data-value="{{.ID}}" title="{{.Name}}">
                                                                                {{avatar .}}
-                                                                               {{.ShortName 20}}
+                                                                               {{.ShortName 40}}
                                                                        </div>
                                                                {{end}}
                                                        </div>

diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
index 4ad6e6024fae59c85a441d2e59414edb86c2bb41..a214369f218159b795a91b44af891aec0c5462f1 100644 (file)
--- a/templates/repo/migrate/gitea.tmpl
+++ b/templates/repo/migrate/gitea.tmpl
@@ -83,18 +83,18 @@
                                                        <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
                                                        <span class="text" title="{{.ContextUser.Name}}">
                                                                {{avatar .ContextUser}}
-                                                               {{.ContextUser.ShortName 20}}
+                                                               {{.ContextUser.ShortName 40}}
                                                        </span>
                                                        {{svg "octicon-triangle-down" 14 "dropdown icon"}}
                                                        <div class="menu" title="{{.SignedUser.Name}}">
                                                                <div class="item" data-value="{{.SignedUser.ID}}">
                                                                        {{avatar .SignedUser}}
-                                                                       {{.SignedUser.ShortName 20}}
+                                                                       {{.SignedUser.ShortName 40}}
                                                                </div>
                                                                {{range .Orgs}}
                                                                <div class="item" data-value="{{.ID}}" title="{{.Name}}">
                                                                        {{avatar .}}
-                                                                       {{.ShortName 20}}
+                                                                       {{.ShortName 40}}
                                                                </div>
                                                                {{end}}
                                                        </div>

diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl
index c31444aaef2611caf4f974a04114ac3d9b05dc88..c4ca991aca865eec1c0667f08d9a5f27103ca0a7 100644 (file)
--- a/templates/repo/migrate/github.tmpl
+++ b/templates/repo/migrate/github.tmpl
@@ -83,18 +83,18 @@
                                                        <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
                                                        <span class="text" title="{{.ContextUser.Name}}">
                                                                {{avatar .ContextUser 28 "mini"}}
-                                                               {{.ContextUser.ShortName 20}}
+                                                               {{.ContextUser.ShortName 40}}
                                                        </span>
                                                        {{svg "octicon-triangle-down" 14 "dropdown icon"}}
                                                        <div class="menu" title="{{.SignedUser.Name}}">
                                                                <div class="item" data-value="{{.SignedUser.ID}}">
                                                                        {{avatar .SignedUser 28 "mini"}}
-                                                                       {{.SignedUser.ShortName 20}}
+                                                                       {{.SignedUser.ShortName 40}}
                                                                </div>
                                                                {{range .Orgs}}
                                                                        <div class="item" data-value="{{.ID}}" title="{{.Name}}">
                                                                                {{avatar . 28 "mini"}}
-                                                                               {{.ShortName 20}}
+                                                                               {{.ShortName 40}}
                                                                        </div>
                                                                {{end}}
                                                        </div>

diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl
index 823bf25de2f2199661c21fd56938fbf2c562a77c..bb1e19041d75fc1bee7a85f32937ff5ffda3077e 100644 (file)
--- a/templates/repo/migrate/gitlab.tmpl
+++ b/templates/repo/migrate/gitlab.tmpl
@@ -83,18 +83,18 @@
                                                        <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
                                                        <span class="text" title="{{.ContextUser.Name}}">
                                                                {{avatar .ContextUser 28 "mini"}}
-                                                               {{.ContextUser.ShortName 20}}
+                                                               {{.ContextUser.ShortName 40}}
                                                        </span>
                                                        {{svg "octicon-triangle-down" 14 "dropdown icon"}}
                                                        <div class="menu" title="{{.SignedUser.Name}}">
                                                                <div class="item" data-value="{{.SignedUser.ID}}">
                                                                        {{avatar .SignedUser 28 "mini"}}
-                                                                       {{.SignedUser.ShortName 20}}
+                                                                       {{.SignedUser.ShortName 40}}
                                                                </div>
                                                                {{range .Orgs}}
                                                                        <div class="item" data-value="{{.ID}}" title="{{.Name}}">
                                                                                {{avatar . 28 "mini"}}
-                                                                               {{.ShortName 20}}
+                                                                               {{.ShortName 40}}
                                                                        </div>
                                                                {{end}}
                                                        </div>

diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl
index dd33fd0138930932787617c553b465887d88708b..be66d5079d819edcc7184452b070d316864624c7 100644 (file)
--- a/templates/repo/migrate/gogs.tmpl
+++ b/templates/repo/migrate/gogs.tmpl
@@ -85,18 +85,18 @@
                                                        <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
                                                        <span class="text" title="{{.ContextUser.Name}}">
                                                                {{avatar .ContextUser}}
-                                                               {{.ContextUser.ShortName 20}}
+                                                               {{.ContextUser.ShortName 40}}
                                                        </span>
                                                        {{svg "octicon-triangle-down" 14 "dropdown icon"}}
                                                        <div class="menu" title="{{.SignedUser.Name}}">
                                                                <div class="item" data-value="{{.SignedUser.ID}}">
                                                                        {{avatar .SignedUser}}
-                                                                       {{.SignedUser.ShortName 20}}
+                                                                       {{.SignedUser.ShortName 40}}
                                                                </div>
                                                                {{range .Orgs}}
                                                                <div class="item" data-value="{{.ID}}" title="{{.Name}}">
                                                                        {{avatar .}}
-                                                                       {{.ShortName 20}}
+                                                                       {{.ShortName 40}}
                                                                </div>
                                                                {{end}}
                                                        </div>

diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl
index 42d9791163eb2b347a083dc2aff9c2fc187682ef..d172fc73ccd643e50aad3894df8e5cfda0eb075a 100644 (file)
--- a/templates/repo/pulls/fork.tmpl
+++ b/templates/repo/pulls/fork.tmpl
@@ -15,20 +15,20 @@
                                                        <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
                                                        <span class="text" title="{{.ContextUser.Name}}">
                                                                {{avatar .ContextUser 28 "mini"}}
-                                                               {{.ContextUser.ShortName 20}}
+                                                               {{.ContextUser.ShortName 40}}
                                                        </span>
                                                        {{svg "octicon-triangle-down" 14 "dropdown icon"}}
                                                        <div class="menu">
                                                                {{if .CanForkToUser}}
                                                                        <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
                                                                                {{avatar .SignedUser 28 "mini"}}
-                                                                               {{.SignedUser.ShortName 20}}
+                                                                               {{.SignedUser.ShortName 40}}
                                                                        </div>
                                                                {{end}}
                                                                {{range .Orgs}}
                                                                        <div class="item" data-value="{{.ID}}" title="{{.Name}}">
                                                                                {{avatar . 28 "mini"}}
-                                                                               {{.ShortName 20}}
+                                                                               {{.ShortName 40}}
                                                                        </div>
                                                                {{end}}
                                                        </div>

diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index 70eb7cce7f1ccfc9f014daf6104c82523b291299..c83ffde40a33dea89474073fe878989a37a993f0 100644 (file)
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -4,7 +4,7 @@
                        <div class="ui floating dropdown link jump">
                                <span class="text">
                                        {{avatar .ContextUser}}
-                                       {{.ContextUser.ShortName 20}}
+                                       {{.ContextUser.ShortName 40}}
                                        {{if .ContextUser.IsOrganization}}
                                                <span class="org-visibility">
                                                        {{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">
                                                <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}}
-                                                       {{.SignedUser.ShortName 20}}
+                                                       {{.SignedUser.ShortName 40}}
                                                </a>
                                                {{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}}">
                                                                {{avatar .}}
-                                                               {{.ShortName 20}}
+                                                               {{.ShortName 40}}
                                                                <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.IsPrivate}}<div class="ui red tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
@@ -94,7 +94,7 @@
                                {{end}}
                                <div class="item">
                                        <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>
                                </div>
                        </div>

diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl
index b444783dbb95f13811e00945e89958c2cfe7fd4b..eabed943fe0de4ce9f48cc27a5c8b726c1a6962b 100644 (file)
--- a/templates/user/project.tmpl
+++ b/templates/user/project.tmpl
@@ -15,18 +15,18 @@
                                                        <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
                                                        <span class="text" title="{{.ContextUser.Name}}">
                                                                {{avatar .ContextUser 28 "mini"}}
-                                                               {{.ContextUser.ShortName 20}}
+                                                               {{.ContextUser.ShortName 40}}
                                                        </span>
                                                        {{svg "octicon-triangle-down" 14 "dropdown icon"}}
                                                        <div class="menu">
                                                                <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
                                                                        {{avatar .SignedUser 28 "mini"}}
-                                                                       {{.SignedUser.ShortName 20}}
+                                                                       {{.SignedUser.ShortName 40}}
                                                                </div>
                                                                {{range .Orgs}}
                                                                <div class="item" data-value="{{.ID}}" title="{{.Name}}">
                                                                        {{avatar . 28 "mini"}}
-                                                                       {{.ShortName 20}}
+                                                                       {{.ShortName 40}}
                                                                </div>
                                                                {{end}}
                                                        </div>

diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index 6b16143bb1697a70493c4c904dcdfccb3640c153..b5c890fd61144cd1003c1f8d83e43a5bc496529c 100644 (file)
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -347,6 +347,9 @@ a.muted:hover,
 
 .ui.selection.dropdown .menu > .item {
   border-color: var(--color-secondary);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .ui.selection.visible.dropdown > .text:not(.default) {
@@ -387,6 +390,10 @@ a.muted:hover,
 
 .ui.menu .ui.dropdown .menu > .item {
   color: var(--color-text) !important;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: block;
 }
 
 .ui.menu .ui.dropdown .menu > .item:hover {

diff --git a/web_src/less/_form.less b/web_src/less/_form.less
index 76c1a06990f6234387de1903630b206cb3a26b9b..a4842edd013604a70b7825b331fcb9097497836a 100644 (file)
--- a/web_src/less/_form.less
+++ b/web_src/less/_form.less
@@ -278,6 +278,10 @@ textarea:focus,
     form {
       .dropdown .text {
         margin-right: 0 !important;
+
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
       .header {