midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BF [2874805] - html of help is not valid 

https://sourceforge.net/tracker/?func=detail&atid=879332&aid=2874805&group_id=176962
This commit is contained in:
trifonnt 2009-10-09 14:55:09 +00:00
parent 6f46c586bd
commit a3298fba8c
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
base/src/org/compiere/model/GridWindow.java
View File

@ -420,8 +420,8 @@ public class GridWindow implements Serializable
if (getHelp().length() != 0) if (getHelp().length() != 0)
center.addElement(new p().addElement(getHelp())); center.addElement(new p().addElement(getHelp()));
center.addElement(new a().setName("Tabs").addElement(new h3("Tabs").addAttribute("ALIGN", "left"))); center.addElement(new a().setName("Tabs")).addElement(new h3("Tabs").addAttribute("ALIGN", "left"));
// Links to Tabs // List of all Tabs in current window
int size = getTabCount(); int size = getTabCount();
p p = new p(); p p = new p();
for (int i = 0; i < size; i++) for (int i = 0; i < size; i++)
@ -429,7 +429,6 @@ public class GridWindow implements Serializable
GridTab tab = getTab(i); GridTab tab = getTab(i);
if (i > 0) if (i > 0)
p.addElement(" | "); p.addElement(" | ");
//p.addElement(" - ");
p.addElement(new a("#Tab"+i).addElement(tab.getName())); p.addElement(new a("#Tab"+i).addElement(tab.getName()));
} }
center.addElement(p) center.addElement(p)
@ -444,10 +443,10 @@ public class GridWindow implements Serializable
table tabHeader = new table(); table tabHeader = new table();
tabHeader.setBorder("0").setCellPadding(0).setCellSpacing(0); tabHeader.setBorder("0").setCellPadding(0).setCellSpacing(0);
tabHeader.addElement(new tr() tabHeader.addElement(new tr()
.addElement(new td().addElement(new a().setName("Tab" + i) .addElement(new td().addElement(new a().setName("Tab" + i))
.addElement(new h2(Msg.getMsg(Env.getCtx(), "Tab") + ": " + tab.getName())))) .addElement(new h2(Msg.getMsg(Env.getCtx(), "Tab") + ": " + tab.getName())))
.addElement(new td().addElement(WebDoc.NBSP).addElement(WebDoc.NBSP)) .addElement(new td().addElement(WebDoc.NBSP).addElement(WebDoc.NBSP)
.addElement(new a("#Tabs").addElement("..").addAttribute("title", "Up one level"))); .addElement(new a("#Tabs").addElement("..").addAttribute("title", "Up one level"))));
tr tr = new tr() tr tr = new tr()
.addElement(new th() .addElement(new th()
.addElement(tabHeader)); .addElement(tabHeader));
@ -459,13 +458,14 @@ public class GridWindow implements Serializable
tr.addElement(new th() tr.addElement(new th()
.addElement(WebDoc.NBSP)); .addElement(WebDoc.NBSP));
table.addElement(tr); table.addElement(tr);
// Desciption // Description
td td = new td().setColSpan(2); td td = new td().setColSpan(2);
if (tab.getHelp().length() != 0) if (tab.getHelp().length() != 0)
td.addElement(new p().addElement(tab.getHelp())); td.addElement(new p().addElement(tab.getHelp()));
// Links to Fields // Links to Fields
td.addElement(new a().setName("Fields"+i));
td.addElement(new h4("Fields").addAttribute("ALIGN", "left"));
p = new p(); p = new p();
p.addElement(new a().setName("Fields"+i).addElement(new h4("Fields").addAttribute("ALIGN", "left")));
if (!tab.isLoadComplete()) if (!tab.isLoadComplete())
this.initTab(i); this.initTab(i);
for (int j = 0; j < tab.getFieldCount(); j++) for (int j = 0; j < tab.getFieldCount(); j++)
@ -480,7 +480,6 @@ public class GridWindow implements Serializable
{ {
if (j > 0) if (j > 0)
p.addElement(" | "); p.addElement(" | ");
//p.addElement(" - ");
p.addElement(new a("#Field" + i + j, hdr)); p.addElement(new a("#Field" + i + j, hdr));
} }
} }
@ -501,10 +500,10 @@ public class GridWindow implements Serializable
table fieldHeader = new table(); table fieldHeader = new table();
fieldHeader.setBorder("0").setCellPadding(0).setCellSpacing(0); fieldHeader.setBorder("0").setCellPadding(0).setCellSpacing(0);
fieldHeader.addElement(new tr() fieldHeader.addElement(new tr()
.addElement(new td().addElement(new a().setName("Field" + i + j) .addElement(new td().addElement(new a().setName("Field" + i + j))
.addElement(new h3(Msg.getMsg(Env.getCtx(), "Field") + ": " + hdr))) .addElement(new h3(Msg.getMsg(Env.getCtx(), "Field") + ": " + hdr)))
.addElement(new td().addElement(WebDoc.NBSP).addElement(WebDoc.NBSP)) .addElement(new td().addElement(WebDoc.NBSP).addElement(WebDoc.NBSP)
.addElement(new strong().addElement(new a("#Fields"+i).addElement("..").addAttribute("title", "Up one level"))))); .addElement(new strong().addElement(new a("#Fields"+i).addElement("..").addAttribute("title", "Up one level")))));
td = new td().setColSpan(2).addElement(fieldHeader); td = new td().setColSpan(2).addElement(fieldHeader);
@ -523,7 +522,7 @@ public class GridWindow implements Serializable
if (!javaClient) if (!javaClient)
doc.addPopupClose(Env.getCtx()); doc.addPopupClose(Env.getCtx());
// System.out.println(doc.toString()); //System.out.println(doc.toString());
return doc; return doc;
} // getHelpDoc } // getHelpDoc

9
base/src/org/compiere/util/WebDoc.java
View File

@ -179,16 +179,15 @@ public class WebDoc
m_topLeft = new td(); m_topLeft = new td();
if (title == null) if (title == null)
m_topLeft.addElement(NBSP); m_topLeft.addElement(NBSP);
//else else
//m_topLeft.addElement(new h1(title)); m_topLeft.addElement(new h1(title));
m_topRow.addElement(m_topLeft); m_topRow.addElement(m_topLeft);
// Logo // Logo
m_topRight = new td().setAlign("right"); m_topRight = new td().setAlign("right");
if (javaClient) { if (javaClient) {
m_topRight.addElement( m_topRight.addElement(new img("res:org/compiere/images/AD10030.png")
new img("res:org/compiere/images/AD10030.png") .setAlign(AlignType.RIGHT).setAlt("ADempiere"));
.setAlign(AlignType.RIGHT).setAlt("Adempiere"));
} else { } else {
if (title.equals("")) { if (title.equals("")) {
m_topRight.addElement(WebEnv.getLogo()); m_topRight.addElement(WebEnv.getLogo());