Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Add suburl support

Browse source
This commit is contained in:
Unknwon 2014-09-19 20:11:34 -04:00
parent 6a7bd097fe
commit 7ba9257a7f
90 changed files with 287 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/web.go
View file

@ -79,6 +79,7 @@ func newMacaron() *macaron.Macaron {
IndentJSON: macaron.Env != macaron.PROD, IndentJSON: macaron.Env != macaron.PROD,
})) }))
m.Use(i18n.I18n(i18n.Options{ m.Use(i18n.I18n(i18n.Options{
SubURL: setting.AppSubUrl,
Langs: setting.Langs, Langs: setting.Langs,
Names: setting.Names, Names: setting.Names,
Redirect: true, Redirect: true,
@ -88,7 +89,9 @@ func newMacaron() *macaron.Macaron {
Interval: setting.CacheInternal, Interval: setting.CacheInternal,
Conn: setting.CacheConn, Conn: setting.CacheConn,
})) }))
m.Use(captcha.Captchaer()) m.Use(captcha.Captchaer(captcha.Options{
SubURL: setting.AppSubUrl,
}))
m.Use(session.Sessioner(session.Options{ m.Use(session.Sessioner(session.Options{
Provider: setting.SessionProvider, Provider: setting.SessionProvider,
Config: *setting.SessionConfig, Config: *setting.SessionConfig,
@ -365,7 +368,7 @@ func runWeb(*cli.Context) {
var err error var err error
listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort) listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
log.Info("Listen: %v://%s", setting.Protocol, listenAddr) log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubUrl)
switch setting.Protocol { switch setting.Protocol {
case setting.HTTP: case setting.HTTP:
err = http.ListenAndServe(listenAddr, m) err = http.ListenAndServe(listenAddr, m)

2
gogs.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.5.2.0917 Beta" const APP_VER = "0.5.3.0919 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

2
models/action.go
View file

@ -137,7 +137,7 @@ func updateIssuesCommit(userId, repoId int64, repoUserName, repoName string, com
return err return err
} }
url := fmt.Sprintf("%s/%s/%s/commit/%s", setting.AppRootSubUrl, repoUserName, repoName, c.Sha1) url := fmt.Sprintf("%s/%s/%s/commit/%s", setting.AppSubUrl, repoUserName, repoName, c.Sha1)
message := fmt.Sprintf(`<a href="%s">%s</a>`, url, c.Message) message := fmt.Sprintf(`<a href="%s">%s</a>`, url, c.Message)
if _, err = CreateComment(userId, issue.RepoId, issue.Id, 0, 0, COMMIT, message, nil); err != nil { if _, err = CreateComment(userId, issue.RepoId, issue.Id, 0, 0, COMMIT, message, nil); err != nil {

6
models/user.go
View file

@ -82,14 +82,14 @@ type User struct {
// DashboardLink returns the user dashboard page link. // DashboardLink returns the user dashboard page link.
func (u *User) DashboardLink() string { func (u *User) DashboardLink() string {
if u.IsOrganization() { if u.IsOrganization() {
return setting.AppRootSubUrl + "/org/" + u.Name + "/dashboard/" return setting.AppSubUrl + "/org/" + u.Name + "/dashboard/"
} }
return setting.AppRootSubUrl + "/" return setting.AppSubUrl + "/"
} }
// HomeLink returns the user home page link. // HomeLink returns the user home page link.
func (u *User) HomeLink() string { func (u *User) HomeLink() string {
return setting.AppRootSubUrl + "/user/" + u.Name return setting.AppSubUrl + "/user/" + u.Name
} }
// AvatarLink returns user gravatar link. // AvatarLink returns user gravatar link.

2
modules/base/markdown.go
View file

@ -113,7 +113,7 @@ func RenderSpecialLink(rawBytes []byte, urlPrefix string) []byte {
ms := MentionPattern.FindAll(line, -1) ms := MentionPattern.FindAll(line, -1)
for _, m := range ms { for _, m := range ms {
line = bytes.Replace(line, m, line = bytes.Replace(line, m,
[]byte(fmt.Sprintf(`<a href="%s/user/%s">%s</a>`, setting.AppRootSubUrl, m[1:], m)), -1) []byte(fmt.Sprintf(`<a href="%s/user/%s">%s</a>`, setting.AppSubUrl, m[1:], m)), -1)
} }
} }

16
modules/base/template.go
View file

@ -82,8 +82,8 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
"AppName": func() string { "AppName": func() string {
return setting.AppName return setting.AppName
}, },
"AppRootSubUrl": func() string { "AppSubUrl": func() string {
return setting.AppRootSubUrl return setting.AppSubUrl
}, },
"AppVer": func() string { "AppVer": func() string {
return setting.AppVer return setting.AppVer
@ -210,7 +210,7 @@ func ActionDesc(act Actioner) string {
content := act.GetContent() content := act.GetContent()
switch act.GetOpType() { switch act.GetOpType() {
case 1: // Create repository. case 1: // Create repository.
return fmt.Sprintf(TPL_CREATE_REPO, setting.AppRootSubUrl, actUserName, actUserName, repoLink, repoName) return fmt.Sprintf(TPL_CREATE_REPO, setting.AppSubUrl, actUserName, actUserName, repoLink, repoName)
case 5: // Commit repository. case 5: // Commit repository.
var push *PushCommits var push *PushCommits
if err := json.Unmarshal([]byte(content), &push); err != nil { if err := json.Unmarshal([]byte(content), &push); err != nil {
@ -223,20 +223,20 @@ func ActionDesc(act Actioner) string {
if push.Len > 3 { if push.Len > 3 {
buf.WriteString(fmt.Sprintf(`<div><a href="{{AppRootSubUrl}}/%s/%s/commits/%s" rel="nofollow">%d other commits >></a></div>`, actUserName, repoName, branch, push.Len)) buf.WriteString(fmt.Sprintf(`<div><a href="{{AppRootSubUrl}}/%s/%s/commits/%s" rel="nofollow">%d other commits >></a></div>`, actUserName, repoName, branch, push.Len))
} }
return fmt.Sprintf(TPL_COMMIT_REPO, setting.AppRootSubUrl, actUserName, actUserName, repoLink, branch, branch, repoLink, repoLink, return fmt.Sprintf(TPL_COMMIT_REPO, setting.AppSubUrl, actUserName, actUserName, repoLink, branch, branch, repoLink, repoLink,
buf.String()) buf.String())
case 6: // Create issue. case 6: // Create issue.
infos := strings.SplitN(content, "|", 2) infos := strings.SplitN(content, "|", 2)
return fmt.Sprintf(TPL_CREATE_ISSUE, setting.AppRootSubUrl, actUserName, actUserName, repoLink, infos[0], repoLink, infos[0], return fmt.Sprintf(TPL_CREATE_ISSUE, setting.AppSubUrl, actUserName, actUserName, repoLink, infos[0], repoLink, infos[0],
AvatarLink(email), infos[1]) AvatarLink(email), infos[1])
case 8: // Transfer repository. case 8: // Transfer repository.
newRepoLink := content + "/" + repoName newRepoLink := content + "/" + repoName
return fmt.Sprintf(TPL_TRANSFER_REPO, setting.AppRootSubUrl, actUserName, actUserName, repoLink, newRepoLink, newRepoLink) return fmt.Sprintf(TPL_TRANSFER_REPO, setting.AppSubUrl, actUserName, actUserName, repoLink, newRepoLink, newRepoLink)
case 9: // Push tag. case 9: // Push tag.
return fmt.Sprintf(TPL_PUSH_TAG, setting.AppRootSubUrl, actUserName, actUserName, repoLink, branch, branch, repoLink, repoLink) return fmt.Sprintf(TPL_PUSH_TAG, setting.AppSubUrl, actUserName, actUserName, repoLink, branch, branch, repoLink, repoLink)
case 10: // Comment issue. case 10: // Comment issue.
infos := strings.SplitN(content, "|", 2) infos := strings.SplitN(content, "|", 2)
return fmt.Sprintf(TPL_COMMENT_ISSUE, setting.AppRootSubUrl, actUserName, actUserName, repoLink, infos[0], repoLink, infos[0], return fmt.Sprintf(TPL_COMMENT_ISSUE, setting.AppSubUrl, actUserName, actUserName, repoLink, infos[0], repoLink, infos[0],
AvatarLink(email), infos[1]) AvatarLink(email), infos[1])
default: default:
return "invalid type" return "invalid type"

8
modules/middleware/auth.go
View file

@ -25,13 +25,13 @@ func Toggle(options *ToggleOptions) macaron.Handler {
return func(ctx *Context) { return func(ctx *Context) {
// Cannot view any page before installation. // Cannot view any page before installation.
if !setting.InstallLock { if !setting.InstallLock {
ctx.Redirect(setting.AppRootSubUrl + "/install") ctx.Redirect(setting.AppSubUrl + "/install")
return return
} }
// Redirect to dashboard if user tries to visit any non-login page. // Redirect to dashboard if user tries to visit any non-login page.
if options.SignOutRequire && ctx.IsSigned && ctx.Req.RequestURI != "/" { if options.SignOutRequire && ctx.IsSigned && ctx.Req.RequestURI != "/" {
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
return return
} }
@ -48,8 +48,8 @@ func Toggle(options *ToggleOptions) macaron.Handler {
if strings.HasSuffix(ctx.Req.RequestURI, "watch") { if strings.HasSuffix(ctx.Req.RequestURI, "watch") {
return return
} }
ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppRootSubUrl + ctx.Req.RequestURI)) ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI))
ctx.Redirect(setting.AppRootSubUrl + "/user/login") ctx.Redirect(setting.AppSubUrl + "/user/login")
return return
} else if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm { } else if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm {
ctx.Data["Title"] = ctx.Tr("auth.active_your_account") ctx.Data["Title"] = ctx.Tr("auth.active_your_account")

2
modules/middleware/context.go
View file

@ -187,7 +187,7 @@ func Contexter() macaron.Handler {
Session: sess, Session: sess,
} }
// Compute current URL for real-time change language. // Compute current URL for real-time change language.
link := setting.AppRootSubUrl + ctx.Req.RequestURI link := setting.AppSubUrl + ctx.Req.RequestURI
i := strings.Index(link, "?") i := strings.Index(link, "?")
if i > -1 { if i > -1 {
link = link[:i] link = link[:i]

6
modules/middleware/org.go
View file

@ -38,7 +38,7 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
ctx.Handle(404, "GetUserByName", err) ctx.Handle(404, "GetUserByName", err)
} else if redirect { } else if redirect {
log.Error(4, "GetUserByName", err) log.Error(4, "GetUserByName", err)
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} else { } else {
ctx.Handle(500, "GetUserByName", err) ctx.Handle(500, "GetUserByName", err)
} }
@ -68,7 +68,7 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
} }
ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner
ctx.Org.OrgLink = setting.AppRootSubUrl + "/org/" + org.Name ctx.Org.OrgLink = setting.AppSubUrl + "/org/" + org.Name
ctx.Data["OrgLink"] = ctx.Org.OrgLink ctx.Data["OrgLink"] = ctx.Org.OrgLink
// Team. // Team.
@ -80,7 +80,7 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
ctx.Handle(404, "GetTeam", err) ctx.Handle(404, "GetTeam", err)
} else if redirect { } else if redirect {
log.Error(4, "GetTeam", err) log.Error(4, "GetTeam", err)
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} else { } else {
ctx.Handle(500, "GetTeam", err) ctx.Handle(500, "GetTeam", err)
} }

12
modules/middleware/repo.go
View file

@ -60,7 +60,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
ctx.Handle(404, "GetUserByName", err) ctx.Handle(404, "GetUserByName", err)
} else if redirect { } else if redirect {
log.Error(4, "GetUserByName", err) log.Error(4, "GetUserByName", err)
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} else { } else {
ctx.Handle(500, "GetUserByName", err) ctx.Handle(500, "GetUserByName", err)
} }
@ -72,7 +72,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
if u == nil { if u == nil {
if redirect { if redirect {
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
return return
} }
ctx.Handle(404, "RepoAssignment", errors.New("invliad user account for single repository")) ctx.Handle(404, "RepoAssignment", errors.New("invliad user account for single repository"))
@ -92,7 +92,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
ctx.Handle(404, "GetRepositoryByName", err) ctx.Handle(404, "GetRepositoryByName", err)
return return
} else if redirect { } else if redirect {
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
return return
} }
ctx.Handle(500, "GetRepositoryByName", err) ctx.Handle(500, "GetRepositoryByName", err)
@ -160,7 +160,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
return return
} }
ctx.Repo.GitRepo = gitRepo ctx.Repo.GitRepo = gitRepo
ctx.Repo.RepoLink = setting.AppRootSubUrl + "/" + u.Name + "/" + repo.Name ctx.Repo.RepoLink = setting.AppSubUrl + "/" + u.Name + "/" + repo.Name
ctx.Data["RepoLink"] = ctx.Repo.RepoLink ctx.Data["RepoLink"] = ctx.Repo.RepoLink
tags, err := ctx.Repo.GitRepo.GetTags() tags, err := ctx.Repo.GitRepo.GetTags()
@ -298,8 +298,8 @@ func RequireTrueOwner() macaron.Handler {
return func(ctx *Context) { return func(ctx *Context) {
if !ctx.Repo.IsTrueOwner && !ctx.Repo.IsAdmin { if !ctx.Repo.IsTrueOwner && !ctx.Repo.IsAdmin {
if !ctx.IsSigned { if !ctx.IsSigned {
ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppRootSubUrl + ctx.Req.RequestURI)) ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI))
ctx.Redirect(setting.AppRootSubUrl + "/user/login") ctx.Redirect(setting.AppSubUrl + "/user/login")
return return
} }
ctx.Handle(404, ctx.Req.RequestURI, nil) ctx.Handle(404, ctx.Req.RequestURI, nil)

7
modules/setting/setting.go
View file

@ -35,7 +35,7 @@ var (
AppVer string AppVer string
AppName string AppName string
AppUrl string AppUrl string
AppRootSubUrl string AppSubUrl string
// Server settings. // Server settings.
Protocol Scheme Protocol Scheme
@ -167,11 +167,12 @@ func NewConfigContext() {
AppUrl += "/" AppUrl += "/"
} }
// Check if has app suburl.
url, err := url.Parse(AppUrl) url, err := url.Parse(AppUrl)
if err != nil { if err != nil {
log.Fatal(4, "Invalid ROOT_URL %s: %s", AppUrl, err) log.Fatal(4, "Invalid ROOT_URL(%s): %s", AppUrl, err)
} }
AppRootSubUrl = strings.TrimSuffix(url.Path, "/") AppSubUrl = strings.TrimSuffix(url.Path, "/")
Protocol = HTTP Protocol = HTTP
if Cfg.MustValue("server", "PROTOCOL") == "https" { if Cfg.MustValue("server", "PROTOCOL") == "https" {

2
routers/admin/admin.go
View file

@ -143,7 +143,7 @@ func Dashboard(ctx *middleware.Context) {
} else { } else {
ctx.Flash.Success(success) ctx.Flash.Success(success)
} }
ctx.Redirect(setting.AppRootSubUrl + "/admin") ctx.Redirect(setting.AppSubUrl + "/admin")
return return
} }

8
routers/admin/auths.go
View file

@ -100,7 +100,7 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
} }
log.Trace("Authentication created by admin(%s): %s", ctx.User.Name, form.AuthName) log.Trace("Authentication created by admin(%s): %s", ctx.User.Name, form.AuthName)
ctx.Redirect(setting.AppRootSubUrl + "/admin/auths") ctx.Redirect(setting.AppSubUrl + "/admin/auths")
} }
func EditAuthSource(ctx *middleware.Context) { func EditAuthSource(ctx *middleware.Context) {
@ -181,7 +181,7 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
log.Trace("Authentication changed by admin(%s): %s", ctx.User.Name, form.AuthName) log.Trace("Authentication changed by admin(%s): %s", ctx.User.Name, form.AuthName)
ctx.Flash.Success(ctx.Tr("admin.auths.update_success")) ctx.Flash.Success(ctx.Tr("admin.auths.update_success"))
ctx.Redirect(setting.AppRootSubUrl + "/admin/auths/" + ctx.Params(":authid")) ctx.Redirect(setting.AppSubUrl + "/admin/auths/" + ctx.Params(":authid"))
} }
func DeleteAuthSource(ctx *middleware.Context) { func DeleteAuthSource(ctx *middleware.Context) {
@ -201,12 +201,12 @@ func DeleteAuthSource(ctx *middleware.Context) {
switch err { switch err {
case models.ErrAuthenticationUserUsed: case models.ErrAuthenticationUserUsed:
ctx.Flash.Error("form.still_own_user") ctx.Flash.Error("form.still_own_user")
ctx.Redirect(setting.AppRootSubUrl + "/admin/auths/" + ctx.Params(":authid")) ctx.Redirect(setting.AppSubUrl + "/admin/auths/" + ctx.Params(":authid"))
default: default:
ctx.Handle(500, "DelLoginSource", err) ctx.Handle(500, "DelLoginSource", err)
} }
return return
} }
log.Trace("Authentication deleted by admin(%s): %s", ctx.User.Name, a.Name) log.Trace("Authentication deleted by admin(%s): %s", ctx.User.Name, a.Name)
ctx.Redirect(setting.AppRootSubUrl + "/admin/auths") ctx.Redirect(setting.AppSubUrl + "/admin/auths")
} }

8
routers/admin/users.go
View file

@ -121,7 +121,7 @@ func NewUserPost(ctx *middleware.Context, form auth.RegisterForm) {
return return
} }
log.Trace("Account created by admin(%s): %s", ctx.User.Name, u.Name) log.Trace("Account created by admin(%s): %s", ctx.User.Name, u.Name)
ctx.Redirect(setting.AppRootSubUrl + "/admin/users") ctx.Redirect(setting.AppSubUrl + "/admin/users")
} }
func EditUser(ctx *middleware.Context) { func EditUser(ctx *middleware.Context) {
@ -198,7 +198,7 @@ func EditUserPost(ctx *middleware.Context, form auth.AdminEditUserForm) {
ctx.Data["User"] = u ctx.Data["User"] = u
ctx.Flash.Success(ctx.Tr("admin.users.update_profile_success")) ctx.Flash.Success(ctx.Tr("admin.users.update_profile_success"))
ctx.Redirect(setting.AppRootSubUrl + "/admin/users/" + ctx.Params(":userid")) ctx.Redirect(setting.AppSubUrl + "/admin/users/" + ctx.Params(":userid"))
} }
func DeleteUser(ctx *middleware.Context) { func DeleteUser(ctx *middleware.Context) {
@ -218,12 +218,12 @@ func DeleteUser(ctx *middleware.Context) {
switch err { switch err {
case models.ErrUserOwnRepos: case models.ErrUserOwnRepos:
ctx.Flash.Error(ctx.Tr("admin.users.still_own_repo")) ctx.Flash.Error(ctx.Tr("admin.users.still_own_repo"))
ctx.Redirect(setting.AppRootSubUrl + "/admin/users/" + ctx.Params(":userid")) ctx.Redirect(setting.AppSubUrl + "/admin/users/" + ctx.Params(":userid"))
default: default:
ctx.Handle(500, "DeleteUser", err) ctx.Handle(500, "DeleteUser", err)
} }
return return
} }
log.Trace("Account deleted by admin(%s): %s", ctx.User.Name, u.Name) log.Trace("Account deleted by admin(%s): %s", ctx.User.Name, u.Name)
ctx.Redirect(setting.AppRootSubUrl + "/admin/users") ctx.Redirect(setting.AppSubUrl + "/admin/users")
} }

2
routers/home.go
View file

@ -33,7 +33,7 @@ func Home(ctx *middleware.Context) {
// Check auto-login. // Check auto-login.
uname := ctx.GetCookie(setting.CookieUserName) uname := ctx.GetCookie(setting.CookieUserName)
if len(uname) != 0 { if len(uname) != 0 {
ctx.Redirect(setting.AppRootSubUrl + "/user/login") ctx.Redirect(setting.AppSubUrl + "/user/login")
return return
} }

2
routers/install.go
View file

@ -253,5 +253,5 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
log.Info("First-time run install finished!") log.Info("First-time run install finished!")
ctx.Flash.Success(ctx.Tr("install.install_success")) ctx.Flash.Success(ctx.Tr("install.install_success"))
ctx.Redirect(setting.AppRootSubUrl + "/user/login") ctx.Redirect(setting.AppSubUrl + "/user/login")
} }

2
routers/org/members.go
View file

@ -87,7 +87,7 @@ func MembersAction(ctx *middleware.Context) {
if ctx.Params(":action") != "leave" { if ctx.Params(":action") != "leave" {
ctx.Redirect(ctx.Org.OrgLink + "/members") ctx.Redirect(ctx.Org.OrgLink + "/members")
} else { } else {
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} }
} }

2
routers/org/org.go
View file

@ -83,5 +83,5 @@ func CreatePost(ctx *middleware.Context, form auth.CreateOrgForm) {
} }
log.Trace("Organization created: %s", org.Name) log.Trace("Organization created: %s", org.Name)
ctx.Redirect(setting.AppRootSubUrl + "/org/" + form.OrgName + "/dashboard") ctx.Redirect(setting.AppSubUrl + "/org/" + form.OrgName + "/dashboard")
} }

8
routers/org/setting.go
View file

@ -49,7 +49,7 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateOrgSettingForm) {
} else if err = models.ChangeUserName(org, form.OrgUserName); err != nil { } else if err = models.ChangeUserName(org, form.OrgUserName); err != nil {
if err == models.ErrUserNameIllegal { if err == models.ErrUserNameIllegal {
ctx.Flash.Error(ctx.Tr("form.illegal_username")) ctx.Flash.Error(ctx.Tr("form.illegal_username"))
ctx.Redirect(setting.AppRootSubUrl + "/org/" + org.LowerName + "/settings") ctx.Redirect(setting.AppSubUrl + "/org/" + org.LowerName + "/settings")
return return
} else { } else {
ctx.Handle(500, "ChangeUserName", err) ctx.Handle(500, "ChangeUserName", err)
@ -73,7 +73,7 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateOrgSettingForm) {
} }
log.Trace("Organization setting updated: %s", org.Name) log.Trace("Organization setting updated: %s", org.Name)
ctx.Flash.Success(ctx.Tr("org.settings.update_setting_success")) ctx.Flash.Success(ctx.Tr("org.settings.update_setting_success"))
ctx.Redirect(setting.AppRootSubUrl + "/org/" + org.Name + "/settings") ctx.Redirect(setting.AppSubUrl + "/org/" + org.Name + "/settings")
} }
func SettingsDelete(ctx *middleware.Context) { func SettingsDelete(ctx *middleware.Context) {
@ -87,13 +87,13 @@ func SettingsDelete(ctx *middleware.Context) {
switch err { switch err {
case models.ErrUserOwnRepos: case models.ErrUserOwnRepos:
ctx.Flash.Error(ctx.Tr("form.org_still_own_repo")) ctx.Flash.Error(ctx.Tr("form.org_still_own_repo"))
ctx.Redirect(setting.AppRootSubUrl + "/org/" + org.LowerName + "/settings/delete") ctx.Redirect(setting.AppSubUrl + "/org/" + org.LowerName + "/settings/delete")
default: default:
ctx.Handle(500, "DeleteOrganization", err) ctx.Handle(500, "DeleteOrganization", err)
} }
} else { } else {
log.Trace("Organization deleted: %s", ctx.User.Name) log.Trace("Organization deleted: %s", ctx.User.Name)
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} }
return return
} }

4
routers/repo/commit.go
View file

@ -159,8 +159,8 @@ func Diff(ctx *middleware.Context) {
ctx.Data["Diff"] = diff ctx.Data["Diff"] = diff
ctx.Data["Parents"] = parents ctx.Data["Parents"] = parents
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0 ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
ctx.Data["SourcePath"] = setting.AppRootSubUrl + "/" + path.Join(userName, repoName, "src", commitId) ctx.Data["SourcePath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "src", commitId)
ctx.Data["RawPath"] = setting.AppRootSubUrl + "/" + path.Join(userName, repoName, "raw", commitId) ctx.Data["RawPath"] = setting.AppSubUrl + "/" + path.Join(userName, repoName, "raw", commitId)
ctx.HTML(200, DIFF) ctx.HTML(200, DIFF)
} }

6
routers/repo/issue.go
View file

@ -54,8 +54,8 @@ func Issues(ctx *middleware.Context) {
isShowClosed := ctx.Query("state") == "closed" isShowClosed := ctx.Query("state") == "closed"
if viewType != "all" && !ctx.IsSigned { if viewType != "all" && !ctx.IsSigned {
ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppRootSubUrl + ctx.Req.RequestURI)) ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI))
ctx.Redirect(setting.AppRootSubUrl + "/user/login") ctx.Redirect(setting.AppSubUrl + "/user/login")
return return
} }
@ -312,7 +312,7 @@ func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) {
} }
log.Trace("%d Issue created: %d", ctx.Repo.Repository.Id, issue.Id) log.Trace("%d Issue created: %d", ctx.Repo.Repository.Id, issue.Id)
send(200, fmt.Sprintf("%s/%s/%s/issues/%d", setting.AppRootSubUrl, ctx.Params(":username"), ctx.Params(":reponame"), issue.Index), nil) send(200, fmt.Sprintf("%s/%s/%s/issues/%d", setting.AppSubUrl, ctx.Params(":username"), ctx.Params(":reponame"), issue.Index), nil)
} }
func checkLabels(labels, allLabels []*models.Label) { func checkLabels(labels, allLabels []*models.Label) {

4
routers/repo/repo.go
View file

@ -96,7 +96,7 @@ func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) {
form.Gitignore, form.License, form.Private, false, form.InitReadme) form.Gitignore, form.License, form.Private, false, form.InitReadme)
if err == nil { if err == nil {
log.Trace("Repository created: %s/%s", ctxUser.Name, form.RepoName) log.Trace("Repository created: %s/%s", ctxUser.Name, form.RepoName)
ctx.Redirect(setting.AppRootSubUrl + "/" + ctxUser.Name + "/" + form.RepoName) ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + form.RepoName)
return return
} else if err == models.ErrRepoAlreadyExist { } else if err == models.ErrRepoAlreadyExist {
ctx.Data["Err_RepoName"] = true ctx.Data["Err_RepoName"] = true
@ -180,7 +180,7 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
form.Mirror, url) form.Mirror, url)
if err == nil { if err == nil {
log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName) log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
ctx.Redirect(setting.AppRootSubUrl + "/" + ctxUser.Name + "/" + form.RepoName) ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + form.RepoName)
return return
} else if err == models.ErrRepoAlreadyExist { } else if err == models.ErrRepoAlreadyExist {
ctx.Data["Err_RepoName"] = true ctx.Data["Err_RepoName"] = true

16
routers/repo/setting.go
View file

@ -97,7 +97,7 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) {
} }
ctx.Flash.Success(ctx.Tr("repo.settings.update_settings_success")) ctx.Flash.Success(ctx.Tr("repo.settings.update_settings_success"))
ctx.Redirect(fmt.Sprintf("%s/%s/%s/settings", setting.AppRootSubUrl, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)) ctx.Redirect(fmt.Sprintf("%s/%s/%s/settings", setting.AppSubUrl, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name))
case "transfer": case "transfer":
if ctx.Repo.Repository.Name != form.RepoName { if ctx.Repo.Repository.Name != form.RepoName {
ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), SETTINGS_OPTIONS, nil) ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), SETTINGS_OPTIONS, nil)
@ -122,7 +122,7 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) {
} }
log.Trace("Repository transfered: %s/%s -> %s", ctx.Repo.Owner.Name, ctx.Repo.Repository.Name, newOwner) log.Trace("Repository transfered: %s/%s -> %s", ctx.Repo.Owner.Name, ctx.Repo.Repository.Name, newOwner)
ctx.Flash.Success(ctx.Tr("repo.settings.transfer_succeed")) ctx.Flash.Success(ctx.Tr("repo.settings.transfer_succeed"))
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
case "delete": case "delete":
if ctx.Repo.Repository.Name != form.RepoName { if ctx.Repo.Repository.Name != form.RepoName {
ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), SETTINGS_OPTIONS, nil) ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), SETTINGS_OPTIONS, nil)
@ -151,9 +151,9 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) {
} }
log.Trace("Repository deleted: %s/%s", ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) log.Trace("Repository deleted: %s/%s", ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
if ctx.Repo.Owner.IsOrganization() { if ctx.Repo.Owner.IsOrganization() {
ctx.Redirect(setting.AppRootSubUrl + "/org/" + ctx.Repo.Owner.Name + "/dashboard") ctx.Redirect(setting.AppSubUrl + "/org/" + ctx.Repo.Owner.Name + "/dashboard")
} else { } else {
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} }
} }
} }
@ -167,7 +167,7 @@ func SettingsCollaboration(ctx *middleware.Context) {
if ctx.Req.Method == "POST" { if ctx.Req.Method == "POST" {
name := strings.ToLower(ctx.Query("collaborator")) name := strings.ToLower(ctx.Query("collaborator"))
if len(name) == 0 || ctx.Repo.Owner.LowerName == name { if len(name) == 0 || ctx.Repo.Owner.LowerName == name {
ctx.Redirect(setting.AppRootSubUrl + ctx.Req.URL.Path) ctx.Redirect(setting.AppSubUrl + ctx.Req.URL.Path)
return return
} }
has, err := models.HasAccess(name, repoLink, models.WRITABLE) has, err := models.HasAccess(name, repoLink, models.WRITABLE)
@ -175,7 +175,7 @@ func SettingsCollaboration(ctx *middleware.Context) {
ctx.Handle(500, "HasAccess", err) ctx.Handle(500, "HasAccess", err)
return return
} else if has { } else if has {
ctx.Redirect(setting.AppRootSubUrl + ctx.Req.URL.Path) ctx.Redirect(setting.AppSubUrl + ctx.Req.URL.Path)
return return
} }
@ -183,7 +183,7 @@ func SettingsCollaboration(ctx *middleware.Context) {
if err != nil { if err != nil {
if err == models.ErrUserNotExist { if err == models.ErrUserNotExist {
ctx.Flash.Error(ctx.Tr("form.user_not_exist")) ctx.Flash.Error(ctx.Tr("form.user_not_exist"))
ctx.Redirect(setting.AppRootSubUrl + ctx.Req.URL.Path) ctx.Redirect(setting.AppSubUrl + ctx.Req.URL.Path)
} else { } else {
ctx.Handle(500, "GetUserByName", err) ctx.Handle(500, "GetUserByName", err)
} }
@ -204,7 +204,7 @@ func SettingsCollaboration(ctx *middleware.Context) {
} }
ctx.Flash.Success(ctx.Tr("repo.settings.add_collaborator_success")) ctx.Flash.Success(ctx.Tr("repo.settings.add_collaborator_success"))
ctx.Redirect(setting.AppRootSubUrl + ctx.Req.URL.Path) ctx.Redirect(setting.AppSubUrl + ctx.Req.URL.Path)
return return
} }

12
routers/user/auth.go
View file

@ -82,7 +82,7 @@ func SignIn(ctx *middleware.Context) {
return return
} }
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} }
func SignInPost(ctx *middleware.Context, form auth.SignInForm) { func SignInPost(ctx *middleware.Context, form auth.SignInForm) {
@ -140,7 +140,7 @@ func SignInPost(ctx *middleware.Context, form auth.SignInForm) {
return return
} }
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} }
func SignOut(ctx *middleware.Context) { func SignOut(ctx *middleware.Context) {
@ -151,7 +151,7 @@ func SignOut(ctx *middleware.Context) {
ctx.Session.Delete("socialEmail") ctx.Session.Delete("socialEmail")
ctx.SetCookie(setting.CookieUserName, "", -1) ctx.SetCookie(setting.CookieUserName, "", -1)
ctx.SetCookie(setting.CookieRememberName, "", -1) ctx.SetCookie(setting.CookieRememberName, "", -1)
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} }
func oauthSignUp(ctx *middleware.Context, sid int64) { func oauthSignUp(ctx *middleware.Context, sid int64) {
@ -288,7 +288,7 @@ func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.Registe
return return
} }
ctx.Redirect(setting.AppRootSubUrl + "/user/login") ctx.Redirect(setting.AppSubUrl + "/user/login")
} }
func Activate(ctx *middleware.Context) { func Activate(ctx *middleware.Context) {
@ -335,7 +335,7 @@ func Activate(ctx *middleware.Context) {
ctx.Session.Set("uid", user.Id) ctx.Session.Set("uid", user.Id)
ctx.Session.Set("uname", user.Name) ctx.Session.Set("uname", user.Name)
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
return return
} }
@ -437,7 +437,7 @@ func ResetPasswdPost(ctx *middleware.Context) {
} }
log.Trace("User password reset: %s", u.Name) log.Trace("User password reset: %s", u.Name)
ctx.Redirect(setting.AppRootSubUrl + "/user/login") ctx.Redirect(setting.AppSubUrl + "/user/login")
return return
} }

6
routers/user/home.go
View file

@ -127,7 +127,7 @@ func Profile(ctx *middleware.Context) {
uname := ctx.Params(":username") uname := ctx.Params(":username")
// Special handle for FireFox requests favicon.ico. // Special handle for FireFox requests favicon.ico.
if uname == "favicon.ico" { if uname == "favicon.ico" {
ctx.Redirect(setting.AppRootSubUrl + "/img/favicon.png") ctx.Redirect(setting.AppSubUrl + "/img/favicon.png")
return return
} }
@ -142,7 +142,7 @@ func Profile(ctx *middleware.Context) {
} }
if u.IsOrganization() { if u.IsOrganization() {
ctx.Redirect(setting.AppRootSubUrl + "/org/" + u.Name) ctx.Redirect(setting.AppSubUrl + "/org/" + u.Name)
return return
} }
@ -182,7 +182,7 @@ func Email2User(ctx *middleware.Context) {
} }
return return
} }
ctx.Redirect(setting.AppRootSubUrl + "/user/" + u.Name) ctx.Redirect(setting.AppSubUrl + "/user/" + u.Name)
} }
const ( const (

18
routers/user/setting.go
View file

@ -56,7 +56,7 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
} else if err = models.ChangeUserName(ctx.User, form.UserName); err != nil { } else if err = models.ChangeUserName(ctx.User, form.UserName); err != nil {
if err == models.ErrUserNameIllegal { if err == models.ErrUserNameIllegal {
ctx.Flash.Error(ctx.Tr("form.illegal_username")) ctx.Flash.Error(ctx.Tr("form.illegal_username"))
ctx.Redirect(setting.AppRootSubUrl + "/user/settings") ctx.Redirect(setting.AppSubUrl + "/user/settings")
return return
} else { } else {
ctx.Handle(500, "ChangeUserName", err) ctx.Handle(500, "ChangeUserName", err)
@ -79,7 +79,7 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
} }
log.Trace("User setting updated: %s", ctx.User.Name) log.Trace("User setting updated: %s", ctx.User.Name)
ctx.Flash.Success(ctx.Tr("settings.update_profile_success")) ctx.Flash.Success(ctx.Tr("settings.update_profile_success"))
ctx.Redirect(setting.AppRootSubUrl + "/user/settings") ctx.Redirect(setting.AppSubUrl + "/user/settings")
} }
func SettingsPassword(ctx *middleware.Context) { func SettingsPassword(ctx *middleware.Context) {
@ -120,7 +120,7 @@ func SettingsPasswordPost(ctx *middleware.Context, form auth.ChangePasswordForm)
ctx.Flash.Success(ctx.Tr("settings.change_password_success")) ctx.Flash.Success(ctx.Tr("settings.change_password_success"))
} }
ctx.Redirect(setting.AppRootSubUrl + "/user/settings/password") ctx.Redirect(setting.AppSubUrl + "/user/settings/password")
} }
func SettingsSSHKeys(ctx *middleware.Context) { func SettingsSSHKeys(ctx *middleware.Context) {
@ -161,7 +161,7 @@ func SettingsSSHKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) {
ctx.Handle(500, "DeletePublicKey", err) ctx.Handle(500, "DeletePublicKey", err)
} else { } else {
log.Trace("SSH key deleted: %s", ctx.User.Name) log.Trace("SSH key deleted: %s", ctx.User.Name)
ctx.Redirect(setting.AppRootSubUrl + "/user/settings/ssh") ctx.Redirect(setting.AppSubUrl + "/user/settings/ssh")
} }
return return
} }
@ -178,7 +178,7 @@ func SettingsSSHKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) {
if ok, err := models.CheckPublicKeyString(cleanContent); !ok { if ok, err := models.CheckPublicKeyString(cleanContent); !ok {
ctx.Flash.Error(ctx.Tr("form.invalid_ssh_key", err.Error())) ctx.Flash.Error(ctx.Tr("form.invalid_ssh_key", err.Error()))
ctx.Redirect(setting.AppRootSubUrl + "/user/settings/ssh") ctx.Redirect(setting.AppSubUrl + "/user/settings/ssh")
return return
} }
@ -197,7 +197,7 @@ func SettingsSSHKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) {
} else { } else {
log.Trace("SSH key added: %s", ctx.User.Name) log.Trace("SSH key added: %s", ctx.User.Name)
ctx.Flash.Success(ctx.Tr("settings.add_key_success")) ctx.Flash.Success(ctx.Tr("settings.add_key_success"))
ctx.Redirect(setting.AppRootSubUrl + "/user/settings/ssh") ctx.Redirect(setting.AppSubUrl + "/user/settings/ssh")
return return
} }
} }
@ -218,7 +218,7 @@ func SettingsSocial(ctx *middleware.Context) {
return return
} }
ctx.Flash.Success(ctx.Tr("settings.unbind_success")) ctx.Flash.Success(ctx.Tr("settings.unbind_success"))
ctx.Redirect(setting.AppRootSubUrl + "/user/settings/social") ctx.Redirect(setting.AppSubUrl + "/user/settings/social")
return return
} }
@ -249,13 +249,13 @@ func SettingsDelete(ctx *middleware.Context) {
switch err { switch err {
case models.ErrUserOwnRepos: case models.ErrUserOwnRepos:
ctx.Flash.Error(ctx.Tr("form.still_own_repo")) ctx.Flash.Error(ctx.Tr("form.still_own_repo"))
ctx.Redirect(setting.AppRootSubUrl + "/user/settings/delete") ctx.Redirect(setting.AppSubUrl + "/user/settings/delete")
default: default:
ctx.Handle(500, "DeleteUser", err) ctx.Handle(500, "DeleteUser", err)
} }
} else { } else {
log.Trace("Account deleted: %s", ctx.User.Name) log.Trace("Account deleted: %s", ctx.User.Name)
ctx.Redirect(setting.AppRootSubUrl + "/") ctx.Redirect(setting.AppSubUrl + "/")
} }
return return
} }

4
routers/user/social.go
View file

@ -22,7 +22,7 @@ import (
func extractPath(next string) string { func extractPath(next string) string {
n, err := url.Parse(next) n, err := url.Parse(next)
if err != nil { if err != nil {
return setting.AppRootSubUrl + "/" return setting.AppSubUrl + "/"
} }
return n.Path return n.Path
} }
@ -88,7 +88,7 @@ func SocialSignIn(ctx *middleware.Context) {
return return
} }
case models.ErrOauth2NotAssociated: case models.ErrOauth2NotAssociated:
next = setting.AppRootSubUrl + "/user/sign_up" next = setting.AppSubUrl + "/user/sign_up"
default: default:
ctx.Handle(500, "social.SocialSignIn(GetOauth2)", err) ctx.Handle(500, "social.SocialSignIn(GetOauth2)", err)
return return

2
templates/.VERSION
View file

@ -1 +1 @@
0.5.2.0917 Beta 0.5.3.0919 Beta

2
templates/admin/auth/edit.tmpl
View file

@ -12,7 +12,7 @@
<div class="panel-header"> <div class="panel-header">
<strong>{{.i18n.Tr "admin.auths.edit"}}</strong> <strong>{{.i18n.Tr "admin.auths.edit"}}</strong>
</div> </div>
<form class="form form-align panel-body" id="auth-setting-form" action="{{AppRootSubUrl}}/admin/auths/{{.Source.Id}}" data-delete-url="/admin/auths/{{.Source.Id}}/delete" method="post"> <form class="form form-align panel-body" id="auth-setting-form" action="{{AppSubUrl}}/admin/auths/{{.Source.Id}}" data-delete-url="/admin/auths/{{.Source.Id}}/delete" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" value="{{.Source.Id}}" name="id"/> <input type="hidden" value="{{.Source.Id}}" name="id"/>
{{$type := .Source.Type}} {{$type := .Source.Type}}

10
templates/admin/auth/list.tmpl
View file

@ -13,7 +13,7 @@
<strong>{{.i18n.Tr "admin.auths.auth_manage_panel"}}</strong> <strong>{{.i18n.Tr "admin.auths.auth_manage_panel"}}</strong>
</div> </div>
<div class="panel-body admin-panel"> <div class="panel-body admin-panel">
<a class="btn-blue btn-medium btn-link btn-radius" href="{{AppRootSubUrl}}/admin/auths/new">{{.i18n.Tr "admin.auths.new"}}</a> <a class="btn-blue btn-medium btn-link btn-radius" href="{{AppSubUrl}}/admin/auths/new">{{.i18n.Tr "admin.auths.new"}}</a>
<div class="admin-table"> <div class="admin-table">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
@ -31,20 +31,20 @@
{{range .Sources}} {{range .Sources}}
<tr> <tr>
<td>{{.Id}}</td> <td>{{.Id}}</td>
<td><a href="{{AppRootSubUrl}}/admin/auths/{{.Id}}">{{.Name}}</a></td> <td><a href="{{AppSubUrl}}/admin/auths/{{.Id}}">{{.Name}}</a></td>
<td>{{.TypeString}}</td> <td>{{.TypeString}}</td>
<td><i class="fa fa{{if .IsActived}}-check{{end}}-square-o"></i></td> <td><i class="fa fa{{if .IsActived}}-check{{end}}-square-o"></i></td>
<td>{{DateFormat .Updated "M d, Y"}}</td> <td>{{DateFormat .Updated "M d, Y"}}</td>
<td>{{DateFormat .Created "M d, Y"}}</td> <td>{{DateFormat .Created "M d, Y"}}</td>
<td><a href="{{AppRootSubUrl}}/admin/auths/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td> <td><a href="{{AppSubUrl}}/admin/auths/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td>
</tr> </tr>
{{end}} {{end}}
</tbody> </tbody>
</table> </table>
{{if or .LastPageNum .NextPageNum}} {{if or .LastPageNum .NextPageNum}}
<ul class="pagination"> <ul class="pagination">
{{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/auths?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}} {{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/auths?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}}
{{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/auths?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}} {{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/auths?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}}
</ul> </ul>
{{end}} {{end}}
</div> </div>

2
templates/admin/auth/new.tmpl
View file

@ -12,7 +12,7 @@
<div class="panel-header"> <div class="panel-header">
<strong>{{.i18n.Tr "admin.auths.new"}}</strong> <strong>{{.i18n.Tr "admin.auths.new"}}</strong>
</div> </div>
<form class="form form-align panel-body" id="repo-setting-form" action="{{AppRootSubUrl}}/admin/auths/new" method="post"> <form class="form form-align panel-body" id="repo-setting-form" action="{{AppSubUrl}}/admin/auths/new" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="field"> <div class="field">
<label class="req">{{.i18n.Tr "admin.auths.auth_type"}}</label> <label class="req">{{.i18n.Tr "admin.auths.auth_type"}}</label>

4
templates/admin/dashboard.tmpl
View file

@ -34,11 +34,11 @@
<tbody> <tbody>
<tr> <tr>
<td>{{.i18n.Tr "admin.dashboard.clean_unbind_oauth"}}</td> <td>{{.i18n.Tr "admin.dashboard.clean_unbind_oauth"}}</td>
<td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppRootSubUrl}}/admin?op=1">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td> <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=1">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
</tr> </tr>
<tr> <tr>
<td>{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}}</td> <td>{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}}</td>
<td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppRootSubUrl}}/admin?op=2">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td> <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=2">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

14
templates/admin/nav.tmpl
View file

@ -2,13 +2,13 @@
<p class="panel-header"><strong>{{.i18n.Tr "admin_panel"}}</strong></p> <p class="panel-header"><strong>{{.i18n.Tr "admin_panel"}}</strong></p>
<div class="panel-body"> <div class="panel-body">
<ul class="menu menu-vertical switching-list grid-1-5 left"> <ul class="menu menu-vertical switching-list grid-1-5 left">
<li {{if .PageIsAdminDashboard}}class="current"{{end}}><a href="{{AppRootSubUrl}}/admin">{{.i18n.Tr "admin.dashboard"}}</a></li> <li {{if .PageIsAdminDashboard}}class="current"{{end}}><a href="{{AppSubUrl}}/admin">{{.i18n.Tr "admin.dashboard"}}</a></li>
<li {{if .PageIsAdminUsers}}class="current"{{end}}><a href="{{AppRootSubUrl}}/admin/users">{{.i18n.Tr "admin.users"}}</a></li> <li {{if .PageIsAdminUsers}}class="current"{{end}}><a href="{{AppSubUrl}}/admin/users">{{.i18n.Tr "admin.users"}}</a></li>
<li {{if .PageIsAdminOrganizations}}class="current"{{end}}><a href="{{AppRootSubUrl}}/admin/orgs">{{.i18n.Tr "admin.organizations"}}</a></li> <li {{if .PageIsAdminOrganizations}}class="current"{{end}}><a href="{{AppSubUrl}}/admin/orgs">{{.i18n.Tr "admin.organizations"}}</a></li>
<li {{if .PageIsAdminRepositories}}class="current"{{end}}><a href="{{AppRootSubUrl}}/admin/repos">{{.i18n.Tr "admin.repositories"}}</a></li> <li {{if .PageIsAdminRepositories}}class="current"{{end}}><a href="{{AppSubUrl}}/admin/repos">{{.i18n.Tr "admin.repositories"}}</a></li>
<li {{if .PageIsAdminAuthentications}}class="current"{{end}}><a href="{{AppRootSubUrl}}/admin/auths">{{.i18n.Tr "admin.authentication"}}</a></li> <li {{if .PageIsAdminAuthentications}}class="current"{{end}}><a href="{{AppSubUrl}}/admin/auths">{{.i18n.Tr "admin.authentication"}}</a></li>
<li {{if .PageIsAdminConfig}}class="current"{{end}}><a href="{{AppRootSubUrl}}/admin/config">{{.i18n.Tr "admin.config"}}</a></li> <li {{if .PageIsAdminConfig}}class="current"{{end}}><a href="{{AppSubUrl}}/admin/config">{{.i18n.Tr "admin.config"}}</a></li>
<li {{if .PageIsAdminMonitor}}class="current"{{end}}><a href="{{AppRootSubUrl}}/admin/monitor">{{.i18n.Tr "admin.monitor"}}</a></li> <li {{if .PageIsAdminMonitor}}class="current"{{end}}><a href="{{AppSubUrl}}/admin/monitor">{{.i18n.Tr "admin.monitor"}}</a></li>
</ul> </ul>
</div> </div>
</div> </div>

6
templates/admin/org/list.tmpl
View file

@ -30,7 +30,7 @@
{{range .Orgs}} {{range .Orgs}}
<tr> <tr>
<td>{{.Id}}</td> <td>{{.Id}}</td>
<td><a href="{{AppRootSubUrl}}/org/{{.Name}}">{{.Name}}</a></td> <td><a href="{{AppSubUrl}}/org/{{.Name}}">{{.Name}}</a></td>
<td>{{.Email}}</td> <td>{{.Email}}</td>
<td>{{.NumTeams}}</td> <td>{{.NumTeams}}</td>
<td>{{.NumMembers}}</td> <td>{{.NumMembers}}</td>
@ -42,8 +42,8 @@
</table> </table>
{{if or .LastPageNum .NextPageNum}} {{if or .LastPageNum .NextPageNum}}
<ul class="pagination"> <ul class="pagination">
{{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/orgs?p={{.LastPageNum}}">&laquo; {{.i18n.Tr "admin.prev"}}</a></li>{{end}} {{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/orgs?p={{.LastPageNum}}">&laquo; {{.i18n.Tr "admin.prev"}}</a></li>{{end}}
{{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/orgs?p={{.NextPageNum}}">&raquo; {{.i18n.Tr "admin.next"}}</a></li>{{end}} {{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/orgs?p={{.NextPageNum}}">&raquo; {{.i18n.Tr "admin.next"}}</a></li>{{end}}
</ul> </ul>
{{end}} {{end}}
</div> </div>

8
templates/admin/repo/list.tmpl
View file

@ -31,8 +31,8 @@
{{range .Repos}} {{range .Repos}}
<tr> <tr>
<td>{{.Id}}</td> <td>{{.Id}}</td>
<td><a href="{{AppRootSubUrl}}/user/{{.Owner.Name}}">{{.Owner.Name}}</a></td> <td><a href="{{AppSubUrl}}/user/{{.Owner.Name}}">{{.Owner.Name}}</a></td>
<td><a href="{{AppRootSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td> <td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td>
<td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td> <td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
<td>{{.NumWatches}}</td> <td>{{.NumWatches}}</td>
<td>{{.NumIssues}}</td> <td>{{.NumIssues}}</td>
@ -44,8 +44,8 @@
</table> </table>
{{if or .LastPageNum .NextPageNum}} {{if or .LastPageNum .NextPageNum}}
<ul class="pagination"> <ul class="pagination">
{{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/repos?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}} {{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/repos?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}}
{{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/repos?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}} {{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/repos?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}}
</ul> </ul>
{{end}} {{end}}
</div> </div>

2
templates/admin/user/edit.tmpl
View file

@ -12,7 +12,7 @@
<div class="panel-header"> <div class="panel-header">
<strong>{{.i18n.Tr "admin.users.edit_account"}}</strong> <strong>{{.i18n.Tr "admin.users.edit_account"}}</strong>
</div> </div>
<form class="form form-align panel-body" id="user-profile-form" action="{{AppRootSubUrl}}/admin/users/{{.User.Id}}" method="post" data-delete-url="/admin/users/{{.User.Id}}/delete"> <form class="form form-align panel-body" id="user-profile-form" action="{{AppSubUrl}}/admin/users/{{.User.Id}}" method="post" data-delete-url="/admin/users/{{.User.Id}}/delete">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="field"> <div class="field">
<label class="req">{{.i18n.Tr "admin.users.auth_source"}}</label> <label class="req">{{.i18n.Tr "admin.users.auth_source"}}</label>

10
templates/admin/user/list.tmpl
View file

@ -13,7 +13,7 @@
<strong>{{.i18n.Tr "admin.users.user_manage_panel"}}</strong> <strong>{{.i18n.Tr "admin.users.user_manage_panel"}}</strong>
</div> </div>
<div class="panel-body admin-panel"> <div class="panel-body admin-panel">
<a class="btn-blue btn-medium btn-link btn-radius" href="{{AppRootSubUrl}}/admin/users/new">{{.i18n.Tr "admin.users.new_account"}}</a> <a class="btn-blue btn-medium btn-link btn-radius" href="{{AppSubUrl}}/admin/users/new">{{.i18n.Tr "admin.users.new_account"}}</a>
<div class="admin-table"> <div class="admin-table">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
@ -32,21 +32,21 @@
{{range .Users}} {{range .Users}}
<tr> <tr>
<td>{{.Id}}</td> <td>{{.Id}}</td>
<td><a href="{{AppRootSubUrl}}/user/{{.Name}}">{{.Name}}</a></td> <td><a href="{{AppSubUrl}}/user/{{.Name}}">{{.Name}}</a></td>
<td>{{.Email}}</td> <td>{{.Email}}</td>
<td><i class="fa fa{{if .IsActive}}-check{{end}}-square-o"></i></td> <td><i class="fa fa{{if .IsActive}}-check{{end}}-square-o"></i></td>
<td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td> <td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td>
<td>{{.NumRepos}}</td> <td>{{.NumRepos}}</td>
<td>{{DateFormat .Created "M d, Y"}}</td> <td>{{DateFormat .Created "M d, Y"}}</td>
<td><a href="{{AppRootSubUrl}}/admin/users/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td> <td><a href="{{AppSubUrl}}/admin/users/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td>
</tr> </tr>
{{end}} {{end}}
</tbody> </tbody>
</table> </table>
{{if or .LastPageNum .NextPageNum}} {{if or .LastPageNum .NextPageNum}}
<ul class="pagination"> <ul class="pagination">
{{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/users?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}} {{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/users?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}}
{{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppRootSubUrl}}/admin/users?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}} {{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/users?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}}
</ul> </ul>
{{end}} {{end}}
</div> </div>

2
templates/admin/user/new.tmpl
View file

@ -12,7 +12,7 @@
<div class="panel-header"> <div class="panel-header">
<strong>{{.i18n.Tr "admin.users.new_account"}}</strong> <strong>{{.i18n.Tr "admin.users.new_account"}}</strong>
</div> </div>
<form class="form form-align panel-body" id="repo-setting-form" action="{{AppRootSubUrl}}/admin/users/new" method="post"> <form class="form form-align panel-body" id="repo-setting-form" action="{{AppSubUrl}}/admin/users/new" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="field"> <div class="field">
<label class="req">{{.i18n.Tr "admin.users.auth_source"}}</label> <label class="req">{{.i18n.Tr "admin.users.auth_source"}}</label>

26
templates/base/head.tmpl
View file

@ -1,8 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head{{if AppRootSubUrl}} data-suburl="{{AppRootSubUrl}}"{{end}}> <head{{if AppSubUrl}} data-suburl="{{AppSubUrl}}"{{end}}>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="shortcut icon" href="{{AppRootSubUrl}}/img/favicon.png" /> <link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" />
<meta http-equiv="X-UA-Compatible" content="IE=edge"/> <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="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="author" content="Gogs - Go Git Service" />
@ -19,21 +19,21 @@
<script src="//code.jquery.com/jquery-1.11.0.min.js"></script> <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script> <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
{{else}} {{else}}
<link href="{{AppRootSubUrl}}/css/bootstrap.min.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/bootstrap.min.css" rel="stylesheet" />
<link href="{{AppRootSubUrl}}/css/font-awesome.min.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/font-awesome.min.css" rel="stylesheet" />
<script src="{{AppRootSubUrl}}/js/jquery-1.10.1.min.js"></script> <script src="{{AppSubUrl}}/js/jquery-1.10.1.min.js"></script>
<script src="{{AppRootSubUrl}}/js/bootstrap.min.js"></script> <script src="{{AppSubUrl}}/js/bootstrap.min.js"></script>
{{end}} {{end}}
<link href="{{AppRootSubUrl}}/css/todc-bootstrap.min.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/todc-bootstrap.min.css" rel="stylesheet" />
<link href="{{AppRootSubUrl}}/css/datepicker3.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/datepicker3.css" rel="stylesheet" />
<link href="{{AppRootSubUrl}}/css/bootstrap-colorpicker.min.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/bootstrap-colorpicker.min.css" rel="stylesheet" />
<link href="{{AppRootSubUrl}}/css/markdown.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/markdown.css" rel="stylesheet" />
<link href="{{AppRootSubUrl}}/css/gogs.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/gogs.css" rel="stylesheet" />
<script src="{{AppRootSubUrl}}/js/lib.js"></script> <script src="{{AppSubUrl}}/js/lib.js"></script>
<script src="{{AppRootSubUrl}}/js/app.js"></script> <script src="{{AppSubUrl}}/js/app.js"></script>
<title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title> <title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title>
</head> </head>
<body> <body>

18
templates/base/navbar.tmpl
View file

@ -1,8 +1,8 @@
<div class="masthead navbar" id="masthead"> <div class="masthead navbar" id="masthead">
<div class="container"> <div class="container">
<nav class="nav"> <nav class="nav">
<a id="nav-logo" class="nav-item pull-left{{if .PageIsHome}} active{{end}}" href="{{AppRootSubUrl}}/"><img src="{{AppRootSubUrl}}/img/favicon.png" alt="Gogs Logo" id="logo"></a> <a id="nav-logo" class="nav-item pull-left{{if .PageIsHome}} active{{end}}" href="{{AppSubUrl}}/"><img src="{{AppSubUrl}}/img/favicon.png" alt="Gogs Logo" id="logo"></a>
<a class="nav-item pull-left{{if .PageIsUserDashboard}} active{{end}}" href="{{AppRootSubUrl}}/">Dashboard</a> <a class="nav-item pull-left{{if .PageIsUserDashboard}} active{{end}}" href="{{AppSubUrl}}/">Dashboard</a>
<a class="nav-item pull-left{{if .PageIsHelp}} active{{end}}" target="_blank" href="http://gogs.io/docs">Help</a> <a class="nav-item pull-left{{if .PageIsHelp}} active{{end}}" target="_blank" href="http://gogs.io/docs">Help</a>
{{if .IsSigned}} {{if .IsSigned}}
{{if .HasAccess}} {{if .HasAccess}}
@ -22,27 +22,27 @@
</div> </div>
</form> --> </form> -->
{{end}} {{end}}
<a id="nav-out" class="nav-item navbar-right navbar-btn btn btn-danger" href="{{AppRootSubUrl}}/user/logout/"><i class="fa fa-power-off fa-lg"></i></a> <a id="nav-out" class="nav-item navbar-right navbar-btn btn btn-danger" href="{{AppSubUrl}}/user/logout/"><i class="fa fa-power-off fa-lg"></i></a>
<a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}"> <a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
<img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/> <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/>
</a> </a>
<a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="{{AppRootSubUrl}}/user/settings" data-toggle="tooltip" data-placement="bottom" title="Settings"><i class="fa fa-cogs fa-lg"></i></a> <a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="{{AppSubUrl}}/user/settings" data-toggle="tooltip" data-placement="bottom" title="Settings"><i class="fa fa-cogs fa-lg"></i></a>
{{if .IsAdmin}} {{if .IsAdmin}}
<a class="navbar-right nav-item{{if .PageIsAdmin}} active{{end}}" href="{{AppRootSubUrl}}/admin" data-toggle="tooltip" data-placement="bottom" title="Admin"><i class="fa fa-gear fa-lg"></i></a> <a class="navbar-right nav-item{{if .PageIsAdmin}} active{{end}}" href="{{AppSubUrl}}/admin" data-toggle="tooltip" data-placement="bottom" title="Admin"><i class="fa fa-gear fa-lg"></i></a>
{{end}} {{end}}
<div class="navbar-right nav-item pull-right{{if .PageIsNewRepo}} active{{end}}" id="nav-repo-new" data-toggle="tooltip" data-placement="bottom" title="New Repo"> <div class="navbar-right nav-item pull-right{{if .PageIsNewRepo}} active{{end}}" id="nav-repo-new" data-toggle="tooltip" data-placement="bottom" title="New Repo">
<button type="button" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square fa-lg"></i></button> <button type="button" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square fa-lg"></i></button>
<div class="dropdown-menu"> <div class="dropdown-menu">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="{{AppRootSubUrl}}/repo/create"><i class="fa fa-book"></i>Repository</a></li> <li><a href="{{AppSubUrl}}/repo/create"><i class="fa fa-book"></i>Repository</a></li>
<li><a href="{{AppRootSubUrl}}/repo/migrate"><i class="fa fa-clipboard"></i>Migration</a></li> <li><a href="{{AppSubUrl}}/repo/migrate"><i class="fa fa-clipboard"></i>Migration</a></li>
<!-- <li><a href="#"><i class="fa fa-users"></i>Organization</a></li> --> <!-- <li><a href="#"><i class="fa fa-users"></i>Organization</a></li> -->
</ul> </ul>
</div> </div>
</div> </div>
{{else}} {{else}}
<a id="nav-signin" class="nav-item navbar-right navbar-btn btn btn-danger" href="{{AppRootSubUrl}}/user/login/" rel="nofollow">Sign In</a> <a id="nav-signin" class="nav-item navbar-right navbar-btn btn btn-danger" href="{{AppSubUrl}}/user/login/" rel="nofollow">Sign In</a>
<a id="nav-signup" class="nav-item navbar-right" href="{{AppRootSubUrl}}/user/sign_up/" rel="nofollow">Sign Up</a> <a id="nav-signup" class="nav-item navbar-right" href="{{AppSubUrl}}/user/sign_up/" rel="nofollow">Sign Up</a>
{{end}} {{end}}
</nav> </nav>
</div> </div>

2
templates/explore/nav.tmpl
View file

@ -2,7 +2,7 @@
<p class="panel-header"><strong>{{.i18n.Tr "explore"}}</strong></p> <p class="panel-header"><strong>{{.i18n.Tr "explore"}}</strong></p>
<div class="panel-body"> <div class="panel-body">
<ul class="menu menu-vertical switching-list grid-1-5 left"> <ul class="menu menu-vertical switching-list grid-1-5 left">
<li {{if .PageIsExploreRepositories}}class="current"{{end}}><a href="{{AppRootSubUrl}}/explore">{{.i18n.Tr "explore.repos"}}</a></li> <li {{if .PageIsExploreRepositories}}class="current"{{end}}><a href="{{AppSubUrl}}/explore">{{.i18n.Tr "explore.repos"}}</a></li>
</ul> </ul>
</div> </div>
</div> </div>

2
templates/explore/repos.tmpl
View file

@ -12,7 +12,7 @@
<li><i class="octicon octicon-star"></i> {{.NumStars}}</li> <li><i class="octicon octicon-star"></i> {{.NumStars}}</li>
<li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li> <li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li>
</ul> </ul>
<h2><a href="{{AppRootSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></h2> <h2><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></h2>
<p class="org-repo-description">{{.Description}}</p> <p class="org-repo-description">{{.Description}}</p>
<p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p> <p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
</div> </div>

4
templates/home.tmpl
View file

@ -3,12 +3,12 @@
<div id="promo-wrapper"> <div id="promo-wrapper">
<div class="container clear"> <div class="container clear">
<div id="promo-logo" class="left"> <div id="promo-logo" class="left">
<img src="{{AppRootSubUrl}}/img/gogs-lg.png" alt="logo" /> <img src="{{AppSubUrl}}/img/gogs-lg.png" alt="logo" />
</div> </div>
<div id="promo-content"> <div id="promo-content">
<h1>Gogs</h1> <h1>Gogs</h1>
<h2>{{.i18n.Tr "app_desc"}}</h2> <h2>{{.i18n.Tr "app_desc"}}</h2>
<form id="promo-form" action="{{AppRootSubUrl}}/user/login" method="post"> <form id="promo-form" action="{{AppSubUrl}}/user/login" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input class="ipt ipt-large" id="username" name="uname" type="text" placeholder="{{.i18n.Tr "home.uname_holder"}}"/> <input class="ipt ipt-large" id="username" name="uname" type="text" placeholder="{{.i18n.Tr "home.uname_holder"}}"/>
<input class="ipt ipt-large" name="password" type="password" placeholder="{{.i18n.Tr "home.password_holder"}}"/> <input class="ipt ipt-large" name="password" type="password" placeholder="{{.i18n.Tr "home.password_holder"}}"/>

2
templates/install.tmpl
View file

@ -8,7 +8,7 @@
<div class="panel-header"> <div class="panel-header">
<strong>{{.i18n.Tr "install.title"}}</strong> <strong>{{.i18n.Tr "install.title"}}</strong>
</div> </div>
<form class="form form-align panel-body" id="install-form" action="{{AppRootSubUrl}}/install" method="post"> <form class="form form-align panel-body" id="install-form" action="{{AppSubUrl}}/install" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="text-center panel-desc">{{.i18n.Tr "install.requite_db_desc"}}</div> <div class="text-center panel-desc">{{.i18n.Tr "install.requite_db_desc"}}</div>
<div class="field"> <div class="field">

22
templates/ng/base/head.tmpl
View file

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head{{if AppRootSubUrl}} data-suburl="{{AppRootSubUrl}}"{{end}}> <head{{if AppSubUrl}} data-suburl="{{AppSubUrl}}"{{end}}>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="author" content="Gogs - Go Git Service" /> <meta name="author" content="Gogs - Go Git Service" />
@ -9,27 +9,27 @@
<meta name="_csrf" content="{{.CsrfToken}}" /> <meta name="_csrf" content="{{.CsrfToken}}" />
{{if .Repository.IsGoget}}<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">{{end}} {{if .Repository.IsGoget}}<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">{{end}}
<link rel="shortcut icon" href="{{AppRootSubUrl}}/img/favicon.png" /> <link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" />
{{if CdnMode}} {{if CdnMode}}
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css"> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css">
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script> <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
{{else}} {{else}}
<link rel="stylesheet" href="{{AppRootSubUrl}}/css/font-awesome.min.css"> <link rel="stylesheet" href="{{AppSubUrl}}/css/font-awesome.min.css">
<script src="{{AppRootSubUrl}}/ng/js/lib/jquery-1.11.1.min.js"></script> <script src="{{AppSubUrl}}/ng/js/lib/jquery-1.11.1.min.js"></script>
{{end}} {{end}}
<!-- Stylesheet --> <!-- Stylesheet -->
<link rel="stylesheet" href="{{AppRootSubUrl}}/ng/css/ui.css"> <link rel="stylesheet" href="{{AppSubUrl}}/ng/css/ui.css">
<link rel="stylesheet" href="{{AppRootSubUrl}}/ng/css/gogs.css"> <link rel="stylesheet" href="{{AppSubUrl}}/ng/css/gogs.css">
<link rel="stylesheet" href="{{AppRootSubUrl}}/ng/fonts/octicons.css"> <link rel="stylesheet" href="{{AppSubUrl}}/ng/fonts/octicons.css">
<link rel="stylesheet" href="{{AppRootSubUrl}}/css/github.min.css"> <link rel="stylesheet" href="{{AppSubUrl}}/css/github.min.css">
<!-- JavaScript --> <!-- JavaScript -->
<script src="{{AppRootSubUrl}}/ng/js/lib/tabs.js"></script> <script src="{{AppSubUrl}}/ng/js/lib/tabs.js"></script>
<script src="{{AppRootSubUrl}}/ng/js/lib/lib.js"></script> <script src="{{AppSubUrl}}/ng/js/lib/lib.js"></script>
<script src="{{AppRootSubUrl}}/ng/js/gogs.js"></script> <script src="{{AppSubUrl}}/ng/js/gogs.js"></script>
<title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title> <title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title>
</head> </head>

26
templates/ng/base/header.tmpl
View file

@ -2,37 +2,37 @@
<ul class="menu menu-line container" id="header-nav"> <ul class="menu menu-line container" id="header-nav">
{{if not .PageIsHome}} {{if not .PageIsHome}}
<li class="head" id="header-nav-logo"> <li class="head" id="header-nav-logo">
<img src="{{AppRootSubUrl}}/img/favicon.png" alt="avatar" class="avatar-30"/> <img src="{{AppSubUrl}}/img/favicon.png" alt="avatar" class="avatar-30"/>
</li> </li>
<li {{if .PageIsDashboard}}class="current"{{end}}> <li {{if .PageIsDashboard}}class="current"{{end}}>
<a href="{{AppRootSubUrl}}/">{{if .IsSigned}}{{.i18n.Tr "dashboard"}}{{else}}{{.i18n.Tr "home"}}{{end}}</a> <a href="{{AppSubUrl}}/">{{if .IsSigned}}{{.i18n.Tr "dashboard"}}{{else}}{{.i18n.Tr "home"}}{{end}}</a>
</li> </li>
<li><a href="{{AppRootSubUrl}}/explore">{{.i18n.Tr "explore"}}</a></li> <li><a href="{{AppSubUrl}}/explore">{{.i18n.Tr "explore"}}</a></li>
<li><a target="_blank" href="http://gogs.io/docs">{{.i18n.Tr "help"}}</a></li> <li><a target="_blank" href="http://gogs.io/docs">{{.i18n.Tr "help"}}</a></li>
{{end}} {{end}}
{{if .IsSigned}} {{if .IsSigned}}
<li class="right" id="header-nav-sign-out"> <li class="right" id="header-nav-sign-out">
<a href="{{AppRootSubUrl}}/user/logout" title="{{.i18n.Tr "sign_out"}}"><i class="octicon octicon-sign-out"></i></a> <a href="{{AppSubUrl}}/user/logout" title="{{.i18n.Tr "sign_out"}}"><i class="octicon octicon-sign-out"></i></a>
</li> </li>
<li class="right {{if .PageIsUserSettings}}current{{end}}"> <li class="right {{if .PageIsUserSettings}}current{{end}}">
<a href="{{AppRootSubUrl}}/user/settings" title="{{.i18n.Tr "account_settings"}}"><i class="octicon octicon-settings"></i></a> <a href="{{AppSubUrl}}/user/settings" title="{{.i18n.Tr "account_settings"}}"><i class="octicon octicon-settings"></i></a>
</li> </li>
{{if .IsAdmin}} {{if .IsAdmin}}
<li class="right {{if .PageIsAdmin}}current{{end}}"> <li class="right {{if .PageIsAdmin}}current{{end}}">
<a href="{{AppRootSubUrl}}/admin" title="{{.i18n.Tr "admin_panel"}}"><i class="octicon octicon-circuit-board"></i></a> <a href="{{AppSubUrl}}/admin" title="{{.i18n.Tr "admin_panel"}}"><i class="octicon octicon-circuit-board"></i></a>
</li> </li>
{{end}} {{end}}
<li class="right down"> <li class="right down">
<a href="#"><i class="octicon octicon-plus"></i></a> <a href="#"><i class="octicon octicon-plus"></i></a>
<ul class="menu menu-down" id="header-new-repo-menu"> <ul class="menu menu-down" id="header-new-repo-menu">
<li><a href="{{AppRootSubUrl}}/repo/create"><i class="octicon octicon-repo-create"></i>{{.i18n.Tr "new_repo"}}</a></li> <li><a href="{{AppSubUrl}}/repo/create"><i class="octicon octicon-repo-create"></i>{{.i18n.Tr "new_repo"}}</a></li>
<li><a href="{{AppRootSubUrl}}/repo/migrate"><i class="octicon octicon-repo-clone"></i>{{.i18n.Tr "new_migrate"}}</a></li> <li><a href="{{AppSubUrl}}/repo/migrate"><i class="octicon octicon-repo-clone"></i>{{.i18n.Tr "new_migrate"}}</a></li>
<li><a href="{{AppRootSubUrl}}/org/create"><i class="octicon octicon-organization"></i>{{.i18n.Tr "new_org"}}</a></li> <li><a href="{{AppSubUrl}}/org/create"><i class="octicon octicon-organization"></i>{{.i18n.Tr "new_org"}}</a></li>
</ul> </ul>
</li> </li>
<li class="right" id="header-nav-user"> <li class="right" id="header-nav-user">
<a href="{{AppRootSubUrl}}/{{.SignedUser.Name}}" class="text-bold"> <a href="{{AppSubUrl}}/{{.SignedUser.Name}}" class="text-bold">
<img src="{{.SignedUser.AvatarLink}}" alt="user-avatar" class="avatar-30"/> <img src="{{.SignedUser.AvatarLink}}" alt="user-avatar" class="avatar-30"/>
{{.SignedUser.Name}} {{.SignedUser.Name}}
</a> </a>
@ -43,14 +43,14 @@
<a target="_blank" href="http://gogs.io/docs"><i class="octicon octicon-info"></i>&nbsp;&nbsp;{{.i18n.Tr "help"}}</a> <a target="_blank" href="http://gogs.io/docs"><i class="octicon octicon-info"></i>&nbsp;&nbsp;{{.i18n.Tr "help"}}</a>
</li> </li>
<li class="right" id="header-nav-explore"> <li class="right" id="header-nav-explore">
<a href="{{AppRootSubUrl}}/explore"><i class="octicon octicon-globe"></i>&nbsp;&nbsp;{{.i18n.Tr "explore"}}</a> <a href="{{AppSubUrl}}/explore"><i class="octicon octicon-globe"></i>&nbsp;&nbsp;{{.i18n.Tr "explore"}}</a>
</li> </li>
{{else}} {{else}}
<li class="right" id="header-nav-sign-in"> <li class="right" id="header-nav-sign-in">
<a href="{{AppRootSubUrl}}/user/login" title="Sign In"><i class="octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}}</a> <a href="{{AppSubUrl}}/user/login" title="Sign In"><i class="octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}}</a>
</li> </li>
<li class="right"> <li class="right">
<a href="{{AppRootSubUrl}}/user/sign_up" title="Account Settings"><i class="octicon octicon-person-add"></i> {{.i18n.Tr "register"}}</a> <a href="{{AppSubUrl}}/user/sign_up" title="Account Settings"><i class="octicon octicon-person-add"></i> {{.i18n.Tr "register"}}</a>
</li> </li>
{{end}} {{end}}
{{end}} {{end}}

8
templates/ng/base/social.tmpl
View file

@ -1,4 +1,4 @@
{{if .OauthService.GitHub}}<a class="btn github" href="{{AppRootSubUrl}}/user/login/github?next=/user/sign_up"><i class="fa fa-github"></i>GitHub</a>{{end}} {{if .OauthService.GitHub}}<a class="btn github" href="{{AppSubUrl}}/user/login/github?next=/user/sign_up"><i class="fa fa-github"></i>GitHub</a>{{end}}
{{if .OauthService.Google}}<a class="btn google" href="{{AppRootSubUrl}}/user/login/google?next=/user/sign_up"><i class="fa fa-google"></i>Google +</a>{{end}} {{if .OauthService.Google}}<a class="btn google" href="{{AppSubUrl}}/user/login/google?next=/user/sign_up"><i class="fa fa-google"></i>Google +</a>{{end}}
{{if .OauthService.Weibo}}<a class="btn weibo" href="{{AppRootSubUrl}}/user/login/weibo?next=/user/sign_up"><i class="fa fa-weibo"></i>新浪微博</a>{{end}} {{if .OauthService.Weibo}}<a class="btn weibo" href="{{AppSubUrl}}/user/login/weibo?next=/user/sign_up"><i class="fa fa-weibo"></i>新浪微博</a>{{end}}
{{if .OauthService.Tencent}}<a class="btn qq" href="{{AppRootSubUrl}}/user/login/qq?next=/user/sign_up"><i class="fa fa-qq"></i>腾讯 QQ&nbsp;</a>{{end}} {{if .OauthService.Tencent}}<a class="btn qq" href="{{AppSubUrl}}/user/login/qq?next=/user/sign_up"><i class="fa fa-qq"></i>腾讯 QQ&nbsp;</a>{{end}}

2
templates/org/base/header.tmpl
View file

@ -1,6 +1,6 @@
<div class="org-header" id="org-header"> <div class="org-header" id="org-header">
<div class="container"> <div class="container">
<a class="text-black left" href="{{AppRootSubUrl}}/org/{{.Org.LowerName}}"> <a class="text-black left" href="{{AppSubUrl}}/org/{{.Org.LowerName}}">
<img class="avatar-48 left" src="{{.Org.AvatarLink}}?s=100"> <img class="avatar-48 left" src="{{.Org.AvatarLink}}?s=100">
<span class="org-name">{{.Org.FullName}}</span> <span class="org-name">{{.Org.FullName}}</span>
</a> </a>

4
templates/org/create.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="sign-wrapper"> <div id="sign-wrapper">
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppRootSubUrl}}/org/create" method="post"> <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/org/create" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="panel-header"> <div class="panel-header">
<h2>{{.i18n.Tr "new_org"}}</h2> <h2>{{.i18n.Tr "new_org"}}</h2>
@ -23,7 +23,7 @@
<div class="field"> <div class="field">
<span class="form-label"></span> <span class="form-label"></span>
<button class="btn btn-large btn-blue btn-radius">{{.i18n.Tr "org.create_org"}}</button> <button class="btn btn-large btn-blue btn-radius">{{.i18n.Tr "org.create_org"}}</button>
<a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppRootSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a> <a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a>
</div> </div>
</div> </div>
</form> </form>

16
templates/org/home.tmpl
View file

@ -22,7 +22,7 @@
<div id="org-home-repo-list" class="left grid-2-3"> <div id="org-home-repo-list" class="left grid-2-3">
<div class="clear"> <div class="clear">
{{if .IsOrganizationOwner}} {{if .IsOrganizationOwner}}
<a class="btn btn-green btn-large btn-link btn-radius right" href="{{AppRootSubUrl}}/repo/create?org={{.Org.Id}}"><i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}</a> <a class="btn btn-green btn-large btn-link btn-radius right" href="{{AppSubUrl}}/repo/create?org={{.Org.Id}}"><i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}</a>
{{end}} {{end}}
</div> </div>
<div id="org-repo-list"> <div id="org-repo-list">
@ -33,7 +33,7 @@
<li><i class="octicon octicon-star"></i> {{.NumStars}}</li> <li><i class="octicon octicon-star"></i> {{.NumStars}}</li>
<li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li> <li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li>
</ul> </ul>
<h2><a href="{{AppRootSubUrl}}/{{$.Org.Name}}/{{.Name}}">{{.Name}}</a></h2> <h2><a href="{{AppSubUrl}}/{{$.Org.Name}}/{{.Name}}">{{.Name}}</a></h2>
<p class="org-repo-description">{{.Description}}</p> <p class="org-repo-description">{{.Description}}</p>
<p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p> <p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
</div> </div>
@ -46,20 +46,20 @@
<div class="panel panel-radius"> <div class="panel panel-radius">
<div class="panel-header"> <div class="panel-header">
{{if $isMember}} {{if $isMember}}
<a class="text-grey right" href="{{AppRootSubUrl}}/org/{{.Org.LowerName}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a> <a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a>
{{end}} {{end}}
<strong>{{.i18n.Tr "org.people"}}</strong> <strong>{{.i18n.Tr "org.people"}}</strong>
</div> </div>
<div class="panel-body member-avatar-group"> <div class="panel-body member-avatar-group">
{{range .Members}} {{range .Members}}
{{if or $isMember (.IsPublicMember $.Org.Id)}} {{if or $isMember (.IsPublicMember $.Org.Id)}}
<a href="{{AppRootSubUrl}}/{{.Name}}" title="{{.Name}}"><img src="{{.AvatarLink}}"></a> <a href="{{AppSubUrl}}/{{.Name}}" title="{{.Name}}"><img src="{{.AvatarLink}}"></a>
{{end}} {{end}}
{{end}} {{end}}
</div> </div>
{{if .IsOrganizationOwner}} {{if .IsOrganizationOwner}}
<div class="panel-footer"> <div class="panel-footer">
<a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppRootSubUrl}}/org/{{.Org.LowerName}}/invitations/new">{{.i18n.Tr "org.invite_someone"}}</a> <a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/invitations/new">{{.i18n.Tr "org.invite_someone"}}</a>
</div> </div>
{{end}} {{end}}
</div> </div>
@ -67,14 +67,14 @@
<br> <br>
<div class="panel panel-radius"> <div class="panel panel-radius">
<div class="panel-header"> <div class="panel-header">
<a class="text-grey right" href="{{AppRootSubUrl}}/org/{{.Org.LowerName}}/teams"><strong>{{.Org.NumTeams}}</strong><span class="octicon octicon-chevron-right"></span></a> <a class="text-grey right" href="{{AppSubUrl}}/org/{{.Org.LowerName}}/teams"><strong>{{.Org.NumTeams}}</strong><span class="octicon octicon-chevron-right"></span></a>
<strong>{{.i18n.Tr "org.teams"}}</strong> <strong>{{.i18n.Tr "org.teams"}}</strong>
</div> </div>
<div class="panel-body" id="org-home-team-list"> <div class="panel-body" id="org-home-team-list">
<ul> <ul>
{{range .Teams}} {{range .Teams}}
<li> <li>
<a class="text-black" href="{{AppRootSubUrl}}/org/{{$.Org.LowerName}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a> <a class="text-black" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p> <p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
</li> </li>
{{end}} {{end}}
@ -82,7 +82,7 @@
</div> </div>
{{if .IsOrganizationOwner}} {{if .IsOrganizationOwner}}
<div class="panel-footer"> <div class="panel-footer">
<a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppRootSubUrl}}/org/{{$.Org.LowerName}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a> <a class="btn btn-medium btn-blue btn-link btn-radius" href="{{AppSubUrl}}/org/{{$.Org.LowerName}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
</div> </div>
{{end}} {{end}}
</div> </div>

2
templates/org/member/members.tmpl
View file

@ -14,7 +14,7 @@
{{range .Members}} {{range .Members}}
<div class="org-member-item"> <div class="org-member-item">
<img class="avatar-48 left" src="{{.AvatarLink}}?s=100"> <img class="avatar-48 left" src="{{.AvatarLink}}?s=100">
<a class="text-black" href="{{AppRootSubUrl}}/{{.Name}}"><span class="member-name"><strong>{{.FullName}}</strong>({{.Name}})</span></a> <a class="text-black" href="{{AppSubUrl}}/{{.Name}}"><span class="member-name"><strong>{{.FullName}}</strong>({{.Name}})</span></a>
<ul class="grid-6-12 right"> <ul class="grid-6-12 right">
<li class="grid-1-3"> <li class="grid-1-3">
{{ $isPublic := .IsPublicMember $.Org.Id}} {{ $isPublic := .IsPublicMember $.Org.Id}}

4
templates/org/new.tmpl
View file

@ -1,7 +1,7 @@
{{template "base/head" .}} {{template "base/head" .}}
{{template "base/navbar" .}} {{template "base/navbar" .}}
<div class="container" id="body"> <div class="container" id="body">
<form action="{{AppRootSubUrl}}/org/create" method="post" class="form-horizontal card" id="org-create"> <form action="{{AppSubUrl}}/org/create" method="post" class="form-horizontal card" id="org-create">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<h3>Create New Organization</h3> <h3>Create New Organization</h3>
{{template "base/alert" .}} {{template "base/alert" .}}
@ -24,7 +24,7 @@
<div class="form-group"> <div class="form-group">
<div class="col-md-offset-2 col-md-8"> <div class="col-md-offset-2 col-md-8">
<button type="submit" class="btn btn-lg btn-primary">Create An Organization</button> <button type="submit" class="btn btn-lg btn-primary">Create An Organization</button>
<a href="{{AppRootSubUrl}}/" class="text-danger">Cancel</a> <a href="{{AppSubUrl}}/" class="text-danger">Cancel</a>
</div> </div>
</div> </div>
</form> </form>

2
templates/org/settings/delete.tmpl
View file

@ -12,7 +12,7 @@
<p class="panel-header"><strong>{{.i18n.Tr "org.settings.delete_account"}}</strong></p> <p class="panel-header"><strong>{{.i18n.Tr "org.settings.delete_account"}}</strong></p>
<div class="panel-body panel-content"> <div class="panel-body panel-content">
<span class="alert alert-red alert-radius block"><i class="octicon octicon-alert"></i>{{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</span> <span class="alert alert-red alert-radius block"><i class="octicon octicon-alert"></i>{{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</span>
<form action="{{AppRootSubUrl}}/org/{{.Org.LowerName}}/settings/delete" method="post"> <form action="{{AppSubUrl}}/org/{{.Org.LowerName}}/settings/delete" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<p class="field"> <p class="field">
<span class="form-label"></span> <span class="form-label"></span>

6
templates/org/settings/nav.tmpl
View file

@ -4,9 +4,9 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<ul class="menu menu-vertical switching-list grid-1-5 left"> <ul class="menu menu-vertical switching-list grid-1-5 left">
<li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{AppRootSubUrl}}/org/{{.Org.LowerName}}/settings">{{.i18n.Tr "org.settings.options"}}</a></li> <li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{AppSubUrl}}/org/{{.Org.LowerName}}/settings">{{.i18n.Tr "org.settings.options"}}</a></li>
<li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{AppRootSubUrl}}/org/{{.Org.LowerName}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li> <li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{AppSubUrl}}/org/{{.Org.LowerName}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li>
<li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{AppRootSubUrl}}/org/{{.Org.LowerName}}/settings/delete">{{.i18n.Tr "org.settings.delete"}}</a></li> <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{AppSubUrl}}/org/{{.Org.LowerName}}/settings/delete">{{.i18n.Tr "org.settings.delete"}}</a></li>
</ul> </ul>
</div> </div>
</div> </div>

2
templates/org/settings/options.tmpl
View file

@ -12,7 +12,7 @@
<div class="panel-header"> <div class="panel-header">
<strong>{{.i18n.Tr "org.settings.options"}}</strong> <strong>{{.i18n.Tr "org.settings.options"}}</strong>
</div> </div>
<form class="form form-align panel-body" id="org-setting-form" action="{{AppRootSubUrl}}/org/{{.Org.LowerName}}/settings" method="post"> <form class="form form-align panel-body" id="org-setting-form" action="{{AppSubUrl}}/org/{{.Org.LowerName}}/settings" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" name="action" value="update"> <input type="hidden" name="action" value="update">
<div class="field"> <div class="field">

2
templates/org/team/members.tmpl
View file

@ -30,7 +30,7 @@
{{if $.IsOrganizationOwner}} {{if $.IsOrganizationOwner}}
<a class="btn btn-small btn-red btn-radius right" href="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/remove?uid={{.Id}}">{{$.i18n.Tr "org.members.remove"}}</a> <a class="btn btn-small btn-red btn-radius right" href="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/remove?uid={{.Id}}">{{$.i18n.Tr "org.members.remove"}}</a>
{{end}} {{end}}
<a class="member" href="{{AppRootSubUrl}}/{{.Name}}"> <a class="member" href="{{AppSubUrl}}/{{.Name}}">
<img alt="{{.Name}}" class="pull-left avatar" src="{{.AvatarLink}}"> <img alt="{{.Name}}" class="pull-left avatar" src="{{.AvatarLink}}">
<strong>{{.FullName}}</strong> ({{.Name}}) <strong>{{.FullName}}</strong> ({{.Name}})
</a> </a>

2
templates/org/team/repositories.tmpl
View file

@ -30,7 +30,7 @@
{{if $canAddRemove}} {{if $canAddRemove}}
<a class="btn btn-small btn-red btn-radius right" href="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/remove?repoid={{.Id}}">{{$.i18n.Tr "org.teams.remove_repo"}}</a> <a class="btn btn-small btn-red btn-radius right" href="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/remove?repoid={{.Id}}">{{$.i18n.Tr "org.teams.remove_repo"}}</a>
{{end}} {{end}}
<a class="member" href="{{AppRootSubUrl}}/{{$.Org.Name}}/{{.Name}}"> <a class="member" href="{{AppSubUrl}}/{{$.Org.Name}}/{{.Name}}">
<i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i> <i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i>
<strong>{{$.Org.Name}}/{{.Name}}</strong> <strong>{{$.Org.Name}}/{{.Name}}</strong>
</a> </a>

2
templates/org/team/teams.tmpl
View file

@ -25,7 +25,7 @@
{{if .NumMembers}} {{if .NumMembers}}
<div class="panel-body member-avatar-group"> <div class="panel-body member-avatar-group">
{{range .Members}} {{range .Members}}
<a href="{{AppRootSubUrl}}/{{.Name}}" title="{{.Name}}"> <a href="{{AppSubUrl}}/{{.Name}}" title="{{.Name}}">
<img src="{{.AvatarLink}}"> <img src="{{.AvatarLink}}">
</a> </a>
{{end}} {{end}}

2
templates/repo/bare.tmpl
View file

@ -5,7 +5,7 @@
<div class="container clear"> <div class="container clear">
<h1 id="repo-header-name" class="left public"> <h1 id="repo-header-name" class="left public">
<i class="mega-octicon octicon-{{if .Repository.IsPrivate}}lock{{else}}repo{{end}}"></i> <i class="mega-octicon octicon-{{if .Repository.IsPrivate}}lock{{else}}repo{{end}}"></i>
<a class="author" href="{{AppRootSubUrl}}/{{.Repository.Owner.Name}}">{{.Repository.Owner.Name}}</a> <a class="author" href="{{AppSubUrl}}/{{.Repository.Owner.Name}}">{{.Repository.Owner.Name}}</a>
<span class="divider">/</span> <span class="divider">/</span>
<a class="repo text-bold" href="{{.RepoLink}}">{{.Repository.Name}}</a> <a class="repo text-bold" href="{{.RepoLink}}">{{.Repository.Name}}</a>
</h1> </h1>

4
templates/repo/commits_table.tmpl
View file

@ -26,8 +26,8 @@
{{$r := List .Commits}} {{$r := List .Commits}}
{{range $r}} {{range $r}}
<tr> <tr>
<td class="author"><img class="avatar" src="{{AvatarLink .Author.Email}}" alt=""/><a href="{{AppRootSubUrl}}/user/email2user?email={{.Author.Email}}">{{.Author.Name}}</a></td> <td class="author"><img class="avatar" src="{{AvatarLink .Author.Email}}" alt=""/><a href="{{AppSubUrl}}/user/email2user?email={{.Author.Email}}">{{.Author.Name}}</a></td>
<td class="sha"><a rel="nofollow" class="label label-success" href="{{AppRootSubUrl}}/{{$username}}/{{$reponame}}/commit/{{.Id}} ">{{SubStr .Id.String 0 10}} </a></td> <td class="sha"><a rel="nofollow" class="label label-success" href="{{AppSubUrl}}/{{$username}}/{{$reponame}}/commit/{{.Id}} ">{{SubStr .Id.String 0 10}} </a></td>
<td class="message">{{.Summary}} </td> <td class="message">{{.Summary}} </td>
<td class="date">{{TimeSince .Author.When $.Lang}}</td> <td class="date">{{TimeSince .Author.When $.Lang}}</td>
</tr> </tr>

4
templates/repo/create.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="repo-wrapper"> <div id="repo-wrapper">
<form id="repo-create-form" class="form form-align panel panel-radius" action="{{AppRootSubUrl}}/repo/create" method="post"> <form id="repo-create-form" class="form form-align panel panel-radius" action="{{AppSubUrl}}/repo/create" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="panel-header"> <div class="panel-header">
<h2>{{.i18n.Tr "new_repo"}}</h2> <h2>{{.i18n.Tr "new_repo"}}</h2>
@ -75,7 +75,7 @@
<div class="field"> <div class="field">
<label></label> <label></label>
<button class="btn btn-large btn-blue btn-radius">{{.i18n.Tr "repo.create_repo"}}</button> <button class="btn btn-large btn-blue btn-radius">{{.i18n.Tr "repo.create_repo"}}</button>
<a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppRootSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a> <a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a>
</div> </div>
</div> </div>
</form> </form>

2
templates/repo/diff.tmpl
View file

@ -30,7 +30,7 @@
</span> </span>
<p class="author"> <p class="author">
<img class="avatar" src="{{AvatarLink .Commit.Author.Email}}" alt=""/> <img class="avatar" src="{{AvatarLink .Commit.Author.Email}}" alt=""/>
<a class="name" href="{{AppRootSubUrl}}/user/email2user?email={{.Commit.Author.Email}}"><strong>{{.Commit.Author.Name}}</strong></a> <a class="name" href="{{AppSubUrl}}/user/email2user?email={{.Commit.Author.Email}}"><strong>{{.Commit.Author.Name}}</strong></a>
<span class="time">{{TimeSince .Commit.Author.When $.Lang}}</span> <span class="time">{{TimeSince .Commit.Author.When $.Lang}}</span>
</p> </p>
</div> </div>

2
templates/repo/header.tmpl
View file

@ -2,7 +2,7 @@
<div class="container clear"> <div class="container clear">
<h1 id="repo-header-name" class="left public"> <h1 id="repo-header-name" class="left public">
<i class="mega-octicon octicon-{{if .Repository.IsPrivate}}lock{{else if .Repository.IsMirror}}repo-clone{{else}}repo{{end}}"></i> <i class="mega-octicon octicon-{{if .Repository.IsPrivate}}lock{{else if .Repository.IsMirror}}repo-clone{{else}}repo{{end}}"></i>
<a class="author" href="{{AppRootSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a> <a class="author" href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
<span class="divider">/</span> <span class="divider">/</span>
<a class="repo text-bold" href="{{.RepoLink}}">{{.Repository.Name}}</a> <a class="repo text-bold" href="{{.RepoLink}}">{{.Repository.Name}}</a>
{{if .Repository.IsMirror}}<span class="label label-gray">{{.i18n.Tr "mirror"}}</span>{{end}} {{if .Repository.IsMirror}}<span class="label label-gray">{{.i18n.Tr "mirror"}}</span>{{end}}

2
templates/repo/issue/list.tmpl
View file

@ -85,7 +85,7 @@
</h5> </h5>
<p class="info"> <p class="info">
<span class="author"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" width="20"/> <span class="author"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" width="20"/>
<a href="{{AppRootSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a></span> <a href="{{AppSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a></span>
<span class="time">{{TimeSince .Created $.Lang}}</span> <span class="time">{{TimeSince .Created $.Lang}}</span>
<span class="comment"><i class="fa fa-comments"></i> {{.NumComments}}</span> <span class="comment"><i class="fa fa-comments"></i> {{.NumComments}}</span>
</p> </p>

26
templates/repo/issue/view.tmpl
View file

@ -8,7 +8,7 @@
<div class="issue-wrap col-md-10"> <div class="issue-wrap col-md-10">
<div class="issue-head clearfix"> <div class="issue-head clearfix">
<div class="number pull-right">#{{.Issue.Index}}</div> <div class="number pull-right">#{{.Issue.Index}}</div>
<a class="author pull-left" href="{{AppRootSubUrl}}/user/{{.Issue.Poster.Name}}"><img class="avatar" src="{{.Issue.Poster.AvatarLink}}" alt="" width="30"/></a> <a class="author pull-left" href="{{AppSubUrl}}/user/{{.Issue.Poster.Name}}"><img class="avatar" src="{{.Issue.Poster.AvatarLink}}" alt="" width="30"/></a>
<h1 class="title pull-left">{{.Issue.Name}}</h1> <h1 class="title pull-left">{{.Issue.Name}}</h1>
<input id="issue-edit-title" class="form-control input-lg pull-left hidden" type="text" value="{{.Issue.Name}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="title"/> <input id="issue-edit-title" class="form-control input-lg pull-left hidden" type="text" value="{{.Issue.Name}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="title"/>
<input type="hidden" value="{{.Issue.Id}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="issue_id"/> <input type="hidden" value="{{.Issue.Id}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="issue_id"/>
@ -17,7 +17,7 @@
<a class="btn btn-danger pull-right issue-edit-cancel hidden" href="#">Cancel</a> <a class="btn btn-danger pull-right issue-edit-cancel hidden" href="#">Cancel</a>
<a class="btn btn-primary pull-right issue-edit-save hidden" href="#" data-ajax="{{.RepoLink}}/issues/{{.Issue.Index}}" data-ajax-name="issue-edit-save" data-ajax-method="post">Save</a>{{end}} <a class="btn btn-primary pull-right issue-edit-save hidden" href="#" data-ajax="{{.RepoLink}}/issues/{{.Issue.Index}}" data-ajax-name="issue-edit-save" data-ajax-method="post">Save</a>{{end}}
<span class="status label label-{{if .Issue.IsClosed}}danger{{else}}success{{end}}">{{if .Issue.IsClosed}}Closed{{else}}Open{{end}}</span> <span class="status label label-{{if .Issue.IsClosed}}danger{{else}}success{{end}}">{{if .Issue.IsClosed}}Closed{{else}}Open{{end}}</span>
<a href="{{AppRootSubUrl}}/user/{{.Issue.Poster.Name}}" class="author"><strong>{{.Issue.Poster.Name}}</strong></a> opened this issue <a href="{{AppSubUrl}}/user/{{.Issue.Poster.Name}}" class="author"><strong>{{.Issue.Poster.Name}}</strong></a> opened this issue
<span class="time">{{TimeSince .Issue.Created $.Lang}}</span> · {{.Issue.NumComments}} comments <span class="time">{{TimeSince .Issue.Created $.Lang}}</span> · {{.Issue.NumComments}} comments
</p> </p>
</div> </div>
@ -63,10 +63,10 @@
{{/* 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE, 4 = COMMIT, 5 = PULL */}} {{/* 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE, 4 = COMMIT, 5 = PULL */}}
{{if eq .Type 0}} {{if eq .Type 0}}
<div class="issue-child" id="issue-comment-{{.Id}}"> <div class="issue-child" id="issue-comment-{{.Id}}">
<a class="user pull-left" href="{{AppRootSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> <a class="user pull-left" href="{{AppSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
<div class="issue-content panel panel-default"> <div class="issue-content panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<a href="{{AppRootSubUrl}}/user/{{.Poster.Name}}" class="user">{{.Poster.Name}}</a> commented <span class="time">{{TimeSince .Created $.Lang}}</span> <a href="{{AppSubUrl}}/user/{{.Poster.Name}}" class="user">{{.Poster.Name}}</a> commented <span class="time">{{TimeSince .Created $.Lang}}</span>
<!-- <a class="issue-comment-del pull-right issue-action" href="#" title="Edit Comment"><i class="fa fa-times-circle"></i></a> <!-- <a class="issue-comment-del pull-right issue-action" href="#" title="Edit Comment"><i class="fa fa-times-circle"></i></a>
<a class="issue-comment-edit pull-right issue-action" href="#" title="Remove Comment" data-url="{remove-link}"><i class="fa fa-edit"></i></a> --> <a class="issue-comment-edit pull-right issue-action" href="#" title="Remove Comment" data-url="{remove-link}"><i class="fa fa-edit"></i></a> -->
<span class="role label label-default pull-right">Owner</span> <span class="role label label-default pull-right">Owner</span>
@ -93,25 +93,25 @@
</div> </div>
{{else if eq .Type 1}} {{else if eq .Type 1}}
<div class="issue-child issue-opened"> <div class="issue-child issue-opened">
<a class="user pull-left" href="{{AppRootSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" /></a> <a class="user pull-left" href="{{AppSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" /></a>
<div class="issue-content"> <div class="issue-content">
<a class="user pull-left" href="{{AppRootSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-success">Reopened</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span> <a class="user pull-left" href="{{AppSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-success">Reopened</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
</div> </div>
</div> </div>
{{else if eq .Type 2}} {{else if eq .Type 2}}
<div class="issue-child issue-closed"> <div class="issue-child issue-closed">
<a class="user pull-left" href="{{AppRootSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> <a class="user pull-left" href="{{AppSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
<div class="issue-content"> <div class="issue-content">
<a class="user pull-left" href="{{AppRootSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span> <a class="user pull-left" href="{{AppSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
</div> </div>
</div> </div>
{{else if eq .Type 4}} {{else if eq .Type 4}}
<div class="issue-child issue-reference issue-reference-commit"> <div class="issue-child issue-reference issue-reference-commit">
<a class="user pull-left" href="{{AppRootSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> <a class="user pull-left" href="{{AppSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
<div class="issue-content"> <div class="issue-content">
<a class="user pull-left" href="{{AppRootSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-primary">Referenced</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span> <a class="user pull-left" href="{{AppSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-primary">Referenced</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
<p> <p>
<a class="user pull-left" href="{{AppRootSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> <a class="user pull-left" href="{{AppSubUrl}}/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
{{.ContentHtml}} {{.ContentHtml}}
</p> </p>
</div> </div>
@ -120,7 +120,7 @@
{{end}} {{end}}
<hr class="issue-line"/> <hr class="issue-line"/>
{{if .SignedUser}}<div class="issue-child issue-reply"> {{if .SignedUser}}<div class="issue-child issue-reply">
<a class="user pull-left" href="{{AppRootSubUrl}}/user/{{.SignedUser.Name}}"><img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/></a> <a class="user pull-left" href="{{AppSubUrl}}/user/{{.SignedUser.Name}}"><img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/></a>
<form class="panel panel-default issue-content" action="{{.RepoLink}}/comment/new" method="post" enctype="multipart/form-data"> <form class="panel panel-default issue-content" action="{{.RepoLink}}/comment/new" method="post" enctype="multipart/form-data">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="panel-body"> <div class="panel-body">
@ -163,7 +163,7 @@
</div> </div>
</div> </div>
</form> </form>
</div>{{else}}<div class="alert alert-warning"><a class="btn btn-success btn-lg" href="{{AppRootSubUrl}}/user/sign_up">Sign up for free</a> to join this conversation. Already have an account? <a href="{{AppRootSubUrl}}/user/login">Sign in to comment</a></div>{{end}} </div>{{else}}<div class="alert alert-warning"><a class="btn btn-success btn-lg" href="{{AppSubUrl}}/user/sign_up">Sign up for free</a> to join this conversation. Already have an account? <a href="{{AppSubUrl}}/user/login">Sign in to comment</a></div>{{end}}
</div> </div>
</div> </div>

4
templates/repo/migrate.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="repo-wrapper"> <div id="repo-wrapper">
<form id="repo-migrate-form" class="form form-align panel panel-radius" action="{{AppRootSubUrl}}/repo/migrate" method="post"> <form id="repo-migrate-form" class="form form-align panel panel-radius" action="{{AppSubUrl}}/repo/migrate" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="panel-header"><h2>{{.i18n.Tr "new_migrate"}}</h2></div> <div class="panel-header"><h2>{{.i18n.Tr "new_migrate"}}</h2></div>
<div class="panel-content"> <div class="panel-content">
@ -74,7 +74,7 @@
<div class="field"> <div class="field">
<label for="repo-create-submit"></label> <label for="repo-create-submit"></label>
<button class="btn btn-large btn-blue btn-radius" id="repo-create-submit">{{.i18n.Tr "repo.migrate_repo"}}</button> <button class="btn btn-large btn-blue btn-radius" id="repo-create-submit">{{.i18n.Tr "repo.migrate_repo"}}</button>
<a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppRootSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a> <a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a>
</div> </div>
</div> </div>
</form> </form>

6
templates/repo/nav.tmpl
View file

@ -2,7 +2,7 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / <a href="{{AppRootSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}">{{.Repository.Name}}</a> {{if .Repository.IsPrivate}}<span class="label label-default">Private</span>{{else if .Repository.IsMirror}}<span class="label label-default">Mirror</span>{{end}}</h3> <h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / <a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}">{{.Repository.Name}}</a> {{if .Repository.IsPrivate}}<span class="label label-default">Private</span>{{else if .Repository.IsMirror}}<span class="label label-default">Mirror</span>{{end}}</h3>
<p class="desc">{{.Repository.DescriptionHtml}}{{if .Repository.Website}} <a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}</p> <p class="desc">{{.Repository.DescriptionHtml}}{{if .Repository.Website}} <a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}</p>
</div> </div>
<div class="col-md-5 actions text-right clone-group-btn"> <div class="col-md-5 actions text-right clone-group-btn">
@ -32,7 +32,7 @@
</div> </div>
</div> </div>
{{if .IsSigned}} {{if .IsSigned}}
<div class="btn-group {{if .IsRepositoryWatching}}watching{{else}}no-watching{{end}}" id="repo-watching" data-watch="{{AppRootSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/watch" data-unwatch="{{AppRootSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/unwatch"> <div class="btn-group {{if .IsRepositoryWatching}}watching{{else}}no-watching{{end}}" id="repo-watching" data-watch="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/watch" data-unwatch="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/unwatch">
{{if .IsRepositoryWatching}} {{if .IsRepositoryWatching}}
<button type="button" class="btn btn-default"><i class="fa fa-eye fa-lg fa-m"></i></button> <button type="button" class="btn btn-default"><i class="fa fa-eye fa-lg fa-m"></i></button>
{{else}} {{else}}
@ -59,7 +59,7 @@
</div> --> </div> -->
{{end}} {{end}}
<!-- <div class="btn-group"> <!-- <div class="btn-group">
<a type="button" {{if not .IsRepositoryOwner}}href="{{AppRootSubUrl}}/{{.Username}}/{{.Reponame}}/fork"{{end}} class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Fork"><i class="fa fa-code-fork fa-lg"></i>&nbsp;{{.Repository.NumForks}}</a> <a type="button" {{if not .IsRepositoryOwner}}href="{{AppSubUrl}}/{{.Username}}/{{.Reponame}}/fork"{{end}} class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Fork"><i class="fa fa-code-fork fa-lg"></i>&nbsp;{{.Repository.NumForks}}</a>
</div> --> </div> -->
</div> </div>
</div> </div>

4
templates/repo/release/list.tmpl
View file

@ -6,7 +6,7 @@
<div id="release"> <div id="release">
<h4 id="release-head"> <h4 id="release-head">
<span class="release"><strong>Releases</strong></span><!-- / <span class="release"><strong>Releases</strong></span><!-- /
<a class="tag" href="{{AppRootSubUrl}}/{tag_link}">Tags</a> --> <a class="tag" href="{{AppSubUrl}}/{tag_link}">Tags</a> -->
<!-- comment : if in tag page, show a.release and span.tag please --> <!-- comment : if in tag page, show a.release and span.tag please -->
</h4> </h4>
<ul id="release-list" class="list-unstyled"> <ul id="release-list" class="list-unstyled">
@ -28,7 +28,7 @@
<h4 class="title"><a href="{{$.RepoLink}}/src/{{.TagName}}">{{.Title}}</a> <small>(<a href="{{$.RepoLink}}/releases/edit/{{.TagName}}" rel="nofollow">edit</a>)</small></h4> <h4 class="title"><a href="{{$.RepoLink}}/src/{{.TagName}}">{{.Title}}</a> <small>(<a href="{{$.RepoLink}}/releases/edit/{{.TagName}}" rel="nofollow">edit</a>)</small></h4>
<p class="info"> <p class="info">
<span class="author"><img class="avatar" src="{{.Publisher.AvatarLink}}" alt="" width="20">&nbsp;&nbsp; <span class="author"><img class="avatar" src="{{.Publisher.AvatarLink}}" alt="" width="20">&nbsp;&nbsp;
<a href="{{AppRootSubUrl}}/user/{{.Publisher.Name}}">{{.Publisher.Name}}</a></span> <a href="{{AppSubUrl}}/user/{{.Publisher.Name}}">{{.Publisher.Name}}</a></span>
{{if .Created}}<span class="time">{{TimeSince .Created $.Lang}}</span>{{end}} {{if .Created}}<span class="time">{{TimeSince .Created $.Lang}}</span>{{end}}
<span class="ahead"><strong>{{.NumCommitsBehind}}</strong> commits to {{.Target}} since this release</span> <span class="ahead"><strong>{{.NumCommitsBehind}}</strong> commits to {{.Target}} since this release</span>
</p> </p>

6
templates/repo/setting_nav.tmpl
View file

@ -1,7 +1,7 @@
<div id="user-setting-nav" class="col-md-2 repo-setting-nav"> <div id="user-setting-nav" class="col-md-2 repo-setting-nav">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item{{if .IsRepoToolbarSetting}} active{{end}}"><a href="{{AppRootSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/settings">Options</a></li> <li class="list-group-item{{if .IsRepoToolbarSetting}} active{{end}}"><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/settings">Options</a></li>
<li class="list-group-item{{if .IsRepoToolbarCollaboration}} active{{end}}"><a href="{{AppRootSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/settings/collaboration">Collaborators</a></li> <li class="list-group-item{{if .IsRepoToolbarCollaboration}} active{{end}}"><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/settings/collaboration">Collaborators</a></li>
<li class="list-group-item{{if .IsRepoToolbarWebHooks}} active{{end}}"><a href="{{AppRootSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/settings/hooks">Webhooks</a></li> <li class="list-group-item{{if .IsRepoToolbarWebHooks}} active{{end}}"><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/settings/hooks">Webhooks</a></li>
</ul> </ul>
</div> </div>

2
templates/repo/settings/collaboration.tmpl
View file

@ -18,7 +18,7 @@
{{range .Collaborators}} {{range .Collaborators}}
<li class="collab"> <li class="collab">
{{if not (eq .Id $.Owner.Id)}}<a href="{{$.RepoLink}}/settings/collaboration?remove={{.Name}}" class="remove-collab right"><i class="fa fa-times"></i></a>{{end}} {{if not (eq .Id $.Owner.Id)}}<a href="{{$.RepoLink}}/settings/collaboration?remove={{.Name}}" class="remove-collab right"><i class="fa fa-times"></i></a>{{end}}
<a class="member" href="{{AppRootSubUrl}}/{{.Name}}"> <a class="member" href="{{AppSubUrl}}/{{.Name}}">
<img alt="{{.Name}}" class="pull-left avatar" src="{{.AvatarLink}}"> <img alt="{{.Name}}" class="pull-left avatar" src="{{.AvatarLink}}">
<strong>{{.FullName}}</strong> ({{.Name}}) <strong>{{.FullName}}</strong> ({{.Name}})
</a> </a>

2
templates/repo/single.tmpl
View file

@ -12,7 +12,7 @@
<b class="caret"></b></a> <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{{range .Branches}} {{range .Branches}}
<li><a {{if eq . $.BranchName}}class="current" {{end}}href="{{AppRootSubUrl}}/{{$.Username}}/{{$.Reponame}}/src/{{.}}">{{.}}</a></li> <li><a {{if eq . $.BranchName}}class="current" {{end}}href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/src/{{.}}">{{.}}</a></li>
{{end}} {{end}}
</ul> </ul>
</div> </div>

6
templates/repo/single_list.tmpl
View file

@ -1,9 +1,9 @@
<div class="panel panel-default info-box"> <div class="panel panel-default info-box">
<div class="panel-heading info-head"> <div class="panel-heading info-head">
<a href="{{AppRootSubUrl}}/{{.Username}}/{{.Reponame}}/commit/{{.LastCommit.Id}}" rel="nofollow">{{.LastCommit.Summary}}</a> <a href="{{AppSubUrl}}/{{.Username}}/{{.Reponame}}/commit/{{.LastCommit.Id}}" rel="nofollow">{{.LastCommit.Summary}}</a>
</div> </div>
<div class="panel-body info-content"> <div class="panel-body info-content">
<a href="{{AppRootSubUrl}}/user/{{.LastCommit.Author.Name}}">{{.LastCommit.Author.Name}}</a> <span class="text-muted">{{TimeSince .LastCommit.Author.When}}</span> <a href="{{AppSubUrl}}/user/{{.LastCommit.Author.Name}}">{{.LastCommit.Author.Name}}</a> <span class="text-muted">{{TimeSince .LastCommit.Author.When}}</span>
</div> </div>
<table class="panel-footer table file-list"> <table class="panel-footer table file-list">
<thead class="hidden"> <thead class="hidden">
@ -36,7 +36,7 @@
</span> </span>
</td> </td>
<td class="text"> <td class="text">
<span class="wrap"><a rel="nofollow" href="{{AppRootSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.Id}}">{{$commit.Summary}}</a></span> <span class="wrap"><a rel="nofollow" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.Id}}">{{$commit.Summary}}</a></span>
</td> </td>
<td class="date"> <td class="date">
<span class="wrap">{{TimeSince $commit.Committer.When}}</span> <span class="wrap">{{TimeSince $commit.Committer.When}}</span>

4
templates/repo/view_list.tmpl
View file

@ -4,7 +4,7 @@
<th colspan="4" class="clear"> <th colspan="4" class="clear">
<span class="author left"> <span class="author left">
<img class="avatar-24 radius" src="{{AvatarLink .LastCommit.Author.Email}}" /> <img class="avatar-24 radius" src="{{AvatarLink .LastCommit.Author.Email}}" />
<a href="{{AppRootSubUrl}}/user/email2user?email={{Md5 .LastCommit.Author.Email}}"><strong>{{.LastCommit.Author.Name}}</strong>:</a> <a href="{{AppSubUrl}}/user/email2user?email={{Md5 .LastCommit.Author.Email}}"><strong>{{.LastCommit.Author.Name}}</strong>:</a>
</span> </span>
<span class="last-commit"><a href="{{.RepoLink}}/commit/{{.LastCommit.Id}}" rel="nofollow"> <span class="last-commit"><a href="{{.RepoLink}}/commit/{{.LastCommit.Id}}" rel="nofollow">
<strong>{{ShortSha .LastCommit.Id.String}}</strong></a> <strong>{{ShortSha .LastCommit.Id.String}}</strong></a>
@ -34,7 +34,7 @@
<a href="{{$.BranchLink}}/{{$.TreePath}}{{$entry.Name}}" class="text-truncate">{{$entry.Name}}</a> <a href="{{$.BranchLink}}/{{$.TreePath}}{{$entry.Name}}" class="text-truncate">{{$entry.Name}}</a>
</td> </td>
<td class="msg"> <td class="msg">
<a class="text-truncate" href="{{AppRootSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.Id}}" rel="nofollow">{{$commit.Summary}}</a> <a class="text-truncate" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.Id}}" rel="nofollow">{{$commit.Summary}}</a>
</td> </td>
<td class="age">{{TimeSince $commit.Committer.When $.i18n.Lang}}</td> <td class="age">{{TimeSince $commit.Committer.When $.i18n.Lang}}</td>
</tr> </tr>

2
templates/status/404.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div class="container text-center"> <div class="container text-center">
<p style="margin-top: 100px"><img src="{{AppRootSubUrl}}/img/404.png" alt="404"/></p> <p style="margin-top: 100px"><img src="{{AppSubUrl}}/img/404.png" alt="404"/></p>
<hr/> <hr/>
<br> <br>
<p>Application Version: {{AppVer}}</p> <p>Application Version: {{AppVer}}</p>

2
templates/status/500.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="body" class="container text-center"> <div id="body" class="container text-center">
<p style="margin-top: 100px"><img src="{{AppRootSubUrl}}/img/500.png" alt="500"/></p> <p style="margin-top: 100px"><img src="{{AppSubUrl}}/img/500.png" alt="500"/></p>
<hr/> <hr/>
<br> <br>
{{if .ErrorMsg}}<p>An error has occurred : {{.ErrorMsg}}</p>{{end}} {{if .ErrorMsg}}<p>An error has occurred : {{.ErrorMsg}}</p>{{end}}

2
templates/user/auth/activate.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="sign-wrapper"> <div id="sign-wrapper">
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppRootSubUrl}}/user/activate" method="post"> <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/activate" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="panel-header"> <div class="panel-header">
<h2>{{.i18n.Tr "auth.active_your_account"}}</h2> <h2>{{.i18n.Tr "auth.active_your_account"}}</h2>

2
templates/user/auth/forgot_passwd.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="sign-wrapper"> <div id="sign-wrapper">
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppRootSubUrl}}/user/forget_password" method="post"> <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/forget_password" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="panel-header"> <div class="panel-header">
<h2>{{.i18n.Tr "auth.forgot_password"}}</h2> <h2>{{.i18n.Tr "auth.forgot_password"}}</h2>

2
templates/user/auth/reset_passwd.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="sign-wrapper"> <div id="sign-wrapper">
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppRootSubUrl}}/user/reset_password?code={{.Code}}" method="post"> <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/reset_password?code={{.Code}}" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="panel-header"> <div class="panel-header">
<h2>{{.i18n.Tr "auth.reset_password"}}</h2> <h2>{{.i18n.Tr "auth.reset_password"}}</h2>

6
templates/user/auth/signin.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="sign-wrapper"> <div id="sign-wrapper">
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppRootSubUrl}}/user/login" method="post"> <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/login" method="post">
<div class="panel-header"> <div class="panel-header">
<h2>{{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_in"}}{{end}}</h2> <h2>{{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_in"}}{{end}}</h2>
</div> </div>
@ -24,12 +24,12 @@
<div class="field"> <div class="field">
<span class="form-label"></span> <span class="form-label"></span>
<button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "sign_in"}}</button>&nbsp;&nbsp;&nbsp;&nbsp; <button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "sign_in"}}</button>&nbsp;&nbsp;&nbsp;&nbsp;
{{if not .IsSocialLogin}}<a href="{{AppRootSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}} {{if not .IsSocialLogin}}<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}}
</div> </div>
{{if not .IsSocialLogin}} {{if not .IsSocialLogin}}
<div class="field"> <div class="field">
<label></label> <label></label>
<a href="{{AppRootSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a> <a href="{{AppSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
</div> </div>
{{if .OauthEnabled}} {{if .OauthEnabled}}
<hr/> <hr/>

4
templates/user/auth/signup.tmpl
View file

@ -1,7 +1,7 @@
{{template "ng/base/head" .}} {{template "ng/base/head" .}}
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div id="sign-wrapper"> <div id="sign-wrapper">
<form class="form-align form panel panel-radius sign-panel sign-form container" id="sign-up-form" action="{{AppRootSubUrl}}/user/sign_up" method="post"> <form class="form-align form panel panel-radius sign-panel sign-form container" id="sign-up-form" action="{{AppSubUrl}}/user/sign_up" method="post">
<div class="panel-header"> <div class="panel-header">
<h2>{{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_up"}}{{end}}</h2> <h2>{{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_up"}}{{end}}</h2>
</div> </div>
@ -40,7 +40,7 @@
</div> </div>
<div class="field"> <div class="field">
<span class="form-label"></span> <span class="form-label"></span>
<a href="{{AppRootSubUrl}}/user/login">{{if .IsSocialLogin}}{{.i18n.Tr "auth.social_register_hepler_msg"}}{{else}}{{.i18n.Tr "auth.register_hepler_msg"}}{{end}}</a> <a href="{{AppSubUrl}}/user/login">{{if .IsSocialLogin}}{{.i18n.Tr "auth.social_register_hepler_msg"}}{{else}}{{.i18n.Tr "auth.register_hepler_msg"}}{{end}}</a>
</div> </div>
{{end}} {{end}}
</div> </div>

24
templates/user/dashboard/dashboard.tmpl
View file

@ -12,17 +12,17 @@
</div> </div>
<div class="content left {{if eq .GetOpType 5}}push-news{{end}} grid-4-5"> <div class="content left {{if eq .GetOpType 5}}push-news{{end}} grid-4-5">
<p class="text-bold"> <p class="text-bold">
<a href="{{AppRootSubUrl}}/{{.GetActUserName}}">{{.GetActUserName}}</a> <a href="{{AppSubUrl}}/{{.GetActUserName}}">{{.GetActUserName}}</a>
{{if eq .GetOpType 1}} {{if eq .GetOpType 1}}
{{$.i18n.Tr "action.create_repo" AppRootSubUrl .GetRepoLink .GetRepoLink | Str2html}} {{$.i18n.Tr "action.create_repo" AppSubUrl .GetRepoLink .GetRepoLink | Str2html}}
{{else if eq .GetOpType 5}} {{else if eq .GetOpType 5}}
{{$.i18n.Tr "action.commit_repo" AppRootSubUrl .GetRepoLink .GetBranch .GetBranch AppRootSubUrl .GetRepoLink .GetRepoLink | Str2html}} {{$.i18n.Tr "action.commit_repo" AppSubUrl .GetRepoLink .GetBranch .GetBranch AppSubUrl .GetRepoLink .GetRepoLink | Str2html}}
{{else if eq .GetOpType 6}} {{else if eq .GetOpType 6}}
{{ $index := index .GetIssueInfos 0}} {{ $index := index .GetIssueInfos 0}}
{{$.i18n.Tr "action.create_issue" AppRootSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}} {{$.i18n.Tr "action.create_issue" AppSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}}
{{else if eq .GetOpType 10}} {{else if eq .GetOpType 10}}
{{ $index := index .GetIssueInfos 0}} {{ $index := index .GetIssueInfos 0}}
{{$.i18n.Tr "action.comment_issue" AppRootSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}} {{$.i18n.Tr "action.comment_issue" AppSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}}
{{end}} {{end}}
</p> </p>
{{if eq .GetOpType 5}} {{if eq .GetOpType 5}}
@ -31,7 +31,7 @@
{{ $push := ActionContent2Commits .}} {{ $push := ActionContent2Commits .}}
{{ $repoLink := .GetRepoLink}} {{ $repoLink := .GetRepoLink}}
{{range $push.Commits}} {{range $push.Commits}}
<li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="{{AppRootSubUrl}}/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> <span class="text-truncate grid-4-5">{{.Message}}</span></li> <li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="{{AppSubUrl}}/{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> <span class="text-truncate grid-4-5">{{.Message}}</span></li>
{{end}} {{end}}
</ul> </ul>
</div> </div>
@ -58,9 +58,9 @@
<i class="octicon octicon-plus"></i> <i class="octicon octicon-plus"></i>
</button> </button>
<ul class="menu menu-vertical drop-down" id="dashboard-new-repo-menu"> <ul class="menu menu-vertical drop-down" id="dashboard-new-repo-menu">
<li><a href="{{AppRootSubUrl}}/repo/create"><i class="octicon octicon-repo-create"></i>{{.i18n.Tr "new_repo"}}</a></li> <li><a href="{{AppSubUrl}}/repo/create"><i class="octicon octicon-repo-create"></i>{{.i18n.Tr "new_repo"}}</a></li>
<li><a href="{{AppRootSubUrl}}/repo/migrate"><i class="octicon octicon-repo-clone"></i>{{.i18n.Tr "new_migrate"}}</a></li> <li><a href="{{AppSubUrl}}/repo/migrate"><i class="octicon octicon-repo-clone"></i>{{.i18n.Tr "new_migrate"}}</a></li>
<li><a href="{{AppRootSubUrl}}/org/create"><i class="octicon octicon-organization"></i>{{.i18n.Tr "new_org"}}</a></li> <li><a href="{{AppSubUrl}}/org/create"><i class="octicon octicon-organization"></i>{{.i18n.Tr "new_org"}}</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
@ -75,7 +75,7 @@
<ul class="list-no-style"> <ul class="list-no-style">
{{range .Repos}} {{range .Repos}}
<li {{if .IsPrivate}}class="private"{{end}}> <li {{if .IsPrivate}}class="private"{{end}}>
<a href="{{AppRootSubUrl}}/{{$.ContextUser.Name}}/{{.Name}}"> <a href="{{AppSubUrl}}/{{$.ContextUser.Name}}/{{.Name}}">
<i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i> <i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i>
<span class="repo-name"> <span class="repo-name">
<strong class="repo">{{.Name}}</strong> <strong class="repo">{{.Name}}</strong>
@ -125,7 +125,7 @@
<ul class="list-no-style"> <ul class="list-no-style">
{{range .ContextUser.Orgs}} {{range .ContextUser.Orgs}}
<li> <li>
<a href="{{AppRootSubUrl}}/{{.Name}}"> <a href="{{AppSubUrl}}/{{.Name}}">
<i class="octicon octicon-organization"></i> <i class="octicon octicon-organization"></i>
<span class="repo-name"> <span class="repo-name">
<strong class="repo">{{.Name}}</strong> <strong class="repo">{{.Name}}</strong>
@ -150,7 +150,7 @@
<ul class="list-no-style"> <ul class="list-no-style">
{{range .Mirrors}} {{range .Mirrors}}
<li {{if .IsPrivate}}class="private"{{end}}> <li {{if .IsPrivate}}class="private"{{end}}>
<a href="{{AppRootSubUrl}}/{{$.ContextUser.Name}}/{{.Name}}"> <a href="{{AppSubUrl}}/{{$.ContextUser.Name}}/{{.Name}}">
<i class="octicon octicon-repo-clone"></i> <i class="octicon octicon-repo-clone"></i>
<span class="repo-name"> <span class="repo-name">
<strong class="repo">{{.Name}}</strong> <strong class="repo">{{.Name}}</strong>

6
templates/user/dashboard/nav.tmpl
View file

@ -9,7 +9,7 @@
<p class="panel-header"><strong>{{.i18n.Tr "home.switch_dashboard_context"}}</strong></p> <p class="panel-header"><strong>{{.i18n.Tr "home.switch_dashboard_context"}}</strong></p>
<ul class="menu menu-vertical switching-list" id="dashboard-switch-menu"> <ul class="menu menu-vertical switching-list" id="dashboard-switch-menu">
<li class="org {{if eq .ContextUser.Id .SignedUser.Id}}checked{{end}}"> <li class="org {{if eq .ContextUser.Id .SignedUser.Id}}checked{{end}}">
<a href="{{AppRootSubUrl}}/"> <a href="{{AppSubUrl}}/">
<i class="octicon octicon-check"></i> <i class="octicon octicon-check"></i>
<img class="avatar-24" src="{{.SignedUser.AvatarLink}}" alt="user-avatar" /> <img class="avatar-24" src="{{.SignedUser.AvatarLink}}" alt="user-avatar" />
{{.SignedUser.Name}} {{.SignedUser.Name}}
@ -25,10 +25,10 @@
</li> </li>
{{end}} {{end}}
<!-- <li> <!-- <li>
<a href="{{AppRootSubUrl}}/user/settings/orgs"><i class="octicon octicon-organization"></i>{{.i18n.Tr "manage_org"}}</a> <a href="{{AppSubUrl}}/user/settings/orgs"><i class="octicon octicon-organization"></i>{{.i18n.Tr "manage_org"}}</a>
</li> --> </li> -->
<li> <li>
<a href="{{AppRootSubUrl}}/org/create"><i class="octicon octicon-plus"></i>{{.i18n.Tr "new_org"}}</a> <a href="{{AppSubUrl}}/org/create"><i class="octicon octicon-plus"></i>{{.i18n.Tr "new_org"}}</a>
</li> </li>
</ul> </ul>
</div> </div>

24
templates/user/issues.tmpl
View file

@ -3,10 +3,10 @@
<div id="body-nav"> <div id="body-nav">
<div class="container"> <div class="container">
<ul class="nav nav-pills pull-right"> <ul class="nav nav-pills pull-right">
<li><a href="{{AppRootSubUrl}}/">News Feed</a></li> <li><a href="{{AppSubUrl}}/">News Feed</a></li>
<li class="active"><a href="{{AppRootSubUrl}}/issues">Issues</a></li> <li class="active"><a href="{{AppSubUrl}}/issues">Issues</a></li>
<!-- <li><a href="{{AppRootSubUrl}}/pulls">Pull Requests</a></li> <!-- <li><a href="{{AppSubUrl}}/pulls">Pull Requests</a></li>
<li><a href="{{AppRootSubUrl}}/stars">Stars</a></li> --> <li><a href="{{AppSubUrl}}/stars">Stars</a></li> -->
</ul> </ul>
<h3>Your Issues</h3> <h3>Your Issues</h3>
</div> </div>
@ -17,30 +17,30 @@
<div id="issue"> <div id="issue">
<div class="col-md-3 filter-list"> <div class="col-md-3 filter-list">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="{{AppRootSubUrl}}/issues?state={{.State}}&repoid={{.RepoId}}"{{if eq .ViewType "all"}} class="active"{{end}}>In your repositories <strong class="pull-right">{{.IssueStats.AllCount}}</strong></a></li> <li><a href="{{AppSubUrl}}/issues?state={{.State}}&repoid={{.RepoId}}"{{if eq .ViewType "all"}} class="active"{{end}}>In your repositories <strong class="pull-right">{{.IssueStats.AllCount}}</strong></a></li>
<li><a href="{{AppRootSubUrl}}/issues?type=assigned&repoid={{.RepoId}}&state={{.State}}"{{if eq .ViewType "assigned"}} class="active"{{end}}>Assigned to you <strong class="pull-right">{{.IssueStats.AssignCount}}</strong></a></li> <li><a href="{{AppSubUrl}}/issues?type=assigned&repoid={{.RepoId}}&state={{.State}}"{{if eq .ViewType "assigned"}} class="active"{{end}}>Assigned to you <strong class="pull-right">{{.IssueStats.AssignCount}}</strong></a></li>
<li><a href="{{AppRootSubUrl}}/issues?type=created_by&repoid={{.RepoId}}&state={{.State}}"{{if eq .ViewType "created_by"}} class="active"{{end}}>Created by you <strong class="pull-right">{{.IssueStats.CreateCount}}</strong></a></li> <li><a href="{{AppSubUrl}}/issues?type=created_by&repoid={{.RepoId}}&state={{.State}}"{{if eq .ViewType "created_by"}} class="active"{{end}}>Created by you <strong class="pull-right">{{.IssueStats.CreateCount}}</strong></a></li>
<li><hr/></li> <li><hr/></li>
{{range .Repos}} {{range .Repos}}
<li><a href="{{AppRootSubUrl}}/issues?type={{$.ViewType}}{{if eq $.RepoId .Id}}{{else}}&repoid={{.Id}}{{end}}&state={{$.State}}" class="sm{{if eq $.RepoId .Id}} active{{end}}">{{$.SignedUser.Name}}/{{.Name}} <strong class="pull-right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a></li> <li><a href="{{AppSubUrl}}/issues?type={{$.ViewType}}{{if eq $.RepoId .Id}}{{else}}&repoid={{.Id}}{{end}}&state={{$.State}}" class="sm{{if eq $.RepoId .Id}} active{{end}}">{{$.SignedUser.Name}}/{{.Name}} <strong class="pull-right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a></li>
{{end}} {{end}}
</ul> </ul>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="filter-option"> <div class="filter-option">
<div class="btn-group"> <div class="btn-group">
<a class="btn btn-default issue-open{{if not .IsShowClosed}} active{{end}}" href="{{AppRootSubUrl}}/issues?type={{.ViewType}}&repoid={{.RepoId}}">Open</a> <a class="btn btn-default issue-open{{if not .IsShowClosed}} active{{end}}" href="{{AppSubUrl}}/issues?type={{.ViewType}}&repoid={{.RepoId}}">Open</a>
<a class="btn btn-default issue-close{{if .IsShowClosed}} active{{end}}" href="{{AppRootSubUrl}}/issues?type={{.ViewType}}&repoid={{.RepoId}}&state=closed">Closed</a> <a class="btn btn-default issue-close{{if .IsShowClosed}} active{{end}}" href="{{AppSubUrl}}/issues?type={{.ViewType}}&repoid={{.RepoId}}&state=closed">Closed</a>
</div> </div>
</div> </div>
<div class="issues list-group"> <div class="issues list-group">
{{range .Issues}}{{if .}} {{range .Issues}}{{if .}}
<div class="list-group-item issue-item" id="issue-{{.Id}}"> <div class="list-group-item issue-item" id="issue-{{.Id}}">
<span class="number pull-right">#{{.Index}}</span> <span class="number pull-right">#{{.Index}}</span>
<h5 class="title"><a href="{{AppRootSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Name}}</a></h5> <h5 class="title"><a href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Name}}</a></h5>
<p class="info"> <p class="info">
<span class="author"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" width="20"/> <span class="author"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" width="20"/>
<a href="{{AppRootSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a></span> <a href="{{AppSubUrl}}/user/{{.Poster.Name}}">{{.Poster.Name}}</a></span>
<span class="time">{{TimeSince .Created $.Lang}}</span> <span class="time">{{TimeSince .Created $.Lang}}</span>
<span class="comment"><i class="fa fa-comments"></i> {{.NumComments}}</span> <span class="comment"><i class="fa fa-comments"></i> {{.NumComments}}</span>
</p> </p>

2
templates/user/profile.tmpl
View file

@ -66,7 +66,7 @@
<li> <li>
<div class="meta pull-right"><!-- <i class="fa fa-star"></i> {{.NumStars}} --> <i class="fa fa-code-fork"></i> {{.NumForks}}</div> <div class="meta pull-right"><!-- <i class="fa fa-star"></i> {{.NumStars}} --> <i class="fa fa-code-fork"></i> {{.NumForks}}</div>
<h4> <h4>
<a href="{{AppRootSubUrl}}/{{$.Owner.Name}}/{{.Name}}">{{.Name}}{{if .IsPrivate}} <span class="label label-default">Private</span>{{end}}</a> <a href="{{AppSubUrl}}/{{$.Owner.Name}}/{{.Name}}">{{.Name}}{{if .IsPrivate}} <span class="label label-default">Private</span>{{end}}</a>
</h4> </h4>
<p class="desc">{{.Description}}</p> <p class="desc">{{.Description}}</p>
<div class="info">Last updated {{TimeSince .Updated $.Lang}}</div> <div class="info">Last updated {{TimeSince .Updated $.Lang}}</div>

2
templates/user/settings/delete.tmpl
View file

@ -11,7 +11,7 @@
<p class="panel-header"><strong>{{.i18n.Tr "settings.delete_account"}}</strong></p> <p class="panel-header"><strong>{{.i18n.Tr "settings.delete_account"}}</strong></p>
<div class="panel-body panel-content"> <div class="panel-body panel-content">
<span class="alert alert-red alert-radius block"><i class="octicon octicon-alert"></i>{{.i18n.Tr "settings.delete_prompt" | Str2html}}</span> <span class="alert alert-red alert-radius block"><i class="octicon octicon-alert"></i>{{.i18n.Tr "settings.delete_prompt" | Str2html}}</span>
<form action="{{AppRootSubUrl}}/user/settings/delete" method="post"> <form action="{{AppSubUrl}}/user/settings/delete" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<p class="field"> <p class="field">
<span class="form-label"></span> <span class="form-label"></span>

10
templates/user/settings/nav.tmpl
View file

@ -2,11 +2,11 @@
<p class="panel-header"><strong>{{.i18n.Tr "settings"}}</strong></p> <p class="panel-header"><strong>{{.i18n.Tr "settings"}}</strong></p>
<div class="panel-body"> <div class="panel-body">
<ul class="menu menu-vertical switching-list grid-1-5 left"> <ul class="menu menu-vertical switching-list grid-1-5 left">
<li {{if .PageIsSettingsProfile}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings">{{.i18n.Tr "settings.profile"}}</a></li> <li {{if .PageIsSettingsProfile}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings">{{.i18n.Tr "settings.profile"}}</a></li>
<li {{if .PageIsSettingsPassword}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings/password">{{.i18n.Tr "settings.password"}}</a></li> <li {{if .PageIsSettingsPassword}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/password">{{.i18n.Tr "settings.password"}}</a></li>
<li {{if .PageIsSettingsSSHKeys}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings/ssh">{{.i18n.Tr "settings.ssh_keys"}}</a></li> <li {{if .PageIsSettingsSSHKeys}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/ssh">{{.i18n.Tr "settings.ssh_keys"}}</a></li>
<li {{if .PageIsSettingsSocial}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings/social">{{.i18n.Tr "settings.social"}}</a></li> <li {{if .PageIsSettingsSocial}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/social">{{.i18n.Tr "settings.social"}}</a></li>
<li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{AppRootSubUrl}}/user/settings/delete">{{.i18n.Tr "settings.delete"}}</a></li> <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/delete">{{.i18n.Tr "settings.delete"}}</a></li>
</ul> </ul>
</div> </div>
</div> </div>

2
templates/user/settings/password.tmpl
View file

@ -9,7 +9,7 @@
<div id="setting-content"> <div id="setting-content">
<div id="user-profile-setting-content" class="panel panel-radius"> <div id="user-profile-setting-content" class="panel panel-radius">
<p class="panel-header"><strong>{{.i18n.Tr "settings.change_password"}}</strong></p> <p class="panel-header"><strong>{{.i18n.Tr "settings.change_password"}}</strong></p>
<form class="form form-align panel-body" id="user-profile-form" action="{{AppRootSubUrl}}/user/settings/password" method="post"> <form class="form form-align panel-body" id="user-profile-form" action="{{AppSubUrl}}/user/settings/password" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<p class="field"> <p class="field">
<label class="req" for="old-password">{{.i18n.Tr "settings.old_password"}}</label> <label class="req" for="old-password">{{.i18n.Tr "settings.old_password"}}</label>

2
templates/user/settings/profile.tmpl
View file

@ -11,7 +11,7 @@
<div class="panel-header"> <div class="panel-header">
<strong>{{.i18n.Tr "settings.public_profile"}}</strong> <strong>{{.i18n.Tr "settings.public_profile"}}</strong>
</div> </div>
<form class="form form-align panel-body" id="user-profile-form" action="{{AppRootSubUrl}}/user/settings" method="post"> <form class="form form-align panel-body" id="user-profile-form" action="{{AppSubUrl}}/user/settings" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="text-center panel-desc">{{.i18n.Tr "settings.profile_desc"}}</div> <div class="text-center panel-desc">{{.i18n.Tr "settings.profile_desc"}}</div>
<div class="field"> <div class="field">

2
templates/user/settings/social.tmpl
View file

@ -20,7 +20,7 @@
<p class="print">{{.Identity}}</p> <p class="print">{{.Identity}}</p>
<p class="activity"><i>{{$.i18n.Tr "settings.add_on"}} {{DateFormat .Created "M d, Y"}} — <i class="octicon octicon-info"></i>{{$.i18n.Tr "settings.last_used"}} {{DateFormat .Updated "M d, Y"}}</i></p> <p class="activity"><i>{{$.i18n.Tr "settings.add_on"}} {{DateFormat .Created "M d, Y"}} — <i class="octicon octicon-info"></i>{{$.i18n.Tr "settings.last_used"}} {{DateFormat .Updated "M d, Y"}}</i></p>
</div> </div>
<a class="right btn btn-small btn-red btn-header btn-radius" href="{{AppRootSubUrl}}/user/settings/social?remove={{.Id}}">{{$.i18n.Tr "settings.unbind"}}</a> <a class="right btn btn-small btn-red btn-header btn-radius" href="{{AppSubUrl}}/user/settings/social?remove={{.Id}}">{{$.i18n.Tr "settings.unbind"}}</a>
</li> </li>
{{end}} {{end}}
</ul> </ul>

4
templates/user/settings/sshkeys.tmpl
View file

@ -23,7 +23,7 @@
<p class="print">{{.Fingerprint}}</p> <p class="print">{{.Fingerprint}}</p>
<p class="activity"><i>{{$.i18n.Tr "settings.add_on"}} {{DateFormat .Created "M d, Y"}} — <i class="octicon octicon-info"></i>{{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFormat .Updated "M d, Y"}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i></p> <p class="activity"><i>{{$.i18n.Tr "settings.add_on"}} {{DateFormat .Created "M d, Y"}} — <i class="octicon octicon-info"></i>{{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFormat .Updated "M d, Y"}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i></p>
</div> </div>
<form action="{{AppRootSubUrl}}/user/settings/ssh" method="post"> <form action="{{AppSubUrl}}/user/settings/ssh" method="post">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
<input name="_method" type="hidden" value="DELETE"> <input name="_method" type="hidden" value="DELETE">
<input name="id" type="hidden" value="{{.Id}}"> <input name="id" type="hidden" value="{{.Id}}">
@ -35,7 +35,7 @@
</div> </div>
<p>{{.i18n.Tr "settings.ssh_helper" | Str2html}}</p> <p>{{.i18n.Tr "settings.ssh_helper" | Str2html}}</p>
<br> <br>
<form class="panel panel-radius form form-align hide" id="user-ssh-add-form" action="{{AppRootSubUrl}}/user/settings/ssh" method="post"> <form class="panel panel-radius form form-align hide" id="user-ssh-add-form" action="{{AppSubUrl}}/user/settings/ssh" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<p class="panel-header"><strong>{{.i18n.Tr "settings.add_new_key"}}</strong></p> <p class="panel-header"><strong>{{.i18n.Tr "settings.add_new_key"}}</strong></p>
<div class="panel-body"> <div class="panel-body">