Mercurial > kallithea

comparison rhodecode/templates/changeset/changeset.html @ 1888:f91d3f9b7230 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
White-space cleanup
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 12 Jan 2012 06:32:40 +0200
parents f26acc1b27e2
children 2112bcbcb346
comparison
equal deleted inserted replaced
1886:50e32940e464 1888:f91d3f9b7230
13 &raquo; 13 &raquo;
14 ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} 14 ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
15 </%def> 15 </%def>
16 16
17 <%def name="page_nav()"> 17 <%def name="page_nav()">
18 ${self.menu('changelog')} 18 ${self.menu('changelog')}
19 </%def> 19 </%def>
20 20
21 <%def name="main()"> 21 <%def name="main()">
22 <div class="box"> 22 <div class="box">
23 <!-- box / title --> 23 <!-- box / title -->
51 </div> 51 </div>
52 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message),c.repo_name)}</div> 52 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message),c.repo_name)}</div>
53 </div> 53 </div>
54 <div class="right"> 54 <div class="right">
55 <div class="changes"> 55 <div class="changes">
56 % if len(c.changeset.affected_files) <= c.affected_files_cut_off: 56 % if len(c.changeset.affected_files) <= c.affected_files_cut_off:
57 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span> 57 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>
58 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span> 58 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>
59 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span> 59 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>
60 % else: 60 % else:
61 <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> 61 <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
62 <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> 62 <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
63 <span class="added" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> 63 <span class="added" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
64 % endif 64 % endif
65 </div> 65 </div>
66 66
67 %if c.changeset.parents: 67 %if c.changeset.parents:
68 %for p_cs in reversed(c.changeset.parents): 68 %for p_cs in reversed(c.changeset.parents):
69 <div class="parent">${_('Parent')} 69 <div class="parent">${_('Parent')}
70 <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id), 70 <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
71 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span> 71 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
72 </div> 72 </div>
73 %endfor 73 %endfor
74 %else: 74 %else:
75 <div class="parent">${_('No parents')}</div> 75 <div class="parent">${_('No parents')}</div>
76 %endif 76 %endif
77 <span class="logtags"> 77 <span class="logtags">
78 %if len(c.changeset.parents)>1: 78 %if len(c.changeset.parents)>1:
79 <span class="merge">${_('merge')}</span> 79 <span class="merge">${_('merge')}</span>
80 %endif 80 %endif
81 <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}"> 81 <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
82 ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> 82 ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
83 %for tag in c.changeset.tags: 83 %for tag in c.changeset.tags:
84 <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> 84 <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
85 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> 85 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
86 %endfor 86 %endfor
87 </span> 87 </span>
88 </div> 88 </div>
89 </div> 89 </div>
90 <span> 90 <span>
91 ${_('%s files affected with %s additions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)} 91 ${_('%s files affected with %s additions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}
92 </span> 92 </span>
93 <div class="cs_files"> 93 <div class="cs_files">
104 </div> 104 </div>
105 %endfor 105 %endfor
106 % if c.cut_off: 106 % if c.cut_off:
107 ${_('Changeset was too big and was cut off...')} 107 ${_('Changeset was too big and was cut off...')}
108 % endif 108 % endif
109 </div> 109 </div>
110 </div> 110 </div>
111 111
112 </div> 112 </div>
113 113
114 ## diff block 114 ## diff block
115 <%namespace name="diff_block" file="/changeset/diff_block.html"/> 115 <%namespace name="diff_block" file="/changeset/diff_block.html"/>
116 ${diff_block.diff_block(c.changes)} 116 ${diff_block.diff_block(c.changes)}
117 117
118 ## template for inline comment form 118 ## template for inline comment form
119 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> 119 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
120 ${comment.comment_inline_form(c.changeset)} 120 ${comment.comment_inline_form(c.changeset)}
121 121
122 ${comment.comments(c.changeset)} 122 ${comment.comments(c.changeset)}
123 123
124 <script type="text/javascript"> 124 <script type="text/javascript">
125 var deleteComment = function(comment_id){ 125 var deleteComment = function(comment_id){
126 126
127 var url = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}".replace('__COMMENT_ID__',comment_id); 127 var url = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}".replace('__COMMENT_ID__',comment_id);
128 var postData = '_method=delete'; 128 var postData = '_method=delete';
132 } 132 }
133 ajaxPOST(url,postData,success); 133 ajaxPOST(url,postData,success);
134 } 134 }
135 135
136 YUE.onDOMReady(function(){ 136 YUE.onDOMReady(function(){
137 137
138 YUE.on(YUQ('.show-inline-comments'),'change',function(e){ 138 YUE.on(YUQ('.show-inline-comments'),'change',function(e){
139 var show = 'none'; 139 var show = 'none';
140 var target = e.currentTarget; 140 var target = e.currentTarget;
141 if(target.checked){ 141 if(target.checked){
142 var show = '' 142 var show = ''
143 } 143 }
144 var boxid = YUD.getAttribute(target,'id_for'); 144 var boxid = YUD.getAttribute(target,'id_for');
145 var comments = YUQ('#{0} .inline-comments'.format(boxid)); 145 var comments = YUQ('#{0} .inline-comments'.format(boxid));
146 for(c in comments){ 146 for(c in comments){
147 YUD.setStyle(comments[c],'display',show); 147 YUD.setStyle(comments[c],'display',show);
148 } 148 }
149 var btns = YUQ('#{0} .inline-comments-button'.format(boxid)); 149 var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
150 for(c in btns){ 150 for(c in btns){
151 YUD.setStyle(btns[c],'display',show); 151 YUD.setStyle(btns[c],'display',show);
152 } 152 }
153 }) 153 })
154 154
155 YUE.on(YUQ('.line'),'click',function(e){ 155 YUE.on(YUQ('.line'),'click',function(e){
156 var tr = e.currentTarget; 156 var tr = e.currentTarget;
157 injectInlineForm(tr); 157 injectInlineForm(tr);
158 }); 158 });
159 159
160 // inject comments into they proper positions 160 // inject comments into they proper positions
161 var file_comments = YUQ('.inline-comment-placeholder'); 161 var file_comments = YUQ('.inline-comment-placeholder');
162 162
163 for (f in file_comments){ 163 for (f in file_comments){
164 var box = file_comments[f]; 164 var box = file_comments[f];
165 var inlines = box.children; 165 var inlines = box.children;
166 for(var i=0; i<inlines.length; i++){ 166 for(var i=0; i<inlines.length; i++){
167 try{ 167 try{
168 168
169 var inline = inlines[i]; 169 var inline = inlines[i];
170 var lineno = YUD.getAttribute(inlines[i],'line'); 170 var lineno = YUD.getAttribute(inlines[i],'line');
171 var lineid = "{0}_{1}".format(YUD.getAttribute(inline,'target_id'),lineno); 171 var lineid = "{0}_{1}".format(YUD.getAttribute(inline,'target_id'),lineno);
172 var target_line = YUD.get(lineid); 172 var target_line = YUD.get(lineid);
173 173
174 var add = createInlineAddButton(target_line.parentNode,'${_("add another comment")}'); 174 var add = createInlineAddButton(target_line.parentNode,'${_("add another comment")}');
175 YUD.insertAfter(add,target_line.parentNode); 175 YUD.insertAfter(add,target_line.parentNode);
176 176
177 var comment = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML)) 177 var comment = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML))
178 YUD.insertAfter(comment,target_line.parentNode); 178 YUD.insertAfter(comment,target_line.parentNode);
179 }catch(e){ 179 }catch(e){
180 console.log(e); 180 console.log(e);
181 } 181 }
182 } 182 }
183 } 183 }
184 }) 184 })
185 185
186 </script> 186 </script>
187 187
188 </div> 188 </div>
189 </%def> 189 </%def>