Changeset - 482b6ac31603
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich (mads) - 9 years ago 2016-12-24 17:26:48
mads@kiilerich.com
style: template markup changes for changeset.html, preparing for Bootstrap

Based on work by Dominik Ruf.
2 files changed with 21 insertions and 17 deletions:
kallithea/public/css/style.css
6
1
kallithea/templates/changeset/changeset.html
15
16
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -1745,49 +1745,48 @@ h3.files_location {
 
    margin-right: -3px;
 
}
 

			




	
	
	
		
 
.changeset-logical-index {

			




	
	
	
		
 
    color: #666666;

			




	
	
	
		
 
    font-style: italic;

			




	
	
	
		
 
    font-size: 85%;

			




	
	
	
		
 
    padding-right: 0.5em;

			




	
	
	
		
 
    text-align: right;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_content {

			




	
	
	
		
 
    border-left: 1px solid #CCC;

			




	
	
	
		
 
    border-right: 1px solid #CCC;

			




	
	
	
		
 
    border-bottom: 1px solid #CCC;

			




	
	
	
		
 
    padding: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_compare_view_content {

			




	
	
	
		
 
    border: 1px solid #CCC;

			




	
	
	
		
 
    padding: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_content .container {

			




	
	
	
		
 
    min-height: 100px;

			




	
	
	
		
 
    font-size: 1.2em;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_compare_view_content .compare_view_commits {

			




	
	
	
		
 
    width: auto !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_compare_view_content .compare_view_commits td {

			




	
	
	
		
 
    padding: 0px 0px 0px 12px !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_content .container .right {

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    width: 20%;

			




	
	
	
		
 
    text-align: right;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_content .container .message {

			




	
	
	
		
 
    white-space: pre-wrap;

			




	
	
	
		
 
}

			




	
	
	
		
 
#changeset_content .container .message a:hover {

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -2192,48 +2191,49 @@ BIN_FILENODE = 6

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .added,

			




	
	
	
		
 
.changed, .removed {

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    padding: 1px;

			




	
	
	
		
 
    color: #444444;

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    min-width: 15px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .added {

			




	
	
	
		
 
    background: #CFC;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .changed {

			




	
	
	
		
 
    background: #FEA;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .removed {

			




	
	
	
		
 
    background: #FAA;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .mergetag,

			




	
	
	
		
 
.right .merge {

			




	
	
	
		
 
    padding: 1px 3px 1px 3px;

			




	
	
	
		
 
    background-color: #fca062;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
    color: #ffffff;

			




	
	
	
		
 
    text-transform: uppercase;

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    border-radius: 3px;

			




	
	
	
		
 
    margin-right: 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .parent {

			




	
	
	
		
 
    color: #666666;

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logtags {

			




	
	
	
		
 
    line-height: 2.2em;

			




	
	
	
		
 
}

			




	
	
	
		
 
.phasetag, .bumpedtag, .divergenttag, .extincttag, .unstabletag, .repotag, .branchtag, .logtags .tagtag, .logtags .booktag {

			




	
	
	
		
 
    margin: 0px 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.phasetag,

			




	
	
	
		
 
.bumpedtag,

			




	
	
		
 
@@ -2266,48 +2266,49 @@ BIN_FILENODE = 6

			




	
	
	
		
 
    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 .mergetag,

			




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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#context-bar .repotag,

			




	
	
	
		
 
.repo-icons .repotag {

			




	
	
	
		
 
    border-color: white;

			




	
	
	
		
 
    color: white;

			




	
	
	
		
 
    margin-top: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.repo-icons .repotag {

			




	
	
	
		
 
    margin-top: 0px;

			




	
	
	
		
 
    padding-top: 0px;

			




	
	
		
 
@@ -4426,24 +4427,28 @@ body table.dataTable thead .sorting_desc

			




	
	
	
		
 
  padding-left: 30px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.dataTables_wrapper .dataTables_info {

			




	
	
	
		
 
  clear: none;

			




	
	
	
		
 
  padding-top: 1em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.dataTables_wrapper .dataTables_paginate {

			




	
	
	
		
 
  padding-top: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.dataTables_wrapper .dataTables_paginate > a.paginate_button {

			




	
	
	
		
 
  padding-top: 1em;

			




	
	
	
		
 
  border: 0 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.text-muted {

			




	
	
	
		
 
    color: #777777;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.grid_edit a {

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.changes_txt {

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -47,138 +47,137 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
                    %if c.statuses:

			




	
	
	
		
 
                        <span class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></span>

			




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

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="tooltip" title="${_('Raw diff')}">

			




	
	
	
		
 
                      <i class="icon-diff"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" data-toggle="tooltip" title="${_('Patch diff')}">

			




	
	
	
		
 
                      <i class="icon-file-powerpoint"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}">

			




	
	
	
		
 
                      <i class="icon-floppy"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                  ${c.context_url(request.GET)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="comments-number" style="float:right;padding-right:5px">

			




	
	
	
		
 
                    ${comment.comment_count(c.inline_cnt, len(c.comments))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="changeset_content">

			




	
	
	
		
 
            <div class="container">

			




	
	
	
		
 
            <div class="form-group container">

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                        <span class="mergetag">${_('Merge')}</span>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 

			




	
	
	
		
 
                        %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                          %for book in c.changeset.bookmarks:

			




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

			




	
	
	
		
 
                             ${h.link_to(book,h.url('changeset_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('changeset_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('changelog_home',repo_name=c.repo_name,branch=c.changeset.branch))}

			




	
	
	
		
 
                         </span>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="left">

			




	
	
	
		
 
                     <div class="author">

			




	
	
	
		
 
                         ${h.gravatar_div(h.email_or_none(c.changeset.author), size=20)}

			




	
	
	
		
 
                         <span><b>${h.person(c.changeset.author,'full_name_and_username')}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/>

			




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

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     <% rev = c.changeset.extra.get('source') %>

			




	
	
	
		
 
                     %if rev:

			




	
	
	
		
 
                     <div>

			




	
	
	
		
 
                       ${_('Grafted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev), class_="changeset_hash")}

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 
                     <% rev = c.changeset.extra.get('transplant_source', '').encode('hex') %>

			




	
	
	
		
 
                     %if rev:

			




	
	
	
		
 
                     <div>

			




	
	
	
		
 
                       ${_('Transplanted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev), class_="changeset_hash")}

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 

			




	
	
	
		
 
                     % if hasattr(c.changeset, 'successors') and c.changeset.successors:

			




	
	
	
		
 
                     <div class='successors'>

			




	
	
	
		
 
                       <span class='successors_header'>${_('Replaced by:')} </span>

			




	
	
	
		
 
                       % for i, s in enumerate(c.changeset.successors):

			




	
	
	
		
 
                           <%

			




	
	
	
		
 
                           comma = ""

			




	
	
	
		
 
                           if i != len(c.changeset.successors)-1:

			




	
	
	
		
 
                             comma = ", "

			




	
	
	
		
 
                           %>

			




	
	
	
		
 
                         <a class='successors_hash' href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}

			




	
	
	
		
 
                       % endfor

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     % endif

			




	
	
	
		
 

			




	
	
	
		
 
                     % if hasattr(c.changeset, 'precursors') and c.changeset.precursors:

			




	
	
	
		
 
                     <div class='precursors'>

			




	
	
	
		
 
                       <span class='precursors_header'>${_('Preceded by:')} </span>

			




	
	
	
		
 
                       % for i, s in enumerate(c.changeset.precursors):

			




	
	
	
		
 
                           <%

			




	
	
	
		
 
                           comma = ""

			




	
	
	
		
 
                           if i != len(c.changeset.precursors)-1:

			




	
	
	
		
 
                             comma = ", "

			




	
	
	
		
 
                           %>

			




	
	
	
		
 
                           <a class="precursors_hash" href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}

			




	
	
	
		
 
                       % endfor

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     % endif

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="message form-group">${h.urlify_text(c.changeset.message, c.repo_name)}</div>

			




	
	
	
		
 
            <div class="changes_txt">

			




	
	
	
		
 
              <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %>

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                  ${ungettext('%s file changed', '%s files changed', len(file_diff_data)) % len(file_diff_data)}:

			




	
	
	
		
 
              % else:

			




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

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="cs_files">

			




	
	
	
		
 
                %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:

			




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

			




	
	
	
		
 
                      <div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-${op}"></i>

			




	
	
	
		
 
                          ${h.link_to(h.safe_unicode(path), '#%s' % fid)}

			




	
	
	
		
 
                      </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())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-5612
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support