kallithea Changeset - dbf7341d10b1

Changeset - dbf7341d10b1

Parent rev.

Child rev.

[Not reviewed]

default

3 7 0

Sean Farley - 11 years ago 2014-11-15 20:21:48
sean.michael.farley@gmail.com

file_status: replace with icon-{modified,added,removed}

10 files changed with 65 insertions and 22 deletions:

kallithea/public/css/contextbar.css

kallithea/public/css/style.css

kallithea/public/images/icons/page_white_add.png

bin+del

kallithea/public/images/icons/page_white_delete.png

bin+del

kallithea/public/images/icons/page_white_edit.png

bin+del

kallithea/templates/changeset/changeset.html

kallithea/templates/changeset/changeset_range.html

kallithea/templates/compare/compare_diff.html

kallithea/templates/pullrequests/pullrequest_show.html

kallithea/tests/functional/test_compare_local.py

0 comments (0 inline, 0 general)

kallithea/public/css/contextbar.css

➞

Show inline comments

@@ @@ -21,12 +21,34 @@ i[class^='icon-'] { @@
     min-height: 16px;
     margin: -2px 0 -4px 0;
     /* background-color: red; /* for debugging */
 }
 /* css classes for diff file status ... it'd be nice if css had a way to
    inherit from another class but alas, we must make sure this content is the
    same from the icon font file */
 .icon-diff-M:before {
     font-family: 'kallithea';
     content: '\e805';
     color: #d0b44c;
+}
 .icon-diff-D:before {
     font-family: 'kallithea';
     content: '\e807';
     color: #bd2c00;
+}
 .icon-diff-A:before {
     font-family: 'kallithea';
     content: '\e806';
     color: #6cc644;
+}
 #content #context-bar {
     position: relative;
     overflow: visible;
     background-color: #577632;
     padding: 0 5px;
     min-height: 36px;

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2448,36 +2448,27 @@ BIN_FILENODE = 6 @@
 .cs_files .changes .bin.bin5 {
     background-color: #6D99FF;
+}
 .cs_files .cs_added,
 .cs_files .cs_A {
     background: url("../images/icons/page_white_add.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_changed,
 .cs_files .cs_M {
     background: url("../images/icons/page_white_edit.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_removed,
 .cs_files .cs_D {
     background: url("../images/icons/page_white_delete.png") no-repeat
         scroll 3px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .table {
     position: relative;

kallithea/public/images/icons/page_white_add.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/public/images/icons/page_white_delete.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/public/images/icons/page_white_edit.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -139,12 +139,13 @@ ${self.repo_context_bar('changelog', c.c @@
             %endif
             </div>
             <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">
                             <i class="icon-diff-${change}"></i>
                             <a href="#${FID}">${h.safe_unicode(path)}</a>
                         </div>
                     <div class="changes">${h.fancy_file_stats(stats)}</div>
                   </div>
               %endfor
               % if c.limited_diff:

kallithea/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -60,12 +60,13 @@ ${self.repo_context_bar('changelog')} @@
             <div class="cs_files">
                 %for cs in c.cs_ranges:
                     <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.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}">
                             <div class="node">
                                 <i class="icon-diff-${change}"></i>
                                 ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}
                             </div>
                             <div class="changes">${h.fancy_file_stats(stats)}</div>
                         </div>
                     %endfor
                 %endfor

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -66,13 +66,16 @@ ${self.repo_context_bar('changelog')} @@
                 <div class="cs_files">
                   %if not c.files:
                      <span class="empty_data">${_('No files')}</span>
                   %endif
                   %for fid, change, f, stat in c.files:
                       <div class="cs_${change}">
                         <div class="node">${h.link_to(h.safe_unicode(f), '#' + fid)}</div>
                          <div class="node">
                              <i class="icon-diff-${change}"></i>
                              ${h.link_to(h.safe_unicode(f), '#' + fid)}
                          </div>
                         <div class="changes">${h.fancy_file_stats(stat)}</div>
                       </div>
                   %endfor
                 </div>
                 % 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')}</a></h5>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -277,13 +277,16 @@ ${self.repo_context_bar('showpullrequest @@
               <div class="cs_files">
                 %if not c.files:
                    <span class="empty_data">${_('No files')}</span>
                 %endif
                 %for fid, change, f, stat in c.files:
                     <div class="cs_${change}">
                       <div class="node">${h.link_to(h.safe_unicode(f),'#' + fid)}</div>
                       <div class="node">
                           <i class="icon-diff-${change}"></i>
                           ${h.link_to(h.safe_unicode(f),'#' + fid)}
                       </div>
                       <div class="changes">${h.fancy_file_stats(stat)}</div>
                     </div>
                 %endfor
               </div>
               <div class="comments-number pr-comments-number">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt} <span class="firstlink"></span> </div>
               % if c.limited_diff:

kallithea/tests/functional/test_compare_local.py

➞

Show inline comments

@@ @@ -26,23 +26,45 @@ class TestCompareController(TestControll @@
         response.mustcontain('''<a href="/%s/changeset/36e0fc9d2808c5022a24f49d6658330383ed8666">r119:36e0fc9d2808</a>''' % HG_REPO)
         response.mustcontain('''<a 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"><a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--e3305437df55">test_and_report.sh</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--c8e92ef85cd1">.hgignore</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--6e08b694d687">.hgtags</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--2c14b00f3393">docs/api/index.rst</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--430ccbc82bdf">vcs/__init__.py</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--9c390eb52cd6">vcs/backends/hg.py</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--ebb592c595c0">vcs/utils/__init__.py</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--7abc741b5052">vcs/utils/annotate.py</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a></div>''')
         response.mustcontain('''<div class="node"><a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a></div>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-A"></i>
                              <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-A"></i>
                              <a href="#C--e3305437df55">test_and_report.sh</a>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-M"></i>
                              <a href="#C--c8e92ef85cd1">.hgignore</a>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-M"></i>
                              <a href="#C--6e08b694d687">.hgtags</a>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-M"></i>
                              <a href="#C--2c14b00f3393">docs/api/index.rst</a>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-M"></i>
                              <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-M"></i>
                              <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-M"></i>
                              <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-M"></i>
                              <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''')
         response.mustcontain('''<div class="node">
                              <i class="icon-diff-M"></i>
                              <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''')
         response.mustcontain('''<div 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'
         tag2 = 'v0.1.3'
         response = self.app.get(url('compare_url',

0 comments (0 inline, 0 general)