Mercurial > kallithea
changeset 1009:eafe5ae429ea beta
Added compare view into journal, fixed wrong function call to show compare view
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 09 Feb 2011 01:02:44 +0100 |
| parents | a9421a8a874f |
| children | 643e4a540ddd |
| files | rhodecode/controllers/changeset.py rhodecode/lib/helpers.py rhodecode/public/css/style.css |
| diffstat | 3 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/changeset.py Wed Feb 09 00:36:12 2011 +0100 +++ b/rhodecode/controllers/changeset.py Wed Feb 09 01:02:44 2011 +0100 @@ -74,7 +74,7 @@ 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)]
--- a/rhodecode/lib/helpers.py Wed Feb 09 00:36:12 2011 +0100 +++ b/rhodecode/lib/helpers.py Wed Feb 09 01:02:44 2011 +0100 @@ -480,6 +480,17 @@ repo_name=repo_name, revision=rev), title=tooltip(message(rev)), class_='tooltip') for rev in revs[:revs_limit] ]) + + compare_view = (' <div class="compare_view tooltip" title="%s">' + '<a href="%s">%s</a> ' + '</div>' % (_('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 = ('<span> %s ' @@ -495,7 +506,7 @@ 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():
--- a/rhodecode/public/css/style.css Wed Feb 09 00:36:12 2011 +0100 +++ b/rhodecode/public/css/style.css Wed Feb 09 01:02:44 2011 +0100 @@ -1433,7 +1433,10 @@ 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;