Skip to content

Commit add4acb

Browse files
hannesa2hannesa2
authored
Merge pull request laullon#199 from toy/cleanup-commit-header-in-history
Cleanup commit header in history view for elements to stay in place
2 parents 35360da + 39505c6 commit add4acb

File tree

3 files changed

+81
-131
lines changed

3 files changed

+81
-131
lines changed

‎Resources/html/views/history/history.css

+21-56
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,31 @@ a.servicebutton:hover {
4949
border: 2px solid #3465a4;
5050
}
5151

52-
#gravatar {
53-
margin-left: 5px;
54-
padding: 2px;
55-
width: 60px;
56-
height: 60px;
52+
.commit_info {
53+
table-layout: fixed;
54+
width: 100%;
55+
}
5756

58-
border: solid gray 1px;
59-
-webkit-border-radius: 2px;
57+
.commit_info th {
58+
vertical-align: top;
59+
}
60+
61+
.commit_info .date {
62+
font-family: Menlo, Monaco, monospace;
63+
}
64+
65+
#parents span:not(:first-child)::before {
66+
content: ', ';
67+
}
68+
69+
.gravatar {
70+
float: left;
71+
margin-right: 5px;
6072
}
6173

6274
.gravatar img {
63-
width: 2.9em;
64-
height: 2.9em;
65-
max-height: 60px;
66-
max-width: 60px;
75+
height: 30px;
76+
width: 30px;
6777
}
6878

6979
.property_name {
@@ -266,51 +276,6 @@ a {
266276
right: 30px;
267277
}
268278

269-
/*
270-
div.button
271-
{
272-
color: #666666;
273-
274-
font-size: 60%;
275-
text-align: center;
276-
277-
width: 70px;
278-
279-
margin-right: 10px;
280-
281-
padding: 2px;
282-
283-
float: left;
284-
clear: both;
285-
286-
border: 1px solid;
287-
-webkit-border-radius: 3px;
288-
}
289-
290-
div.created
291-
{
292-
background-color: #ccffcc;
293-
border-color: #66ff66;
294-
}
295-
296-
div.changed
297-
{
298-
background-color: #ffcc99;
299-
border-color: #ff9933;
300-
}
301-
302-
div.deleted
303-
{
304-
background-color: #ffcccc;
305-
border-color: #ff6666;
306-
}
307-
308-
div.renamed
309-
{
310-
// No colour needed right now.
311-
}
312-
*/
313-
314279
#notification_message .cancel {
315280
color: red;
316281
}

‎Resources/html/views/history/history.js

+23-28
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ var reload = function() {
139139
var showRefs = function() {
140140
var refs = $("refs");
141141
if (commit.refs) {
142-
refs.parentNode.classList.remove("hidden");
142+
refs.classList.remove("hidden");
143143
refs.textContent = "";
144144
for (var i = 0; i < commit.refs.length; i++) {
145145
var ref = commit.refs[i];
@@ -152,7 +152,7 @@ var showRefs = function() {
152152
refs.appendChild(span);
153153
}
154154
} else
155-
refs.parentNode.classList.add("hidden");
155+
refs.classList.add("hidden");
156156
}
157157

158158
var loadCommit = function(commitObject, currentRef) {
@@ -190,16 +190,22 @@ var loadCommit = function(commitObject, currentRef) {
190190
$("date").textContent = commit.author_date;
191191
setGravatar(commit.author_email, $("author_gravatar"));
192192

193-
if (commit.committer_name != commit.author_name) {
194-
$("committerID").parentNode.classList.remove("hidden");
193+
if (commit.committer_name != commit.author_name || commit.committer_email != commit.author_email) {
194+
$("committerID").parentNode.parentNode.classList.remove("hidden");
195195
setFormattedEmailContent($("committerID"), commit.committer_name, commit.committer_email);
196-
197-
$("committerDate").parentNode.classList.remove("hidden");
198196
$("committerDate").textContent = commit.committer_date;
199197
setGravatar(commit.committer_email, $("committer_gravatar"));
198+
199+
$("commitDate").parentNode.classList.add("hidden");
200+
} else if (commit.committer_date != commit.author_date) {
201+
$("commitDate").parentNode.classList.remove("hidden");
202+
203+
$("commitDate").textContent = commit.committer_date;
204+
205+
$("committerID").parentNode.parentNode.classList.add("hidden");
200206
} else {
201-
$("committerID").parentNode.classList.add("hidden");
202-
$("committerDate").parentNode.classList.add("hidden");
207+
$("committerID").parentNode.parentNode.classList.add("hidden");
208+
$("commitDate").parentNode.classList.add("hidden");
203209
}
204210

205211
var textToHTML = function (txt) {
@@ -222,20 +228,19 @@ var loadCommit = function(commitObject, currentRef) {
222228
while (filelist.hasChildNodes())
223229
filelist.removeChild(filelist.lastChild);
224230
showRefs();
225-
removeParentsFromCommitHeader();
226231

227232
// Scroll to top
228233
scroll(0, 0);
229234

230-
if (!commit.parents)
231-
return;
232-
233-
for (var i = 0; i < commit.parents.length; i++) {
234-
var newRow = $("commit_header").insertRow(-1);
235-
newRow.innerHTML = "<td class='property_name'>Parent:</td><td>" +
236-
"<a class='SHA commit-link' href=''>" +
237-
commit.parents[i].SHA() + "</a></td>";
238-
bindCommitSelectionLinks(newRow);
235+
var parentsNode = $("parents");
236+
parentsNode.innerHTML = '';
237+
if (commit.parents) {
238+
for (var i = 0; i < commit.parents.length; i++) {
239+
var container = document.createElement("span");
240+
container.innerHTML = '<a class="SHA commit-link" href="">' + commit.parents[i].SHA() + "</a>";
241+
parentsNode.appendChild(container);
242+
}
243+
bindCommitSelectionLinks(parentsNode);
239244
}
240245

241246
commit.notificationID = setTimeout(function() {
@@ -246,16 +251,6 @@ var loadCommit = function(commitObject, currentRef) {
246251

247252
}
248253

249-
var removeParentsFromCommitHeader = function() {
250-
for (var i = 0; i < $("commit_header").rows.length; ++i) {
251-
var row = $("commit_header").rows[i];
252-
if (row.innerHTML.match(/Parent:/)) {
253-
row.parentNode.removeChild(row);
254-
--i;
255-
}
256-
}
257-
};
258-
259254
var showMultipleSelectionMessage = function(messageParts) {
260255
jQuery("#commit").hide();
261256
jParagraphs = jQuery.map(messageParts, function(message) {

‎Resources/html/views/history/index.html

+37-47
Original file line numberDiff line numberDiff line change
@@ -24,60 +24,50 @@
2424
</div>
2525
</div>
2626

27-
<table>
27+
<table class="commit_info">
2828
<tr>
29-
<td width="50%">
30-
<table>
31-
<tr>
32-
<td class="property_name">Subject:</td>
33-
<td id="subjectID"></td>
34-
</tr>
35-
<td colspan="2">
36-
<table id="authorTable">
37-
<tr>
38-
<td class="property_name">Author:</td>
39-
<td class="gravatar hidden" rowspan="2" align="center">
40-
<img id="author_gravatar" src=""></img>
41-
</td>
42-
<td id="authorID"></td>
43-
</tr>
44-
<tr>
45-
<td class="property_name">Date:</td>
46-
<td id="date"></td>
47-
</tr>
48-
<tr class="hidden">
49-
<td class="property_name">Committer:</td>
50-
<td class="gravatar hidden" rowspan="2" align="center">
51-
<img id="committer_gravatar" src=""></img>
52-
</td>
53-
<td id="committerID"></td>
54-
</tr>
55-
<tr class="hidden">
56-
<td class="property_name">Date:</td>
57-
<td id="committerDate"></td>
58-
</tr>
59-
</table>
60-
</td>
61-
</table>
29+
<th class="property_name">Subject</th>
30+
<td id="subjectID"></td>
31+
</tr>
32+
<tr>
33+
<th class="property_name">ID</th>
34+
<td>
35+
<span id="commitID" class="SHA"></span>
36+
<span id="refs"></span>
37+
</td>
38+
</tr>
39+
<tr>
40+
<th class="property_name">Parents</th>
41+
<td id="parents"></td>
42+
</tr>
43+
<tr>
44+
<th class="property_name">Author</th>
45+
<td>
46+
<div class="gravatar hidden">
47+
<img id="author_gravatar" src="" />
48+
</div>
49+
<div id="authorID"></div>
50+
<div id="date" class="date"></div>
51+
<div class="hidden">
52+
<span id="commitDate" class="date"></span>
53+
(Commit date)
54+
</div>
6255
</td>
63-
<td width="50%">
64-
<table id="commit_header">
65-
<tr></tr>
66-
<tr>
67-
<td class="property_name">SHA:</td>
68-
<td id="commitID" class="SHA"></td>
69-
</tr>
70-
<tr class="hidden">
71-
<td class="property_name">Refs:</td>
72-
<td id="refs"></td>
73-
</tr>
74-
</table>
56+
</tr>
57+
<tr class="hidden">
58+
<th class="property_name">Committer</th>
59+
<td>
60+
<div class="gravatar hidden">
61+
<img id="committer_gravatar" src="" />
62+
</div>
63+
<div id="committerID"></div>
64+
<div id="committerDate" class="date"></div>
7565
</td>
7666
</tr>
7767
</table>
7868

7969
<div id="notification" class="hidden">
80-
<img src="../../images/spinner.gif" alt="Spinner" id="spinner"></img>
70+
<img src="../../images/spinner.gif" alt="Spinner" id="spinner" />
8171
<div id="notification_message"></div>
8272
</div>
8373

0 commit comments

Comments
 (0)