From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001 From: Paul Martin <paul@paulsputer.com> Date: Sat, 30 Apr 2016 04:19:14 -0400 Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates --- src/main/java/com/gitblit/wicket/pages/RepositoryPage.html | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html index 1af9127..d413242 100644 --- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html @@ -17,20 +17,27 @@ <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="search-query" style="width: 170px;border-radius: 14px 0 0 14px; padding-left: 14px;" id="searchBox" wicket:id="searchBox" value=""/> + <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 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> - <span wicket:id="originRepository">[origin repository]</span> </div> </div> </div> @@ -38,6 +45,7 @@ <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> @@ -59,9 +67,29 @@ <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="mirrorFragment"> + <p class="originRepository"><span wicket:id="originRepository">[origin repository]</span></p> + </wicket:fragment> </wicket:extend> </body> -- Gitblit v1.9.1