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

(refs #327)Fix icon position for global recent activities feed

Browse Source
This commit is contained in:
takezoe
2014-04-18 07:11:49 +09:00
parent b60e2c07c7
commit 1382d59206
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/twirl/dashboard/tab.scala.html
View File

@@ -1,9 +1,13 @@
@(active: String = "")(implicit context: app.Context) @(active: String = "")(implicit context: app.Context)
@import context._ @import context._
@import view.helpers._
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li@if(active == ""){ class="active"}><a href="@path/">News Feed</a></li> <li@if(active == ""){ class="active"}><a href="@path/">News Feed</a></li>
@if(loginAccount.isDefined){ @if(loginAccount.isDefined){
<li@if(active == "pulls" ){ class="active"}><a href="@path/dashboard/pulls">Pull Requests</a></li> <li@if(active == "pulls" ){ class="active"}><a href="@path/dashboard/pulls">Pull Requests</a></li>
<li@if(active == "issues"){ class="active"}><a href="@path/dashboard/issues/repos">Issues</a></li> <li@if(active == "issues"){ class="active"}><a href="@path/dashboard/issues/repos">Issues</a></li>
} }
@if(active == ""){
<li class="pull-right"><a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a></li>
}
</ul> </ul>

3
src/main/twirl/helper/activities.scala.html
View File

@@ -5,9 +5,6 @@
@if(activities.isEmpty){ @if(activities.isEmpty){
No activity No activity
} else { } else {
<div style="text-align:right;">
<a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
</div>
@activities.map { activity => @activities.map { activity =>
<div class="block"> <div class="block">
@(activity.activityType match { @(activity.activityType match {