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 18 insertions and 10 deletions:
rhodecode/public/css/style.css
2
1
rhodecode/templates/changeset/changeset.html
11
4
rhodecode/templates/changeset/changeset_range.html
5
5
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -2750,97 +2750,98 @@ h3.files_location {
 
    margin-right: 2px;
 
}
 

			




	
	
	
		
 
.right .parent {

			




	
	
	
		
 
    color: #666666;

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logtags {

			




	
	
	
		
 
    line-height: 2.2em;

			




	
	
	
		
 
}

			




	
	
	
		
 
.branchtag, .logtags .tagtag, .logtags .booktag {

			




	
	
	
		
 
    margin: 0px 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#shortlog_data .branchtag,

			




	
	
	
		
 
#shortlog_data .booktag,

			




	
	
	
		
 
#shortlog_data .tagtag {

			




	
	
	
		
 
    margin: 0px 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.branchtag,

			




	
	
	
		
 
.tagtag,

			




	
	
	
		
 
.booktag,

			




	
	
	
		
 
.spantag {

			




	
	
	
		
 
    padding: 1px 3px 1px 3px;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
    color: #336699;

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    -webkit-border-radius: 4px;

			




	
	
	
		
 
    border-radius: 4px;

			




	
	
	
		
 
    border: 1px solid #d9e8f8;

			




	
	
	
		
 
    line-height: 1.5em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .branchtag,

			




	
	
	
		
 
#graph_content .tagtag,

			




	
	
	
		
 
#graph_content .booktag {

			




	
	
	
		
 
    margin: 1.1em 0;

			




	
	
	
		
 
    margin-right: 0.5em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.branchtag,

			




	
	
	
		
 
.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;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.booktag {

			




	
	
	
		
 
    border-color: #46A546;

			




	
	
	
		
 
    color: #46A546;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.tagtag {

			




	
	
	
		
 
    border-color: #62cffc;

			




	
	
	
		
 
    color: #62cffc;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.logtags .branchtag a:hover,

			




	
	
	
		
 
.logtags .branchtag a,

			




	
	
	
		
 
.branchtag a,

			




	
	
	
		
 
.branchtag a:hover {

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
    color: inherit;

			




	
	
	
		
 
}

			




	
	
	
		
 
.logtags .tagtag {

			




	
	
	
		
 
    padding: 1px 3px 1px 3px;

			




	
	
	
		
 
    background-color: #62cffc;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
    color: #ffffff;

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    -webkit-border-radius: 3px;

			




	
	
	
		
 
    border-radius: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.tagtag a,

			




	
	
	
		
 
.tagtag a:hover,

			




	
	
	
		
 
.logtags .tagtag a,

			




	
	
	
		
 
.logtags .tagtag a:hover {

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
    color: inherit;

			




	
	
	
		
 
}

			




	
	
	
		
 
.logbooks .booktag, .logbooks .booktag, .logtags .booktag, .logtags .booktag {

			




	
	
	
		
 
    padding: 1px 3px 1px 3px;

			




	
	
	
		
 
    background-color: #46A546;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
    color: #ffffff;

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    -webkit-border-radius: 3px;

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -57,105 +57,112 @@ ${self.context_bar('changelog')}

			




	
	
	
		
 
                <div class="date">

			




	
	
	
		
 
                  ${h.fmt_date(c.changeset.date)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="changeset-status-container">

			




	
	
	
		
 
                    %if c.statuses:

			




	
	
	
		
 
                      <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div>

			




	
	
	
		
 
                      <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[0])}" /></div>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Patch diff'))}"><img class="icon" src="${h.url('/images/icons/page_add.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}"  class="tooltip" title="${h.tooltip(_('Download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                  ${c.context_url(request.GET)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="changeset_content">

			




	
	
	
		
 
            <div class="container">

			




	
	
	
		
 
                 <div class="left">

			




	
	
	
		
 
                     <div class="author">

			




	
	
	
		
 
                         <div class="gravatar">

			




	
	
	
		
 
                             <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.changeset.author),20)}"/>

			




	
	
	
		
 
                         </div>

			




	
	
	
		
 
                         <span>${h.person(c.changeset.author)}</span><br/>

			




	
	
	
		
 
                         <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div>

			




	
	
	
		
 
                 </div>

			




	
	
	
		
 
                 <div class="right">

			




	
	
	
		
 
                     <div class="changes">

			




	
	
	
		
 
                        % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:

			




	
	
	
		
 
                         <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span>

			




	
	
	
		
 
                         <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>

			




	
	
	
		
 
                         <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span>

			




	
	
	
		
 
                        % else:

			




	
	
	
		
 
                         <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="added"   title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                        % endif

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 

			




	
	
	
		
 
                 <span class="logtags">

			




	
	
	
		
 
                 %if len(c.changeset.parents)>1:

			




	
	
	
		
 
                 <span class="merge">${_('merge')}</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

			




	
	
	
		
 
                     %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

			




	
	
	
		
 
                 </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))}:

			




	
	
	
		
 
            % else:

			




	
	
	
		
 
            ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </span>

			




	
	
	
		
 
            <div class="cs_files">

			




	
	
	
		
 
              %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems():

			




	
	
	
		
 
                  <div class="cs_${change}">

			




	
	
	
		
 
                        <div class="node">

			




	
	
	
		
 
                            <a href="#${FID}">${h.safe_unicode(path)}</a>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    <div class="changes">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              %endfor

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes[c.changeset.raw_id])}

			




	
	
	
		
 

			




	
	
	
		
 
    % if c.limited_diff:

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h4>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## main comment form and it status

			




	
	
	
		
 
    ${comment.comments(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id),

			




	
	
	
		
 
                       h.changeset_status(c.rhodecode_db_repo, c.changeset.raw_id))}

			




	
	
	
		
 

			




	
	
	
		
 
    ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS

			




	
	
	
		
 
    <script type="text/javascript">

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -31,90 +31,90 @@ ${self.context_bar('changelog')}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
            <div class="container">

			




	
	
	
		
 
            <table class="compare_view_commits noborder">

			




	
	
	
		
 
            %for cnt,cs in enumerate(c.cs_ranges):

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>

			




	
	
	
		
 
                <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>

			




	
	
	
		
 
                <td><div class="author">${h.person(cs.author)}</div></td>

			




	
	
	
		
 
                <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




	
	
	
		
 
                <td>

			




	
	
	
		
 
                  %if c.statuses:

			




	
	
	
		
 
                    <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </td>

			




	
	
	
		
 
                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </table>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>

			




	
	
	
		
 
            <div class="cs_files">

			




	
	
	
		
 
                   %for cs in c.cs_ranges:

			




	
	
	
		
 
                       <div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                      %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():

			




	
	
	
		
 
                        <div class="cs_${change}">${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}</div>

			




	
	
	
		
 
                      %endfor

			




	
	
	
		
 
                   %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
     %for cs in c.cs_ranges:

			




	
	
	
		
 
          ##${comment.comment_inline_form(cs)}

			




	
	
	
		
 
          ## diff block

			




	
	
	
		
 
          <div class="h3">

			




	
	
	
		
 
          <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a>

			




	
	
	
		
 
             <div class="gravatar">

			




	
	
	
		
 
                 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>

			




	
	
	
		
 
             </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)}

			




	
	
	
		
 

			




	
	
	
		
 
     %endfor

			




	
	
	
		
 
     <script type="text/javascript">

			




	
	
	
		
 

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.diff-menu-activate'),'click',function(e){

			




	
	
	
		
 
              var act = e.currentTarget.nextElementSibling;

			




	
	
	
		
 

			




	
	
	
		
 
              if(YUD.hasClass(act,'active')){

			




	
	
	
		
 
                  YUD.removeClass(act,'active');

			




	
	
	
		
 
                  YUD.setStyle(act,'display','none');

			




	
	
	
		
 
              }else{

			




	
	
	
		
 
                  YUD.addClass(act,'active');

			




	
	
	
		
 
                  YUD.setStyle(act,'display','');

			




	
	
	
		
 
              }

			




	
	
	
		
 
          });

			




	
	
	
		
 
      })

			




	
	
	
		
 
    </script>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.