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 /templates/user/dashboard | |
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>
Diffstat (limited to 'templates/user/dashboard')
-rw-r--r-- | templates/user/dashboard/issues.tmpl | 24 | ||||
-rw-r--r-- | templates/user/dashboard/milestones.tmpl | 24 | ||||
-rw-r--r-- | templates/user/dashboard/navbar.tmpl | 10 | ||||
-rw-r--r-- | templates/user/dashboard/repolist.tmpl | 12 |
4 files changed, 35 insertions, 35 deletions
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> |