diff options
| -rw-r--r-- | models/project/project.go | 11 | ||||
| -rw-r--r-- | templates/projects/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/list.tmpl | 12 | ||||
| -rw-r--r-- | templates/repo/issue/new_form.tmpl | 9 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/sidebar.tmpl | 9 | ||||
| -rw-r--r-- | templates/repo/projects/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/shared/issuelist.tmpl | 2 |
7 files changed, 24 insertions, 23 deletions
diff --git a/models/project/project.go b/models/project/project.go index 679d695881..44609e60b2 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -144,10 +144,21 @@ func (p *Project) Link() string { return "" } +func (p *Project) IconName() string { + if p.IsRepositoryProject() { + return "octicon-project" + } + return "octicon-project-symlink" +} + func (p *Project) IsOrganizationProject() bool { return p.Type == TypeOrganization } +func (p *Project) IsRepositoryProject() bool { + return p.Type == TypeRepository +} + func init() { db.RegisterModel(new(Project)) } diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 89c52dee68..5062109161 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -38,7 +38,7 @@ <div class="milestone list"> {{range .Projects}} <li class="item"> - {{svg "octicon-project-symlink"}} <a href="{{.Link}}">{{.Title}}</a> + {{svg .IconName}} <a href="{{.Link}}">{{.Title}}</a> <div class="meta"> {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 975d659470..726ef25cfe 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -100,8 +100,7 @@ </div> {{range .OpenProjects}} <a class="{{if $.ProjectID}}{{if eq $.ProjectID .ID}}active selected{{end}}{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{.ID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} </a> {{end}} {{end}} @@ -112,8 +111,7 @@ </div> {{range .ClosedProjects}} <a class="{{if $.ProjectID}}{{if eq $.ProjectID .ID}}active selected{{end}}{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{.ID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} </a> {{end}} {{end}} @@ -273,8 +271,7 @@ </div> {{range .OpenProjects}} <div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/projects"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} </div> {{end}} {{end}} @@ -285,8 +282,7 @@ </div> {{range .ClosedProjects}} <div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/projects"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} </div> {{end}} {{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index b45a00f781..4945203ca5 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -134,8 +134,7 @@ </div> {{range .OpenProjects}} <a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} </a> {{end}} {{end}} @@ -146,8 +145,7 @@ </div> {{range .ClosedProjects}} <a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} </a> {{end}} {{end}} @@ -159,8 +157,7 @@ <div class="selected"> {{if .Project}} <a class="item muted sidebar-item-link" href="{{.Project.Link}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Project.Title}} + {{svg .Project.IconName 18 "gt-mr-3"}}{{.Project.Title}} </a> {{end}} </div> diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 40d87b4178..cef1e3a02e 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -196,8 +196,7 @@ </div> {{range .OpenProjects}} <a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} </a> {{end}} {{end}} @@ -208,8 +207,7 @@ </div> {{range .ClosedProjects}} <a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{svg .IconName 18 "gt-mr-3"}}{{.Title}} </a> {{end}} {{end}} @@ -220,8 +218,7 @@ <div class="selected"> {{if .Issue.ProjectID}} <a class="item muted sidebar-item-link" href="{{.Issue.Project.Link}}"> - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Issue.Project.Title}} + {{svg .Issue.Project.IconName 18 "gt-mr-3"}}{{.Issue.Project.Title}} </a> {{end}} </div> diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 6833b7d785..2350a3af54 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -40,7 +40,7 @@ <div class="milestone list"> {{range .Projects}} <li class="item"> - {{svg "octicon-project"}} <a href="{{.Link}}">{{.Title}}</a> + {{svg .IconName}} <a href="{{.Link}}">{{.Title}}</a> <div class="meta"> {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index ae9cb55d44..40ddb4dab0 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -88,7 +88,7 @@ {{end}} {{if .Project}} <a class="project" href="{{.Project.Link}}"> - {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 14 "gt-mr-2"}}{{else}}{{svg "octicon-project" 14 "gt-mr-2"}}{{end}}{{.Project.Title}} + {{svg .Project.IconName 14 "gt-mr-2"}}{{.Project.Title}} </a> {{end}} {{if .Ref}} |