Changeset - d4b39ef6cadf
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 9 years ago 2016-10-24 21:45:35
madski@unity3d.com
style: use span for tag/bookmark tags ... and make it inline-block to avoid wrapping

Based on work by Dominik Ruf.
5 files changed with 27 insertions and 26 deletions:
kallithea/public/css/style.css
1
kallithea/templates/changelog/changelog.html
16
16
kallithea/templates/changelog/changelog_summary_data.html
6
6
kallithea/templates/compare/compare_cs.html
2
2
kallithea/templates/pullrequests/pullrequest_show.html
2
2
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -2431,48 +2431,49 @@ BIN_FILENODE = 6
 
}
 

			




	
	
	
		
 
#graph_content .phasetag,

			




	
	
	
		
 
#graph_content .bumpedtag,

			




	
	
	
		
 
#graph_content .divergenttag,

			




	
	
	
		
 
#graph_content .extincttag,

			




	
	
	
		
 
#graph_content .unstabletag,

			




	
	
	
		
 
#graph_content .branchtag,

			




	
	
	
		
 
#graph_content .tagtag,

			




	
	
	
		
 
#graph_content .booktag {

			




	
	
	
		
 
    margin: 1.1em 0;

			




	
	
	
		
 
    margin-right: 0.5em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.phasetag,

			




	
	
	
		
 
.bumpedtag,

			




	
	
	
		
 
.divergenttag,

			




	
	
	
		
 
.extincttag,

			




	
	
	
		
 
.unstabletag,

			




	
	
	
		
 
.repotag,

			




	
	
	
		
 
.branchtag,

			




	
	
	
		
 
.tagtag,

			




	
	
	
		
 
.booktag {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    display: inline-block;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .logtags .phasetag,

			




	
	
	
		
 
.right .logtags .bumpedtag,

			




	
	
	
		
 
.right .logtags .divergenttag,

			




	
	
	
		
 
.right .logtags .extincttag,

			




	
	
	
		
 
.right .logtags .unstabletag,

			




	
	
	
		
 
.right .logtags .branchtag,

			




	
	
	
		
 
.right .logtags .tagtag,

			




	
	
	
		
 
.right .logtags .booktag,

			




	
	
	
		
 
.right .merge {

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    line-height: 1em;

			




	
	
	
		
 
    margin: 1px 1px !important;

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.repotag {

			




	
	
	
		
 
    border-color: #56A546;

			




	
	
	
		
 
    color: #46A546;

			




	
	
	
		
 
    font-size: 8px;

			




	
	
	
		
 
    text-transform: uppercase;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -108,88 +108,88 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                        <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">

			




	
	
	
		
 
                            ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')}

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="date">

			




	
	
	
		
 
                            <div class="date tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
                            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="mid">

			




	
	
	
		
 
                            <div class="log-container">

			




	
	
	
		
 
                                <div class="message" id="C-${cs.raw_id}">${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                                <div class="extra-container">

			




	
	
	
		
 
                                    %if c.comments.get(cs.raw_id):

			




	
	
	
		
 
                                        <div class="comments-container">

			




	
	
	
		
 
                                            <div class="comments-cnt" title="${_('Changeset has comments')}">

			




	
	
	
		
 
                                                <a href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                                                    ${len(c.comments[cs.raw_id])}

			




	
	
	
		
 
                                                    <i class="icon-comment-discussion"></i>

			




	
	
	
		
 
                                                </a>

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.bumped:

			




	
	
	
		
 
                                        <div class="bumpedtag" title="Bumped">

			




	
	
	
		
 
                                        <span class="bumpedtag" title="Bumped">

			




	
	
	
		
 
                                            Bumped

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.divergent:

			




	
	
	
		
 
                                        <div class="divergenttag" title="Divergent">

			




	
	
	
		
 
                                        <span class="divergenttag" title="Divergent">

			




	
	
	
		
 
                                            Divergent

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.extinct:

			




	
	
	
		
 
                                        <div class="extincttag" title="Extinct">

			




	
	
	
		
 
                                        <span class="extincttag" title="Extinct">

			




	
	
	
		
 
                                            Extinct

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.unstable:

			




	
	
	
		
 
                                        <div class="unstabletag" title="Unstable">

			




	
	
	
		
 
                                        <span class="unstabletag" title="Unstable">

			




	
	
	
		
 
                                            Unstable

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.phase:

			




	
	
	
		
 
                                        <div class="phasetag" title="Phase">

			




	
	
	
		
 
                                        <span class="phasetag" title="Phase">

			




	
	
	
		
 
                                            ${cs.phase}

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                                        %for book in cs.bookmarks:

			




	
	
	
		
 
                                            <div class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                                            <span class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                                                ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                            </span>

			




	
	
	
		
 
                                        %endfor

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %for tag in cs.tags:

			




	
	
	
		
 
                                        <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                                        <span class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                                            ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endfor

			




	
	
	
		
 
                                    %if (not c.branch_name) and cs.branch:

			




	
	
	
		
 
                                        <div class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




	
	
	
		
 
                                        <span class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




	
	
	
		
 
                                            ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </tbody>

			




	
	
	
		
 
                </table>

			




	
	
	
		
 

			




	
	
	
		
 
                <input type="checkbox" id="singlerange" style="display:none"/>

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 

			




	
	
	
		
 
                <div class="pagination-wh pagination-left">

			




	
	
	
		
 
                    ${c.pagination.pager('$link_previous ~2~ $link_next')}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>

			




	
	
	
		
 
        <script type="text/javascript">

			




	
	
	
		
 
            $(document).ready(function(){

			




	
	
	
		
 
                var $checkboxes = $('.changeset_range');

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog_summary_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -33,62 +33,62 @@

			




	
	
	
		
 
        <td class="compact">

			




	
	
	
		
 
              %if c.comments.get(cs.raw_id,[]):

			




	
	
	
		
 
               <div class="comments-container">

			




	
	
	
		
 
                   <div title="${('comments')}">

			




	
	
	
		
 
                       <a href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                          <i class="icon-comment"></i>${len(c.comments[cs.raw_id])}

			




	
	
	
		
 
                       </a>

			




	
	
	
		
 
                   </div>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}" class="revision-link">${h.show_id(cs)}</a>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            ${h.urlify_text(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
        </td>

			




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

			




	
	
	
		
 
                      ${h.age(cs.date)}</span>

			




	
	
	
		
 
        </td>

			




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

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                %for book in cs.bookmarks:

			




	
	
	
		
 
                    <div class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                    <span class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                        ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            %for tag in cs.tags:

			




	
	
	
		
 
             <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
             <span class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                 ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
             </span>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            %if cs.branch:

			




	
	
	
		
 
             <div class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




	
	
	
		
 
             <span class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




	
	
	
		
 
                 ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
             </span>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
%endfor

			




	
	
	
		
 

			




	
	
	
		
 
</table>

			




	
	
	
		
 

			




	
	
	
		
 
<div class="pagination-wh pagination-left">

			




	
	
	
		
 
${c.repo_changesets.pager('$link_previous ~2~ $link_next')}

			




	
	
	
		
 
</div>

			




	
	
	
		
 
%else:

			




	
	
	
		
 

			




	
	
	
		
 
%if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):

			




	
	
	
		
 
<h4>${_('Add or upload files directly via Kallithea')}</h4>

			




	
	
	
		
 
<div style="margin: 20px 30px;">

			




	
	
	
		
 
  <div id="add_node_id" class="add_node">

			




	
	
	
		
 
      <a class="btn btn-default btn-xs" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
%endif

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<h4>${_('Push new repository')}</h4>

			




	
	
	
		
 
<pre>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -47,51 +47,51 @@

			




	
	
	
		
 
              else:

			




	
	
	
		
 
                  title = _('Position in this list of changesets')

			




	
	
	
		
 
          %>

			




	
	
	
		
 
          <span class="tooltip" title="${title}">

			




	
	
	
		
 
            ${index}

			




	
	
	
		
 
          </span>

			




	
	
	
		
 
        </td>

			




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

			




	
	
	
		
 
        %if c.visual.use_gravatar:

			




	
	
	
		
 
        <td>${h.gravatar_div(h.email_or_none(cs.author), size=14, div_commit_id="${cs.raw_id}")}</td>

			




	
	
	
		
 
        %endif

			




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

			




	
	
	
		
 
        <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
        %if cs.branch:

			




	
	
	
		
 
        <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <div style="float: right; margin-top: -4px;">

			




	
	
	
		
 
                %for tag in cs.tags:

			




	
	
	
		
 
                    <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                    <span class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                        ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        </tr>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    </table>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.as_form:

			




	
	
	
		
 
      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
      ## links should perhaps use ('rev', c.a_rev) instead ...

			




	
	
	
		
 
      ${h.link_to(_('Show merge diff'),

			




	
	
	
		
 
        h.url('compare_url',

			




	
	
	
		
 
          repo_name=c.a_repo.repo_name,

			




	
	
	
		
 
          org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name,

			




	
	
	
		
 
          other_repo=c.cs_repo.repo_name,

			




	
	
	
		
 
          other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,

			




	
	
	
		
 
          merge='1')

			




	
	
	
		
 
        )}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
        ${_('Common ancestor')}:

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -179,51 +179,51 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                <div style="height:0">

			




	
	
	
		
 
                  <canvas id="avail_graph_canvas" style="width:0"></canvas>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <table id="updaterevs-table" class="noborder" style="padding-left:50px">

			




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

			




	
	
	
		
 
                    <tr id="chg_available_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 and not (editable and cs.revision in c.avail_revs) else ''}">

			




	
	
	
		
 
                      %if c.cs_ranges and cs.revision == c.cs_ranges[-1].revision:

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if editable:

			




	
	
	
		
 
                            ${h.radio(name='updaterev', value='', checked=True)}

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td colspan="4">${_("Current revision - no change")}</td>

			




	
	
	
		
 
                      %else:

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if editable and cs.revision in c.avail_revs:

			




	
	
	
		
 
                            ${h.radio(name='updaterev', value=cs.raw_id)}

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




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

			




	
	
	
		
 
                        <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          <div style="float: right; margin-top: -4px;">

			




	
	
	
		
 
                            %for tag in cs.tags:

			




	
	
	
		
 
                              <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                              <span class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                                ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                              </div>

			




	
	
	
		
 
                              </span>

			




	
	
	
		
 
                            %endfor

			




	
	
	
		
 
                          </div>

			




	
	
	
		
 
                          <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_text(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </table>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="msg-div">(${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")})</div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <div class="msg-div">${c.update_msg_other}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ## REVIEWERS

			




	
	
	
		
 
    <div style="float:left; border-left:1px dashed #eee">

			




	
	
	
		
 
        <div class="pr-details-title">${_('Pull Request Reviewers')}</div>

			




	
	
	
		
 
        <div id="reviewers" style="padding:0px 0px 5px 10px">

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




	
	
	
		
 
              <input type="hidden" value="${member.user_id}" name="org_review_members" />

			




        

    



    


    



    



      

      





    
    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.