##// END OF EJS Templates
#818: Bookmarks Do Not Display on Changeset View...
marcink -
r3727:0cecc222 beta
parent child Browse files
Show More
@@ -2795,7 +2795,8 b' h3.files_location {'
2795 }
2795 }
2796
2796
2797 .right .logtags .branchtag,
2797 .right .logtags .branchtag,
2798 .logtags .tagtag,
2798 .right .logtags .tagtag,
2799 .right .logtags .booktag,
2799 .right .merge {
2800 .right .merge {
2800 float: right;
2801 float: right;
2801 line-height: 1em;
2802 line-height: 1em;
@@ -102,15 +102,22 b''
102 %if len(c.changeset.parents)>1:
102 %if len(c.changeset.parents)>1:
103 <span class="merge">${_('merge')}</span>
103 <span class="merge">${_('merge')}</span>
104 %endif
104 %endif
105 %if c.changeset.branch:
105 %if h.is_hg(c.rhodecode_repo):
106 <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">
106 %for book in c.changeset.bookmarks:
107 ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
107 <span class="booktag" title="${_('Bookmark %s') % book}">
108 </span>
108 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
109 %endif
109 </span>
110 %endfor
111 %endif
110 %for tag in c.changeset.tags:
112 %for tag in c.changeset.tags:
111 <span class="tagtag" title="${_('Tag %s') % tag}">
113 <span class="tagtag" title="${_('Tag %s') % tag}">
112 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
114 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
113 %endfor
115 %endfor
116 %if c.changeset.branch:
117 <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">
118 ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
119 </span>
120 %endif
114 </span>
121 </span>
115 </div>
122 </div>
116 </div>
123 </div>
@@ -76,11 +76,6 b''
76 %if len(cs.parents)>1:
76 %if len(cs.parents)>1:
77 <span class="merge">${_('merge')}</span>
77 <span class="merge">${_('merge')}</span>
78 %endif
78 %endif
79 %if cs.branch:
80 <span class="branchtag" title="${_('Branch %s') % cs.branch}">
81 ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
82 </span>
83 %endif
84 %if h.is_hg(c.rhodecode_repo):
79 %if h.is_hg(c.rhodecode_repo):
85 %for book in cs.bookmarks:
80 %for book in cs.bookmarks:
86 <span class="booktag" title="${_('Bookmark %s') % book}">
81 <span class="booktag" title="${_('Bookmark %s') % book}">
@@ -92,6 +87,11 b''
92 <span class="tagtag" title="${_('Tag %s') % tag}">
87 <span class="tagtag" title="${_('Tag %s') % tag}">
93 ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
88 ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
94 %endfor
89 %endfor
90 %if cs.branch:
91 <span class="branchtag" title="${_('Branch %s') % cs.branch}">
92 ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
93 </span>
94 %endif
95 </span>
95 </span>
96 </div>
96 </div>
97 </div>
97 </div>
General Comments 0
You need to be logged in to leave comments. Login now