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/RepositoryPage.html | 105 ++++++++++++++++++++++++---------------------------- 1 files changed, 48 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html index d49f018..22544bc 100644 --- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html @@ -6,77 +6,68 @@ <body> <wicket:extend> - <!-- page nav links --> - <div class="navbar navbar-fixed-top"> - <div class="navbar-inner"> + <div class="repositorynavbar"> + <div class="repositorynavbar-inner"> <div class="container"> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </a> - <a class="brand" wicket:id="rootLink"> - <img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/> - </a> - - <div class="nav-collapse" wicket:id="navPanel"></div> - - <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> - - <form class="hidden-phone hidden-tablet pull-right" style="margin-top:10px;" wicket:id="searchForm"> - <span class="search"> - <select class="small" wicket:id="searchType"/> - <input type="text" id="searchBox" wicket:id="searchBox" value=""/> - </span> - </form> - </div> - </div> - </div> - - <!-- page content --> - <div class="container"> - <div style="text-align:center;" wicket:id="feedback">[Feedback Panel]</div> - - <!-- page header --> - <div class="pageTitle"> - <div class="row"> - <div class="controls"> - <span wicket:id="workingCopyIndicator"></span> - <span class="hidden-phone hidden-tablet" wicket:id="forksProhibitedIndicator"></span> - <div class="hidden-phone btn-group pull-right"> - <!-- future spot for other repo buttons --> - <a class="btn btn-info" wicket:id="myForkLink"><img style="border:0px;vertical-align:middle;" src="fork_16x16.png"></img> <wicket:message key="gb.myFork"></wicket:message></a> - <a class="btn btn-info" wicket:id="forkLink"><img style="border:0px;vertical-align:middle;" src="fork_16x16.png"></img> <wicket:message key="gb.fork"></wicket:message></a> + + <div class="title"> + <div class="row"> + <!-- search form --> + <div class="hidden-phone pull-right"> + <form class="form-search" style="margin: 0px;" wicket:id="searchForm"> + <div class="input-append"> + <select class="span2" style="border-radius: 4px;" wicket:id="searchType"/> + <input type="text" class="input-medium search-query" style="border-radius: 14px 0 0 14px; padding-left: 14px;" id="searchBox" wicket:id="searchBox" value=""/> + <button class="btn" style="border-radius: 0 14px 14px 0px;margin-left:-5px;" type="submit"><i class="icon-search"></i></button> + </div> + </form> + </div> + + <div class="span7"> + <div> + <span class="project" wicket:id="projectTitle">[project title]</span>/<span class="repository" wicket:id="repositoryName">[repository name]</span> + <a class="hidden-phone hidden-tablet" style="text-decoration: none;" wicket:id="syndication" wicket:message="title:gb.feed"> + <img style="border:0px;vertical-align:baseline;" src="feed_16x16.png"></img> + </a> + </div> + <span wicket:id="originRepository">[origin repository]</span> + </div> </div> </div> - <div class="span7"> - <div><span class="project" wicket:id="projectTitle">[project title]</span>/<img wicket:id="repositoryIcon" style="padding-left: 10px;"></img><span class="repository" wicket:id="repositoryName">[repository name]</span> <span class="hidden-phone"><span wicket:id="pageName">[page name]</span></span></div> - <span wicket:id="originRepository">[origin repository]</span> + + <div> + <div class="hidden-phone btn-group pull-right" style="margin-top:5px;"> + <!-- future spot for other repo buttons --> + <a class="btn" wicket:id="newTicketLink"></a> + <a class="btn" wicket:id="starLink"></a> + <a class="btn" wicket:id="unstarLink"></a> + <a class="btn" wicket:id="myForkLink"><img style="border:0px;vertical-align:middle;" src="fork-black_16x16.png"></img> <wicket:message key="gb.myFork"></wicket:message></a> + <a class="btn" wicket:id="forkLink"><img style="border:0px;vertical-align:middle;" src="fork-black_16x16.png"></img> <wicket:message key="gb.fork"></wicket:message></a> + <a class="btn" wicket:id="editLink"><i class="icon-cog"></i> <wicket:message key="gb.edit"></wicket:message></a> + </div> + + <div wicket:id="repositoryNavPanel"></div> </div> </div> </div> - + </div> + + <div class="container"> <wicket:child /> </div> + + <wicket:fragment wicket:id="toolbarLinkFragment"> + <i wicket:id="icon" style="padding-right:3px;"></i><span wicket:id="label"></span> + </wicket:fragment> <wicket:fragment wicket:id="originFragment"> <p class="originRepository"><wicket:message key="gb.forkedFrom">[forked from]</wicket:message> <span wicket:id="originRepository">[origin repository]</span></p> </wicket:fragment> - - <wicket:fragment wicket:id="workingCopyFragment"> - <div class="pull-right" style="padding-top:0px;margin-bottom:0px;padding-left:5px"> - <span class="alert alert-info" style="padding: 6px 14px 6px 14px;vertical-align: middle;"><i class="icon-exclamation-sign"></i> <span class="hidden-phone" wicket:id="workingCopy" style="font-weight:bold;">[working copy]</span></span> - </div> - </wicket:fragment> - <wicket:fragment wicket:id="forksProhibitedFragment"> - <div class="pull-right" style="padding-top:0px;margin-bottom:0px;padding-left:5px"> - <span class="alert alert-error" style="padding: 6px 14px 6px 14px;vertical-align: middle;"><i class="icon-ban-circle"></i> <span class="hidden-phone" wicket:id="forksProhibited" style="font-weight:bold;">[forks prohibited]</span></span> - </div> + <wicket:fragment wicket:id="mirrorFragment"> + <p class="originRepository"><span wicket:id="originRepository">[origin repository]</span></p> </wicket:fragment> - + </wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1