diff options
| author | silverwind <me@silverwind.io> | 2020-09-11 22:19:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 16:19:00 -0400 |
| commit | ffddf3f8a6ca5e3db46e5731d717a55eb58e858f (patch) | |
| tree | de8b73f1346e81d2bb9acf042bd33eafd0df26c1 | |
| parent | 26c4a049da178993e5ccddcb50e7edc70a6bde5d (diff) | |
| download | gitea-ffddf3f8a6ca5e3db46e5731d717a55eb58e858f.tar.gz gitea-ffddf3f8a6ca5e3db46e5731d717a55eb58e858f.zip | |
Make SVG size argument optional (#12814)
Now defaults to 16 on both frontend and backend.
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
89 files changed, 458 insertions, 455 deletions
diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 9037af8991..9e1c2fd381 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -470,7 +470,10 @@ var heightRe = regexp.MustCompile(`height="[0-9]+?"`) // SVG render icons - arguments icon name (string), size (int), class (string) func SVG(icon string, others ...interface{}) template.HTML { - var size = others[0].(int) + size := 16 + if len(others) > 0 && others[0].(int) != 0 { + size = others[0].(int) + } class := "" if len(others) > 1 && others[1].(string) != "" { diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 0fd87f9256..99c215493d 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -21,44 +21,44 @@ <tbody> <tr> <td>{{.i18n.Tr "admin.dashboard.delete_inactive_accounts"}}</td> - <td><button type="submit" class="ui green button" name="op" value="delete_inactive_accounts">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="delete_inactive_accounts">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> <tr> <td>{{.i18n.Tr "admin.dashboard.delete_repo_archives"}}</td> - <td><button type="submit" class="ui green button" name="op" value="delete_repo_archives">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="delete_repo_archives">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> <tr> <td>{{.i18n.Tr "admin.dashboard.delete_missing_repos"}}</td> - <td><button type="submit" class="ui green button" name="op" value="delete_missing_repos">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="delete_missing_repos">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> <tr> <td>{{.i18n.Tr "admin.dashboard.git_gc_repos"}}</td> - <td><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> <tr> <td>{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}<br/> {{.i18n.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td> - <td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> <tr> <td>{{.i18n.Tr "admin.dashboard.resync_all_hooks"}}</td> - <td><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> <tr> <td>{{.i18n.Tr "admin.dashboard.reinit_missing_repos"}}</td> - <td><button type="submit" class="ui green button" name="op" value="reinit_missing_repos">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="reinit_missing_repos">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> <tr> <td>{{.i18n.Tr "admin.dashboard.sync_external_users"}}</td> - <td><button type="submit" class="ui green button" name="op" value="sync_external_users">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="sync_external_users">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> <tr> <td>{{.i18n.Tr "admin.dashboard.repo_health_check"}}</td> - <td><button type="submit" class="ui green button" name="op" value="repo_health_check">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="repo_health_check">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> <tr> <td>{{.i18n.Tr "admin.dashboard.delete_generated_repository_avatars"}}</td> - <td><button type="submit" class="ui green button" name="op" value="delete_generated_repository_avatars">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="delete_generated_repository_avatars">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td> </tr> </tbody> </table> diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl index 8dd0d939d7..c3600fa996 100644 --- a/templates/admin/monitor.tmpl +++ b/templates/admin/monitor.tmpl @@ -24,7 +24,7 @@ <tbody> {{range .Entries}} <tr> - <td><button type="submit" class="ui green button" name="op" value="{{.Name}}" title="{{$.i18n.Tr "admin.dashboard.operation_run"}}">{{svg "octicon-triangle-right" 16}}</button></td> + <td><button type="submit" class="ui green button" name="op" value="{{.Name}}" title="{{$.i18n.Tr "admin.dashboard.operation_run"}}">{{svg "octicon-triangle-right"}}</button></td> <td>{{$.i18n.Tr (printf "admin.dashboard.%s" .Name)}}</td> <td>{{.Spec}}</td> <td>{{DateFmtLong .Next}}</td> diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 4f6bc50342..4a0fd16111 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -38,7 +38,7 @@ <td> <a href="{{.HomeLink}}">{{.Name}}</a> {{if .Visibility.IsPrivate}} - <span class="text gold">{{svg "octicon-lock" 16}}</span> + <span class="text gold">{{svg "octicon-lock"}}</span> {{end}} </td> <td>{{.NumTeams}}</td> diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index b9b8865382..4c3b77dcfb 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -45,7 +45,7 @@ <td> <a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a> {{if .Owner.Visibility.IsPrivate}} - <span class="text gold">{{svg "octicon-lock" 16}}</span> + <span class="text gold">{{svg "octicon-lock"}}</span> {{end}} </td> <td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td> diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 832b8cf3c7..e960f7fe17 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -50,7 +50,7 @@ <img class="ui tiny avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}"> <span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span> <span class="mobile-only">{{.SignedUser.Name}}</span> - <span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down" 16}}</span> + <span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span> </span> <div class="menu user-menu" tabindex="-1"> <div class="ui header"> @@ -59,7 +59,7 @@ <div class="divider"></div> <a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/"> - {{svg "octicon-sign-out" 16}} + {{svg "octicon-sign-out"}} {{.i18n.Tr "sign_out"}}<!-- Sign Out --> </a> </div><!-- end content avatar menu --> @@ -69,7 +69,7 @@ <div class="right stackable menu"> <a href="{{AppSubUrl}}/notifications" class="item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted"> <span class="text"> - <span class="fitted">{{svg "octicon-bell" 16}}</span> + <span class="fitted">{{svg "octicon-bell"}}</span> <span class="sr-mobile-only">{{.i18n.Tr "notifications"}}</span> {{$notificationUnreadCount := 0}} {{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}} @@ -81,20 +81,20 @@ <div class="ui dropdown jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted"> <span class="text"> - <span class="fitted">{{svg "octicon-plus" 16}}</span> + <span class="fitted">{{svg "octicon-plus"}}</span> <span class="sr-mobile-only">{{.i18n.Tr "create_new"}}</span> - <span class="fitted not-mobile">{{svg "octicon-triangle-down" 16}}</span> + <span class="fitted not-mobile">{{svg "octicon-triangle-down"}}</span> </span> <div class="menu"> <a class="item" href="{{AppSubUrl}}/repo/create"> - <span class="fitted">{{svg "octicon-plus" 16}}</span> {{.i18n.Tr "new_repo"}} + <span class="fitted">{{svg "octicon-plus"}}</span> {{.i18n.Tr "new_repo"}} </a> <a class="item" href="{{AppSubUrl}}/repo/migrate"> - <span class="fitted">{{svg "octicon-repo-push" 16}}</span> {{.i18n.Tr "new_migrate"}} + <span class="fitted">{{svg "octicon-repo-push"}}</span> {{.i18n.Tr "new_migrate"}} </a> {{if .SignedUser.CanCreateOrganization}} <a class="item" href="{{AppSubUrl}}/org/create"> - <span class="fitted">{{svg "octicon-organization" 16}}</span> {{.i18n.Tr "new_org"}} + <span class="fitted">{{svg "octicon-organization"}}</span> {{.i18n.Tr "new_org"}} </a> {{end}} </div><!-- end content create new menu --> @@ -105,7 +105,7 @@ <img class="ui tiny avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}"> <span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span> <span class="mobile-only">{{.SignedUser.Name}}</span> - <span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down" 16}}</span> + <span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span> </span> <div class="menu user-menu" tabindex="-1"> <div class="ui header"> @@ -114,19 +114,19 @@ <div class="divider"></div> <a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}"> - {{svg "octicon-person" 16}} + {{svg "octicon-person"}} {{.i18n.Tr "your_profile"}}<!-- Your profile --> </a> <a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars"> - {{svg "octicon-star" 16}} + {{svg "octicon-star"}} {{.i18n.Tr "your_starred"}} </a> <a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings"> - {{svg "octicon-tools" 16}} + {{svg "octicon-tools"}} {{.i18n.Tr "your_settings"}}<!-- Your settings --> </a> <a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io"> - {{svg "octicon-question" 16}} + {{svg "octicon-question"}} {{.i18n.Tr "help"}}<!-- Help --> </a> {{if .IsAdmin}} @@ -140,7 +140,7 @@ <div class="divider"></div> <a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/"> - {{svg "octicon-sign-out" 16}} + {{svg "octicon-sign-out"}} {{.i18n.Tr "sign_out"}}<!-- Sign Out --> </a> </div><!-- end content avatar menu --> @@ -151,11 +151,11 @@ <div class="right stackable menu"> {{if .ShowRegistrationButton}} <a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up"> - {{svg "octicon-person" 16}} {{.i18n.Tr "register"}} + {{svg "octicon-person"}} {{.i18n.Tr "register"}} </a> {{end}} <a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{.CurrentURL}}"> - {{svg "octicon-sign-in" 16}} {{.i18n.Tr "sign_in"}} + {{svg "octicon-sign-in"}} {{.i18n.Tr "sign_in"}} </a> </div><!-- end anonymous right menu --> {{end}} diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl index 5433425972..ce86c0a8c1 100644 --- a/templates/explore/navbar.tmpl +++ b/templates/explore/navbar.tmpl @@ -1,16 +1,16 @@ <div class="ui secondary pointing tabular top attached borderless stackable menu navbar"> <a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos"> - {{svg "octicon-repo" 16}} {{.i18n.Tr "explore.repos"}} + {{svg "octicon-repo"}} {{.i18n.Tr "explore.repos"}} </a> <a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users"> - {{svg "octicon-person" 16}} {{.i18n.Tr "explore.users"}} + {{svg "octicon-person"}} {{.i18n.Tr "explore.users"}} </a> <a class="{{if .PageIsExploreOrganizations}}active{{end}} item" href="{{AppSubUrl}}/explore/organizations"> - {{svg "octicon-organization" 16}} {{.i18n.Tr "explore.organizations"}} + {{svg "octicon-organization"}} {{.i18n.Tr "explore.organizations"}} </a> {{if .IsRepoIndexerEnabled}} <a class="{{if .PageIsExploreCode}}active{{end}} item" href="{{AppSubUrl}}/explore/code"> - {{svg "octicon-code" 16}} {{.i18n.Tr "explore.code"}} + {{svg "octicon-code"}} {{.i18n.Tr "explore.code"}} </a> {{end}} </div> diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 6980622de1..a83998543b 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -12,18 +12,18 @@ <span class="header"> <a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}} {{if .Visibility.IsPrivate}} - <span class="text gold">{{svg "octicon-lock" 16}}</span> + <span class="text gold">{{svg "octicon-lock"}}</span> {{end}} </span> <div class="description"> {{if .Location}} - {{svg "octicon-location" 16}} {{.Location}} + {{svg "octicon-location"}} {{.Location}} {{end}} {{if and .Website}} - {{svg "octicon-link" 16}} + {{svg "octicon-link"}} <a href="{{.Website}}" rel="nofollow">{{.Website}}</a> {{end}} - {{svg "octicon-clock" 16}} {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}} + {{svg "octicon-clock"}} {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}} </div> </div> </div> diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 35a8b3948c..9e4e438a84 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -27,16 +27,16 @@ {{end}} {{end}} {{if .IsFork}} - <span class="middle">{{svg "octicon-repo-forked" 16}}</span> + <span class="middle">{{svg "octicon-repo-forked"}}</span> {{else if .IsMirror}} - <span class="middle">{{svg "octicon-mirror" 16}}</span> + <span class="middle">{{svg "octicon-mirror"}}</span> {{end}} <div class="ui right metas"> {{if .PrimaryLanguage }} <span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span> {{end}} - <span class="text grey">{{svg "octicon-star" 16}} {{.NumStars}}</span> - <span class="text grey">{{svg "octicon-git-branch" 16}} {{.NumForks}}</span> + <span class="text grey">{{svg "octicon-star"}} {{.NumStars}}</span> + <span class="text grey">{{svg "octicon-git-branch"}} {{.NumForks}}</span> </div> </div> <div class="description"> diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 1929eb296c..a305e0db24 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -12,13 +12,13 @@ <span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span> <div class="description"> {{if .Location}} - {{svg "octicon-location" 16}} {{.Location}} + {{svg "octicon-location"}} {{.Location}} {{end}} {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} - {{svg "octicon-mail" 16}} + {{svg "octicon-mail"}} <a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a> {{end}} - {{svg "octicon-clock" 16}} {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}} + {{svg "octicon-clock"}} {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}} </div> </div> </div> diff --git a/templates/home.tmpl b/templates/home.tmpl index 5daea544fe..721bb50dba 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -16,7 +16,7 @@ <div class="ui stackable middle very relaxed page grid"> <div class="eight wide center column"> <h1 class="hero ui icon header"> - {{svg "octicon-flame" 16}} {{.i18n.Tr "startpage.install"}} + {{svg "octicon-flame"}} {{.i18n.Tr "startpage.install"}} </h1> <p class="large"> {{.i18n.Tr "startpage.install_desc" | Str2html}} @@ -24,7 +24,7 @@ </div> <div class="eight wide center column"> <h1 class="hero ui icon header"> - {{svg "octicon-device-desktop" 16}} {{.i18n.Tr "startpage.platform"}} + {{svg "octicon-device-desktop"}} {{.i18n.Tr "startpage.platform"}} </h1> <p class="large"> {{.i18n.Tr "startpage.platform_desc" | Str2html}} @@ -34,7 +34,7 @@ <div class="ui stackable middle very relaxed page grid"> <div class="eight wide center column"> <h1 class="hero ui icon header"> - {{svg "octicon-rocket" 16}} {{.i18n.Tr "startpage.lightweight"}} + {{svg "octicon-rocket"}} {{.i18n.Tr "startpage.lightweight"}} </h1> <p class="large"> {{.i18n.Tr "startpage.lightweight_desc" | Str2html}} @@ -42,7 +42,7 @@ </div> <div class="eight wide center column"> <h1 class="hero ui icon header"> - {{svg "octicon-code" 16}} {{.i18n.Tr "startpage.license"}} + {{svg "octicon-code"}} {{.i18n.Tr "startpage.license"}} </h1> <p class="large"> {{.i18n.Tr "startpage.license_desc" | Str2html}} diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index 6593900c1e..17cc58fcbb 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -9,11 +9,11 @@ <div class="ui right"> <div class="ui menu"> <a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members"> - {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} + {{svg "octicon-organization"}} {{$.i18n.Tr "org.people"}} <div class="floating ui black label">{{.NumMembers}}</div> </a> <a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams"> - {{svg "octicon-people" 16}} {{$.i18n.Tr "org.teams"}} + {{svg "octicon-people"}} {{$.i18n.Tr "org.teams"}} <div class="floating ui black label">{{.NumTeams}}</div> </a> </div> diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 7fc2a5c2de..01c1fe66b0 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -7,12 +7,12 @@ <div id="org-info"> <div class="ui header"> {{.Org.DisplayName}} - {{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}}</a>{{end}} + {{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear"}}</a>{{end}} </div> {{if .Org.Description}}<p class="desc">{{.Org.Description}}</p>{{end}} <div class="text grey meta"> - {{if .Org.Location}}<div class="item">{{svg "octicon-location" 16}} <span>{{.Org.Location}}</span></div>{{end}} - {{if .Org.Website}}<div class="item">{{svg "octicon-link" 16}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}} + {{if .Org.Location}}<div class="item">{{svg "octicon-location"}} <span>{{.Org.Location}}</span></div>{{end}} + {{if .Org.Website}}<div class="item">{{svg "octicon-link"}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}} </div> </div> </div> @@ -38,7 +38,7 @@ <strong>{{.i18n.Tr "org.people"}}</strong> {{if .IsOrganizationMember}} <div class="ui right"> - <a class="text grey" href="{{.OrgLink}}/members">{{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}}</a> + <a class="text grey" href="{{.OrgLink}}/members">{{.Org.NumMembers}} {{svg "octicon-chevron-right"}}</a> </div> {{end}} </h4> @@ -55,7 +55,7 @@ <div class="ui top attached header"> <strong>{{.i18n.Tr "org.teams"}}</strong> <div class="ui right"> - <a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right" 16}}</a> + <a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a> </div> </div> <div class="ui attached table segment teams"> diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 1c33c55c5a..f33f9be927 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -34,7 +34,7 @@ {{$.i18n.Tr "org.members.member_role"}} </div> <div class="meta"> - <strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock" 16}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong> + <strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong> </div> </div> <div class="ui one wide column center"> @@ -44,9 +44,9 @@ <div class="meta"> <strong> {{if index $.MembersTwoFaStatus .ID}} - <span class="text green">{{svg "octicon-check" 16}}</span> + <span class="text green">{{svg "octicon-check"}}</span> {{else}} - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{end}} </strong> </div> diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 729126b7b9..a189a2f5e3 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -11,7 +11,7 @@ </h4> <div class="ui attached warning segment"> <div class="ui red message"> - <p class="text left">{{svg "octicon-alert" 16}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p> + <p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p> </div> <form class="ui form ignore-dirty" id="delete-form" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} diff --git a/templates/org/team/navbar.tmpl b/templates/org/team/navbar.tmpl index 95329a2be3..18d638796c 100644 --- a/templates/org/team/navbar.tmpl +++ b/templates/org/team/navbar.tmpl @@ -1,4 +1,4 @@ <div class="ui top attached tabular menu"> - <a class="item{{if .PageIsOrgTeamMembers}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName}}">{{svg "octicon-person" 16}} <strong>{{.Team.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> - <a class="item{{if .PageIsOrgTeamRepos}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/repositories">{{svg "octicon-repo" 16}} <strong>{{.Team.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a> + <a class="item{{if .PageIsOrgTeamMembers}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName}}">{{svg "octicon-person"}} <strong>{{.Team.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> + <a class="item{{if .PageIsOrgTeamRepos}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/repositories">{{svg "octicon-repo"}} <strong>{{.Team.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a> </div> diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index f6cb4f028a..de39fee2ea 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -42,13 +42,13 @@ {{end}} <a class="member" href="{{AppSubUrl}}/{{$.Org.Name}}/{{.Name}}"> {{if .IsPrivate}} - {{svg "octicon-lock" 16}} + {{svg "octicon-lock"}} {{else if .IsFork}} - {{svg "octicon-repo-forked" 16}} + {{svg "octicon-repo-forked"}} {{else if .IsMirror}} - {{svg "octicon-mirror" 16}} + {{svg "octicon-mirror"}} {{else}} - {{svg "octicon-repo" 16}} + {{svg "octicon-repo"}} {{end}} <strong>{{$.Org.Name}}/{{.Name}}</strong> </a> diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index d3bd082875..9ab6e8f4cd 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -55,7 +55,7 @@ </div> {{if .IsOrganizationOwner}} <div class="ui bottom attached segment"> - <a class="ui teal small button" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/edit">{{svg "octicon-gear" 16}} {{$.i18n.Tr "org.teams.settings"}}</a> + <a class="ui teal small button" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/edit">{{svg "octicon-gear"}} {{$.i18n.Tr "org.teams.settings"}}</a> </div> {{end}} </div> diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 6aef18dfff..e4be11ee52 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}} {{if .IsOrganizationOwner}} <div class="text right"> - <a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus" 16}} {{.i18n.Tr "org.create_new_team"}}</a> + <a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{.i18n.Tr "org.create_new_team"}}</a> </div> <div class="ui divider"></div> {{end}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 41f6be6430..fd24499fcc 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -63,21 +63,21 @@ <div class="ui attached segment horizontal segments"> {{if .Permission.CanRead $.UnitTypePullRequests}} <a href="#merged-pull-requests" class="ui attached segment text center"> - <span class="text purple">{{svg "octicon-git-pull-request" 16}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br> + <span class="text purple">{{svg "octicon-git-pull-request"}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br> {{.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n") }} </a> <a href="#proposed-pull-requests" class="ui attached segment text center"> - <span class="text green">{{svg "octicon-git-branch" 16}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br> + <span class="text green">{{svg "octicon-git-branch"}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br> {{.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n") }} </a> {{end}} {{if .Permission.CanRead $.UnitTypeIssues}} <a href="#closed-issues" class="ui attached segment text center"> - <span class="text red">{{svg "octicon-issue-closed" 16}}</span> <strong>{{.Activity.ClosedIssueCount}}</strong><br> + <span class="text red">{{svg "octicon-issue-closed"}}</span> <strong>{{.Activity.ClosedIssueCount}}</strong><br> {{.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n") }} </a> <a href="#new-issues" class="ui attached segment text center"> - <span class="text green">{{svg "octicon-issue-opened" 16}}</span> <strong>{{.Activity.OpenedIssueCount}}</strong><br> + <span class="text green">{{svg "octicon-issue-opened"}}</span> <strong>{{.Activity.OpenedIssueCount}}</strong><br> {{.i18n.Tr (TrN .i18n.Lang .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n") }} </a> {{end}} @@ -120,7 +120,7 @@ {{if gt .Activity.PublishedReleaseCount 0}} <h4 class="ui horizontal divider header" id="published-releases"> - <span class="text">{{svg "octicon-tag" 16}}</span> + <span class="text">{{svg "octicon-tag"}}</span> {{.i18n.Tr "repo.activity.title.releases_published_by" (.i18n.Tr (TrN .i18n.Lang .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n") .Activity.PublishedReleaseCount) (.i18n.Tr (TrN .i18n.Lang .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.PublishedReleaseAuthorCount) }} </h4> <div class="list"> @@ -139,7 +139,7 @@ {{if gt .Activity.MergedPRCount 0}} <h4 class="ui horizontal divider header" id="merged-pull-requests"> - <span class="text">{{svg "octicon-git-pull-request" 16}}</span> + <span class="text">{{svg "octicon-git-pull-request"}}</span> {{.i18n.Tr "repo.activity.title.prs_merged_by" (.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n") .Activity.MergedPRCount) (.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.MergedPRAuthorCount) }} </h4> <div class="list"> @@ -155,7 +155,7 @@ {{if gt .Activity.OpenedPRCount 0}} <h4 class="ui horizontal divider header" id="proposed-pull-requests"> - <span class="text">{{svg "octicon-git-branch" 16}}</span> + <span class="text">{{svg "octicon-git-branch"}}</span> {{.i18n.Tr "repo.activity.title.prs_opened_by" (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n") .Activity.OpenedPRCount) (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.OpenedPRAuthorCount) }} </h4> <div class="list"> @@ -171,7 +171,7 @@ {{if gt .Activity.ClosedIssueCount 0}} <h4 class="ui horizontal divider header" id="closed-issues"> - <span class="text">{{svg "octicon-issue-closed" 16}}</span> + <span class="text">{{svg "octicon-issue-closed"}}</span> {{.i18n.Tr "repo.activity.title.issues_closed_by" (.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n") .Activity.ClosedIssueCount) (.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.ClosedIssueAuthorCount) }} </h4> <div class="list"> @@ -187,7 +187,7 @@ {{if gt .Activity.OpenedIssueCount 0}} <h4 class="ui horizontal divider header" id="new-issues"> - <span class="text">{{svg "octicon-issue-opened" 16}}</span> + <span class="text">{{svg "octicon-issue-opened"}}</span> {{.i18n.Tr "repo.activity.title.issues_created_by" (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n") .Activity.OpenedIssueCount) (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.OpenedIssueAuthorCount) }} </h4> <div class="list"> @@ -203,7 +203,7 @@ {{if gt .Activity.UnresolvedIssueCount 0}} <h4 class="ui horizontal divider header" id="unresolved-conversations"> - <span class="text">{{svg "octicon-comment-discussion" 16}}</span> + <span class="text">{{svg "octicon-comment-discussion"}}</span> {{.i18n.Tr (TrN .i18n.Lang .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n") .Activity.UnresolvedIssueCount }} </h4> <div class="text center desc"> diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 74025bd530..51ddf6c1e1 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -16,10 +16,10 @@ {{range .Branches}} {{if eq .Name $.DefaultBranch}} {{if .IsProtected}} - {{svg "octicon-shield-lock" 16}} + {{svg "octicon-shield-lock"}} {{end}} <a href="{{$.RepoLink}}/src/branch/{{$.DefaultBranch | EscapePound}}">{{$.DefaultBranch}}</a> - <p class="info">{{svg "octicon-git-commit" 16}}<a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p> + <p class="info">{{svg "octicon-git-commit"}}<a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p> {{end}} {{end}} </td> @@ -27,8 +27,8 @@ <div class="ui basic jump dropdown icon button poping up" data-content="{{$.i18n.Tr "repo.branch.download" ($.DefaultBranch)}}" data-variation="tiny inverted" data-position="top right"> <i class="download icon"></i> <div class="menu"> - <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.zip">{{svg "octicon-file-zip" 16}} ZIP</a> - <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.tar.gz">{{svg "octicon-file-zip" 16}} TAR.GZ</a> + <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.zip">{{svg "octicon-file-zip"}} ZIP</a> + <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.tar.gz">{{svg "octicon-file-zip"}} TAR.GZ</a> </div> </div> </td> @@ -53,10 +53,10 @@ <p class="info">{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}</p> {{else}} {{if .IsProtected}} - {{svg "octicon-shield-lock" 16}} + {{svg "octicon-shield-lock"}} {{end}} <a href="{{$.RepoLink}}/src/branch/{{.Name | EscapePound}}">{{.Name}}</a> - <p class="info">{{svg "octicon-git-commit" 16}}<a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p> + <p class="info">{{svg "octicon-git-commit"}}<a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p> {{end}} </td> <td class="three wide ui"> @@ -77,7 +77,7 @@ {{if not .LatestPullRequest}} {{if .IsIncluded}} <a class="ui poping up orange small label" data-content="{{$.i18n.Tr "repo.branch.included_desc"}}" data-variation="tiny inverted" data-position="top right"> - {{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.branch.included"}} + {{svg "octicon-git-pull-request"}} {{$.i18n.Tr "repo.branch.included"}} </a> {{else if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} <a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}"> @@ -93,11 +93,11 @@ {{else}} <a href="{{.LatestPullRequest.Issue.HTMLURL}}">{{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}}</a> {{if .LatestPullRequest.HasMerged}} - <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label purple mini label">{{svg "octicon-git-merge" 16}} {{$.i18n.Tr "repo.pulls.merged"}}</a> + <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label purple mini label">{{svg "octicon-git-merge"}} {{$.i18n.Tr "repo.pulls.merged"}}</a> {{else if .LatestPullRequest.Issue.IsClosed}} - <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label red mini label">{{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.issues.closed_title"}}</a> + <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label red mini label">{{svg "octicon-git-pull-request"}} {{$.i18n.Tr "repo.issues.closed_title"}}</a> {{else}} - <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label green mini label">{{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.issues.open_title"}}</a> + <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label green mini label">{{svg "octicon-git-pull-request"}} {{$.i18n.Tr "repo.issues.open_title"}}</a> {{end}} {{end}} </td> @@ -106,14 +106,14 @@ <div class="ui basic jump dropdown icon button poping up" data-content="{{$.i18n.Tr "repo.branch.download" (.Name)}}" data-variation="tiny inverted" data-position="top right"> <i class="download icon"></i> <div class="menu"> - <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound .Name}}.zip">{{svg "octicon-file-zip" 16}} ZIP</a> - <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound .Name}}.tar.gz">{{svg "octicon-file-zip" 16}} TAR.GZ</a> + <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound .Name}}.zip">{{svg "octicon-file-zip"}} ZIP</a> + <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound .Name}}.tar.gz">{{svg "octicon-file-zip"}} TAR.GZ</a> </div> </div> {{end}} {{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}} {{if .IsDeleted}} - <a class="ui basic jump button icon poping up undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.restore" (.Name)}}" data-variation="tiny inverted" data-position="top right"><span class="text blue">{{svg "octicon-reply" 16}}</span></a> + <a class="ui basic jump button icon poping up undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.restore" (.Name)}}" data-variation="tiny inverted" data-position="top right"><span class="text blue">{{svg "octicon-reply"}}</span></a> {{else}} <a class="ui basic jump button icon poping up delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.delete" (.Name)}}" data-variation="tiny inverted" data-position="top right" data-name="{{.Name}}"><i class="trash icon text red"></i></a> {{end}} diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 28aa14abea..6a8e16c101 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -2,7 +2,7 @@ <div class="ui floating filter dropdown custom" data-can-create-branch="{{.CanCreateBranch}}" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> <div class="ui basic small compact button" @click="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible"> <span class="text"> - {{svg "octicon-git-branch" 16}} + {{svg "octicon-git-branch"}} {{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: <strong>{{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}</strong> </span> @@ -26,7 +26,7 @@ <div class="two column row"> <a class="reference column" href="#" @click="mode = 'branches'; focusSearchField()"> <span class="text" :class="{black: mode == 'branches'}"> - {{svg "octicon-git-branch" 16}} {{.i18n.Tr "repo.branches"}} + {{svg "octicon-git-branch"}} {{.i18n.Tr "repo.branches"}} </span> </a> <a class="reference column" href="#" @click="mode = 'tags'; focusSearchField()"> @@ -42,7 +42,7 @@ <div class="item" v-if="showCreateNewBranch" :class="{active: active == filteredItems.length}" :ref="'listItem' + filteredItems.length"> <a href="#" @click="createNewBranch()"> <div> - {{svg "octicon-git-branch" 16}} + {{svg "octicon-git-branch"}} {{.i18n.Tr "repo.branch.create_branch" `${ searchTerm }` | Safe}} </div> <div class="text small"> diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 1d223d2ea2..fb60967e30 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -28,10 +28,10 @@ <pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre> {{end}} {{if .BranchName}} - <span class="text grey">{{svg "octicon-git-branch" 16}}{{.BranchName}}</span> + <span class="text grey">{{svg "octicon-git-branch"}}{{.BranchName}}</span> {{end}} {{if .TagName}} - <span class="text grey">{{svg "octicon-tag" 16}}{{.TagName}}</span> + <span class="text grey">{{svg "octicon-tag"}}{{.TagName}}</span> {{end}} </div> <div class="ui attached info segment {{$class}}"> @@ -51,7 +51,7 @@ <span class="text grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span> {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} <div class="committed-by"> - <span class="text grey">{{svg "octicon-git-commit" 16}}{{.i18n.Tr "repo.diff.committed_by"}}</span> + <span class="text grey">{{svg "octicon-git-commit"}}{{.i18n.Tr "repo.diff.committed_by"}}</span> {{if ne .Verification.CommittingUser.ID 0}} <img class="ui avatar image" src="{{.Verification.CommittingUser.RelAvatarLink}}" /> <a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a> @@ -90,7 +90,7 @@ <div class="ui bottom attached message {{$class}}"> {{if .Verification.Verified }} {{if ne .Verification.SigningUser.ID 0}} - {{svg "gitea-lock" 16}} + {{svg "gitea-lock"}} {{if eq .Verification.TrustStatus "trusted"}} <span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span> {{else if eq .Verification.TrustStatus "untrusted"}} @@ -102,14 +102,14 @@ <a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.Name}}</strong></a> <span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> {{.Verification.SigningKey.KeyID}}</span> {{else}} - <span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog" 16}}</span> + <span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span> <span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span> <img class="ui avatar image" src="{{AvatarLink .Verification.SigningEmail}}" /> <strong>{{.Verification.SigningUser.Name}}</strong> <span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> <i class="cogs icon" title="{{.i18n.Tr "gpg.default_key"}}"></i>{{.Verification.SigningKey.KeyID}}</span> {{end}} {{else if .Verification.Warning}} - {{svg "gitea-unlock" 16}} + {{svg "gitea-unlock"}} <span class="ui text">{{.i18n.Tr .Verification.Reason}}</span> <span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> <i class="warning icon"></i>{{.Verification.SigningKey.KeyID}}</span> {{else}} diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 3b4c39524d..dc729d9358 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -8,7 +8,7 @@ <div class="fitted item"> <a href="{{.RepoLink}}/graph" class="ui basic small compact button"> <span class="text"> - {{svg "octicon-git-branch" 16}} + {{svg "octicon-git-branch"}} </span> {{.i18n.Tr "repo.commit_graph"}} </a> diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index 0703df12e9..cb8c6e05fd 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -5,7 +5,7 @@ {{ $tag := printf "%s-%d" $.comment.HashTag $index }} {{ $index = Add $index 1}} <div class="singular-commit" id="{{$tag}}"> - <span class="badge badge-commit">{{svg "octicon-git-commit" 16}}</span> + <span class="badge badge-commit">{{svg "octicon-git-commit"}}</span> {{if .User}} <a class="ui avatar image" href="{{AppSubUrl}}/{{.User.Name}}"><img src="{{.User.RelAvatarLink}}" alt=""/></a> {{else}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index da2a134994..2ff8d5b4d8 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -21,9 +21,9 @@ <button class="ui blue tiny button" data-panel="#add-deploy-key-panel" data-tooltip={{.i18n.Tr "repo.commits.search.tooltip"}}>{{.i18n.Tr "repo.commits.find"}}</button> </form> {{else if .IsDiffCompare}} - <a href="{{$.CommitRepoLink}}/commit/{{.BeforeCommitID}}" class="ui green sha label">{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch" 16}}{{else if .BaseIsTag}}{{svg "octicon-tag" 16}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}}</a> + <a href="{{$.CommitRepoLink}}/commit/{{.BeforeCommitID}}" class="ui green sha label">{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}}</a> ... - <a href="{{$.CommitRepoLink}}/commit/{{.AfterCommitID}}" class="ui green sha label">{{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch" 16}}{{else if .HeadIsTag}}{{svg "octicon-tag" 16}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}}</a> + <a href="{{$.CommitRepoLink}}/commit/{{.AfterCommitID}}" class="ui green sha label">{{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}}</a> {{end}} </div> </div> diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index 604c814b8e..6bcb14406c 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -5,17 +5,17 @@ <td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} <a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{$.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=down" data-anchor="{{$.Anchor}}"> - {{svg "octicon-fold-down" 16}} + {{svg "octicon-fold-down"}} </a> {{end}} {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} <a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{$.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=up" data-anchor="{{$.Anchor}}"> - {{svg "octicon-fold-up" 16}} + {{svg "octicon-fold-up"}} </a> {{end}} {{if eq $line.GetExpandDirection 2}} <a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{$.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=" data-anchor="{{$.Anchor}}"> - {{svg "octicon-fold" 16}} + {{svg "octicon-fold"}} </a> {{end}} </td> @@ -37,17 +37,17 @@ <td colspan="2" class="lines-num"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} <a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{$.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=down" data-anchor="{{$.Anchor}}"> - {{svg "octicon-fold-down" 16}} + {{svg "octicon-fold-down"}} </a> {{end}} {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} <a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{$.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=up" data-anchor="{{$.Anchor}}"> - {{svg "octicon-fold-up" 16}} + {{svg "octicon-fold-up"}} </a> {{end}} {{if eq $line.GetExpandDirection 2}} <a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{$.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=" data-anchor="{{$.Anchor}}"> - {{svg "octicon-fold" 16}} + {{svg "octicon-fold"}} </a> {{end}} </td> diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 7338c1ee67..2d39759d80 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -18,7 +18,7 @@ {{else}} <div> <div class="diff-detail-box diff-box sticky"> - {{svg "octicon-diff" 16}} {{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}} + {{svg "octicon-diff"}} {{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}} <div class="ui right"> {{if .PageIsPullFiles}} {{template "repo/diff/whitespace_dropdown" .}} @@ -128,17 +128,17 @@ <td class="lines-num lines-num-old"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} <a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{$.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=down" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> - {{svg "octicon-fold-down" 16}} + {{svg "octicon-fold-down"}} </a> {{end}} {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} <a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{$.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=up" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> - {{svg "octicon-fold-up" 16}} + {{svg "octicon-fold-up"}} </a> {{end}} {{if eq $line.GetExpandDirection 2}} <a role="button" class="blob-excerpt" data-url="{{$.RepoLink}}/blob_excerpt/{{$.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> - {{svg "octicon-fold" 16}} + {{svg "octicon-fold"}} </a> {{end}} </td> @@ -164,11 +164,11 @@ <div class="ui top attached header"> <span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.i18n.Tr "repo.issues.review.resolved_by"}}</span> <button id="show-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="ui compact right labeled button show-outdated"> - {{svg "octicon-unfold" 16}} + {{svg "octicon-unfold"}} {{$.i18n.Tr "repo.issues.review.show_resolved"}} </button> <button id="hide-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="hide ui compact right labeled button hide-outdated"> - {{svg "octicon-fold" 16}} + {{svg "octicon-fold"}} {{$.i18n.Tr "repo.issues.review.hide_resolved"}} </button> </div> @@ -200,11 +200,11 @@ <div class="ui top attached header"> <span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.i18n.Tr "repo.issues.review.resolved_by"}}</span> <button id="show-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="ui compact right labeled button show-outdated"> - {{svg "octicon-unfold" 16}} + {{svg "octicon-unfold"}} {{$.i18n.Tr "repo.issues.review.show_resolved"}} </button> <button id="hide-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="hide ui compact right labeled button hide-outdated"> - {{svg "octicon-fold" 16}} + {{svg "octicon-fold"}} {{$.i18n.Tr "repo.issues.review.hide_resolved"}} </button> </div> diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index e201db4687..6d1d3861a0 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -24,7 +24,7 @@ </div> </div> <div class="field footer"> - <span class="markdown-info">{{svg "octicon-markdown" 16}} {{$.root.i18n.Tr "repo.diff.comment.markdown_info"}}</span> + <span class="markdown-info">{{svg "octicon-markdown"}} {{$.root.i18n.Tr "repo.diff.comment.markdown_info"}}</span> <div class="ui right"> {{if $.reply}} <button class="ui submit green tiny button btn-reply" onclick="window.submitReply(this);">{{$.root.i18n.Tr "repo.diff.comment.reply"}}</button> diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 1859af68d0..cae57540a7 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -13,7 +13,7 @@ {{ end }} </h2> <div class="ui segment choose branch"> - {{svg "octicon-git-compare" 16}} + {{svg "octicon-git-compare"}} <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> <div class="ui basic small button"> <span class="text">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span> diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index 5f87a4176c..1a461c7ad7 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -7,17 +7,17 @@ <td colspan="2" class="lines-num"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5) }} <a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{$.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=down" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> - {{svg "octicon-fold-down" 16}} + {{svg "octicon-fold-down"}} </a> {{end}} {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4) }} <a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{$.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=up" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> - {{svg "octicon-fold-up" 16}} + {{svg "octicon-fold-up"}} </a> {{end}} {{if eq $line.GetExpandDirection 2}} <a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{$.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=" data-anchor="diff-{{Sha1 $file.Name}}K{{$line.SectionInfo.RightIdx}}"> - {{svg "octicon-fold" 16}} + {{svg "octicon-fold"}} </a> {{end}} </td> @@ -43,11 +43,11 @@ <div class = "ui attached header"> <span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.root.i18n.Tr "repo.issues.review.resolved_by"}}</span> <button id="show-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="ui compact right labeled button show-outdated"> - {{svg "octicon-unfold" 16}} + {{svg "octicon-unfold"}} {{$.root.i18n.Tr "repo.issues.review.show_resolved"}} </button> <button id="hide-outdated-{{(index $line.Comments 0).ID}}" data-comment="{{(index $line.Comments 0).ID}}" class="hide ui compact right labeled button hide-outdated"> - {{svg "octicon-fold" 16}} + {{svg "octicon-fold"}} {{$.root.i18n.Tr "repo.issues.review.hide_resolved"}} </button> </div> diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 35fe1a910d..0bfb11ad2a 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -17,7 +17,7 @@ <div class="ui radio checkbox {{if not .CanCommitToBranch.CanCommitToBranch}}disabled{{end}}"> <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" button_text="{{.i18n.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "direct"}}checked{{end}}> <label> - {{svg "octicon-git-commit" 16}} + {{svg "octicon-git-commit"}} {{.i18n.Tr "repo.editor.commit_directly_to_this_branch" (.BranchName|Escape) | Safe}} {{if not .CanCommitToBranch.CanCommitToBranch}} <div class="ui visible small warning message"> @@ -41,7 +41,7 @@ <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.i18n.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}> {{end}} <label> - {{svg "octicon-git-pull-request" 16}} + {{svg "octicon-git-pull-request"}} {{if $pullRequestEnabled}} {{.i18n.Tr "repo.editor.create_new_branch" | Safe}} {{else}} @@ -52,7 +52,7 @@ </div> <div class="quick-pull-branch-name {{if not (eq .commit_choice "commit-to-new-branch")}}hide{{end}}"> <div class="new-branch-name-input field {{if .Err_NewBranchName}}error{{end}}"> - {{svg "octicon-git-branch" 16}} + {{svg "octicon-git-branch"}} <input type="text" name="new_branch_name" value="{{.new_branch_name}}" class="input-contrast mr-2 js-quick-pull-new-branch-name" placeholder="{{.i18n.Tr "repo.editor.new_branch_name_desc"}}" {{if eq .commit_choice "commit-to-new-branch"}}required{{end}}> <span class="text-muted js-quick-pull-normalization-info"></span> </div> diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index db012728e7..6b88d88597 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -17,7 +17,7 @@ <div class="divider"> / </div> {{if eq $i $l}} <input id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.editor.name_your_file"}}" data-editorconfig="{{$.Editorconfig}}" required autofocus> - <span class="poping up" data-content="{{$.i18n.Tr "repo.editor.filename_help"}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-info" 16}}</span> + <span class="poping up" data-content="{{$.i18n.Tr "repo.editor.filename_help"}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-info"}}</span> {{else}} <span class="section"><a href="{{EscapePound $.BranchLink}}/{{index $.TreePaths $i | EscapePound}}">{{$v}}</a></span> {{end}} @@ -29,10 +29,10 @@ </div> <div class="field"> <div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff"> - <a class="active item" data-tab="write">{{svg "octicon-code" 16}} {{if .IsNewFile}}{{.i18n.Tr "repo.editor.new_file"}}{{else}}{{.i18n.Tr "repo.editor.edit_file"}}{{end}}</a> + <a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{.i18n.Tr "repo.editor.new_file"}}{{else}}{{.i18n.Tr "repo.editor.edit_file"}}{{end}}</a> {{if not .IsNewFile}} - <a class="item" data-tab="preview" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL | EscapePound}}" data-preview-file-modes="{{.PreviewableFileModes}}" data-markdown-mode="gfm">{{svg "octicon-eye" 16}} {{.i18n.Tr "preview"}}</a> - <a class="item" data-tab="diff" data-url="{{.RepoLink}}/_preview/{{.BranchName | EscapePound}}/{{.TreePath | EscapePound}}" data-context="{{.BranchLink}}">{{svg "octicon-diff" 16}} {{.i18n.Tr "repo.editor.preview_changes"}}</a> + <a class="item" data-tab="preview" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL | EscapePound}}" data-preview-file-modes="{{.PreviewableFileModes}}" data-markdown-mode="gfm">{{svg "octicon-eye"}} {{.i18n.Tr "preview"}}</a> + <a class="item" data-tab="diff" data-url="{{.RepoLink}}/_preview/{{.BranchName | EscapePound}}/{{.TreePath | EscapePound}}" data-context="{{.BranchLink}}">{{svg "octicon-diff"}} {{.i18n.Tr "repo.editor.preview_changes"}}</a> {{end}} </div> <div class="ui bottom attached active tab segment" data-tab="write"> diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl index 7794c2a2d3..8138194e1b 100644 --- a/templates/repo/editor/upload.tmpl +++ b/templates/repo/editor/upload.tmpl @@ -15,7 +15,7 @@ <div class="divider"> / </div> {{if eq $i $l}} <input type="text" id="file-name" value="{{$v}}" placeholder="{{$.i18n.Tr "repo.editor.add_subdir"}}" autofocus> - <span class="poping up" data-content="{{$.i18n.Tr "repo.editor.filename_help"}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-info" 16}}</span> + <span class="poping up" data-content="{{$.i18n.Tr "repo.editor.filename_help"}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-info"}}</span> {{else}} <span class="section"><a href="{{EscapePound $.BranchLink}}/{{index $.TreePaths $i | EscapePound}}">{{$v}}</a></span> {{end}} diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index 4067bce716..3da7690533 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -35,7 +35,7 @@ {{end}} {{if not (and $.DisableHTTP $.DisableSSH)}} <button class="ui basic button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url"> - {{svg "octicon-clippy" 16}} + {{svg "octicon-clippy"}} </button> {{end}} </div> diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index c644b24d57..7d2ecb5a91 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -6,8 +6,8 @@ <h2 class="ui header dividing">{{.i18n.Tr "repo.commit_graph"}} <div class="ui right"> <div class="ui icon buttons tiny color-buttons"> - <button id="flow-color-monochrome" class="ui labelled icon button{{if eq .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "repo.commit_graph.monochrome"}}"><span class="emoji">{{svg "material-invert-colors" 16}}</span> {{.i18n.Tr "repo.commit_graph.monochrome"}}</button> - <button id="flow-color-colored" class="ui labelled icon button{{if ne .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "repo.commit_graph.color"}}"><span class="emoji">{{svg "material-palette" 16}}</span> {{.i18n.Tr "repo.commit_graph.color"}}</button> + <button id="flow-color-monochrome" class="ui labelled icon button{{if eq .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "repo.commit_graph.monochrome"}}"><span class="emoji">{{svg "material-invert-colors"}}</span> {{.i18n.Tr "repo.commit_graph.monochrome"}}</button> + <button id="flow-color-colored" class="ui labelled icon button{{if ne .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "repo.commit_graph.color"}}"><span class="emoji">{{svg "material-palette"}}</span> {{.i18n.Tr "repo.commit_graph.color"}}</button> </div> </div> </h2> diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 491cbc1c29..e207640504 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -39,7 +39,7 @@ {{$.CsrfTokenHtml}} <div class="ui labeled button{{if not $.IsSigned}} poping up{{end}}" tabindex="0"{{if not $.IsSigned}} data-content="{{$.i18n.Tr "repo.watch_guest_user" }}" data-position="top center" data-variation="tiny"{{end}}> <button type="submit" class="ui compact basic button"{{if not $.IsSigned}} disabled{{end}}> - {{if $.IsWatchingRepo}}{{svg "octicon-eye-closed" 16}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{svg "octicon-eye" 16}}{{$.i18n.Tr "repo.watch"}}{{end}} + {{if $.IsWatchingRepo}}{{svg "octicon-eye-closed" 16}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{svg "octicon-eye"}}{{$.i18n.Tr "repo.watch"}}{{end}} </button> <a class="ui basic label" href="{{.Link}}/watchers"> {{.NumWatches}} @@ -50,7 +50,7 @@ {{$.CsrfTokenHtml}} <div class="ui labeled button{{if not $.IsSigned}} poping up{{end}}" tabindex="0"{{if not $.IsSigned}} data-content="{{$.i18n.Tr "repo.star_guest_user" }}" data-position="top center" data-variation="tiny"{{end}}> <button type="submit" class="ui compact basic button"{{if not $.IsSigned}} disabled{{end}}> - {{if $.IsStaringRepo}}{{svg "octicon-star-fill" 16}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{svg "octicon-star" 16}}{{$.i18n.Tr "repo.star"}}{{end}} + {{if $.IsStaringRepo}}{{svg "octicon-star-fill"}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{svg "octicon-star"}}{{$.i18n.Tr "repo.star"}}{{end}} </button> <a class="ui basic label" href="{{.Link}}/stars"> {{.NumStars}} @@ -60,7 +60,7 @@ {{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}} <div class="ui labeled button {{if and ($.IsSigned) (not $.CanSignedUserFork)}}disabled-repo-button{{end}}" tabindex="0"> <a class="ui compact basic button {{if or (not $.IsSigned) (not $.CanSignedUserFork)}}poping up{{end}}" {{if $.CanSignedUserFork}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else if $.IsSigned}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" {{ else }} data-content="{{$.i18n.Tr "repo.fork_guest_user" }}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{AppSubUrl}}/repo/fork/{{.ID}}" {{end}} data-position="top center" data-variation="tiny"> - {{svg "octicon-repo-forked" 16}}{{$.i18n.Tr "repo.fork"}} + {{svg "octicon-repo-forked"}}{{$.i18n.Tr "repo.fork"}} </a> <a class="ui basic label" href="{{.Link}}/forks"> {{.NumForks}} @@ -77,31 +77,31 @@ <div class="ui tabular stackable menu navbar"> {{if .Permission.CanRead $.UnitTypeCode}} <a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}"> - {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} + {{svg "octicon-code"}} {{.i18n.Tr "repo.code"}} </a> {{end}} {{if .Permission.CanRead $.UnitTypeIssues}} <a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues"> - {{svg "octicon-issue-opened" 16}} {{.i18n.Tr "repo.issues"}} <span class="ui {{if not .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span> + {{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.issues"}} <span class="ui {{if not .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span> </a> {{end}} {{if .Permission.CanRead $.UnitTypeExternalTracker}} <a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoExternalIssuesLink}}" target="_blank" rel="noopener noreferrer"> - {{svg "octicon-link-external" 16}} {{.i18n.Tr "repo.issues"}} </span> + {{svg "octicon-link-external"}} {{.i18n.Tr "repo.issues"}} </span> </a> {{end}} {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}} <a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls"> - {{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.pulls"}} <span class="ui {{if not .Repository.NumOpenPulls}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenPulls}}</span> + {{svg "octicon-git-pull-request"}} {{.i18n.Tr "repo.pulls"}} <span class="ui {{if not .Repository.NumOpenPulls}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenPulls}}</span> </a> {{end}} {{ if and (not .UnitProjectsGlobalDisabled) (.Permission.CanRead $.UnitTypeProjects)}} <a href="{{.RepoLink}}/projects" class="{{ if .IsProjectsPage }}active{{end}} item"> - {{svg "octicon-project" 16}} {{.i18n.Tr "repo.project_board"}} + {{svg "octicon-project"}} {{.i18n.Tr "repo.project_board"}} <span class="ui {{if not .Repository.NumOpenProjects}}gray{{else}}blue{{end}} small label"> {{.Repository.NumOpenProjects}} </span> @@ -110,19 +110,19 @@ {{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsEmptyRepo) }} <a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases"> - {{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .NumReleases}}gray{{else}}blue{{end}} small label">{{.NumReleases}}</span> + {{svg "octicon-tag"}} {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .NumReleases}}gray{{else}}blue{{end}} small label">{{.NumReleases}}</span> </a> {{end}} {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} <a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Permission.CanRead $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}> - {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} + {{svg "octicon-book"}} {{.i18n.Tr "repo.wiki"}} </a> {{end}} {{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}} <a class="{{if .PageIsActivity}}active{{end}} item" href="{{.RepoLink}}/activity"> - {{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}} + {{svg "octicon-pulse"}} {{.i18n.Tr "repo.activity"}} </a> {{end}} @@ -131,7 +131,7 @@ {{if .Permission.IsAdmin}} <div class="right menu"> <a class="{{if .PageIsSettings}}active{{end}} item" href="{{.RepoLink}}/settings"> - {{svg "octicon-tools" 16}} {{.i18n.Tr "repo.settings"}} + {{svg "octicon-tools"}} {{.i18n.Tr "repo.settings"}} </a> </div> {{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 0e017f532b..32905fdd58 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -127,14 +127,14 @@ {{end}} {{if or (not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))}} <button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url"> - {{svg "octicon-clippy" 16}} + {{svg "octicon-clippy"}} </button> {{end}} <div class="ui basic jump dropdown icon button poping up" data-content="{{.i18n.Tr "repo.download_archive"}}" data-variation="tiny inverted" data-position="top right"> <i class="download icon"></i> <div class="menu"> - <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.zip">{{svg "octicon-file-zip" 16}} ZIP</a> - <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.tar.gz">{{svg "octicon-file-zip" 16}} TAR.GZ</a> + <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.zip">{{svg "octicon-file-zip"}} ZIP</a> + <a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.tar.gz">{{svg "octicon-file-zip"}} TAR.GZ</a> </div> </div> </div> diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 69d99b3441..b59c57cb56 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -20,7 +20,7 @@ <div class="two column row"> <a class="reference column" href="#" data-target="#branch-list"> <span class="text black"> - {{svg "octicon-git-branch" 16}} {{.i18n.Tr "repo.branches"}} + {{svg "octicon-git-branch"}} {{.i18n.Tr "repo.branches"}} </span> </a> <a class="reference column" href="#" data-target="#tag-list"> diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index e9f235e3b7..7d6cf0f54b 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -31,7 +31,7 @@ <li class="item"> <div class="ui grid middle aligned"> <div class="four wide column"> - <div class="ui label" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{svg "octicon-tag" 16}} {{.Name | RenderEmoji}}</div> + <div class="ui label" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{svg "octicon-tag"}} {{.Name | RenderEmoji}}</div> </div> <div class="six wide column"> <div class="ui"> @@ -40,18 +40,18 @@ </div> <div class="three wide column"> {{if $.PageIsOrgSettingsLabels}} - <a class="ui right open-issues" href="/issues?labels={{.ID}}">{{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> + <a class="ui right open-issues" href="/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> {{else}} - <a class="ui right open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> + <a class="ui right open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> {{end}} </div> <div class="three wide column"> {{if and (not $.PageIsOrgSettingsLabels ) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} - <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan" 16}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> - <a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil" 16}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> + <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> {{else if $.PageIsOrgSettingsLabels}} - <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan" 16}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> - <a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil" 16}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> + <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> {{end}} </div> </div> @@ -74,7 +74,7 @@ <li class="item"> <div class="ui grid middle aligned"> <div class="three wide column"> - <div class="ui label" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{svg "octicon-tag" 16}} {{.Name | RenderEmoji}}</div> + <div class="ui label" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{svg "octicon-tag"}} {{.Name | RenderEmoji}}</div> </div> <div class="seven wide column"> <div class="ui"> @@ -82,7 +82,7 @@ </div> </div> <div class="three wide column"> - <a class="ui right open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}</a> + <a class="ui right open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}</a> </div> <div class="three wide column"> </div> diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 36eb092202..49f9db13bf 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -30,11 +30,11 @@ <div class="six wide column"> <div class="ui tiny basic status buttons"> <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-opened" 16}} + {{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} </a> <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-closed" 16}} + {{svg "octicon-issue-closed"}} {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} </a> </div> @@ -51,7 +51,7 @@ <span class="info">{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}}</span> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a> {{range .Labels}} - <a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.QueryString}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash" 16}}{{else if .IsSelected}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}</a> + <a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.QueryString}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{svg "octicon-check"}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}</a> {{end}} </div> </div> @@ -124,11 +124,11 @@ <div class="six wide column"> <div class="ui tiny basic status buttons"> <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-opened" 16}} + {{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} </a> <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-closed" 16}} + {{svg "octicon-issue-closed"}} {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} </a> </div> @@ -155,7 +155,7 @@ <div class="menu"> {{range .Labels}} <div class="item issue-action" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels"> - {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} + {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} </div> {{end}} </div> @@ -224,11 +224,11 @@ {{end}} {{if .NumComments}} - <span class="comment ui right">{{svg "octicon-comment" 16}} {{.NumComments}}</span> + <span class="comment ui right">{{svg "octicon-comment"}} {{.NumComments}}</span> {{end}} {{if .TotalTrackedTime}} - <span class="comment ui right">{{svg "octicon-clock" 16}} {{.TotalTrackedTime | Sec2Time}}</span> + <span class="comment ui right">{{svg "octicon-clock"}} {{.TotalTrackedTime | Sec2Time}}</span> {{end}} <p class="desc"> @@ -243,24 +243,24 @@ {{if .Milestone}} <a class="milestone" href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}"> - {{svg "octicon-milestone" 16}} {{.Milestone.Name}} + {{svg "octicon-milestone"}} {{.Milestone.Name}} </a> {{end}} {{if .Ref}} <a class="ref" href="{{index $.IssueRefURLs .ID}}"> - {{svg "octicon-git-branch" 16}} {{index $.IssueRefEndNames .ID}} + {{svg "octicon-git-branch"}} {{index $.IssueRefEndNames .ID}} </a> {{end}} {{$tasks := .GetTasks}} {{if gt $tasks 0}} {{$tasksDone := .GetTasksDone}} <span class="checklist"> - {{svg "octicon-checklist" 16}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span> + {{svg "octicon-checklist"}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span> </span> {{end}} {{if ne .DeadlineUnix 0}} <span class="due-date poping up" data-content="{{$.i18n.Tr "repo.issues.due_date"}}" data-variation="tiny inverted" data-position="right center"> - {{svg "octicon-calendar" 16}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> + {{svg "octicon-calendar"}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> </span> {{end}} {{range .Assignees}} @@ -273,25 +273,25 @@ {{$rejectOfficial := call $approvalCounts .ID "reject"}} {{$waitingOfficial := call $approvalCounts .ID "waiting"}} {{if gt $approveOfficial 0}} - <span class="approvals">{{svg "octicon-check" 16}} + <span class="approvals">{{svg "octicon-check"}} {{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}} </span> {{end}} {{if gt $rejectOfficial 0}} - <span class="rejects">{{svg "octicon-diff" 16}} + <span class="rejects">{{svg "octicon-diff"}} {{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}} </span> {{end}} {{if gt $waitingOfficial 0}} - <span class="waiting">{{svg "octicon-eye" 16}} + <span class="waiting">{{svg "octicon-eye"}} {{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}} </span> {{end}} {{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}} - <span class="conflicting">{{svg "octicon-x" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> + <span class="conflicting">{{svg "octicon-x"}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> {{end}} {{end}} </p> diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 7a55eaa01d..af17fde641 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -24,9 +24,9 @@ <div class="column"> {{ $closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.Lang }} {{if .IsClosed}} - {{svg "octicon-clock" 16}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} {{else}} - {{svg "octicon-calendar" 16}} + {{svg "octicon-calendar"}} {{if .Milestone.DeadlineString}} <span {{if .IsOverdue}}class="overdue"{{end}}>{{.Milestone.DeadlineString}}</span> {{else}} @@ -42,11 +42,11 @@ <div class="six wide column"> <div class="ui tiny basic status buttons"> <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-opened" 16}} + {{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} </a> <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-closed" 16}} + {{svg "octicon-issue-closed"}} {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} </a> </div> @@ -63,7 +63,7 @@ <span class="info">{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}}</span> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a> {{range .Labels}} - <a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash" 16}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}</a> + <a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}</a> {{end}} </div> </div> @@ -120,11 +120,11 @@ <div class="six wide column"> <div class="ui tiny basic status buttons"> <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-opened" 16}} + {{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} </a> <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&assignee={{.AssigneeID}}"> - {{svg "octicon-issue-closed" 16}} + {{svg "octicon-issue-closed"}} {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} </a> </div> @@ -151,7 +151,7 @@ <div class="menu"> {{range .Labels}} <div class="item issue-action" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels"> - {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check" 16}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} + {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}}<span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} </div> {{end}} </div> @@ -193,14 +193,14 @@ {{if .IsPull}} {{if .PullRequest.HasMerged}} <div class="ui purple label">#{{.Index}}</div> - <a class="ui purple text">{{svg "octicon-git-pull-request" 16}}</a> + <a class="ui purple text">{{svg "octicon-git-pull-request"}}</a> {{else}} <div class="ui red label">#{{.Index}}</div> - <a class="ui red text">{{svg "octicon-git-pull-request" 16}}</a> + <a class="ui red text">{{svg "octicon-git-pull-request"}}</a> {{end}} {{else}} <div class="ui red label">#{{.Index}}</div> - <a class="ui red text">{{svg "octicon-issue-closed" 16}}</a> + <a class="ui red text">{{svg "octicon-issue-closed"}}</a> {{end}} {{else}} {{if .IsRead}} @@ -209,9 +209,9 @@ <div class="ui green label">#{{.Index}}</div> {{end}} {{if .IsPull}} - <a class="ui green text">{{svg "octicon-git-pull-request" 16}}</a> + <a class="ui green text">{{svg "octicon-git-pull-request"}}</a> {{else}} - <a class="ui green text">{{svg "octicon-issue-opened" 16}}</a> + <a class="ui green text">{{svg "octicon-issue-opened"}}</a> {{end}} {{end}} @@ -228,11 +228,11 @@ {{end}} {{if .NumComments}} - <span class="comment ui right">{{svg "octicon-comment" 16}} {{.NumComments}}</span> + <span class="comment ui right">{{svg "octicon-comment"}} {{.NumComments}}</span> {{end}} {{if .TotalTrackedTime}} - <span class="comment ui right">{{svg "octicon-clock" 16}} {{.TotalTrackedTime | Sec2Time}}</span> + <span class="comment ui right">{{svg "octicon-clock"}} {{.TotalTrackedTime | Sec2Time}}</span> {{end}} <p class="desc"> @@ -247,18 +247,18 @@ {{if .Ref}} <a class="ref" href="{{index $.IssueRefURLs .ID}}"> - {{svg "octicon-git-branch" 16}} {{index $.IssueRefEndNames .ID}} + {{svg "octicon-git-branch"}} {{index $.IssueRefEndNames .ID}} </a> {{end}} {{$tasks := .GetTasks}} {{if gt $tasks 0}} {{$tasksDone := .GetTasksDone}} <span class="checklist"> - {{svg "octicon-checklist" 16}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span> + {{svg "octicon-checklist"}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span> </span> {{end}} {{if ne .DeadlineUnix 0}} - {{svg "octicon-calendar" 16}} + {{svg "octicon-calendar"}} <span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> {{end}} {{range .Assignees}} @@ -271,25 +271,25 @@ {{$rejectOfficial := call $approvalCounts .ID "reject"}} {{$waitingOfficial := call $approvalCounts .ID "waiting"}} {{if gt $approveOfficial 0}} - <span class="approvals">{{svg "octicon-check" 16}} + <span class="approvals">{{svg "octicon-check"}} {{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}} </span> {{end}} {{if gt $rejectOfficial 0}} - <span class="rejects">{{svg "octicon-diff" 16}} + <span class="rejects">{{svg "octicon-diff"}} {{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}} </span> {{end}} {{if gt $waitingOfficial 0}} - <span class="waiting">{{svg "octicon-eye" 16}} + <span class="waiting">{{svg "octicon-eye"}} {{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}} </span> {{end}} {{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}} - <span class="conflicting">{{svg "octicon-x" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> + <span class="conflicting">{{svg "octicon-x"}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> {{end}} {{end}} </p> diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 1fb4906e45..bb42a9c73d 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -14,11 +14,11 @@ {{template "base/alert" .}} <div class="ui tiny basic buttons"> <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.RepoLink}}/milestones?state=open"> - {{svg "octicon-milestone" 16}} + {{svg "octicon-milestone"}} {{.i18n.Tr "repo.milestones.open_tab" .OpenCount}} </a> <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.RepoLink}}/milestones?state=closed"> - {{svg "octicon-milestone" 16}} + {{svg "octicon-milestone"}} {{.i18n.Tr "repo.milestones.close_tab" .ClosedCount}} </a> </div> @@ -43,7 +43,7 @@ <div class="milestone list"> {{range .Milestones}} <li class="item"> - {{svg "octicon-milestone" 16}} <a href="{{$.RepoLink}}/milestone/{{.ID}}">{{.Name}}</a> + {{svg "octicon-milestone"}} <a href="{{$.RepoLink}}/milestone/{{.ID}}">{{.Name}}</a> <div class="ui right green progress" data-percent="{{.Completeness}}"> <div class="bar" {{if not .Completeness}}style="background-color: transparent"{{end}}> <div class="progress"></div> @@ -52,9 +52,9 @@ <div class="meta"> {{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.Lang }} {{if .IsClosed}} - {{svg "octicon-clock" 16}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} {{else}} - {{svg "octicon-calendar" 16}} + {{svg "octicon-calendar"}} {{if .DeadlineString}} <span {{if .IsOverdue}}class="overdue"{{end}}>{{.DeadlineString}}</span> {{else}} @@ -62,21 +62,21 @@ {{end}} {{end}} <span class="issue-stats"> - {{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}} - {{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}} - {{if .TotalTrackedTime}}{{svg "octicon-clock" 16}} {{.TotalTrackedTime|Sec2Time}}{{end}} - {{if .UpdatedUnix}}{{svg "octicon-clock" 16}} {{$.i18n.Tr "repo.milestones.update_ago" (.TimeSinceUpdate|Sec2Time)}}{{end}} + {{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}} + {{svg "octicon-issue-closed"}} {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}} + {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} + {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.i18n.Tr "repo.milestones.update_ago" (.TimeSinceUpdate|Sec2Time)}}{{end}} </span> </div> {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} <div class="ui right operate"> - <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-pencil" 16}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> + <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-pencil"}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> {{if .IsClosed}} - <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/open">{{svg "octicon-check" 16}} {{$.i18n.Tr "repo.milestones.open"}}</a> + <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/open">{{svg "octicon-check"}} {{$.i18n.Tr "repo.milestones.open"}}</a> {{else}} - <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-x" 16}} {{$.i18n.Tr "repo.milestones.close"}}</a> + <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-x"}} {{$.i18n.Tr "repo.milestones.close"}}</a> {{end}} - <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trashcan" 16}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> </div> {{end}} {{if .Content}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 058ade5bce..6c354f1760 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -42,7 +42,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong> {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="filter menu" data-id="#label_ids"> @@ -56,13 +56,13 @@ <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div> {{if or .Labels .OrgLabels}} {{range .Labels}} - <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} + <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check"}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a> {{end}} <div class="ui divider"></div> {{range .OrgLabels}} - <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} + <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check"}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a> {{end}} {{else}} @@ -87,7 +87,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.milestone"}}</strong> {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="menu"> @@ -107,7 +107,7 @@ {{if .OpenMilestones}} <div class="divider"></div> <div class="header"> - {{svg "octicon-milestone" 16}} + {{svg "octicon-milestone"}} {{.i18n.Tr "repo.issues.new.open_milestone"}} </div> {{range .OpenMilestones}} @@ -117,7 +117,7 @@ {{if .ClosedMilestones}} <div class="divider"></div> <div class="header"> - {{svg "octicon-milestone" 16}} + {{svg "octicon-milestone"}} {{.i18n.Tr "repo.issues.new.closed_milestone"}} </div> {{range .ClosedMilestones}} @@ -144,7 +144,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.projects"}}</strong> {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="menu"> @@ -164,7 +164,7 @@ {{if .OpenProjects}} <div class="divider"></div> <div class="header"> - {{svg "octicon-project" 16}} + {{svg "octicon-project"}} {{.i18n.Tr "repo.issues.new.open_projects"}} </div> {{range .OpenProjects}} @@ -174,7 +174,7 @@ {{if .ClosedProjects}} <div class="divider"></div> <div class="header"> - {{svg "octicon-project" 16}} + {{svg "octicon-project"}} {{.i18n.Tr "repo.issues.new.closed_projects"}} </div> {{range .ClosedProjects}} @@ -201,7 +201,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.assignees"}}</strong> {{if .HasIssuesOrPullsWritePermission}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="filter menu" data-id="#assignee_ids"> @@ -213,7 +213,7 @@ <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignees"}}</div> {{range .Assignees}} <a class="item" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}"> - <span class="octicon-check invisible">{{svg "octicon-check" 16}}</span> + <span class="octicon-check invisible">{{svg "octicon-check"}}</span> <span class="text"> <img class="ui avatar image" src="{{.RelAvatarLink}}"> {{.GetDisplayName}} </span> diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl index 2873102afb..6d694219ca 100644 --- a/templates/repo/issue/view_content/add_reaction.tmpl +++ b/templates/repo/issue/view_content/add_reaction.tmpl @@ -1,7 +1,7 @@ {{if .ctx.IsSigned}} <div class="item action ui pointing top right select-reaction dropdown" data-action-url="{{ .ActionURL }}"> <a class="add-reaction"> - {{svg "octicon-smiley" 16}} + {{svg "octicon-smiley"}} </a> <div class="menu"> <div class="header">{{ .ctx.i18n.Tr "repo.pick_reaction"}}</div> diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index 3c69dbc2ba..1144b9a77a 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -2,9 +2,9 @@ <div class="twelve wide column" style="padding: 6px;"> <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'> {{if FilenameIsImage .Name}} - <span class="ui image">{{svg "octicon-file-media" 16}}</span> + <span class="ui image">{{svg "octicon-file-media"}}</span> {{else}} - <span class="ui image">{{svg "octicon-desktop-download" 16}}</span> + <span class="ui image">{{svg "octicon-desktop-download"}}</span> {{end}} <span><strong>{{.Name}}</strong></span> </a> diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index b63c7da7cd..39b932f4bc 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -73,7 +73,7 @@ </div> {{else if eq .Type 1}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-dot-fill" 16}}</span> + <span class="badge">{{svg "octicon-dot-fill"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -88,7 +88,7 @@ </div> {{else if eq .Type 2}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-circle-slash" 16}}</span> + <span class="badge">{{svg "octicon-circle-slash"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -103,7 +103,7 @@ </div> {{else if eq .Type 28}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge purple">{{svg "octicon-git-merge" 16}}</span> + <span class="badge purple">{{svg "octicon-git-merge"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -128,7 +128,7 @@ {{end}} {{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-bookmark" 16}}</span> + <span class="badge">{{svg "octicon-bookmark"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -145,7 +145,7 @@ </div> {{else if eq .Type 4}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-bookmark" 16}}</span> + <span class="badge">{{svg "octicon-bookmark"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -154,14 +154,14 @@ {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}} </span> <div class="detail"> - {{svg "octicon-git-commit" 16}} + {{svg "octicon-git-commit"}} <span class="text grey">{{.Content | Str2html}}</span> </div> </div> {{else if eq .Type 7}} {{if .Label}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-tag" 16}}</span> + <span class="badge">{{svg "octicon-tag"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -173,7 +173,7 @@ {{end}} {{else if eq .Type 8}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-milestone" 16}}</span> + <span class="badge">{{svg "octicon-milestone"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -184,7 +184,7 @@ </div> {{else if eq .Type 9}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-person" 16}}</span> + <span class="badge">{{svg "octicon-person"}}</span> {{if gt .AssigneeID 0}} {{if .RemovedAssignee}} <a class="ui avatar image" href="{{.Assignee.HomeLink}}"> @@ -215,7 +215,7 @@ </div> {{else if eq .Type 10}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-pencil" 16}}</span> + <span class="badge">{{svg "octicon-pencil"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -226,7 +226,7 @@ </div> {{else if eq .Type 11}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-git-branch" 16}}</span> + <span class="badge">{{svg "octicon-git-branch"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -237,7 +237,7 @@ </div> {{else if eq .Type 12}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -248,7 +248,7 @@ </div> {{else if eq .Type 13}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -257,13 +257,13 @@ {{$.i18n.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}} </span> <div class="detail"> - {{svg "octicon-clock" 16}} + {{svg "octicon-clock"}} <span class="text grey">{{.Content}}</span> </div> </div> {{else if eq .Type 14}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -272,13 +272,13 @@ {{$.i18n.Tr "repo.issues.add_time_history" $createdStr | Safe}} </span> <div class="detail"> - {{svg "octicon-clock" 16}} + {{svg "octicon-clock"}} <span class="text grey">{{.Content}}</span> </div> </div> {{else if eq .Type 15}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -289,7 +289,7 @@ </div> {{else if eq .Type 16}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -300,7 +300,7 @@ </div> {{else if eq .Type 17}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -311,7 +311,7 @@ </div> {{else if eq .Type 18}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -322,7 +322,7 @@ </div> {{else if eq .Type 19}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-package-dependents" 16}}</span> + <span class="badge">{{svg "octicon-package-dependents"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -332,7 +332,7 @@ </span> {{if .DependentIssue}} <div class="detail"> - {{svg "octicon-plus" 16}} + {{svg "octicon-plus"}} <span class="text grey"> <a href="{{.DependentIssue.HTMLURL}}"> {{if eq .DependentIssue.RepoID .Issue.RepoID}} @@ -347,7 +347,7 @@ </div> {{else if eq .Type 20}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-package-dependents" 16}}</span> + <span class="badge">{{svg "octicon-package-dependents"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -357,7 +357,7 @@ </span> {{if .DependentIssue}} <div class="detail"> - <span class="text grey">{{svg "octicon-trashcan" 16}}</span> + <span class="text grey">{{svg "octicon-trashcan"}}</span> <span class="text grey"> <a href="{{.DependentIssue.HTMLURL}}"> {{if eq .DependentIssue.RepoID .Issue.RepoID}} @@ -382,7 +382,7 @@ <span class="badge {{if eq .Review.Type 1}}green {{- else if eq .Review.Type 2}}grey {{- else if eq .Review.Type 3}}red - {{- else}}grey{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon) 16}}</span> + {{- else}}grey{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span> <span class="text grey"> {{if .OriginalAuthor }} <span class="text black"><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{if $.Repository.OriginalURL}}</span><span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span> @@ -440,7 +440,7 @@ {{$isNotPending := (not (eq (index $comms 0).Review.Type 0))}} {{if or $invalid $resolved}} <button id="show-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="ui compact right labeled button show-outdated"> - {{svg "octicon-unfold" 16}} + {{svg "octicon-unfold"}} {{if $invalid }} {{$.i18n.Tr "repo.issues.review.show_outdated"}} {{else}} @@ -448,7 +448,7 @@ {{end}} </button> <button id="hide-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="hide ui compact right labeled button hide-outdated"> - {{svg "octicon-fold" 16}} + {{svg "octicon-fold"}} {{if $invalid}} {{$.i18n.Tr "repo.issues.review.hide_outdated"}} {{else}} @@ -532,7 +532,7 @@ </div> {{else if eq .Type 23}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-lock" 16}}</span> + <span class="badge">{{svg "octicon-lock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -550,7 +550,7 @@ </div> {{else if eq .Type 24}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-key" 16}}</span> + <span class="badge">{{svg "octicon-key"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -561,7 +561,7 @@ </div> {{else if eq .Type 25}} <div class="timeline-item event"> - <span class="badge">{{svg "octicon-git-branch" 16}}</span> + <span class="badge">{{svg "octicon-git-branch"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -572,7 +572,7 @@ </div> {{else if eq .Type 26}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -581,13 +581,13 @@ {{$.i18n.Tr "repo.issues.del_time_history" $createdStr | Safe}} </span> <div class="detail"> - {{svg "octicon-clock" 16}} + {{svg "octicon-clock"}} <span class="text grey">{{.Content}}</span> </div> </div> {{else if eq .Type 27}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-eye" 16}}</span> + <span class="badge">{{svg "octicon-eye"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -606,7 +606,7 @@ </div> {{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-repo-push" 16}}</span> + <span class="badge">{{svg "octicon-repo-push"}}</span> <span class="text grey"> <a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{ if .IsForcePush }} @@ -622,7 +622,7 @@ {{else if eq .Type 30}} {{if not $.UnitProjectsGlobalDisabled}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-project" 16}}</span> + <span class="badge">{{svg "octicon-project"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index f26dd9e845..7d5cae5bff 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -1,7 +1,7 @@ {{if .ctx.IsSigned}} <div class="item action ui pointing top right custom dropdown context-dropdown"> <a class="context-menu"> - {{svg "octicon-kebab-horizontal" 16}} + {{svg "octicon-kebab-horizontal"}} </a> <div class="menu"> {{if .diff}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 2a5198f962..9111ab7e86 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -50,10 +50,10 @@ {{if $canChoose }} <a href="#" class="ui poping up icon re-request-review" data-is-checked="{{if eq .Type 4}}true{{else}}false{{end}}" data-issue-id="{{$.Issue.ID}}" data-content="{{ if eq .Type 4 }} {{$.i18n.Tr "repo.issues.remove_request_review"}} {{else}} {{$.i18n.Tr "repo.issues.re_request_review"}} {{end}}" data-id="{{.ReviewerID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> - {{svg "octicon-sync" 16}} + {{svg "octicon-sync"}} </a> {{end}} - {{svg (printf "octicon-%s" .Type.Icon) 16}} + {{svg (printf "octicon-%s" .Type.Icon)}} </span> </div> </div> @@ -112,7 +112,7 @@ {{end}} {{else if .IsPullFilesConflicted}} <div class="item text grey"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.files_conflicted"}} {{range .ConflictedFiles}} <div>{{.}}</div> @@ -120,48 +120,48 @@ </div> {{else if .IsPullRequestBroken}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.data_broken"}} </div> {{else if .IsPullWorkInProgress}} <div class="item text grey"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.cannot_merge_work_in_progress" (.WorkInProgressPrefix|Escape) | Str2html}} </div> {{else if .Issue.PullRequest.IsChecking}} <div class="item text yellow"> - <i class="icon icon-octicon">{{svg "octicon-sync" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-sync"}}</i> {{$.i18n.Tr "repo.pulls.is_checking"}} </div> {{else if .Issue.PullRequest.CanAutoMerge}} {{if .IsBlockedByApprovals}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue.PullRequest.ProtectedBranch.RequiredApprovals}} </div> {{else if .IsBlockedByRejection}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}} </div> {{else if .IsBlockedByOutdatedBranch}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.blocked_by_outdated_branch"}} </div> {{else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsError .RequiredStatusCheckState.IsFailure)}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.required_status_check_failed"}} </div> {{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.required_status_check_missing"}} </div> {{else if and .AllowMerge .RequireSigned (not .WillSign)}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.require_signed_wont_sign"}} </div> <div class="item text yellow"> @@ -173,12 +173,12 @@ {{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}} {{if $notAllOverridableChecksOk}} <div class="item text yellow"> - <i class="icon icon-octicon">{{svg "octicon-dot-fill" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-dot-fill"}}</i> {{$.i18n.Tr "repo.pulls.required_status_check_administrator"}} </div> {{else}} <div class="item text green"> - <i class="icon icon-octicon">{{svg "octicon-check" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-check"}}</i> {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}} </div> {{end}} @@ -200,7 +200,7 @@ <div class="ui divider"></div> <div class="item item-section text grey"> <div class="item-section-left"> - <i class="icon icon-octicon">{{svg "octicon-alert" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-alert"}}</i> {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} </div> <div class="item-section-right"> @@ -294,7 +294,7 @@ {{end}} <div class="ui {{if $notAllOverridableChecksOk}}red{{else}}green{{end}} buttons merge-button"> <button class="ui button" data-do="{{.MergeStyle}}"> - {{svg "octicon-git-merge" 16}} + {{svg "octicon-git-merge"}} <span class="button-text"> {{if eq .MergeStyle "merge"}} {{$.i18n.Tr "repo.pulls.merge_pull_request"}} @@ -331,18 +331,18 @@ {{else}} <div class="ui divider"></div> <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.no_merge_desc"}} </div> <div class="item text grey"> - {{svg "octicon-info" 16}} + {{svg "octicon-info"}} {{$.i18n.Tr "repo.pulls.no_merge_helper"}} </div> {{end}} {{else}} <div class="ui divider"></div> <div class="item text grey"> - {{svg "octicon-info" 16}} + {{svg "octicon-info"}} {{$.i18n.Tr "repo.pulls.no_merge_access"}} </div> {{end}} @@ -351,36 +351,36 @@ {{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}} {{if .IsBlockedByApprovals}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue.PullRequest.ProtectedBranch.RequiredApprovals}} </div> {{else if .IsBlockedByRejection}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}} </div> {{else if .IsBlockedByOutdatedBranch}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.blocked_by_outdated_branch"}} </div> {{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.required_status_check_failed"}} </div> {{else if and .RequireSigned (not .WillSign)}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.require_signed_wont_sign"}} </div> {{else}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.cannot_auto_merge_desc"}} </div> <div class="item text grey"> - {{svg "octicon-info" 16}} + {{svg "octicon-info"}} {{$.i18n.Tr "repo.pulls.cannot_auto_merge_helper"}} </div> {{end}} @@ -388,7 +388,7 @@ {{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}} <div class="item text grey"> - <i class="icon icon-octicon">{{svg "octicon-alert" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-alert"}}</i> {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} {{if .UpdateAllowed}} <form action="{{.Link}}/update" method="post" class="ui floating right"> diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index d02dedfb81..e47bcbe35c 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -9,7 +9,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.review.reviewers"}}</strong> {{if and .CanChooseReviewer (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> @@ -45,7 +45,7 @@ {{end}} <a class="{{if not $canChoose}}ui poping up{{end}} item {{if $checked}} checked {{end}} {{if not $canChoose}}ban-change{{end}}" href="#" data-id="{{.ID}}" data-id-selector="#review_request_{{.ID}}" {{if not $canChoose}} data-content="{{$.i18n.Tr "repo.issues.remove_request_review_block"}}"{{end}}> - <span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check" 16}}</span> + <span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check"}}</span> <span class="text"> <img class="ui avatar image" src="{{.RelAvatarLink}}"> {{.GetDisplayName}} </span> @@ -79,10 +79,10 @@ {{if $canChoose}} <a href="#" class="ui poping up icon re-request-review" data-is-checked="{{if eq .Type 4}}true{{else}}false{{end}}" data-content="{{ if eq .Type 4 }} {{$.i18n.Tr "repo.issues.remove_request_review"}} {{else}} {{$.i18n.Tr "repo.issues.re_request_review"}} {{end}}" data-issue-id="{{$.Issue.ID}}" data-id="{{.ReviewerID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> - {{svg "octicon-sync" 16}} + {{svg "octicon-sync"}} </a> {{end}} - {{svg (printf "octicon-%s" .Type.Icon) 16}} + {{svg (printf "octicon-%s" .Type.Icon)}} </span> </div> {{end}} @@ -95,7 +95,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels"> @@ -109,12 +109,12 @@ <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div> {{if or .Labels .OrgLabels}} {{range .Labels}} - <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} + <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check"}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a> {{end}} <div class="ui divider"></div> {{range .OrgLabels}} - <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} + <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check"}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a> {{end}} {{else}} @@ -143,7 +143,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.milestone"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/milestone"> @@ -163,7 +163,7 @@ {{if .OpenMilestones}} <div class="divider"></div> <div class="header"> - {{svg "octicon-milestone" 16}} + {{svg "octicon-milestone"}} {{.i18n.Tr "repo.issues.new.open_milestone"}} </div> {{range .OpenMilestones}} @@ -173,7 +173,7 @@ {{if .ClosedMilestones}} <div class="divider"></div> <div class="header"> - {{svg "octicon-milestone" 16}} + {{svg "octicon-milestone"}} {{.i18n.Tr "repo.issues.new.closed_milestone"}} </div> {{range .ClosedMilestones}} @@ -198,28 +198,28 @@ <div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-project dropdown"> <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.projects"}}</strong> - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} </span> <div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/projects"> <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_projects"}}</div> {{if .OpenProjects}} <div class="divider"></div> <div class="header"> - {{svg "octicon-project" 16}} + {{svg "octicon-project"}} {{.i18n.Tr "repo.issues.new.open_projects"}} </div> {{range .OpenProjects}} - <div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">{{svg "octicon-project" 16}} {{.Title}}</div> + <div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">{{svg "octicon-project"}} {{.Title}}</div> {{end}} {{end}} {{if .ClosedProjects}} <div class="divider"></div> <div class="header"> - {{svg "octicon-project" 16}} + {{svg "octicon-project"}} {{.i18n.Tr "repo.issues.new.closed_projects"}} </div> {{range .ClosedProjects}} - <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">{{svg "octicon-project" 16}} {{.Title}}</a> + <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">{{svg "octicon-project"}} {{.Title}}</a> {{end}} {{end}} </div> @@ -228,7 +228,7 @@ <span class="no-select item {{if .Issue.ProjectID}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_projects"}}</span> <div class="selected"> {{if .Issue.ProjectID}} - <a class="item" href="{{.RepoLink}}/projects/{{.Issue.ProjectID}}">{{svg "octicon-project" 16}} {{.Issue.Project.Title}}</a> + <a class="item" href="{{.RepoLink}}/projects/{{.Issue.ProjectID}}">{{svg "octicon-project"}} {{.Issue.Project.Title}}</a> {{end}} </div> </div> @@ -241,7 +241,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.assignees"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee"> @@ -265,7 +265,7 @@ {{$checked = true}} {{end}} {{end}} - <span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check" 16}}</span> + <span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check"}}</span> <span class="text"> <img class="ui avatar image" src="{{.RelAvatarLink}}"> {{.GetDisplayName}} </span> @@ -308,10 +308,10 @@ {{$.CsrfTokenHtml}} <button class="fluid ui button"> {{if $.IssueWatch.IsWatching}} - {{svg "octicon-mute" 16}} + {{svg "octicon-mute"}} {{.i18n.Tr "repo.issues.unsubscribe"}} {{else}} - {{svg "octicon-unmute" 16}} + {{svg "octicon-unmute"}} {{.i18n.Tr "repo.issues.subscribe"}} {{end}} </button> @@ -396,7 +396,7 @@ </div> {{if ne .Issue.DeadlineUnix 0}} <p> - {{svg "octicon-calendar" 16}} + {{svg "octicon-calendar"}} {{.Issue.DeadlineUnix.FormatDate}} {{if .Issue.IsOverdue}} <span style="color: red;">{{.i18n.Tr "repo.issues.due_date_overdue"}}</span> @@ -522,10 +522,10 @@ <div> <button class="fluid ui show-modal button {{if .Issue.IsLocked }} negative {{ end }}" data-modal="#lock"> {{if .Issue.IsLocked}} - {{svg "octicon-key" 16}} + {{svg "octicon-key"}} {{.i18n.Tr "repo.issues.unlock"}} {{else}} - {{svg "octicon-lock" 16}} + {{svg "octicon-lock"}} {{.i18n.Tr "repo.issues.lock"}} {{end}} </button> diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index ea63dd0737..a916f7ca17 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -17,13 +17,13 @@ {{end}} </div> {{if .HasMerged}} - <div class="ui purple large label">{{svg "octicon-git-merge" 16}} {{.i18n.Tr "repo.pulls.merged"}}</div> + <div class="ui purple large label">{{svg "octicon-git-merge"}} {{.i18n.Tr "repo.pulls.merged"}}</div> {{else if .Issue.IsClosed}} - <div class="ui red large label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request" 16}}{{else}}{{svg "octicon-issue-closed" 16}}{{end}} {{.i18n.Tr "repo.issues.closed_title"}}</div> + <div class="ui red large label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.i18n.Tr "repo.issues.closed_title"}}</div> {{else if .Issue.IsPull}} - <div class="ui green large label">{{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.issues.open_title"}}</div> + <div class="ui green large label">{{svg "octicon-git-pull-request"}} {{.i18n.Tr "repo.issues.open_title"}}</div> {{else}} - <div class="ui green large label">{{svg "octicon-issue-opened" 16}} {{.i18n.Tr "repo.issues.open_title"}}</div> + <div class="ui green large label">{{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.issues.open_title"}}</div> {{end}} {{if .Issue.IsPull}} @@ -51,7 +51,7 @@ <span class="text">{{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}</span> </div> </div> - {{svg "octicon-arrow-right" 16}} + {{svg "octicon-arrow-right"}} <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> <div class="ui basic small button"> <span class="text" id="pull-target-branch" data-basename="{{$.BaseName}}" data-branch="{{$.BaseBranch}}">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span> diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index cf84ad39e0..4d382ebbb5 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -22,7 +22,7 @@ <div class="inline field {{if .Err_Auth}}error{{end}}"> <label for="auth_token">{{.i18n.Tr "access_token"}}</label> <input id="auth_token" name="auth_token" value="{{.auth_token}}" {{if not .auth_token}}data-need-clear="true"{{end}}> - <a target=”_blank” href="https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token">{{svg "octicon-question" 16}}</a> + <a target=”_blank” href="https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token">{{svg "octicon-question"}}</a> </div> <div class="inline field"> diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 427a1e05df..edf742eb99 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -22,7 +22,7 @@ <div class="inline field {{if .Err_Auth}}error{{end}}"> <label for="auth_token">{{.i18n.Tr "access_token"}}</label> <input id="auth_token" name="auth_token" value="{{.auth_token}}" {{if not .auth_token}}data-need-clear="true"{{end}}> - <a target=”_blank” href="https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html">{{svg "octicon-question" 16}}</a> + <a target=”_blank” href="https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html">{{svg "octicon-question"}}</a> </div> <div class="inline field"> diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 6e98bd3fd0..7151442689 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -14,11 +14,11 @@ {{template "base/alert" .}} <div class="ui tiny basic buttons"> <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.RepoLink}}/projects?state=open"> - {{svg "octicon-project" 16}} + {{svg "octicon-project"}} {{.i18n.Tr "repo.issues.open_tab" .OpenCount}} </a> <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.RepoLink}}/projects?state=closed"> - {{svg "octicon-check" 16}} + {{svg "octicon-check"}} {{.i18n.Tr "repo.milestones.close_tab" .ClosedCount}} </a> </div> @@ -40,26 +40,26 @@ <div class="milestone list"> {{range .Projects}} <li class="item"> - {{svg "octicon-project" 16}} <a href="{{$.RepoLink}}/projects/{{.ID}}">{{.Title}}</a> + {{svg "octicon-project"}} <a href="{{$.RepoLink}}/projects/{{.ID}}">{{.Title}}</a> <div class="meta"> {{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.Lang }} {{if .IsClosed }} - {{svg "octicon-clock" 16}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} {{end}} <span class="issue-stats"> - {{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}} - {{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}} + {{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}} + {{svg "octicon-issue-closed"}} {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}} </span> </div> {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} <div class="ui right operate"> - <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Title}}>{{svg "octicon-pencil" 16}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> + <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Title}}>{{svg "octicon-pencil"}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> {{if .IsClosed}} - <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/open">{{svg "octicon-check" 16}} {{$.i18n.Tr "repo.projects.open"}}</a> + <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/open">{{svg "octicon-check"}} {{$.i18n.Tr "repo.projects.open"}}</a> {{else}} - <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-x" 16}} {{$.i18n.Tr "repo.projects.close"}}</a> + <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-x"}} {{$.i18n.Tr "repo.projects.close"}}</a> {{end}} - <a class="delete-button" href="#" data-url="{{$.RepoLink}}/projects/{{.ID}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan" 16}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="delete-button" href="#" data-url="{{$.RepoLink}}/projects/{{.ID}}/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> </div> {{end}} {{if .Description}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 653004aa27..c25a05c5c7 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -52,11 +52,11 @@ </span> <div class="menu user-menu" tabindex="-1"> <a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}"> - {{svg "octicon-pencil" 16}} + {{svg "octicon-pencil"}} {{$.i18n.Tr "repo.projects.board.edit"}} </a> <a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}"> - {{svg "octicon-trashcan" 16}} + {{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.projects.board.delete"}} </a> @@ -113,9 +113,9 @@ <div class="content"> <div class="header"> <span class="{{if .IsClosed}}red{{else}}green{{end}}"> - {{if .IsPull}}{{svg "octicon-git-merge" 16}} - {{else if .IsClosed}}{{svg "octicon-issue-closed" 16}} - {{else}}{{svg "octicon-issue-opened" 16}} + {{if .IsPull}}{{svg "octicon-git-merge"}} + {{else if .IsClosed}}{{svg "octicon-issue-closed"}} + {{else}}{{svg "octicon-issue-opened"}} {{end}} </span> <a class="project-board-title" href="{{$.RepoLink}}/issues/{{.Index}}">#{{.Index}} {{.Title}}</a> @@ -123,7 +123,7 @@ <div class="meta"> {{ if .MilestoneID }} <a class="milestone" href="{{$.RepoLink}}/milestone/{{ .MilestoneID}}"> - {{svg "octicon-milestone" 16}} {{ .Milestone.Name }} + {{svg "octicon-milestone"}} {{ .Milestone.Name }} </a> {{ end }} </div> diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index b54751a401..5a414f7fc2 100644 --- a/templates/repo/pulls/tab_menu.tmpl +++ b/templates/repo/pulls/tab_menu.tmpl @@ -1,16 +1,16 @@ <div class="ui top attached pull tabular stackable menu"> <a class="item {{if .PageIsPullConversation}}active{{end}}" href="{{.RepoLink}}/pulls/{{.Issue.Index}}"> - {{svg "octicon-comment-discussion" 16}} + {{svg "octicon-comment-discussion"}} {{$.i18n.Tr "repo.pulls.tab_conversation"}} <span class="ui {{if not .Issue.NumComments}}gray{{else}}blue{{end}} small label">{{.Issue.NumComments}}</span> </a> <a class="item {{if .PageIsPullCommits}}active{{end}}" {{if .NumCommits}}href="{{.RepoLink}}/pulls/{{.Issue.Index}}/commits"{{end}}> - {{svg "octicon-git-commit" 16}} + {{svg "octicon-git-commit"}} {{$.i18n.Tr "repo.pulls.tab_commits"}} <span class="ui {{if not .NumCommits}}gray{{else}}blue{{end}} small label">{{if .NumCommits}}{{.NumCommits}}{{else}}N/A{{end}}</span> </a> <a class="item {{if .PageIsPullFiles}}active{{end}}" {{if .NumFiles}}href="{{.RepoLink}}/pulls/{{.Issue.Index}}/files"{{end}}> - {{svg "octicon-diff" 16}} + {{svg "octicon-diff"}} {{$.i18n.Tr "repo.pulls.tab_files"}} <span class="ui {{if not .NumFiles}}gray{{else}}blue{{end}} small label">{{if .NumFiles}}{{.NumFiles}}{{else}}N/A{{end}}</span> </a> diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index baef2c1cee..bba6f91e7b 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -43,8 +43,8 @@ <div class="download"> {{if $.Permission.CanRead $.UnitTypeCode}} <a href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow"><i class="code icon"></i> {{ShortSha .Sha1}}</a> - <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16}} ZIP</a> - <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.tar.gz">{{svg "octicon-file-zip" 16}} TAR.GZ</a> + <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.zip" rel="nofollow">{{svg "octicon-file-zip"}} ZIP</a> + <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.tar.gz">{{svg "octicon-file-zip"}} TAR.GZ</a> {{end}} </div> {{else}} @@ -80,18 +80,18 @@ <ul class="list"> {{if $.Permission.CanRead $.UnitTypeCode}} <li> - <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.zip" rel="nofollow"><strong>{{svg "octicon-file-zip" 16}} {{$.i18n.Tr "repo.release.source_code"}} (ZIP)</strong></a> + <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.zip" rel="nofollow"><strong>{{svg "octicon-file-zip"}} {{$.i18n.Tr "repo.release.source_code"}} (ZIP)</strong></a> </li> <li> - <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.tar.gz"><strong>{{svg "octicon-file-zip" 16}} {{$.i18n.Tr "repo.release.source_code"}} (TAR.GZ)</strong></a> + <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.tar.gz"><strong>{{svg "octicon-file-zip"}} {{$.i18n.Tr "repo.release.source_code"}} (TAR.GZ)</strong></a> </li> {{end}} {{if .Attachments}} {{range .Attachments}} <li> - <span class="ui text right" data-tooltip="{{$.i18n.Tr "repo.release.download_count" (.DownloadCount | PrettyNumber)}}" data-position="bottom right">{{svg "octicon-info" 16}}</span> + <span class="ui text right" data-tooltip="{{$.i18n.Tr "repo.release.download_count" (.DownloadCount | PrettyNumber)}}" data-position="bottom right">{{svg "octicon-info"}}</span> <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}"> - <strong><span class="ui image" title='{{.Name}}'>{{svg "octicon-package" 16}}</span> {{.Name}}</strong> + <strong><span class="ui image" title='{{.Name}}'>{{svg "octicon-package"}}</span> {{.Name}}</strong> <span class="ui text grey right">{{.Size | FileSize}}</span> </a> </li> diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 2312a614a2..7b9a063564 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -23,7 +23,7 @@ <span class="at">@</span> <div class="ui selection dropdown"> <input type="hidden" name="tag_target" value="{{.tag_target}}"/> - {{svg "octicon-git-branch" 16}} + {{svg "octicon-git-branch"}} <div class="text"> {{.i18n.Tr "repo.release.target"}} : <strong id="repo-branch-current">{{.Repository.DefaultBranch}}</strong> diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 082aebff73..9061857041 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -18,7 +18,7 @@ </a> </div> <div class="ui eight wide column"> - {{svg "octicon-shield-lock" 16}} + {{svg "octicon-shield-lock"}} <div class="ui inline dropdown"> <div class="text">{{if eq .Collaboration.Mode 1}}{{$.i18n.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.i18n.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.i18n.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.i18n.Tr "repo.settings.collaboration.undefined"}}{{end}}</div> <i class="dropdown icon"></i> @@ -67,7 +67,7 @@ </a> </div> <div class="ui eight wide column poping up" data-content="{{$.i18n.Tr "repo.settings.change_team_permission_tip"}}"> - {{svg "octicon-shield-lock" 16}} + {{svg "octicon-shield-lock"}} <div class="ui inline dropdown"> <div class="text">{{if eq .Authorize 1}}{{$.i18n.Tr "repo.settings.collaboration.read"}}{{else if eq .Authorize 2}}{{$.i18n.Tr "repo.settings.collaboration.write"}}{{else if eq .Authorize 3}}{{$.i18n.Tr "repo.settings.collaboration.admin"}}{{else if eq .Authorize 4}}{{$.i18n.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.i18n.Tr "repo.settings.collaboration.undefined"}}{{end}}</div> </div> diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index a22be48bb9..15d861d74e 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -33,7 +33,7 @@ {{.Fingerprint}} </div> <div class="activity meta"> - <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} - <span>{{$.i18n.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.i18n.Tr "settings.can_write_info"}} {{end}}</span></i> + <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} - <span>{{$.i18n.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.i18n.Tr "settings.can_write_info"}} {{end}}</span></i> </div> </div> </div> diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl index ace47ad7b9..213637ed46 100644 --- a/templates/repo/settings/githooks.tmpl +++ b/templates/repo/settings/githooks.tmpl @@ -14,7 +14,7 @@ </div> {{range .Hooks}} <div class="item"> - <span class="text {{if .IsActive}}green{{else}}grey{{end}}">{{svg "octicon-dot-fill" 16}}</span> + <span class="text {{if .IsActive}}green{{else}}grey{{end}}">{{svg "octicon-dot-fill"}}</span> <span>{{.Name}}</span> <a class="text blue ui right" href="{{$.RepoLink}}/settings/hooks/git/{{.Name}}"><i class="fa fa-pencil"></i></a> </div> diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index cde718d0cc..38dd547468 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -7,8 +7,8 @@ <h4 class="ui top attached header"> {{.i18n.Tr "repo.settings.lfs_filelist"}} ({{.i18n.Tr "admin.total" .Total}}) <div class="ui right"> - <a class="ui black tiny show-panel button" href="{{.Link}}/locks"><span class="octicon-tiny">{{svg "octicon-lock" 16}}</span>{{.i18n.Tr "repo.settings.lfs_locks"}}</a> - <a class="ui blue tiny show-panel button" href="{{.Link}}/pointers"><span class="octicon-tiny">{{svg "octicon-search" 16}}</span> {{.i18n.Tr "repo.settings.lfs_findpointerfiles"}}</a> + <a class="ui black tiny show-panel button" href="{{.Link}}/locks"><span class="octicon-tiny">{{svg "octicon-lock"}}</span>{{.i18n.Tr "repo.settings.lfs_locks"}}</a> + <a class="ui blue tiny show-panel button" href="{{.Link}}/pointers"><span class="octicon-tiny">{{svg "octicon-search"}}</span> {{.i18n.Tr "repo.settings.lfs_findpointerfiles"}}</a> </div> </h4> <table id="lfs-files-table" class="ui attached segment single line table"> @@ -27,7 +27,7 @@ <td class="right aligned"> <a class="ui blue show-panel button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.i18n.Tr "repo.settings.lfs_findcommits"}}</a> <button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}"> - <span class="btn-octicon btn-octicon-danger poping up" data-content="{{$.i18n.Tr "repo.editor.delete_this_file"}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan" 16}}</span> + <span class="btn-octicon btn-octicon-danger poping up" data-content="{{$.i18n.Tr "repo.editor.delete_this_file"}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan"}}</span> </button> </td> </tr> diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl index 5a2a168bec..cfef51b3cc 100644 --- a/templates/repo/settings/lfs_file_find.tmpl +++ b/templates/repo/settings/lfs_file_find.tmpl @@ -13,7 +13,7 @@ {{range .Results}} <tr> <td> - {{svg "octicon-file" 16}} + {{svg "octicon-file"}} <a href="{{EscapePound $.RepoLink}}/src/commit/{{.SHA}}/{{EscapePound .Name}}" title="{{.Name}}">{{.Name}}</a> </td> <td class="message"> @@ -24,7 +24,7 @@ </span> </td> <td> - <span class="text grey">{{svg "octicon-git-branch" 16}}{{.BranchName}}</span> + <span class="text grey">{{svg "octicon-git-branch"}}{{.BranchName}}</span> </td> <td> {{if .ParentHashes}} diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl index bb6d55a709..c895896bcd 100644 --- a/templates/repo/settings/lfs_locks.tmpl +++ b/templates/repo/settings/lfs_locks.tmpl @@ -23,14 +23,14 @@ <tr> <td> {{if index $.Linkable $index}} - {{svg "octicon-file" 16}} + {{svg "octicon-file"}} <a href="{{EscapePound $.RepoLink}}/src/branch/{{EscapePound $lock.Repo.DefaultBranch}}/{{EscapePound $lock.Path}}" title="{{$lock.Path}}">{{$lock.Path}}</a> {{else}} - {{svg "octicon-diff" 16}} + {{svg "octicon-diff"}} <span class="poping up" title="{{$.i18n.Tr "repo.settings.lfs_lock_file_no_exist"}}">{{$lock.Path}}</span> {{end}} {{if not (index $.Lockables $index)}} - <span class="poping up" title="{{$.i18n.Tr "repo.settings.lfs_noattribute"}}">{{svg "octicon-alert" 16}}</span> + <span class="poping up" title="{{$.i18n.Tr "repo.settings.lfs_noattribute"}}">{{svg "octicon-alert"}}</span> {{end}} </td> <td> @@ -43,7 +43,7 @@ <td class="right aligned"> <form action="{{$.LFSFilesLink}}/locks/{{$lock.ID}}/unlock" method="POST"> {{$.CsrfTokenHtml}} - <button class="ui blue button"><span class="btn-octicon">{{svg "octicon-lock" 16}}</span>{{$.i18n.Tr "repo.settings.lfs_force_unlock"}}</button> + <button class="ui blue button"><span class="btn-octicon">{{svg "octicon-lock"}}</span>{{$.i18n.Tr "repo.settings.lfs_force_unlock"}}</button> </form> </td> </tr> diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 3c2dfc831e..57ffc74886 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -65,7 +65,7 @@ <div class="menu"> {{range .Teams}} <div class="item" data-value="{{.ID}}"> - {{svg "octicon-people" 16}} + {{svg "octicon-people"}} {{.Name}} </div> {{end}} @@ -115,7 +115,7 @@ <div class="menu"> {{range .Teams}} <div class="item" data-value="{{.ID}}"> - {{svg "octicon-people" 16}} + {{svg "octicon-people"}} {{.Name}} </div> {{end}} @@ -195,7 +195,7 @@ <div class="menu"> {{range .Teams}} <div class="item" data-value="{{.ID}}"> - {{svg "octicon-people" 16}} + {{svg "octicon-people"}} {{.Name}} </div> {{end}} diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl index 53c01c168b..6499b93116 100644 --- a/templates/repo/settings/webhook/history.tmpl +++ b/templates/repo/settings/webhook/history.tmpl @@ -14,9 +14,9 @@ <div class="item"> <div class="meta"> {{if .IsSucceed}} - <span class="text green">{{svg "octicon-check" 16}}</span> + <span class="text green">{{svg "octicon-check"}}</span> {{else}} - <span class="text red">{{svg "octicon-alert" 16}}</span> + <span class="text red">{{svg "octicon-alert"}}</span> {{end}} <a class="ui blue sha label toggle button" data-target="#info-{{.ID}}">{{.UUID}}</a> <div class="ui right"> diff --git a/templates/repo/settings/webhook/list.tmpl b/templates/repo/settings/webhook/list.tmpl index dcc27baa61..29994d8197 100644 --- a/templates/repo/settings/webhook/list.tmpl +++ b/templates/repo/settings/webhook/list.tmpl @@ -44,11 +44,11 @@ {{range .Webhooks}} <div class="item"> {{if eq .LastStatus 1}} - <span class="text green">{{svg "octicon-check" 16}}</span> + <span class="text green">{{svg "octicon-check"}}</span> {{else if eq .LastStatus 2}} - <span class="text red">{{svg "octicon-alert" 16}}</span> + <span class="text red">{{svg "octicon-alert"}}</span> {{else}} - <span class="text grey">{{svg "octicon-dot-fill" 16}}</span> + <span class="text grey">{{svg "octicon-dot-fill"}}</span> {{end}} <a class="dont-break-out" href="{{$.BaseLink}}/{{.ID}}">{{.URL}}</a> <div class="ui right"> diff --git a/templates/repo/shabox_badge.tmpl b/templates/repo/shabox_badge.tmpl index f46b52004e..c51c0ef548 100644 --- a/templates/repo/shabox_badge.tmpl +++ b/templates/repo/shabox_badge.tmpl @@ -2,14 +2,14 @@ {{if .verification.Verified}} <div title="{{if eq .verification.TrustStatus "trusted"}}{{else if eq .verification.TrustStatus "untrusted"}}{{$.root.i18n.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{$.root.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.verification.Reason}}"> {{if ne .verification.SigningUser.ID 0}} - {{svg "gitea-lock" 16}} + {{svg "gitea-lock"}} <img class="ui signature avatar image" src="{{.verification.SigningUser.RelAvatarLink}}" /> {{else}} - <span title="{{$.root.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog" 16}}</span> + <span title="{{$.root.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span> <img class="ui signature avatar image" src="{{AvatarLink .verification.SigningEmail}}" /> {{end}} </div> {{else}} - <span title="{{$.root.i18n.Tr .verification.Reason}}">{{svg "gitea-unlock" 16}}</span> + <span title="{{$.root.i18n.Tr .verification.Reason}}">{{svg "gitea-unlock"}}</span> {{end}} </div> diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index 00bb4a54f8..8668ab240f 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -3,15 +3,15 @@ <div class="ui two horizontal center link list"> {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}} <div class="item{{if .PageIsCommits}} active{{end}}"> - <a class="ui" href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}">{{svg "octicon-history" 16}} <b>{{.CommitsCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commits") }}</a> + <a class="ui" href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}">{{svg "octicon-history"}} <b>{{.CommitsCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commits") }}</a> </div> {{end}} {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) }} <div class="item{{if .PageIsBranches}} active{{end}}"> - <a class="ui" href="{{.RepoLink}}/branches/">{{svg "octicon-git-branch" 16}} <b>{{.BranchesCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .BranchesCount "repo.branch" "repo.branches") }}</a> + <a class="ui" href="{{.RepoLink}}/branches/">{{svg "octicon-git-branch"}} <b>{{.BranchesCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .BranchesCount "repo.branch" "repo.branches") }}</a> </div> <div class="item"> - <span class="ui">{{svg "octicon-database" 16}} <b>{{SizeFmt .Repository.Size}}</b></span> + <span class="ui">{{svg "octicon-database"}} <b>{{SizeFmt .Repository.Size}}</b></span> </div> {{end}} </div> diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index 9bf0560427..d50da4de71 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -14,11 +14,11 @@ <div class="meta"> {{if .Website}} - {{svg "octicon-link" 16}} <a href="{{.Website}}" target="_blank" rel="noopener noreferrer">{{.Website}}</a> + {{svg "octicon-link"}} <a href="{{.Website}}" target="_blank" rel="noopener noreferrer">{{.Website}}</a> {{else if .Location}} - {{svg "octicon-location" 16}} {{.Location}} + {{svg "octicon-location"}} {{.Location}} {{else}} - {{svg "octicon-clock" 16}} {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}} + {{svg "octicon-clock"}} {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}} {{end}} </div> </li> diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 26f66d2cb5..2f4fc12e62 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -45,14 +45,14 @@ </div> {{if .Repository.CanEnableEditor}} {{if .CanEditFile}} - <a href="{{.RepoLink}}/_edit/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><span class="btn-octicon poping up" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil" 16}}</span></a> + <a href="{{.RepoLink}}/_edit/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><span class="btn-octicon poping up" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil"}}</span></a> {{else}} - <span class="btn-octicon poping up disabled" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil" 16}}</span> + <span class="btn-octicon poping up disabled" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil"}}</span> {{end}} {{if .CanDeleteFile}} - <a href="{{.RepoLink}}/_delete/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><span class="btn-octicon btn-octicon-danger poping up" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan" 16}}</span></a> + <a href="{{.RepoLink}}/_delete/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><span class="btn-octicon btn-octicon-danger poping up" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan"}}</span></a> {{else}} - <span class="btn-octicon poping up disabled" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan" 16}}</span> + <span class="btn-octicon poping up disabled" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-trashcan"}}</span> {{end}} {{end}} </div> diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 3b469f4fca..b4f2260fe2 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -36,7 +36,7 @@ <tbody> {{if .HasParentPath}} <tr class="has-parent"> - <td colspan="3">{{svg "octicon-reply" 16}}<a href="{{EscapePound .BranchLink}}{{.ParentPath}}">..</a></td> + <td colspan="3">{{svg "octicon-reply"}}<a href="{{EscapePound .BranchLink}}{{.ParentPath}}">..</a></td> </tr> {{end}} {{range $item := .Files}} @@ -46,7 +46,7 @@ <td class="name four wide"> <span class="truncate"> {{if $entry.IsSubModule}} - {{svg "octicon-file-submodule" 16}} + {{svg "octicon-file-submodule"}} {{$refURL := $commit.RefURL AppUrl $.Repository.FullName $.SSHDomain}} {{if $refURL}} <a href="{{$refURL}}">{{$entry.Name}}</a><span class="at">@</span><a href="{{$refURL}}/commit/{{$commit.RefID}}">{{ShortSha $commit.RefID}}</a> @@ -57,7 +57,7 @@ {{if $entry.IsDir}} {{$subJumpablePathName := $entry.GetSubJumpablePathName}} {{$subJumpablePath := SubJumpablePath $subJumpablePathName}} - {{svg "octicon-file-directory" 16}} + {{svg "octicon-file-directory"}} <a href="{{EscapePound $.TreeLink}}/{{EscapePound $subJumpablePathName}}" title="{{$subJumpablePathName}}"> {{if eq (len $subJumpablePath) 2}} <span class="jumpable-path">{{index $subJumpablePath 0}}</span>{{index $subJumpablePath 1}} @@ -66,7 +66,7 @@ {{end}} </a> {{else}} - {{svg (printf "octicon-%s" (EntryIcon $entry)) 16}} + {{svg (printf "octicon-%s" (EntryIcon $entry))}} <a href="{{EscapePound $.TreeLink}}/{{EscapePound $entry.Name}}" title="{{$entry.Name}}">{{$entry.Name}}</a> {{end}} {{end}} diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index 01e8627944..2c131e0b0f 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -15,7 +15,7 @@ {{range .Pages}} <tr> <td> - {{svg "octicon-file" 16}} + {{svg "octicon-file"}} <a href="{{$.RepoLink}}/wiki/{{.SubURL}}">{{.Name}}</a> </td> {{$timeSince := TimeSinceUnix .UpdatedUnix $.Lang}} diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl index b7551b834d..da07901bff 100644 --- a/templates/repo/wiki/revision.tmpl +++ b/templates/repo/wiki/revision.tmpl @@ -23,13 +23,13 @@ {{end}} {{if or (not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))}} <button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url"> - {{svg "octicon-clippy" 16}} + {{svg "octicon-clippy"}} </button> {{end}} </div> </div> <div class="ui header eight wide column"> - <a class="file-revisions-btn ui basic button" title="{{.i18n.Tr "repo.wiki.back_to_wiki"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}" ><span>{{.revision}}</span> {{svg "octicon-home" 16}}</a> + <a class="file-revisions-btn ui basic button" title="{{.i18n.Tr "repo.wiki.back_to_wiki"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}" ><span>{{.revision}}</span> {{svg "octicon-home"}}</a> {{$title}} <div class="ui sub header wrap"> {{$timeSince := TimeSince .Author.When $.Lang}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index d83f6fe6f7..3d29cdcc56 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -47,7 +47,7 @@ {{end}} {{if or (not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))}} <button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url"> - {{svg "octicon-clippy" 16}} + {{svg "octicon-clippy"}} </button> {{end}} </div> @@ -56,7 +56,7 @@ <div class="ui dividing header"> <div class="ui stackable grid"> <div class="eight wide column"> - <a class="file-revisions-btn ui basic button" title="{{.i18n.Tr "repo.wiki.file_revision"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}/_revision" ><span>{{.CommitCount}}</span> {{svg "octicon-history" 16}}</a> + <a class="file-revisions-btn ui basic button" title="{{.i18n.Tr "repo.wiki.file_revision"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}/_revision" ><span>{{.CommitCount}}</span> {{svg "octicon-history"}}</a> {{$title}} <div class="ui sub header"> {{$timeSince := TimeSince .Author.When $.Lang}} diff --git a/templates/swagger/ui.tmpl b/templates/swagger/ui.tmpl index 7ad39dd8e0..4b4d791979 100644 --- a/templates/swagger/ui.tmpl +++ b/templates/swagger/ui.tmpl @@ -6,7 +6,7 @@ <link href="{{StaticUrlPrefix}}/css/swagger.css?v={{MD5 AppVer}}" rel="stylesheet"> </head> <body> - <a class="swagger-back-link" href="{{AppUrl}}">{{svg "octicon-reply" 16}}{{.i18n.Tr "return_to_gitea"}}</a> + <a class="swagger-back-link" href="{{AppUrl}}">{{svg "octicon-reply"}}{{.i18n.Tr "return_to_gitea"}}</a> <div id="swagger-ui" data-source="{{AppUrl}}swagger.{{.APIJSONVersion}}.json"></div> <script src="{{StaticUrlPrefix}}/js/swagger.js?v={{MD5 AppVer}}"></script> </body> diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 8876553ab5..66ee6164bb 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -56,11 +56,11 @@ <div class="column"> <div class="ui tiny basic status buttons"> <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}"> - {{svg "octicon-issue-opened" 16}} + {{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.issues.open_tab" .ShownIssueStats.OpenCount}} </a> <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed&q={{$.Keyword}}"> - {{svg "octicon-issue-closed" 16}} + {{svg "octicon-issue-closed"}} {{.i18n.Tr "repo.issues.close_tab" .ShownIssueStats.ClosedCount}} </a> </div> @@ -127,10 +127,10 @@ {{end}} {{if .NumComments}} - <span class="comment ui right">{{svg "octicon-comment" 16}} {{.NumComments}}</span> + <span class="comment ui right">{{svg "octicon-comment"}} {{.NumComments}}</span> {{end}} {{if .TotalTrackedTime}} - <span class="comment ui right">{{svg "octicon-clock" 16}} {{.TotalTrackedTime | Sec2Time}}</span> + <span class="comment ui right">{{svg "octicon-clock"}} {{.TotalTrackedTime | Sec2Time}}</span> {{end}} <p class="desc"> @@ -143,12 +143,12 @@ {{end}} {{if .Milestone}} <a class="milestone" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/milestone/{{.Milestone.ID}}"> - {{svg "octicon-milestone" 16}} {{.Milestone.Name}} + {{svg "octicon-milestone"}} {{.Milestone.Name}} </a> {{end}} {{if .Ref}} <a class="ref" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}{{index $.IssueRefURLs .ID}}"> - {{svg "octicon-git-branch" 16}} {{index $.IssueRefEndNames .ID}} + {{svg "octicon-git-branch"}} {{index $.IssueRefEndNames .ID}} </a> {{end}} {{range .Assignees}} @@ -160,12 +160,12 @@ {{if gt $tasks 0}} {{$tasksDone := .GetTasksDone}} <span class="checklist"> - {{svg "octicon-checklist" 16}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span> + {{svg "octicon-checklist"}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span> </span> {{end}} {{if ne .DeadlineUnix 0}} <span class="due-date poping up" data-content="{{$.i18n.Tr "repo.issues.due_date"}}" data-variation="tiny inverted" data-position="right center"> - {{svg "octicon-calendar" 16}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> + {{svg "octicon-calendar"}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> </span> {{end}} {{if .IsPull}} @@ -173,25 +173,25 @@ {{$rejectOfficial := call $approvalCounts .ID "reject"}} {{$waitingOfficial := call $approvalCounts .ID "waiting"}} {{if gt $approveOfficial 0}} - <span class="approvals">{{svg "octicon-check" 16}} + <span class="approvals">{{svg "octicon-check"}} {{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}} </span> {{end}} {{if gt $rejectOfficial 0}} - <span class="rejects">{{svg "octicon-diff" 16}} + <span class="rejects">{{svg "octicon-diff"}} {{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}} </span> {{end}} {{if gt $waitingOfficial 0}} - <span class="waiting">{{svg "octicon-eye" 16}} + <span class="waiting">{{svg "octicon-eye"}} {{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}} </span> {{end}} {{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}} - <span class="conflicting">{{svg "octicon-x" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> + <span class="conflicting">{{svg "octicon-x"}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> {{end}} {{end}} </p> diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 2a4226e923..f22bf13e22 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -36,11 +36,11 @@ <div class="twelve wide column content"> <div class="ui tiny basic status buttons"> <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open"> - {{svg "octicon-issue-opened" 16}} + {{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.milestones.open_tab" .MilestoneStats.OpenCount}} </a> <a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed"> - {{svg "octicon-issue-closed" 16}} + {{svg "octicon-issue-closed"}} {{.i18n.Tr "repo.milestones.close_tab" .MilestoneStats.ClosedCount}} </a> </div> @@ -66,7 +66,7 @@ {{range .Milestones}} <li class="item"> <div class="ui label">{{.Repo.FullName}}</div> - {{svg "octicon-milestone" 16}} <a href="{{.Repo.Link }}/milestone/{{.ID}}">{{.Name}}</a> + {{svg "octicon-milestone"}} <a href="{{.Repo.Link }}/milestone/{{.ID}}">{{.Name}}</a> <div class="ui right green progress" data-percent="{{.Completeness}}"> <div class="bar" {{if not .Completeness}}style="background-color: transparent"{{end}}> <div class="progress"></div> @@ -75,9 +75,9 @@ <div class="meta"> {{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.Lang }} {{if .IsClosed}} - {{svg "octicon-clock" 16}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} {{else}} - {{svg "octicon-calendar" 16}} + {{svg "octicon-calendar"}} {{if .DeadlineString}} <span {{if .IsOverdue}}class="overdue"{{end}}>{{.DeadlineString}}</span> {{else}} @@ -85,20 +85,20 @@ {{end}} {{end}} <span class="issue-stats"> - {{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.milestones.open_tab" .NumOpenIssues}} - {{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.milestones.close_tab" .NumClosedIssues}} - {{if .TotalTrackedTime}}{{svg "octicon-clock" 16}} {{.TotalTrackedTime|Sec2Time}}{{end}} + {{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.milestones.open_tab" .NumOpenIssues}} + {{svg "octicon-issue-closed"}} {{$.i18n.Tr "repo.milestones.close_tab" .NumClosedIssues}} + {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} </span> </div> {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} <div class="ui right operate"> - <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-pencil" 16}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> + <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-pencil"}} {{$.i18n.Tr "repo.issues.label_edit"}}</a> {{if .IsClosed}} - <a href="{{$.Link}}/{{.ID}}/open" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-check" 16}} {{$.i18n.Tr "repo.milestones.open"}}</a> + <a href="{{$.Link}}/{{.ID}}/open" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-check"}} {{$.i18n.Tr "repo.milestones.open"}}</a> {{else}} - <a href="{{$.Link}}/{{.ID}}/close" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-x" 16}} {{$.i18n.Tr "repo.milestones.close"}}</a> + <a href="{{$.Link}}/{{.ID}}/close" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-x"}} {{$.i18n.Tr "repo.milestones.close"}}</a> {{end}} - <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trashcan" 16}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a> </div> {{end}} {{if .Content}} diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 7afb975bbc..c94dfa5e8f 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -25,7 +25,7 @@ </div> {{if .SignedUser.CanCreateOrganization}} <a class="item" href="{{AppSubUrl}}/org/create"> - {{svg "octicon-plus" 16}} {{.i18n.Tr "new_org"}} + {{svg "octicon-plus"}} {{.i18n.Tr "new_org"}} </a> {{end}} </div> @@ -35,17 +35,17 @@ {{if .ContextUser.IsOrganization}} <div class="right stackable menu"> <a class="{{if .PageIsNews}}active{{end}} item" style="margin-left: auto" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/dashboard"> - {{svg "octicon-rss" 16}} {{.i18n.Tr "activities"}} + {{svg "octicon-rss"}} {{.i18n.Tr "activities"}} </a> <a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/issues"> - {{svg "octicon-issue-opened" 16}} {{.i18n.Tr "issues"}} + {{svg "octicon-issue-opened"}} {{.i18n.Tr "issues"}} </a> <a class="{{if .PageIsPulls}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/pulls"> - {{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "pull_requests"}} + {{svg "octicon-git-pull-request"}} {{.i18n.Tr "pull_requests"}} </a> {{if .ShowMilestonesDashboardPage}} <a class="{{if .PageIsMilestonesDashboard}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/milestones"> - {{svg "octicon-milestone" 16}} {{.i18n.Tr "milestones"}} + {{svg "octicon-milestone"}} {{.i18n.Tr "milestones"}} </a> {{end}} <div class="item"> diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index ce4a97a36f..717318634e 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -53,15 +53,15 @@ <a @click="togglePrivateFilter()"> <div class="ui checkbox" id="privateFilterCheckbox" title="{{.i18n.Tr "home.show_both_private_public"}}" v-if="privateFilter === 'both'"> <input type="checkbox"> - <label>{{svg "octicon-lock" 16}}{{.i18n.Tr "home.show_private"}}</label> + <label>{{svg "octicon-lock"}}{{.i18n.Tr "home.show_private"}}</label> </div> <div class="ui checkbox" id="privateFilterCheckbox" title="{{.i18n.Tr "home.show_only_public"}}" v-if="privateFilter === 'public'"> <input type="checkbox"> - <label>{{svg "octicon-lock" 16}}</svg>{{.i18n.Tr "home.show_private"}}</label> + <label>{{svg "octicon-lock"}}</svg>{{.i18n.Tr "home.show_private"}}</label> </div> <div class="ui checkbox" id="privateFilterCheckbox" title="{{.i18n.Tr "home.show_only_private"}}" v-if="privateFilter === 'private'"> <input type="checkbox"> - <label>{{svg "octicon-lock" 16}}</svg>{{.i18n.Tr "home.show_private"}}</label> + <label>{{svg "octicon-lock"}}</svg>{{.i18n.Tr "home.show_private"}}</label> </div> </a> </div> @@ -99,7 +99,7 @@ <strong class="text truncate item-name">${repo.full_name}</strong> <i v-if="repo.archived" class="archive icon archived-icon"></i> <span class="ui right text light grey"> - ${repo.stars_count} <span class="rear">{{svg "octicon-star" 16}}</span> + ${repo.stars_count} <span class="rear">{{svg "octicon-star"}}</span> </span> </a> </li> @@ -143,10 +143,10 @@ <ul class="repo-owner-name-list"> <li v-for="org in organizations"> <a :href="suburl + '/' + org.name"> - {{svg "octicon-organization" 16}} + {{svg "octicon-organization"}} <strong class="text truncate item-name">${org.name}</strong> <span class="ui right text light grey"> - ${org.num_repos} <span class="rear">{{svg "octicon-repo" 16}}</span> + ${org.num_repos} <span class="rear">{{svg "octicon-repo"}}</span> </span> </a> </li> diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 18054c479a..d35009107a 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -15,7 +15,7 @@ {{$.CsrfTokenHtml}} <div class="{{if not $notificationUnreadCount}}hide{{end}}"> <button class="ui mini button primary" title='{{$.i18n.Tr "notification.mark_all_as_read"}}'> - {{svg "octicon-checklist" 16}} + {{svg "octicon-checklist"}} </button> </div> </form> @@ -38,22 +38,22 @@ <tr id="notification_{{.ID}}"> <td class="collapsing" data-href="{{.HTMLURL}}"> {{if eq .Status 3}} - <span class="blue">{{svg "octicon-pin" 16}}</span> + <span class="blue">{{svg "octicon-pin"}}</span> {{else if $issue.IsPull}} {{if $issue.IsClosed}} {{if $issue.GetPullRequest.HasMerged}} - <span class="purple">{{svg "octicon-git-merge" 16}}</span> + <span class="purple">{{svg "octicon-git-merge"}}</span> {{else}} - <span class="red">{{svg "octicon-git-pull-request" 16}}</span> + <span class="red">{{svg "octicon-git-pull-request"}}</span> {{end}} {{else}} - <span class="green">{{svg "octicon-git-pull-request" 16}}</span> + <span class="green">{{svg "octicon-git-pull-request"}}</span> {{end}} {{else}} {{if $issue.IsClosed}} - <span class="red">{{svg "octicon-issue-closed" 16}}</span> + <span class="red">{{svg "octicon-issue-closed"}}</span> {{else}} - <span class="green">{{svg "octicon-issue-opened" 16}}</span> + <span class="green">{{svg "octicon-issue-opened"}}</span> {{end}} {{end}} </td> @@ -79,7 +79,7 @@ data-page="{{$.Page.Paginater.Current}}" data-notification-id="{{.ID}}" data-q="{{$.Keyword}}"> - {{svg "octicon-pin" 16}} + {{svg "octicon-pin"}} </button> </form> {{end}} @@ -97,7 +97,7 @@ data-page="{{$.Page.Paginater.Current}}" data-notification-id="{{.ID}}" data-q="{{$.Keyword}}"> - {{svg "octicon-check" 16}} + {{svg "octicon-check"}} </button> </form> {{else if eq .Status 2}} @@ -112,7 +112,7 @@ data-page="{{$.Page.Paginater.Current}}" data-notification-id="{{.ID}}" data-q="{{$.Keyword}}"> - {{svg "octicon-bell" 16}} + {{svg "octicon-bell"}} </button> </form> {{end}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index ecfc7e6544..9deadd921d 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -20,17 +20,17 @@ <div class="extra content wrap"> <ul class="text black"> {{if .Owner.Location}} - <li>{{svg "octicon-location" 16}} {{.Owner.Location}}</li> + <li>{{svg "octicon-location"}} {{.Owner.Location}}</li> {{end}} {{if .ShowUserEmail }} <li> - {{svg "octicon-mail" 16}} + {{svg "octicon-mail"}} <a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a> </li> {{end}} {{if .Owner.Website}} <li> - {{svg "octicon-link" 16}} + {{svg "octicon-link"}} <a target="_blank" rel="noopener noreferrer me" href="{{.Owner.Website}}">{{.Owner.Website}}</a> </li> {{end}} @@ -47,7 +47,7 @@ </li> {{end}} {{end}} - <li>{{svg "octicon-clock" 16}} {{.i18n.Tr "user.join_on"}} {{.Owner.CreatedUnix.FormatShort}}</li> + <li>{{svg "octicon-clock"}} {{.i18n.Tr "user.join_on"}} {{.Owner.CreatedUnix.FormatShort}}</li> {{if and .Orgs .HasOrgsVisible}} <li> <ul class="user-orgs"> @@ -66,12 +66,12 @@ {{if .SignedUser.IsFollowing .Owner.ID}} <form method="post" action="{{.Link}}/action/unfollow?redirect_to={{$.Link}}"> {{$.CsrfTokenHtml}} - <button type="submit" class="ui basic red button">{{svg "octicon-person" 16}} {{.i18n.Tr "user.unfollow"}}</button> + <button type="submit" class="ui basic red button">{{svg "octicon-person"}} {{.i18n.Tr "user.unfollow"}}</button> </form> {{else}} <form method="post" action="{{.Link}}/action/follow?redirect_to={{$.Link}}"> {{$.CsrfTokenHtml}} - <button type="submit" class="ui basic green button">{{svg "octicon-person" 16}} {{.i18n.Tr "user.follow"}}</button> + <button type="submit" class="ui basic green button">{{svg "octicon-person"}} {{.i18n.Tr "user.follow"}}</button> </form> {{end}} </li> @@ -83,21 +83,21 @@ <div class="ui eleven wide column"> <div class="ui secondary stackable pointing menu"> <a class='{{if and (ne .TabName "activity") (ne .TabName "following") (ne .TabName "followers") (ne .TabName "stars") (ne .TabName "projects")}}active{{end}} item' href="{{.Owner.HomeLink}}"> - {{svg "octicon-repo" 16}} {{.i18n.Tr "user.repositories"}} + {{svg "octicon-repo"}} {{.i18n.Tr "user.repositories"}} </a> <a class='{{if eq .TabName "activity"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=activity"> - {{svg "octicon-rss" 16}} {{.i18n.Tr "user.activity"}} + {{svg "octicon-rss"}} {{.i18n.Tr "user.activity"}} </a> <a class='{{if eq .TabName "stars"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=stars"> - {{svg "octicon-star" 16}} {{.i18n.Tr "user.starred"}} + {{svg "octicon-star"}} {{.i18n.Tr "user.starred"}} <div class="ui label">{{.Owner.NumStars}}</div> </a> <a class='{{if eq .TabName "following"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=following"> - {{svg "octicon-person" 16}} {{.i18n.Tr "user.following"}} + {{svg "octicon-person"}} {{.i18n.Tr "user.following"}} <div class="ui label">{{.Owner.NumFollowing}}</div> </a> <a class='{{if eq .TabName "followers"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=followers"> - {{svg "octicon-person" 16}} {{.i18n.Tr "user.followers"}} + {{svg "octicon-person"}} {{.i18n.Tr "user.followers"}} <div class="ui label">{{.Owner.NumFollowers}}</div> </a> </div> diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index e8b4267a70..b2cff86188 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -172,7 +172,7 @@ </h4> <div class="ui attached warning segment"> <div class="ui red message"> - <p class="text left">{{svg "octicon-alert" 16}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p> + <p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p> </div> <form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post"> {{.CsrfTokenHtml}} diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 4131350cb0..b2751ae13b 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -22,7 +22,7 @@ <div class="content"> <strong>{{.Name}}</strong> <div class="activity meta"> - <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> + <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> </div> </div> </div> diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 55e2a4b008..e5b42f4174 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -29,7 +29,7 @@ {{.Fingerprint}} </div> <div class="activity meta"> - <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> + <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> </div> </div> </div> diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index ed93dd1e42..8d9065ec61 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -13,13 +13,13 @@ <div class="item"> <div class="content"> {{if .IsPrivate}} - <span class="text gold iconFloat">{{svg "octicon-lock" 16}}</span> + <span class="text gold iconFloat">{{svg "octicon-lock"}}</span> {{else if .IsFork}} - <span class="iconFloat">{{svg "octicon-repo-forked" 16}}</span> + <span class="iconFloat">{{svg "octicon-repo-forked"}}</span> {{else if .IsMirror}} - <span class="iconFloat">{{svg "octicon-mirror" 16}}</span> + <span class="iconFloat">{{svg "octicon-mirror"}}</span> {{else}} - <span class="iconFloat">{{svg "octicon-repo" 16}}</span> + <span class="iconFloat">{{svg "octicon-repo"}}</span> {{end}} <a class="name" href="{{AppSubUrl}}/{{$.Owner.Name}}/{{.Name}}">{{$.Owner.Name}}/{{.Name}}</a> <span>{{SizeFmt .Size}}</span> diff --git a/templates/user/settings/security_u2f.tmpl b/templates/user/settings/security_u2f.tmpl index e083e0b434..5fb5f344d1 100644 --- a/templates/user/settings/security_u2f.tmpl +++ b/templates/user/settings/security_u2f.tmpl @@ -24,7 +24,7 @@ <label for="nickname">{{.i18n.Tr "settings.u2f_nickname"}}</label> <input id="nickname" name="nickname" type="text" required> </div> - <button id="register-security-key" class="ui green button">{{svg "octicon-key" 16}} {{.i18n.Tr "settings.u2f_register_key"}}</button> + <button id="register-security-key" class="ui green button">{{svg "octicon-key"}} {{.i18n.Tr "settings.u2f_register_key"}}</button> </div> {{else}} <b>{{.i18n.Tr "settings.u2f_require_twofa"}}</b> diff --git a/web_src/js/features/contextpopup.js b/web_src/js/features/contextpopup.js index 2597c18014..a9a0ceee3b 100644 --- a/web_src/js/features/contextpopup.js +++ b/web_src/js/features/contextpopup.js @@ -65,7 +65,7 @@ function issuePopup(owner, repo, index, $element) { html: ` <div> <p><small>${issue.repository.full_name} on ${createdAt}</small></p> - <p><span class="${color}">${svg(octicon, 16)}</span> <strong>${issue.title}</strong> #${index}</p> + <p><span class="${color}">${svg(octicon)}</span> <strong>${issue.title}</strong> #${index}</p> <p>${body}</p> ${labels} </div> diff --git a/web_src/js/markdown/anchors.js b/web_src/js/markdown/anchors.js index 73c38eef32..b7d0a1f608 100644 --- a/web_src/js/markdown/anchors.js +++ b/web_src/js/markdown/anchors.js @@ -23,7 +23,7 @@ export default function initMarkdownAnchors() { const a = document.createElement('a'); a.classList.add('anchor'); a.setAttribute('href', `#${encodeURIComponent(originalId)}`); - a.innerHTML = svg('octicon-link', 16); + a.innerHTML = svg('octicon-link'); heading.prepend(a); } |