From c658df9e87d65b08d5482cf04489cb0532ff83dd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Oct 2012 10:50:35 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit
---
src/com/gitblit/wicket/pages/MetricsPage.html | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/MetricsPage.html b/src/com/gitblit/wicket/pages/MetricsPage.html
index 734b9fa..4aefc79 100644
--- a/src/com/gitblit/wicket/pages/MetricsPage.html
+++ b/src/com/gitblit/wicket/pages/MetricsPage.html
@@ -6,30 +6,39 @@
<body>
<wicket:extend>
- <div style="padding-top:10px;">
- <!-- branch name -->
- <div><span class="metricsTitle" wicket:id="branchTitle"></span></div>
-
- <!-- placeholder for more info -->
- <div style="float:right;width:200px;text-align: left;">
- </div>
-
- <!-- branch stats -->
- <h2><wicket:message key="gb.stats"></wicket:message></h2>
- <span wicket:id="branchStats"></span>
-
- <!-- commit activity trend -->
- <h2><wicket:message key="gb.commitActivityTrend"></wicket:message></h2>
- <div><img wicket:id="commitsChart" /></div>
-
- <!-- commit activity by day of week -->
- <h2><wicket:message key="gb.commitActivityDOW"></wicket:message></h2>
- <div><img wicket:id="dayOfWeekChart" /></div>
-
- <!-- commit activity by primary authors -->
- <h2><wicket:message key="gb.commitActivityAuthors"></wicket:message></h2>
- <div><img wicket:id="authorsChart" /></div>
- </div>
+<div style="padding-top:10px;">
+ <!-- branch name -->
+ <div><span class="metricsTitle" wicket:id="branchTitle"></span></div>
+
+ <table style="width:100%;">
+ <tr>
+ <!-- branch stats -->
+ <td colspan=2>
+ <h2><wicket:message key="gb.stats"></wicket:message></h2>
+ <span wicket:id="branchStats"></span>
+ </td>
+ </tr>
+ <tr>
+ <!-- commit activity trend -->
+ <td>
+ <h2><wicket:message key="gb.commitActivityTrend"></wicket:message></h2>
+ <div><img wicket:id="commitsChart" /></div>
+ </td>
+ <!-- commit activity by day of week -->
+ <td>
+ <h2><wicket:message key="gb.commitActivityDOW"></wicket:message></h2>
+ <div><img wicket:id="dayOfWeekChart" /></div>
+ </td>
+ </tr>
+ <tr>
+ <!-- commit activity by primary authors -->
+ <td colspan=2>
+ <h2><wicket:message key="gb.commitActivityAuthors"></wicket:message></h2>
+ <div style="text-align: center;"><img wicket:id="authorsChart" /></div>
+ </td>
+ </tr>
+ </table>
+</div>
</wicket:extend>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1