##// END OF EJS Templates
Added compare view into journal, fixed wrong function call to show compare view
marcink -
r1009:eafe5ae4 beta
parent child Browse files
Show More
@@ -74,7 +74,7 b' class ChangesetController(BaseController'
74 if len(rev_range) == 2:
74 if len(rev_range) == 2:
75 rev_start = rev_range[0]
75 rev_start = rev_range[0]
76 rev_end = rev_range[1]
76 rev_end = rev_range[1]
77 rev_ranges = repo.get_changeset_ranges(rev_start, rev_end,
77 rev_ranges = repo.get_changesets_ranges(rev_start, rev_end,
78 range_limit)
78 range_limit)
79 else:
79 else:
80 rev_ranges = [repo.get_changeset(revision)]
80 rev_ranges = [repo.get_changeset(revision)]
@@ -480,6 +480,17 b' def action_parser(user_log):'
480 repo_name=repo_name,
480 repo_name=repo_name,
481 revision=rev), title=tooltip(message(rev)),
481 revision=rev), title=tooltip(message(rev)),
482 class_='tooltip') for rev in revs[:revs_limit] ])
482 class_='tooltip') for rev in revs[:revs_limit] ])
483
484 compare_view = (' <div class="compare_view tooltip" title="%s">'
485 '<a href="%s">%s</a> '
486 '</div>' % (_('Show all combined changesets %s->%s' \
487 % (revs[0], revs[-1])),
488 url('changeset_home', repo_name=repo_name,
489 revision='%s...%s' % (revs[0], revs[-1])
490 ),
491 _('compare view'))
492 )
493
483 if len(revs) > revs_limit:
494 if len(revs) > revs_limit:
484 uniq_id = revs[0]
495 uniq_id = revs[0]
485 html_tmpl = ('<span> %s '
496 html_tmpl = ('<span> %s '
@@ -495,7 +506,7 b' def action_parser(user_log):'
495 repo_name=repo_name, revision=rev),
506 repo_name=repo_name, revision=rev),
496 title=message(rev), class_='tooltip')
507 title=message(rev), class_='tooltip')
497 for rev in revs[revs_limit:revs_top_limit]]))
508 for rev in revs[revs_limit:revs_top_limit]]))
498
509 cs_links += compare_view
499 return cs_links
510 return cs_links
500
511
501 def get_fork_name():
512 def get_fork_name():
@@ -1433,7 +1433,10 b' padding-top: 5px;'
1433 font-weight: bold;
1433 font-weight: bold;
1434 font-size: 1.1em;
1434 font-size: 1.1em;
1435 }
1435 }
1436
1436 #journal .compare_view{
1437 padding: 5px 0px 5px 38px;
1438 width: 95px;
1439 }
1437 .trending_language_tbl,.trending_language_tbl td {
1440 .trending_language_tbl,.trending_language_tbl td {
1438 border:0 !important;
1441 border:0 !important;
1439 margin:0 !important;
1442 margin:0 !important;
General Comments 0
You need to be logged in to leave comments. Login now