diff options
| -rw-r--r-- | routers/dashboard.go | 5 | ||||
| -rw-r--r-- | routers/repo/single.go | 10 | ||||
| -rw-r--r-- | routers/user/setting.go | 13 | ||||
| -rw-r--r-- | routers/user/user.go | 18 | ||||
| -rw-r--r-- | templates/base/navbar.tmpl | 2 | ||||
| -rw-r--r-- | templates/help.tmpl | 11 | ||||
| -rw-r--r-- | templates/home.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issues.tmpl | 9 | ||||
| -rw-r--r-- | templates/repo/pulls.tmpl | 9 | ||||
| -rw-r--r-- | templates/user/issues.tmpl | 17 | ||||
| -rw-r--r-- | templates/user/notification.tmpl | 12 | ||||
| -rw-r--r-- | templates/user/password.tmpl | 26 | ||||
| -rw-r--r-- | templates/user/publickey.tmpl | 13 | ||||
| -rw-r--r-- | templates/user/pulls.tmpl | 17 | ||||
| -rw-r--r-- | templates/user/security.tmpl | 12 | ||||
| -rw-r--r-- | templates/user/setting.tmpl | 12 | ||||
| -rw-r--r-- | templates/user/setting_nav.tmpl | 11 | ||||
| -rw-r--r-- | templates/user/stars.tmpl | 17 |
18 files changed, 133 insertions, 83 deletions
diff --git a/routers/dashboard.go b/routers/dashboard.go index ddaef0cb56..d5358f0a00 100644 --- 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 0cc41b1c8f..d64248d990 100644 --- 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 ea42f70cfa..3f60c6c6fb 100644 --- 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 c43cf84a24..f8c9b4d3dd 100644 --- 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 181beb5a44..4902ce2593 100644 --- 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 index 0000000000..b4d5d2a97e --- /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 8cbb29ebb4..e077624323 100644 --- 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 index 0000000000..daacc089c3 --- /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 index 0000000000..daacc089c3 --- /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 index 0000000000..94f6689456 --- /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 ecb3fa856c..7911c0fd5f 100644 --- 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 532a57cb0f..2ee178a3fc 100644 --- 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> <a href="/forget-password/">Forgot your password?</a> </div> diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl index ef5879b54d..72467659be 100644 --- 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 index 0000000000..0891f5e850 --- /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 cf51127d2c..a7506b5086 100644 --- 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 d6a6094f3f..c38054f39b 100644 --- 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 index 0000000000..3a500fdafe --- /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 index 0000000000..4e6f0c92fc --- /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 |