Separate labels and milestones from issues

src/main/twirl/gitbucket/core/issues/labels/list.scala.html

@@ -5,9 +5,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"Labels - ${repository.owner}/${repository.name}"){
-  @html.menu("issues", repository){
+  @html.menu("labels", repository){
-    @issues.html.navigation("labels", hasWritePermission, repository)
-    <br>
     <table class="table table-bordered table-hover table-issues" id="new-label-table" style="display: none;">
       <tr><td></td></tr>
     </table>

src/main/twirl/gitbucket/core/issues/list.scala.html

@@ -13,7 +13,7 @@
 @import gitbucket.core.view.helpers._
 @html.main((if(target == "issues") "Issues" else "Pull requests") + s" - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu(target, repository){
-    @navigation(target, true, repository, Some(condition))
+    @navigation(target, true, repository, openCount, closedCount, condition)
     @listparts(target, issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
     @if(hasWritePermission){
       <form id="batcheditForm" method="POST">

src/main/twirl/gitbucket/core/issues/listparts.scala.html

@@ -12,6 +12,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @import gitbucket.core.service.IssuesService.IssueInfo
+@*
 @if(condition.nonEmpty){
   <div style="width: 100%; display: inline-block;">
     <a href="@gitbucket.core.service.IssuesService.IssueSearchCondition().toURL" class="header-link">
@@ -20,22 +21,13 @@
     </a>
   </div>
 }
+*@
 <table class="table table-bordered table-hover table-issues">
   <thead>
     <tr>
       <th style="background-color: #eee;">
         <input type="checkbox"/>
-        <span class="small">
+        <span id="table-issues-control">
-          <a class="button-link@if(condition.state == "open"){ selected}" href="@condition.copy(state = "open").toURL">
-            <i class="octicon octicon-issue-opened @(if(condition.state == "open"){"active"})"></i>
-            @openCount Open
-          </a>&nbsp;&nbsp;
-          <a class="button-link@if(condition.state == "closed"){ selected}" href="@condition.copy(state = "closed").toURL">
-            <i class="octicon octicon-check @(if(condition.state == "closed"){"active"})"></i>
-            @closedCount Closed
-          </a>
-        </span>
-        <div class="pull-right" id="table-issues-control">
           @helper.html.dropdown("Author", flat = true) {
             @collaborators.map { collaborator =>
               <li>
@@ -113,9 +105,9 @@
               </a>
             </li>
           }
-        </div>
+        </span>
         @if(hasWritePermission){
-          <div class="pull-right" id="table-issues-batchedit">
+          <span id="table-issues-batchedit">
             @helper.html.dropdown("Mark as", flat = true) {
               <li><a href="javascript:void(0);" class="toggle-state" data-id="open">Open</a></li>
               <li><a href="javascript:void(0);" class="toggle-state" data-id="close">Close</a></li>
@@ -143,7 +135,7 @@
                 <li><a href="javascript:void(0);" class="toggle-assign" data-name="@collaborator"><i class="octicon"></i>@avatar(collaborator, 20) @collaborator</a></li>
               }
             }
-          </div>
+          </span>
         }
       </th>
     </tr>
@@ -157,9 +149,11 @@
           } else {
             No pull requests to show.
           }
+          @*
           @if(condition.labels.nonEmpty || condition.milestone.isDefined){
             <a href="@condition.copy(labels = Set.empty, milestone = None).toURL">Clear active filters.</a>
           } else {
+          *@
             @if(repository.isDefined){
               @if(target == "issues"){
                 <a href="@url(repository.get)/issues/new">Create a new issue.</a>
@@ -167,7 +161,9 @@
                 <a href="@url(repository.get)/compare">Create a new pull request.</a>
               }
             }
+          @*
           }
+          *@
         </td>
       </tr>
     }
@@ -177,7 +173,9 @@
           @if(hasWritePermission){
             <input type="checkbox" value="@issue.issueId"/>
           }
+          @*
           <i class="octicon octicon-issue-@(if(issue.closed) "closed" else "opened")" style="margin-right: 3px;"></i>
+          *@
           @if(repository.isEmpty){
             <a href="@path/@issue.userName/@issue.repositoryName">@issue.repositoryName</a>&nbsp;&#xFF65;
           }
@@ -204,7 +202,7 @@
               </a>
             }
           </span>
-          <div class="small muted" style="margin-left: 40px; margin-top: 2px;">
+          <div class="small muted" style="margin-left: 12px; margin-top: 2px;">
             #@issue.issueId opened  @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username")
             @milestone.map { milestone =>
               <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><i class="octicon octicon-milestone"></i> @milestone</a></span>

src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html

@@ -3,13 +3,10 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"Milestones - ${repository.owner}/${repository.name}"){
-  @html.menu("issues", repository){
+  @html.menu("milestones", repository){
     @if(milestone.isEmpty){
       <h4>New milestone</h4>
       <div class="muted">Create a new milestone to help organize your issues and pull requests.</div>
-    } else {
-      @issues.html.navigation("milestones", false, repository)
-      <br><br>
     }
     <hr style="margin-top: 12px; margin-bottom: 18px;" class="fill-width"/>
     <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true">

src/main/twirl/gitbucket/core/issues/milestones/list.scala.html

@@ -5,9 +5,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"Milestones - ${repository.owner}/${repository.name}"){
-  @html.menu("issues", repository){
+  @html.menu("milestones", repository){
-    @issues.html.navigation("milestones", hasWritePermission, repository)
-    <br>
     <table class="table table-bordered table-hover table-issues">
       <thead>
         <tr>

src/main/twirl/gitbucket/core/issues/navigation.scala.html

@@ -1,42 +1,21 @@
 @(active: String,
   newButton: Boolean,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
-  condition: Option[gitbucket.core.service.IssuesService.IssueSearchCondition] = None)(implicit context: gitbucket.core.controller.Context)
+  openCount: Int,
+  closedCount: Int,
+  condition: gitbucket.core.service.IssuesService.IssueSearchCondition)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
+
 <ul class="nav nav-pills pull-left" style="line-height: 14px; margin-bottom: 10px;">
-  <li class="@if(active == "issues"    ){active}"><a href="@url(repository)/issues">Issues</a></li>
+  <li class="@if(condition.state == "open"){active}">
-  <li class="@if(active == "pulls"     ){active}"><a href="@url(repository)/pulls">Pull requests</a></li>
+    <a href="@condition.copy(state = "open").toURL">Open <span class="badge">@openCount</span></a>
-  <li class="@if(active == "labels"    ){active}"><a href="@url(repository)/issues/labels">Labels</a></li>
+  </li>
-  <li class="@if(active == "milestones"){active}"><a href="@url(repository)/issues/milestones">Milestones</a></li>
+  <li class="@if(condition.state == "closed"){active}">
+    <a href="@condition.copy(state = "closed").toURL">Closed <span class="badge">@closedCount</span></a>
+  </li>
 </ul>
 <form method="GET" id="search-filter-form" class="form-inline pull-right">
-  @condition.map { condition =>
-    @if(loginAccount.isDefined){
-      <div class="form-group" style="width: 300px">
-        <div class="input-group" style="margin-bottom: 0px;">
-          <div class="input-group-btn">
-            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-              Filter
-              <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu">
-              <li><a href="?q=is:open">Open issues and pull requests</a></li>
-              <li><a href="?q=is:open+is:issue+author:@urlEncode(loginAccount.get.userName)">Your issues</a></li>
-              <li><a href="?q=is:open+is:pr+author:@urlEncode(loginAccount.get.userName)">Your pull requests</a></li>
-              <li><a href="?q=is:open+assignee:@urlEncode(loginAccount.get.userName)">Everything assigned to you</a></li>
-              @*
-              <li><a href="?q=is:open+mentions:@urlEncode(loginAccount.get.userName)">Everything mentioning you</a></li>
-              *@
-            </ul>
-          </div>
-          <input type="text" id="search-filter-box" class="form-control" size="40" name="q" value="is:@{if(active == "issues") "issue" else "pr"} @condition.toFilterString"/>
-        </div>
-      </div>
-    } else {
-      <input type="text" id="search-filter-box" class="form-control" size="40" name="q" value="is:@{if(active == "issues") "issue" else "pr"} @condition.toFilterString"/>
-    }
-  }
   @if(loginAccount.isDefined){
     @if(newButton){
       @if(active == "issues"){

src/main/twirl/gitbucket/core/menu.scala.html

@@ -55,10 +55,12 @@
       }
     </div>
     <ul class="nav nav-tabs">
-      @menuitem(""       , "code"   , "Code")
+      @menuitem(""                   ,"code"       ,"Code")
-      @menuitem("/issues", "issues" , "Issues", repository.issueCount)
+      @menuitem("/issues"            ,"issues"     ,"Issues", repository.issueCount)
-      @menuitem("/pulls" , "pulls"  , "Pull Requests", repository.pullCount)
+      @menuitem("/pulls"             ,"pulls"      ,"Pull Requests", repository.pullCount)
-      @menuitem("/wiki"  , "wiki"   , "Wiki")
+      @menuitem("/issues/labels"     ,"labels"     ,"Labels")
+      @menuitem("/issues/milestones" ,"milestones" ,"Milestones")
+      @menuitem("/wiki"              ,"wiki"       ,"Wiki")
       @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
         @menuitem("/settings" , "settings" , "Settings")
       }