From d0751dc352ef06c067593f31f5423fce357f8f1f Mon Sep 17 00:00:00 2001 From: Ting <kxyfyh@vip.qq.com> Date: Wed, 16 Apr 2014 00:06:56 -0400 Subject: [PATCH] Fix skip summary metrics regression since introducing flotr2 --- src/main/java/com/gitblit/wicket/pages/SummaryPage.html | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/SummaryPage.html b/src/main/java/com/gitblit/wicket/pages/SummaryPage.html index c9bce40..2d1b6a5 100644 --- a/src/main/java/com/gitblit/wicket/pages/SummaryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.html @@ -9,32 +9,26 @@ <div style="clear:both;"> <!-- Repository Activity Chart --> <div class="hidden-phone" style="float:right;"> - <img class="activityGraph" wicket:id="commitsChart" /> + <div style="width:290px; height:120px;" id="commitsChart"></div> </div> <!-- Repository info --> - <div class="hidden-phone" style="padding-bottom: 10px;"> - <table class="plain"> + <div class="hidden-phone"> + <table class="summary"> <tr><th><wicket:message key="gb.description">[description]</wicket:message></th><td><span wicket:id="repositoryDescription">[repository description]</span></td></tr> <tr><th><wicket:message key="gb.owners">[owner]</wicket:message></th><td><span wicket:id="repositoryOwners"><span wicket:id="owner"></span><span wicket:id="comma"></span></span></td></tr> <tr><th><wicket:message key="gb.lastChange">[last change]</wicket:message></th><td><span wicket:id="repositoryLastChange">[repository last change]</span></td></tr> + <tr><th><wicket:message key="gb.size">[size]</wicket:message></th><td><span wicket:id="repositorySize">[repository size]</span></td></tr> <tr><th><wicket:message key="gb.stats">[stats]</wicket:message></th><td><span wicket:id="branchStats">[branch stats]</span> <span class="link"><a wicket:id="metrics"><wicket:message key="gb.metrics">[metrics]</wicket:message></a></span></td></tr> - <tr><th style="vertical-align:top;padding-top:4px;"><wicket:message key="gb.repositoryUrl">[URL]</wicket:message> <img style="vertical-align: top;padding-left:3px;" wicket:id="accessRestrictionIcon" /></th> - <td style="padding-top:4px;"> - <div wicket:id="repositoryPrimaryUrl">[repository primary url]</div> - <div wicket:id="repositoryGitDaemonUrl">[repository git daemon url]</div> - <div wicket:id="otherUrls" > - <div wicket:id="otherUrl" style="padding-top:10px"></div> - </div> - <div wicket:id="repositorySparkleShareInviteUrl">[repository sparkleshare invite url]</div> - </td> + <tr class="hidden-tablet"><th style="vertical-align:top;padding-top:4px;"><wicket:message key="gb.repositoryUrl">[URL]</wicket:message></th> + <td><div wicket:id="repositoryUrlPanel">[repository url panel]</div></td> </tr> </table> </div> </div> <!-- commits --> - <div style="padding-bottom:15px;" wicket:id="commitsPanel">[commits panel]</div> + <div style="padding-bottom:15px;padding-top:5px;" wicket:id="commitsPanel">[commits panel]</div> <!-- tags --> <div style="padding-bottom:15px;" wicket:id="tagsPanel">[tags panel]</div> @@ -54,10 +48,20 @@ <div wicket:id="readmeContent" class="markdown"></div> </div> </wicket:fragment> - + + <wicket:fragment wicket:id="plaintextPanel"> + <div class="header" style="margin-top:0px;" > + <i style="vertical-align: middle;" class="icon-book"></i> + <span style="font-weight:bold;vertical-align:middle;" wicket:id="readmeFile"></span> + </div> + <div style="border:1px solid #ddd;border-radius: 0 0 3px 3px;padding: 15px 20px;"> + <div wicket:id="readmeContent"></div> + </div> + </wicket:fragment> <wicket:fragment wicket:id="ownersFragment"> </wicket:fragment> + </wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1