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/panels/ProjectRepositoryPanel.html | 48 +++++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html index 9b621d5..88de3b4 100644 --- a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html +++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html @@ -5,15 +5,6 @@ lang="en"> <wicket:panel> - <wicket:fragment wicket:id="repositoryAdminLinks"> - <span class="link"> - <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> - | <a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a> - | <a wicket:id="editRepository"><wicket:message key="gb.edit">[edit]</wicket:message></a> - | <a wicket:id="deleteRepository"><wicket:message key="gb.delete">[delete]</wicket:message></a> - </span> - </wicket:fragment> - <wicket:fragment wicket:id="repositoryOwnerLinks"> <span class="link"> <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> @@ -33,6 +24,22 @@ <p class="originRepository" style="margin-left:20px;" ><wicket:message key="gb.forkedFrom">[forked from]</wicket:message> <span wicket:id="originRepository">[origin repository]</span></p> </wicket:fragment> + <wicket:fragment wicket:id="repoIconFragment"> + <span class="mega-octicon octicon-repo"></span> + </wicket:fragment> + + <wicket:fragment wicket:id="mirrorIconFragment"> + <span class="mega-octicon octicon-mirror"></span> + </wicket:fragment> + + <wicket:fragment wicket:id="forkIconFragment"> + <span class="mega-octicon octicon-repo-forked"></span> + </wicket:fragment> + + <wicket:fragment wicket:id="cloneIconFragment"> + <span class="mega-octicon octicon-repo-push" wicket:message="title:gb.workingCopyWarning"></span> + </wicket:fragment> + <div> <div style="padding-top:15px;padding-bottom:15px;margin-right:15px;"> <div class="pull-right" style="text-align:right;padding-right:15px;"> @@ -42,12 +49,6 @@ <img class="inlineIcon" wicket:id="frozenIcon" /> <img class="inlineIcon" wicket:id="federatedIcon" /> - <a style="text-decoration: none;" wicket:id="tickets" wicket:message="title:gb.tickets"> - <img style="border:0px;vertical-align:middle;" src="bug_16x16.png"></img> - </a> - <a style="text-decoration: none;" wicket:id="docs" wicket:message="title:gb.docs"> - <img style="border:0px;vertical-align:middle;" src="book_16x16.png"></img> - </a> <a 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> @@ -56,12 +57,15 @@ </div> <div class="pageTitle" style="border:0px;"> - <div> - <span class="repositorySwatch" wicket:id="repositorySwatch"></span> - <span class="repository" style="padding-left:3px;color:black;" wicket:id="repositoryName">[repository name]</span> - <img class="inlineIcon" style="vertical-align:baseline" wicket:id="accessRestrictionIcon" /> - </div> - <span wicket:id="originRepository">[origin repository]</span> + <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="repository" style="padding-left:3px;color:black;" wicket:id="repositoryName">[repository name]</span> + </div> + <span wicket:id="originRepository">[origin repository]</span> + </div> </div> <div style="padding-left:20px;"> @@ -71,8 +75,6 @@ <wicket:message key="gb.lastChange">[last change]</wicket:message> <span wicket:id="repositoryLastChange">[last change]</span>, <span style="font-size:0.8em;" wicket:id="repositorySize">[repository size]</span> </div> - - <div class="hidden-phone hidden-tablet" wicket:id="repositoryCloneUrl">[repository clone url]</div> </div> </div> </div> -- Gitblit v1.9.1