Commit Diff

Commit:
f7ee760463c69e0dd834e1c13f93229fe08822b3
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
gotwebd: make commit page more like `got log' / tog - drop the "diff commit1 commit2" header; it's already showed in the body of the diff. - hide the tree id (not that useful to show.) - show the committer if different from the author. - use From/Via for Committer/Author. discussed with jamsek, stsp, tracey ok jamsek tracey
Actions:
Patch | Tree
commit - c115f13dfefb091ce3bfb4f72a9fe2082ca1c4f7
commit + f7ee760463c69e0dd834e1c13f93229fe08822b3
blob - 6a5d354e145ae61a1ae18f8936f735573508bd28
blob + c8f7a859f74578199b84566a25e7a1b31a3717d9
--- gotwebd/files/htdocs/gotwebd/gotweb.css
+++ gotwebd/files/htdocs/gotwebd/gotweb.css
@@ -223,20 +223,6 @@ body {
 	padding-bottom: 2px;
 }
 .header_commit {
-	float: left;
-	width: 72%;
-	padding-top: 2px;
-	padding-bottom: 2px;
-}
-#header_diff_title {
-	clear: left;
-	float: left;
-	width: 6.5em;
-	padding-left: 10px;
-	padding-top: 2px;
-	padding-bottom: 2px;
-}
-#header_diff {
 	float: left;
 	width: 72%;
 	padding-top: 2px;
blob - c484e575fcdffc1d12bf43e72bd267c8b4933e2c
blob + f6d6987c9e6d419dcfc760b4ddba5c5c9fde6c1f
--- gotwebd/pages.tmpl
+++ gotwebd/pages.tmpl
@@ -708,18 +708,14 @@ gotweb_render_age(struct template *tp, time_t time, in
 <div id="diff_content">
   <div id="diff_header_wrapper">
     <div id="diff_header">
-      <div id="header_diff_title">Diff:</div>
-      <div id="header_diff">
-        {{ rc->parent_id }}
-        <br />
-        {{ rc->commit_id }}
-      </div>
       <div class="header_commit_title">Commit:</div>
       <div class="header_commit">{{ rc->commit_id }}</div>
-      <div id="header_tree_title">Tree:</div>
-      <div id="header_tree">{{ rc->tree_id }}</div>
-      <div class="header_author_title">Author:</div>
+      <div class="header_author_title">From:</div>
       <div class="header_author">{{ rc->author }}</div>
+      {{ if strcmp(rc->committer, rc->author) != 0 }}
+        <div class="header_author_title">Via:</div>
+        <div class="header_author">{{ rc->committer }}</div>
+      {{ end }}
       <div class="header_age_title">Date:</div>
       <div class="header_age">
         {{ render gotweb_render_age(tp, rc->committer_time, TM_LONG) }}