Mercurial > kallithea
comparison rhodecode/templates/changeset/changeset.html @ 1772:c83d3d42ab92 beta
- diff.css merge to main style.css
- css fixes for diffs
- JS fixes for diff and inline comments
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 10 Dec 2011 00:48:05 +0200 |
parents | 5e4827a8e942 |
children | fb423ee576e8 |
comparison
equal
deleted
inserted
replaced
1771:5948ab03e639 | 1772:c83d3d42ab92 |
---|---|
130 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span> | 130 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span> |
131 » <span>${h.link_to(_('raw diff'), | 131 » <span>${h.link_to(_('raw diff'), |
132 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span> | 132 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span> |
133 » <span>${h.link_to(_('download diff'), | 133 » <span>${h.link_to(_('download diff'), |
134 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span> | 134 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span> |
135 <span style="float:right"> | 135 <span style="float:right;margin-top:-3px"> |
136 <label> | 136 <label> |
137 ${_('show inline comments')} | 137 ${_('show inline comments')} |
138 ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=self.fid(filenode.changeset.raw_id,filenode.path))} | 138 ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=self.fid(filenode.changeset.raw_id,filenode.path))} |
139 </label> | 139 </label> |
140 </span> | 140 </span> |
179 ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))} | 179 ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))} |
180 <strong>${_('Leave a comment')}</strong> | 180 <strong>${_('Leave a comment')}</strong> |
181 <div class="clearfix"> | 181 <div class="clearfix"> |
182 <div class="comment-help"> | 182 <div class="comment-help"> |
183 ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} | 183 ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} |
184 ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')} | |
184 </div> | 185 </div> |
185 ${h.textarea('text')} | 186 ${h.textarea('text')} |
186 </div> | 187 </div> |
187 <div class="comment-button"> | 188 <div class="comment-button"> |
188 ${h.submit('save', _('Comment'), class_='ui-button')} | 189 ${h.submit('save', _('Comment'), class_='ui-button')} |
214 var boxid = YUD.getAttribute(target,'id_for'); | 215 var boxid = YUD.getAttribute(target,'id_for'); |
215 var comments = YUQ('#{0} .inline-comments'.format(boxid)); | 216 var comments = YUQ('#{0} .inline-comments'.format(boxid)); |
216 for(c in comments){ | 217 for(c in comments){ |
217 YUD.setStyle(comments[c],'display',show); | 218 YUD.setStyle(comments[c],'display',show); |
218 } | 219 } |
220 var btns = YUQ('#{0} .inline-comments-button'.format(boxid)); | |
221 for(c in btns){ | |
222 YUD.setStyle(btns[c],'display',show); | |
223 } | |
219 }) | 224 }) |
220 | 225 |
221 YUE.on(YUQ('.line'),'click',function(e){ | 226 YUE.on(YUQ('.line'),'click',function(e){ |
222 var tr = e.currentTarget; | 227 var tr = e.currentTarget; |
223 injectInlineForm(tr); | 228 injectInlineForm(tr); |