diff --git a/src/main/twirl/gitbucket/core/dashboard/header.scala.html b/src/main/twirl/gitbucket/core/dashboard/header.scala.html index ea14458..bbf879e 100644 --- a/src/main/twirl/gitbucket/core/dashboard/header.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/header.scala.html @@ -6,11 +6,11 @@ @import gitbucket.core.view.helpers._ - + @openCount Open    - + @closedCount Closed diff --git a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html index 6729173..ed5bbf5 100644 --- a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html @@ -19,9 +19,9 @@ @if(issue.isPullRequest){ - + } else { - + } @issue.userName/@issue.repositoryName ･ @if(issue.isPullRequest){ @@ -38,18 +38,19 @@ } @if(commentCount > 0){ - @commentCount + @commentCount } else { - @commentCount + @commentCount }
#@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate) @milestone.map { milestone => - @milestone + +@milestone }
diff --git a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html index 6906048..4b6a159 100644 --- a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html @@ -4,16 +4,16 @@
- + News Feed @if(loginAccount.isDefined){ - + Pull Requests - + Issues } @@ -27,6 +27,8 @@ margin-bottom: 20px; } + + div.dashboard-nav a { line-height: 10px; margin-left: 20px; @@ -36,8 +38,17 @@ color: #888; } -div.dashboard-nav a:hover { + +div.dashboard-nav .octicon{ + width: 16px; + height: 16px; + font-size: 16px; + color: #888; +} + +div.dashboard-nav a:hover,div.dashboard-nav a:hover .octicon { text-decoration: none; + color: #333; } div.dashboard-nav a.active { diff --git a/src/main/twirl/gitbucket/core/helper/activities.scala.html b/src/main/twirl/gitbucket/core/helper/activities.scala.html index 18856c2..1b9fa2c 100644 --- a/src/main/twirl/gitbucket/core/helper/activities.scala.html +++ b/src/main/twirl/gitbucket/core/helper/activities.scala.html @@ -8,20 +8,20 @@ @activities.map { activity =>
@(activity.activityType match { - case "open_issue" => detailActivity(activity, "activity-issue.png") - case "comment_issue" => detailActivity(activity, "activity-comment.png") - case "comment_commit" => detailActivity(activity, "activity-comment.png") - case "close_issue" => detailActivity(activity, "activity-issue-close.png") - case "reopen_issue" => detailActivity(activity, "activity-issue-reopen.png") - case "open_pullreq" => detailActivity(activity, "activity-merge.png") - case "merge_pullreq" => detailActivity(activity, "activity-merge.png") - case "create_repository" => simpleActivity(activity, "activity-create-repository.png") - case "create_branch" => simpleActivity(activity, "activity-branch.png") - case "delete_branch" => simpleActivity(activity, "activity-delete.png") - case "create_tag" => simpleActivity(activity, "activity-tag.png") - case "delete_tag" => simpleActivity(activity, "activity-delete.png") - case "fork" => simpleActivity(activity, "activity-fork.png") - case "push" => customActivity(activity, "activity-commit.png"){ + case "open_issue" => detailActivity(activity, "issue-opened") + case "comment_issue" => detailActivity(activity, "comment-discussion") + case "comment_commit" => detailActivity(activity, "comment-discussion") + case "close_issue" => detailActivity(activity, "issue-closed") + case "reopen_issue" => detailActivity(activity, "issue-reopened") + case "open_pullreq" => detailActivity(activity, "git-pull-request") + case "merge_pullreq" => detailActivity(activity, "git-merge") + case "create_repository" => simpleActivity(activity, "repo") + case "create_branch" => simpleActivity(activity, "git-branch") + case "delete_branch" => simpleActivity(activity, "circle-slash") + case "create_tag" => simpleActivity(activity, "tag") + case "delete_tag" => simpleActivity(activity, "circle-slash") + case "fork" => simpleActivity(activity, "repo-forked") + case "push" => customActivity(activity, "commit"){
{activity.additionalInfo.get.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) => if(i == 3){ @@ -61,7 +61,7 @@ } @detailActivity(activity: gitbucket.core.model.Activity, image: String) = { -
+
@helper.html.datetimeago(activity.activityDate)
@@ -74,8 +74,9 @@
} + @customActivity(activity: gitbucket.core.model.Activity, image: String)(additionalInfo: Any) = { -
+
@helper.html.datetimeago(activity.activityDate)
@@ -87,7 +88,7 @@ } @simpleActivity(activity: gitbucket.core.model.Activity, image: String) = { -
+
@avatar(activity.activityUserName, 16) diff --git a/src/main/twirl/gitbucket/core/helper/checkicon.scala.html b/src/main/twirl/gitbucket/core/helper/checkicon.scala.html index b9726a7..32a0c5a 100644 --- a/src/main/twirl/gitbucket/core/helper/checkicon.scala.html +++ b/src/main/twirl/gitbucket/core/helper/checkicon.scala.html @@ -1,6 +1,6 @@ @(condition: => Boolean) @if(condition){ - + } else { - + } \ No newline at end of file diff --git a/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html b/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html index 88462a5..a3f9cbd 100644 --- a/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html +++ b/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html @@ -3,11 +3,11 @@ @import context._ @import gitbucket.core.view.helpers._ @if(repository.repository.isPrivate){ - + } else { @if(repository.repository.originUserName.isDefined){ - + } else { - + } } diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html index 3cc9027..85dbd1c 100644 --- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html +++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html @@ -17,8 +17,7 @@ @if(condition.nonEmpty){ @@ -31,11 +30,11 @@ } - + @openCount Open    - + @closedCount Closed
@@ -182,7 +181,7 @@ @if(hasWritePermission){ } - + @if(repository.isEmpty){ @issue.repositoryName ･ } @@ -200,18 +199,19 @@ } @if(commentCount > 0){ - @commentCount + @commentCount } else { - @commentCount + @commentCount }
#@issue.issueId opened @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username") @milestone.map { milestone => - @milestone + +@milestone }
diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html index 1026201..9d946ec 100644 --- a/src/main/twirl/gitbucket/core/main.scala.html +++ b/src/main/twirl/gitbucket/core/main.scala.html @@ -17,6 +17,7 @@ + @@ -58,16 +59,16 @@ } @if(loginAccount.isDefined){ @avatar(loginAccount.get.userName, 20) @loginAccount.get.userName - + - + @if(loginAccount.get.isAdmin){ - + } - + } else { Sign in } diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index 2c5f008..e37ba29 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -9,16 +9,11 @@ @import context._ @import gitbucket.core.view.helpers._ -@sidemenu(path: String, name: String, label: String, count: Int = 0) = { +@sidemenu(path: String, name: String, icon: String, label: String, count: Int = 0) = {
  • - @if(active == name){ - - } else { - - - } + @if(expand){ @label} @if(expand && count > 0){
    @count
    @@ -71,12 +66,12 @@
      • - @sidemenu("" , "code" , "Code") - @sidemenu("/issues", "issues", "Issues", repository.issueCount) - @sidemenu("/pulls" , "pulls" , "Pull Requests", repository.pullCount) - @sidemenu("/wiki" , "wiki" , "Wiki") + @sidemenu("" , "code" , "code" , "Code") + @sidemenu("/issues", "issues" , "issue-opened" , "Issues", repository.issueCount) + @sidemenu("/pulls" , "pulls" , "git-pull-request" , "Pull Requests", repository.pullCount) + @sidemenu("/wiki" , "wiki" , "book" , "Wiki") @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ - @sidemenu("/settings", "settings", "Settings") + @sidemenu("/settings" , "settings" , "tools", "Settings") }
    @@ -94,10 +89,10 @@ } @id.map { id =>     } } @@ -112,22 +107,19 @@ - - + @repository.commitCount commits - - + @repository.branchList.length branches - - + @repository.tags.length releases @@ -140,44 +132,21 @@