From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0

---
 src/main/java/com/gitblit/wicket/panels/TextOption.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/panels/TextOption.java b/src/main/java/com/gitblit/wicket/panels/TextOption.java
index dcd465f..22370f3 100644
--- a/src/main/java/com/gitblit/wicket/panels/TextOption.java
+++ b/src/main/java/com/gitblit/wicket/panels/TextOption.java
@@ -43,7 +43,7 @@
 	public TextOption(String wicketId, String title, String description, String css, IModel<String> model) {
 		super(wicketId);
 		add(new Label("name", title));
-		add(new Label("description", description));
+		add(new Label("description", description).setVisible(!StringUtils.isEmpty(description)));
 		TextField<String> tf = new TextField<String>("text", model);
 		if (!StringUtils.isEmpty(css)) {
 			WicketUtils.setCssClass(tf, css);

--
Gitblit v1.9.1