From b5c7332f5976cc19ab681ed4b82501a62c6a2f61 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Tue, 30 Jun 2015 08:48:35 -0400
Subject: [PATCH] Merge pull request #277 from mrjoel/mrjoel-serverNPEfix
---
src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html | 90 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
index d7c76f1..a537277 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
@@ -5,8 +5,79 @@
lang="en">
<wicket:panel>
- <span wicket:id="repositoryUrl" style="color: blue;">[repository url]</span><span class="hidden-phone hidden-tablet" wicket:id="copyFunction"></span>
-
+
+ <div wicket:id="repositoryUrlPanel"></div>
+ <div wicket:id="applicationMenusPanel"></div>
+ <div wicket:id="repositoryIndicators"></div>
+
+ <wicket:fragment wicket:id="repositoryUrlFragment">
+ <div class="btn-toolbar" style="margin: 0px;">
+ <div class="btn-group repositoryUrlContainer">
+ <img style="vertical-align: middle;padding: 0px 0px 1px 3px;" wicket:id="accessRestrictionIcon"></img>
+ <span wicket:id="menu"></span>
+ <div class="repositoryUrl">
+ <span wicket:id="primaryUrl">[repository primary url]</span>
+ <span class="hidden-phone hidden-tablet" wicket:id="copyFunction"></span>
+ </div>
+ <span class="hidden-phone hidden-tablet repositoryUrlRightCap" wicket:id="primaryUrlPermission">[repository primary url permission]</span>
+ </div>
+ </div>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="indicatorsFragment">
+ <div>
+ <div wicket:id="workingCopyIndicator"></div>
+ <div wicket:id="forksProhibitedIndicator"></div>
+ </div>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="applicationMenusFragment">
+ <div class="btn-toolbar" style="margin: 4px 0px 0px 0px;">
+ <div class="btn-group" wicket:id="appMenus">
+ <span wicket:id="appMenu"></span>
+ </div>
+ </div>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="appMenuFragment">
+ <a class="btn btn-mini btn-appmenu" data-toggle="dropdown" href="#">
+ <span wicket:id="applicationName"></span>
+ <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu applicationMenu">
+ <li>
+ <div class="applicationHeaderMenuItem">
+ <div style="float:right">
+ <img style="padding-right: 5px;vertical-align: middle;" wicket:id="applicationIcon"></img>
+ </div>
+ <span class="applicationTitle" wicket:id="applicationTitle"></span>
+ </div>
+ </li>
+ <li><div class="applicationHeaderMenuItem"><span wicket:id="applicationDescription"></span></div></li>
+ <li><div class="applicationLegalMenuItem"><span wicket:id="applicationLegal"></span></div></li>
+
+ <li class="divider" style="margin: 5px 1px 0px 1px;clear:both;" ></li>
+
+ <li class="action" wicket:id="actionItems">
+ <span wicket:id="actionItem"></span>
+ </li>
+ </ul>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="urlProtocolMenuFragment">
+ <a class="" data-toggle="dropdown" href="#">
+ <span class="repositoryUrlLeftCap" wicket:id="menuText">URLs</span>
+ <span class="caret" style="vertical-align: middle;"></span>
+ </a>
+ <ul class="dropdown-menu urlMenu">
+ <li class="url" wicket:id="repoUrls"><span wicket:id="repoUrl"></span></li>
+ </ul>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="actionFragment">
+ <span wicket:id="permission" style="margin: 0px 10px 0px 5px;"></span><span wicket:id="content"></span><span class="hidden-phone hidden-tablet" wicket:id="copyFunction"></span>
+ </wicket:fragment>
+
<!-- Plain JavaScript manual copy & paste -->
<wicket:fragment wicket:id="jsPanel">
<span style="vertical-align:baseline;">
@@ -24,7 +95,20 @@
quality="high"
wmode="transparent"
scale="noscale"
- allowScriptAccess="always"></object>
+ allowScriptAccess="sameDomain"></object>
</wicket:fragment>
+
+ <wicket:fragment wicket:id="workingCopyFragment">
+ <div class="repositoryIndicator">
+ <span class="alert alert-info"><i class="icon-exclamation-sign"></i> <span class="hidden-phone" wicket:id="workingCopy">[working copy]</span></span>
+ </div>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="forksProhibitedFragment">
+ <div class="repositoryIndicator">
+ <span class="alert alert-error"><i class="icon-ban-circle"></i> <span class="hidden-phone" wicket:id="forksProhibited">[forks prohibited]</span></span>
+ </div>
+ </wicket:fragment>
+
</wicket:panel>
</html>
\ No newline at end of file
--
Gitblit v1.9.1