##// END OF EJS Templates
comments: small fixes for range commits comments
milka -
r4551:d3ec0df2 default
parent child Browse files
Show More
@@ -473,10 +473,10 b' class RepoCommitsView(RepoAppView):'
473 self.db_repo_name, commit_obj=commit)
473 self.db_repo_name, commit_obj=commit)
474
474
475 comment_data = data
475 comment_data = data
476 comment_type = 'inline' if is_inline else 'general'
476 posted_comment_type = 'inline' if is_inline else 'general'
477 channelstream.comment_channelstream_push(
477 channelstream.comment_channelstream_push(
478 self.request, comment_broadcast_channel, self._rhodecode_user,
478 self.request, comment_broadcast_channel, self._rhodecode_user,
479 _('posted a new {} comment').format(comment_type),
479 _('posted a new {} comment').format(posted_comment_type),
480 comment_data=comment_data)
480 comment_data=comment_data)
481
481
482 # finalize, commit and redirect
482 # finalize, commit and redirect
@@ -520,10 +520,6 b' form.comment-form {'
520 color: @grey4;
520 color: @grey4;
521 }
521 }
522
522
523 p {
524 padding: 0;
525 margin: 0;
526 }
527 }
523 }
528
524
529 .action-buttons-extra {
525 .action-buttons-extra {
@@ -325,10 +325,9 b''
325 ## inject form here
325 ## inject form here
326 </div>
326 </div>
327 <script type="text/javascript">
327 <script type="text/javascript">
328 var lineNo = 'general';
329 var resolvesCommentId = null;
328 var resolvesCommentId = null;
330 var generalCommentForm = Rhodecode.comments.createGeneralComment(
329 var generalCommentForm = Rhodecode.comments.createGeneralComment(
331 lineNo, "${placeholder}", resolvesCommentId);
330 'general', "${placeholder}", resolvesCommentId);
332
331
333 // set custom success callback on rangeCommit
332 // set custom success callback on rangeCommit
334 % if is_compare:
333 % if is_compare:
@@ -543,13 +542,13 b''
543
542
544 <div class="toolbar-text">
543 <div class="toolbar-text">
545 <% renderer_url = '<a href="%s">%s</a>' % (h.route_url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper()) %>
544 <% renderer_url = '<a href="%s">%s</a>' % (h.route_url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper()) %>
546 <p>${_('Styling with {} is supported.').format(renderer_url)|n}
545 <span>${_('Styling with {} is supported.').format(renderer_url)|n}
547
546
548 <i class="icon-info-circled tooltip-hovercard"
547 <i class="icon-info-circled tooltip-hovercard"
549 data-hovercard-alt="ALT"
548 data-hovercard-alt="ALT"
550 data-hovercard-url="javascript:commentHelp('${c.visual.default_renderer.upper()}')"
549 data-hovercard-url="javascript:commentHelp('${c.visual.default_renderer.upper()}')"
551 data-comment-json-b64='${h.b64(h.json.dumps({}))}'></i>
550 data-comment-json-b64='${h.b64(h.json.dumps({}))}'></i>
552 </p>
551 </span>
553 </div>
552 </div>
554 </div>
553 </div>
555
554
@@ -104,8 +104,6 b''
104 %for commit in c.commit_ranges:
104 %for commit in c.commit_ranges:
105 ## commit range header for each individual diff
105 ## commit range header for each individual diff
106 <h3>
106 <h3>
107
108
109 <a class="tooltip-hovercard revision" data-hovercard-alt="Commit: ${commit.short_id}" data-hovercard-url="${h.route_path('hovercard_repo_commit', repo_name=c.repo_name, commit_id=commit.raw_id)}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}">
107 <a class="tooltip-hovercard revision" data-hovercard-alt="Commit: ${commit.short_id}" data-hovercard-url="${h.route_path('hovercard_repo_commit', repo_name=c.repo_name, commit_id=commit.raw_id)}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}">
110 ${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}
108 ${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}
111 </a>
109 </a>
General Comments 0
You need to be logged in to leave comments. Login now