kallithea Changeset - 596393436724

Changeset - 596393436724

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-09-06 00:51:18
madski@unity3d.com

diff: fix display of links to before / after files - it was not obvious what the hashes / file names did

Show a "missing" symbol instead of the hash.

2 files changed with 47 insertions and 28 deletions:

kallithea/public/css/style.css

kallithea/templates/changeset/diff_block.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2676,15 +2676,24 @@ table.code-browser .browser-file { @@
     box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
     margin-top: 5px;
     margin-left: 1px;
+}
 .diffblock .diff-actions {
     padding: 2px 0px 0px 2px;
     float: left;
+}
 .diffblock .diff-actions span.no-file,
 .diffblock .diff-actions span.arrow {
     opacity: 0.5;
+}
 .diffblock .diff-actions span.arrow {
     margin: 0 -3px;
+}
 .diffblock .diff-actions a i {
     margin: 0 2px;
+}
 .diffblock.twoway {
     overflow: visible;
+}
 .diffblock.twoway .diff-actions {
     padding-top: 0;
+}

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -21,45 +21,55 @@ @@
+>
     <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.safe_unicode(cs_filename)} |
                     %if op == 'A':
                       ${_('Added')}
                       <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_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=a_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=cs_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=cs_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=a_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=cs_filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>
                     %else:
                       ${op}???
                     %endif
                     ${h.safe_unicode(cs_filename)}
                 </div>
                 <div class="diff-actions">
                   <span style="margin: 0 10px">
                     %if op == 'A':
                       <span class="no-file tooltip" title="${_("No file before")}">
                         <i class="icon-minus-circled"></i></span>
                     %else:
                       <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" class="tooltip" title="${_("File before")}">
                         <i class="icon-doc"></i></a>
                     %endif
                     %if op == 'A':
                       <span class="arrow tooltip" title="${_("Added")}">&#10142;</span>
                     %elif op == 'M':
                       <span class="arrow tooltip" title="${_("Modified")}">&#10142;</span>
                     %elif op == 'D':
                       <span class="arrow tooltip" title="${_("Deleted")}">&#10142;</span>
                     %elif op == 'R':
                       <span class="arrow tooltip" title="${_("Renamed")}">&#10142;</span>
                     %elif op is None:
                       <span class="arrow tooltip" title="${_("No change")}">&#10142;</span>
                     %else:
                       <span class="arrow tooltip" title="${_("Unknown operation: %r") % op}">&#10142;</span>
                     %endif
                     %if op == 'D':
                       <span class="no-file tooltip" title="${_("No file after")}">
                         <i class="icon-minus-circled"></i></span>
                     %else:
                       <a href="${h.url('files_home', repo_name=cs_repo_name, f_path=cs_filename, revision=cs_rev)}" class="tooltip" title="${_("File after")}">
                         <i class="icon-doc"></i></a>
                     %endif
                   </span>
                   <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_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>
                       <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(cs_filename),diff2=cs_rev,diff1=a_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">
                       <i class="icon-docs"></i>
                   </a>
                       <i class="icon-docs"></i></a>
                   <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='raw')}" class="tooltip" title="${_('Raw diff')}">
                       <i class="icon-diff"></i>
                   </a>
                       <i class="icon-diff"></i></a>
                   <a href="${h.url('files_diff_home',repo_name=cs_repo_name,f_path=h.safe_unicode(cs_filename),diff2=cs_rev,diff1=a_rev,diff='download')}" class="tooltip" title="${_('Download diff')}">
                       <i class="icon-floppy"></i>
                   </a>
                       <i class="icon-floppy"></i></a>
                   ${c.ignorews_url(request.GET, url_fid)}
                   ${c.context_url(request.GET, url_fid)}
                 </div>
                 <span style="float:right;margin-top:-3px">
                     <label>
                         ${_('Show inline comments')}

0 comments (0 inline, 0 general)