Merge branch 'cubdesign-name-truncate'

This commit is contained in:
Naoki Takezoe
2016-01-16 14:18:12 +09:00
2 changed files with 20 additions and 17 deletions

View File

@@ -106,25 +106,25 @@
} }
</td> </td>
<td class="content-name"> <td class="content-name">
@if(file.isDirectory){ @if(file.isDirectory){
@if(file.linkUrl.isDefined){ @if(file.linkUrl.isDefined){
<a href="@file.linkUrl"> <a href="@file.linkUrl">
<span class="simplified-path">@file.name.split("/").toList.init match { <span class="simplified-path">@file.name.split("/").toList.init match {
case Nil => {} case Nil => {}
case list => {@list.mkString("", "/", "/")} case list => {@list.mkString("", "/", "/")}
}</span>@file.name.split("/").toList.last }</span>@file.name.split("/").toList.last
</a> </a>
} else {
<a href="@url(repository)/tree@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name">
<span class="simplified-path">@file.name.split("/").toList.init match {
case Nil => {}
case list => {@list.mkString("", "/", "/")}
}</span>@file.name.split("/").toList.last
</a>
}
} else { } else {
<a href="@url(repository)/tree@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name"> <a href="@url(repository)/blob@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
<span class="simplified-path">@file.name.split("/").toList.init match {
case Nil => {}
case list => {@list.mkString("", "/", "/")}
}</span>@file.name.split("/").toList.last
</a>
} }
} else {
<a href="@url(repository)/blob@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
}
</td> </td>
<td class="mute"> <td class="mute">
<a href="@url(repository)/commit/@file.commitId" class="commit-message shorten-text" title="@file.message">@link(file.message, repository)</a> <a href="@url(repository)/commit/@file.commitId" class="commit-message shorten-text" title="@file.message">@link(file.message, repository)</a>

View File

@@ -829,6 +829,9 @@ table.table-file-list .file-icon {
table.table-file-list .content-name { table.table-file-list .content-name {
max-width: 180px; max-width: 180px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
table.table-file-list .commit-message { table.table-file-list .commit-message {