Mercurial > kallithea

changeset 5650:76b9630e1e92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: align diff layout; give changeset diffs links and give PR diffs more action icons I'm not sure this is better but it uses existing parts consistently.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 05 Jan 2016 16:56:39 +0100
parents 7db8e58cee2f
children e97ed5aff9ad
files kallithea/templates/changeset/diff_block.html
diffstat 1 files changed, 31 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/changeset/diff_block.html	Sun Nov 29 16:43:42 2015 +0100
+++ b/kallithea/templates/changeset/diff_block.html	Tue Jan 05 16:56:39 2016 +0100
@@ -12,14 +12,34 @@
     <%
     url_fid = h.FID(cs_rev, filename)
     a_repo_name = cs_repo_name = c.repo_name
+    a_ref_type, a_ref_name = 'rev', a_rev
+    cs_ref_type, cs_ref_name = 'rev', cs_rev
     %>
     <div id="${id_fid}_target" style="clear:both;margin-top:25px"></div>
     <div id="${id_fid}" class="diffblock margined comm">
         <div class="code-header">
             <div class="changeset_header">
                 <div class="changeset_file">
-                    ${h.link_to_if(op!='D',h.safe_unicode(filename),h.url('files_home',repo_name=cs_repo_name,
-                    revision=cs_rev,f_path=h.safe_unicode(filename)))}
+                    ${h.safe_unicode(filename)} |
+                    ## TODO: link to ancestor and head of other instead of exactly other
+                    %if op == 'A':
+                      ${_('Added')}
+                      <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>
+                    %elif op == 'M':
+                      <a class="spantag" href="${h.url('files_home', repo_name=a_repo_name, f_path=filename, revision=a_rev)}">${h.short_ref(a_ref_type, a_ref_name)}</a>
+                      <i class="icon-right"></i>
+                      <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>
+                    %elif op == 'D':
+                      ${_('Deleted')}
+                      <a class="spantag" href="${h.url('files_home', repo_name=a_repo_name, f_path=filename, revision=a_rev)}">${h.short_ref(a_ref_type, a_ref_name)}</a>
+                    %elif op == 'R':
+                      ${_('Renamed')}
+                      <a class="spantag" href="${h.url('files_home', repo_name=a_repo_name, f_path=filename, revision=a_rev)}">${h.short_ref(a_ref_type, a_ref_name)}</a>
+                      <i class="icon-right"></i>
+                      <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>
+                    %else:
+                      ${op}???
+                    %endif
                 </div>
                 <div class="diff-actions">
                   <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full diff for this file')}">
@@ -111,9 +131,18 @@
                     %endif
                 </div>
                 <div class="diff-actions">
+                  <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full diff for this file')}">
+                      <i class="icon-file-code"></i>
+                  </a>
                   <a href="${h.url('files_diff_2way_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff1=a_rev,diff2=cs_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">
                       <i class="icon-docs"></i>
                   </a>
+                  <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='raw')}" class="tooltip" title="${_('Raw diff')}">
+                      <i class="icon-diff"></i>
+                  </a>
+                  <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(filename),diff2=cs_rev,diff1=a_rev,diff='download')}" class="tooltip" title="${_('Download diff')}">
+                      <i class="icon-floppy"></i>
+                  </a>
                   ${c.ignorews_url(request.GET, url_fid)}
                   ${c.context_url(request.GET, url_fid)}
                 </div>