diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java index cb9cb43fec..61ef38eac4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java @@ -139,30 +139,73 @@ public class HelpController renderQuickInfo(null); } + /** + * Make tooltip content for a field + * @param field + */ public void renderToolTip(GridField field) - { - StringBuilder sb = new StringBuilder(); - sb.append("\n\n
\n"); + { + String hdr = null; + String desc = null; + String help = null; + String otherContent = null; if (field != null) { - String hdr = field.getHeader(); + hdr = field.getHeader(); if (hdr != null && hdr.length() > 0) - { - sb.append("" + hdr + ""); - + { if (field.getDescription().length() != 0) - sb.append("

\n" + field.getDescription() + ""); + desc = field.getDescription(); if (field.getHelp().length() != 0) - sb.append("

\n" + field.getHelp()); + help = field.getHelp(); } } else { - sb.append("(" + Msg.getMsg(Env.getCtx(), "PlaceCursorIntoField") + ")"); + otherContent = Msg.getMsg(Env.getCtx(), "PlaceCursorIntoField"); } + renderToolTip(hdr, desc, help, otherContent); + } + + /** + * Make tooltip content, when hdr == null, show otherContent + * @param hdr + * @param desc + * @param help + * @param otherContent + */ + public void renderToolTip(String hdr, String desc, String help, String otherContent) + { + StringBuilder sb = new StringBuilder(); + sb.append("\n\n
\n"); + + if (hdr == null || hdr.trim().length() == 0){ + if (otherContent != null){ + sb.append("("); + sb.append (otherContent); + sb.append (")"); + } + }else{ + sb.append(""); + sb.append(hdr); + sb.append(""); + + if (desc != null && desc.trim().length() > 0){ + sb.append("

\n"); + sb.append(desc); + sb.append(""); + } + + if (help != null && help.trim().length() > 0){ + sb.append("

\n"); + sb.append(help); + } + + } + sb.append("
\n\n"); htmlToolTip.setContent(sb.toString()); }