mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-14 01:15:50 +01:00
(refs #488)Start to apply new issue UI to the issue list.
This commit is contained in:
@@ -19,6 +19,7 @@
|
|||||||
@html.menu("issues", repository){
|
@html.menu("issues", repository){
|
||||||
@tab("issues", false, repository)
|
@tab("issues", false, repository)
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
|
@*
|
||||||
<div class="span3">
|
<div class="span3">
|
||||||
<ul class="nav nav-pills nav-stacked">
|
<ul class="nav nav-pills nav-stacked">
|
||||||
<li@if(filter == "all"){ class="active"}>
|
<li@if(filter == "all"){ class="active"}>
|
||||||
@@ -131,6 +132,7 @@
|
|||||||
@_root_.issues.labels.html.edit(None, repository)
|
@_root_.issues.labels.html.edit(None, repository)
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
*@
|
||||||
@***** show issue list *****@
|
@***** show issue list *****@
|
||||||
@listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
|
@listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,7 +11,8 @@
|
|||||||
@import context._
|
@import context._
|
||||||
@import view.helpers._
|
@import view.helpers._
|
||||||
|
|
||||||
<div class="span9">
|
<div class="span12">
|
||||||
|
@*
|
||||||
@if(condition.labels.nonEmpty || condition.milestoneId.isDefined){
|
@if(condition.labels.nonEmpty || condition.milestoneId.isDefined){
|
||||||
<a href="@condition.copy(labels = Set.empty, milestoneId = None).toURL" id="clear-filter">
|
<a href="@condition.copy(labels = Set.empty, milestoneId = None).toURL" id="clear-filter">
|
||||||
<i class="icon-remove-circle"></i> Clear milestone and label filters
|
<i class="icon-remove-circle"></i> Clear milestone and label filters
|
||||||
@@ -72,7 +73,15 @@
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
}
|
}
|
||||||
|
*@
|
||||||
<table class="table table-bordered table-hover table-issues">
|
<table class="table table-bordered table-hover table-issues">
|
||||||
|
<tr>
|
||||||
|
<th style="padding-top: 10px; padding-bottom: 10px; background-color: #eee;">
|
||||||
|
<input type="checkbox"/>
|
||||||
|
<a class="button-link@if(condition.state == "open" ){ selected}" href="@condition.copy(state = "open" ).toURL">@openCount Open</a>
|
||||||
|
<a class="button-link@if(condition.state == "closed"){ selected}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
@if(issues.isEmpty){
|
@if(issues.isEmpty){
|
||||||
<tr>
|
<tr>
|
||||||
<td style="padding: 20px; background-color: #eee; text-align: center;">
|
<td style="padding: 20px; background-color: #eee; text-align: center;">
|
||||||
@@ -87,6 +96,7 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
} else {
|
} else {
|
||||||
|
@*
|
||||||
@if(hasWritePermission){
|
@if(hasWritePermission){
|
||||||
<tr>
|
<tr>
|
||||||
<td style="background-color: #eee;">
|
<td style="background-color: #eee;">
|
||||||
@@ -134,18 +144,19 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
|
*@
|
||||||
}
|
}
|
||||||
@issues.map { case (issue, labels, commentCount) =>
|
@issues.map { case (issue, labels, commentCount) =>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td style="padding-top: 15px; padding-bottom: 15px;">
|
||||||
@if(hasWritePermission){
|
@if(hasWritePermission){
|
||||||
<label class="checkbox" style="cursor: default;">
|
<label class="checkbox" style="cursor: default;">
|
||||||
<input type="checkbox" value="@issue.issueId"/>
|
<input type="checkbox" value="@issue.issueId"/>
|
||||||
}
|
}
|
||||||
@if(issue.isPullRequest){
|
@if(issue.isPullRequest){
|
||||||
<img src="@assets/common/images/pullreq-@(if(issue.closed) "closed" else "open").png"/>
|
<img src="@assets/common/images/pullreq-@(if(issue.closed) "closed" else "open").png" style="margin-right: 20px;"/>
|
||||||
} else {
|
} else {
|
||||||
<img src="@assets/common/images/issue-@(if(issue.closed) "closed" else "open").png"/>
|
<img src="@assets/common/images/issue-@(if(issue.closed) "closed" else "open").png" style="margin-right: 20px;"/>
|
||||||
}
|
}
|
||||||
@if(repository.isEmpty){
|
@if(repository.isEmpty){
|
||||||
<a href="@path/@issue.userName/@issue.repositoryName">@issue.repositoryName</a> ・
|
<a href="@path/@issue.userName/@issue.repositoryName">@issue.repositoryName</a> ・
|
||||||
@@ -162,13 +173,10 @@
|
|||||||
@issue.assignedUserName.map { userName =>
|
@issue.assignedUserName.map { userName =>
|
||||||
@avatar(userName, 20, tooltip = true)
|
@avatar(userName, 20, tooltip = true)
|
||||||
}
|
}
|
||||||
#@issue.issueId
|
<a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count"><i class="icon-comment"></i>@commentCount</a>
|
||||||
</span>
|
</span>
|
||||||
<div class="small muted" style="margin-left: 20px;">
|
<div class="small muted" style="margin-left: 40px; margin-top: 5px;">
|
||||||
Opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
|
#@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
|
||||||
@if(commentCount > 0){
|
|
||||||
<i class="icon-comment"></i><a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
@if(hasWritePermission){
|
@if(hasWritePermission){
|
||||||
</label>
|
</label>
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
@(active: String, create: Boolean, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
|
@(active: String, create: Boolean, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
|
||||||
@import context._
|
@import context._
|
||||||
@import view.helpers._
|
@import view.helpers._
|
||||||
<ul class="nav nav-tabs pull-left fill-width">
|
<ul class="nav nav-pills pull-left fill-width" style="margin-bottom: 0px;">
|
||||||
<li@if(active == "issues"){ class="active"}><a href="@url(repository)/issues">Browse Issues</a></li>
|
<li@if(active == "issues" ){ class="active"}><a href="@url(repository)/issues">Issues</a></li>
|
||||||
<li@if(active == "milestones"){ class="active"}><a href="@url(repository)/issues/milestones">Milestones</a></li>
|
<li@if(active == "pulls" ){ class="active"}><a href="@url(repository)/pulls">Pull requests</a></li>
|
||||||
|
<li@if(active == "labels" ){ class="active"}><a href="@url(repository)/labels">Labels</a></li>
|
||||||
|
<li@if(active == "milestones"){ class="active"}><a href="@url(repository)/milestones">Milestones</a></li>
|
||||||
@if(loginAccount.isDefined){
|
@if(loginAccount.isDefined){
|
||||||
<li class="pull-right">
|
<li class="pull-right">
|
||||||
<div class="btn-group">
|
<div class="btn-group">
|
||||||
|
|||||||
@@ -620,6 +620,16 @@ span.simplified-path {
|
|||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
/* Issues */
|
/* Issues */
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
a.button-link {
|
||||||
|
font-weight: normal;
|
||||||
|
color: gray;
|
||||||
|
}
|
||||||
|
|
||||||
|
a.selected {
|
||||||
|
font-weight: bold;
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
span.issue-status {
|
span.issue-status {
|
||||||
display: block;
|
display: block;
|
||||||
font-size: large;
|
font-size: large;
|
||||||
@@ -634,7 +644,7 @@ table.table-issues {
|
|||||||
a.issue-title {
|
a.issue-title {
|
||||||
color: #333;
|
color: #333;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
size: 110%;
|
font-size: 120%;
|
||||||
}
|
}
|
||||||
|
|
||||||
ul.label-list {
|
ul.label-list {
|
||||||
|
|||||||
Reference in New Issue
Block a user