kallithea Changeset - 0cecc22285ef

Changeset - 0cecc22285ef

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2013-04-09 00:40:48
marcin@python-works.com

#818: Bookmarks Do Not Display on Changeset View
- made the consistent order of displaying tags iconss

3 files changed with 19 insertions and 11 deletions:

rhodecode/public/css/style.css

rhodecode/templates/changeset/changeset.html

rhodecode/templates/changeset/changeset_range.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2792,13 +2792,14 @@ h3.files_location { @@
 .tagtag,
 .booktag {
     float: left;
+}
 .right .logtags .branchtag,
 .logtags .tagtag,
 .right .logtags .tagtag,
 .right .logtags .booktag,
 .right .merge {
     float: right;
     line-height: 1em;
     margin: 1px 1px !important;
     display: block;
+}

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -99,21 +99,28 @@ ${self.context_bar('changelog')} @@
                      </div>
                  <span class="logtags">
                  %if len(c.changeset.parents)>1:
                  <span class="merge">${_('merge')}</span>
                  %endif
                      %if c.changeset.branch:
                      <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">
                      ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
                      </span>
                      %endif
                     %if h.is_hg(c.rhodecode_repo):
                       %for book in c.changeset.bookmarks:
                       <span class="booktag" title="${_('Bookmark %s') % book}">
                          ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
                       </span>
                       %endfor
                     %endif
                      %for tag in c.changeset.tags:
                          <span class="tagtag"  title="${_('Tag %s') % tag}">
                          ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
                      %endfor
                      %if c.changeset.branch:
                          <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">
                          ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
                          </span>
                      %endif
                  </span>
                     </div>
             </div>
             <span>
             % if c.limited_diff:
             ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}:

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -73,28 +73,28 @@ ${self.context_bar('changelog')} @@
              </div>
              <div class="right">
               <span class="logtags">
                 %if len(cs.parents)>1:
                 <span class="merge">${_('merge')}</span>
                 %endif
                 %if cs.branch:
                 <span class="branchtag" title="${_('Branch %s') % cs.branch}">
                    ${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="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
                 %endif
                 %for tag in cs.tags:
                     <span 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))}</span>
                 %endfor
                 %if cs.branch:
                 <span class="branchtag" title="${_('Branch %s') % cs.branch}">
                    ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                 </span>
                 %endif
               </span>
             </div>
            </div>
           ${diff_block.diff_block(c.changes[cs.raw_id])}
           ##${comment.comments(cs)}

0 comments (0 inline, 0 general)