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 | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
index ec5b4a4..a537277 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
@@ -8,19 +8,26 @@
<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>
- <span class="repositoryUrl">
+ <div class="repositoryUrl">
<span wicket:id="primaryUrl">[repository primary url]</span>
<span class="hidden-phone hidden-tablet" wicket:id="copyFunction"></span>
- </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>
@@ -88,8 +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