diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-17 01:14:10 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-17 01:14:10 -0400 |
| commit | 1043ab506e09a1e313ef98ebe8a3650e0b1133f7 (patch) | |
| tree | cc395835c66470d41e37ce5bfe073bcb40bda141 | |
| parent | 95cb7cb2add654da8b93be420014cad53ddbb1a4 (diff) | |
| parent | d64a8e8d3aa5f1dc606860c0950a8b7dbebf944c (diff) | |
| download | gitea-1043ab506e09a1e313ef98ebe8a3650e0b1133f7.tar.gz gitea-1043ab506e09a1e313ef98ebe8a3650e0b1133f7.zip | |
Merge branch 'master' of github.com:gogits/gogs
| -rw-r--r-- | modules/middleware/repo.go | 2 | ||||
| -rwxr-xr-x | public/css/gogs.css | 1 | ||||
| -rw-r--r-- | routers/repo/single.go | 2 | ||||
| -rw-r--r-- | templates/base/head.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/toolbar.tmpl | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 8cdc6df718..7a4157367e 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -24,7 +24,6 @@ func RepoAssignment(redirect bool) martini.Handler { // get repository owner ctx.Repo.IsOwner = ctx.IsSigned && ctx.User.LowerName == params["username"] - ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner if !ctx.Repo.IsOwner { user, err = models.GetUserByName(params["username"]) @@ -70,5 +69,6 @@ func RepoAssignment(redirect bool) martini.Handler { ctx.Data["Owner"] = user ctx.Data["Title"] = user.Name + "/" + repo.Name ctx.Data["RepositoryLink"] = ctx.Data["Title"] + ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner } } diff --git a/public/css/gogs.css b/public/css/gogs.css index 2c05d27ecb..f98cf7a184 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -10,6 +10,7 @@ body { html, body { height: 100%; + font-family: Helvetica, Arial, sans-serif; } /* override bs3 */ diff --git a/routers/repo/single.go b/routers/repo/single.go index ac733b0b38..b16a706be6 100644 --- a/routers/repo/single.go +++ b/routers/repo/single.go @@ -73,7 +73,6 @@ func Single(ctx *middleware.Context, params martini.Params) { ctx.Data["Paths"] = Paths ctx.Data["Treenames"] = treenames ctx.Data["IsRepoToolbarSource"] = true - ctx.Data["IsRepositoryOwner"] = strings.ToLower(params["username"]) == ctx.User.LowerName ctx.Data["Files"] = files ctx.Render.HTML(200, "repo/single", ctx.Data) } @@ -90,7 +89,6 @@ func Setting(ctx *middleware.Context, params martini.Params) { ctx.Data["Title"] = title + " - settings" ctx.Data["IsRepoToolbarSetting"] = true - ctx.Data["IsRepositoryOwner"] = strings.ToLower(params["username"]) == ctx.User.LowerName ctx.Render.HTML(200, "repo/setting", ctx.Data) } diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index da10097592..f02ea095ca 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -3,7 +3,9 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="shortcut icon" href="/img/favicon.png" /> - <meta name="author" content="Gogs - Go Git Service" /> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/> + <meta name="author" content="Gogs - Go Git Service" /> <meta name="description" content="Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language" /> <meta name="keywords" content="go, git"> diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl index 4a0b60adad..3729edaf5c 100644 --- a/templates/repo/toolbar.tmpl +++ b/templates/repo/toolbar.tmpl @@ -5,8 +5,9 @@ <ul class="nav navbar-nav"> <li class="{{if .IsRepoToolbarSource}}active{{end}}"><a href="/{{.RepositoryLink}}">Source</a></li> <li><a href="/{{.RepositoryLink}}/commits">Commits</a></li> - <li><a href="/{{.RepositoryLink}}/issues">Issues <!--<span class="badge">42</span>--></a></li> + <li><a href="/{{.RepositoryLink}}/branches">Branches</a></li> <li><a href="/{{.RepositoryLink}}/pulls">Pull Requests</a></li> + <li><a href="/{{.RepositoryLink}}/issues">Issues <!--<span class="badge">42</span>--></a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a> <ul class="dropdown-menu"> |