Changeset - 287eff9614fa
[Not reviewed]
beta
0 3 0
Aras Pranckevicius - 14 years ago 2012-01-09 21:40:10
aras@unity3d.com
changelog: make messages be links again, and somewhat co-exist with issue tracker links (those are bold now)
3 files changed with 19 insertions and 3 deletions:
0 comments (0 inline, 0 general)
rhodecode/lib/helpers.py
Show inline comments
 
@@ -741,16 +741,19 @@ def urlify_text(text_):
 
        url_full = match_obj.groups()[0]
 
        return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})
 

	
 
    return literal(url_pat.sub(url_func, text_))
 

	
 

	
 
def urlify_commit(text_, repository=None):
 
def urlify_commit(text_, repository=None, link_=None):
 
    import re
 
    import traceback
 

	
 
    if link_:
 
        link_ = '<a href="' + link_ + '">'
 

	
 
    try:
 
        conf = config['app_conf']
 

	
 
        URL_PAT = re.compile(r'%s' % conf.get('url_pat'))
 

	
 
        if URL_PAT:
 
@@ -765,26 +768,34 @@ def urlify_commit(text_, repository=None
 
                '</a>'
 
                )
 
                url = ISSUE_SERVER_LNK.replace('{id}', issue_id)
 
                if repository:
 
                    url = url.replace('{repo}', repository)
 

	
 
                if link_:
 
                    tmpl = '</a>' + tmpl + link_
 

	
 
                return tmpl % (
 
                    {
 
                     'cls': 'issue-tracker-link',
 
                     'url': url,
 
                     'id-repr': issue_id,
 
                     'issue-prefix': ISSUE_PREFIX,
 
                     'serv': ISSUE_SERVER_LNK,
 
                    }
 
                )
 
            return literal(URL_PAT.sub(url_func, text_))
 
            newtext = URL_PAT.sub(url_func, text_)
 
            if link_:
 
                newtext = link_ + newtext + '</a>'
 
            return literal(newtext)
 
    except:
 
        log.error(traceback.format_exc())
 
        pass
 

	
 
    
 

	
 
    return text_
 

	
 

	
 
def rst(source):
 
    return literal('<div class="rst-block">%s</div>' %
 
                   MarkupRenderer.rst(source))
rhodecode/public/css/style.css
Show inline comments
 
@@ -2319,12 +2319,17 @@ h3.files_location {
 
}
 
 
#graph_content .container .mid .message a:hover{
 
	text-decoration: none;
 
}
 
 
#content #graph_content .message .issue-tracker-link {
 
	font-weight: bold !important;
 
}
 
 
 
.right div {
 
	clear: both;
 
}
 
 
.right .changes .changed_total {
 
	display: block;
rhodecode/templates/changelog/changelog.html
Show inline comments
 
@@ -56,13 +56,13 @@ ${c.repo_name} ${_('Changelog')} - ${c.r
 
								</div>
 
								<div title="${cs.author}" class="user">${h.person(cs.author)}</div>
 
							</div>
 
                            <div class="date">${cs.date}</div>
 
						</div>
 
						<div class="mid">
 
                            <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div>
 
                            <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 
                            <div class="expand ${'tablerow%s' % (cnt%2)}">&darr; ${_('show more')} &darr;</div>
 
						</div>	
 
						<div class="right">
 
									<div id="${cs.raw_id}_changes_info" class="changes">
 
                                        <span id="${cs.raw_id}" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</span>
 
									</div>					
0 comments (0 inline, 0 general)