# HG changeset patch # User Marcin Kuzminski # Date 2011-02-09 00:02:44 # Node ID eafe5ae429eaa3e737c1c98617ee47d8981a2646 # Parent a9421a8a874f790934397fc47e7d09545baff3ae Added compare view into journal, fixed wrong function call to show compare view diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -74,7 +74,7 @@ class ChangesetController(BaseController if len(rev_range) == 2: rev_start = rev_range[0] rev_end = rev_range[1] - rev_ranges = repo.get_changeset_ranges(rev_start, rev_end, + rev_ranges = repo.get_changesets_ranges(rev_start, rev_end, range_limit) else: rev_ranges = [repo.get_changeset(revision)] diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -480,6 +480,17 @@ def action_parser(user_log): repo_name=repo_name, revision=rev), title=tooltip(message(rev)), class_='tooltip') for rev in revs[:revs_limit] ]) + + compare_view = ('
' + '%s ' + '
' % (_('Show all combined changesets %s->%s' \ + % (revs[0], revs[-1])), + url('changeset_home', repo_name=repo_name, + revision='%s...%s' % (revs[0], revs[-1]) + ), + _('compare view')) + ) + if len(revs) > revs_limit: uniq_id = revs[0] html_tmpl = (' %s ' @@ -495,7 +506,7 @@ def action_parser(user_log): repo_name=repo_name, revision=rev), title=message(rev), class_='tooltip') for rev in revs[revs_limit:revs_top_limit]])) - + cs_links += compare_view return cs_links def get_fork_name(): diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -1433,7 +1433,10 @@ padding-top: 5px; font-weight: bold; font-size: 1.1em; } - +#journal .compare_view{ +padding: 5px 0px 5px 38px; +width: 95px; +} .trending_language_tbl,.trending_language_tbl td { border:0 !important; margin:0 !important;