kallithea Changeset - c83d3d42ab92

Changeset - c83d3d42ab92

Parent rev.

Child rev.

[Not reviewed]

beta

1 6 0

Marcin Kuzminski - 14 years ago 2011-12-09 23:48:05
marcin@python-works.com

- diff.css merge to main style.css
- css fixes for diffs
- JS fixes for diff and inline comments

7 files changed with 155 insertions and 161 deletions:

rhodecode/lib/diffs.py

rhodecode/public/css/diff.css

150

rhodecode/public/css/style.css

138

rhodecode/public/js/rhodecode.js

rhodecode/templates/base/root.html

rhodecode/templates/changeset/changeset.html

rhodecode/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -363,85 +363,85 @@ class DiffProcessor(object): @@
         """
         Return udiff as html table with customized css classes
         """
         def _link_to_if(condition, label, url):
             """
             Generates a link if condition is meet or just the label if not.
             """
             if condition:
                 return '''<a href="%(url)s">%(label)s</a>''' % {'url': url,
                                                                 'label': label}
             else:
                 return label
         diff_lines = self.prepare()
         _html_empty = True
         _html = []
         _html.append('''<table class="%(table_class)s">\n''' \
                                             % {'table_class': table_class})
         for diff in diff_lines:
             for line in diff['chunks']:
                 _html_empty = False
                 for change in line:
                     _html.append('''<tr class="%(line_class)s %(action)s">\n''' \
                         % {'line_class': line_class,
                            'action': change['action']})
                     anchor_old_id = ''
                     anchor_new_id = ''
                     anchor_old = "%(filename)s_o%(oldline_no)s" % \
                                 {'filename': self._safe_id(diff['filename']),
                                  'oldline_no': change['old_lineno']}
                     anchor_new = "%(filename)s_n%(oldline_no)s" % \
                                 {'filename': self._safe_id(diff['filename']),
                                  'oldline_no': change['new_lineno']}
                     cond_old = change['old_lineno'] != '...' and \
                                                         change['old_lineno']
                     cond_new = change['new_lineno'] != '...' and \
                                                         change['new_lineno']
                     if cond_old:
                         anchor_old_id = 'id="%s"' % anchor_old
                     if cond_new:
                         anchor_new_id = 'id="%s"' % anchor_new
                     ###########################################################
                     # OLD LINE NUMBER
                     ###########################################################
                     _html.append('''\t<td %(a_id)s class="%(old_lineno_cls)s">''' \
                                     % {'a_id': anchor_old_id,
                                        'old_lineno_cls': old_lineno_class})
-                    _html.append('''<pre>%(link)s</pre>''' \
                     _html.append('''%(link)s''' \
                         % {'link':
                         _link_to_if(cond_old, change['old_lineno'], '#%s' \
                                                                 % anchor_old)})
                     _html.append('''</td>\n''')
                     ###########################################################
                     # NEW LINE NUMBER
                     ###########################################################
                     _html.append('''\t<td %(a_id)s class="%(new_lineno_cls)s">''' \
                                     % {'a_id': anchor_new_id,
                                        'new_lineno_cls': new_lineno_class})
-                    _html.append('''<pre>%(link)s</pre>''' \
                     _html.append('''%(link)s''' \
                         % {'link':
                         _link_to_if(cond_new, change['new_lineno'], '#%s' \
                                                                 % anchor_new)})
                     _html.append('''</td>\n''')
                     ###########################################################
                     # CODE
                     ###########################################################
                     _html.append('''\t<td class="%(code_class)s">''' \
                                                 % {'code_class': code_class})
                     _html.append('''\n\t\t<pre>%(code)s</pre>\n''' \
                                                 % {'code': change['line']})
                     _html.append('''\t</td>''')
                     _html.append('''\n</tr>\n''')
         _html.append('''</table>''')
         if _html_empty:
             return None
         return ''.join(_html)
     def stat(self):
         """
         Returns tuple of added, and removed lines for this instance
         """
         return self.adds, self.removes

rhodecode/public/css/diff.css

➞

Show inline comments

deleted file

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2697,97 +2697,96 @@ div.gravatar img { @@
 	-khtml-border-radius: 4px;
 	-moz-border-radius: 4px;
 	border-radius: 4px;
+}
 #header,#content,#footer {
 	min-width: 978px;
+}
 #content {
 	clear: both;
 	overflow: hidden;
 	padding: 14px 10px;
+}
 #content div.box div.title div.search {
 	border-left: 1px solid #316293;
+}
 #content div.box div.title div.search div.input input {
 	border: 1px solid #316293;
+}
 .ui-btn{
     color: #515151;
     background-color: #DADADA;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#F4F4F4),to(#DADADA) );
     background-image: -moz-linear-gradient(top, #F4F4F4, #DADADA);
     background-image: -ms-linear-gradient(top, #F4F4F4, #DADADA);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F4F4F4),color-stop(100%, #DADADA) );
     background-image: -webkit-linear-gradient(top, #F4F4F4, #DADADA) );
     background-image: -o-linear-gradient(top, #F4F4F4, #DADADA) );
     background-image: linear-gradient(top, #F4F4F4, #DADADA);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#F4F4F4', endColorstr='#DADADA', GradientType=0);
     border-top: 1px solid #DDD;
     border-left: 1px solid #c6c6c6;
     border-right: 1px solid #DDD;
     border-bottom: 1px solid #c6c6c6;
     color: #515151;
     outline: none;
     margin: 0px 3px 3px 0px;
     -webkit-border-radius: 4px 4px 4px 4px !important;
     -khtml-border-radius: 4px 4px 4px 4px !important;
     -moz-border-radius: 4px 4px 4px 4px !important;
     border-radius: 4px 4px 4px 4px !important;
     box-shadow: 0 1px 0 #DADADA !important;
     cursor: pointer !important;
 	padding: 3px 3px 3px 3px;
+}
 .ui-btn.xsmall{
     padding: 1px 2px 1px 1px;
+}
 .ui-btn:focus {
   outline: none;
+}
 .ui-btn:hover{
     background-position: 0 -15px;
     text-decoration: none;
     color: #515151;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25), 0 0 3px #FFFFFF !important;
+}
 .ui-btn.red{
   color:#fff;
   background-color: #c43c35;
   background-repeat: repeat-x;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
   background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
   background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: linear-gradient(top, #ee5f5b, #c43c35);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
   border-color: #c43c35 #c43c35 #882a25;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .ui-btn.blue{
   background-color: #339bb9;
   background-repeat: repeat-x;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
   background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));
   background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
   background-image: linear-gradient(top, #5bc0de, #339bb9);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
   border-color: #339bb9 #339bb9 #22697d;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
@@ @@ -3512,128 +3511,264 @@ div.comment-inline-form { @@
     font-family: 'Monaco', 'Courier', 'Courier New', monospace;
+}
 form.comment-inline-form {
     margin-top: 10px;
     margin-left: 10px;
+}
 .comment-inline-form-submit {
     margin-top: 5px;
     margin-left: 525px;
+}
 .file-comments {
     display: none;
+}
 .comment-inline-form .comment {
     margin-left: 10px;
+}
 .comment-inline-form .comment-help{
     padding: 0px 0px 2px 0px;
     color: #666666;
     font-size: 10px;
+}
 .comment-inline-form .comment-button{
     padding-top:5px;
+}
 /** 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;
     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{
 	color:#888 !important;
 	display: block;
 	font-size: 10px
+}
 .notifications a:hover{
 	text-decoration: none !important;
+}
 .notification-header{
+}
 .notification-header .desc{
 	font-size: 16px;
     height: 24px;
     padding-top: 6px;
     float: left
+}
 .notification-list .container.unread{
+}
 .notification-header .desc.unread{
     font-weight: bold;
     font-size: 17px;
+}
 .notification-header .delete-notifications{
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-subject{
     clear:both;
     border-bottom: 1px solid #eee;
     padding:5px 0px 5px 38px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 div.diffblock {
     overflow: auto;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
     -webkit-border-radius: 6px 6px 0px 0px;
     -moz-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.diffblock.margined{
     margin: 0px 20px 0px 20px;
+}
 div.diffblock .code-header{
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     padding:10px 0 10px 0;
+}
 div.diffblock .code-header div{
     margin-left:10px;
     font-weight: bold;
     font-size: 14px;
+}
 div.diffblock .code-body{
     background: #FFFFFF;
+}
 div.diffblock pre.raw{
     background: #FFFFFF;
     color:#000000;
+}
 table.code-difftable{
     border-collapse: collapse;
     width: 99%;
+}
 table.code-difftable td {
     padding: 0 !important;
     background: none !important;
     border:0 !important;
     vertical-align: none !important;
+}
 table.code-difftable .context{
     background:none repeat scroll 0 0 #DDE7EF;
+}
 table.code-difftable .add{
     background:none repeat scroll 0 0 #DDFFDD;
+}
 table.code-difftable .add ins{
     background:none repeat scroll 0 0 #AAFFAA;
     text-decoration:none;
+}
 table.code-difftable .del{
     background:none repeat scroll 0 0 #FFDDDD;
+}
 table.code-difftable .del del{
     background:none repeat scroll 0 0 #FFAAAA;
     text-decoration:none;
+}
 /** LINE NUMBERS **/
 table.code-difftable .lineno{
     background:none repeat scroll 0 0 #EEEEEE !important;
     padding-left:2px;
     padding-right:2px;
     text-align:right;
     width:30px;
     -moz-user-select:none;
     -webkit-user-select: none;
     border-right: 1px solid #CCC !important;
     border-left: 0px solid #CCC !important;
     border-top: 0px solid #CCC !important;
     border-bottom: none !important;
     vertical-align: middle !important;
+}
 table.code-difftable .lineno.new {
+}
 table.code-difftable .lineno.old {
+}
 table.code-difftable .lineno a{
     color:#747474 !important;
     font:11px "Bitstream Vera Sans Mono",Monaco,"Courier New",Courier,monospace !important;
     letter-spacing:-1px;
     text-align:right;
     float:right;
     width:20px;
     padding-right: 2px;
     cursor: pointer;
+}
 table.code-difftable .lineno-inline{
     background:none repeat scroll 0 0 #FFF !important;
     padding-left:2px;
     padding-right:2px;
     text-align:right;
     width:30px;
     -moz-user-select:none;
     -webkit-user-select: none;
+}
 /** CODE **/
 table.code-difftable .code {
     display: block;
     width: 100%;
+}
 table.code-difftable .code td{
     margin:0;
     padding:0;
+}
 table.code-difftable .code pre{
     margin:0;
     padding:0;
     height: 17px;
     line-height: 17px;
+}
 .diffblock.margined.comm .line .code:hover{
     background-color:#FFFFCC !important;
     cursor: pointer !important;
     background-image:url("../images/icons/comment_add.png") !important;
     background-repeat:no-repeat !important;
     background-position: right !important;
     background-position: 0% 50% !important;
+}
@@ \ No newline at end of file @@

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -311,97 +311,98 @@ var ajaxPOST = function(url,postData,suc @@
     var postData = postData;
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
 };
 /** comments **/
 var removeInlineForm = function(form) {
 	form.parentNode.removeChild(form);
 };
 var tableTr = function(cls,body){
 	var form = document.createElement('tr');
 	YUD.addClass(form, cls);
 	form.innerHTML = '<td class="lineno-inline new-inline"></td>'+
     				 '<td class="lineno-inline old-inline"></td>'+
                      '<td>{0}</td>'.format(body);
 	return form;
 };
 var createInlineForm = function(parent_tr, f_path, line) {
 	var tmpl = YUD.get('comment-inline-form-template').innerHTML;
 	tmpl = tmpl.format(f_path, line);
 	var form = tableTr('comment-form-inline',tmpl)
 	// create event for hide button
 	form = new YAHOO.util.Element(form);
 	var form_hide_button = new YAHOO.util.Element(form.getElementsByClassName('hide-inline-form')[0]);
 	form_hide_button.on('click', function(e) {
 		var newtr = e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode;
 		removeInlineForm(newtr);
 		YUD.removeClass(parent_tr, 'form-open');
 	});
 	return form
 };
 var injectInlineForm = function(tr){
 	  if(YUD.hasClass(tr,'form-open') || YUD.hasClass(tr,'context')){
 		  return
+	  }
 	  YUD.addClass(tr,'form-open');
 	  var node = tr.parentNode.parentNode.parentNode.getElementsByClassName('full_f_path')[0];
 	  var f_path = YUD.getAttribute(node,'path');
 	  var lineno = getLineNo(tr);
 	  var form = createInlineForm(tr, f_path, lineno);
 	  var target_tr = tr;
 	  if(YUD.hasClass(YUD.getNextSibling(tr),'inline-comments')){
 		  target_tr = YUD.getNextSibling(tr);
+	  }
 	  YUD.insertAfter(form,target_tr);
 	  YUD.get('text_'+lineno).focus();
 	  YUD.get('text_'+lineno).focus();
 	  tooltip_activate();
 };
 var createInlineAddButton = function(tr,label){
 	var html = '<div class="add-comment"><span class="ui-btn">{0}</span></div>'.format(label);
 	var add = new YAHOO.util.Element(tableTr('inline-comments-button',html));
 	add.on('click', function(e) {
 		injectInlineForm(tr);
 	});
 	return add;
 };
 var getLineNo = function(tr) {
 	var line;
 	var o = tr.children[0].id.split('_');
 	var n = tr.children[1].id.split('_');
 	if (n.length >= 2) {
 		line = n[n.length-1];
 	} else if (o.length >= 2) {
 		line = o[o.length-1];
+	}
 	return line
 };
 var fileBrowserListeners = function(current_url, node_list_url, url_base,
 									truncated_lbl, nomatch_lbl){
 	var current_url_branch = +"?branch=__BRANCH__";
 	var url = url_base;
 	var node_url = node_list_url;
 	YUE.on('stay_at_branch','click',function(e){
 	    if(e.target.checked){
 	        var uri = current_url_branch;
 	        uri = uri.replace('__BRANCH__',e.target.value);
 	        window.location = uri;
+	    }
 	    else{
 	        window.location = current_url;
+	    }
 	})
 	var n_filter = YUD.get('node_filter');
 	var F = YAHOO.namespace('node_filter');
 	F.filterTimeout = null;

rhodecode/templates/base/root.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>${self.title()}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
         <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
         ## CSS ###
         <%def name="css()">
             <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen"/>
             <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css')}"/>
             <link rel="stylesheet" type="text/css" href="${h.url('/css/diff.css')}"/>
             ## EXTRA FOR CSS
             ${self.css_extra()}
         </%def>
         <%def name="css_extra()">
         </%def>
         ${self.css()}
         %if c.ga_code:
         <!-- Analytics -->
 	     <script type="text/javascript">
 	      var _gaq = _gaq || [];
 	      _gaq.push(['_setAccount', '${c.ga_code}']);
 	      _gaq.push(['_trackPageview']);
 	      (function() {
 	        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 	        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
 	        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 	      })();
 	     </script>
 	    %endif
         ## JAVASCRIPT ##
         <%def name="js()">
             <script type="text/javascript" src="${h.url('/js/yui.2.9.js')}"></script>
             <!--[if IE]>
                <script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script>
             <![endif]-->
             <script type="text/javascript" src="${h.url('/js/yui.flot.js')}"></script>
             <script type="text/javascript" src="${h.url('/js/rhodecode.js')}"></script>
            ## EXTRA FOR JS
            ${self.js_extra()}
             <script type="text/javascript">
             var follow_base_url  = "${h.url('toggle_following')}";
             var stop_follow_text = "${_('Stop following this repository')}";
             var start_follow_text = "${_('Start following this repository')}";
             var onSuccessFollow = function(target){
                 var f = YUD.get(target.id);
                 var f_cnt = YUD.get('current_followers_count');
                 if(f.getAttribute('class')=='follow'){
                     f.setAttribute('class','following');
                     f.setAttribute('title',stop_follow_text);

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -87,166 +87,171 @@ @@
 		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %for tag in c.changeset.tags:
 		                 <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %endfor
 		         </span>
 	                </div>
 	        </div>
 	        <span style="font-size:1.1em;font-weight: bold">
 	        ${_('%s files affected with %s additions and %s deletions.') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}
 	        </span>
 	        <div class="cs_files">
 	                %for change,filenode,diff,cs1,cs2,stat in c.changes:
 	                    <div class="cs_${change}">
                             <div class="node">
                             %if change != 'removed':
                                 ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=self.fid(filenode.changeset.raw_id,filenode.path)))}
                             %else:
                                 ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=self.fid('',filenode.path)))}
                             %endif
                             </div>
 		                    <div class="changes">${h.fancy_file_stats(stat)}</div>
 	                    </div>
 	                %endfor
 	                % if c.cut_off:
 	                  ${_('Changeset was too big and was cut off...')}
 	                % endif
 	        </div>
 	    </div>
     </div>
 	%for change,filenode,diff,cs1,cs2,stat in c.changes:
 		%if change !='removed':
 		<div style="clear:both;height:10px"></div>
 		<div class="diffblock  margined comm" id="${self.fid(filenode.changeset.raw_id,filenode.path)}">
 			<div class="code-header">
 				<div class="changeset_header">
 					<span class="changeset_file">
 						${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
 						revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
 					</span>
 					&raquo; <span>${h.link_to(_('diff'),
 					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span>
 					&raquo; <span>${h.link_to(_('raw diff'),
 					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>
 					&raquo; <span>${h.link_to(_('download diff'),
 					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>
                     <span style="float:right">
+                    <span style="float:right;margin-top:-3px">
                       <label>
                       ${_('show inline comments')}
                       ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=self.fid(filenode.changeset.raw_id,filenode.path))}
                       </label>
                     </span>
 				</div>
 			</div>
 			<div class="code-body">
                 <div class="full_f_path" path="${filenode.path}"></div>
 				%if diff:
 					${diff|n}
 				%else:
 					${_('No changes in this file')}
 				%endif
 			</div>
 		</div>
 		%endif
 	%endfor
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     ## template for inline comment form
     ${comment.comment_inline_form()}
     <div class="comments">
         <div class="comments-number">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
         %for path, lines in c.inline_comments:
             <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${self.fid(c.changeset.raw_id,path)}">
             % for line,comments in lines.iteritems():
                 <div class="inline-comment-placeholder-line" line="${line}" target_id="${h.safeid(h.safe_unicode(path))}">
                 %for co in comments:
                     ${comment.comment_block(co)}
                 %endfor
                 </div>
             %endfor
             </div>
         %endfor
         %for co in c.comments:
             ${comment.comment_block(co)}
         %endfor
         %if c.rhodecode_user.username != 'default':
         <div class="comment-form">
             ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))}
             <strong>${_('Leave a comment')}</strong>
             <div class="clearfix">
                 <div class="comment-help">
                     ${_('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>
                     ${h.textarea('text')}
             </div>
             <div class="comment-button">
             ${h.submit('save', _('Comment'), class_='ui-button')}
             </div>
             ${h.end_form()}
         </div>
         %endif
     </div>
     <script type="text/javascript">
       var deleteComment = function(comment_id){
           var url = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}".replace('__COMMENT_ID__',comment_id);
           var postData = '_method=delete';
           var success = function(o){
               var n = YUD.get('comment-'+comment_id);
               n.parentNode.removeChild(n);
+          }
           ajaxPOST(url,postData,success);
+      }
       YUE.onDOMReady(function(){
     	  YUE.on(YUQ('.show-inline-comments'),'change',function(e){
     		  var show = 'none';
     		  var target = e.currentTarget;
     		  if(target.checked){
     			  var show = ''
+    		  }
     		  var boxid = YUD.getAttribute(target,'id_for');
     		  var comments = YUQ('#{0} .inline-comments'.format(boxid));
     		  for(c in comments){
     		     YUD.setStyle(comments[c],'display',show);
+    		  }
     		  var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
               for(c in btns){
                   YUD.setStyle(btns[c],'display',show);
+               }
     	  })
           YUE.on(YUQ('.line'),'click',function(e){
         	  var tr = e.currentTarget;
         	  injectInlineForm(tr);
           });
           // inject comments into they proper positions
           var file_comments = YUQ('.inline-comment-placeholder');
           for (f in file_comments){
         	  var box = file_comments[f];
         	  var inlines = box.children;
         	  for(var i=0; i<inlines.length; i++){
         		  try{
           		    var inline = inlines[i];
           		    var lineno = YUD.getAttribute(inlines[i],'line');
           		    var lineid = "{0}_{1}".format(YUD.getAttribute(inline,'target_id'),lineno);
                     var target_line = YUD.get(lineid);
                     var add = createInlineAddButton(target_line.parentNode,'${_("add another comment")}');
                     YUD.insertAfter(add,target_line.parentNode);
                     var comment = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML))
                     YUD.insertAfter(comment,target_line.parentNode);
         		  }catch(e){}
+        	  }
+          }
       })
     </script>
   </div>
 </%def>

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

 ##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>
   	</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()">
 <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=c.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')}</div>
               <textarea id="text_{1}" name="text"></textarea>
           <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')}
       </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=h.url.current())}">${_('Login now')}</a>
           </div>
       </div>
       <div class="comment-button">
       ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
       </div>
       ${h.end_form()}
   %endif
   </div>
 </div>
 </%def>
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)