Simplify dashboard UI

src/main/twirl/gitbucket/core/dashboard/header.scala.html

@@ -4,17 +4,7 @@
   groups: List[String])(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-<span class="small">
-  <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">
+<div id="table-issues-control">
   @helper.html.dropdown("Visibility", flat = true){
     <li>
       <a href="@(condition.copy(visibility = (if(condition.visibility == Some("private")) None else Some("private"))).toURL)">

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

@@ -11,7 +11,7 @@
   <div class="body">
     @dashboard.html.tab("issues")
     <div class="container">
-      @issuesnavi(filter, "issues", condition)
+      @issuesnavi(filter, openCount, closedCount, condition)
       @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
     </div>
   </div>

src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html

@@ -21,11 +21,6 @@
     @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) =>
       <tr>
         <td style="padding-top: 12px; padding-bottom: 12px;">
-          @if(issue.isPullRequest){
-            <i class="octicon octicon-git-pull-request @(if(issue.closed) "closed" else "open")"></i>
-          } else {
-            <i class="octicon octicon-issue-@(if(issue.closed) "closed" else "opened")"></i>
-          }
           <a href="@path/@issue.userName/@issue.repositoryName">@issue.userName/@issue.repositoryName</a>&nbsp;&#xFF65;
           @if(issue.isPullRequest){
             <a href="@path/@issue.userName/@issue.repositoryName/pull/@issue.issueId" class="issue-title">@issue.title</a>
@@ -50,7 +45,7 @@
               </a>
             }
           </span>
-          <div class="small muted" style="margin-left: 20px; margin-top: 2px;">
+          <div class="small muted" style="margin-top: 2px;">
             #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
             @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/dashboard/issuesnavi.scala.html

@@ -1,9 +1,17 @@
 @(filter: String,
-  active: String,
+  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(condition.state == "open"){"active"})">
+    <a href="@condition.copy(state = "open").toURL">Open <span class="badge">@openCount</span></a>
+  </li>
+  <li class="@if(condition.state == "closed"){ selected}">
+    <a href="@condition.copy(state = "closed").toURL">Closed <span class="badge">@closedCount</span></a>
+  </li>
+  @*
   <li class="@if(filter == "created_by"){active}">
     <a href="@path/dashboard/@active/created_by@condition.copy(author = None, assigned = None).toURL">Created</a>
   </li>
@@ -13,8 +21,5 @@
   <li class="@if(filter == "mentioned"){active}">
     <a href="@path/dashboard/@active/mentioned@condition.copy(author = None, assigned = None).toURL">Mentioned</a>
   </li>
+  *@
 </ul>
-<form method="GET" id="search-filter-form" action="@path/dashboard/@active" class="pull-right">
-  <input type="text" id="search-filter-box" class="form-control" name="q" style="width: 400px;"
-         value="is:@{if(active == "issues") "issue" else "pr"} @condition.toFilterString"/>
-</form>

src/main/twirl/gitbucket/core/dashboard/pulls.scala.html

@@ -11,7 +11,7 @@
   <div class="body">
     @dashboard.html.tab("pulls")
     <div class="container">
-      @issuesnavi(filter, "pulls", condition)
+      @issuesnavi(filter, openCount, closedCount, condition)
       @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
     </div>
   </div>

src/main/twirl/gitbucket/core/helper/activities.scala.html

@@ -61,8 +61,10 @@
 }
 
 @detailActivity(activity: gitbucket.core.model.Activity, image: String) = {
+  @*
   <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
-  <div class="activity-content">
+  *@
+  <div>
     <div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
     <div class="strong">
       @avatar(activity.activityUserName, 16)
@@ -75,8 +77,10 @@
 }
 
 @customActivity(activity: gitbucket.core.model.Activity, image: String)(additionalInfo: Any) = {
+  @*
   <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
-  <div class="activity-content">
+  *@
+  <div>
     <div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
     <div class="strong">
       @avatar(activity.activityUserName, 16)
@@ -87,12 +91,14 @@
 }
 
 @simpleActivity(activity: gitbucket.core.model.Activity, image: String) = {
+  @*
   <div class="activity-icon-small"><i class="octicon octicon-@image"></i></div>
-  <div class="activity-content">
+  *@
+  <div>
+    <span class="muted small">@helper.html.datetimeago(activity.activityDate)</span>
     <div>
       @avatar(activity.activityUserName, 16)
       @activityMessage(activity.message)
-      <span class="muted small">@helper.html.datetimeago(activity.activityDate)</span>
     </div>
   </div>
 }

src/main/webapp/assets/common/css/gitbucket.css

@@ -517,6 +517,7 @@ div.repository-content {
 /****************************************************************************/
 /* Activity */
 /****************************************************************************/
+/*
 div.activity-icon-large {
   position: absolute;
   padding-top: 8px;
@@ -530,7 +531,7 @@ div.activity-icon-small {
 div.activity-content {
   margin-left: 40px;
 }
-
+*/
 div[class^="activity-icon"] i{
     color: #BBB;
 }