From cebf455f3fd54b72e530942f308097ec54b408cd Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 07 Apr 2011 09:46:30 -0400 Subject: [PATCH] Let Wicket manage resources and use markup inheritance. --- src/com/gitblit/wicket/pages/SummaryPage.html | 122 ++++++++++++++++++++-------------------- 1 files changed, 62 insertions(+), 60 deletions(-) diff --git a/src/com/gitblit/wicket/pages/SummaryPage.html b/src/com/gitblit/wicket/pages/SummaryPage.html index 3eab0a1..ccfb6ae 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.html +++ b/src/com/gitblit/wicket/pages/SummaryPage.html @@ -1,76 +1,78 @@ <?xml version="1.0" encoding="UTF-8"?> <html xmlns="http://www.w3.org/1999/xhtml" > <body> - <!-- page header --> - <div wicket:id="pageHeader"></div> - +<wicket:extend> + <!-- page nav links --> - <div wicket:id="pageLinks"></div> + <div wicket:id="pageLinks">[page links]</div> - <!-- repository info --> - <div class="title"> </div> - <table class="projects_list"> - <tr id="metadata_desc"><td>description</td><td><span wicket:id="repositoryDescription">Message goes here</span></td></tr> - <tr id="metadata_owner"><td>owner</td><td><span wicket:id="repositoryOwner">Message goes here</span></td></tr> - <tr id="metadata_lchange"><td>last change</td><td><span wicket:id="repositoryLastChange">Message goes here</span></td></tr> - <tr class="metadata_url"><td>URL</td><td><span wicket:id="repositoryCloneUrl">Message goes here</span></td></tr> - </table> - - - <!-- shortlog --> - <div class="header" wicket:id="shortlog"></div> + <div> + <!-- Repository Activity Chart --> + <div style="width:400px;float:right;"> + <img class="activityGraph" wicket:id="commitsChart" /> + </div> - <table class="project_list"> + <!-- Repository info --> + <div style="margin-right:410px;"> + <table class="plain"> + <tr><th>description</th><td><span wicket:id="repositoryDescription">[repository description]</span></td></tr> + <tr><th>owner</th><td><span wicket:id="repositoryOwner">[repository owner]</span></td></tr> + <tr><th>last change</th><td><span wicket:id="repositoryLastChange">[repository last change]</span></td></tr> + <tr><th>URL</th><td><span wicket:id="repositoryCloneUrl">[repository clone url]</span></td></tr> + </table> + </div> + </div> + + <!-- shortlog --> + <div class="header" wicket:id="shortlog">[shortlog header]</div> + <table style="width:100%" class="pretty"> <tbody> <tr wicket:id="commit"> - <td><span wicket:id="commitDate"></span></td> - <td><i><span wicket:id="commitAuthor"></span></i></td> - <td><div wicket:id="commitShortMessage"></div></td> - <td><div wicket:id="commitRefs"></div></td> - <td><span wicket:id="commitLinks"></span></td> + <td class="date"><span wicket:id="commitDate">[commit date]</span></td> + <td class="author"><span wicket:id="commitAuthor">[commit author]</span></td> + <td><div wicket:id="commitShortMessage">[commit short message]</div></td> + <td class="rightAlign"><div wicket:id="commitRefs">[commit refs]</div></td> + <td class="rightAlign"><span wicket:id="commitLinks">[commit links]</span></td> </tr> - - <tr> - <td colspan="4"><div wicket:id="shortlogMore"></div></td> - </tr> </tbody> </table> + <div class="pager" wicket:id="shortlogMore">[more shortlogs]</div> + <!-- Open Branches Body --> + <div style="width:400px; float:left;"> + <!-- heads --> + <div class="header" wicket:id="branches">[branches header]</div> + <table style="width:100%" class="pretty"> + <tbody> + <tr wicket:id="branch"> + <td class="date"><span wicket:id="branchDate">[branch date]</span></td> + <td><div wicket:id="branchName">[branch name]</div></td> + <td class="rightAlign"><span wicket:id="branchLinks">[branch links]</span></td> + </tr> + </tbody> + </table> + <div class="pager" wicket:id="allBranches">[all branches]</div> + <!-- Close Branches Body --> + </div> - <!-- tags --> - <div class="header" wicket:id="tags"></div> + <!-- Open Tags body --> + <div style="margin-left:405px;"> + <!-- tags --> + <div class="header" wicket:id="tags">[tags header]</div> + <table style="width:100%" class="pretty"> + <tbody> + <tr wicket:id="tag"> + <td class="date"><span wicket:id="tagDate">[tag date]</span></td> + <td><b><div wicket:id="tagName">[tag name]</div></b></td> + <td><div wicket:id="tagDescription">[tag description]</div></td> + <td class="rightAlign"><span wicket:id="tagLinks">[tag links]</span></td> + </tr> + </tbody> + </table> + <div class="pager" wicket:id="allTags">[all tags]</div> + <!-- Close Tags Body --> + </div> - <table class="project_list"> - <tbody> - <tr wicket:id="tag"> - <td><i><span wicket:id="tagDate"></span></i></td> - <td><div wicket:id="tagName"></div></td> - <td><div wicket:id="tagDescription"></div></td> - <td><span wicket:id="tagLinks"></span></td> - </tr> - - <tr> - <td colspan="4"><div wicket:id="tagsMore"></div></td> - </tr> - </tbody> - </table> - - - <!-- heads --> - <div class="header" wicket:id="heads"></div> - - <table class="heads"> - <tbody> - <tr wicket:id="head"> - <td><i><span wicket:id="headDate"></span></i></td> - <td><div wicket:id="headName"></div></td> - <td><span wicket:id="headLinks"></span></td> - </tr> - </tbody> - </table> - - - <!-- footer --> - <div wicket:id="pageFooter"></div> +</wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1