From d1a60e364383b877fd98b853d94b739cb171fe9c Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Mon, 17 Nov 2014 23:07:34 +0800 Subject: [PATCH] add pull-request and labels page design --- cmd/web.go | 2 + public/ng/css/gogs.css | 72 ++++++++++++++++++++++++++----- public/ng/css/ui.css | 10 ++--- public/ng/less/gogs/issue.less | 54 ++++++++++++++++++++--- public/ng/less/ui/label.less | 2 +- public/ng/less/ui/pager.less | 8 ++-- routers/repo/issue.go | 8 ++++ templates/repo/issue2/labels.tmpl | 36 ++++++++++++++++ templates/repo/issue2/list.tmpl | 24 +++++------ templates/repo/pr2/list.tmpl | 48 +++++++++++++++++++++ 10 files changed, 226 insertions(+), 38 deletions(-) create mode 100644 templates/repo/issue2/labels.tmpl create mode 100644 templates/repo/pr2/list.tmpl diff --git a/cmd/web.go b/cmd/web.go index a99ee4a1f6..5b81537f79 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -387,6 +387,8 @@ func runWeb(*cli.Context) { m.Get("/branches", repo.Branches) m.Get("/archive/*", repo.Download) m.Get("/issues2/", repo.Issues2) + m.Get("/pulls2/", repo.PullRequest2) + m.Get("/labels2/",repo.Labels2) m.Group("", func() { m.Get("/src/*", repo.Home) diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index 1cf6cb3bc8..14acd7a91f 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -2002,16 +2002,18 @@ textarea#issue-add-content { height: 120px; resize: vertical; } +#issue-list-nav { + border-bottom: 1px solid #DDD; + padding-bottom: 12px; +} #issue-list-nav li > a { font-size: 13px; font-weight: bold; - padding: .4em .9em; - border-radius: .3em; + padding: .2em .8em; } #issue-list-nav li.current > a { background-color: #0079bc; color: #FAFAFA; - border-radius: .3em; } #issue-list-nav li.right { margin-left: 4px; @@ -2020,7 +2022,7 @@ textarea#issue-add-content { padding: 0 !important; } #issue-new > a button { - height: 34px; + height: 29px; } #issue-list-menu { padding: 16px 0 12px 0; @@ -2043,38 +2045,86 @@ textarea#issue-add-content { #issue-list-menu > .right .mark { margin-left: 12px; } -#issue-list .item { +#issue-list .item, +#pull-list .item { position: relative; padding-bottom: 12px; margin-bottom: 12px; border-bottom: 1px dashed #AAA; } -#issue-list .item .title > .title-text { +#issue-list .item .title > .title-text, +#pull-list .item .title > .title-text { color: #444; font-size: 15px; margin: 0 6px; } -#issue-list .comment { +#issue-list .item .index-num, +#pull-list .item .index-num { + padding: .25em .6em; +} +#issue-list .comment, +#pull-list .comment { color: #666; position: absolute; top: 6px; right: 0; } -#issue-list .issue-label a { +#issue-list .issue-label, +#pull-list .issue-label { + padding: .25em .6em; +} +#issue-list .issue-label a, +#pull-list .issue-label a { color: #FFF; } -#issue-list .desc { +#issue-list .desc, +#pull-list .desc { color: #999; } -#issue-list .desc a { +#issue-list .desc a, +#pull-list .desc a { color: #999; } -#issue-list .desc a:hover { +#issue-list .desc a:hover, +#pull-list .desc a:hover { color: #03a2ef; } #issue-list-pager { margin: 18px 0 24px 0; font-size: 14px; + line-height: 24px; +} +#labels-num { + margin-right: 1em; +} +#label-list .right { + margin-left: 1em; + color: #999; + line-height: 30px; +} +#label-list .right i { + margin-right: 3px; +} +#label-list .right:hover { + color: #444444; +} +#label-list .num { + margin-right: 3px; +} +#label-list .issue-num { + margin-right: 4em; +} +#label-list .label:hover { + color: #FFF; +} +#label-list .label i { + margin-right: 6px; +} +#label-list .item { + height: 30px; + padding-bottom: 12px; + margin-bottom: 12px; + border-bottom: 1px dashed #AAA; } .org-header-alert .alert { margin-top: 10px; diff --git a/public/ng/css/ui.css b/public/ng/css/ui.css index 8d562485ba..a33d9a7a15 100644 --- a/public/ng/css/ui.css +++ b/public/ng/css/ui.css @@ -735,7 +735,7 @@ ul.menu-radius > li:last-child > a { border-color: #F0C36D; } .label { - padding: 2px 6px; + padding: .3em .6em .2em .6em; color: #ffffff; } .label-red { @@ -882,8 +882,8 @@ table td { border-bottom-right-radius: .3em; } .pager .page { - padding: 2px 6px; - margin: 0 3px; + padding: .3em .5em .2em .5em; + margin: 0 .3em; background-color: #cccccc; color: #444444; } @@ -894,8 +894,8 @@ table td { } .pager .prev, .pager .next { - padding: 2px 8px; - margin: 0 4px; + padding: .4em .6em; + margin: 0 .3em; background-color: #505050; color: #fafafa; } diff --git a/public/ng/less/gogs/issue.less b/public/ng/less/gogs/issue.less index 1ab54ee370..79f9d793f0 100644 --- a/public/ng/less/gogs/issue.less +++ b/public/ng/less/gogs/issue.less @@ -223,19 +223,19 @@ textarea#issue-add-content { } // #issue list navigator #issue-list-nav { + border-bottom: 1px solid #DDD; + padding-bottom: 12px; li { > a { font-size: 13px; font-weight: bold; - padding: .4em .9em; - border-radius: .3em; + padding: .2em .8em; } } li.current { > a { background-color: #0079bc; color: #FAFAFA; - border-radius: .3em; } } li.right { @@ -247,7 +247,7 @@ textarea#issue-add-content { > a { padding: 0 !important; button { - height: 34px; + height: 29px; } } } @@ -282,7 +282,8 @@ textarea#issue-add-content { } } // each issue list item -#issue-list { +#issue-list, +#pull-list { .item { position: relative; padding-bottom: 12px; @@ -293,6 +294,9 @@ textarea#issue-add-content { font-size: 15px; margin: 0 6px; } + .index-num { + padding: .25em .6em; + } } .comment { color: #666; @@ -301,6 +305,7 @@ textarea#issue-add-content { right: 0; } .issue-label { + padding: .25em .6em; a { color: #FFF; } @@ -319,4 +324,43 @@ textarea#issue-add-content { #issue-list-pager { margin: 18px 0 24px 0; font-size: 14px; + line-height: 24px; +} +// labels numbers +#labels-num { + margin-right: 1em; +} +// labels list +#label-list { + .right { + margin-left: 1em; + color: #999; + i { + margin-right: 3px; + } + line-height: 30px; + &:hover { + color: #444444; + } + } + .num { + margin-right: 3px; + } + .issue-num { + margin-right: 4em; + } + .label { + &:hover { + color: #FFF; + } + i { + margin-right: 6px; + } + } + .item { + height: 30px; + padding-bottom: 12px; + margin-bottom: 12px; + border-bottom: 1px dashed #AAA; + } } \ No newline at end of file diff --git a/public/ng/less/ui/label.less b/public/ng/less/ui/label.less index 21a4c82d3d..ab07718f30 100644 --- a/public/ng/less/ui/label.less +++ b/public/ng/less/ui/label.less @@ -1,7 +1,7 @@ @import "var"; .label { - padding: 2px 6px; + padding: .3em .6em .2em .6em; color: @labelFontColor; } diff --git a/public/ng/less/ui/pager.less b/public/ng/less/ui/pager.less index 18e24cd132..37540b369e 100644 --- a/public/ng/less/ui/pager.less +++ b/public/ng/less/ui/pager.less @@ -2,8 +2,8 @@ .pager{ .page{ - padding: 2px 6px; - margin: 0 3px; + padding: .3em .5em .2em .5em; + margin: 0 .3em; background-color: @pagerPageBgColor; color: @pagerPageColor; &:hover,&.hover{ @@ -12,8 +12,8 @@ } } .prev,.next{ - padding: 2px 8px; - margin: 0 4px; + padding: .4em .6em; + margin: 0 .3em; background-color: @pagerDirectionBgColor; color: @pagerDirectionColor; &.invalid{ diff --git a/routers/repo/issue.go b/routers/repo/issue.go index e3a14e193b..b08b06050b 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1125,3 +1125,11 @@ func IssueGetAttachment(ctx *middleware.Context) { func Issues2(ctx *middleware.Context){ ctx.HTML(200,"repo/issue2/list") } + +func PullRequest2(ctx *middleware.Context){ + ctx.HTML(200,"repo/pr2/list") +} + +func Labels2(ctx *middleware.Context){ + ctx.HTML(200,"repo/issue2/labels") +} diff --git a/templates/repo/issue2/labels.tmpl b/templates/repo/issue2/labels.tmpl new file mode 100644 index 0000000000..b499bae1b1 --- /dev/null +++ b/templates/repo/issue2/labels.tmpl @@ -0,0 +1,36 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+ {{template "repo/header" .}} +
+ +
+
+
6Labels
+
+
+ +
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/repo/issue2/list.tmpl b/templates/repo/issue2/list.tmpl index 384371eb04..db69afb7aa 100644 --- a/templates/repo/issue2/list.tmpl +++ b/templates/repo/issue2/list.tmpl @@ -8,7 +8,7 @@
  • Pull Request
  • Labels
  • Milestones
    • -
    • +
  • Filter
    • @@ -29,9 +29,9 @@ 7

    - #588 + #588 Delete account text and/or translations missing - bug + bug

    opened 7 days ago by marcuspoehls

    @@ -40,9 +40,9 @@ 7

    - #588 + #588 Delete account text and/or translations missing - bug + bug

    opened 7 days ago by marcuspoehls

    @@ -51,19 +51,19 @@ 7

    - #588 + #588 Disabling attachments breaks issues and comments ajax submit - bug + bug

    opened 7 days ago by marcuspoehls

    - - 1 - 2 - 3 - + + 1 + 2 + 3 +
    diff --git a/templates/repo/pr2/list.tmpl b/templates/repo/pr2/list.tmpl new file mode 100644 index 0000000000..938682562e --- /dev/null +++ b/templates/repo/pr2/list.tmpl @@ -0,0 +1,48 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
    + {{template "repo/header" .}} +
    + +
    + + +
    + + 1 + 2 + 3 + +
    +
    +
    +
    +{{template "ng/base/footer" .}} \ No newline at end of file