Merge branch 'ticket/129' into develop

James Moger

2014-09-30 f685ea581f94373a63bcdc94ec417fdf92a95d68

 src/main/java/com/gitblit/wicket/pages/ActivityPage.html

@@ -9,6 +9,11 @@
   <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 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>

@@ -18,8 +23,7 @@
      </tr>

      </table>

   </div>

   <div wicket:id="activityPanel" style="padding-top:5px;" >[activity panel]</div>

   </div>

</wicket:fragment>	
</wicket:extend>

</body>

</html>