From 4b7b406a6db1c02e6fe899f3fb8e65406f4acffe Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 25 Mar 2012 20:15:45 -0400
Subject: [PATCH] Improved commit message/ref panel layout
---
src/com/gitblit/wicket/panels/LogPanel.html | 2 +-
src/com/gitblit/wicket/panels/SearchPanel.html | 2 +-
src/com/gitblit/wicket/panels/HistoryPanel.html | 2 +-
resources/gitblit.css | 13 +++++++++++++
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/resources/gitblit.css b/resources/gitblit.css
index 7812ec4..9b96a1a 100644
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -16,6 +16,9 @@
ul, ol {
margin-bottom: 10px !important;
}
+a:focus {
+ outline: none;
+}
hr {
margin-top: 10px;
@@ -657,6 +660,16 @@
border-left: 0;
}
+table.pretty td.message {
+ padding: 0px;
+}
+
+table.pretty table.nestedTable {
+ width: 100%;
+ margin-left: 4px !important;
+ margin-bottom: 0px !important;
+}
+
table.comments td {
padding: 4px;
line-height: 17px;
diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.html b/src/com/gitblit/wicket/panels/HistoryPanel.html
index 9589d14..3ae8a8f 100644
--- a/src/com/gitblit/wicket/panels/HistoryPanel.html
+++ b/src/com/gitblit/wicket/panels/HistoryPanel.html
@@ -19,7 +19,7 @@
<td class="date"><span wicket:id="commitDate">[commit date]</span></td>
<td class="icon"><img wicket:id="commitIcon" /></td>
<td class="author"><span wicket:id="commitAuthor">[commit author]</span></td>
- <td><div class="references" wicket:id="commitRefs">[commit refs]</div><span wicket:id="commitShortMessage">[commit short message]</span></td>
+ <td class="message"><table class="nestedTable"><tr><td><span style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</span></td><td><div style="text-align:right;" wicket:id="commitRefs">[commit refs]</div></td></tr></table></td>
<td class="rightAlign">
<span wicket:id="historyLinks">[history links]</span>
</td>
diff --git a/src/com/gitblit/wicket/panels/LogPanel.html b/src/com/gitblit/wicket/panels/LogPanel.html
index 9617306..7036fa4 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.html
+++ b/src/com/gitblit/wicket/panels/LogPanel.html
@@ -15,7 +15,7 @@
<td class="date"><span wicket:id="commitDate">[commit date]</span></td>
<td class="author"><span wicket:id="commitAuthor">[commit author]</span></td>
<td class="icon"><img wicket:id="commitIcon" /></td>
- <td><div class="references" wicket:id="commitRefs">[commit refs]</div><div style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</div></td>
+ <td class="message"><table class="nestedTable"><tr><td><span style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</span></td><td><div style="text-align:right;" wicket:id="commitRefs">[commit refs]</div></td></tr></table></td>
<td class="rightAlign">
<span class="link">
<a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a>
diff --git a/src/com/gitblit/wicket/panels/SearchPanel.html b/src/com/gitblit/wicket/panels/SearchPanel.html
index bfbcb6b..50f4638 100644
--- a/src/com/gitblit/wicket/panels/SearchPanel.html
+++ b/src/com/gitblit/wicket/panels/SearchPanel.html
@@ -18,7 +18,7 @@
<td class="date"><span wicket:id="commitDate">[commit date]</span></td>
<td class="author"><span wicket:id="commitAuthor">[commit author]</span></td>
<td class="icon"><img wicket:id="commitIcon" /></td>
- <td><div class="references" wicket:id="commitRefs">[commit refs]</div><span wicket:id="commitShortMessage">[commit short message]</span></td>
+ <td class="message"><table class="nestedTable"><tr><td><span style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</span></td><td><div style="text-align:right;" wicket:id="commitRefs">[commit refs]</div></td></tr></table></td>
<td class="rightAlign">
<span class="link">
<a wicket:id="commit"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a>
--
Gitblit v1.9.1