##// END OF EJS Templates
Merged in aras_p/rhodecode (pull request #28)
marcink -
r1980:3dbf0ff5 merge beta
parent child Browse files
Show More
@@ -448,7 +448,18 b' def action_parser(user_log, feed=False):'
448 _('compare view'))
448 _('compare view'))
449 )
449 )
450
450
451 if len(revs) > revs_limit:
451 # if we have exactly one more than normally displayed:
452 # just display it, takes less space than displaying "and 1 more revisions"
453 if len(revs) == revs_limit + 1:
454 rev = revs[revs_limit]
455 cs_links.append(", " + link_to(rev,
456 url('changeset_home',
457 repo_name=repo_name,
458 revision=rev), title=tooltip(message(rev)),
459 class_='tooltip') )
460
461 # hidden-by-default ones
462 if len(revs) > revs_limit + 1:
452 uniq_id = revs[0]
463 uniq_id = revs[0]
453 html_tmpl = ('<span> %s '
464 html_tmpl = ('<span> %s '
454 '<a class="show_more" id="_%s" href="#more">%s</a> '
465 '<a class="show_more" id="_%s" href="#more">%s</a> '
@@ -459,15 +470,20 b' def action_parser(user_log, feed=False):'
459 _('revisions')))
470 _('revisions')))
460
471
461 if not feed:
472 if not feed:
462 html_tmpl = '<span id="%s" style="display:none"> %s </span>'
473 html_tmpl = '<span id="%s" style="display:none">, %s </span>'
463 else:
474 else:
464 html_tmpl = '<span id="%s"> %s </span>'
475 html_tmpl = '<span id="%s"> %s </span>'
465
476
466 cs_links.append(html_tmpl % (uniq_id, ', '.join([link_to(rev,
477 morelinks = ', '.join([link_to(rev,
467 url('changeset_home',
478 url('changeset_home',
468 repo_name=repo_name, revision=rev),
479 repo_name=repo_name, revision=rev),
469 title=message(rev), class_='tooltip')
480 title=message(rev), class_='tooltip')
470 for rev in revs[revs_limit:revs_top_limit]])))
481 for rev in revs[revs_limit:revs_top_limit]])
482
483 if len(revs) > revs_top_limit:
484 morelinks += ', ...'
485
486 cs_links.append(html_tmpl % (uniq_id, morelinks))
471 if len(revs) > 1:
487 if len(revs) > 1:
472 cs_links.append(compare_view)
488 cs_links.append(compare_view)
473 return ''.join(cs_links)
489 return ''.join(cs_links)
General Comments 0
You need to be logged in to leave comments. Login now