ui update, repo-assignment panic bug fix

author FuXiaoHei <fuxiaohei@hexiaz.com>

Mon, 17 Mar 2014 05:12:28 +0000 (13:12 +0800)

committer FuXiaoHei <fuxiaohei@hexiaz.com>

Mon, 17 Mar 2014 05:12:28 +0000 (13:12 +0800)
author FuXiaoHei <fuxiaohei@hexiaz.com>
Mon, 17 Mar 2014 05:12:28 +0000 (13:12 +0800)
committer FuXiaoHei <fuxiaohei@hexiaz.com>
Mon, 17 Mar 2014 05:12:28 +0000 (13:12 +0800)
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go

index 8cdc6df718d5ef04ab8f8e1faa2446eee10b7743..7a4157367eca848b1052f71be9b2f261c1252240 100644 (file)
--- 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 2c05d27ecb9daf4b8ac307d4d3d67914496bbe7b..f98cf7a184d6fd35723db6d8c9a39fdf94b185fd 100755 (executable)
--- 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 6bf03ca2b8a8ed714cbba435a6d4e0ab4210099f..3541dac9374088ed05cb784f1132a01e02d92977 100644 (file)
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -46,7 +46,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)
  }
@@ -63,7 +62,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 da1009759251d67f35e4d7fe1df345b903794c48..f02ea095cafd1498089f54b79c374e0dc0b33f38 100644 (file)
--- 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 4a0b60adadbf5a862360830ceda9ef24b9508f5d..3729edaf5ce8ff482ea925d73574b171dcaaa98c 100644 (file)
--- 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">
author	FuXiaoHei <fuxiaohei@hexiaz.com>
	Mon, 17 Mar 2014 05:12:28 +0000 (13:12 +0800)
committer	FuXiaoHei <fuxiaohei@hexiaz.com>
	Mon, 17 Mar 2014 05:12:28 +0000 (13:12 +0800)
modules/middleware/repo.go		patch \| blob \| history
public/css/gogs.css		patch \| blob \| history
routers/repo/single.go		patch \| blob \| history
templates/base/head.tmpl		patch \| blob \| history
templates/repo/toolbar.tmpl		patch \| blob \| history