diff options
| author | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-17 12:04:18 +0800 |
|---|---|---|
| committer | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-17 12:04:18 +0800 |
| commit | 061a879cea39a1cce56dcb394b912fad50d7b77a (patch) | |
| tree | 26e8c3d25da1b9d785421a6a02b7564798b2e8c4 /templates | |
| parent | ed84adb679f3de70b2bffaead20a87711c38ee3a (diff) | |
| parent | 9f015b4c73806e65d3ca085b76723dc8cf41eb02 (diff) | |
| download | gitea-061a879cea39a1cce56dcb394b912fad50d7b77a.tar.gz gitea-061a879cea39a1cce56dcb394b912fad50d7b77a.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
conf/app.ini
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/repo/release/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/dashboard.tmpl | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 8d423d667c..aada89d11a 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.0.0913 Beta
\ No newline at end of file +0.5.2.0916 Beta
\ No newline at end of file diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 0f02508fb9..b9f462588d 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -29,7 +29,7 @@ <p class="info"> <span class="author"><img class="avatar" src="{{.Publisher.AvatarLink}}" alt="" width="20"> <a href="/user/{{.Publisher.Name}}">{{.Publisher.Name}}</a></span> - {{if .Created}}<span class="time">{{TimeSince .Created}}</span>{{end}} + {{if .Created}}<span class="time">{{TimeSince .Created $.Lang}}</span>{{end}} <span class="ahead"><strong>{{.NumCommitsBehind}}</strong> commits to {{.Target}} since this release</span> </p> <div class="markdown desc"> diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index bf0aba097b..2f9bbc4ed4 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -9,7 +9,7 @@ <div class="avatar left"> <img class="avatar-30" src="{{AvatarLink .GetActEmail}}" alt=""> </div> - <div class="content left {{if eq .GetOpType 5}}push-news{{end}}"> + <div class="content left {{if eq .GetOpType 5}}push-news{{end}} grid-4-5"> <p class="text-bold"> <a href="/{{.GetActUserName}}">{{.GetActUserName}}</a> {{if eq .GetOpType 1}} @@ -30,7 +30,7 @@ {{ $push := ActionContent2Commits .}} {{ $repoLink := .GetRepoLink}} {{range $push.Commits}} - <li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> {{.Message}}</li> + <li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> <span class="text-truncate grid-4-5">{{.Message}}</span></li> {{end}} </ul> </div> |