Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-10-26 08:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump to Twirl 1.4.1 (#2320)

Browse Source
This commit is contained in:
Naoki Takezoe
2019-06-02 10:21:02 +09:00
committed by GitHub
parent 841e6d110c
commit 71248cd9b7
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/plugins.sbt
View File

@@ -1,7 +1,7 @@
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.15")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.4.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.3")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")

4
src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
View File

@@ -17,7 +17,7 @@
</tr>
</thead>
<tbody>
@issues.map { case IssueInfo(issue, labels, milestone, priority, commentCount, commitStatus) =>
@issues.map { case IssueInfo(issue, labels, milestone, priority, commentCount, commitStatus) => {
<tr>
<td style="padding-top: 12px; padding-bottom: 12px;">
<a href="@context.path/@issue.userName/@issue.repositoryName">@issue.userName/@issue.repositoryName</a>&nbsp;&#xFF65;
@@ -52,7 +52,7 @@
</div>
</td>
</tr>
}
}}
@if(issues.isEmpty){
<tr>
<td style="padding: 20px; background-color: #eee; text-align: center;">

4
src/main/twirl/gitbucket/core/issues/commentlist.scala.html
View File

@@ -114,9 +114,9 @@
@gitbucket.core.helper.html.datetimeago(comment.registeredDate)
</div>
<div style="discussion-item-content">
@defining(comment.content.split(":")){ case Array(issueId, rest @ _*) =>
@defining(comment.content.split(":")){ case Array(issueId, rest @ _*) => {
@helpers.issueLink(repository, issueId.toInt, rest.mkString(":"))
}
}}
</div>
</div>
}

12
src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
View File

@@ -56,9 +56,9 @@
</div>
<span id="label-priority">
@issue.flatMap(_.priorityId).orElse(defaultPriority.map(_.priorityId)).map { priorityId =>
@priorities.collect { case priority if(priority.priorityId == priorityId) =>
@priorities.collect { case priority if(priority.priorityId == priorityId) => {
<a class="issue-priority" style="background-color: #@priority.color; color: #@priority.fontColor;" href="@helpers.url(repository)/issues?priority=@helpers.urlEncode(priority.priorityName)&state=open"@if(!priority.description.isEmpty) { title="@priority.description.get" }>@priority.priorityName</a>
}
}}
}.getOrElse {
<span class="muted small">No priority</span>
}
@@ -102,16 +102,16 @@
</div>
<div id="milestone-progress-area">
@issue.flatMap(_.milestoneId).map { milestoneId =>
@milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) =>
@milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) => {
@gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
}
}}
}
</div>
<span id="label-milestone">
@issue.flatMap(_.milestoneId).map { milestoneId =>
@milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) =>
@milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) => {
<a class="strong small username" href="@helpers.url(repository)/issues?milestone=@helpers.urlEncode(milestone.title)&state=open">@milestone.title</a>
}
}}
}.getOrElse {
<span class="muted small">No milestone</span>
}

4
src/main/twirl/gitbucket/core/issues/listparts.scala.html
View File

@@ -206,7 +206,7 @@
</td>
</tr>
}
@issues.map { case IssueInfo(issue, labels, milestone, priority, commentCount, commitStatus) =>
@issues.map { case IssueInfo(issue, labels, milestone, priority, commentCount, commitStatus) => {
<tr>
<td style="padding-top: 12px; padding-bottom: 12px;">
@if(isManageable){
@@ -253,7 +253,7 @@
</div>
</td>
</tr>
}
}}
</tbody>
</table>
<div class="pull-right">