Mercurial > kallithea

changeset 2247:99536f257644 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#421 bookmarks in changlog view
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 08 May 2012 22:18:46 +0200
parents d919631e8390
children 72542dc597be
files docs/changelog.rst rhodecode/lib/vcs/backends/hg/changeset.py rhodecode/public/css/style.css rhodecode/templates/changelog/changelog.html
diffstat 4 files changed, 23 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/docs/changelog.rst	Fri May 04 14:13:28 2012 +0200
+++ b/docs/changelog.rst	Tue May 08 22:18:46 2012 +0200
@@ -26,6 +26,7 @@
 - limited push/pull operations are now logged for git in the journal
 - bumped mercurial to 2.2.X series
 - added support for displaying submodules in file-browser
+- #421 added bookmarks in changlog view
 
 fixes
 +++++
--- a/rhodecode/lib/vcs/backends/hg/changeset.py	Fri May 04 14:13:28 2012 +0200
+++ b/rhodecode/lib/vcs/backends/hg/changeset.py	Tue May 08 22:18:46 2012 +0200
@@ -37,6 +37,10 @@
         return  safe_unicode(self._ctx.branch())
 
     @LazyProperty
+    def bookmarks(self):
+        return map(safe_unicode, self._ctx.bookmarks())
+
+    @LazyProperty
     def message(self):
         return safe_unicode(self._ctx.description())
 
--- a/rhodecode/public/css/style.css	Fri May 04 14:13:28 2012 +0200
+++ b/rhodecode/public/css/style.css	Tue May 08 22:18:46 2012 +0200
@@ -2520,6 +2520,10 @@
 .right .logtags{
 	padding: 2px 2px 2px 2px;
 }
+.right .logtags .branchtag,.right .logtags .tagtag,.right .logtags .booktag{
+    margin: 0px 2px;
+}
+
 .right .logtags .branchtag,.logtags .branchtag {
   padding: 1px 3px 1px 3px;
   background-color: #bfbfbf;
@@ -2558,10 +2562,10 @@
     text-decoration: none;
     color: #ffffff;
 }
-.right .logbooks .bookbook,.logbooks .bookbook {
-  padding: 1px 3px 2px;
+.right .logbooks .bookbook,.logbooks .bookbook,.right .logtags .bookbook,.logtags .bookbook {
+  padding: 1px 3px 1px 3px;
   background-color: #46A546;
-  font-size: 9.75px;
+  font-size: 10px;
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
@@ -2570,10 +2574,10 @@
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
-.right .logbooks .bookbook,.logbooks .bookbook a{
+.right .logbooks .bookbook,.logbooks .bookbook a,.right .logtags .bookbook,.logtags .bookbook a{
 	color: #ffffff;
 }
-.right .logbooks .bookbook,.logbooks .bookbook a:hover{
+.right .logbooks .bookbook,.logbooks .bookbook a:hover,.right .logtags .bookbook,.logtags .bookbook a:hover{
     text-decoration: none;
     color: #ffffff;
 }
--- a/rhodecode/templates/changelog/changelog.html	Fri May 04 14:13:28 2012 +0200
+++ b/rhodecode/templates/changelog/changelog.html	Tue May 08 22:18:46 2012 +0200
@@ -93,8 +93,16 @@
 									%endif
 									%if cs.branch:
 									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
-									   ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
+									   ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                    </span>
 									%endif
+                                    %if h.is_hg(c.rhodecode_repo):
+                                      %for book in cs.bookmarks:
+                                      <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
+                                         ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                      </span>                   
+                                      %endfor                
+                                    %endif
 									%for tag in cs.tags:
 										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 										${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>