kallithea Changeset - 08344d037ba1

Changeset - 08344d037ba1

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2012-01-19 04:43:27
marcin@python-works.com

added links to revisions in commit messages

2 files changed with 55 insertions and 15 deletions:

rhodecode/lib/helpers.py

rhodecode/public/css/style.css

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -649,165 +649,197 @@ def changed_tooltip(nodes): @@
                                              for x in nodes[:30]]) + suf)
     else:
         return ': ' + _('No Files')
 def repo_link(groups_and_repos):
     """
     Makes a breadcrumbs link to repo within a group
     joins &raquo; on each group to create a fancy link
     ex::
         group >> subgroup >> repo
     :param groups_and_repos:
     """
     groups, repo_name = groups_and_repos
     if not groups:
         return repo_name
     else:
         def make_link(group):
             return link_to(group.name, url('repos_group_home',
                                            group_name=group.group_name))
         return literal(' &raquo; '.join(map(make_link, groups)) + \
                        " &raquo; " + repo_name)
 def fancy_file_stats(stats):
     """
     Displays a fancy two colored bar for number of added/deleted
     lines of code on file
     :param stats: two element list of added/deleted lines of code
     """
     a, d, t = stats[0], stats[1], stats[0] + stats[1]
     width = 100
     unit = float(width) / (t or 1)
     # needs > 9% of width to be visible or 0 to be hidden
     a_p = max(9, unit * a) if a > 0 else 0
     d_p = max(9, unit * d) if d > 0 else 0
     p_sum = a_p + d_p
     if p_sum > width:
         #adjust the percentage to be == 100% since we adjusted to 9
         if a_p > d_p:
             a_p = a_p - (p_sum - width)
         else:
             d_p = d_p - (p_sum - width)
     a_v = a if a > 0 else ''
     d_v = d if d > 0 else ''
     def cgen(l_type):
         mapping = {'tr':'top-right-rounded-corner',
                    'tl':'top-left-rounded-corner',
                    'br':'bottom-right-rounded-corner',
                    'bl':'bottom-left-rounded-corner'}
         map_getter = lambda x:mapping[x]
         if l_type == 'a' and d_v:
             #case when added and deleted are present
             return ' '.join(map(map_getter, ['tl', 'bl']))
         if l_type == 'a' and not d_v:
             return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
         if l_type == 'd' and a_v:
             return ' '.join(map(map_getter, ['tr', 'br']))
         if l_type == 'd' and not a_v:
             return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
     d_a = '<div class="added %s" style="width:%s%%">%s</div>' % (cgen('a'),
                                                                  a_p, a_v)
     d_d = '<div class="deleted %s" style="width:%s%%">%s</div>' % (cgen('d'),
                                                                    d_p, d_v)
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 def urlify_text(text_):
     import re
     url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]'''
                          '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
     def url_func(match_obj):
         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_changesets(text_, repository):
     import re
     URL_PAT = re.compile(r'([0-9a-fA-F]{12,})')
     def url_func(match_obj):
         rev = match_obj.groups()[0]
         pref = ''
         if match_obj.group().startswith(' '):
             pref = ' '
         tmpl = (
         '%(pref)s<a class="%(cls)s" href="%(url)s">'
         '%(rev)s'
         '</a>'
+        )
         return tmpl % {
          'pref': pref,
          'cls': 'revision-link',
          'url': url('changeset_home', repo_name=repository, revision=rev),
          'rev': rev,
+        }
     newtext = URL_PAT.sub(url_func, text_)
     return newtext
 def urlify_commit(text_, repository=None, link_=None):
     import re
     import traceback
     if link_:
         link_ = '<a href="' + link_ + '">'
     # urlify changesets
     text_ = urlify_changesets(text_, repository)
     def linkify_others(t,l):
         urls = re.compile(r'(\<a.*?\<\/a\>)',)
         links = []
         for e in urls.split(t):
             if not urls.match(e):
                 links.append('<a class="message-link" href="%s">%s</a>' % (l,e))
             else:
                 links.append(e)
         return ''.join(links)
     try:
         conf = config['app_conf']
         URL_PAT = re.compile(r'%s' % conf.get('url_pat'))
         if URL_PAT:
             ISSUE_SERVER_LNK = conf.get('issue_server_link')
             ISSUE_PREFIX = conf.get('issue_prefix')
             def url_func(match_obj):
                 pref = ''
                 if match_obj.group().startswith(' '):
                     pref = ' '
                 issue_id = match_obj.groups()[0]
                 tmpl = (
                 '%(pref)s<a class="%(cls)s" href="%(url)s">'
                 '%(issue-prefix)s%(id-repr)s'
                 '</a>'
+                )
                 url = ISSUE_SERVER_LNK.replace('{id}', issue_id)
                 if repository:
                     url = url.replace('{repo}', repository)
                 if link_:
                     tmpl = '</a>' + tmpl + link_
                 return tmpl % (
+                    {
                 return tmpl % {
                      'pref': pref,
                      'cls': 'issue-tracker-link',
                      'url': url,
                      'id-repr': issue_id,
                      'issue-prefix': ISSUE_PREFIX,
                      'serv': ISSUE_SERVER_LNK,
+                    }
+                )
+                }
             newtext = URL_PAT.sub(url_func, text_)
             if link_:
                 newtext = link_ + newtext + '</a>'
             # wrap not links into final link => link_
             newtext = linkify_others(newtext, link_)
             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))
 def rst_w_mentions(source):
     """
     Wrapped rst renderer with @mention highlighting
     :param source:
     """
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst_with_mentions(source))

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2235,195 +2235,203 @@ h3.files_location { @@
 	margin-top: 7px;
 	text-align: left;
+}
 .cs_files .cs_changed {
 	background: url("../images/icons/page_white_edit.png") no-repeat scroll
 px;
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 .cs_files .cs_removed {
 	background: url("../images/icons/page_white_delete.png") no-repeat
 		scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 #graph {
 	overflow: hidden;
+}
 #graph_nodes {
 	float: left;
 	margin-right: -6px;
 	margin-top: 0px;
+}
 #graph_content {
 	width: 80%;
 	float: left;
+}
 #graph_content .container_header {
 	border-bottom: 1px solid #DDD;
 	padding: 10px;
 	height: 25px;
+}
 #graph_content #rev_range_container {
 	padding: 7px 20px;
 	float: left;
+}
 #graph_content .container {
 	border-bottom: 1px solid #DDD;
 	height: 56px;
 	overflow: hidden;
+}
 #graph_content .container .right {
 	float: right;
 	width: 23%;
 	text-align: right;
+}
 #graph_content .container .left {
 	float: left;
 	width: 25%;
 	padding-left: 5px;
+}
 #graph_content .container .mid {
 	float: left;
 	width: 49%;
+}
 #graph_content .container .left .date {
 	color: #666;
 	padding-left: 22px;
 	font-size: 10px;
+}
 #graph_content .container .left .author {
 	height: 22px;
+}
 #graph_content .container .left .author .user {
 	color: #444444;
 	float: left;
 	margin-left: -4px;
 	margin-top: 4px;
+}
 #graph_content .container .mid .message {
 	white-space: pre-wrap;
+}
 #graph_content .container .mid .message a:hover{
 	text-decoration: none;
+}
 #content #graph_content .message .issue-tracker-link {
 	font-weight: bold !important;
 #content #graph_content .message .revision-link,
 #changeset_content .container .message .revision-link
+ {
 	color:#3F6F9F;
     font-weight: bold !important;
+}
 #content #graph_content .message .issue-tracker-link,
 #changeset_content .container .message .issue-tracker-link{
     color:#3F6F9F;
     font-weight: bold !important;
+}
 .right .comments-container{
 	padding-right: 5px;
 	margin-top:1px;
 	float:right;
 	height:14px;
+}
 .right .comments-cnt{
     float: left;
     color: rgb(136, 136, 136);
     padding-right: 2px;
+}
 .right .changes{
 	clear: both;
+}
 .right .changes .changed_total {
 	display: block;
 	float: right;
 	text-align: center;
 	min-width: 45px;
 	cursor: pointer;
 	color: #444444;
 	background: #FEA;
 	-webkit-border-radius: 0px 0px 0px 6px;
 	-moz-border-radius: 0px 0px 0px 6px;
 	border-radius: 0px 0px 0px 6px;
 	padding: 1px;
+}
 .right .changes .added,.changed,.removed {
 	display: block;
 	padding: 1px;
 	color: #444444;
 	float: right;
 	text-align: center;
 	min-width: 15px;
+}
 .right .changes .added {
 	background: #CFC;
+}
 .right .changes .changed {
 	background: #FEA;
+}
 .right .changes .removed {
 	background: #FAA;
+}
 .right .merge {
   padding: 1px 3px 1px 3px;
   background-color: #fca062;
   font-size: 10px;
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
   margin-right: 2px;
+}
 .right .parent {
 	color: #666666;
 	clear:both;
+}
 .right .logtags{
 	padding: 2px 2px 2px 2px;
+}
 .right .logtags .branchtag,.logtags .branchtag {
   padding: 1px 3px 1px 3px;
   background-color: #bfbfbf;
   font-size: 10px;
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
+}
 .right .logtags .branchtag a:hover,.logtags .branchtag a{
 	color: #ffffff;
+}
 .right .logtags .branchtag a:hover,.logtags .branchtag a:hover{
 	text-decoration: none;
 	color: #ffffff;
+}
 .right .logtags .tagtag,.logtags .tagtag {
   padding: 1px 3px 1px 3px;

0 comments (0 inline, 0 general)