Mirror fix

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

diff --git a/routers/repo/single.go b/routers/repo/single.go
index 0cc41b1c8faaec4951fbda730a36fb80e2d7b8ec..d64248d990759034a6d059c8973ef436ceb5a260 100644 (file)
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -182,10 +182,12 @@ func Commits(ctx *middleware.Context, params martini.Params) {
        ctx.Render.HTML(200, "repo/commits", ctx.Data)
 }
 
-func Issues(ctx *middleware.Context) string {
-       return "This is issues page"
+func Issues(ctx *middleware.Context) {
+       ctx.Data["IsRepoToolbarIssues"] = true
+       ctx.Render.HTML(200, "repo/issues", ctx.Data)
 }
 
-func Pulls(ctx *middleware.Context) string {
-       return "This is pulls page"
+func Pulls(ctx *middleware.Context) {
+       ctx.Data["IsRepoToolbarPulls"] = true
+       ctx.Render.HTML(200, "repo/pulls", ctx.Data)
 }

diff --git a/routers/user/setting.go b/routers/user/setting.go
index ea42f70cfaa1f6aa749c31b1ce3a42cbf554e50c..3f60c6c6fb3a880b56fd1d2d337ca44344b09c78 100644 (file)
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -14,10 +14,11 @@ import (
        "github.com/gogits/gogs/modules/middleware"
 )
 
-// render user setting page (email, website modify)
+// Render user setting page (email, website modify)
 func Setting(ctx *middleware.Context, form auth.UpdateProfileForm) {
        ctx.Data["Title"] = "Setting"
-       ctx.Data["PageIsUserSetting"] = true
+       ctx.Data["PageIsUserSetting"] = true // For navbar arrow.
+       ctx.Data["IsUserPageSetting"] = true // For setting nav highlight.
 
        user := ctx.User
        ctx.Data["Owner"] = user
@@ -50,6 +51,7 @@ func Setting(ctx *middleware.Context, form auth.UpdateProfileForm) {
 func SettingPassword(ctx *middleware.Context, form auth.UpdatePasswdForm) {
        ctx.Data["Title"] = "Password"
        ctx.Data["PageIsUserSetting"] = true
+       ctx.Data["IsUserPageSettingPasswd"] = true
 
        if ctx.Req.Method == "GET" {
                ctx.Render.HTML(200, "user/password", ctx.Data)
@@ -149,20 +151,23 @@ func SettingSSHKeys(ctx *middleware.Context, form auth.AddSSHKeyForm) {
        }
 
        ctx.Data["PageIsUserSetting"] = true
+       ctx.Data["IsUserPageSettingSSH"] = true
        ctx.Data["Keys"] = keys
        ctx.Render.HTML(200, "user/publickey", ctx.Data)
 }
 
 func SettingNotification(ctx *middleware.Context) {
-       // todo user setting notification
+       // TODO: user setting notification
        ctx.Data["Title"] = "Notification"
        ctx.Data["PageIsUserSetting"] = true
+       ctx.Data["IsUserPageSettingNotify"] = true
        ctx.Render.HTML(200, "user/notification", ctx.Data)
 }
 
 func SettingSecurity(ctx *middleware.Context) {
-       // todo user setting security
+       // TODO: user setting security
        ctx.Data["Title"] = "Security"
        ctx.Data["PageIsUserSetting"] = true
+       ctx.Data["IsUserPageSettingSecurity"] = true
        ctx.Render.HTML(200, "user/security", ctx.Data)
 }

diff --git a/routers/user/user.go b/routers/user/user.go
index c43cf84a24962474070944176e30d1322481a18e..f8c9b4d3dddedc8d5563229e13494212ea0d3fd6 100644 (file)
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -151,6 +151,8 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
 
 func Delete(ctx *middleware.Context) {
        ctx.Data["Title"] = "Delete Account"
+       ctx.Data["PageIsUserSetting"] = true
+       ctx.Data["IsUserPageSettingDelete"] = true
 
        if ctx.Req.Method == "GET" {
                ctx.Render.HTML(200, "user/delete", ctx.Data)
@@ -182,7 +184,7 @@ func Delete(ctx *middleware.Context) {
 }
 
 const (
-       feedTpl = `<i class="icon fa fa-%s"></i>
+       TPL_FEED = `<i class="icon fa fa-%s"></i>
                         <div class="info"><span class="meta">%s</span><br>%s</div>`
 )
 
@@ -194,20 +196,20 @@ func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
 
        feeds := make([]string, len(actions))
        for i := range actions {
-               feeds[i] = fmt.Sprintf(feedTpl, base.ActionIcon(actions[i].OpType),
+               feeds[i] = fmt.Sprintf(TPL_FEED, base.ActionIcon(actions[i].OpType),
                        base.TimeSince(actions[i].Created), base.ActionDesc(actions[i], ctx.User.AvatarLink()))
        }
        ctx.Render.JSON(200, &feeds)
 }
 
-func Issues(ctx *middleware.Context) string {
-       return "This is issues page"
+func Issues(ctx *middleware.Context) {
+       ctx.Render.HTML(200, "user/issues", ctx.Data)
 }
 
-func Pulls(ctx *middleware.Context) string {
-       return "This is pulls page"
+func Pulls(ctx *middleware.Context) {
+       ctx.Render.HTML(200, "user/pulls", ctx.Data)
 }
 
-func Stars(ctx *middleware.Context) string {
-       return "This is stars page"
+func Stars(ctx *middleware.Context) {
+       ctx.Render.HTML(200, "user/stars", ctx.Data)
 }

diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl
index 181beb5a440e6722ac1c2e535f56cddf7558aded..4902ce2593cec23b0e7f7be3885fe018140398f7 100644 (file)
--- a/templates/base/navbar.tmpl
+++ b/templates/base/navbar.tmpl
@@ -3,7 +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="/help">Help</a>{{if .IsSigned}}
+            <a class="gogs-nav-item{{if .PageIsHelp}} active{{end}}" 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/help.tmpl b/templates/help.tmpl
new file mode 100644 (file)
index 0000000..b4d5d2a
--- /dev/null
+++ b/templates/help.tmpl
@@ -0,0 +1,11 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="gogs-body-nav">
+    <div class="container">
+        <h3>Help</h3>
+    </div>
+</div>
+<div id="gogs-body" class="container" data-page="user">
+    {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
+</div>
+{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/home.tmpl b/templates/home.tmpl
index 8cbb29ebb4168276384a8b166269c8606b541ff0..e0776243230debd602d35c1ae7781434cfcc6d7c 100644 (file)
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div id="gogs-body" class="container">
-       Website is still in the progress of building...please come back later!
+       Welcome to the land of Gogs! There will be some indroduction!
 </div>
 {{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/repo/issues.tmpl b/templates/repo/issues.tmpl
new file mode 100644 (file)
index 0000000..daacc08
--- /dev/null
+++ b/templates/repo/issues.tmpl
@@ -0,0 +1,9 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+{{template "repo/nav" .}}
+{{template "repo/toolbar" .}}
+<div id="gogs-body" class="container">
+    <div id="gogs-source">
+    </div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/repo/pulls.tmpl b/templates/repo/pulls.tmpl
new file mode 100644 (file)
index 0000000..daacc08
--- /dev/null
+++ b/templates/repo/pulls.tmpl
@@ -0,0 +1,9 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+{{template "repo/nav" .}}
+{{template "repo/toolbar" .}}
+<div id="gogs-body" class="container">
+    <div id="gogs-source">
+    </div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/user/issues.tmpl b/templates/user/issues.tmpl
new file mode 100644 (file)
index 0000000..94f6689
--- /dev/null
+++ b/templates/user/issues.tmpl
@@ -0,0 +1,17 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="gogs-body-nav">
+    <div class="container">
+        <ul class="nav nav-pills pull-right">
+            <li><a href="/">Feed</a></li>
+            <li class="active"><a href="/issues">Issues</a></li>
+            <li><a href="/pulls">Pull Requests</a></li>
+            <li><a href="/stars">Stars</a></li>
+        </ul>
+        <h3>Issues</h3>
+    </div>
+</div>
+<div id="gogs-body" class="container" data-page="user">
+    {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
+</div>
+{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/user/notification.tmpl b/templates/user/notification.tmpl
index ecb3fa856c2928e1e342ced8a24db3d8fe66c49c..7911c0fd5fd571ee76ffb73b9c9ea2b429959e57 100644 (file)
--- a/templates/user/notification.tmpl
+++ b/templates/user/notification.tmpl
@@ -1,17 +1,7 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div id="gogs-body" class="container" data-page="user">
-    <div id="gogs-user-setting-nav" class="col-md-3">
-        <h4>Account Setting</h4>
-        <ul class="list-group">
-            <li class="list-group-item"><a href="/user/setting">Account Profile</a></li>
-            <li class="list-group-item"><a href="/user/setting/password">Password</a></li>
-            <li class="list-group-item list-group-item-success"><a href="/user/setting/notification">Notifications</a></li>
-            <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
-            <li class="list-group-item"><a href="/user/setting/security">Security</a></li>
-            <li class="list-group-item"><a href="/user/delete">Delete Account</a></li>
-        </ul>
-    </div>
+    {{template "user/setting_nav" .}}
     <div id="gogs-user-setting-container" class="col-md-9">
         <h4>Notification</h4>
     </div>

diff --git a/templates/user/password.tmpl b/templates/user/password.tmpl
index 532a57cb0fd0b7744c2b638648265cc0d20cc724..2ee178a3fc7c6e498e4abe51775feb3bc80a448d 100644 (file)
--- a/templates/user/password.tmpl
+++ b/templates/user/password.tmpl
@@ -1,45 +1,35 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div id="gogs-body" class="container" data-page="user">
-    <div id="gogs-user-setting-nav" class="col-md-3">
-        <h4>Account Setting</h4>
-        <ul class="list-group">
-            <li class="list-group-item"><a href="/user/setting">Account Profile</a></li>
-            <li class="list-group-item list-group-item-success"><a href="/user/setting/password">Password</a></li>
-            <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li>
-            <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
-            <li class="list-group-item"><a href="/user/setting/security">Security</a></li>
-            <li class="list-group-item"><a href="/user/delete">Delete Account</a></li>
-        </ul>
-    </div>
+    {{template "user/setting_nav" .}}
     <div id="gogs-user-setting-container" class="col-md-9">
         <div id="gogs-setting-pwd">
             <h4>Password</h4>
             <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting/password">{{if .IsSuccess}}
                 <p class="alert alert-success">Password is changed successfully. You can now sign in via new password.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
                 <div class="form-group">
-                    <label class="col-md-2 control-label">Old Password<strong class="text-danger">*</strong></label>
-                    <div class="col-md-8">
+                    <label class="col-md-3 control-label">Old Password<strong class="text-danger">*</strong></label>
+                    <div class="col-md-7">
                         <input type="password" name="oldpasswd" class="form-control" placeholder="Type your current password" required="required">
                     </div>
                 </div>
 
                 <div class="form-group">
-                    <label class="col-md-2 control-label">New Password<strong class="text-danger">*</strong></label>
-                    <div class="col-md-8">
+                    <label class="col-md-3 control-label">New Password<strong class="text-danger">*</strong></label>
+                    <div class="col-md-7">
                         <input type="password" name="newpasswd" class="form-control" placeholder="Type your new password" required="required">
                     </div>
                 </div>
 
                 <div class="form-group">
-                    <label class="col-md-2 control-label">Re-Type<strong class="text-danger">*</strong></label>
-                    <div class="col-md-8">
+                    <label class="col-md-3 control-label">Re-Type<strong class="text-danger">*</strong></label>
+                    <div class="col-md-7">
                         <input type="password" name="retypepasswd" class="form-control" placeholder="Re-type your new password" required="required">
                     </div>
                 </div>
 
                 <div class="form-group">
-                    <div class="col-md-offset-2 col-md-8">
+                    <div class="col-md-offset-3 col-md-7">
                         <button type="submit" class="btn btn-primary">Change Password</button>&nbsp;&nbsp;
                         <a href="/forget-password/">Forgot your password?</a>
                     </div>

diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl
index ef5879b54dc62b9045c49a651f397c2a91a8645f..72467659bef06eebdc4811639fecb3b788f271d2 100644 (file)
--- a/templates/user/publickey.tmpl
+++ b/templates/user/publickey.tmpl
@@ -1,18 +1,7 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div id="gogs-body" class="container" data-page="user">
-    <div id="gogs-user-setting-nav" class="col-md-3">
-        <h4>Account Setting</h4>
-        <ul class="list-group">
-            <li class="list-group-item"><a href="/user/setting">Account Profile</a></li>
-            <li class="list-group-item"><a href="/user/setting/password">Password</a></li>
-            <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li>
-            <li class="list-group-item list-group-item-success"><a href="/user/setting/ssh/">SSH Keys</a></li>
-            <li class="list-group-item"><a href="/user/setting/security">Security</a></li>
-            <li class="list-group-item"><a href="/user/delete">Delete Account</a></li>
-        </ul>
-    </div>
-
+    {{template "user/setting_nav" .}}
     <div id="gogs-user-setting-container" class="col-md-9">
         <div id="gogs-ssh-keys">
             <h4>SSH Keys</h4>{{if .AddSSHKeySuccess}}

diff --git a/templates/user/pulls.tmpl b/templates/user/pulls.tmpl
new file mode 100644 (file)
index 0000000..0891f5e
--- /dev/null
+++ b/templates/user/pulls.tmpl
@@ -0,0 +1,17 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="gogs-body-nav">
+    <div class="container">
+        <ul class="nav nav-pills pull-right">
+            <li><a href="/">Feed</a></li>
+            <li><a href="/issues">Issues</a></li>
+            <li class="active"><a href="/pulls">Pull Requests</a></li>
+            <li><a href="/stars">Stars</a></li>
+        </ul>
+        <h3>Pull Requests</h3>
+    </div>
+</div>
+<div id="gogs-body" class="container" data-page="user">
+    {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
+</div>
+{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/user/security.tmpl b/templates/user/security.tmpl
index cf51127d2cba917f2a15df6593958ce3e9753ffd..a7506b50864b9b1708e9a6d75050bfb16e691c9e 100644 (file)
--- a/templates/user/security.tmpl
+++ b/templates/user/security.tmpl
@@ -1,17 +1,7 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div id="gogs-body" class="container" data-page="user">
-    <div id="gogs-user-setting-nav" class="col-md-3">
-        <h4>Account Setting</h4>
-        <ul class="list-group">
-            <li class="list-group-item"><a href="/user/setting">Account Profile</a></li>
-            <li class="list-group-item"><a href="/user/setting/password">Password</a></li>
-            <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li>
-            <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
-            <li class="list-group-item list-group-item-success"><a href="/user/setting/security">Security</a></li>
-            <li class="list-group-item"><a href="/user/delete">Delete Account</a></li>
-        </ul>
-    </div>
+    {{template "user/setting_nav" .}}
     <div id="gogs-user-setting-container" class="col-md-9">
         <h4>Security</h4>
     </div>

diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index d6a6094f3f4f3b14836ea6b1f985655b560cfe44..c38054f39bbf270030c6a90eea291a3aca9c7d9c 100644 (file)
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -1,17 +1,7 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div id="gogs-body" class="container" data-page="user">
-    <div id="gogs-user-setting-nav" class="col-md-3">
-        <h4>Account Setting</h4>
-        <ul class="list-group">
-            <li class="list-group-item list-group-item-success"><a href="/user/setting">Account Profile</a></li>
-            <li class="list-group-item"><a href="/user/setting/password">Password</a></li>
-            <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li>
-            <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
-            <li class="list-group-item"><a href="/user/setting/security">Security</a></li>
-            <li class="list-group-item"><a href="/user/delete">Delete Account</a></li>
-        </ul>
-    </div>
+    {{template "user/setting_nav" .}}
     <div id="gogs-user-setting-container" class="col-md-9">
         <div id="gogs-setting-pwd">
             <h4>Account Profile</h4>

diff --git a/templates/user/setting_nav.tmpl b/templates/user/setting_nav.tmpl
new file mode 100644 (file)
index 0000000..3a500fd
--- /dev/null
+++ b/templates/user/setting_nav.tmpl
@@ -0,0 +1,11 @@
+<div id="gogs-user-setting-nav" class="col-md-3">
+    <h4>Account Setting</h4>
+    <ul class="list-group">
+        <li class="list-group-item{{if .IsUserPageSetting}} list-group-item-success{{end}}"><a href="/user/setting">Account Profile</a></li>
+        <li class="list-group-item{{if .IsUserPageSettingPasswd}} list-group-item-success{{end}}"><a href="/user/setting/password">Password</a></li>
+        <li class="list-group-item{{if .IsUserPageSettingNotify}} list-group-item-success{{end}}"><a href="/user/setting/notification">Notifications</a></li>
+        <li class="list-group-item{{if .IsUserPageSettingSSH}} list-group-item-success{{end}}"><a href="/user/setting/ssh/">SSH Keys</a></li>
+        <li class="list-group-item{{if .IsUserPageSettingSecurity}} list-group-item-success{{end}}"><a href="/user/setting/security">Security</a></li>
+        <li class="list-group-item{{if .IsUserPageSettingDelete}} list-group-item-success{{end}}"><a href="/user/delete">Delete Account</a></li>
+    </ul>
+</div>
\ No newline at end of file

diff --git a/templates/user/stars.tmpl b/templates/user/stars.tmpl
new file mode 100644 (file)
index 0000000..4e6f0c9
--- /dev/null
+++ b/templates/user/stars.tmpl
@@ -0,0 +1,17 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="gogs-body-nav">
+    <div class="container">
+        <ul class="nav nav-pills pull-right">
+            <li><a href="/">Feed</a></li>
+            <li><a href="/issues">Issues</a></li>
+            <li><a href="/pulls">Pull Requests</a></li>
+            <li class="active"><a href="/stars">Stars</a></li>
+        </ul>
+        <h3>Stars</h3>
+    </div>
+</div>
+<div id="gogs-body" class="container" data-page="user">
+    {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
+</div>
+{{template "base/footer" .}}
\ No newline at end of file