##// END OF EJS Templates
fixed some anchor id problems for changeset ranges
marcink -
r1676:e8619168 beta
parent child Browse files
Show More
@@ -268,10 +268,10 b' class ChangesetController(BaseRepoContro'
268 ccmodel = ChangesetCommentsModel()
268 ccmodel = ChangesetCommentsModel()
269
269
270 ccmodel.create(text=request.POST.get('text'),
270 ccmodel.create(text=request.POST.get('text'),
271 repo_id=c.rhodecode_db_repo.repo_id,
271 repo_id=c.rhodecode_db_repo.repo_id,
272 user_id=c.rhodecode_user.user_id,
272 user_id=c.rhodecode_user.user_id,
273 revision=revision, f_path=request.POST.get('f_path'),
273 revision=revision, f_path=request.POST.get('f_path'),
274 line_no = request.POST.get('line'))
274 line_no=request.POST.get('line'))
275
275
276 return redirect(h.url('changeset_home', repo_name=repo_name,
276 return redirect(h.url('changeset_home', repo_name=repo_name,
277 revision=revision))
277 revision=revision))
@@ -33,7 +33,7 b' from webhelpers.text import chop_at, col'
33 from webhelpers.date import time_ago_in_words
33 from webhelpers.date import time_ago_in_words
34 from webhelpers.paginate import Page
34 from webhelpers.paginate import Page
35 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
35 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
36 convert_boolean_attrs, NotGiven
36 convert_boolean_attrs, NotGiven, _make_safe_id_component
37
37
38 from vcs.utils.annotate import annotate_highlight
38 from vcs.utils.annotate import annotate_highlight
39 from rhodecode.lib.utils import repo_name_slug
39 from rhodecode.lib.utils import repo_name_slug
@@ -51,7 +51,7 b' def _reset(name, value=None, id=NotGiven'
51 return HTML.input(**attrs)
51 return HTML.input(**attrs)
52
52
53 reset = _reset
53 reset = _reset
54
54 safeid = _make_safe_id_component
55
55
56 def get_token():
56 def get_token():
57 """Return the current authentication token, creating one if one doesn't
57 """Return the current authentication token, creating one if one doesn't
@@ -34,10 +34,6 b' table.code-difftable{'
34 border-collapse: collapse;
34 border-collapse: collapse;
35 width: 99%;
35 width: 99%;
36 }
36 }
37 table.code-difftable td:target *{
38 background: repeat scroll 0 0 #FFFFBE !important;
39 text-decoration: underline;
40 }
41
37
42 table.code-difftable td {
38 table.code-difftable td {
43 padding: 0 !important;
39 padding: 0 !important;
@@ -63,7 +63,7 b''
63 </div>
63 </div>
64 %if len(c.changeset.parents)>1:
64 %if len(c.changeset.parents)>1:
65 <div class="merge">
65 <div class="merge">
66 ${_('merge')}<img alt="merge" src="${h.url("/images/icons/arrow_join.png")}"/>
66 ${_('merge')}<img alt="merge" src="${h.url('/images/icons/arrow_join.png')}"/>
67 </div>
67 </div>
68 %endif
68 %endif
69
69
@@ -92,8 +92,7 b''
92 <div class="cs_files">
92 <div class="cs_files">
93 %for change,filenode,diff,cs1,cs2,stat in c.changes:
93 %for change,filenode,diff,cs1,cs2,stat in c.changes:
94 <div class="cs_${change}">
94 <div class="cs_${change}">
95 <div class="node">${h.link_to(h.safe_unicode(filenode.path),
95 <div class="node">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor='C-%s-%s' % (h.short_id(filenode.changeset.raw_id),h.safeid(h.safe_unicode(filenode.path)))))}</div>
96 h.url.current(anchor=h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))))}</div>
97 <div class="changes">${h.fancy_file_stats(stat)}</div>
96 <div class="changes">${h.fancy_file_stats(stat)}</div>
98 </div>
97 </div>
99 %endfor
98 %endfor
@@ -109,7 +108,7 b''
109 %if change !='removed':
108 %if change !='removed':
110 <div style="clear:both;height:10px"></div>
109 <div style="clear:both;height:10px"></div>
111 <div class="diffblock margined">
110 <div class="diffblock margined">
112 <div id="${h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))}" class="code-header">
111 <div id="${'C-%s-%s' % (h.short_id(filenode.changeset.raw_id),h.safeid(h.safe_unicode(filenode.path)))}" class="code-header">
113 <div class="changeset_header">
112 <div class="changeset_header">
114 <span class="changeset_file">
113 <span class="changeset_file">
115 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
114 ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
General Comments 0
You need to be logged in to leave comments. Login now