From 44f6238fd5fe7675e7de43f4a42d1f7dabcfee4e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 27 Nov 2012 17:01:59 -0500
Subject: [PATCH] Tweak to GCA config, fix send mail prompts, added authority.cmd
---
src/com/gitblit/wicket/panels/LinkPanel.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/LinkPanel.java b/src/com/gitblit/wicket/panels/LinkPanel.java
index 16b8cd4..688a957 100644
--- a/src/com/gitblit/wicket/panels/LinkPanel.java
+++ b/src/com/gitblit/wicket/panels/LinkPanel.java
@@ -26,6 +26,9 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.WicketUtils;
+
public class LinkPanel extends Panel {
private static final long serialVersionUID = 1L;
@@ -34,25 +37,30 @@
public LinkPanel(String wicketId, String linkCssClass, String label,
Class<? extends WebPage> clazz) {
- this(wicketId, linkCssClass, new Model<String>(label), clazz, null, false);
+ this(wicketId, null, linkCssClass, new Model<String>(label), clazz, null, false);
}
public LinkPanel(String wicketId, String linkCssClass, String label,
Class<? extends WebPage> clazz, PageParameters parameters) {
- this(wicketId, linkCssClass, new Model<String>(label), clazz, parameters, false);
+ this(wicketId, null, linkCssClass, new Model<String>(label), clazz, parameters, false);
}
public LinkPanel(String wicketId, String linkCssClass, String label,
Class<? extends WebPage> clazz, PageParameters parameters, boolean newWindow) {
- this(wicketId, linkCssClass, new Model<String>(label), clazz, parameters, newWindow);
+ this(wicketId, null, linkCssClass, new Model<String>(label), clazz, parameters, newWindow);
+ }
+
+ public LinkPanel(String wicketId, String bootstrapIcon, String linkCssClass, String label,
+ Class<? extends WebPage> clazz, PageParameters parameters, boolean newWindow) {
+ this(wicketId, bootstrapIcon, linkCssClass, new Model<String>(label), clazz, parameters, newWindow);
}
public LinkPanel(String wicketId, String linkCssClass, IModel<String> model,
Class<? extends WebPage> clazz, PageParameters parameters) {
- this(wicketId, linkCssClass, model, clazz, parameters, false);
+ this(wicketId, null, linkCssClass, model, clazz, parameters, false);
}
- public LinkPanel(String wicketId, String linkCssClass, IModel<String> model,
+ public LinkPanel(String wicketId, String bootstrapIcon, String linkCssClass, IModel<String> model,
Class<? extends WebPage> clazz, PageParameters parameters, boolean newWindow) {
super(wicketId);
this.labelModel = model;
@@ -68,7 +76,14 @@
if (linkCssClass != null) {
link.add(new SimpleAttributeModifier("class", linkCssClass));
}
- link.add(new Label("label", labelModel));
+ Label icon = new Label("icon");
+ if (StringUtils.isEmpty(bootstrapIcon)) {
+ link.add(icon.setVisible(false));
+ } else {
+ WicketUtils.setCssClass(icon, bootstrapIcon);
+ link.add(icon);
+ }
+ link.add(new Label("label", labelModel).setRenderBodyOnly(true));
add(link);
}
@@ -87,6 +102,7 @@
if (linkCssClass != null) {
link.add(new SimpleAttributeModifier("class", linkCssClass));
}
+ link.add(new Label("icon").setVisible(false));
link.add(new Label("label", labelModel));
add(link);
}
--
Gitblit v1.9.1