Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 22:45:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into asciidoctorj

Browse Source 
Conflicts:
	src/main/scala/app/RepositoryViewerController.scala
This commit is contained in:
Tobias Roeser
2014-03-29 13:53:23 +01:00
parent 10a40bfcaf 5317ac5e03
commit c9a1515d1f
73 changed files with 1694 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/twirl/repo/files.scala.html
View File

@@ -55,14 +55,22 @@
<tr>
<td width="16">
@if(file.isDirectory){
<img src="@assets/common/images/folder.png"/>
@if(file.linkUrl.isDefined){
<img src="@assets/common/images/folder_link.png"/>
} else {
<img src="@assets/common/images/folder.png"/>
}
} else {
<img src="@assets/common/images/file.png"/>
}
</td>
<td>
@if(file.isDirectory){
<a href="@url(repository)/tree@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
@if(file.linkUrl.isDefined){
<a href="@file.linkUrl">@file.name</a>
} else {
<a href="@url(repository)/tree@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
}
} else {
<a href="@url(repository)/blob@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
}