Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-12 16:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sapk/gitbucket into sapk-master

Browse Source
This commit is contained in:
Naoki Takezoe
2015-07-18 22:18:02 +09:00
parent 124f331963 1ff68111b4
commit 861c619c19
91 changed files with 1089 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/twirl/gitbucket/core/helper/activities.scala.html
View File

@@ -8,20 +8,20 @@
@activities.map { activity =>
<div class="block">
@(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"){
<div class="small activity-message">
{activity.additionalInfo.get.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
if(i == 3){
@@ -37,12 +37,12 @@
}}
</div>
}
case "create_wiki" => customActivity(activity, "activity-wiki.png"){
case "create_wiki" => customActivity(activity, "book"){
<div class="small activity-message">
Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>.
</div>
}
case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
case "edit_wiki" => customActivity(activity, "book"){
activity.additionalInfo.get.split(":") match {
case Array(pageName, commitId) =>
<div class="small activity-message">
@@ -61,7 +61,7 @@
}
@detailActivity(activity: gitbucket.core.model.Activity, image: String) = {
<div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
<div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
<div class="activity-content">
<div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
<div class="strong">
@@ -75,7 +75,7 @@
}
@customActivity(activity: gitbucket.core.model.Activity, image: String)(additionalInfo: Any) = {
<div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
<div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
<div class="activity-content">
<div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
<div class="strong">
@@ -87,7 +87,7 @@
}
@simpleActivity(activity: gitbucket.core.model.Activity, image: String) = {
<div class="activity-icon-small"><img src="@assets/common/images/@image"/></div>
<div class="activity-icon-small"><i class="octicon octicon-@image"></i></div>
<div class="activity-content">
<div>
@avatar(activity.activityUserName, 16)

4
src/main/twirl/gitbucket/core/helper/checkicon.scala.html
View File

@@ -1,6 +1,6 @@
@(condition: => Boolean)
@if(condition){
<i class="icon-ok"></i>
<i class="octicon octicon-check active"></i>
} else {
<i class="icon-white"></i>
<i class="octicon"></i>
}

16
src/main/twirl/gitbucket/core/helper/diff.scala.html
View File

@@ -25,16 +25,16 @@
<span class="pull-right diffstat" data-diff-id="@i"></span>
<a href="#diff-@i">
@if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
<img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
<i class="octicon octicon-diff-renamed"></i> @diff.oldPath -> @diff.newPath
}
@if(diff.changeType == ChangeType.ADD){
<img src="@assets/common/images/diff_add.png"/> @diff.newPath
<i class="octicon octicon-diff-added"></i> @diff.newPath
}
@if(diff.changeType == ChangeType.MODIFY){
<img src="@assets/common/images/diff_edit.png"/> @diff.newPath
<i class="octicon octicon-diff-modified"></i> @diff.newPath
}
@if(diff.changeType == ChangeType.DELETE){
<img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
<i class="octicon octicon-diff-removed"></i> @diff.oldPath
}
</a>
</li>
@@ -55,7 +55,7 @@
</div>
}
<span class="diffstat">
<img src="@assets/common/images/diff_move.png"/>
<i class="octicon octicon-diff-renamed"></i>
</span> @diff.oldPath -> @diff.newPath
}
@if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
@@ -68,9 +68,9 @@
}
<span class="diffstat">
@if(diff.changeType == ChangeType.ADD){
<img src="@assets/common/images/diff_add.png"/>
<i class="octicon octicon-diff-added"></i>
}else{
<img src="@assets/common/images/diff_edit.png"/>
<i class="octicon octicon-diff-modified"></i>
}
</span>
@diff.newPath
@@ -83,7 +83,7 @@
</div>
}
<span class="diffstat">
<img src="@assets/common/images/diff_delete.png"/>
<i class="octicon octicon-diff-removed"></i>
</span> @diff.oldPath
}
</th>

6
src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html
View File

@@ -3,11 +3,11 @@
@import context._
@import gitbucket.core.view.helpers._
@if(repository.repository.isPrivate){
<img src="@assets/common/images/repo_private@{if(large){"_lg"}}.png"/>
<i class="@{if(large){"mega-"}}octicon octicon-lock"></i>
} else {
@if(repository.repository.originUserName.isDefined){
<img src="@assets/common/images/repo_fork@{if(large){"_lg"}}.png"/>
<i class="@{if(large){"mega-"}}octicon octicon-repo-forked"></i>
} else {
<img src="@assets/common/images/repo_public@{if(large){"_lg"}}.png"/>
<i class="@{if(large){"mega-"}}octicon octicon-repo"></i>
}
}