From 9047cadcd33f95eebafa2f794b895c8406eb80c5 Mon Sep 17 00:00:00 2001 From: FuXiaoHei <fuxiaohei@hexiaz.com> Date: Fri, 28 Mar 2014 21:42:28 +0800 Subject: [PATCH] issue close and reopen block ui --- public/css/gogs.css | 21 ++++++++++++++++++++- templates/issue/view.tmpl | 20 ++++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/public/css/gogs.css b/public/css/gogs.css index d4976460e64f..d6c117c846c2 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -856,6 +856,7 @@ html, body { .commit-list .sha a { font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace; + font-size: 14px; } .guide-box pre, .guide-box .input-group { @@ -1165,7 +1166,7 @@ html, body { font-weight: normal; } -#issue .issue-child .panel-heading .user { +#issue .issue-child .panel-heading .user,#issue .issue-closed a.user,#issue .issue-opened a.user { font-weight: bold; } @@ -1173,6 +1174,10 @@ html, body { border-color: #CCC; } +#issue .issue-is-closed .issue-line{ + display: none; +} + #issue .issue-head .info .btn { margin-top: -8px; margin-left: 8px; @@ -1188,6 +1193,20 @@ html, body { width: 60%; } +#issue .issue-closed .issue-content,#issue .issue-opened .issue-content{ + line-height: 42px; +} + +#issue .issue-closed{ + border-bottom: 3px solid #CCC; + margin-bottom: 24px; + padding-bottom: 24px; +} + +#issue .issue-closed .btn-danger,#issue .issue-opened .btn-success{ + margin: 0 .8em; +} + /* wrapper and footer */ #wrapper { diff --git a/templates/issue/view.tmpl b/templates/issue/view.tmpl index 4d053930b944..609974f41328 100644 --- a/templates/issue/view.tmpl +++ b/templates/issue/view.tmpl @@ -4,7 +4,7 @@ {{template "repo/toolbar" .}} <div id="body" class="container"> <div id="issue"> - <div id="issue-{issue.id}" class="issue-whole"> + <div id="issue-{issue.id}" class="issue-whole issue-is-opening"> <div class="issue-head clearfix"> <div class="number pull-right">#{{.Issue.Index}}</div> <a class="author pull-left" href="/user/{{.Issue.Poster.Name}}"><img class="avatar" src="{{.Issue.Poster.AvatarLink}}" alt="" width="30"/></a> @@ -44,6 +44,22 @@ </div> </div> {{end}} + <div class="issue-child issue-closed"> + <a class="user pull-left" href="{user.link}"><img class="avatar" src="{user.avatar}" alt=""/></a> + <div class="issue-content"> + <a class="user pull-left" href="{user.link}">{user.name}</a> + <span class="btn btn-danger">Closed</span> this + <span class="time">{close.time}</span> + </div> + </div> + <div class="issue-child issue-opened"> + <a class="user pull-left" href="{user.link}"><img class="avatar" src="{user.avatar}" alt=""/></a> + <div class="issue-content"> + <a class="user pull-left" href="{user.link}">{user.name}</a> + <span class="btn btn-success">Reopened</span> this + <span class="time">{close.time}</span> + </div> + </div> <hr class="issue-line"/> <div class="issue-child issue-reply"> <a class="user pull-left" href="/user/{{.SignedUser.Name}}"><img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/></a> @@ -71,7 +87,7 @@ <div class="text-right"> <div class="form-group"> <input type="hidden" value="id" name="repo-id"/> - <button class="btn-default btn issue-open" id="issue-open-btn" data-origin="Open" data-text="Open & Comment">Open</button> + <button class="btn-default btn issue-open" id="issue-open-btn" data-origin="Re-Open" data-text="Re-Open & Comment">Open</button> <button class="btn-default btn issue-close" id="issue-close-btn" data-origin="Close" data-text="Close & Comment">Close</button> <button class="btn-success btn" id="issue-reply-btn">Comment</button> </div>