Mercurial > kallithea
changeset 3707:93de03499097 beta
shortlog: show all refs (bookmarks,tags,branches) in one dedicated column
- rename confusing name bookbook to booktag (as others similar names)
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 07 Apr 2013 23:11:17 +0200 |
parents | 4e28db85edf7 |
children | ec65d8b2fccc |
files | rhodecode/public/css/style.css rhodecode/templates/bookmarks/bookmarks.html rhodecode/templates/bookmarks/bookmarks_data.html rhodecode/templates/changelog/changelog.html rhodecode/templates/changeset/changeset_range.html rhodecode/templates/shortlog/shortlog_data.html |
diffstat | 6 files changed, 38 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Sun Apr 07 22:18:03 2013 +0200 +++ b/rhodecode/public/css/style.css Sun Apr 07 23:11:17 2013 +0200 @@ -2637,7 +2637,7 @@ left: initial; } -#graph_content .logtags .bookbook, +#graph_content .logtags .booktag, #graph_content .logtags .tagtag { float: left; line-height: 1em; @@ -2761,9 +2761,15 @@ margin: 0px 2px; } +#shortlog_data .branchtag, +#shortlog_data .booktag, +#shortlog_data .tagtag { + margin: 0px 2px; +} + .branchtag, .tagtag, -.bookbook, +.booktag, .spantag { padding: 1px 3px 1px 3px; font-size: 10px; @@ -2777,14 +2783,14 @@ #graph_content .branchtag, #graph_content .tagtag, -#graph_content .bookbook { +#graph_content .booktag { margin: 1.1em 0; margin-right: 0.5em; } .branchtag, .tagtag, -.bookbook { +.booktag { float: left; } @@ -2797,7 +2803,7 @@ display: block; } -.bookbook { +.booktag { border-color: #46A546; color: #46A546; } @@ -2831,7 +2837,7 @@ text-decoration: none; color: inherit; } -.logbooks .bookbook, .logbooks .bookbook, .logtags .bookbook, .logtags .bookbook { +.logbooks .booktag, .logbooks .booktag, .logtags .booktag, .logtags .booktag { padding: 1px 3px 1px 3px; background-color: #46A546; font-size: 10px; @@ -2840,14 +2846,14 @@ -webkit-border-radius: 3px; border-radius: 3px; } -.logbooks .bookbook, .logbooks .bookbook a, .right .logtags .bookbook, .logtags .bookbook a { +.logbooks .booktag, .logbooks .booktag a, .right .logtags .booktag, .logtags .booktag a { color: #ffffff; } -.logbooks .bookbook, .logbooks .bookbook a:hover, -.logtags .bookbook, .logtags .bookbook a:hover, -.bookbook a, -.bookbook a:hover { +.logbooks .booktag, .logbooks .booktag a:hover, +.logtags .booktag, .logtags .booktag a:hover, +.booktag a, +.booktag a:hover { text-decoration: none; color: inherit; }
--- a/rhodecode/templates/bookmarks/bookmarks.html Sun Apr 07 22:18:03 2013 +0200 +++ b/rhodecode/templates/bookmarks/bookmarks.html Sun Apr 07 23:11:17 2013 +0200 @@ -67,7 +67,7 @@ var func = function(node){ return node.parentNode.parentNode.parentNode.parentNode.parentNode; } - q_filter('q_filter_bookmarks',YUQ('div.table tr td .logbooks .bookbook a'),func); + q_filter('q_filter_bookmarks',YUQ('div.table tr td .logbooks .booktag a'),func); }); </script>
--- a/rhodecode/templates/bookmarks/bookmarks_data.html Sun Apr 07 22:18:03 2013 +0200 +++ b/rhodecode/templates/bookmarks/bookmarks_data.html Sun Apr 07 23:11:17 2013 +0200 @@ -13,7 +13,7 @@ <tr class="parity${cnt%2}"> <td> <span class="logbooks"> - <span class="bookbook">${h.link_to(book[0], + <span class="booktag">${h.link_to(book[0], h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))}</span> </span> </td>
--- a/rhodecode/templates/changelog/changelog.html Sun Apr 07 22:18:03 2013 +0200 +++ b/rhodecode/templates/changelog/changelog.html Sun Apr 07 23:11:17 2013 +0200 @@ -98,7 +98,7 @@ %endif %if h.is_hg(c.rhodecode_repo): %for book in cs.bookmarks: - <div class="bookbook" title="${_('Bookmark %s') % book}"> + <div class="booktag" title="${_('Bookmark %s') % book}"> ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} </div> %endfor
--- a/rhodecode/templates/changeset/changeset_range.html Sun Apr 07 22:18:03 2013 +0200 +++ b/rhodecode/templates/changeset/changeset_range.html Sun Apr 07 23:11:17 2013 +0200 @@ -83,7 +83,7 @@ %endif %if h.is_hg(c.rhodecode_repo): %for book in cs.bookmarks: - <span class="bookbook" title="${_('Bookmark %s') % book}"> + <span class="booktag" title="${_('Bookmark %s') % book}"> ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} </span> %endfor
--- a/rhodecode/templates/shortlog/shortlog_data.html Sun Apr 07 22:18:03 2013 +0200 +++ b/rhodecode/templates/shortlog/shortlog_data.html Sun Apr 07 23:11:17 2013 +0200 @@ -6,8 +6,7 @@ <th class="left">${_('Commit message')}</th> <th class="left">${_('Age')}</th> <th class="left">${_('Author')}</th> - <th class="left">${_('Branch')}</th> - <th class="left">${_('Tags')}</th> + <th class="left">${_('Refs')}</th> </tr> %for cnt,cs in enumerate(c.repo_changesets): <tr class="parity${cnt%2}"> @@ -37,20 +36,23 @@ </td> <td title="${cs.author}">${h.person(cs.author)}</td> <td> - <span class="logtags"> - %if cs.branch: - <span class="branchtag"> - ${cs.branch} - </span> - %endif - </span> - </td> - <td> - <span class="logtags"> - %for tag in cs.tags: - <span class="tagtag">${tag}</span> + %if h.is_hg(c.rhodecode_repo): + %for book in cs.bookmarks: + <div class="booktag" title="${_('Bookmark %s') % book}"> + ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + </div> %endfor - </span> + %endif + %for tag in cs.tags: + <div class="tagtag" title="${_('Tag %s') % tag}"> + ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + </div> + %endfor + %if cs.branch: + <div class="branchtag" title="${_('Branch %s' % cs.branch)}"> + ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))} + </div> + %endif </td> </tr> %endfor