kallithea Changeset - 99536f257644

Changeset - 99536f257644

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 14 years ago 2012-05-08 22:18:46
marcin@python-works.com

#421 bookmarks in changlog view

4 files changed with 23 insertions and 6 deletions:

docs/changelog.rst

rhodecode/lib/vcs/backends/hg/changeset.py

rhodecode/public/css/style.css

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -17,24 +17,25 @@ news @@
 - unified annotation view with file source view
 - notification improvements, better inbox + css
 - #419 don't strip passwords for login forms, make rhodecode
   more compatible with LDAP servers
 - Added HTTP_X_FORWARDED_FOR as another method of extracting
   IP for pull/push logs. - moved all to base controller
 - #415: Adding comment to changeset causes reload.
   Comments are now added via ajax and doesn't reload the page
 - #374 LDAP config is discarded when LDAP can't be activated
 - 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
 +++++
 - fixed dev-version marker for stable when served from source codes
 - fixed missing permission checks on show forks page
 - #418 cast to unicode fixes in notification objects
 - #426 fixed mention extracting regex
 - fixed remote-pulling for git remotes remopositories
 - fixed #434: Error when accessing files or changesets of a git repository
   with submodules

rhodecode/lib/vcs/backends/hg/changeset.py

➞

Show inline comments

@@ @@ -28,24 +28,28 @@ class MercurialChangeset(BaseChangeset): @@
         self.revision = self._ctx._rev
         self.nodes = {}
     @LazyProperty
     def tags(self):
         return map(safe_unicode, self._ctx.tags())
     @LazyProperty
     def branch(self):
         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())
     @LazyProperty
     def author(self):
         return safe_unicode(self._ctx.user())
     @LazyProperty
     def date(self):
         return date_fromtimestamp(*self._ctx.date())
     @LazyProperty

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2511,24 +2511,28 @@ h3.files_location { @@
   -moz-border-radius: 3px;
   border-radius: 3px;
   margin-right: 2px;
+}
 .right .parent {
 	color: #666666;
 	clear:both;
+}
 .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;
   font-size: 10px;
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
+}
@@ @@ -2549,40 +2553,40 @@ h3.files_location { @@
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
+}
 .right .logtags .tagtag a:hover,.logtags .tagtag a{
 	color: #ffffff;
+}
 .right .logtags .tagtag a:hover,.logtags .tagtag a:hover{
     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;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -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;
+}
 div.browserblock {
 	overflow: hidden;
 	border: 1px solid #ccc;
 	background: #f8f8f8;
 	font-size: 100%;
 	line-height: 125%;
 	padding: 0;
     -webkit-border-radius: 6px 6px 0px 0px;
     -moz-border-radius: 6px 6px 0px 0px;

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -84,26 +84,34 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 										</div>
 									%endfor
 								   %else:
                                         <div class="parent">${_('No parents')}</div>
                                    %endif
 								<span class="logtags">
 									%if len(cs.parents)>1:
 									<span class="merge">${_('merge')}</span>
 									%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>
 									%endfor
 								</span>
 						</div>
 					</div>
 				%endfor
 				<div class="pagination-wh pagination-left">
 					${c.pagination.pager('$link_previous ~2~ $link_next')}
 				</div>

0 comments (0 inline, 0 general)