Mirror fix

diff --git a/routers/dashboard.go b/routers/dashboard.go
index cab1662fc3a8b0b3c57f332bd44d9941012073fb..ddaef0cb56c071bd56c57837bf1523589ebf5385 100644 (file)
--- a/routers/dashboard.go
+++ b/routers/dashboard.go
@@ -17,3 +17,7 @@ func Home(ctx *middleware.Context) {
        ctx.Data["PageIsHome"] = true
        ctx.Render.HTML(200, "home", ctx.Data)
 }
+
+func Help(ctx *middleware.Context) string {
+       return "This is help page"
+}

diff --git a/routers/repo/single.go b/routers/repo/single.go
index a7f07898f018176f2f70159cca2dbbec0c4f9232..a0f444716c8d1bdf0cd5dcc34d10ffecb16a443b 100644 (file)
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -60,3 +60,15 @@ func Setting(ctx *middleware.Context) {
        ctx.Data["IsRepoToolbarSetting"] = true
        ctx.Render.HTML(200, "repo/setting", ctx.Data)
 }
+
+func Commits(ctx *middleware.Context) string {
+       return "This is commits page"
+}
+
+func Issues(ctx *middleware.Context) string {
+       return "This is issues page"
+}
+
+func Pulls(ctx *middleware.Context) string {
+       return "This is pulls page"
+}

diff --git a/routers/user/user.go b/routers/user/user.go
index 8d8691a39fbbc2fe8f5bbfba47b535da012668b1..e13f6909dddc9beb32b3dfa665683e62035812d7 100644 (file)
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -189,3 +189,15 @@ func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
        }
        ctx.Render.JSON(200, &feeds)
 }
+
+func Issues(ctx *middleware.Context) string {
+       return "This is issues page"
+}
+
+func Pulls(ctx *middleware.Context) string {
+       return "This is pulls page"
+}
+
+func Stars(ctx *middleware.Context) string {
+       return "This is stars page"
+}

diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl
index 3fe0c1147a518caa3b684bbb1db18d7ba9f7ee9a..181beb5a440e6722ac1c2e535f56cddf7558aded 100644 (file)
--- a/templates/base/navbar.tmpl
+++ b/templates/base/navbar.tmpl
@@ -3,8 +3,7 @@
         <nav class="gogs-nav">
             <a id="gogs-nav-logo" class="gogs-nav-item{{if .PageIsHome}} active{{end}}" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="gogs-logo"></a>
             <a class="gogs-nav-item{{if .PageIsUserDashboard}} active{{end}}" href="/">Dashboard</a>
-            <a class="gogs-nav-item" href="#">Explore</a>
-            <a class="gogs-nav-item" href="#">Help</a>{{if .IsSigned}}
+            <a class="gogs-nav-item" href="/help">Help</a>{{if .IsSigned}}
             <a id="gogs-nav-out" class="gogs-nav-item navbar-right navbar-btn btn btn-danger" href="/user/logout/"><i class="fa fa-power-off fa-lg"></i></a>
             <a id="gogs-nav-avatar" class="gogs-nav-item navbar-right" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
                 <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/>

diff --git a/templates/repo/setting.tmpl b/templates/repo/setting.tmpl
index 5e0a9f6cb969fed7e605fa98320f75341bd881d5..225e2294295d76c5957fd3385d99a855ed1c80c5 100644 (file)
--- a/templates/repo/setting.tmpl
+++ b/templates/repo/setting.tmpl
@@ -14,7 +14,7 @@
     </div>
     <div id="gogs-repo-setting-container" class="col-md-9 tab-content">
         <div id="options" class="tab-pane">
-            repo-options
+            <h4>Repository Options</h4>
         </div>
         <div id="delete" class="tab-pane">
             <h4>Delete Repository</h4>

diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl
index 5774c0051d52a7ce5c814e0807dceb21c97b54ab..8ea7e2bbf9f46b8ef0028ee333232d51b518582e 100644 (file)
--- a/templates/repo/single.tmpl
+++ b/templates/repo/single.tmpl
@@ -10,8 +10,8 @@
                 <a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-chain"></i>master&nbsp;&nbsp;
                     <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                    <li><a class="current" href="/{{.RepositoryLink}}/branch/master">master</a></li>
-                    <li><a href="//{{.RepositoryLink}}/branch/develop">develop</a></li>
+                    <li><a class="current" href="/{{.RepositoryLink}}/tree/master">master</a></li>
+                    <li><a href="/{{.RepositoryLink}}/tree/develop">develop</a></li>
                 </ul>
             </div>
             {{$paths := .Paths}}
@@ -47,7 +47,7 @@
                     {{if .IsDir}}
                     <a href="/{{$username}}/{{$reponame}}/tree/{{$branchname}}/{{.Path}}">{{.Name}}</a>
                     {{else}}
-                    <a href="#">{{.Name}} - {{FileSize .Size}}</a>
+                    <a href="/{{$username}}/{{$reponame}}/blob/{{$branchname}}/{{.Name}}">{{.Name}} - {{FileSize .Size}}</a>
                     {{end}}</td>
                        <td class="date"><time datetime="{{.Created}}" data-title="true" title="{{.Created}}">{{TimeSince .Created}}</time></td>
                        <td class="text">{{.Message}}</td>

diff --git a/web.go b/web.go
index b7138120a3fcb29ba7ab490a7d8b9393d4e3556c..16f39bdb0eb752c0d89f8672e693a3ca6f17964a 100644 (file)
--- a/web.go
+++ b/web.go
@@ -50,6 +50,9 @@ func runWeb(*cli.Context) {
 
        // Routers.
        m.Get("/", middleware.SignInRequire(false), routers.Home)
+       m.Get("/issues", middleware.SignInRequire(true), user.Issues)
+       m.Get("/pulls", middleware.SignInRequire(true), user.Pulls)
+       m.Get("/stars", middleware.SignInRequire(true), user.Stars)
        m.Any("/user/login", middleware.SignOutRequire(), binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
        m.Any("/user/logout", middleware.SignInRequire(true), user.SignOut)
        m.Any("/user/sign_up", middleware.SignOutRequire(), binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
@@ -67,7 +70,12 @@ func runWeb(*cli.Context) {
        m.Any("/repo/create", middleware.SignInRequire(true), binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
        m.Any("/repo/delete", middleware.SignInRequire(true), binding.Bind(auth.DeleteRepoForm{}), repo.Delete)
 
+       m.Get("/help", routers.Help)
+
        m.Get("/:username/:reponame/settings", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Setting)
+       m.Get("/:username/:reponame/commits", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Commits)
+       m.Get("/:username/:reponame/issues", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Issues)
+       m.Get("/:username/:reponame/pulls", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Pulls)
        m.Get("/:username/:reponame/tree/:branchname/**",
                middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Single)
        m.Get("/:username/:reponame/tree/:branchname",