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/TicketPage.html | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html index 6fcf96c..aa52d8f 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketPage.html +++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html @@ -298,11 +298,28 @@ </wicket:fragment> +<!-- CAN NOT PROPOSE FRAGMENT --> +<wicket:fragment wicket:id="canNotProposeFragment"> + <div class="featureWelcome"> + <div class="row"> + <div class="icon span2 hidden-phone"><i class="fa fa-ban"></i></div> + <div class="span9"> + <h1><wicket:message key="gb.canNotProposePatchset"></wicket:message></h1> + <div class="markdown"> + <p><span wicket:id="reason"></span></p> + </div> + </div> + </div> + </div> +</wicket:fragment> + + <!-- PATCHSET FRAGMENT --> <wicket:fragment wicket:id="patchsetFragment"> - <div class="row" style="padding: 0px 0px 20px;"> + <div class="row" style="padding: 0px;"> <div class="span12 attribution-border"> - <div wicket:id="panel"></div> + <div wicket:id="mergePanel" style="margin-bottom: 10px;"></div> + <div wicket:id="panel"></div> </div> </div> @@ -335,9 +352,8 @@ <!-- COLLAPSIBLE PATCHSET (temp) --> <wicket:fragment wicket:id="collapsiblePatchsetFragment"> -<div wicket:id="mergePanel" style="margin-bottom: 10px;"></div> <div class="accordion" id="accordionPatchset" style="clear:both;margin: 0px;"> -<div class="patch-group"> +<div class="patch-group" style="margin-bottom: 20px;"> <div class="accordion-heading"> <div class="attribution-patch-pullright"> <div style="padding-bottom: 2px;"> -- Gitblit v1.9.1