From 76e18a87471ec487304eb13dc8a5d362585b4f1c Mon Sep 17 00:00:00 2001 From: Paul Martin <paul@paulsputer.com> Date: Mon, 11 Apr 2016 14:59:46 -0400 Subject: [PATCH] Merge pull request #1046 from gitblit/1028-FilterAndPagingForFilestorePage --- src/main/java/com/gitblit/wicket/pages/RepositoryPage.html | 128 +++++++++++++++++++++++------------------- 1 files changed, 71 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..d413242 100644 --- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html @@ -6,77 +6,91 @@ <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 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 style="display:inline-block;vertical-align:top;padding-right:5px;"> + <span wicket:id="repoIcon"></span> + </div> + <div style="display:inline-block;"> + <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> + <div> + <span class="gray" wicket:id="originRepository">[origin repository]</span> + </div> + </div> + </div> + </div> + </div> + + <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> - <!-- 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> - </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> - </div> - <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="repoIconFragment"> + <span class="gray mega-octicon octicon-repo"></span> + </wicket:fragment> + + <wicket:fragment wicket:id="mirrorIconFragment"> + <span class="gray mega-octicon octicon-mirror"></span> + </wicket:fragment> + + <wicket:fragment wicket:id="forkIconFragment"> + <span class="gray mega-octicon octicon-repo-forked"></span> + </wicket:fragment> + + <wicket:fragment wicket:id="cloneIconFragment"> + <span class="gray mega-octicon octicon-repo-push" wicket:message="title:gb.workingCopyWarning"></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