From b635f482e4b1a8ce4d39990f532a15d0ec0f0be2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 07 Mar 2014 15:15:52 -0500
Subject: [PATCH] Fix NPE in bugtraq processor
---
src/main/java/com/gitblit/wicket/pages/ActivityPage.html | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/ActivityPage.html b/src/main/java/com/gitblit/wicket/pages/ActivityPage.html
index 4b10c2c..4c76b39 100644
--- a/src/main/java/com/gitblit/wicket/pages/ActivityPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.html
@@ -5,19 +5,25 @@
lang="en">
<body>
<wicket:extend>
- <div class="pageTitle">
- <h2><wicket:message key="gb.recentActivity"></wicket:message><small> <span class="hidden-phone">/ <span wicket:id="subheader">[days back]</span></span></small></h2>
+ <div class="container">
+ <div class="dashboardTitle">
+ <wicket:message key="gb.recentActivity"></wicket:message> <small><span class="hidden-phone"><span wicket:id="subheader">[days back]</span></span></small>
</div>
- <div class="hidden-phone" style="height: 155px;text-align: center;">
+ <div wicket:id="chartsPanel"></div>
+ <div wicket:id="activityPanel" style="padding-top:5px;" >[activity panel]</div>
+ </div>
+
+<wicket:fragment wicket:id="chartsFragment">
+ <div class="hidden-phone" style="text-align: center;">
<table>
<tr>
- <td><span class="hidden-tablet" id="chartDaily"></span></td>
- <td><span id="chartRepositories"></span></td>
- <td><span id="chartAuthors"></span></td>
+ <td><div style="width:310px; height:150px" class="hidden-tablet" id="chartDaily"></div></td>
+ <td><div style="width:310px; height:175px" id="chartRepositories"></div></td>
+ <td><div style="width:310px; height:175px" id="chartAuthors"></div></td>
</tr>
</table>
</div>
- <div wicket:id="activityPanel" style="padding-top:5px;" >[activity panel]</div>
+</wicket:fragment>
</wicket:extend>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1