diff options
author | delvh <dev.lh@web.de> | 2023-05-31 08:50:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-31 08:50:18 +0200 |
commit | bf27fc35960afe4e949c4b7425139a9f5df12aad (patch) | |
tree | 570fe0432c8c8aba9dfd2d5769aaec82bee042a9 /templates/projects | |
parent | 3a6a6342eaa60751861d08cdc24dfd141d9ea7f5 (diff) | |
download | gitea-bf27fc35960afe4e949c4b7425139a9f5df12aad.tar.gz gitea-bf27fc35960afe4e949c4b7425139a9f5df12aad.zip |
Merge `new project` templates into one (#24985)
Additionally simplify the `new project` template slightly.
Review hint: Disable whitespace changes.
<details><summary>Before</summary>
## New repo project
![grafik](https://github.com/go-gitea/gitea/assets/51889757/4de977e8-3688-45cd-8832-49b001e6f249)
## Edit repo project
![grafik](https://github.com/go-gitea/gitea/assets/51889757/daaf353f-6c99-48bd-b37a-a3bc64459079)
## New user/org project
![grafik](https://github.com/go-gitea/gitea/assets/51889757/6a5a3be5-f51a-4599-b75c-7adb9710d2fa)
## Edit user/org project
![grafik](https://github.com/go-gitea/gitea/assets/51889757/a4768f49-cf46-4773-8a0f-54dfdcc1c1b8)
</details>
<details><summary>After</summary>
## New repo project
![grafik](https://github.com/go-gitea/gitea/assets/51889757/3d0ac8a0-850a-4743-963c-71c66ef38d07)
## Edit repo project
![grafik](https://github.com/go-gitea/gitea/assets/51889757/6b86a1cd-e360-4a9b-aaf7-af032d0d991a)
## New user/org project
![grafik](https://github.com/go-gitea/gitea/assets/51889757/a7b0964c-e4c7-4924-842a-52a58499bc36)
## Edit user/org project
![grafik](https://github.com/go-gitea/gitea/assets/51889757/0fbc5605-afee-49bd-a44a-8646f8c55681)
</details>
---------
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'templates/projects')
-rw-r--r-- | templates/projects/new.tmpl | 131 |
1 files changed, 57 insertions, 74 deletions
diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 60609999fc..6d1ae04159 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -1,87 +1,70 @@ -<div role="main" aria-label="{{.Title}}" class="page-content repository projects edit-project new milestone"> - <div class="ui container"> - <div class="navbar"> - {{if and .CanWriteProjects .PageIsEditProject}} - <div class="ui right floated secondary menu"> - <a class="ui small green button" href="{{$.HomeLink}}/-/projects/new">{{.locale.Tr "repo.milestones.new"}}</a> - </div> +<div class="ui container"> + <h2 class="ui dividing header"> + {{if .PageIsEditProjects}} + {{.locale.Tr "repo.projects.edit"}} + <div class="sub header">{{.locale.Tr "repo.projects.edit_subheader"}}</div> + {{else}} + {{.locale.Tr "repo.projects.new"}} + <div class="sub header">{{.locale.Tr "repo.projects.new_subheader"}}</div> {{end}} - </div> - <div class="ui divider"></div> - <h2 class="ui dividing header"> - {{if .PageIsEditProjects}} - {{.locale.Tr "repo.projects.edit"}} - <div class="sub header">{{.locale.Tr "repo.projects.edit_subheader"}}</div> - {{else}} - {{.locale.Tr "repo.projects.new"}} - <div class="sub header">{{.locale.Tr "repo.projects.new_subheader"}}</div> - {{end}} - </h2> - {{template "base/alert" .}} - <form class="ui form grid" action="{{.Link}}" method="post"> - {{.CsrfTokenHtml}} - <div class="eleven wide column"> - <input type="hidden" id="redirect" name="redirect" value="{{.redirect}}"> - <div class="field {{if .Err_Title}}error{{end}}"> - <label>{{.locale.Tr "repo.projects.title"}}</label> - <input name="title" placeholder="{{.locale.Tr "repo.projects.title"}}" value="{{.title}}" autofocus required> - </div> - <div class="field"> - <label>{{.locale.Tr "repo.projects.description"}}</label> - <textarea name="content" placeholder="{{.locale.Tr "repo.projects.description_placeholder"}}">{{.content}}</textarea> - </div> - - {{if not .PageIsEditProjects}} - <div class="field"> - <label>{{.locale.Tr "repo.projects.template.desc"}}</label> - <div class="ui selection dropdown"> - <input type="hidden" name="board_type" value="{{.type}}"> - <div class="default text">{{.locale.Tr "repo.projects.template.desc_helper"}}</div> - <div class="menu"> - {{range $element := .BoardTypes}} - <div class="item" data-id="{{$element.BoardType}}" data-value="{{$element.BoardType}}">{{$.locale.Tr $element.Translation}}</div> - {{end}} - </div> - </div> - </div> - {{end}} + </h2> + {{template "base/alert" .}} + <form class="ui form grid" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <div class="eleven wide column"> + <input type="hidden" id="redirect" name="redirect" value="{{.redirect}}"> + <div class="field {{if .Err_Title}}error{{end}}"> + <label>{{.locale.Tr "repo.projects.title"}}</label> + <input name="title" placeholder="{{.locale.Tr "repo.projects.title"}}" value="{{.title}}" autofocus required> + </div> + <div class="field"> + <label>{{.locale.Tr "repo.projects.description"}}</label> + <textarea name="content" placeholder="{{.locale.Tr "repo.projects.description_placeholder"}}">{{.content}}</textarea> + </div> + {{if not .PageIsEditProjects}} <div class="field"> - <label>{{.locale.Tr "repo.projects.card_type.desc"}}</label> + <label>{{.locale.Tr "repo.projects.template.desc"}}</label> <div class="ui selection dropdown"> - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - {{range $element := .CardTypes}} - {{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}} - <input type="hidden" name="card_type" value="{{$element.CardType}}"> - <div class="default text">{{$.locale.Tr $element.Translation}}</div> - {{end}} - {{end}} + <input type="hidden" name="board_type" value="{{.type}}"> + <div class="default text">{{.locale.Tr "repo.projects.template.desc_helper"}}</div> <div class="menu"> - {{range $element := .CardTypes}} - <div class="item" data-id="{{$element.CardType}}" data-value="{{$element.CardType}}">{{$.locale.Tr $element.Translation}}</div> + {{range $element := .BoardTypes}} + <div class="item" data-id="{{$element.BoardType}}" data-value="{{$element.BoardType}}">{{$.locale.Tr $element.Translation}}</div> {{end}} </div> </div> </div> - </div> - <div class="ui container"> - <div class="ui divider"></div> - <div class="ui left"> - {{if .PageIsEditProjects}} - <a class="ui cancel button" href="{{$.HomeLink}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}"> - {{.locale.Tr "repo.milestones.cancel"}} - </a> - <button class="ui primary button"> - {{.locale.Tr "repo.projects.modify"}} - </button> - {{else}} - <button class="ui primary button"> - {{.locale.Tr "repo.projects.create"}} - </button> + {{end}} + + <div class="field"> + <label>{{.locale.Tr "repo.projects.card_type.desc"}}</label> + <div class="ui selection dropdown"> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{range $element := .CardTypes}} + {{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}} + <input type="hidden" name="card_type" value="{{$element.CardType}}"> + <div class="default text">{{$.locale.Tr $element.Translation}}</div> + {{end}} {{end}} + <div class="menu"> + {{range $element := .CardTypes}} + <div class="item" data-id="{{$element.CardType}}" data-value="{{$element.CardType}}">{{$.locale.Tr $element.Translation}}</div> + {{end}} + </div> </div> </div> - - </form> - </div> + </div> + <div class="ui container"> + <div class="ui divider"></div> + <div class="ui left"> + <a class="ui cancel button" href="{{$.CancelLink}}"> + {{.locale.Tr "repo.milestones.cancel"}} + </a> + <button class="ui primary button"> + {{if .PageIsEditProjects}}{{.locale.Tr "repo.projects.modify"}}{{else}}{{.locale.Tr "repo.projects.create"}}{{end}} + </button> + </div> + </div> + </form> </div> |