From 381cd5df2956c0b3b757e6d8e16f268a7c4babd1 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 14 Sep 2012 08:07:39 -0400 Subject: [PATCH] Merge pull request #36 from Mrbytes/master --- src/com/gitblit/wicket/pages/SummaryPage.html | 96 ++++++++++++++++-------------------------------- 1 files changed, 32 insertions(+), 64 deletions(-) diff --git a/src/com/gitblit/wicket/pages/SummaryPage.html b/src/com/gitblit/wicket/pages/SummaryPage.html index be00143..45ffddf 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.html +++ b/src/com/gitblit/wicket/pages/SummaryPage.html @@ -1,82 +1,50 @@ -<?xml version="1.0" encoding="UTF-8"?> -<html xmlns="http://www.w3.org/1999/xhtml" > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd" + xml:lang="en" + lang="en"> <body> - <!-- page header --> - <div wicket:id="pageHeader"></div> +<wicket:extend> - <!-- page nav links --> - <div wicket:id="pageLinks"></div> - - <div> + <div style="clear:both;"> <!-- Repository Activity Chart --> - <div style="width:50%;float:right;"> - <img style="padding-top:8px;" wicket:id="commitsChart" /> + <div class="hidden-phone" style="float:right;"> + <img class="activityGraph" wicket:id="commitsChart" /> </div> <!-- Repository info --> - <div style="width:50%;"> + <div class="hidden-phone" style="padding-bottom: 10px;"> <table class="plain"> - <tr><th>description</th><td><span wicket:id="repositoryDescription">Message goes here</span></td></tr> - <tr><th>owner</th><td><span wicket:id="repositoryOwner">Message goes here</span></td></tr> - <tr><th>last change</th><td><span wicket:id="repositoryLastChange">Message goes here</span></td></tr> - <tr><th>URL</th><td><span wicket:id="repositoryCloneUrl">Message goes here</span></td></tr> + <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.owner">[owner]</wicket:message></th><td><span wicket:id="repositoryOwner">[repository owner]</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.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;"><wicket:message key="gb.repositoryUrl">[URL]</wicket:message> <img style="vertical-align: top;padding-left:3px;" wicket:id="accessRestrictionIcon" /></th><td><span wicket:id="repositoryCloneUrl">[repository clone url]</span><div wicket:id="otherUrls"></div></td></tr> </table> </div> </div> - <!-- shortlog --> - <div class="header" wicket:id="shortlog"></div> - <table style="width:100%" class="pretty"> - <tbody> - <tr wicket:id="commit"> - <td class="date"><span wicket:id="commitDate"></span></td> - <td class="author"><span wicket:id="commitAuthor"></span></td> - <td><div wicket:id="commitShortMessage"></div></td> - <td><div wicket:id="commitRefs"></div></td> - <td><span wicket:id="commitLinks"></span></td> - </tr> - </tbody> - </table> - <div class="pager" wicket:id="shortlogMore"></div> + <!-- commits --> + <div style="padding-bottom:15px;" wicket:id="commitsPanel">[commits panel]</div> - <!-- Open additional graphs body --> - <div style="width:25%;float:right;"> - </div> - - <!-- Open Tags and Heads body --> - <div style="width:65%"> - <!-- tags --> - <div class="header" wicket:id="tags"></div> - <table style="width:100%" class="pretty"> - <tbody> - <tr wicket:id="tag"> - <td class="date"><span wicket:id="tagDate"></span></td> - <td><b><div wicket:id="tagName"></div></b></td> - <td><div wicket:id="tagDescription"></div></td> - <td><span wicket:id="tagLinks"></span></td> - </tr> - </tbody> - </table> - <div class="pager" wicket:id="tagsMore"></div> + <div style="padding-bottom:15px;" wicket:id="tagsPanel">[tags panel]</div> - - <!-- heads --> - <div class="header" wicket:id="heads"></div> - <table style="width:100%" class="pretty"> - <tbody> - <tr wicket:id="head"> - <td class="date"><span wicket:id="headDate"></span></td> - <td><div wicket:id="headName"></div></td> - <td><span wicket:id="headLinks"></span></td> - </tr> - </tbody> - </table> + <!-- branches --> + <div style="padding-bottom:15px;" wicket:id="branchesPanel">[branches panel]</div> - <!-- Close Tags and Heads Body --> - </div> + <!-- markdown readme --> + <div wicket:id="readme"></div> - <!-- footer --> - <div style="clear:both;" wicket:id="pageFooter"></div> + <wicket:fragment wicket:id="markdownPanel"> + <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: 20px;"> + <div wicket:id="readmeContent" class="markdown"></div> + </div> + </wicket:fragment> +</wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1