9934931f1f
1. The previous color contrast calculation function was incorrect at
least for the `#84b6eb` where it output low-contrast white instead of
black. I've rewritten these functions now to accept hex colors and to
match GitHub's calculation and to output pure white/black for maximum
contrast. Before and after:
<img width="94" alt="Screenshot 2024-04-02 at 01 53 46"
src="https://github.com/go-gitea/gitea/assets/115237/00b39e15-a377-4458-95cf-ceec74b78228"><img
width="90" alt="Screenshot 2024-04-02 at 01 51 30"
src="https://github.com/go-gitea/gitea/assets/115237/1677067a-8d8f-47eb-82c0-76330deeb775">
2. Fix project-related issues:
- Expose the new `ContrastColor` function as template helper and use it
for project cards, replacing the previous JS solution which eliminates a
flash of wrong color on page load.
- Fix a bug where if editing a project title, the counter would get
lost.
- Move `rgbToHex` function to color utils.
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Giteabot <teabot@gitea.io>
---
Conflict resolution: Trivial.
(cherry picked from commit 36887ed3921d03f1864360c95bd2ecf853bfbe72)
(cherry picked from commit f6c0c39f1a)
180 lines
7.4 KiB
Go HTML Template
180 lines
7.4 KiB
Go HTML Template
{{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
|
|
|
|
<div class="ui container tw-max-w-full">
|
|
<div class="tw-flex tw-justify-between tw-items-center tw-mb-4 tw-gap-3">
|
|
<h2 class="tw-mb-0 tw-flex-1 tw-break-anywhere">{{.Project.Title}}</h2>
|
|
{{if $canWriteProject}}
|
|
<div class="ui compact mini menu">
|
|
<a class="item" href="{{.Link}}/edit?redirect=project">
|
|
{{svg "octicon-pencil"}}
|
|
{{ctx.Locale.Tr "repo.issues.label_edit"}}
|
|
</a>
|
|
{{if .Project.IsClosed}}
|
|
<button class="item btn link-action" data-url="{{.Link}}/open">
|
|
{{svg "octicon-check"}}
|
|
{{ctx.Locale.Tr "repo.projects.open"}}
|
|
</button>
|
|
{{else}}
|
|
<button class="item btn link-action" data-url="{{.Link}}/close">
|
|
{{svg "octicon-skip"}}
|
|
{{ctx.Locale.Tr "repo.projects.close"}}
|
|
</button>
|
|
{{end}}
|
|
<button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
|
|
{{svg "octicon-trash"}}
|
|
{{ctx.Locale.Tr "repo.issues.label_delete"}}
|
|
</button>
|
|
<button class="item btn show-modal" data-modal="#new-project-column-item">
|
|
{{svg "octicon-plus"}}
|
|
{{ctx.Locale.Tr "new_project_column"}}
|
|
</button>
|
|
</div>
|
|
<div class="ui small modal new-project-column-modal" id="new-project-column-item">
|
|
<div class="header">
|
|
{{ctx.Locale.Tr "repo.projects.column.new"}}
|
|
</div>
|
|
<div class="content">
|
|
<form class="ui form">
|
|
<div class="required field">
|
|
<label for="new_project_column">{{ctx.Locale.Tr "repo.projects.column.new_title"}}</label>
|
|
<input class="new-project-column" id="new_project_column" name="title" required>
|
|
</div>
|
|
|
|
<div class="field color-field">
|
|
<label for="new_project_column_color_picker">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
|
|
<div class="color picker column">
|
|
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color_picker" name="color">
|
|
{{template "repo/issue/label_precolors"}}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="text right actions">
|
|
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
|
|
<button data-url="{{$.Link}}" class="ui primary button" id="new_project_column_submit">{{ctx.Locale.Tr "repo.projects.column.new_submit"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
|
|
<div class="content">{{$.Project.RenderedContent}}</div>
|
|
|
|
<div class="divider"></div>
|
|
</div>
|
|
|
|
<div id="project-board">
|
|
<div class="board {{if .CanWriteProjects}}sortable{{end}}">
|
|
{{range .Columns}}
|
|
<div class="ui segment project-column"{{if .Color}} style="background: {{.Color}} !important; color: {{ContrastColor .Color}} !important"{{end}} data-id="{{.ID}}" data-sorting="{{.Sorting}}" data-url="{{$.Link}}/{{.ID}}">
|
|
<div class="project-column-header{{if $canWriteProject}} tw-cursor-grab{{end}}">
|
|
<div class="ui large label project-column-title tw-py-1">
|
|
<div class="ui small circular grey label project-column-issue-count">
|
|
{{.NumIssues ctx}}
|
|
</div>
|
|
<span class="project-column-title-label">{{.Title}}</span>
|
|
</div>
|
|
{{if $canWriteProject}}
|
|
<div class="ui dropdown jump item">
|
|
<div class="tw-px-2">
|
|
{{svg "octicon-kebab-horizontal"}}
|
|
</div>
|
|
<div class="menu user-menu">
|
|
<a class="item show-modal button" data-modal="#edit-project-column-modal-{{.ID}}">
|
|
{{svg "octicon-pencil"}}
|
|
{{ctx.Locale.Tr "repo.projects.column.edit"}}
|
|
</a>
|
|
{{if not .Default}}
|
|
<a class="item show-modal button default-project-column-show"
|
|
data-modal="#default-project-column-modal-{{.ID}}"
|
|
data-modal-default-project-column-header="{{ctx.Locale.Tr "repo.projects.column.set_default"}}"
|
|
data-modal-default-project-column-content="{{ctx.Locale.Tr "repo.projects.column.set_default_desc"}}"
|
|
data-url="{{$.Link}}/{{.ID}}/default">
|
|
{{svg "octicon-pin"}}
|
|
{{ctx.Locale.Tr "repo.projects.column.set_default"}}
|
|
</a>
|
|
<a class="item show-modal button show-delete-project-column-modal"
|
|
data-modal="#delete-project-column-modal-{{.ID}}"
|
|
data-url="{{$.Link}}/{{.ID}}">
|
|
{{svg "octicon-trash"}}
|
|
{{ctx.Locale.Tr "repo.projects.column.delete"}}
|
|
</a>
|
|
{{end}}
|
|
|
|
<div class="ui small modal edit-project-column-modal" id="edit-project-column-modal-{{.ID}}">
|
|
<div class="header">
|
|
{{ctx.Locale.Tr "repo.projects.column.edit"}}
|
|
</div>
|
|
<div class="content">
|
|
<form class="ui form">
|
|
<div class="required field">
|
|
<label for="new_project_column_title">{{ctx.Locale.Tr "repo.projects.column.edit_title"}}</label>
|
|
<input class="project-column-title-input" id="new_project_column_title" name="title" value="{{.Title}}" required>
|
|
</div>
|
|
|
|
<div class="field color-field">
|
|
<label for="new_project_column_color">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
|
|
<div class="color picker column">
|
|
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color" name="color" value="{{.Color}}">
|
|
{{template "repo/issue/label_precolors"}}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="text right actions">
|
|
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
|
|
<button data-url="{{$.Link}}/{{.ID}}" class="ui primary button edit-project-column-button">{{ctx.Locale.Tr "repo.projects.column.edit"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui g-modal-confirm modal default-project-column-modal" id="default-project-column-modal-{{.ID}}">
|
|
<div class="header">
|
|
<span id="default-project-column-header"></span>
|
|
</div>
|
|
<div class="content">
|
|
<label id="default-project-column-content"></label>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
|
|
</div>
|
|
|
|
<div class="ui g-modal-confirm modal" id="delete-project-column-modal-{{.ID}}">
|
|
<div class="header">
|
|
{{ctx.Locale.Tr "repo.projects.column.delete"}}
|
|
</div>
|
|
<div class="content">
|
|
<label>
|
|
{{ctx.Locale.Tr "repo.projects.column.deletion_desc"}}
|
|
</label>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="divider"{{if .Color}} style="color: {{ContrastColor .Color}} !important"{{end}}></div>
|
|
<div class="ui cards" data-url="{{$.Link}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}">
|
|
{{range (index $.IssuesMap .ID)}}
|
|
<div class="issue-card gt-word-break {{if $canWriteProject}}tw-cursor-grab{{end}}" data-issue="{{.ID}}">
|
|
{{template "repo/issue/card" (dict "Issue" . "Page" $)}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
|
|
{{if .CanWriteProjects}}
|
|
<div class="ui g-modal-confirm delete modal">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{ctx.Locale.Tr "repo.projects.deletion"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{ctx.Locale.Tr "repo.projects.deletion_desc"}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
{{end}}
|