third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve dependency UI (#4503)

Browse Source
tokarchuk/v1.17
Lauris BH 6 years ago committed by Lunny Xiao
parent fa4663e61e
commit fab7937c62
5 changed files with 50 additions and 53 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      options/locale/locale_en-US.ini
  2. 2
      public/css/index.css
  3. 4
      public/less/_base.less
  4. 8
      public/less/_repository.less
  5. 88
      templates/repo/issue/view_content/sidebar.tmpl

1
options/locale/locale_en-US.ini
Unescape View File

@ -794,6 +794,7 @@ issues.dependency.pr_no_dependencies = This pull request currently doesn't have
issues.dependency.add = Add dependency... issues.dependency.add = Add dependency...
issues.dependency.cancel = Cancel issues.dependency.cancel = Cancel
issues.dependency.remove = Remove issues.dependency.remove = Remove
issues.dependency.remove_info = Remove this dependency
issues.dependency.added_dependency = `<a href="%[1]s">%[2]s</a> added a new dependency %[3]s` issues.dependency.added_dependency = `<a href="%[1]s">%[2]s</a> added a new dependency %[3]s`
issues.dependency.removed_dependency = `<a href="%[1]s">%[2]s</a> removed a dependency %[3]s` issues.dependency.removed_dependency = `<a href="%[1]s">%[2]s</a> removed a dependency %[3]s`
issues.dependency.issue_closing_blockedby = Closing this pull request is blocked by the following issues issues.dependency.issue_closing_blockedby = Closing this pull request is blocked by the following issues

2
public/css/index.css
View File

File diff suppressed because one or more lines are too long

4
public/less/_base.less
Unescape View File

@ -156,6 +156,10 @@ pre, code {
z-index: 10; z-index: 10;
} }
&.transparent.label {
background-color: transparent;
}
&.menu, &.menu,
&.vertical.menu, &.vertical.menu,
&.segment { &.segment {

8
public/less/_repository.less
Unescape View File

@ -743,6 +743,14 @@
margin-right: 5px; margin-right: 5px;
} }
} }
.ui.depending {
.item.is-closed {
.title {
text-decoration: line-through;
}
}
}
} }
.comment.form { .comment.form {
.ui.comments { .ui.comments {

88
templates/repo/issue/view_content/sidebar.tmpl
Unescape View File

@ -254,84 +254,68 @@
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="ui depending"> <div class="ui depending">
<span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span> {{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}}
<br> <span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span>
{{if .BlockedByDependencies}} <br>
<p>{{if .Issue.IsPull}}
{{.i18n.Tr "repo.issues.dependency.pr_no_dependencies"}}
{{else}}
{{.i18n.Tr "repo.issues.dependency.issue_no_dependencies"}}
{{end}}</p>
{{end}}
{{if .BlockingDependencies}}
<span class="text" data-tooltip="{{if .Issue.IsPull}} <span class="text" data-tooltip="{{if .Issue.IsPull}}
{{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}} {{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}}
{{else}} {{else}}
{{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}} {{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}}
{{end}}" data-inverted=""> {{end}}" data-inverted="">
{{.i18n.Tr "repo.issues.dependency.blocked_by_short"}}: <strong>{{.i18n.Tr "repo.issues.dependency.blocks_short"}}</strong>
</span> </span>
<div class="ui relaxed divided list"> <div class="ui relaxed divided list">
{{range .BlockedByDependencies}} {{range .BlockingDependencies}}
<div class="item"> <div class="item{{if .IsClosed}} is-closed{{end}}">
<div class="right floated content"> <div class="ui black label">#{{.Index}}</div>
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
<div class="ui transparent label right floated">
{{if $.CanCreateIssueDependencies}} {{if $.CanCreateIssueDependencies}}
<a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blockedBy');"> <a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blocking');"
data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
<i class="delete icon text red"></i> <i class="delete icon text red"></i>
</a> </a>
{{end}} {{end}}
{{if .IsClosed}}
<div class="ui red mini label">
<i class="octicon octicon-issue-closed"></i>
</div>
{{else}}
<div class="ui green mini label">
<i class="octicon octicon-issue-opened"></i>
</div>
{{end}}
</div> </div>
<div class="ui black label">#{{.Index}}</div>
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
</div> </div>
{{end}} {{end}}
</div> </div>
{{end}} {{end}}
{{if .BlockingDependencies}} {{if .BlockedByDependencies}}
<span class="text" data-tooltip="{{if .Issue.IsPull}} <span class="text" data-tooltip="{{if .Issue.IsPull}}
{{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}} {{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}}
{{else}} {{else}}
{{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}} {{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}}
{{end}}" data-inverted=""> {{end}}" data-inverted="">
{{.i18n.Tr "repo.issues.dependency.blocks_short"}}: <strong>{{.i18n.Tr "repo.issues.dependency.blocked_by_short"}}</strong>
</span> </span>
<div class="ui relaxed divided list"> <div class="ui relaxed divided list">
{{range .BlockingDependencies}} {{range .BlockedByDependencies}}
<div class="item"> <div class="item{{if .IsClosed}} is-closed{{end}}">
<div class="right floated content"> <div class="ui black label">#{{.Index}}</div>
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
<div class="ui transparent label right floated">
{{if $.CanCreateIssueDependencies}} {{if $.CanCreateIssueDependencies}}
<a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blocking');"> <a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blockedBy');"
data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
<i class="delete icon text red"></i> <i class="delete icon text red"></i>
</a> </a>
{{end}} {{end}}
{{if .IsClosed}}
<div class="ui red tiny label">
<i class="octicon octicon-issue-closed"></i>
</div>
{{else}}
<div class="ui green mini label">
<i class="octicon octicon-issue-opened"></i>
</div>
{{end}}
</div> </div>
<div class="ui black label">#{{.Index}}</div>
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
</div> </div>
{{end}} {{end}}
</div> </div>
{{end}} {{end}}
{{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}}
<p>{{if .Issue.IsPull}}
{{.i18n.Tr "repo.issues.dependency.pr_no_dependencies"}}
{{else}}
{{.i18n.Tr "repo.issues.dependency.issue_no_dependencies"}}
{{end}}</p>
{{end}}
{{if .CanCreateIssueDependencies}} {{if .CanCreateIssueDependencies}}
<div> <div>
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/add" id="addDependencyForm"> <form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/add" id="addDependencyForm">

Write Preview
Loading…
Cancel
Save