From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001 From: Gerard Smyth <gerard.smyth@gmail.com> Date: Thu, 08 May 2014 13:09:30 -0400 Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored. --- src/main/java/com/gitblit/wicket/pages/ProjectPage.html | 87 ++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ProjectPage.html b/src/main/java/com/gitblit/wicket/pages/ProjectPage.html index 3e73ba5..d19496b 100644 --- a/src/main/java/com/gitblit/wicket/pages/ProjectPage.html +++ b/src/main/java/com/gitblit/wicket/pages/ProjectPage.html @@ -6,65 +6,52 @@ <body> <wicket:extend> - - - <div class="row"> - <div class="span12"> - <h2><span wicket:id="projectTitle"></span> <small><span wicket:id="projectDescription"></span></small> - <a class="hidden-phone hidden-tablet brand" style="text-decoration: none;" wicket:id="syndication" wicket:message="title:gb.feed"> - <img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img> - </a> - </h2> - <div class="markdown" wicket:id="projectMessage">[project message]</div> - </div> - </div> - - <div class="tabbable"> - <!-- tab titles --> - <ul class="nav nav-tabs"> - <li class="active"><a href="#repositories" data-toggle="tab"><wicket:message key="gb.repositories"></wicket:message></a></li> - <li ><a href="#activity" data-toggle="tab"><wicket:message key="gb.activity"></wicket:message></a></li> - </ul> - - <!-- tab content --> - <div class="tab-content"> - - <!-- repositories tab --> - <div class="tab-pane active" id="repositories"> - <!-- markdown --> - <div class="row"> - <div class="span12"> - <div class="markdown" wicket:id="repositoriesMessage">[repositories message]</div> + <div class="container"> + <div class="row"> + <div class="span12"> + <div class="dashboardTitle"> + <span wicket:id="projectTitle"></span> + <small class="hidden-phone"><span wicket:id="projectDescription"></span></small> + + <a + class="hidden-phone hidden-tablet brand" + style="text-decoration: none;" wicket:id="syndication" + wicket:message="title:gb.feed"> <img + style="border: 0px; vertical-align: middle;" src="feed_16x16.png"></img> + </a> </div> </div> - <div class="row"> - <div class="span6" style="border-bottom:1px solid #eee;" wicket:id="repositoryList"> - <span wicket:id="repository"></span> - </div> - </div> </div> - <!-- activity tab --> - <div class="tab-pane" id="activity"> - <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="row"> + <div class="span7"> + <div class="hidden-phone hidden-tablet markdown" style="padding-bottom: 30px;" wicket:id="projectMessage">[project message]</div> + <div ng-non-bindable wicket:id="activity">[activity panel]</div> </div> - - <div class="hidden-phone" style="height: 155px;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> - </tr> - </table> + <div class="span5"> + <div class="hidden-phone hidden-tablet markdown" wicket:id="repositoriesMessage">[repositories message]</div> + <div wicket:id="repositoryList">[repository list]</div> </div> - - <div wicket:id="activityPanel">[activity panel]</div> </div> - </div> + +<wicket:fragment wicket:id="activityFragment"> + <div class="dashboardTitle"><span class="hidden-phone hidden-tablet" wicket:id="feedTitle"></span> <small><span wicket:id="feedheader"></span></small></div> + <div class="hidden-phone hidden-tablet" style="text-align:center;"> + <div wicket:id="charts"></div> </div> + <div wicket:id="digests"></div> +</wicket:fragment> + +<wicket:fragment wicket:id="chartsFragment"> + <table> + <tr> + <td><div id="chartRepositories" style="display:inline-block;width: 175px; height:175px"></div></td> + <td><div id="chartAuthors" style="display:inline-block;width: 175px; height: 175px;"></div></td> + </tr> + </table> +</wicket:fragment> + </wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1