kallithea Changeset - 1f06cd49cb3e

Changeset - 1f06cd49cb3e

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Aras Pranckevicius - 14 years ago 2012-01-07 20:44:18
aras@unity3d.com

changeset: simplifying comments

2 files changed with 11 insertions and 19 deletions:

rhodecode/public/css/style.css

rhodecode/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -3676,68 +3676,69 @@ div.rst-block pre { @@
     color: #444;
     overflow: auto;
     -webkit-box-shadow: rgba(0,0,0,0.07) 0 1px 2px inset;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
+}
 /** comment main **/
 .comments {
     padding:10px 20px;
+}
 .comments .comment {
     border: 1px solid #ddd;
     margin-top: 10px;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
+}
 .comments .comment .meta {
     background: #f8f8f8;
-    padding: 6px;
+    padding: 4px;
     border-bottom: 1px solid #ddd;
+}
 .comments .comment .meta img {
     vertical-align: middle;
+}
 .comments .comment .meta .user {
     font-weight: bold;
+}
 .comments .comment .meta .date {
     float: right;
+}
 .comments .comment .text {
     padding: 8px 6px 6px 14px;
     background-color: #FAFAFA;
+}
 .comment .text div.rst-block p {
 	margin: 0.5em 0px !important;
+}
 .comments .comments-number{
 	padding:0px 0px 10px 0px;
 	font-weight: bold;
 	color: #666;
 	font-size: 16px;
+}
 /** comment form **/
 .comment-form .clearfix{
 	background: #EEE;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     padding: 10px;
+}
 div.comment-form {
     margin-top: 20px;
+}
 .comment-form strong {
     display: block;
@@ @@ -3763,50 +3764,49 @@ form.comment-form { @@
 .file-comments {
     display: none;
+}
 .comment-form .comment {
     margin-left: 10px;
+}
 .comment-form .comment-help{
     padding: 0px 0px 5px 0px;
     color: #666;
+}
 .comment-form .comment-button{
 	padding-top:5px;
+}
 .add-another-button {
     margin-left: 10px;
     margin-top: 10px;
     margin-bottom: 10px;
+}
 .comment .buttons {
     position: absolute;
     right:40px;
 	float: right;
+}
 .show-inline-comments{
 	position: relative;
 	top:1px
+}
 /** comment inline form **/
 .comment-inline-form .clearfix{
     background: #EEE;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     padding: 5px;
+}
 div.comment-inline-form {
     margin-top: 5px;
     padding:2px 6px 8px 6px;
+}
 .comment-inline-form strong {
@@ @@ -3851,66 +3851,64 @@ form.comment-inline-form { @@
 /** comment inline **/
 .inline-comments {
     padding:10px 20px;
+}
 .inline-comments div.rst-block  {
 	clear:both;
 	overflow:hidden;
 	margin:0;
 	padding:0 20px 0px;
+}
 .inline-comments .comment {
     border: 1px solid #ddd;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     margin: 3px 3px 5px 5px;
     background-color: #FAFAFA;
+}
 .inline-comments .comment-wrapp{
 	padding:1px;
+}
 .inline-comments .comment .meta {
     background: #f8f8f8;
-    padding: 6px;
+    padding: 4px;
     border-bottom: 1px solid #ddd;
+}
 .inline-comments .comment .meta img {
     vertical-align: middle;
+}
 .inline-comments .comment .meta .user {
     font-weight: bold;
+}
 .inline-comments .comment .meta .date {
     float: right;
+}
 .inline-comments .comment .text {
     padding: 8px 6px 6px 14px;
     background-color: #FAFAFA;
+}
 .inline-comments .comments-number{
     padding:0px 0px 10px 0px;
     font-weight: bold;
     color: #666;
     font-size: 16px;
+}
 .inline-comments-button .add-comment{
 	margin:10px 5px !important;
+}
 .notifications{
 	width:22px;
     padding:2px;
 	float:right;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     text-align: center;
     margin: 0px -10px 0px 5px;
     background-color: #DEDEDE;
+}
 .notifications a{

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

 ## -*- 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-wrapp">
   	<div class="meta">
   		<span class="user">
   			<img src="${h.gravatar_url(co.author.email, 20)}" />
   			${co.author.username}
   		</span>
   		<a href="${h.url.current(anchor='comment-%s' % co.comment_id)}"> ${_('commented on')} </a>
   		${h.short_id(co.revision)}
   		%if co.f_path:
   			${_(' in file ')}
   			${co.f_path}:L ${co.line_no}
   		%endif
   		<span class="date">
   			${h.age(co.modified_at)}
   		</span>
       %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
         <span class="buttons">
           <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
         </span>
       %endif
   	</div>
   	<div class="text">
   		%if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
   			<div class="buttons">
   				<span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
   			</div>
   		%endif
   		${h.rst_w_mentions(co.text)|n}
   	</div>
     </div>
   </div>
 </%def>
 <%def name="comment_inline_form(changeset)">
 <div id='comment-inline-form-template' style="display:none">
   <div class="comment-inline-form">
   %if c.rhodecode_user.username != 'default':
       ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}
       <div class="clearfix">
           <div class="comment-help">${_('Commenting on line')} {1}. ${_('Comments parsed using')}
           <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} ${_('with')}
           <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
           </div>
           <textarea id="text_{1}" name="text"></textarea>
       </div>
       <div class="comment-button">
       <input type="hidden" name="f_path" value="{0}">
       <input type="hidden" name="line" value="{1}">
       ${h.submit('save', _('Comment'), class_='ui-btn')}
       ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}

0 comments (0 inline, 0 general)