summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-19 22:05:44 +0800
committerFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-19 22:05:44 +0800
commit3634d1ee326fd285935c0a5992575583ef6467d4 (patch)
tree6c3b93148de0cb06e04bb1d18fa9b2c9b93698b3
parent42b85a969894e7dbd4273d678b478228155905e2 (diff)
parent8e1f339fd69806af1edafc152fab0009105d4220 (diff)
downloadgitea-3634d1ee326fd285935c0a5992575583ef6467d4.tar.gz
gitea-3634d1ee326fd285935c0a5992575583ef6467d4.zip
Merge branch 'master' of https://github.com/gogits/gogs
-rw-r--r--README.md2
-rw-r--r--models/repo.go1
-rw-r--r--templates/repo/nav.tmpl2
3 files changed, 3 insertions, 2 deletions
diff --git a/README.md b/README.md
index c0cd9cceb2..ce5fd5f6db 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ There are two ways to install Gogs:
## Acknowledgments
- Mail service is based on [WeTalk](https://github.com/beego/wetalk).
-- Logo inspired by [martini](https://github.com/martini-contrib).
+- Logo is inspired by [martini](https://github.com/martini-contrib).
## Contributors
diff --git a/models/repo.go b/models/repo.go
index 38ab3d4a9b..fce7d7f530 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -34,6 +34,7 @@ type Repository struct {
LowerName string `xorm:"unique(s) index not null"`
Name string `xorm:"index not null"`
Description string
+ Website string
Private bool
NumWatchs int
NumStars int
diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl
index b67f82d5e3..d261bbd6e9 100644
--- a/templates/repo/nav.tmpl
+++ b/templates/repo/nav.tmpl
@@ -3,7 +3,7 @@
<div class="row">
<div class="col-md-6">
<h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / {{.Repository.Name}}</h3>
- <p class="desc">a sentence to describe the repository.<a href="#">official-site</a></p>
+ <p class="desc">{{.Repository.Description}}{{if .Repository.Website}}<a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}</p>
</div>
{{if not .IsBareRepo}}
<div class="col-md-6 actions text-right">