Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor project templates #26448

Merged
merged 12 commits into from
Aug 12, 2023
Merged

Refactor project templates #26448

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a8b8a34
refactor projects templates
denyskon Aug 10, 2023
4ec430f
Merge remote-tracking branch 'upstream/main' into refactor/project-te…
denyskon Aug 10, 2023
759292f
formatting; apply suggested changes
denyskon Aug 11, 2023
9477d97
Merge branch 'main' into refactor/project-templates
denyskon Aug 11, 2023
f76b127
Update templates/projects/list.tmpl
denyskon Aug 11, 2023
c656092
remove empty hrefs
denyskon Aug 11, 2023
51fec80
fix indentation
denyskon Aug 11, 2023
08ebaad
convert menu items to divs
denyskon Aug 11, 2023
95e3368
apply delvh's patch
denyskon Aug 11, 2023
c3d2563
Merge branch 'main' into refactor/project-templates
denyskon Aug 11, 2023
d18dec5
fix style on user page
denyskon Aug 11, 2023
1e8c1bc
Merge branch 'main' into refactor/project-templates
GiteaBot Aug 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions templates/projects/view.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
{{ctx.Locale.Tr "repo.issues.label_edit"}}
</a>
{{if .Project.IsClosed}}
<a class="item link-action" data-url="{{.Link}}/open">
<div class="item link-action" data-url="{{.Link}}/open">
denyskon marked this conversation as resolved.
Show resolved Hide resolved
{{svg "octicon-check"}}
{{ctx.Locale.Tr "repo.projects.open"}}
</a>
</div>
{{else}}
<a class="item link-action" data-url="{{.Link}}/close">
<div class="item link-action" data-url="{{.Link}}/close">
{{svg "octicon-skip"}}
{{ctx.Locale.Tr "repo.projects.close"}}
</a>
</div>
{{end}}
<a class="item delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
<div class="item delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
{{svg "octicon-trash"}}
{{ctx.Locale.Tr "repo.issues.label_delete"}}
</a>
<a class="item show-modal" data-modal="#new-project-column-item">
</div>
<div class="item show-modal" data-modal="#new-project-column-item">
{{svg "octicon-plus"}}
{{ctx.Locale.Tr "new_project_column"}}
</a>
</div>
</div>
<div class="ui small modal new-project-column-modal" id="new-project-column-item">
<div class="header">
Expand Down Expand Up @@ -80,35 +80,35 @@
{{svg "octicon-kebab-horizontal"}}
</div>
<div class="menu user-menu" tabindex="-1">
<a class="item show-modal button" data-modal="#edit-project-column-modal-{{.ID}}">
<div class="item show-modal button" data-modal="#edit-project-column-modal-{{.ID}}">
denyskon marked this conversation as resolved.
Show resolved Hide resolved
{{svg "octicon-pencil"}}
{{ctx.Locale.Tr "repo.projects.column.edit"}}
</a>
</div>
{{if not .Default}}
<a class="item show-modal button default-project-column-show"
<div 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>
</div>
{{else}}
<a class="item show-modal button default-project-column-show"
<div 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.unset_default"}}"
data-modal-default-project-column-content="{{ctx.Locale.Tr "repo.projects.column.unset_default_desc"}}"
data-url="{{$.Link}}/{{.ID}}/unsetdefault">
{{svg "octicon-pin-slash"}}
{{ctx.Locale.Tr "repo.projects.column.unset_default"}}
</a>
</div>
{{end}}
<a class="item show-modal button show-delete-project-column-modal"
<div 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>
</div>

<div class="ui small modal edit-project-column-modal" id="edit-project-column-modal-{{.ID}}">
<div class="header">
Expand Down