changeset 1980:3dbf0ff5fc2b beta

Merged in aras_p/rhodecode (pull request #28)
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 05 Feb 2012 21:33:29 +0200
parents 164199e476e9 (current diff) 3dc2cf954173 (diff)
children 518f87919375
files
diffstat 1 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/helpers.py	Thu Feb 02 00:32:15 2012 +0200
+++ b/rhodecode/lib/helpers.py	Sun Feb 05 21:33:29 2012 +0200
@@ -448,7 +448,18 @@
                                     _('compare view'))
                         )
 
-        if len(revs) > revs_limit:
+        # if we have exactly one more than normally displayed:
+        # just display it, takes less space than displaying "and 1 more revisions"
+        if len(revs) == revs_limit + 1:
+            rev = revs[revs_limit]
+            cs_links.append(", " + link_to(rev,
+                url('changeset_home',
+                repo_name=repo_name,
+                revision=rev), title=tooltip(message(rev)),
+                class_='tooltip') )
+
+        # hidden-by-default ones
+        if len(revs) > revs_limit + 1:
             uniq_id = revs[0]
             html_tmpl = ('<span> %s '
             '<a class="show_more" id="_%s" href="#more">%s</a> '
@@ -459,15 +470,20 @@
                                         _('revisions')))
 
             if not feed:
-                html_tmpl = '<span id="%s" style="display:none"> %s </span>'
+                html_tmpl = '<span id="%s" style="display:none">, %s </span>'
             else:
                 html_tmpl = '<span id="%s"> %s </span>'
 
-            cs_links.append(html_tmpl % (uniq_id, ', '.join([link_to(rev,
+            morelinks = ', '.join([link_to(rev,
                 url('changeset_home',
                 repo_name=repo_name, revision=rev),
                 title=message(rev), class_='tooltip')
-                for rev in revs[revs_limit:revs_top_limit]])))
+                for rev in revs[revs_limit:revs_top_limit]])
+
+            if len(revs) > revs_top_limit:
+                morelinks += ', ...'
+
+            cs_links.append(html_tmpl % (uniq_id, morelinks))
         if len(revs) > 1:
             cs_links.append(compare_view)
         return ''.join(cs_links)