third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

assignee ui in issue view

Browse Source
tokarchuk/v1.17
FuXiaoHei 11 years ago
parent 8eb15815f1
commit a03f380fa8
2 changed files with 80 additions and 62 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      public/css/gogs.css
  2. 122
      templates/issue/view.tmpl

20
public/css/gogs.css
Unescape View File

@ -1434,35 +1434,45 @@ html, body {
margin-bottom: 8px; margin-bottom: 8px;
} }
#issue .milestone-item .label{ #issue .milestone-item .label {
margin-top: 8px; margin-top: 8px;
float: left; float: left;
padding: .5em; padding: .5em;
margin-left: .8em; margin-left: .8em;
} }
#issue .assignee,#issue .assignee ul{ #issue .assignee.dropdown-menu, #issue .assignee ul {
padding: 0; padding: 0;
margin: 0; margin: 0;
min-width: 300px; min-width: 300px;
} }
#issue .assignee li{ #issue .assignee li {
padding: 4px 12px; padding: 4px 12px;
line-height: 30px; line-height: 30px;
} }
#issue .assignee li:hover{ #issue .assignee li:hover {
background-color: #e8f0ff; background-color: #e8f0ff;
cursor: pointer; cursor: pointer;
} }
#issue .assignee li img{ #issue .assignee li img, #issue .issue-bar .assignee img {
width: 28px; width: 28px;
height: 28px; height: 28px;
margin-right: 12px; margin-right: 12px;
} }
#issue .issue-bar > div {
padding-bottom: 8px;
margin-bottom: 8px;
border-bottom: 1px solid #CCC;
}
#issue .issue-bar .assignee {
line-height: 30px;
}
/* wrapper and footer */ /* wrapper and footer */
#wrapper { #wrapper {

122
templates/issue/view.tmpl
Unescape View File

@ -5,64 +5,65 @@
<div id="body" class="container"> <div id="body" class="container">
<div id="issue"> <div id="issue">
<div id="issue-{{.Issue.Id}}" class="issue-whole issue-is-opening"> <div id="issue-{{.Issue.Id}}" class="issue-whole issue-is-opening">
<div class="issue-head clearfix"> <div class="issue-wrap col-md-10">
<div class="number pull-right">#{{.Issue.Index}}</div> <div class="issue-head clearfix">
<a class="author pull-left" href="/user/{{.Issue.Poster.Name}}"><img class="avatar" src="{{.Issue.Poster.AvatarLink}}" alt="" width="30"/></a> <div class="number pull-right">#{{.Issue.Index}}</div>
<h1 class="title pull-left">{{.Issue.Name}}</h1> <a class="author pull-left" href="/user/{{.Issue.Poster.Name}}"><img class="avatar" src="{{.Issue.Poster.AvatarLink}}" alt="" width="30"/></a>
<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"/> <h1 class="title pull-left">{{.Issue.Name}}</h1>
<input type="hidden" value="{{.Issue.Id}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="issue_id"/> <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"/>
<p class="info pull-left"> <input type="hidden" value="{{.Issue.Id}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="issue_id"/>
{{if .IsIssueOwner}}<a class="btn btn-default pull-right issue-edit" href="#" id="issue-edit-btn">Edit</a> <p class="info pull-left">
<a class="btn btn-danger pull-right issue-edit-cancel hidden" href="#">Cancel</a> {{if .IsIssueOwner}}<a class="btn btn-default pull-right issue-edit" href="#" id="issue-edit-btn">Edit</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-danger pull-right issue-edit-cancel hidden" href="#">Cancel</a>
<span class="status label label-{{if .Issue.IsClosed}}danger{{else}}success{{end}}">{{if .Issue.IsClosed}}Closed{{else}}Open{{end}}</span> <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 href="/user/{{.Issue.Poster.Name}}" class="author"><strong>{{.Issue.Poster.Name}}</strong></a> opened this issue <span class="status label label-{{if .Issue.IsClosed}}danger{{else}}success{{end}}">{{if .Issue.IsClosed}}Closed{{else}}Open{{end}}</span>
<span class="time">{{TimeSince .Issue.Created}}</span> · {{.Issue.NumComments}} comments <a href="/user/{{.Issue.Poster.Name}}" class="author"><strong>{{.Issue.Poster.Name}}</strong></a> opened this issue
</p> <span class="time">{{TimeSince .Issue.Created}}</span> · {{.Issue.NumComments}} comments
</div> </p>
<div class="issue-main"> </div>
<div class="panel panel-default issue-content"> <div class="issue-main">
<div class="panel-body markdown"> <div class="panel panel-default issue-content">
<div class="content"> <div class="panel-body markdown">
{{str2html .Issue.RenderedContent}} <div class="content">
</div> {{str2html .Issue.RenderedContent}}
<textarea class="form-control hidden" name="content" id="issue-edit-content" rows="10" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="content">{{.Issue.Content}}</textarea> </div>
</div> <textarea class="form-control hidden" name="content" id="issue-edit-content" rows="10" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="content">{{.Issue.Content}}</textarea>
</div> </div>
{{range .Comments}} </div>
{{if eq .Type 0}} {{range .Comments}}
<div class="issue-child" id="issue-comment-{{.Id}}"> {{if eq .Type 0}}
<a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> <div class="issue-child" id="issue-comment-{{.Id}}">
<div class="issue-content panel panel-default"> <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
<div class="panel-heading"> <div class="issue-content panel panel-default">
<a href="/user/{{.Poster.Name}}" class="user">{{.Poster.Name}}</a> commented <span class="time">{{TimeSince .Created}}</span> <div class="panel-heading">
<!-- <a class="issue-comment-del pull-right issue-action" href="#" title="Edit Comment"><i class="fa fa-times-circle"></i></a> <a href="/user/{{.Poster.Name}}" class="user">{{.Poster.Name}}</a> commented <span class="time">{{TimeSince .Created}}</span>
<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-del pull-right issue-action" href="#" title="Edit Comment"><i class="fa fa-times-circle"></i></a>
<span class="role label label-default pull-right">Owner</span> <a class="issue-comment-edit pull-right issue-action" href="#" title="Remove Comment" data-url="{remove-link}"><i class="fa fa-edit"></i></a> -->
</div> <span class="role label label-default pull-right">Owner</span>
<div class="panel-body markdown"> </div>
{{str2html .Content}} <div class="panel-body markdown">
</div> {{str2html .Content}}
</div> </div>
</div> </div>
{{else if eq .Type 1}} </div>
<div class="issue-child issue-opened"> {{else if eq .Type 1}}
<a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" /></a> <div class="issue-child issue-opened">
<div class="issue-content"> <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" /></a>
<a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-success">Reopened</span> this issue <span class="time">{{TimeSince .Created}}</span> <div class="issue-content">
</div> <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-success">Reopened</span> this issue <span class="time">{{TimeSince .Created}}</span>
</div> </div>
{{else if eq .Type 2}}
<div class="issue-child issue-closed">
<a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
<div class="issue-content">
<a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created}}</span>
</div> </div>
</div> {{else if eq .Type 2}}
{{end}} <div class="issue-child issue-closed">
{{end}} <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
<hr class="issue-line"/> <div class="issue-content">
{{if .SignedUser}}<div class="issue-child issue-reply"> <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created}}</span>
</div>
</div>
{{end}}
{{end}}
<hr class="issue-line"/>
{{if .SignedUser}}<div class="issue-child issue-reply">
<a class="user pull-left" href="/user/{{.SignedUser.Name}}"><img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/></a> <a class="user pull-left" href="/user/{{.SignedUser.Name}}"><img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/></a>
<form class="panel panel-default issue-content" action="{{.RepoLink}}/comment/new" method="post"> <form class="panel panel-default issue-content" action="{{.RepoLink}}/comment/new" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
@ -95,6 +96,13 @@
</div> </div>
</form> </form>
</div>{{else}}<div class="alert alert-warning"><a class="btn btn-success btn-lg" href="/user/sign_up">Sign up for free</a> to join this conversation. Already have an account? <a href="/user/login">Sign in to comment</a></div>{{end}} </div>{{else}}<div class="alert alert-warning"><a class="btn btn-success btn-lg" href="/user/sign_up">Sign up for free</a> to join this conversation. Already have an account? <a href="/user/login">Sign in to comment</a></div>{{end}}
</div>
</div>
<div class="issue-bar col-md-2">
<div class="assignee">
<h4>Assignee</h4>
<p><img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132"><strong>fuxiaohei</strong></p>
</div>
</div><!-- </div><!--
<div class="col-md-3"> <div class="col-md-3">
label assignment milestone dashboard label assignment milestone dashboard

Write Preview
Loading…
Cancel
Save