Changeset - b66e4d720198
Parent rev.
Child rev.
[Not reviewed]
default
0 7 0
domruf - 8 years ago 2017-10-25 23:16:34
dominikruf@gmail.com
templates: change .node elements to <span>

This way we don't need to make them 'float: left'
7 files changed with 20 insertions and 26 deletions:
kallithea/public/css/style.css
3
kallithea/public/less/kallithea-diff.less
3
kallithea/templates/changeset/changeset.html
2
2
kallithea/templates/changeset/changeset_range.html
2
2
kallithea/templates/compare/compare_diff.html
2
2
kallithea/templates/pullrequests/pullrequest_show.html
2
2
kallithea/tests/functional/test_compare_local.py
12
12
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -1933,15 +1933,12 @@ input.perm_filter {
 
  width: 14px;
 
  height: 14px;
 
}
 
.cs_files .progress {
 
  margin-bottom: 0;
 
}
 
.cs_files .node {
 
  float: left;
 
}
 
.cs_files .changes {
 
  float: right;
 
  color: #577632;
 
}
 
.cs_files .changes .added {
 
  color: inherit;
kallithea/public/less/kallithea-diff.less
➞
Show inline comments
 
.cs_files .progress {
 
  margin-bottom: 0;
 
}
 
.cs_files .node {
 
  float: left;
 
}
 
.cs_files .changes {
 
  float: right;
 
  color: #577632;
 
}
 
.cs_files .changes .added {
 
  color: inherit;
kallithea/templates/changeset/changeset.html
➞
Show inline comments
 
@@ -149,16 +149,16 @@ ${self.repo_context_bar('changelog', c.c
 
                  ${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} clearfix">
 
                      <div class="node">
 
                      <span class="node">
 
                          <i class="icon-diff-${op}"></i>
 
                          ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
 
                      </div>
 
                      </span>
 
                      <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
kallithea/templates/changeset/changeset_range.html
➞
Show inline comments
 
@@ -51,16 +51,16 @@ ${self.repo_context_bar('changelog')}
 
                <div class="cs_files">
 
                    %for cs in c.cs_ranges:
 
                        <h6>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</h6>
 
                        <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
 
                        %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
 
                            <div class="cs_${op} clearfix">
 
                                <div class="node">
 
                                <span class="node">
 
                                    <i class="icon-diff-${op}"></i>
 
                                    ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
 
                                </div>
 
                                </span>
 
                                <div class="changes">${h.fancy_file_stats(stats)}</div>
 
                            </div>
 
                        %endfor
 
                    %endfor
 
                </div>
 
        </div>
kallithea/templates/compare/compare_diff.html
➞
Show inline comments
 
@@ -67,16 +67,16 @@ ${self.repo_context_bar('changelog')}
 
                <div class="cs_files">
 
                  %if not c.file_diff_data:
 
                     <span class="empty_data">${_('No files')}</span>
 
                  %endif
 
                  %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data:
 
                    <div class="cs_${op} clearfix">
 
                      <div class="node">
 
                      <span class="node">
 
                          <i class="icon-diff-${op}"></i>
 
                          ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
 
                      </div>
 
                      </span>
 
                      <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
kallithea/templates/pullrequests/pullrequest_show.html
➞
Show inline comments
 
@@ -304,16 +304,16 @@ ${self.repo_context_bar('showpullrequest
 
              <div class="cs_files">
 
                %if not c.file_diff_data:
 
                   <span class="empty_data">${_('No files')}</span>
 
                %endif
 
                %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data:
 
                    <div class="cs_${op} clearfix">
 
                      <div class="node">
 
                      <span class="node">
 
                          <i class="icon-diff-${op}"></i>
 
                          ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
 
                      </div>
 
                      </span>
 
                      <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
kallithea/tests/functional/test_compare_local.py
➞
Show inline comments
 
@@ -27,54 +27,54 @@ class TestCompareController(TestControll
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">r120:17544fbfcd33</a>''' % HG_REPO)
 

			




	
	
	
		
 
        response.mustcontain('11 files changed with 94 insertions and 64 deletions')

			




	
	
	
		
 

			




	
	
	
		
 
        ## files diff

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>

			




	
	
	
		
 
                      </div>''')

			




	
	
	
		
 
                      </span>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--e3305437df55">test_and_report.sh</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--c8e92ef85cd1">.hgignore</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--6e08b694d687">.hgtags</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--2c14b00f3393">docs/api/index.rst</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                   '''<span class="node">

			




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

			




	
	
	
		
 
                          <a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_tag_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        tag1 = 'v0.1.2'

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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