Mirror fix

This commit is contained in:
Unknown 2014-03-18 18:31:54 -04:00
parent 58147bef20
commit fbd252c1cf
18 changed files with 133 additions and 83 deletions

View file

@ -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)
}

View file

@ -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)
}

View file

@ -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)
}

View file

@ -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)
}