Files
@ ad5f5906e340
Branch filter:
Location: kallithea/kallithea/templates/changeset/changeset_file_comment.html
ad5f5906e340
7.7 KiB
text/html
style: increase spacing around PR comment chunks
Use more spacing around the whole comment section - 5px was too cramped, 10px
(from @kallithea-panel-margin) is used in other places and looks better.
Use more spacing around the whole comment section - 5px was too cramped, 10px
(from @kallithea-panel-margin) is used in other places and looks better.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | ## -*- coding: utf-8 -*-
## usage:
## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
## ${comment.comment_block(co)}
##
<%def name="comment_block(co)">
<div class="comment" id="comment-${co.comment_id}">
<div class="comment-prev-next-links"></div>
<div class="panel panel-default">
<div class="panel-heading">
${h.gravatar_div(co.author.email, size=20)}
<span class="user">
${co.author.full_name_and_username}
</span>
<span data-toggle="tooltip" title="${h.fmt_date(co.modified_at)}">
${h.age(co.modified_at)}
</span>
%if co.pull_request:
<a href="${co.url()}">${_("comment")}</a>
${_('on pull request')}
<a href="${co.pull_request.url()}">"${co.pull_request.title or _("No title")}"</a>
%else:
${_('on this changeset')}
%endif
<a class="permalink" href="${co.url()}">¶</a>
%if co.author_id == request.authuser.user_id or h.HasRepoPermissionLevel('admin')(c.repo_name):
%if co.deletable():
<button type="button" onClick="confirm('${_('Delete comment?')}') && deleteComment(${co.comment_id})" class="pull-right buttons delete-comment btn btn-default btn-xs">${_('Delete')}</button>
%endif
%endif
</div>
<div class="panel-body">
%if co.status_change:
<div class="automatic-comment">
<p>
${_("Status change")}: <span class="comment-status-label">${co.status_change[0].status_lbl}</span>
<i class="icon-circle changeset-status-${co.status_change[0].status}"></i>
</p>
</div>
%endif
<div class="comment-text">
%if co.text:
${h.render_w_mentions(co.text, c.repo_name)|n}
%endif
</div>
</div>
</div>
</div>
</%def>
<%def name="comment_inline_form()">
<div id='comment-inline-form-template' style="display: none;">
<div class="comment comment-preview submitting" style="display: none;">
<div class="panel panel-default">
<div class="panel-heading">
${h.gravatar_div(request.authuser.email, size=20)}
<span class="user">
${request.authuser.full_name_or_username}
</span>
<span class="comment-submission-status">
${_('Submitting ...')}
</span>
</div>
<div class="panel-body">
<div class="automatic-comment" style="display: none;">
<p>
${_("Status change")}: <span class="comment-status-label"></span>
<i class="icon-circle"></i>
</p>
</div>
<div class="comment-text">
<div class="formatted-fixed">
</div>
</div>
</div>
</div>
</div>
<div class="ac">
%if request.authuser.username != 'default':
${h.form('#', class_='inline-form')}
<div class="well well-sm clearfix">
<div class="comment-help">
<span class="text-muted">${_('Comments are in plain text. Use @username to notify another user.')|n}</span>
</div>
<textarea name="text" class="form-control"></textarea>
<div id="status_block_container" class="status-block general-only hidden">
%if c.pull_request is None:
${_('Set changeset status')}:
%else:
${_('Vote for pull request status')}:
%endif
<span class="general-only cs-only">
</span>
<label class="radio-inline">
<input type="radio" class="status_change_radio" name="changeset_status" id="changeset_status_unchanged" value="" checked="checked" />
${_('No change')}
</label>
%for status, lbl in c.changeset_statuses:
<label class="radio-inline">
<input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
${lbl}<i class="icon-circle changeset-status-${status}"></i>
</label>
%endfor
%if c.pull_request is not None and ( \
h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionLevel('admin')(c.repo_name) \
or c.pull_request.owner_id == request.authuser.user_id):
<div>
${_('Finish pull request')}:
<label class="checkbox-inline">
<input id="save_close" type="checkbox" name="save_close" class="status_change_checkbox">
${_("Close")}
</label>
<label class="checkbox-inline">
<input id="save_delete" type="checkbox" name="save_delete" value="delete" class="status_change_checkbox">
${_("Delete")}
</label>
</div>
%endif
</div>
</div>
<div class="comment-button">
${h.submit('save', _('Comment'), class_='btn btn-default btn-sm save-inline-form')}
${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-default btn-sm hide-inline-form')}
</div>
${h.end_form()}
%else:
${h.form('')}
<div class="clearfix">
<div class="comment-help">
${_('You need to be logged in to comment.')} <a href="${h.url('login_home', came_from=request.path_qs)}">${_('Login now')}</a>
</div>
</div>
<div class="comment-button">
${h.reset('hide-inline-form', _('Hide'), class_='btn btn-default btn-sm hide-inline-form')}
</div>
${h.end_form()}
%endif
</div>
</div>
</%def>
## show comment count as "x comments (y inline, z general)"
<%def name="comment_count(inline_cnt, general_cnt)">
${'%s (%s, %s)' % (
ungettext("%d comment", "%d comments", inline_cnt + general_cnt) % (inline_cnt + general_cnt),
ungettext("%d inline", "%d inline", inline_cnt) % inline_cnt,
ungettext("%d general", "%d general", general_cnt) % general_cnt
)}
<span class="firstlink"></span>
</%def>
## generate inline comments and the main ones
<%def name="generate_comments()">
## original location of comments ... but the ones outside diff context remains here
<div class="comments inline-comments">
%for f_path, lines in c.inline_comments:
%for line_no, comments in lines.iteritems():
<div class="comments-list-chunk" data-f_path="${f_path}" data-line_no="${line_no}" data-target-id="${h.safeid(h.safe_unicode(f_path))}_${line_no}">
%for co in comments:
${comment_block(co)}
%endfor
</div>
%endfor
%endfor
<div class="comments-list-chunk" data-f_path="" data-line_no="" data-target-id="general-comments">
%for co in c.comments:
${comment_block(co)}
%endfor
</div>
</div>
<div class="comments-number">
${comment_count(c.inline_cnt, len(c.comments))}
</div>
</%def>
## MAIN COMMENT FORM
<%def name="comments(change_status=True)">
<div class="inline-comments inline-comments-general
${'show-general-status' if change_status else ''}">
<div id="comments-general-comments" class="">
## comment_div for general comments
</div>
</div>
<script>
$(document).ready(function () {
$(window).on('beforeunload', function(){
var $textareas = $('.comment-inline-form textarea[name=text]');
if($textareas.size() > 1 ||
$textareas.val()) {
// this message will not be displayed on all browsers
// (e.g. some versions of Firefox), but the user will still be warned
return 'There are uncommitted comments.';
}
});
});
</script>
</%def>
|