Open Source Projects Europe

--- a/Allura/allura/templates/repo/diff.html
+++ b/Allura/allura/templates/repo/diff.html
@@ -1,26 +1,26 @@
-{% extends 'jinja_master/master.html' %}
+{% extends 'repo/repo_master.html' %}
 {% do g.register_forge_css('css/forge/hilite.css') %}
 
 {% block title %}
-  {{c.project.name}} / {{c.app.config.options.mount_label}} / Diff of {{h.really_unicode(a.filename)}}
+  {{c.project.name}} / {{c.app.config.options.mount_label}} / Diff of {{h.really_unicode(a.path())}}
 {% endblock %}
 
-{% block header %}Diff of {{h.really_unicode(a.filename)}}{% endblock %}
+{% block header %}Diff of
+<a href="{{b.url()}}">{{b.path()}}</a>
+<a href="{{a.url()}}">{{a.commit.shorthand_id()}}</a>
+..
+<a href="{{b.url()}}">{{b.commit.shorthand_id()}}</a>
+{% endblock %}
 
 {% block content %}
-  <a href="{{a._commit.url()}}">{{h.text.truncate(a._commit._id, 10)}}:</a>
-  <a href="{{a.url()}}">{{a.path()}}</a><br/>
-  vs.<br/>
-  <a href="{{b._commit.url()}}">{{h.text.truncate(b._commit._id, 10)}}:</a>
-  <a href="{{b.url()}}">{{b.path()}}</a>
-
+  {{ clone_info(c.app.repo) }}
   {% if (not a.has_html_view and not a.has_image_view) or (not b.has_html_view and not b.has_image_view) %}
     {{a.name}} cannot be displayed in your browser.
     You may, however, <a href="?format=raw">download this file</a> instead.
   {% endif %}
   {% if a.has_html_view and b.has_html_view %}
   <div class="clip">
-    <h3><span class="ico-l"><b class="ui-icon ui-icon-document"></b> {{h.really_unicode(a.filename)}}</span></h3>
+    <h3><span class="ico-l"><b class="ui-icon ui-icon-document"></b> {{h.really_unicode(a.filename) or '&nbsp;'}}</span></h3>
     {{g.highlight(diff, lexer='diff')}}
   </div>
   {% endif %}
@@ -34,4 +34,10 @@
          title="{{h.text.truncate(b._commit._id, 10)}}"/>
   </div>
   {% endif %}
+{% endblock %}
+
+{% block extra_css %}
+  <style type="text/css">
+    .clip h3 {margin-bottom: 0;
+  </style>
 {% endblock %}