From: Travis C. <tc...@us...> - 2008-04-10 22:27:31
|
Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXTabPanel.wo In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1997/ERExtensions/Components/Nonlocalized.lproj/ERXTabPanel.wo Modified Files: Tag: Wonder_2_0_0_Branch ERXTabPanel.html ERXTabPanel.wod Log Message: Merged updates from trunk. Index: ERXTabPanel.html =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXTabPanel.wo/ERXTabPanel.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.6.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.6.1 *** ERXTabPanel.html 5 Feb 2002 20:11:37 -0000 1.1.1.1 --- ERXTabPanel.html 10 Apr 2008 22:26:57 -0000 1.1.1.1.6.1 *************** *** 1,22 **** ! <WEBOBJECT NAME=RenderBorder><WEBOBJECT NAME=Table> ! <tr valign=bottom> ! <td width=1 bgcolor=#ffffff><webObject name=Image2></webObject></td> ! <td align=left valign="top" bgcolor=#ffffff><table width=100% border=0 cellpadding=0 cellspacing=0><tr><webObject name=TabRepetition><webObject name="TabImageContainer"><webObject name=LeftTabImage></webObject></webObject><webObject name=TabContainer><webObject name=SelectedTabConditional><webObject name=TabName></webObject></webObject><webObject name=NotSelectedTabConditional><webObject name=HasSubmitAction><TABLE CELLPADDING=0 CELLSPACING=0 BORDER=0><TR> ! <TD NOWRAP><webObject name=UseLinkForTabSwitch><span style="position:absolute; visibility:hidden;"><WEBOBJECT NAME=TabImageHidden></WEBOBJECT> </span><WEBOBJECT NAME=Hyperlink1><WEBOBJECT NAME=TabName4></WEBOBJECT></WEBOBJECT></webObject><webObject name=DoNotUseLinkForTabSwitch><WEBOBJECT NAME=TabImage></WEBOBJECT> <WEBOBJECT NAME=TabName4></WEBOBJECT></webObject></TD></TR><TR><TD><WEBOBJECT NAME=Image1></WEBOBJECT></TD></TR></TABLE></webObject><webObject name=HasNoSubmitAction><webObject name=TabLink><webObject NAME=TabName3></webObject></webObject></webObject></webObject></webObject><webObject NAME=TabImageContainer2><webObject name=RightTabImage></webObject></webObject></webObject><td valign=bottom width=100% bgcolor=#ffffff><table height=1 width=100% bgcolor=#999999 border=0 cellpadding=0 cellspacing=0><tr><td bgcolor=#999999><webObject name=Image2></webObject></td></tr></table></td> ! </tr></table></td><td bgcolor=#ffffff><table height=1 width=100% bgcolor=#999999 border=0 cellpadding=0 cellspacing=0><tr><td bgcolor=#999999><webObject name=Image2></webObject></td></tr></table></td> ! <td width=1 bgcolor=#ffffff><webObject name=Image2></webObject></td> ! ! </tr> ! <TR> ! <WEBOBJECT NAME=td2> ! <WEBOBJECT NAME=Image3></WEBOBJECT></WEBOBJECT> ! <TD colspan=2><WEBOBJECT NAME=ComponentContent1></WEBOBJECT></TD> ! <WEBOBJECT NAME=td2> ! <WEBOBJECT NAME=Image4></WEBOBJECT></WEBOBJECT> ! </TR> ! <TR> ! <WEBOBJECT NAME=td1><WEBOBJECT NAME=Image2></WEBOBJECT></WEBOBJECT> ! </TR> ! </WEBOBJECT> ! ! </WEBOBJECT><WEBOBJECT NAME=NoBorder><WEBOBJECT NAME=ComponentContent1></WEBOBJECT></WEBOBJECT> --- 1,73 ---- ! <webobject name="RenderBorder"> ! <webobject name="Table"> ! <tr valign="bottom"> ! <td width="1" bgcolor="#ffffff"><webobject name="Image2"></webobject></td> ! <td align="left" valign="top" bgcolor="#ffffff"> ! <table width="100%" border="0" cellpadding="0" cellspacing="0"> ! <tr> ! <webobject name="TabRepetition"> ! <webobject name="TabImageContainer"> ! <webobject name="LeftTabImage"></webobject> ! </webobject> ! <webobject name="TabContainer"> ! <webobject name="SelectedTabConditional"> ! <webobject name="TabName"></webobject> ! </webobject> ! <webobject name="NotSelectedTabConditional"> ! <webobject name="HasSubmitAction"> ! <table cellpadding="0" cellspacing="0" border="0"> ! <tr> ! <td nowrap> ! <webobject name="UseLinkForTabSwitch"> ! <span style="position:absolute; visibility:hidden;"><webobject name="TabImageHidden"></webobject> </span><webobject name="Hyperlink1"><webobject name="TabName4"></webobject></webobject></webobject> ! <webobject name="DoNotUseLinkForTabSwitch"> ! <webobject name="TabImage"></webobject> <webobject name="TabName4"></webobject> ! </webobject> ! </td> ! </tr> ! <tr> ! <td><webobject name="Image1"></webobject></td> ! </tr> ! </table> ! </webobject> ! <webobject name="HasNoSubmitAction"> ! <webobject name="TabLink"><webobject name="TabName3"></webobject></webobject> ! </webobject> ! </webobject> ! </webobject> ! <webobject name="TabImageContainer2"> ! <webobject name="RightTabImage"></webobject> ! </webobject> ! </webobject> ! <td valign="bottom" width="100%" bgcolor="#ffffff"> ! <table height="1" width="100%" bgcolor="#999999" border="0" cellpadding="0" cellspacing="0"> ! <tr> ! <td bgcolor="#999999"><webobject name="Image2"></webobject></td> ! </tr> ! </table> ! </td> ! </tr> ! </table> ! </td> ! <td bgcolor="#ffffff"> ! <table height="1" width="100%" bgcolor="#999999" border="0" cellpadding="0" cellspacing="0"> ! <tr> ! <td bgcolor="#999999"><webobject name="Image2"></webobject></td> ! </tr> ! </table> ! </td> ! <td width="1" bgcolor="#ffffff"><webobject name="Image2"></webobject></td> ! </tr> ! <tr> ! <webobject name="td2"><webobject name="Image3"></webobject></webobject> ! <td colspan="2"><webobject name="ComponentContent1"></webobject></td> ! <webobject name="td2"><webobject name="Image4"></webobject></webobject> ! </tr> ! <tr> ! <webobject name="td1"><webobject name="Image2"></webobject></webobject> ! </tr> ! </webobject> ! </webobject> ! <webobject name="NoBorder"> ! <webobject name="ComponentContent1"></webobject> ! </webobject> Index: ERXTabPanel.wod =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXTabPanel.wo/ERXTabPanel.wod,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** ERXTabPanel.wod 4 Aug 2002 08:33:23 -0000 1.3 --- ERXTabPanel.wod 10 Apr 2008 22:26:57 -0000 1.3.6.1 *************** *** 12,23 **** DoNotUseLinkForTabSwitch: WOConditional { ! condition=useLinkForTabSwitch; ! negate=true; } GenericContainer1: WOGenericContainer { ! bgcolor=bgcolor; ! colspan = contentColSpan; ! elementName = "TD"; } --- 12,23 ---- DoNotUseLinkForTabSwitch: WOConditional { ! condition = useLinkForTabSwitch; ! negate = true; } GenericContainer1: WOGenericContainer { ! bgcolor = bgcolor; ! colspan = contentColSpan; ! elementName = "td"; } *************** *** 32,41 **** Hyperlink1: WOHyperlink { ! //WOElementName="a"; class = cellTabClass; ! // "javascript:document.EditForm.submit();"; ! elementName = "A"; ! onClick = submitString; ! action = switchSubmitTab; } --- 32,41 ---- Hyperlink1: WOHyperlink { ! //WOElementName="a"; class = cellTabClass; ! // "javascript:document.EditForm.submit();"; ! elementName = "a"; ! onclick = submitString; ! action = switchSubmitTab; } *************** *** 71,78 **** Image6: WOImage { ! height = 8; framework = "ERExtensions"; filename = "s.gif"; ! width = 1; } --- 71,78 ---- Image6: WOImage { ! height = 8; framework = "ERExtensions"; filename = "s.gif"; ! width = 1; } *************** *** 96,101 **** NoBorder: WOConditional { ! condition=true; // renderBorder; ! negate=true; } --- 96,101 ---- NoBorder: WOConditional { ! condition = true; // renderBorder; ! negate = true; } *************** *** 105,114 **** RenderBorder: WOConditional { ! condition=true; // renderBorder; } RenderTop: WOConditional { ! condition=^doNotRenderTop; ! negate=true; } --- 105,114 ---- RenderBorder: WOConditional { ! condition = true; // renderBorder; } RenderTop: WOConditional { ! condition = ^doNotRenderTop; ! negate = true; } *************** *** 144,149 **** elementName = "td"; valign = "top"; ! otherTagString="NOWRAP"; ! class = cellTabClass; } --- 144,149 ---- elementName = "td"; valign = "top"; ! otherTagString="nowrap"; ! class = cellTabClass; } *************** *** 162,167 **** ! TabImageContainer: WOGenericContainer ! { align = "baseline"; bgcolor = tabBgColor; --- 162,166 ---- ! TabImageContainer: WOGenericContainer { align = "baseline"; bgcolor = tabBgColor; *************** *** 173,177 **** align = "baseline"; bgcolor = tabBgColor; ! elementName = "TD"; valign = "top"; } --- 172,176 ---- align = "baseline"; bgcolor = tabBgColor; ! elementName = "td"; valign = "top"; } *************** *** 218,239 **** elementName = "TABLE"; width = ^width; ! bgcolor=^bgcolor; } UseLinkForTabSwitch: WOConditional { ! condition=useLinkForTabSwitch; } td1: WOGenericContainer { ! elementName="TD"; ! colspan=4; ! bgcolor=^borderColor; ! height=1; } td2: WOGenericContainer { ! elementName="TD"; ! rowspan=6; ! bgcolor=^borderColor; ! width=1; } --- 217,238 ---- elementName = "TABLE"; width = ^width; ! bgcolor=^bgcolor; } UseLinkForTabSwitch: WOConditional { ! condition = useLinkForTabSwitch; } td1: WOGenericContainer { ! elementName = "td"; ! colspan = 4; ! bgcolor = ^borderColor; ! height = 1; } td2: WOGenericContainer { ! elementName = "td"; ! rowspan = 6; ! bgcolor = ^borderColor; ! width = 1; } |