From 5dc3dd17049a5c097122c6159aa7a915658c263a Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 16 Nov 2015 11:11:59 -0500 Subject: [PATCH] fix #1960 --- README.md | 2 +- cmd/web.go | 7 +- gogs.go | 2 +- models/user.go | 2 +- modules/avatar/avatar.go | 4 +- public/css/gogs.css | 36 +++++-- public/less/_base.less | 3 + public/less/_explore.less | 44 ++++---- public/less/_user.less | 25 +++++ templates/.VERSION | 2 +- templates/explore/repos.tmpl | 2 +- templates/repo/issue/navbar.tmpl | 2 +- templates/user/profile.tmpl | 178 ++++++++++++++----------------- 13 files changed, 173 insertions(+), 136 deletions(-) diff --git a/README.md b/README.md index 8be1adc6f6..1e363ded54 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](public/img/gogs-large-resize.png) -##### Current version: 0.7.12 Beta +##### Current version: 0.7.13 Beta diff --git a/cmd/web.go b/cmd/web.go index 095ddeb1f0..dfe47021c7 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -515,10 +515,13 @@ func runWeb(ctx *cli.Context) { m.Group("", func() { m.Get("/releases", repo.Releases) m.Get("/^:type(issues|pulls)$", repo.RetrieveLabels, repo.Issues) - m.Get("/^:type(issues|pulls)$/:index", repo.ViewIssue) m.Get("/labels/", repo.RetrieveLabels, repo.Labels) m.Get("/milestones", repo.Milestones) - }, middleware.RepoRef()) + }, middleware.RepoRef(), + func(ctx *middleware.Context) { + ctx.Data["PageIsList"] = true + }) + m.Get("/^:type(issues|pulls)$/:index", repo.ViewIssue) m.Get("/branches", repo.Branches) m.Get("/archive/*", repo.Download) diff --git a/gogs.go b/gogs.go index 157133eda6..f8a39f3fc8 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.7.12.1116 Beta" +const APP_VER = "0.7.13.1116 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/user.go b/models/user.go index 18dce976f6..3131a88d55 100644 --- a/models/user.go +++ b/models/user.go @@ -265,7 +265,7 @@ func (u *User) UploadAvatar(data []byte) error { return fmt.Errorf("Decode: %v", err) } - m := resize.Resize(234, 234, img, resize.NearestNeighbor) + m := resize.Resize(290, 290, img, resize.NearestNeighbor) sess := x.NewSession() defer sessionRelease(sess) diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go index 60f7e2ecb7..b25b1bfe4e 100644 --- a/modules/avatar/avatar.go +++ b/modules/avatar/avatar.go @@ -104,7 +104,7 @@ func New(hash string, cacheDir string) *Avatar { expireDuration: time.Minute * 10, reqParams: url.Values{ "d": {"retro"}, - "size": {"200"}, + "size": {"290"}, "r": {"pg"}}.Encode(), imagePath: filepath.Join(cacheDir, hash+".image"), //maybe png or jpeg } @@ -194,7 +194,7 @@ func (this *service) mustInt(r *http.Request, defaultValue int, keys ...string) func (this *service) ServeHTTP(w http.ResponseWriter, r *http.Request) { urlPath := r.URL.Path hash := urlPath[strings.LastIndex(urlPath, "/")+1:] - size := this.mustInt(r, 80, "s", "size") // default size = 80*80 + size := this.mustInt(r, 290, "s", "size") // default size = 290*290 avatar := New(hash, this.cacheDir) avatar.AlterImage = this.altImage diff --git a/public/css/gogs.css b/public/css/gogs.css index 6300dfaa66..db86e3de34 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -848,6 +848,9 @@ pre.raw { .ui .text.yellow { color: #FBBD08 !important; } +.ui .text.gold { + color: #a1882b !important; +} .ui .text.left { text-align: left !important; } @@ -2688,6 +2691,23 @@ footer .container .links > *:first-child { .user.settings .email.list .item:not(:first-child) .button { margin-top: -10px; } +.user.profile .ui.card .username { + display: block; +} +.user.profile .ui.card .extra.content { + padding: 0; +} +.user.profile .ui.card .extra.content ul { + margin: 0; + padding: 0; +} +.user.profile .ui.card .extra.content ul li { + padding: 10px; + list-style: none; +} +.user.profile .ui.card .extra.content ul li:not(:last-child) { + border-bottom: 1px solid #eaeaea; +} .dashboard { padding-top: 15px; padding-bottom: 80px; @@ -2820,24 +2840,26 @@ footer .container .links > *:first-child { padding-top: 15px; padding-bottom: 80px; } -.explore.repositories .ui.repository.list .item { - border-top: 1px solid #eee; - padding-top: 25px; +.ui.repository.list .item { padding-bottom: 25px; } -.explore.repositories .ui.repository.list .item .ui.header { +.ui.repository.list .item:not(:first-child) { + border-top: 1px solid #eee; + padding-top: 25px; +} +.ui.repository.list .item .ui.header { font-size: 1.5rem; padding-bottom: 10px; } -.explore.repositories .ui.repository.list .item .ui.header .metas { +.ui.repository.list .item .ui.header .metas { color: #888; font-size: 13px; font-weight: normal; } -.explore.repositories .ui.repository.list .item .ui.header .metas span:not(:last-child) { +.ui.repository.list .item .ui.header .metas span:not(:last-child) { margin-right: 5px; } -.explore.repositories .ui.repository.list .item .time { +.ui.repository.list .item .time { font-size: 12px; color: #808080; } diff --git a/public/less/_base.less b/public/less/_base.less index fca214b396..086c687709 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -139,6 +139,9 @@ pre { &.yellow { color: #FBBD08 !important; } + &.gold { + color: #a1882b !important; + } &.left { text-align: left !important; diff --git a/public/less/_explore.less b/public/less/_explore.less index 5d6be53777..b510c71a10 100644 --- a/public/less/_explore.less +++ b/public/less/_explore.less @@ -1,30 +1,32 @@ .explore { padding-top: 15px; padding-bottom: @footer-margin * 2; +} - &.repositories { - .ui.repository.list { - .item { - border-top: 1px solid #eee; - padding-top: 25px; - padding-bottom: 25px; - .ui.header { - font-size: 1.5rem; - padding-bottom: 10px; - .metas { - color: #888; - font-size: 13px; - font-weight: normal; - span:not(:last-child) { - margin-right: 5px; - } - } - } - .time { - font-size: 12px; - color: #808080; +.ui.repository.list { + .item { + padding-bottom: 25px; + + &:not(:first-child) { + border-top: 1px solid #eee; + padding-top: 25px; + } + + .ui.header { + font-size: 1.5rem; + padding-bottom: 10px; + .metas { + color: #888; + font-size: 13px; + font-weight: normal; + span:not(:last-child) { + margin-right: 5px; } } } + .time { + font-size: 12px; + color: #808080; + } } } \ No newline at end of file diff --git a/public/less/_user.less b/public/less/_user.less index c403e3580d..bf0de5068a 100644 --- a/public/less/_user.less +++ b/public/less/_user.less @@ -18,4 +18,29 @@ } } } + + &.profile { + .ui.card { + .username { + display: block; + } + .extra.content { + padding: 0; + + ul { + margin: 0; + padding: 0; + + li { + padding: 10px; + list-style: none; + + &:not(:last-child) { + border-bottom: 1px solid #eaeaea; + } + } + } + } + } + } } \ No newline at end of file diff --git a/templates/.VERSION b/templates/.VERSION index 3501f1632e..87a10ba387 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.7.12.1116 Beta \ No newline at end of file +0.7.13.1116 Beta \ No newline at end of file diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl index 75940e1150..6654a315d0 100644 --- a/templates/explore/repos.tmpl +++ b/templates/explore/repos.tmpl @@ -5,7 +5,7 @@ {{template "explore/navbar" .}}
- {{range $i, $v := .Repos}} + {{range .Repos}}
{{.Owner.Name}} / {{.Name}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 7fdc41aa21..d6d1074c6d 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,5 +1,5 @@
- {{if not .CommitsCount}} + {{if not .PageIsList}} {{.i18n.Tr "repo.issues"}} {{.i18n.Tr "repo.pulls"}} {{end}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index abb2f19479..069529ca3b 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -1,104 +1,86 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -
-
-
-
- {{if and (.Owner.UseCustomAvatar) (eq .SignedUserName .Owner.Name)}} - - {{else if eq .SignedUserName .Owner.Name}} - - {{else}} - +{{template "base/head" .}} +
+
+
+
+
+ {{if and (.Owner.UseCustomAvatar) (eq .SignedUserName .Owner.Name)}} + + + + {{else if eq .SignedUserName .Owner.Name}} + + + + {{else}} + + + + {{end}} +
+ {{if .Owner.FullName}}{{.Owner.FullName}}{{end}} + {{.Owner.Name}} +
+
+
    + {{if .Owner.Location}} +
  • {{.Owner.Location}}
    • + {{end}} + {{if and .Owner.Email .IsSigned}} +
  • + + {{.Owner.Email}} +
    • + {{end}} + {{if .Owner.Website}} +
  • + + {{.Owner.Website}} +
    • + {{end}} +
  • {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}
    • +
+
+
+
+
+
+ + {{.i18n.Tr "user.repositories"}} + + + + {{.i18n.Tr "user.activity"}} + + +
+ {{if ne .TabName "activity"}} +
+ {{range .Repos}} + {{if or (not .IsPrivate) (.HasAccess $.SignedUser)}} +
+
+ {{.Name}} + {{if .IsPrivate}} + {{end}} - - -
- {{if .Owner.FullName}}{{.Owner.FullName}}
{{end}} - {{.Owner.Name}} -
-
-
-
-
    - {{if .Owner.Location}} -
  •   {{.Owner.Location}}
    • - {{end}} - {{if and .Owner.Email .IsSigned}} -
  •   {{.Owner.Email}}
    • - {{end}} - {{if .Owner.Website}} -
  •   {{.Owner.Website}}
    • - {{end}} -
  •   {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}
    • -
-
- -
-
-
-
-
- -
- {{if eq .TabName "activity"}} -
-
- {{template "user/dashboard/feeds" .}} -
- {{else}} -
-
- {{range .Repos}} - {{if or (not .IsPrivate) (.HasAccess $.SignedUser)}} -
-
    -
  • {{.NumStars}}
    • -
  • {{.NumForks}}
    • -
-

- {{.Name}} - {{if .IsPrivate}} - - {{end}} -

-

{{.Description}}

-

{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}

-
- {{end}} - {{end}} -
-
- {{end}} + +
+ {{.NumStars}} + {{.NumForks}}
+
+ {{if .Description}}

{{.Description}}

{{end}} +

{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}

+ {{end}} + {{end}}
+ {{else}} +
+ {{template "user/dashboard/feeds" .}} + {{end}}
+
-{{template "ng/base/footer" .}} +{{template "base/footer" .}} \ No newline at end of file