Author: dolander
Date: Tue Aug 3 15:48:42 2004
New Revision: 35649
Added:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
- copied, changed from rev 35608,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
Removed:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13789/Page1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13797/Page1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13803/Page1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13881/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14259/ErrorPage.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14683/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14754/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14764/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14781/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14787/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14826/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15095/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15174/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15175/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15392/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15430/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15454/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15574/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15590/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15964/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b16092/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b17287/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b17461/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18025/begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18067/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18068/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b22957/begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b30458/begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33322/begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33704/begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33807/begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b35084/done.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b35084b/done.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b37913/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38183/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38184/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39434/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39820/sample.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39820/sampleResult.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40031/results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40596/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40862/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40999/page2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b41391/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b42486/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b42558/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/cr121496/results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/checkboxDemo/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/controlTests/callingPageFlow/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/controlTests/getData/begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/errors/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/errorsinline/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/nullbinding/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatnumber/errors/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatnumber/nullbinding/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatstring/nullbinding/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/anybean/updateAnyBean.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basic/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/declarebundle/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callMethod/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callMethod/variousMethods.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callPageFlow/simpleTest.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callPageFlow/sumTest.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/overloading/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/returnNull/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/cellRepeater/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/cellrepeatererror/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/util/sortFilterPage.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/expressions/simple.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/globalApp/nojpf/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/message/message.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/dataStructures/repeaterBody.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/nested/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/pad/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/simple/defaultText.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/simple/ignoreNulls.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/simplerepeater/simpleRepeater.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/typeConverter/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/demo/DemoResults.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/directFormTest/formTest.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/cellRepeaterError/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/radioButtonError/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/repeaterErrors/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/repeaterPadError/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/except/ErrorPage.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test1/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test1/Jsp3.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test2/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formTest/formTest.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsAllScript/Results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsAllScriptHtml/Results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsFind/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsNoContainers/Results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsScriptScopeId/Results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test49/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test50/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test51/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test59/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/actionChaining/result.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/anchorFormPosting/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/anchorPosting/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/appState/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/attrBinding/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/beginForm/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/binding/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/breakoutNesting/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/breakoutNesting/other/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/buttonSubmit/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/cellRepeater/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/exceptHier/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/globalForwards/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/globalForwards/Page1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/lifecycleExceptions/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/linkNav/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multiForms/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multipartRequest/output.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multipleForms/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestedFormReturn/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nesting/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestingRepeater/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestingScope/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overloadedActions/page1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/padRepeater/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageScope/scopeOne/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageScope/scopeTwo/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/readonlyAction/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/returnToPage/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/urlBinding/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrc/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jsp3.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug27848/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug40862/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/listenTo/listenToB/handled.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/listenTo/listenToB/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anyBeanOverload/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anybean/nestingResult.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anybean/result.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/error.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/lifecycle/history.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/lots.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input1_single.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input2_single.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/inputSessionScope.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/inputSessionScope_single.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/a/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/b/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToAction/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp3.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/sub1/SubJsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp3.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test14/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test16/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test17/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test21/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test24/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test24/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test25/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test25/template.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/include1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/include2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test29/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp11.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp12.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp13.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp7.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test4/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test5/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test6/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test7/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test8/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test8/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp3.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp4.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/resources/jsp/qaTraceResults.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test31/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test32/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test32/sub1/SubJsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test34/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test37/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test47/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test48/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/jpf1/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/jpf2/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/subJpf1/SubJsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/jpf1/Jsp1a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/jpf2/Jsp2a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/subJpf1/SubJsp1a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/jpf1/Jsp1a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/jpf2/Jsp2a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/subJpf1/SubJsp1a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/jpf1/Jsp1a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/jpf2/Jsp2a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/subJpf1/SubJsp1a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/jpf1/Jsp1a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/jpf2/Jsp2a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/subJpf1/SubJsp1a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/singletonJpf/jpfTest6/subJpf1/SubJsp1a.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheck/Results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheck/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheckOptionError/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadio/Results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadio/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadioOptionError/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskey/page2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskeyGroup/page2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/anchorActions/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/buttonSubmitTagId/begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/content/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/dateConverter/showResults.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/dateFormatString/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disable/results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disableBinding/results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disableImageButton/results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/except/ErrorPage.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/formatTags/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/hidden/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/imageAnchorActions/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelDefaultValues/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelDefaults/begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelLiteral/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelStyles/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/multiSelect/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/nullableSelect/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/onTest/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/paramEncoding/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/paramMulti/results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/primitiveOptionsDS/dumpBoxes.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelect/Results.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelect/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelectTypeError/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/rtexpTagId/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/runtimeErrors/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/runtimeErrors/next.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/select/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/sessionBean/jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/sessionBean/jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/style/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/styleClass/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/tagIds/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/tempNegate/Begin.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAttributeBits/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/anchorTargets.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/checkboxResults.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/checkboxTest.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelResults.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/labelTest.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/radioResults.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/radioTest.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/selectResults.jsp
Log:
In this change the <netui:label> was renamed to <netui:span>. This was an
issue in the 8.1 tags because <netui:label> does not output the HTML <label>
using in 508 complience inside forms.
Because the netui tags are HTML specific, we decided to rename label to span
because <span> is
the HTML output by the label tag. The next checkin will rename the
<netui:formLabel> to <netui:label>.
svn doesn't allow this type of rename in a single change.
The bulk of this change is updating the tag usage in the tests.
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java
Tue Aug 3 15:48:42 2004
@@ -72,7 +72,6 @@
private InputHiddenTag.State _state = new InputHiddenTag.State();
private String _value; // The value of the Hidden field.
- //private String _tagId;
private Object _dataInput;
/**
@@ -113,75 +112,6 @@
}
/**
- * Return the ID of the hidden.
- * @return the ID.
- */
- //public String getTagId()
- //{
- // return _tagId;
- //}
-
- /**
- * Set the ID of the hidden.
- * @param tagId - the ID.
- * @jsptagref.attributedescription
- * <p>String value. Sets the <code>id</code> (or <code>name</code>)
attribute of the rendered HTML tag.
- * Note that the real id attribute rendered in the browser may be
- * changed by the application container (for example, Portal containers
may change
- * the rendered id value to ensure the uniqueness of
- * id's on the page). In this case, the real id rendered
- * in the browser may be looked up
- * through the JavaScript function getNetuiTagName( tagId, tag )</code>.
- *
- * <p>For example, assume that some tag's <code>tagId</code> attribute is
set to <code>foo</code>.
- *
- * <pre> <netui:textBox <b>tagId="foo"</b> /></pre>
- *
- * <p>Then the following JavaScript function will return the real id
attribute rendered in the browser:
- *
- * <pre> getNetuiTagName( "foo", this )</pre>
- *
- * <p>To get a <netui:form> element and all of its children elements in
JavaScript, use
- * the same JavaScript function <code>getNetuiTagName( tagId, tag
)</code>. For example,
- * assume that there is a <netui:form> whose
- * tagId attribute is set to <code>bar</code>.
- *
- * <pre> <netui:form <b>tagId="bar"</b> ></pre>
- *
- * <p>Then the following JavaScript function will return the
<netui:form> element
- * and its children (packaged as an array).
- *
- * <pre> document[getNetuiTagName( "bar", this )]</pre>
- *
- * <p>To retreive the value entered into a <netui:textBox> within the
<netui:form> tag, use the following
- * JavaScript expression.
- *
- * <pre> document[getNetuiTagName("bar", this)][getNetuiTagName("foo",
this)].value</pre>
- *
- * <p>The second parameter ensures that the JavaScript function
- * begins its search within the correct Portlet scope. Pass the
- * JavaScript keyword <code>this</code> as the second parameter.
- *
- * For detailed information on using the function
- * <code>getNetuiTagName( tagId, tag )</code> see
- * <a href="[EMAIL
PROTECTED]/../guide/netui/guide/conUsingJavaScript.html">
- * Using JavaScript in Page Flow and Portal Applications</a>.
- *
- * @jsptagref.databindable false
- *
- * @jsptagref.attributesyntaxvalue <i>string_tagId</i>
- *
- * @netui:attribute required="false" rtexprvalue="true"
- * @netui.tldx:attribute category="general"
- */
- //public void setTagId(String tagId)
- // throws JspException
- //{
- // // @todo: this is in the base class, should we remove it?
- // _tagId = tagId;
- //}
-
- /**
* Set the data input. This value will override the <code>
* dataSource</code> and provide the input value on the select box.
* @param dataInput the value of the input to the page. This value
@@ -295,7 +225,6 @@
// Continue processing this page
localRelease();
return SKIP_BODY;
-
}
/**
@@ -307,7 +236,6 @@
_state.clear();
_value = null;
- //_tagId = null;
_dataInput = null;
}
Copied:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
(from rev 35608,
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java)
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java
Tue Aug 3 15:48:42 2004
@@ -117,15 +117,15 @@
* see '&nbsp;'</p>
* <pre> <netui:label value="{pageFlow.somethingNull}"
defaultValue="&amp;nbsp;"/></pre>
*
- * @netui:tag name="label" description="Places formatted or dynamically
generated text on the page."
+ * @netui:tag name="span" description="Places formatted or dynamically
generated text on the page inside an HTML span."
* @netui.tldx:tag requiredchild="formatDate formatNumber formatString
attribute"
* renderer="workshop.netui.jspdesigner.tldx.LabelRenderer"
* bodycontentpref="empty"
*/
-public class Label extends LabelBase
+public class Span extends LabelBase
implements Formattable
{
- private static final Logger logger = Logger.getInstance(Label.class);
+ private static final Logger logger = Logger.getInstance(Span.class);
private SpanTag.State _state = new SpanTag.State();
private String _id;
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13789/Page1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13789/Page1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13789/Page1.jsp
Tue Aug 3 15:48:42 2004
@@ -8,6 +8,6 @@
This page directly binds to the page flow using a label
</p>
<hr>
-Label: <netui:label value="${pageFlow.string}"/>
+Label: <netui:span value="${pageFlow.string}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13797/Page1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13797/Page1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13797/Page1.jsp
Tue Aug 3 15:48:42 2004
@@ -8,6 +8,6 @@
This is the results posted from the form. It must match what was entered in
the textbox.
</p>
<hr>
-String Value = '<netui:label value="${pageFlow.string}"/>'
+String Value = '<netui:span value="${pageFlow.string}"/>'
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13803/Page1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13803/Page1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13803/Page1.jsp
Tue Aug 3 15:48:42 2004
@@ -7,6 +7,6 @@
<h4>Results</h4>
<p style="color:green">This binds to the results that should have been posted
by the form. You should see the results here
</p>
-PageFlow.String: <netui:label value="${pageFlow.string}"/>
+PageFlow.String: <netui:span value="${pageFlow.string}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13881/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13881/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b13881/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -19,10 +19,10 @@
<netui:button type="submit">Submit</netui:button>
</netui:form>
<hr>
-Checkbox from Form: <netui:label value="${pageFlow.form.checkBox1}" /><br>
-Checkbox from Form (true): <netui:label value="${pageFlow.form.checkBox2}"
/><br>
+Checkbox from Form: <netui:span value="${pageFlow.form.checkBox1}" /><br>
+Checkbox from Form (true): <netui:span value="${pageFlow.form.checkBox2}"
/><br>
<br>
-Checkbox from Page Flow: <netui:label value="${pageFlow.checkBox}" /><br>
-Checkbox from Page Flow (true): <netui:label value="${pageFlow.checkBox2}"
/><br>
+Checkbox from Page Flow: <netui:span value="${pageFlow.checkBox}" /><br>
+Checkbox from Page Flow (true): <netui:span value="${pageFlow.checkBox2}"
/><br>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14259/ErrorPage.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14259/ErrorPage.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14259/ErrorPage.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
is explicitly set to false. Both lines should be the same.
</p>
<hr>
-<b>Page Flow Message:</b> <netui:label value="${pageFlow.message}"/><hr>
+<b>Page Flow Message:</b> <netui:span value="${pageFlow.message}"/><hr>
<b>Exception Tag Message:</b> <br><netui:exceptions showMessage="true"/><hr>
<b>Exception Tag No StackTrace:</b> <br><netui:exceptions
showStackTrace="false"/><hr>
</netui:body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14683/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14683/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14683/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -11,6 +11,6 @@
a page flow variable. The JSP filter needs to insure that the page flow is
created. Below you should see the
value '<b>String</b>'. This is the only page of the test.
</p>
-Value: '<netui:label value="${pageFlow.data}" />'
+Value: '<netui:span value="${pageFlow.data}" />'
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14754/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14754/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14754/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -11,7 +11,7 @@
This will bind a label to the 4th element of an array inside a page flow. The
value should be '<b>5</b>'. This is the only page
hit during this test.
</p>
-Element [4]: <netui:label value="${pageFlow.foo[4]}" />
+Element [4]: <netui:span value="${pageFlow.foo[4]}" />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14764/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14764/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14764/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -13,7 +13,7 @@
names are bound to page flow variables. This is the only page hit in
this test.
</p>
-Name: <netui:label value="${pageFlow.lastName}, ${pageFlow.firstName}" />
+Name: <netui:span value="${pageFlow.lastName}, ${pageFlow.firstName}" />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14781/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14781/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14781/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -17,6 +17,6 @@
<br>
<netui:button type="submit">Submit</netui:button>
</netui:form><br>
-Selected: <netui:label value="${pageFlow.selected}"/>
+Selected: <netui:span value="${pageFlow.selected}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14787/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14787/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14787/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -18,9 +18,9 @@
</netui:form>
<hr>
<h4>Actual PageFlowController values</h4>
-text1: <netui:label value="${pageFlow.text1}"/><br>
-text1Default: <netui:label value="${pageFlow.text1Default}"/><br>
-text2: <netui:label value="${pageFlow.text2}"/><br>
-text2Default: <netui:label value="${pageFlow.text2Default}"/><br>
+text1: <netui:span value="${pageFlow.text1}"/><br>
+text1Default: <netui:span value="${pageFlow.text1Default}"/><br>
+text2: <netui:span value="${pageFlow.text2}"/><br>
+text2Default: <netui:span value="${pageFlow.text2Default}"/><br>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14826/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14826/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14826/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -21,7 +21,7 @@
<b>Select 1:</b><br />
<db:repeater dataSource="pageFlow.selected">
<db:repeaterItem>
- <netui:label value="${container.item}"/><br />
+ <netui:span value="${container.item}"/><br />
</db:repeaterItem>
</db:repeater>
<br />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15095/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15095/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15095/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
<netui:button type="submit">Submit</netui:button>
</netui:form>
<hr />
-Value: <netui:label value="${pageFlow.value}"/>
+Value: <netui:span value="${pageFlow.value}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15174/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15174/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15174/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -11,7 +11,7 @@
<netui:parameter name="foo" value="baz"/><br />
</netui:anchor>
<hr />
-Action: <netui:label value="${pageFlow.action}"/><br />
-Foo: <netui:label value="${pageFlow.foo}"/><br />
+Action: <netui:span value="${pageFlow.action}"/><br />
+Foo: <netui:span value="${pageFlow.foo}"/><br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15175/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15175/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15175/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -9,7 +9,7 @@
<netui:button type="submit">Submit</netui:button>
</netui:form>
<hr />
-Action: <netui:label value="${pageFlow.action}"/><br />
-Foo: <netui:label value="${pageFlow.foo}"/><br />
+Action: <netui:span value="${pageFlow.action}"/><br />
+Foo: <netui:span value="${pageFlow.foo}"/><br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15392/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15392/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15392/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -7,6 +7,6 @@
<h4>Passing a Bad Form</h4>
<netui:anchor action="getUserInfo">Get User</netui:anchor>
<hr />
-User: <netui:label value="${pageFlow.user}"/><br />
+User: <netui:span value="${pageFlow.user}"/><br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15430/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15430/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15430/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -18,10 +18,10 @@
<netui:button type="submit">Submit</netui:button>
</netui:form>
<br />
-Checkbox from Form: <netui:label value="${pageFlow.form.checkBox1}" /><br />
-True Checkbox Form: <netui:label value="${pageFlow.form.checkBox2}" /><br />
+Checkbox from Form: <netui:span value="${pageFlow.form.checkBox1}" /><br />
+True Checkbox Form: <netui:span value="${pageFlow.form.checkBox2}" /><br />
<br />
-Checkbox from Page Flow: <netui:label value="${pageFlow.checkBox}" /><br />
-True Checkbox from Page Flow: <netui:label value="${pageFlow.checkBox2}" /><br
/>
+Checkbox from Page Flow: <netui:span value="${pageFlow.checkBox}" /><br />
+True Checkbox from Page Flow: <netui:span value="${pageFlow.checkBox2}" /><br
/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15454/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15454/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15454/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -19,7 +19,7 @@
<b>Results:</b><br />
<db:repeater dataSource="pageFlow.info">
<db:repeaterItem>
- <netui:label value="${container.item}"/><br />
+ <netui:span value="${container.item}"/><br />
</db:repeaterItem>
</db:repeater>
<br />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15574/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15574/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15574/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -27,7 +27,7 @@
<b>Results:</b><br />
<db:repeater dataSource="pageFlow.info">
<db:repeaterItem>
- <netui:label value="${container.item}"/><br />
+ <netui:span value="${container.item}"/><br />
</db:repeaterItem>
</db:repeater>
<br />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15590/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15590/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15590/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -21,7 +21,7 @@
<b>Results:</b><br />
<db:repeater dataSource="pageFlow.strings">
<db:repeaterItem>
- <netui:label value="${container.item}"/><br />
+ <netui:span value="${container.item}"/><br />
</db:repeaterItem>
</db:repeater>
<br />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15964/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15964/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b15964/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,8 +10,8 @@
<netui:parameter name="baz" value="param-baz"/>
</netui:anchor>
<hr />
-Foo <netui:label value="${param.foo}"/><br />
-Bar <netui:label value="${param.bar}"/><br />
-Baz <netui:label value="${param.baz}"/><br />
+Foo <netui:span value="${param.foo}"/><br />
+Bar <netui:span value="${param.bar}"/><br />
+Baz <netui:span value="${param.baz}"/><br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b16092/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b16092/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b16092/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -9,13 +9,13 @@
<b>With repeaterItem</b><br />
<db:repeater dataSource="pageFlow.checks">
<db:repeaterItem>
- Value: <netui:label value="${container.item}"/><br />
+ Value: <netui:span value="${container.item}"/><br />
</db:repeaterItem>
</db:repeater>
<hr />
<b>Without repeaterItem</b><br />
<db:repeater dataSource="pageFlow.checks">
- Value: <netui:label value="${container.item}"/><br />
+ Value: <netui:span value="${container.item}"/><br />
</db:repeater>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b17287/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b17287/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b17287/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -11,7 +11,7 @@
{
%>
<db:cellRepeater dataSource="pageFlow.data" rows="${pageFlow.rows}">
- Item: <netui:label value="${container.item}" />
+ Item: <netui:span value="${container.item}" />
</db:cellRepeater>
<%
}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b17461/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b17461/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b17461/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad minRepeat="${min}" maxRepeat="${max}" padText="${text}"/>
</db:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18025/begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18025/begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18025/begin.jsp
Tue Aug 3 15:48:42 2004
@@ -5,9 +5,9 @@
</head>
<body>
<br/>
-A final string: <b>'<netui:label value="${pageFlow.finalString}"/>'</b>
+A final string: <b>'<netui:span value="${pageFlow.finalString}"/>'</b>
<br/>
-A non-final string: <b>'<netui:label value="${pageFlow.nonFinalString}"/>'</b>
+A non-final string: <b>'<netui:span value="${pageFlow.nonFinalString}"/>'</b>
<br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18067/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18067/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18067/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -5,13 +5,13 @@
</head>
<body>
<h4>Format bug</h4>
-<netui:label value="${pageFlow.letters}">
+<netui:span value="${pageFlow.letters}">
<netui:formatString pattern="$##-#####-#" truncate="true"/>
-</netui:label>
+</netui:span>
<br />
-<netui:label value="${pageFlow.letters}">
+<netui:span value="${pageFlow.letters}">
<netui:formatString pattern="$$#-#####-#" truncate="true"/>
-</netui:label>
+</netui:span>
<hr />
<b>Should be</b><br />
#A-BCDEF-G<br />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18068/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18068/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b18068/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -5,9 +5,9 @@
</head>
<body>
<h4>Format Error -- Should report an error for an invalid type</h4>
-<netui:label value="12345.67">
+<netui:span value="12345.67">
<netui:formatNumber language="EN" country = "US" type="foo"
pattern="#.00"/>
-</netui:label>
+</netui:span>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b22957/begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b22957/begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b22957/begin.jsp
Tue Aug 3 15:48:42 2004
@@ -13,6 +13,6 @@
<netui:form action="foo">
<netui:anchor formSubmit="true">Create</netui:anchor>
</netui:form>
- <netui:label value="${pageFlow.lastAction}"/>
+ <netui:span value="${pageFlow.lastAction}"/>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b30458/begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b30458/begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b30458/begin.jsp
Tue Aug 3 15:48:42 2004
@@ -16,7 +16,7 @@
class="tablebody" ></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label
value="${container.item}"></netui:label></td>
+ <td><netui:span
value="${container.item}"></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></table></netui-data:repeaterFooter>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33322/begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33322/begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33322/begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,6 +10,6 @@
</title>
</head>
<netui:body>
- <netui:label value="${pageFlow.foo}"><netui:formatNumber
pattern="999.00.999"/></netui:label><br />
+ <netui:span value="${pageFlow.foo}"><netui:formatNumber
pattern="999.00.999"/></netui:span><br />
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33704/begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33704/begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33704/begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,6 +10,6 @@
</title>
</head>
<body>
- Date: <netui:label value="${pageFlow.foo}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:label><br />
+ Date: <netui:span value="${pageFlow.foo}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:span><br />
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33807/begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33807/begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b33807/begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,6 +10,6 @@
</title>
</head>
<netui:body>
- Date: <netui:label value="${pageFlow.foo}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:label><br />
+ Date: <netui:span value="${pageFlow.foo}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:span><br />
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b35084/done.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b35084/done.jsp
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b35084/done.jsp
Tue Aug 3 15:48:42 2004
@@ -6,6 +6,6 @@
<netui:base/>
</head>
<body>
- <netui:label value="${pageFlow.name}"/>
+ <netui:span value="${pageFlow.name}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b35084b/done.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b35084b/done.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b35084b/done.jsp
Tue Aug 3 15:48:42 2004
@@ -6,6 +6,6 @@
<netui:base/>
</head>
<body>
- <netui:label value="${pageFlow.name}"/>
+ <netui:span value="${pageFlow.name}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b37913/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b37913/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b37913/index.jsp
Tue Aug 3 15:48:42 2004
@@ -16,7 +16,7 @@
<ul>
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}"></netui:label></li>
+ <li><netui:span value="${container.item}"></netui:span></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ul></netui-data:repeaterFooter>
</netui-data:repeater>
@@ -24,7 +24,7 @@
<h4>String Values - Simple Repeater</h4>
<ul>
<netui-data:repeater dataSource="pageFlow.stringValues">
- <li><netui:label value="${container.item}"></netui:label></li>
+ <li><netui:span value="${container.item}"></netui:span></li>
</netui-data:repeater>
</ul>
<hr />
@@ -34,7 +34,7 @@
<ul>
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}"></netui:label></li>
+ <li><netui:span value="${container.item}"></netui:span></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ul></netui-data:repeaterFooter>
</netui-data:repeater>
@@ -42,7 +42,7 @@
<h4>List Values - Simple Repeater</h4>
<ul>
<netui-data:repeater dataSource="pageFlow.listValues">
- <li><netui:label value="${container.item}"></netui:label></li>
+ <li><netui:span value="${container.item}"></netui:span></li>
</netui-data:repeater>
</ul>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/results.jsp
Tue Aug 3 15:48:42 2004
@@ -19,7 +19,7 @@
%>
<netui-data:repeater dataSource="requestScope.parameterNames">
<netui-data:repeaterHeader><ul></netui-data:repeaterHeader>
- <netui-data:repeaterItem><li><netui:label
value="${container.item}"/></li>
+ <netui-data:repeaterItem><li><netui:span
value="${container.item}"/></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ul></netui-data:repeaterFooter>
</netui-data:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38183/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38183/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38183/index.jsp
Tue Aug 3 15:48:42 2004
@@ -11,7 +11,7 @@
<body>
<netui-data:repeater dataSource="pageFlow.data">
<netui-data:repeaterHeader><ul></netui-data:repeaterHeader>
- <netui-data:repeaterItem><li><netui:label value="${container.foo}"/></li>
+ <netui-data:repeaterItem><li><netui:span value="${container.foo}"/></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ul></netui-data:repeaterFooter>
</netui-data:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38184/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38184/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38184/index.jsp
Tue Aug 3 15:48:42 2004
@@ -8,7 +8,7 @@
<h4>List</h4>
<netui-data:repeater dataSource="pageFlow.list">
<netui-data:repeaterHeader><ul></netui-data:repeaterHeader>
- <netui-data:repeaterItem><li><netui:label
value="${container.item}"/></li>
+ <netui-data:repeaterItem><li><netui:span value="${container.item}"/></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ul></netui-data:repeaterFooter>
</netui-data:repeater>
@@ -16,7 +16,7 @@
<h4>Enumeration</h4>
<netui-data:repeater dataSource="pageFlow.e">
<netui-data:repeaterHeader><ul></netui-data:repeaterHeader>
- <netui-data:repeaterItem><li><netui:label
value="${container.item}"/></li>
+ <netui-data:repeaterItem><li><netui:span value="${container.item}"/></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ul></netui-data:repeaterFooter>
</netui-data:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39434/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39434/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39434/index.jsp
Tue Aug 3 15:48:42 2004
@@ -11,35 +11,35 @@
</head>
<body>
From Label: ("08/28/2003"):
- <netui:label value="08/28/2003">
+ <netui:span value="08/28/2003">
<netui:formatDate pattern="MM/dd/yyyy"/>
- </netui:label> <br />
+ </netui:span> <br />
From Label: ("08/28/03"):
- <netui:label value="08/28/03">
+ <netui:span value="08/28/03">
<netui:formatDate pattern="MM/dd/yyyy"/>
- </netui:label> <br />
+ </netui:span> <br />
From Label: ("08/28/72"):
- <netui:label value="08/28/72">
+ <netui:span value="08/28/72">
<netui:formatDate pattern="MM/dd/yyyy"/>
- </netui:label> <br />
+ </netui:span> <br />
From Label: ("08282003"):
- <netui:label value="08282003">
+ <netui:span value="08282003">
<netui:formatDate pattern="MM/dd/yyyy"/>
- </netui:label> <br />
+ </netui:span> <br />
From Label: ("082803"):
- <netui:label value="082803">
+ <netui:span value="082803">
<netui:formatDate pattern="MM/dd/yyyy"/>
- </netui:label> <br />
+ </netui:span> <br />
From Label: ("082872"):
- <netui:label value="082872">
+ <netui:span value="082872">
<netui:formatDate pattern="MM/dd/yyyy"/>
- </netui:label> <br />
+ </netui:span> <br />
Repeater from String:
<netui-data:repeater dataSource="pageFlow.stringDates">
<netui-data:repeaterItem>
- <netui:label value="${container.item}">
+ <netui:span value="${container.item}">
<netui:formatDate pattern="MM/dd/yy"/>
- </netui:label>
+ </netui:span>
</netui-data:repeaterItem>
</netui-data:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39820/sample.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39820/sample.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39820/sample.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<netui:parameter name="form" value="Form 1"/>
<table>
<tr>
- <td><netui:label value="Prop1:"></netui:label></td>
+ <td><netui:span value="Prop1:"></netui:span></td>
<td>
<netui:textBox
dataSource="actionForm.prop1"></netui:textBox>
</td>
@@ -34,7 +34,7 @@
<netui:parameter name="form" value="Form 2"/>
<table>
<tr>
- <td><netui:label value="Prop1:"></netui:label></td>
+ <td><netui:span value="Prop1:"></netui:span></td>
<td>
<netui:textBox
dataSource="actionForm.prop1"></netui:textBox>
</td>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39820/sampleResult.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39820/sampleResult.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39820/sampleResult.jsp
Tue Aug 3 15:48:42 2004
@@ -8,9 +8,9 @@
<title>Sample Application Resutl Page</title>
</head>
<body>
- Prop1: <netui:label value="${pageFlow.prop1}"></netui:label><br>
- Prop2: <netui:label value="${pageFlow.prop2}"></netui:label><br>
- Form: <netui:label value="${pageFlow.formValue}"></netui:label><br>
+ Prop1: <netui:span value="${pageFlow.prop1}"></netui:span><br>
+ Prop2: <netui:span value="${pageFlow.prop2}"></netui:span><br>
+ Form: <netui:span value="${pageFlow.formValue}"></netui:span><br>
<p>
<netui:anchor action="begin">back</netui:anchor>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40031/results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40031/results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40031/results.jsp
Tue Aug 3 15:48:42 2004
@@ -13,8 +13,8 @@
</head>
<body>
<p>
- string 1:<netui:label value="${pageInput.string1}"/> <br/>
- string 2:<netui:label value="${pageInput.string2}"/> <br/>
+ string 1:<netui:span value="${pageInput.string1}"/> <br/>
+ string 2:<netui:span value="${pageInput.string2}"/> <br/>
</p>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40596/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40596/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40596/index.jsp
Tue Aug 3 15:48:42 2004
@@ -23,10 +23,10 @@
%>
<netui-data:repeater dataSource="pageScope.set">
- <netui:label value="${container.item.key}"/><br/>
+ <netui:span value="${container.item.key}"/><br/>
<netui-data:repeater dataSource="container.item.value">
- <netui:label value="${container.item}"/><br/>
+ <netui:span value="${container.item}"/><br/>
</netui-data:repeater>
</netui-data:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40862/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40862/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40862/index.jsp
Tue Aug 3 15:48:42 2004
@@ -25,7 +25,7 @@
<netui-data:repeaterItem>
<p>
<netui:anchor
href="${container.item.url}">
- <netui:label
value="${container.item.text}"/>
+ <netui:span
value="${container.item.text}"/>
</netui:anchor>
<netui:anchor action="editCompanies">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40999/page2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40999/page2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b40999/page2.jsp
Tue Aug 3 15:48:42 2004
@@ -16,11 +16,11 @@
<netui-data:repeaterHeader><ol></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<li>
- <netui:label value="${container.item}"
defaultValue=" "></netui:label>
+ <netui:span value="${container.item}"
defaultValue=" "></netui:span>
</li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ol></netui-data:repeaterFooter>
</netui-data:repeater><br>
- <b>Type:</b> <netui:label
value="${pageInput.form.type}"></netui:label><br/>
+ <b>Type:</b> <netui:span
value="${pageInput.form.type}"></netui:span><br/>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b41391/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b41391/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b41391/index.jsp
Tue Aug 3 15:48:42 2004
@@ -24,7 +24,7 @@
pageContext.setAttribute("array", map.get(text));
%>
-<h1><netui:label value="${pageScope.text}"/></h1>
+<h1><netui:span value="${pageScope.text}"/></h1>
<br/>
<br/>
<b>Data Set</b>
@@ -35,7 +35,7 @@
<ol>
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}" defaultValue=" "/></li>
+ <li><netui:span value="${container.item}" defaultValue=" "/></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
</ol>
@@ -50,7 +50,7 @@
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label value="${container.item}"
defaultValue=" "></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" "></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
@@ -67,7 +67,7 @@
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label value="${container.item}"
defaultValue=" "></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" "></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
@@ -84,7 +84,7 @@
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label value="${container.item}"
defaultValue=" "></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" "></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
@@ -92,7 +92,7 @@
</table>
</netui-data:repeaterFooter>
<netui-data:pad minRepeat="10">
- <tr><td><netui:label value="Pad text:
${container.index}"/></td></tr>
+ <tr><td><netui:span value="Pad text:
${container.index}"/></td></tr>
</netui-data:pad>
</netui-data:repeater>
<br/>
@@ -104,7 +104,7 @@
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label value="${container.item}"
defaultValue=" "></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" "></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
@@ -112,7 +112,7 @@
</table>
</netui-data:repeaterFooter>
<netui-data:pad minRepeat="10">
- <tr><td><netui:label value="Pad text:
${container.index}"/></td></tr>
+ <tr><td><netui:span value="Pad text:
${container.index}"/></td></tr>
</netui-data:pad>
</netui-data:repeater>
<br/>
@@ -124,7 +124,7 @@
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label value="${container.item}"
defaultValue=" "></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" "></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
@@ -132,7 +132,7 @@
</table>
</netui-data:repeaterFooter>
<netui-data:pad maxRepeat="1">
- <tr><td><netui:label value="Pad text:
${container.index}"/></td></tr>
+ <tr><td><netui:span value="Pad text:
${container.index}"/></td></tr>
</netui-data:pad>
</netui-data:repeater>
<b>ignoreNulls=true, padContext (max=1)</b><br/>
@@ -143,7 +143,7 @@
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label value="${container.item}"
defaultValue=" "></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" "></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
@@ -151,7 +151,7 @@
</table>
</netui-data:repeaterFooter>
<netui-data:pad maxRepeat="1">
- <tr><td><netui:label value="Pad text:
${container.index}"/></td></tr>
+ <tr><td><netui:span value="Pad text:
${container.index}"/></td></tr>
</netui-data:pad>
</netui-data:repeater>
<hr/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b42486/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b42486/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b42486/index.jsp
Tue Aug 3 15:48:42 2004
@@ -13,7 +13,7 @@
<netui-data:repeater dataSource="pageFlow.foo">
<netui-data:repeaterHeader><ol></netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <li><netui:label value="${container.item.key}"/> & <netui:label
value="${container.item.value}"/></li>
+ <li><netui:span value="${container.item.key}"/> & <netui:span
value="${container.item.value}"/></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ol></netui-data:repeaterFooter>
</netui-data:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b42558/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b42558/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b42558/index.jsp
Tue Aug 3 15:48:42 2004
@@ -16,7 +16,7 @@
</netui-data:callPageFlow>
<br/>
-Page Flow said: <netui:label value="${pageScope.helloText}"/>
+Page Flow said: <netui:span value="${pageScope.helloText}"/>
<br/>
<br/>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/cr121496/results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/cr121496/results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/cr121496/results.jsp
Tue Aug 3 15:48:42 2004
@@ -11,6 +11,6 @@
</head>
<body>
<netui:anchor action="begin">Home</netui:anchor><br>
- Prop2: <netui:label value="${param.prop2}"></netui:label>
+ Prop2: <netui:span value="${param.prop2}"></netui:span>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/checkboxDemo/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/checkboxDemo/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/checkboxDemo/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -13,7 +13,7 @@
<table>
</db:repeaterHeader>
<db:repeaterItem>
-<tr><td><netui:label value="${container.item.file}"/></td><td>
+<tr><td><netui:span value="${container.item.file}"/></td><td>
<td><netui:checkBox dataSource="container.item.selected"/></td></tr>
</db:repeaterItem>
<db:repeaterFooter>
@@ -33,7 +33,7 @@
<db:methodParameter value="${container.item.selected}"/>
</db:callMethod>
<c:if test="${pageScope.result == 'include'}">
- <li><netui:label value="${container.item.file}"/></li>
+ <li><netui:span value="${container.item.file}"/></li>
</c:if>
</db:repeaterItem>
<db:repeaterFooter>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/controlTests/callingPageFlow/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/controlTests/callingPageFlow/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/controlTests/callingPageFlow/index.jsp
Tue Aug 3 15:48:42 2004
@@ -11,7 +11,7 @@
</head>
<body>
<netui-data:callPageFlow method="callableMethod"
resultId="call1"><netui-data:methodParameter type="java.lang.String"
value="String"></netui-data:methodParameter></netui-data:callPageFlow>
- <netui:label value="${pageScope.call1}"></netui:label>
<br><netui-data:callPageFlow method="callableMethod"
resultId="call2"><netui-data:methodParameter type="int"
value="2"></netui-data:methodParameter></netui-data:callPageFlow>
- <netui:label value="${pageScope.call2}"></netui:label>
+ <netui:span value="${pageScope.call1}"></netui:span>
<br><netui-data:callPageFlow method="callableMethod"
resultId="call2"><netui-data:methodParameter type="int"
value="2"></netui-data:methodParameter></netui-data:callPageFlow>
+ <netui:span value="${pageScope.call2}"></netui:span>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/controlTests/getData/begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/controlTests/getData/begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/controlTests/getData/begin.jsp
Tue Aug 3 15:48:42 2004
@@ -16,7 +16,7 @@
class="tablebody" ></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label
value="${container.item}"></netui:label></td>
+ <td><netui:span
value="${container.item}"></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></table></netui-data:repeaterFooter>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/errors/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/errors/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/errors/index.jsp
Tue Aug 3 15:48:42 2004
@@ -18,14 +18,14 @@
</p>
<ul>
<li><netui:formatDate /> -- No Parent</li>
- <li><netui:label value="01/28/63"><netui:formatDate
stringInputPattern="x//ssd" /></netui:label> -- bad input pattern</li>
- <li><netui:label value="01/28/63"><netui:formatDate pattern="x//ssd"
/></netui:label> -- bad pattern</li>
- <li><netui:label value="bad-date"><netui:formatDate /></netui:label> --
bad date</li>
- <li><netui:label value="${pageFlow.charValue}"><netui:formatDate
/></netui:label> -- bad type</li>
+ <li><netui:span value="01/28/63"><netui:formatDate
stringInputPattern="x//ssd" /></netui:span> -- bad input pattern</li>
+ <li><netui:span value="01/28/63"><netui:formatDate pattern="x//ssd"
/></netui:span> -- bad pattern</li>
+ <li><netui:span value="bad-date"><netui:formatDate /></netui:span> -- bad
date</li>
+ <li><netui:span value="${pageFlow.charValue}"><netui:formatDate
/></netui:span> -- bad type</li>
</ul>
<hr>
<ul>
- <li><netui:label value="01/28/63"><netui:formatDate
pattern="${pageFlow.nullValue}"/></netui:label></li>
+ <li><netui:span value="01/28/63"><netui:formatDate
pattern="${pageFlow.nullValue}"/></netui:span></li>
<li><netui:select dataSource="pageFlow.select">
<netui:formatDate pattern="${pageFlow.nullValue}"/>
<netui:selectOption value="01/28/63" />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/errorsinline/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/errorsinline/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/errorsinline/index.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
This is a single page test.
</p>
<ul>
- <li><netui:label value="01/28/63"><netui:formatDate
pattern="${pageFlow.nullValue}"/></netui:label></li>
+ <li><netui:span value="01/28/63"><netui:formatDate
pattern="${pageFlow.nullValue}"/></netui:span></li>
<li><netui:select dataSource="pageFlow.select">
<netui:formatDate pattern="${pageFlow.nullValue}"/>
<netui:selectOption value="01/28/63" />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/nullbinding/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/nullbinding/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatdate/nullbinding/index.jsp
Tue Aug 3 15:48:42 2004
@@ -15,12 +15,12 @@
This is a single page test.
</p>
<ul>
- <li><netui:label value="01/28/63"><netui:formatDate
pattern="${pageFlow.nullValue}" /></netui:label> -- pattern</li>
- <li><netui:label value="01/28/63"><netui:formatDate
stringInputPattern="${pageFlow.nullValue}" /></netui:label> --
stringInputPattern</li>
+ <li><netui:span value="01/28/63"><netui:formatDate
pattern="${pageFlow.nullValue}" /></netui:span> -- pattern</li>
+ <li><netui:span value="01/28/63"><netui:formatDate
stringInputPattern="${pageFlow.nullValue}" /></netui:span> --
stringInputPattern</li>
</ul>
<li>
- <li><netui:label value="01/28/63"><netui:formatDate
country="${pageFlow.nullValue}" /></netui:label> -- country</li>
- <li><netui:label value="01/28/63"><netui:formatDate
language="${pageFlow.nullValue}" /></netui:label> -- language</li>
+ <li><netui:span value="01/28/63"><netui:formatDate
country="${pageFlow.nullValue}" /></netui:span> -- country</li>
+ <li><netui:span value="01/28/63"><netui:formatDate
language="${pageFlow.nullValue}" /></netui:span> -- language</li>
</ul>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatnumber/errors/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatnumber/errors/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatnumber/errors/index.jsp
Tue Aug 3 15:48:42 2004
@@ -15,8 +15,8 @@
</p>
<ul>
<li><netui:formatNumber /> -- no parent</li>
- <li><netui:label value="bad.number"><netui:formatNumber /></netui:label>
-- bad number value</li>
- <li><netui:label value="12345"><netui:formatNumber pattern=";##0.0#"
/></netui:label> -- bad pattern value</li>
+ <li><netui:span value="bad.number"><netui:formatNumber /></netui:span> --
bad number value</li>
+ <li><netui:span value="12345"><netui:formatNumber pattern=";##0.0#"
/></netui:span> -- bad pattern value</li>
</ul>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatnumber/nullbinding/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatnumber/nullbinding/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatnumber/nullbinding/index.jsp
Tue Aug 3 15:48:42 2004
@@ -14,10 +14,10 @@
This is a single page test.
</p>
<ul>
- <li><netui:label value="12345"><netui:formatNumber
pattern="${pageFlow.nullValue}" /></netui:label> -- pattern</li>
- <li><netui:label value="12345"><netui:formatNumber
type="${pageFlow.nullValue}" /></netui:label> -- type</li>
- <li><netui:label value="12345"><netui:formatNumber
country="${pageFlow.nullValue}" /></netui:label> -- country</li>
- <li><netui:label value="12345"><netui:formatNumber
language="${pageFlow.nullValue}" /></netui:label> -- language</li>
+ <li><netui:span value="12345"><netui:formatNumber
pattern="${pageFlow.nullValue}" /></netui:span> -- pattern</li>
+ <li><netui:span value="12345"><netui:formatNumber
type="${pageFlow.nullValue}" /></netui:span> -- type</li>
+ <li><netui:span value="12345"><netui:formatNumber
country="${pageFlow.nullValue}" /></netui:span> -- country</li>
+ <li><netui:span value="12345"><netui:formatNumber
language="${pageFlow.nullValue}" /></netui:span> -- language</li>
</ul>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatstring/nullbinding/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatstring/nullbinding/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/formatstring/nullbinding/index.jsp
Tue Aug 3 15:48:42 2004
@@ -14,9 +14,9 @@
This is a single page test.
</p>
<ul>
- <li><netui:label value="123456"><netui:formatString
pattern="${pageFlow.nullValue}" /></netui:label> -- pattern</li>
- <li><netui:label value="123456"><netui:formatString pattern="###-###"
country="${pageFlow.nullValue}" /></netui:label> -- country</li>
- <li><netui:label value="123456"><netui:formatString pattern="###-###"
language="${pageFlow.nullValue}" /></netui:label> -- language</li>
+ <li><netui:span value="123456"><netui:formatString
pattern="${pageFlow.nullValue}" /></netui:span> -- pattern</li>
+ <li><netui:span value="123456"><netui:formatString pattern="###-###"
country="${pageFlow.nullValue}" /></netui:span> -- country</li>
+ <li><netui:span value="123456"><netui:formatString pattern="###-###"
language="${pageFlow.nullValue}" /></netui:span> -- language</li>
</ul>
<hr>
<ul>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/anybean/updateAnyBean.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/anybean/updateAnyBean.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/anybean/updateAnyBean.jsp
Tue Aug 3 15:48:42 2004
@@ -23,7 +23,7 @@
</netui:form>
<br/>
<br/>
- POSTed value: <netui:label value="${pageInput.name}"/>
+ POSTed value: <netui:span value="${pageInput.name}"/>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basic/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basic/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basic/index.jsp
Tue Aug 3 15:48:42 2004
@@ -11,9 +11,9 @@
<b>Simple Bundle Tests</b>
<netui-data:declareBundle name="myBundle" bundlePath="properties.bundle1"/>
<p>
- <netui:label value="${bundle.myBundle.message1}"/><br/>
+ <netui:span value="${bundle.myBundle.message1}"/><br/>
<br/>
- Multi-word message key: <netui:label
value="${bundle.myBundle['multi.word.key']}"/><br/>
+ Multi-word message key: <netui:span
value="${bundle.myBundle['multi.word.key']}"/><br/>
<br/>
</p>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/basicnojpf/index.jsp
Tue Aug 3 15:48:42 2004
@@ -15,12 +15,12 @@
bundlePath="error/Text"/>
Bundle Messages:
<ul>
- <li><b>[</b><netui:label
value='${bundle["foo"].BundleString}'/><b>]</b>
- <li><b>[</b><netui:label
value='${bundle["bar"].BundleString}'/><b>]</b>
- <li><b>[</b><netui:label
value='${bundle["foo"].BundleString2}'/><b>]</b>
- <li><b>[</b><netui:label
value='${bundle["bar"].BundleString2}'/><b>]</b>
- <li><b>[</b><netui:label value='${bundle["foo"].$$}'/><b>]</b>
- <li><b>[</b><netui:label value='${bundle["bar"].$$}'/><b>]</b>
+ <li><b>[</b><netui:span value='${bundle["foo"].BundleString}'/><b>]</b>
+ <li><b>[</b><netui:span value='${bundle["bar"].BundleString}'/><b>]</b>
+ <li><b>[</b><netui:span
value='${bundle["foo"].BundleString2}'/><b>]</b>
+ <li><b>[</b><netui:span
value='${bundle["bar"].BundleString2}'/><b>]</b>
+ <li><b>[</b><netui:span value='${bundle["foo"].$$}'/><b>]</b>
+ <li><b>[</b><netui:span value='${bundle["bar"].$$}'/><b>]</b>
</ul>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/declarebundle/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/declarebundle/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/declarebundle/index.jsp
Tue Aug 3 15:48:42 2004
@@ -15,10 +15,10 @@
<body>
<b>Bundle Binding Tests</b>
<br/>
- bundle.bundle1.message1: <netui-html:label
value="${bundle.bundle1.message1}"/><br/>
- bundle.germanBundle1.message1: <netui-html:label
value="${bundle.germanBundle1.message1}"/><br/>
- bundle["[EMAIL PROTECTED]&"].message1: <netui-html:label
value='${bundle["[EMAIL PROTECTED]&"].message1}'/><br/>
- bundle["bundle2"].message1: <netui-html:label
value='${bundle["bundle2"].message1}'/><br/>
- bundle.bundle2.message2: <netui-html:label
value='${bundle.bundle2.message2}'/><br/>
+ bundle.bundle1.message1: <netui-html:span
value="${bundle.bundle1.message1}"/><br/>
+ bundle.germanBundle1.message1: <netui-html:span
value="${bundle.germanBundle1.message1}"/><br/>
+ bundle["[EMAIL PROTECTED]&"].message1: <netui-html:span
value='${bundle["[EMAIL PROTECTED]&"].message1}'/><br/>
+ bundle["bundle2"].message1: <netui-html:span
value='${bundle["bundle2"].message1}'/><br/>
+ bundle.bundle2.message2: <netui-html:span
value='${bundle.bundle2.message2}'/><br/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/bundle/struts/index.jsp
Tue Aug 3 15:48:42 2004
@@ -11,9 +11,9 @@
<body>
<b>Struts Interop i18n Tests</b>
<p>
- default bundle: <netui:label
value="${bundle.default.myStrutsMessage}"/><br/>
- double quotes: <netui:label
value="${bundle[\"namedStrutsMessages/databinding/bundle/struts\"].myStrutsMessage}"/><br/>
- single quotes: <netui:label
value="${bundle['namedStrutsMessages/databinding/bundle/struts'].myStrutsMessage}"/><br/>
+ default bundle: <netui:span
value="${bundle.default.myStrutsMessage}"/><br/>
+ double quotes: <netui:span
value="${bundle[\"namedStrutsMessages/databinding/bundle/struts\"].myStrutsMessage}"/><br/>
+ single quotes: <netui:span
value="${bundle['namedStrutsMessages/databinding/bundle/struts'].myStrutsMessage}"/><br/>
<br/>
<br/>
</p>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callMethod/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callMethod/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callMethod/index.jsp
Tue Aug 3 15:48:42 2004
@@ -9,7 +9,7 @@
<body>
<b>callMethod Tag Test</b>
<netui-data:callMethod object="${pageFlow}" method="saySomething"
resultId="whatWasSaid"/>
-<netui:label value="${pageScope.whatWasSaid}"/>
+<netui:span value="${pageScope.whatWasSaid}"/>
<br/>
<br/>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callMethod/variousMethods.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callMethod/variousMethods.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callMethod/variousMethods.jsp
Tue Aug 3 15:48:42 2004
@@ -16,34 +16,34 @@
<br/>
<!-- test 1 -->
<netui-data:callMethod object="${requestScope.callMethodType}"
resultId="publicMethod" method="publicMethod"/>
-<netui:label value="${pageScope.publicMethod}"/>
+<netui:span value="${pageScope.publicMethod}"/>
<br/>
<br/>
<!-- test 2 -->
<netui-data:callMethod object="${requestScope.callMethodType}"
resultId="protectedMethod" method="protectedMethod"/>
-<netui:label value="${pageScope.protectedMethod}"/>
+<netui:span value="${pageScope.protectedMethod}"/>
<br/>
<br/>
<!-- test 3 -->
<netui-data:callMethod object="${requestScope.callMethodType}"
resultId="privateMethod" method="privateMethod"/>
-<netui:label value="${pageScope.privateMethod}"/>
+<netui:span value="${pageScope.privateMethod}"/>
<br/>
<br/>
<!-- test 4 -->
<netui-data:callMethod object="${requestScope.callMethodType}"
resultId="publicStaticMethod" method="publicStaticMethod"/>
-<netui:label value="${pageScope.publicStaticMethod}"/>
+<netui:span value="${pageScope.publicStaticMethod}"/>
<br/>
<br/>
<!-- test 5 -->
<netui-data:callMethod object="${requestScope.callMethodType}"
resultId="publicMethodZeroArg" method="publicMethodZeroArg"/>
-<netui:label value="${pageScope.publicMethodZeroArg}"/>
+<netui:span value="${pageScope.publicMethodZeroArg}"/>
<br/>
<br/>
<!-- test 6 -->
<netui-data:callMethod object="${requestScope.callMethodType}"
resultId="publicMethodOneArg" method="publicMethodOneArg">
<netui-data:methodParameter value="123"/>
</netui-data:callMethod>
-<netui:label value="${pageScope.publicMethodOneArg}"/>
+<netui:span value="${pageScope.publicMethodOneArg}"/>
<br/>
<br/>
<!-- test 7 -->
@@ -51,7 +51,7 @@
<netui-data:methodParameter value="123"/>
<netui-data:methodParameter value="456"/>
</netui-data:callMethod>
-<netui:label value="${pageScope.publicMethodTwoArg}"/>
+<netui:span value="${pageScope.publicMethodTwoArg}"/>
<br/>
<br/>
<br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callPageFlow/simpleTest.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callPageFlow/simpleTest.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callPageFlow/simpleTest.jsp
Tue Aug 3 15:48:42 2004
@@ -11,14 +11,14 @@
<body>
<b>Call Page Flow Tests</b><br/>
<netui-data:callPageFlow resultId="jpfText" method="getDefaultText"/>
-PageFlow defaultText = <netui:label value="${pageScope.jpfText}"/><br/>
+PageFlow defaultText = <netui:span value="${pageScope.jpfText}"/><br/>
<br/>
<netui-data:callPageFlow resultId="jpfSaid" method="echo">
<netui-data:methodParameter value="Hello JSP Page"/>
</netui-data:callPageFlow>
-PageFlow said: <netui:label value="${pageScope.jpfSaid}"/><br/>
+PageFlow said: <netui:span value="${pageScope.jpfSaid}"/><br/>
<br/>
<br/>
<netui:anchor action="begin">Home</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callPageFlow/sumTest.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callPageFlow/sumTest.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/callPageFlow/sumTest.jsp
Tue Aug 3 15:48:42 2004
@@ -20,11 +20,11 @@
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr class="row">
- <td><netui:label value="${container.item.name}"/></td>
- <td><center><netui:label
value="${container.item.quantity}"/></center></td>
- <td><netui:label value="${container.item.price}">
+ <td><netui:span value="${container.item.name}"/></td>
+ <td><center><netui:span
value="${container.item.quantity}"/></center></td>
+ <td><netui:span value="${container.item.price}">
<netui:formatNumber pattern="$#,###,###.00"/>
- </netui:label>
+ </netui:span>
</td>
</tr>
</netui-data:repeaterItem>
@@ -36,9 +36,9 @@
<netui-data:callPageFlow resultId="cartSum" method="sumCartItems">
<netui-data:methodParameter
value="${pageFlow.cart.lineItemList}"/>
</netui-data:callPageFlow>
- <netui:label value="${pageScope.cartSum}">
+ <netui:span value="${pageScope.cartSum}">
<netui:formatNumber pattern="$#,###,###.00"/>
- </netui:label>
+ </netui:span>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/overloading/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/overloading/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/overloading/index.jsp
Tue Aug 3 15:48:42 2004
@@ -14,19 +14,19 @@
<br/>
<b>foo()</b>
<netui-data:callPageFlow method="foo" resultId="test1"/>
-<netui-html:label value="${pageScope.test1}"/>
+<netui-html:span value="${pageScope.test1}"/>
<br/>
<b>foo(Integer)</b>
<netui-data:callPageFlow method="foo" resultId="test2">
<netui-data:methodParameter value="42" type="java.lang.Integer"/>
</netui-data:callPageFlow>
-<netui-html:label value="${pageScope.test2}"/>
+<netui-html:span value="${pageScope.test2}"/>
<br/>
<b>foo(int)</b>
<netui-data:callPageFlow method="foo" resultId="test3">
<netui-data:methodParameter value="42" type="int"/>
</netui-data:callPageFlow>
-<netui-html:label value="${pageScope.test3}"/>
+<netui-html:span value="${pageScope.test3}"/>
<br/>
<br/>
<b>foo(String, int)</b>
@@ -34,7 +34,7 @@
<netui-data:methodParameter value="null" type="java.lang.String"/>
<netui-data:methodParameter value="42" type="int"/>
</netui-data:callPageFlow>
-<netui-html:label value="${pageScope.test4}"/>
+<netui-html:span value="${pageScope.test4}"/>
<br/>
<br/>
<b>foo(String, Integer)</b>
@@ -42,14 +42,14 @@
<netui-data:methodParameter value="null" type="java.lang.String"/>
<netui-data:methodParameter value="42" type="java.lang.Integer"/>
</netui-data:callPageFlow>
-<netui-html:label value="${pageScope.test5}"/>
+<netui-html:span value="${pageScope.test5}"/>
<br/>
<br/>
<b>foo(String)</b>
<netui-data:callPageFlow method="foo" resultId="test6">
<netui-data:methodParameter value="42" type="java.lang.String"/>
</netui-data:callPageFlow>
-<netui-html:label value="${pageScope.test6}"/>
+<netui-html:span value="${pageScope.test6}"/>
<br/>
<br/>
<b>Error tests</b>
@@ -58,7 +58,7 @@
<netui-data:callPageFlow method="foo" resultId="test100">
<netui-data:methodParameter type="java.lang.STring" value="42"/>
</netui-data:callPageFlow>
-<netui-html:label value="${pageScope.test100}"/>
+<netui-html:span value="${pageScope.test100}"/>
<br/>
<br/>
<b>foo(String, int)</b>
@@ -66,21 +66,21 @@
<netui-data:methodParameter value="42" type="int"/>
<netui-data:methodParameter value="asdf" type="java.lang.String"/>
</netui-data:callPageFlow>
-<netui-html:label value="${pageScope.test101}"/>
+<netui-html:span value="${pageScope.test101}"/>
<br/>
<br/>
<b>foo(Integer)</b>
<netui-data:callPageFlow method="foo" resultId="test102">
<netui-data:methodParameter value="42" type="FooBar"/>
</netui-data:callPageFlow>
-<netui-html:label value="${pageScope.test102}"/>
+<netui-html:span value="${pageScope.test102}"/>
<br/>
<br/>
<b>foo(?)</b>
<netui-data:callPageFlow method="foo" resultId="test103">
<netui-data:methodParameter value="42" type=""/>
</netui-data:callPageFlow>
-<netui-html:label value="${pageScope.test103}"/>
+<netui-html:span value="${pageScope.test103}"/>
<br/>
<br/>
<hr>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/returnNull/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/returnNull/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/callMethod/returnNull/index.jsp
Tue Aug 3 15:48:42 2004
@@ -14,13 +14,13 @@
<br/>
<b>Non-Null return value</b><br/>
<netui-data:callPageFlow method="getNonNullValue" resultId="jpfSays"/>
-\${pageScope.jpfSays}: <netui:label value="${pageScope.jpfSays}"/>
+\${pageScope.jpfSays}: <netui:span value="${pageScope.jpfSays}"/>
<br/>
<br/>
<b>Null return value</b><br/>
<netui-data:callMethod object="${pageFlow}" method="getNullValue"
resultId="jpfSays"/>
-\${pageScope.jpfSays}: <netui:label value="${pageScope.jpfSays}"/>
+\${pageScope.jpfSays}: <netui:span value="${pageScope.jpfSays}"/>
<br/>
<br/>
<b>Via code:</b> <%= pageContext.getAttribute("jpfSays") %>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/cellRepeater/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/cellRepeater/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/cellRepeater/index.jsp
Tue Aug 3 15:48:42 2004
@@ -40,119 +40,119 @@
<b>4x5 with <%= itemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.itemArray" rows="4" columns="5"
tableClass="table" cellClass="cell"
alternatingCellClass="altCell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>4x5 with <%= itemArray.length %> items and databound row / column
sizes</b><br/>
<netui-data:cellRepeater dataSource="pageScope.itemArray"
rows="${pageScope.rowsStr}"
columns="${pageScope.columnsStr}"
tableClass="table" cellClass="cell"
alternatingCellClass="altCell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>4x5 (vert) with <%= itemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.itemArray" rows="4" columns="5"
verticalRepeat="true"
tableClass="table" cellClass="altCell"
alternatingCellClass="cell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>Small <%= smallItemArray.length %> Item Array</b><br/>
<br/>
<b>1x5 with <%= smallItemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.smallItemArray" rows="1"
columns="5">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>1x5 (vert) with <%= smallItemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.smallItemArray" rows="1"
columns="5" verticalRepeat="true">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>5x1 with <%= smallItemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.smallItemArray" rows="5"
columns="1">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>5x1 (vert) with <%= smallItemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.smallItemArray" rows="5"
columns="1" verticalRepeat="true">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>1x1 with <%= smallItemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.smallItemArray" rows="1"
columns="1">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>1x1 (vert) with <%= smallItemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.smallItemArray" rows="1"
columns="1" verticalRepeat="true">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>2x2 (horiz) with <%= smallItemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.smallItemArray" rows="2"
columns="2">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>2x2 (vert) with <%= smallItemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.smallItemArray" rows="2"
columns="2" verticalRepeat="true">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>Zero Item Array</b>
<br/>
<netui-data:cellRepeater dataSource="pageScope.zeroArray" rows="4" columns="5">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<netui-data:cellRepeater dataSource="pageScope.zeroArray" rows="4" columns="5"
verticalRepeat="true">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<b>Zero Item Array with styles</b>
<br/>
<netui-data:cellRepeater dataSource="pageScope.zeroArray" rows="4" columns="5"
tableClass="table" cellClass="cell"
alternatingCellClass="altCell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>NULL Array</b>
<br/>
<netui-data:cellRepeater dataSource="pageScope.nullArray" rows="4" columns="5">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>NULL Array with styles</b>
<br/>
<netui-data:cellRepeater dataSource="pageScope.nullArray" rows="4" columns="5"
tableClass="table" cellClass="cell"
alternatingCellClass="altCell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<netui-data:cellRepeater dataSource="pageScope.nullArray" rows="4" columns="5"
verticalRepeat="true">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>4x5 (vert) with <%= itemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.itemArray" rows="4"
verticalRepeat="true" tableClass="table"
cellClass="altCell" alternatingCellClass="cell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>4x5 (vert) with <%= itemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.itemArray" rows="2"
verticalRepeat="true" tableClass="table"
cellClass="altCell" alternatingCellClass="cell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>4x5 (vert) with <%= itemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.itemArray" columns="2"
verticalRepeat="true" tableClass="table"
cellClass="altCell" alternatingCellClass="cell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<b>4x5 (vert) with <%= itemArray.length %> items</b><br/>
<netui-data:cellRepeater dataSource="pageScope.itemArray" columns="2"
verticalRepeat="false" tableClass="table"
cellClass="altCell" alternatingCellClass="cell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/cellrepeatererror/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/cellrepeatererror/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/cellrepeatererror/index.jsp
Tue Aug 3 15:48:42 2004
@@ -40,7 +40,7 @@
<b>Expected Failures</b><br/>
<% try{ %>
<netui-data:cellRepeater dataSource="pageScope.nullArray" rows="-42"
columns="5">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<%}catch(Exception e){out.write(HtmlExceptionFormatter.format("Expected
failure, rows < 0", e, false));}%>
<hr/>
@@ -48,7 +48,7 @@
<br/>
<netui-data:cellRepeater dataSource="pageScope.itemArray"
verticalRepeat="false" tableClass="table"
cellClass="altCell" alternatingCellClass="cell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<% }catch(Exception e)
{out.write(HtmlExceptionFormatter.format("Expected failure, missing rows and
columns", e, false));} %>
@@ -57,7 +57,7 @@
<netui-data:cellRepeater dataSource="pageScope.itemArray"
rows="${pageScope.badRowsStr}"
columns="${pageScope.columnsStr}"
tableClass="table" cellClass="cell"
alternatingCellClass="altCell">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<br/>
<%}catch(Exception e){out.write(HtmlExceptionFormatter.format("Expected
failure, rows expression evaluates to NaN", e, false));}
@@ -66,13 +66,13 @@
<%try{%>
<br/>
<netui-data:cellRepeater dataSource="pageScope.nullArray" rows="5"
columns="-42">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<%}catch(Exception e){out.write(HtmlExceptionFormatter.format("Expected
failure, columns < 0", e, false));}%>
<hr/>
<% try{ %>
<netui-data:cellRepeater dataSource="globalApp.noCellRepeaterProperty"
rows="-42" columns="5">
- Item: <netui-html:label value="${container.item}"/>
+ Item: <netui-html:span value="${container.item}"/>
</netui-data:cellRepeater>
<%}catch(Exception e){out.write(HtmlExceptionFormatter.format("Expected
failure, rows < 0", e, false));}%>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/util/sortFilterPage.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/util/sortFilterPage.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/util/sortFilterPage.jsp
Tue Aug 3 15:48:42 2004
@@ -19,7 +19,7 @@
<table class="debug"><tr><th class="debug">Expression</th><th
class="debug">Direction</th></tr>
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <tr><td><netui:label
value="${container.item.sortExpression}"/></td><td><netui:label
value="${container.item.direction}"/></td></tr>
+ <tr><td><netui:span
value="${container.item.sortExpression}"/></td><td><netui:span
value="${container.item.direction}"/></td></tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
</table>
@@ -40,9 +40,9 @@
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label value="${container.item.filterExpression}"/></td>
- <td><netui:label value="${container.item.operation}"/></td>
- <td><netui:label value="${container.item.value}"/></td>
+ <td><netui:span value="${container.item.filterExpression}"/></td>
+ <td><netui:span value="${container.item.operation}"/></td>
+ <td><netui:span value="${container.item.value}"/></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/expressions/simple.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/expressions/simple.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/expressions/simple.jsp
Tue Aug 3 15:48:42 2004
@@ -18,11 +18,11 @@
expression and the results of that expression.
</p>
<br>
-<netui:label value="\${pageScope.stringAttr}"/>:
-<netui:label value="${pageScope.stringAttr}"/><br>
+<netui:span value="\${pageScope.stringAttr}"/>:
+<netui:span value="${pageScope.stringAttr}"/><br>
<hr>
-<netui:label value="\${'\${'}\${pageScope.stringAttr}}"/>:
-<netui:label value="${'${'}${pageScope.stringAttr}}"/><br>
+<netui:span value="\${'\${'}\${pageScope.stringAttr}}"/>:
+<netui:span value="${'${'}${pageScope.stringAttr}}"/><br>
<br/>
<br/>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/globalApp/nojpf/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/globalApp/nojpf/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/globalApp/nojpf/index.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
<b>Global App Binding -- no JPF</b>
<br/>
<br/>
-The Global.app says: <netui:label value="${globalApp.sayHello}"/>
+The Global.app says: <netui:span value="${globalApp.sayHello}"/>
<br/>
<br/>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/message/message.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/message/message.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/message/message.jsp
Tue Aug 3 15:48:42 2004
@@ -18,7 +18,7 @@
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
<br/>
-Test 1: <netui:label value="${pageScope.endMessage}"/>
+Test 1: <netui:span value="${pageScope.endMessage}"/>
<!-- TEST 2 -->
<%
@@ -29,7 +29,7 @@
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
<br/>
-Test 2: <netui:label value="${pageScope.endMessage}"/>
+Test 2: <netui:span value="${pageScope.endMessage}"/>
<!-- TEST 3 -->
<%
@@ -40,7 +40,7 @@
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
<br/>
-Test 3: <netui:label value="${pageScope.endMessage}"/>
+Test 3: <netui:span value="${pageScope.endMessage}"/>
<!-- TEST 4 -->
<%
@@ -51,7 +51,7 @@
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
<br/>
-Test 4: <netui:label value="${pageScope.endMessage}"/>
+Test 4: <netui:span value="${pageScope.endMessage}"/>
<!-- TEST 5 -->
<netui-data:declareBundle name="bundle1" bundlePath="properties.bundle1"/>
@@ -60,7 +60,7 @@
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
<br/>
-Test 5: <netui:label value="${pageScope.endMessage}"/>
+Test 5: <netui:span value="${pageScope.endMessage}"/>
<br/>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/dataStructures/repeaterBody.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/dataStructures/repeaterBody.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/dataStructures/repeaterBody.jsp
Tue Aug 3 15:48:42 2004
@@ -58,8 +58,8 @@
<table border=1><tr><td><center>Column 1</center></td><td><center>Column
2</center></td><td><center>Column 3</center></td></tr>
<netui-databinding:repeater dataSource="pageScope.currentSource">
<tr>
- <td><netui-html:label value="${container.item.textProperty}"/></td>
- <td><center><netui-html:label
value="${container.item.index}"/></center></td>
+ <td><netui-html:span value="${container.item.textProperty}"/></td>
+ <td><center><netui-html:span
value="${container.item.index}"/></center></td>
<td><netui-html:textBox dataSource="container.item.index"
size="7"/></td>
</tr>
</netui-databinding:repeater>
@@ -73,8 +73,8 @@
<netui-databinding:repeater dataSource="pageScope.currentSource">
<netui-databinding:repeaterItem>
<tr>
- <td><netui-html:label value="${container.item.textProperty}"/></td>
- <td><center><netui-html:label
value="${container.item.index}"/></center></td>
+ <td><netui-html:span value="${container.item.textProperty}"/></td>
+ <td><center><netui-html:span
value="${container.item.index}"/></center></td>
<td><netui-html:textBox dataSource="container.item.index"
size="7"/></td>
</tr>
</netui-databinding:repeaterItem>
@@ -89,8 +89,8 @@
</netui-databinding:repeaterHeader>
<netui-databinding:repeaterItem>
<tr>
- <td><netui-html:label value="${container.item.textProperty}"/></td>
- <td><center><netui-html:label
value="${container.item.index}"/></center></td>
+ <td><netui-html:span value="${container.item.textProperty}"/></td>
+ <td><center><netui-html:span
value="${container.item.index}"/></center></td>
<td><netui-html:textBox dataSource="container.item.index"
size="7"/></td>
</tr>
</netui-databinding:repeaterItem>
@@ -103,8 +103,8 @@
<netui-databinding:repeater dataSource="pageScope.currentSource">
<netui-databinding:repeaterItem>
<tr>
- <td><netui-html:label value="${container.item.textProperty}"/></td>
- <td><center><netui-html:label
value="${container.item.index}"/></center></td>
+ <td><netui-html:span value="${container.item.textProperty}"/></td>
+ <td><center><netui-html:span
value="${container.item.index}"/></center></td>
<td><netui-html:textBox dataSource="container.item.index"
size="7"/></td>
</tr>
</netui-databinding:repeaterItem>
@@ -121,8 +121,8 @@
</netui-databinding:repeaterHeader>
<netui-databinding:repeaterItem>
<tr>
- <td><netui-html:label value="${container.item.textProperty}"/></td>
- <td><center><netui-html:label
value="${container.item.index}"/></center></td>
+ <td><netui-html:span value="${container.item.textProperty}"/></td>
+ <td><center><netui-html:span
value="${container.item.index}"/></center></td>
<td><netui-html:textBox dataSource="container.item.index"
size="7"/></td>
</tr>
</netui-databinding:repeaterItem>
@@ -140,8 +140,8 @@
<table border=1><tr><td><center>Column
1</center></td><td><center>Column 2</center></td><td><center>Column
3</center></td></tr>
</netui-databinding:repeaterHeader>
<tr>
- <td><netui-html:label value="${container.item.textProperty}"/></td>
- <td><center><netui-html:label
value="${container.item.index}"/></center></td>
+ <td><netui-html:span value="${container.item.textProperty}"/></td>
+ <td><center><netui-html:span
value="${container.item.index}"/></center></td>
<td><netui-html:textBox dataSource="container.item.index"
size="7"/></td>
</tr>
</netui-databinding:repeater>
@@ -152,8 +152,8 @@
<table border=1><tr><td><center>Column 1</center></td><td><center>Column
2</center></td><td><center>Column 3</center></td></tr>
<netui-databinding:repeater dataSource="pageScope.currentSource">
<tr>
- <td><netui-html:label value="${container.item.textProperty}"/></td>
- <td><center><netui-html:label
value="${container.item.index}"/></center></td>
+ <td><netui-html:span value="${container.item.textProperty}"/></td>
+ <td><center><netui-html:span
value="${container.item.index}"/></center></td>
<td><netui-html:textBox dataSource="container.item.index"
size="7"/></td>
</tr>
<netui-databinding:repeaterFooter>
@@ -169,8 +169,8 @@
<table border=1><tr><td><center>Column
1</center></td><td><center>Column 2</center></td><td><center>Column
3</center></td></tr>
</netui-databinding:repeaterHeader>
<tr>
- <td><netui-html:label value="${container.item.textProperty}"/></td>
- <td><center><netui-html:label
value="${container.item.index}"/></center></td>
+ <td><netui-html:span value="${container.item.textProperty}"/></td>
+ <td><center><netui-html:span
value="${container.item.index}"/></center></td>
<td><netui-html:textBox dataSource="container.item.index"
size="7"/></td>
</tr>
<netui-databinding:repeaterFooter>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/nested/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/nested/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/nested/index.jsp
Tue Aug 3 15:48:42 2004
@@ -10,12 +10,12 @@
<b>Nested Repeaters</b>
<table>
<netui-data:repeater dataSource="pageInput.data">
- <tr><td><netui:label value="${container.item.name}"/></td></tr>
+ <tr><td><netui:span value="${container.item.name}"/></td></tr>
<tr>
<td>
<table>
<netui-data:repeater dataSource="container.item.numbers">
- <tr><td><netui:label value="${container.item}"/></td></tr>
+ <tr><td><netui:span value="${container.item}"/></td></tr>
</netui-data:repeater>
</table>
</td>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/pad/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/pad/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/pad/index.jsp
Tue Aug 3 15:48:42 2004
@@ -13,7 +13,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="10" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -21,7 +21,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="10" minRepeat="10" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -29,7 +29,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="11" minRepeat="10" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -37,7 +37,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="22" minRepeat="10" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -45,7 +45,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad minRepeat="11" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -53,7 +53,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad minRepeat="15" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -61,7 +61,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad minRepeat="15">FOO<br/></netui-data:pad>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -69,7 +69,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad minRepeat="15"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -77,7 +77,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="8" minRepeat="5" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -85,7 +85,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="5" minRepeat="5" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -93,7 +93,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="2" minRepeat="2" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -101,7 +101,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="2" minRepeat="1" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -109,7 +109,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="1" minRepeat="1" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -117,7 +117,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad minRepeat="1" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -125,7 +125,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad maxRepeat="1" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
@@ -133,7 +133,7 @@
<netui-data:repeater dataSource="pageFlow.simpleJavaBeans">
<netui-data:pad minRepeat="0" maxRepeat="5" padText="FOO<br/>"/>
<netui-data:repeaterItem>
- <b>array[<netui-html:label value="${container.item.index}"/>] =
<netui-html:label value="${container.item.textProperty}"/></b><br/>
+ <b>array[<netui-html:span value="${container.item.index}"/>] =
<netui-html:span value="${container.item.textProperty}"/></b><br/>
</netui-data:repeaterItem>
</netui-data:repeater>
<br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/simple/defaultText.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/simple/defaultText.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/simple/defaultText.jsp
Tue Aug 3 15:48:42 2004
@@ -23,46 +23,46 @@
<br/>
<b>defaultText attribute; null dataSource</b><br/>
<netui-data:repeater dataSource="pageScope.nullArray" defaultText="<b>No Data
To Display</b>">
- <li><netui-html:label value="${container.item}"/></li>
+ <li><netui-html:span value="${container.item}"/></li>
</netui-data:repeater>
<br/>
<br/>
<b>defaultText attribute; emptyArray (zero length) dataSource</b><br/>
<netui-data:repeater dataSource="pageScope.emptyArray" defaultText="<b>No Data
To Display</b>">
- <li><netui-html:label value="${container.item}"/></li>
+ <li><netui-html:span value="${container.item}"/></li>
</netui-data:repeater>
<br/>
<br/>
<b>defaultText attribute; tenArrayAllNull (10 length all null)
dataSource</b><br/>
<netui-data:repeater dataSource="pageScope.tenArrayAllNull" defaultText="<b>No
Data To Display</b>">
- <li><netui-html:label value="${container.item}"/></li>
+ <li><netui-html:span value="${container.item}"/></li>
</netui-data:repeater>
<br/>
<br/>
<b>defaultText attribute; tenArrayAllNull (10 length all null) dataSource,
ignoreNulls</b><br/>
<netui-data:repeater dataSource="pageScope.tenArrayAllNull" ignoreNulls="true"
defaultText="<b>No Data To Display</b>">
- <li><netui-html:label value="${container.item}"/></li>
+ <li><netui-html:span value="${container.item}"/></li>
</netui-data:repeater>
<br/>
<br/>
<b>defaultText attribute; header; item; footer; non-null, empty
dataSource</b><br/>
<netui-data:repeater dataSource="pageScope.nullArray" defaultText="<b>No Data
To Display</b>">
<netui-data:repeaterHeader><table border=1></netui-data:repeaterHeader>
- <netui-data:repeaterItem><netui-html:label
value="${container.item}"/><br/></netui-data:repeaterItem>
+ <netui-data:repeaterItem><netui-html:span
value="${container.item}"/><br/></netui-data:repeaterItem>
<netui-data:repeaterHeader></table></netui-data:repeaterHeader>
</netui-data:repeater>
<br/>
<br/>
<b>defaultText attribute; non-null (5 length String[]) dataSource</b><br/>
<netui-data:repeater dataSource="pageScope.stringArray" defaultText="<b>No
Data To Display</b>">
- <li><netui-html:label value="${container.item}"/></li>
+ <li><netui-html:span value="${container.item}"/></li>
</netui-data:repeater>
<br/>
<br/>
<b>defaultText attribute; emptyArray (zero length) dataSource,
header/item/footer</b><br/>
<netui-data:repeater dataSource="pageScope.emptyArray" defaultText="<b>No Data
To Display</b>">
<netui-data:repeaterHeader><ul></netui-data:repeaterHeader>
- <netui-data:repeaterItem><li><netui-html:label
value="${container.item}"/></li></netui-data:repeaterItem>
+ <netui-data:repeaterItem><li><netui-html:span
value="${container.item}"/></li></netui-data:repeaterItem>
<netui-data:repeaterFooter></ul></netui-data:repeaterFooter>
</netui-data:repeater>
<br/>
@@ -70,7 +70,7 @@
<b>defaultText attribute; tenArrayAllNull (10 length all null) dataSource,
header/item/footer</b><br/>
<netui-data:repeater dataSource="pageScope.tenArrayAllNull" defaultText="<b>No
Data To Display</b>">
<netui-data:repeaterHeader>HEADER<br/><ul></netui-data:repeaterHeader>
- <netui-data:repeaterItem><li><netui-html:label
value="${container.item}"/></li></netui-data:repeaterItem>
+ <netui-data:repeaterItem><li><netui-html:span
value="${container.item}"/></li></netui-data:repeaterItem>
<netui-data:repeaterFooter></ul>FOOTER<br/></netui-data:repeaterFooter>
</netui-data:repeater>
<br/>
@@ -78,7 +78,7 @@
<b>defaultText attribute; tenArrayAllNull (10 length all null) dataSource,
ignoreNulls</b><br/>
<netui-data:repeater dataSource="pageScope.tenArrayAllNull" ignoreNulls="true"
defaultText="<b>No Data To Display</b>">
<netui-data:repeaterHeader>HEADER<br/><ul></netui-data:repeaterHeader>
- <netui-data:repeaterItem><li><netui-html:label
value="${container.item}"/></li></netui-data:repeaterItem>
+ <netui-data:repeaterItem><li><netui-html:span
value="${container.item}"/></li></netui-data:repeaterItem>
<netui-data:repeaterFooter></ul>FOOTER<br/></netui-data:repeaterFooter>
</netui-data:repeater>
<br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/simple/ignoreNulls.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/simple/ignoreNulls.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/repeater/simple/ignoreNulls.jsp
Tue Aug 3 15:48:42 2004
@@ -23,7 +23,7 @@
<b>denseArray, ignoreNulls=true</b><br/>
<ul>
<netui-data:repeater dataSource="pageScope.denseArray" ignoreNulls="true">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
<br/>
@@ -31,7 +31,7 @@
<b>denseArray, ignoreNulls=false</b><br/>
<ul>
<netui-data:repeater dataSource="pageScope.denseArray" ignoreNulls="false">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
<br/>
@@ -41,7 +41,7 @@
<b>sparseArray, ignoreNulls=true</b><br/>
<ul>
<netui-data:repeater dataSource="pageScope.sparseArray" ignoreNulls="true">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
<br/>
@@ -49,7 +49,7 @@
<b>sparseArray, ignoreNulls=false</b><br/>
<ul>
<netui-data:repeater dataSource="pageScope.sparseArray" ignoreNulls="false">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
<br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/simplerepeater/simpleRepeater.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/simplerepeater/simpleRepeater.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/simplerepeater/simpleRepeater.jsp
Tue Aug 3 15:48:42 2004
@@ -20,7 +20,7 @@
<netui-data:repeaterItem>
<tr>
<td>
- <netui:label value="${container.item}"/>
+ <netui:span value="${container.item}"/>
</td>
</tr>
</netui-data:repeaterItem>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/typeConverter/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/typeConverter/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/typeConverter/index.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<h1>Person Type Converter Test</h1>
<netui-html:form action="postback">
<table>
-<tr><td><b>Current Person</b>:</td><td><netui-html:label
value="${actionForm.person}"/></td></tr>
+<tr><td><b>Current Person</b>:</td><td><netui-html:span
value="${actionForm.person}"/></td></tr>
<tr><td>New Person</td><td><netui-html:textBox
dataSource="actionForm.person"/></td></tr>
<tr><td colspan=2><netui-html:button>Submit</netui-html:button></td></tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/demo/DemoResults.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/demo/DemoResults.jsp
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/demo/DemoResults.jsp
Tue Aug 3 15:48:42 2004
@@ -8,12 +8,12 @@
<temp:setAttribute name="pageTitle" value="Demo Results" />
<temp:section name="wizBody">
</tr><tr>
- <td class="wizbody" colspan="3">Name: <b><netui:label
value="${pageFlow.name}"/></b></td>
+ <td class="wizbody" colspan="3">Name: <b><netui:span
value="${pageFlow.name}"/></b></td>
</tr>
<db:repeater dataSource="pageFlow.results">
<db:repeaterItem>
<tr>
- <td class="wizbody" colspan="3"><netui:label
value="${container.item}"/></td>
+ <td class="wizbody" colspan="3"><netui:span
value="${container.item}"/></td>
</tr>
</db:repeaterItem>
</db:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/directFormTest/formTest.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/directFormTest/formTest.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/directFormTest/formTest.jsp
Tue Aug 3 15:48:42 2004
@@ -44,9 +44,9 @@
<db:repeater dataSource="pageFlow.info">
<db:repeaterItem>
<tr>
- <td width="100px" ><netui:label value="${container.item.name}"/></td>
- <td width="300px"><netui:label value="${container.item.value}"/></td>
- <td><netui:label value="${container.item.change}"/></td>
+ <td width="100px" ><netui:span value="${container.item.name}"/></td>
+ <td width="300px"><netui:span value="${container.item.value}"/></td>
+ <td><netui:span value="${container.item.change}"/></td>
</tr>
</db:repeaterItem>
</db:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/cellRepeaterError/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/cellRepeaterError/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/cellRepeaterError/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -18,13 +18,13 @@
<b>Error in Cell Repeater - rows/cols</b>
<db:cellRepeater
dataSource="pageFlow.data" >
- Item: <netui:label value="${container.item}" />
+ Item: <netui:span value="${container.item}" />
</db:cellRepeater>
<hr />
<b>Error in Cell Repeater - datasource</b>
<db:cellRepeater
dataSource="pageFlow.foo" rows="5">
- Item: <netui:label value="${container.item}" />
+ Item: <netui:span value="${container.item}" />
</db:cellRepeater>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/radioButtonError/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/radioButtonError/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/radioButtonError/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,6 +10,6 @@
<netui:button type="submit">Submit</netui:button>
</netui:form>
<br />
-Selected: <netui:label value="${pageFlow.radioSelect}" />
+Selected: <netui:span value="${pageFlow.radioSelect}" />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/repeaterErrors/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/repeaterErrors/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/repeaterErrors/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -9,7 +9,7 @@
<br />
<b>standalone repeaterItem</b></br>
<db:repeaterItem>
- <netui:label value="${container.item}"/><br />
+ <netui:span value="${container.item}"/><br />
</db:repeaterItem>
<b>standalone repeaterHeader</b></br>
@@ -25,7 +25,7 @@
<b>Expression Error</b></br>
<db:repeater dataSource="pageFlow.foo" >
<db:repeaterItem>
- <netui:label value="${container.item}"/><br />
+ <netui:span value="${container.item}"/><br />
</db:repeaterItem>
</db:repeater>
<br />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/repeaterPadError/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/repeaterPadError/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/errors/repeaterPadError/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad maxRepeat="-1" minRepeat="-1"><td width="100pt"> </td></db:pad>
</db:repeater>
@@ -19,7 +19,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad minRepeat="16" maxRepeat="10"><td width="100pt"> </td></db:pad>
</db:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/except/ErrorPage.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/except/ErrorPage.jsp
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/except/ErrorPage.jsp
Tue Aug 3 15:48:42 2004
@@ -5,7 +5,7 @@
</head>
<body>
<h4>Report Exception</h4>
-Message <netui:label value="${pageFlow.message}"/><br />
+Message <netui:span value="${pageFlow.message}"/><br />
<netui:anchor action="goHome">Return</netui:anchor>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test1/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test1/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test1/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
</font>
<center>
<netui:form action="jpfAction1">
- Field1 value: <netui:label value="${actionForm.field1}"/>
+ Field1 value: <netui:span value="${actionForm.field1}"/>
</netui:form>
<br/>
<netui:anchor action="jpfAction1">Continue</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test1/Jsp3.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test1/Jsp3.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test1/Jsp3.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
</font>
<center>
<netui:form action="jpfAction3">
- Field1 value: <netui:label value="${actionForm.field1}"/>
+ Field1 value: <netui:span value="${actionForm.field1}"/>
</netui:form>
<br/>
<netui:anchor action="jpfAction3">Continue</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test2/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test2/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formBean/test2/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -17,7 +17,7 @@
<table>
<tr>
<td>Field1 Value:</td>
- <td><netui:label value="${actionForm.field1}"/></td>
+ <td><netui:span value="${actionForm.field1}"/></td>
</tr>
</table>
<netui:button action="jpfAction1" value="continue" type="submit"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formTest/formTest.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formTest/formTest.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/formTest/formTest.jsp
Tue Aug 3 15:48:42 2004
@@ -44,9 +44,9 @@
<db:repeater dataSource="pageFlow.info">
<db:repeaterItem>
<tr>
- <td width="100px" ><netui:label value="${container.item.name}"/></td>
- <td width="300px"><netui:label value="${container.item.value}"/></td>
- <td><netui:label value="${container.item.change}"/></td>
+ <td width="100px" ><netui:span value="${container.item.name}"/></td>
+ <td width="300px"><netui:span value="${container.item.value}"/></td>
+ <td><netui:span value="${container.item.change}"/></td>
</tr>
</db:repeaterItem>
</db:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/i18n/localeOverride/index.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
<body>
<b>i18n Override Test</b>
<br/>
-<netui:label value="${bundle.default.message1}"/>
+<netui:span value="${bundle.default.message1}"/>
<br/>
<netui:anchor action="resetLocale">Reset Locale</netui:anchor>
<br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsAllScript/Results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsAllScript/Results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsAllScript/Results.jsp
Tue Aug 3 15:48:42 2004
@@ -13,9 +13,9 @@
<body>
<netui:anchor action="begin">Home</netui:anchor><br>
<hr />
- anchorForm: <netui:label value="${param.anchorForm}"></netui:label>
<br /><br />
- LastName: <netui:label
value="${pageInput.names.firstName}"></netui:label><br />
- FirstName: <netui:label
value="${pageInput.names.lastName}"></netui:label><br />
+ anchorForm: <netui:span value="${param.anchorForm}"></netui:span> <br
/><br />
+ LastName: <netui:span
value="${pageInput.names.firstName}"></netui:span><br />
+ FirstName: <netui:span
value="${pageInput.names.lastName}"></netui:span><br />
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsAllScriptHtml/Results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsAllScriptHtml/Results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsAllScriptHtml/Results.jsp
Tue Aug 3 15:48:42 2004
@@ -13,9 +13,9 @@
<body>
<netui:anchor action="begin">Home</netui:anchor><br>
<hr />
- anchorForm: <netui:label value="${param.anchorForm}"></netui:label>
<br /><br />
- LastName: <netui:label
value="${pageInput.names.firstName}"></netui:label><br />
- FirstName: <netui:label
value="${pageInput.names.lastName}"></netui:label><br />
+ anchorForm: <netui:span value="${param.anchorForm}"></netui:span> <br
/><br />
+ LastName: <netui:span
value="${pageInput.names.firstName}"></netui:span><br />
+ FirstName: <netui:span
value="${pageInput.names.lastName}"></netui:span><br />
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsFind/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsFind/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsFind/index.jsp
Tue Aug 3 15:48:42 2004
@@ -22,7 +22,7 @@
<netui:button value="postForm" type="submit"/>
</netui:form>
<hr />
- Type: <netui:label value="${pageFlow.type}"></netui:label>
+ Type: <netui:span value="${pageFlow.type}"></netui:span>
<script language="JavaScript" type="text/JavaScript">
var name = getNetuiTagName("select");
document.writeln("<br/>Select Name:" + name + "<br/>");
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsNoContainers/Results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsNoContainers/Results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsNoContainers/Results.jsp
Tue Aug 3 15:48:42 2004
@@ -13,9 +13,9 @@
<body>
<netui:anchor action="begin">Home</netui:anchor><br>
<hr />
- anchorForm: <netui:label value="${param.anchorForm}"></netui:label>
<br /> <br />
- LastName: <netui:label
value="${pageInput.names.firstName}"></netui:label><br />
- FirstName: <netui:label
value="${pageInput.names.lastName}"></netui:label><br />
+ anchorForm: <netui:span value="${param.anchorForm}"></netui:span> <br
/> <br />
+ LastName: <netui:span
value="${pageInput.names.firstName}"></netui:span><br />
+ FirstName: <netui:span
value="${pageInput.names.lastName}"></netui:span><br />
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsScriptScopeId/Results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsScriptScopeId/Results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/javascript/jsScriptScopeId/Results.jsp
Tue Aug 3 15:48:42 2004
@@ -13,10 +13,10 @@
<body>
<netui:anchor action="begin">Home</netui:anchor><br>
<hr />
- anchorForm: <netui:label value="${param.anchorForm}"></netui:label>
<br />
- scope: <netui:label value="${param.scope}"></netui:label> <br /><br />
- LastName: <netui:label
value="${pageInput.names.firstName}"></netui:label><br />
- FirstName: <netui:label
value="${pageInput.names.lastName}"></netui:label><br />
+ anchorForm: <netui:span value="${param.anchorForm}"></netui:span> <br
/>
+ scope: <netui:span value="${param.scope}"></netui:span> <br /><br />
+ LastName: <netui:span
value="${pageInput.names.firstName}"></netui:span><br />
+ FirstName: <netui:span
value="${pageInput.names.lastName}"></netui:span><br />
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test49/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test49/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test49/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -17,12 +17,12 @@
<br/>
<netui:form action="action2">
<font color="blue">
- String 1: <netui:label value="${actionForm.string1}"/>
+ String 1: <netui:span value="${actionForm.string1}"/>
</font>
<br/>
<font color="blue">
- String 2: <netui:label value="${actionForm.string2}"/>
+ String 2: <netui:span value="${actionForm.string2}"/>
</font>
<br/><br/>
<netui:button type="submit">Continue...</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test50/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test50/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test50/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -17,12 +17,12 @@
<br/>
<netui:form action="finish">
<font color="blue">
- String 1: <netui:label value="${actionForm.string1}"/>
+ String 1: <netui:span value="${actionForm.string1}"/>
</font>
<br/>
<font color="blue">
- String 2: <netui:label value="${actionForm.string2}"/>
+ String 2: <netui:span value="${actionForm.string2}"/>
</font>
<br/><br/>
<netui:button type="submit">Finish...</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test51/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test51/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test51/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -17,12 +17,12 @@
<br/>
<netui:form action="finish">
<font color="blue">
- String 1: <netui:label value="${actionForm.string1}"/>
+ String 1: <netui:span value="${actionForm.string1}"/>
</font>
<br/>
<font color="blue">
- String 2: <netui:label value="${actionForm.string2}"/>
+ String 2: <netui:span value="${actionForm.string2}"/>
</font>
<br/><br/>
<netui:button type="submit">Finish...</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test59/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test59/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/jpfScopedForms/test59/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -17,12 +17,12 @@
<br/>
<netui:form action="action1">
<font color="blue">
- String 1: <netui:label value="${actionForm.string1}"/>
+ String 1: <netui:span value="${actionForm.string1}"/>
</font>
<br/>
<font color="blue">
- String 2: <netui:label value="${actionForm.string2}"/>
+ String 2: <netui:span value="${actionForm.string2}"/>
</font>
<br/><br/>
<font color="green">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/actionChaining/result.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/actionChaining/result.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/actionChaining/result.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
</title>
</head>
<body>
- Forms were the same? <b><netui:label
value="${pageInput.isSameForm}"/></b>
+ Forms were the same? <b><netui:span
value="${pageInput.isSameForm}"/></b>
<br>
<br>
<netui:anchor action="begin">back</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/anchorFormPosting/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/anchorFormPosting/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/anchorFormPosting/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -15,6 +15,6 @@
<netui:parameter name="firstName" value="FirstName"/><br />
</netui:anchor>
<hr />
-Value: <netui:label value="${pageFlow.value}"/><br />
+Value: <netui:span value="${pageFlow.value}"/><br />
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/anchorPosting/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/anchorPosting/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/anchorPosting/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -15,8 +15,8 @@
<netui:parameter name="{pageFlow.name}" value="foo"/><br>
<netui:parameter name="{pageFlow.type}" value="bar"/><br>
</netui:anchor>
-Name: <netui:label value="${pageFlow.name}"/><br>
-Type: <netui:label value="${pageFlow.type}"/><br>
+Name: <netui:span value="${pageFlow.name}"/><br>
+Type: <netui:span value="${pageFlow.type}"/><br>
<hr>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/appState/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/appState/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/appState/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -11,7 +11,7 @@
binding is done the page flow. The page flow exposes a a property that passes
through the property
on the global app. This is a single page test.
</p>
-App State: <netui:label value="${globalApp.appState}"/><br>
-App State through page flow: <netui:label value="${pageFlow.appInfo}"/>
+App State: <netui:span value="${globalApp.appState}"/><br>
+App State through page flow: <netui:span value="${pageFlow.appInfo}"/>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/attrBinding/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/attrBinding/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/attrBinding/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -13,37 +13,37 @@
page test.
</p>
<h4>Base Type Attributes</h4>
-int Property: <netui:label value="${pageFlow.prop1}"/><br>
-String Property: <netui:label value="${pageFlow.prop2}"/><br>
-float Property: <netui:label value="${pageFlow.prop3}"/><br>
-boolean Property: <netui:label value="${pageFlow.prop4}"/><br>
+int Property: <netui:span value="${pageFlow.prop1}"/><br>
+String Property: <netui:span value="${pageFlow.prop2}"/><br>
+float Property: <netui:span value="${pageFlow.prop3}"/><br>
+boolean Property: <netui:span value="${pageFlow.prop4}"/><br>
<h4>Base Type Array Attributes</h4>
<b>int[]</b><br>
<table><tr>
<db:repeater dataSource="pageFlow.props1">
- <td width="50px"><netui:label value="${container.item}"/></td>
+ <td width="50px"><netui:span value="${container.item}"/></td>
</db:repeater>
</tr></table>
<b>String[]</b></br>
<table><tr>
<db:repeater dataSource="pageFlow.props2">
- <td width="50px"><netui:label value="${container.item}"/></td>
+ <td width="50px"><netui:span value="${container.item}"/></td>
</db:repeater>
</tr></table>
<b>float[]</b></br>
<table><tr>
<db:repeater dataSource="pageFlow.props3">
- <td width="50px"><netui:label value="${container.item}"/></td>
+ <td width="50px"><netui:span value="${container.item}"/></td>
</db:repeater>
</tr></table>
<b>boolean[]</b></br>
<table><tr>
<db:repeater dataSource="pageFlow.props4">
- <td width="50px"><netui:label value="${container.item}"/></td>
+ <td width="50px"><netui:span value="${container.item}"/></td>
</db:repeater>
</tr></table>
</netui:body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/beginForm/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/beginForm/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/beginForm/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -7,6 +7,6 @@
<h4>Pass a Form to a Begin</h4>
<netui:anchor action="getUserInfo">Get User</netui:anchor>
<hr />
-User: <netui:label value="${pageFlow.user}"/><br />
+User: <netui:span value="${pageFlow.user}"/><br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/binding/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/binding/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/binding/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -7,20 +7,20 @@
</head>
<body>
<h4>Binding To Structures and fields</h4>
-HashMap["foo"]: <b><netui:label value='${pageFlow.hashValue["foo"]}' /></b><br
/>
-HashMap."Baz": <b><netui:label value="${pageFlow.hashValue.baz}" /></b><br />
-Hash.Array[3]: <b><netui:label value="${pageFlow.hashValue.array[3]}"/></b><br
/>
-Array [2]: <b><netui:label value="${pageFlow.array[2]}"/></b><br />
-public.field: <b><netui:label value="${pageFlow.pubField}"/></b><br />
-public.Array [1]: <b><netui:label value="${pageFlow.pubArray[1]}"/></b><br />
-class.field: <b><netui:label value="${pageFlow.info.value}"/></b><br />
-Hash.class.field: <b><netui:label
value="${pageFlow.hashValue.info.value}"/></b><br />
-public.class.field: <b><netui:label value="${pageFlow.pubInfo.value}"/></b><br
/>
-public Hash["foo"]: <b><netui:label
value='${pageFlow.pubHash["foo"]}'/></b><br />
-public Hash "Baz" with ".": <b><netui:label
value="${pageFlow.pubHash.baz}"/></b><br />
-public Hash <null> with ".": <b><netui:label
value="${pageFlow.pubHash.nullValue}"/></b><br />
-public Hash <null> with ["nullValue"]: <b><netui:label
value='${pageFlow.pubHash["nullValue"]}'/></b><br />
-public, existing null field: <b><netui:label
value='${pageFlow.nullField}'/></b><br />
+HashMap["foo"]: <b><netui:span value='${pageFlow.hashValue["foo"]}' /></b><br
/>
+HashMap."Baz": <b><netui:span value="${pageFlow.hashValue.baz}" /></b><br />
+Hash.Array[3]: <b><netui:span value="${pageFlow.hashValue.array[3]}"/></b><br
/>
+Array [2]: <b><netui:span value="${pageFlow.array[2]}"/></b><br />
+public.field: <b><netui:span value="${pageFlow.pubField}"/></b><br />
+public.Array [1]: <b><netui:span value="${pageFlow.pubArray[1]}"/></b><br />
+class.field: <b><netui:span value="${pageFlow.info.value}"/></b><br />
+Hash.class.field: <b><netui:span
value="${pageFlow.hashValue.info.value}"/></b><br />
+public.class.field: <b><netui:span value="${pageFlow.pubInfo.value}"/></b><br
/>
+public Hash["foo"]: <b><netui:span value='${pageFlow.pubHash["foo"]}'/></b><br
/>
+public Hash "Baz" with ".": <b><netui:span
value="${pageFlow.pubHash.baz}"/></b><br />
+public Hash <null> with ".": <b><netui:span
value="${pageFlow.pubHash.nullValue}"/></b><br />
+public Hash <null> with ["nullValue"]: <b><netui:span
value='${pageFlow.pubHash["nullValue"]}'/></b><br />
+public, existing null field: <b><netui:span
value='${pageFlow.nullField}'/></b><br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/breakoutNesting/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/breakoutNesting/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/breakoutNesting/index.jsp
Tue Aug 3 15:48:42 2004
@@ -11,7 +11,7 @@
<body>
<h3>Stateful Controller</h3>
- state: <b><netui:label value="${pageFlow.someState}"/></b>
+ state: <b><netui:span value="${pageFlow.someState}"/></b>
<br>
<br>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/breakoutNesting/other/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/breakoutNesting/other/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/breakoutNesting/other/index.jsp
Tue Aug 3 15:48:42 2004
@@ -11,7 +11,7 @@
<body>
<h3>Other Controller</h3>
- page flow stack: <b><netui:label value="${pageInput.pfStack}"/></b>
+ page flow stack: <b><netui:span value="${pageInput.pfStack}"/></b>
<br>
<br>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/buttonSubmit/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/buttonSubmit/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/buttonSubmit/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -9,6 +9,6 @@
<netui:button type="submit" action="/buttonTwo" >Button Two</netui:button>
</netui:form>
<br />
-Last Action: <netui:label value="${pageFlow.action}"/>
+Last Action: <netui:span value="${pageFlow.action}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/cellRepeater/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/cellRepeater/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/cellRepeater/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -21,36 +21,36 @@
tableClass="cellTable"
cellClass="cellCell"
rows="4" columns="4">
- Item: <netui:label value="${container.item}" />
+ Item: <netui:span value="${container.item}" />
</db:cellRepeater>
<hr />
<b>less cells than data</b>
<db:cellRepeater dataSource="pageFlow.data" rows="3" columns="2">
- Item: <netui:label value="${container.item}" />
+ Item: <netui:span value="${container.item}" />
</db:cellRepeater>
<hr />
<b>Veritical Repeat</b>
<db:cellRepeater verticalRepeat="true"
dataSource="pageFlow.data" rows="2" columns="3">
- Item: <netui:label value="${container.item}" />
+ Item: <netui:span value="${container.item}" />
</db:cellRepeater>
<hr />
<b>Vertical Repeat = false</b>
<db:cellRepeater verticalRepeat="false"
dataSource="pageFlow.data" rows="2" columns="3">
- Item: <netui:label value="${container.item}" />
+ Item: <netui:span value="${container.item}" />
</db:cellRepeater>
<hr />
<b>Databind rows</b>
<db:cellRepeater
dataSource="pageFlow.data" rows="${pageFlow.rows}">
- Item: <netui:label value="${container.item}" />
+ Item: <netui:span value="${container.item}" />
</db:cellRepeater>
<hr />
<b>Databind cols</b>
<db:cellRepeater
dataSource="pageFlow.data" columns="${pageFlow.cols}">
- Item: <netui:label value="${container.item}" />
+ Item: <netui:span value="${container.item}" />
</db:cellRepeater>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/exceptHier/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/exceptHier/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/exceptHier/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -13,6 +13,6 @@
<netui:anchor action="throwSubLocal">Throw a ExceptSub with local - local sub
handler</netui:anchor><br />
<netui:anchor action="throwRuntime">Throw a Runtime - global
handler</netui:anchor><br />
<hr />
-Message <netui:label value="${pageFlow.message}"/>
+Message <netui:span value="${pageFlow.message}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValid/Results.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
</title>
</head>
<body>
- <netui:label value="Name: " /> <netui:label
value="${pageFlow.form.name}" /><br />
- <netui:label value="Type:" /> <netui:label
value="${pageFlow.form.type}"/>
+ <netui:span value="Name: " /> <netui:span
value="${pageFlow.form.name}" /><br />
+ <netui:span value="Type:" /> <netui:span
value="${pageFlow.form.type}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/formValidAnnot/Results.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
</title>
</head>
<body>
- <netui:label value="Name: " /> <netui:label
value="${pageFlow.form.name}" /><br />
- <netui:label value="Type:" /> <netui:label
value="${pageFlow.form.type}"/>
+ <netui:span value="Name: " /> <netui:span
value="${pageFlow.form.name}" /><br />
+ <netui:span value="Type:" /> <netui:span
value="${pageFlow.form.type}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/globalForwards/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/globalForwards/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/globalForwards/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -6,7 +6,7 @@
</head>
<body>
<h4>Global Forwards</h4>
-Last Action: <b><netui:label value="${pageFlow.action}"/></b><br />
+Last Action: <b><netui:span value="${pageFlow.action}"/></b><br />
<netui:anchor action="/next" >Next</netui:anchor>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/globalForwards/Page1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/globalForwards/Page1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/globalForwards/Page1.jsp
Tue Aug 3 15:48:42 2004
@@ -6,7 +6,7 @@
</head>
<body>
<h4>Global Forwards Next Page</h4>
-Last Action: <b><netui:label value="${pageFlow.action}"/></b><br />
+Last Action: <b><netui:span value="${pageFlow.action}"/></b><br />
<netui:anchor action="/home">Home</netui:anchor>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/lifecycleExceptions/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/lifecycleExceptions/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/lifecycleExceptions/index.jsp
Tue Aug 3 15:48:42 2004
@@ -24,9 +24,9 @@
<ul>
<netui-data:repeater dataSource="pageFlow.history">
<netui-data:repeaterItem>
- <li><netui:label value="${container.item.message}"/>
- threw a <netui:label
value="${container.item.exceptionName}"/>
- (<netui:label
value="${container.item.actionName}"/>)</li>
+ <li><netui:span value="${container.item.message}"/>
+ threw a <netui:span
value="${container.item.exceptionName}"/>
+ (<netui:span
value="${container.item.actionName}"/>)</li>
</netui-data:repeaterItem>
</netui-data:repeater>
</ul>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/linkNav/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/linkNav/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/linkNav/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -7,6 +7,6 @@
<netui:anchor action="/linkOne" >Link One</netui:anchor>
<netui:anchor action="/linkTwo" >Link Two</netui:anchor>
<br />
-Last Action: <netui:label value="${pageFlow.action}"/>
+Last Action: <netui:span value="${pageFlow.action}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multiForms/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multiForms/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multiForms/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -6,11 +6,11 @@
<body>
<netui:form action="/buttonOne">
<netui:textBox dataSource="actionForm.name" /><br />
-Input Value:<netui:label value="${actionForm.name}" /><br />
+Input Value:<netui:span value="${actionForm.name}" /><br />
<netui:button type="submit" action="buttonOne" >Button One</netui:button>
<netui:button type="submit" action="buttonTwo" >Button Two</netui:button>
</netui:form>
<br />
-Last Action: <netui:label value="${pageFlow.action}"/>
+Last Action: <netui:span value="${pageFlow.action}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multipartRequest/output.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multipartRequest/output.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multipartRequest/output.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
FormProp:
</td>
<td>
- <netui:label value="${actionForm.formProp}"/>
+ <netui:span value="${actionForm.formProp}"/>
</td>
</tr>
<tr valign="top">
@@ -20,7 +20,7 @@
PfProp:
</td>
<td>
- <netui:label value="${pageFlow.pfProp}"/>
+ <netui:span value="${pageFlow.pfProp}"/>
</td>
</tr>
<tr valign="top">
@@ -28,7 +28,7 @@
FormFile:
</td>
<td>
- <netui:label value="${actionForm.fileContents}"/>
+ <netui:span value="${actionForm.fileContents}"/>
</td>
</tr>
<tr valign="top">
@@ -36,7 +36,7 @@
PfFile:
</td>
<td>
- <netui:label value="${pageFlow.fileContents}"/>
+ <netui:span value="${pageFlow.fileContents}"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multipleForms/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multipleForms/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/multipleForms/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -14,6 +14,6 @@
<netui:button type="submit" >Submit</netui:button>
</netui:form>
<br />
-Last Action: <netui:label value="${pageFlow.action}"/>
+Last Action: <netui:span value="${pageFlow.action}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestedFormReturn/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestedFormReturn/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestedFormReturn/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -12,6 +12,6 @@
<netui:button type="submit">Submit</netui:button>
</netui:form>
<br />
-Return Information: <netui:label value="${pageFlow.value}"/>
+Return Information: <netui:span value="${pageFlow.value}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nesting/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nesting/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nesting/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -6,6 +6,6 @@
<body>
<netui:anchor action="/nest" >Nest Page Flow</netui:anchor>
<br />
-Last Action: <netui:label value="${pageFlow.action}"/>
+Last Action: <netui:span value="${pageFlow.action}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestingRepeater/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestingRepeater/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestingRepeater/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,13 +10,13 @@
<db:repeater dataSource="pageFlow.data">
<db:repeaterItem>
<tr>
- <td><b><netui:label value="${container.item.name}"/></b></td>
+ <td><b><netui:span value="${container.item.name}"/></b></td>
<db:repeater dataSource="container.item.values">
<db:repeaterItem>
- <td><netui:label value="${container.item}"/></td>
+ <td><netui:span value="${container.item}"/></td>
</db:repeaterItem>
</db:repeater>
- <td><b><netui:label value="${container.item.end}"/></b></td>
+ <td><b><netui:span value="${container.item.end}"/></b></td>
</tr>
</db:repeaterItem>
</db:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestingScope/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestingScope/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/nestingScope/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -7,6 +7,6 @@
<h4>Scope One</h4>
<netui:anchor action="/nav">Navigate</netui:anchor><br />
<netui:anchor action="/nestPageFlow">Nest Page Flow</netui:anchor><br />
-Count: <netui:label value="${pageFlow.visits}"/>
+Count: <netui:span value="${pageFlow.visits}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overloadedActions/page1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overloadedActions/page1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/overloadedActions/page1.jsp
Tue Aug 3 15:48:42 2004
@@ -11,13 +11,13 @@
<h3>getActions test</h3>
-<font color="Blue"><netui:label
value="${requestScope.message}"/></font><br><br>
+<font color="Blue"><netui:span value="${requestScope.message}"/></font><br><br>
Actions in this pageflow:
<ul>
<netui-data:repeater dataSource="pageFlow.actions">
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}"/>
+ <li><netui:span value="${container.item}"/>
</netui-data:repeaterItem>
</netui-data:repeater>
</ul>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/padRepeater/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/padRepeater/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/padRepeater/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad maxRepeat="6" minRepeat="6"><td width="100pt"> </td></db:pad>
</db:repeater>
@@ -19,7 +19,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad maxRepeat="3"><td width="100pt"> </td></db:pad>
</db:repeater>
@@ -28,7 +28,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad minRepeat="3"><td width="100pt"> </td></db:pad>
</db:repeater>
@@ -37,7 +37,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad minRepeat="6"><td width="100pt"> </td></db:pad>
</db:repeater>
@@ -46,7 +46,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad minRepeat="6" padText='<td width="100pt"> </td>' />
</db:repeater>
@@ -55,7 +55,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad minRepeat="${pageFlow.min}" padText="${pageFlow.text}" />
</db:repeater>
@@ -64,7 +64,7 @@
<db:repeater dataSource="pageFlow.strings">
<db:repeaterHeader><table border="1" cellpadding="0"
cellspacing="0"><tr></db:repeaterHeader>
<db:repeaterFooter></tr></table></db:repeaterFooter>
- <db:repeaterItem><td width="100pt"><netui:label
value="${container.item}"/></td>
+ <db:repeaterItem><td width="100pt"><netui:span
value="${container.item}"/></td>
</db:repeaterItem>
<db:pad maxRepeat="${pageFlow.max}" padText="${pageFlow.text}" />
</db:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageScope/scopeOne/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageScope/scopeOne/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageScope/scopeOne/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -7,6 +7,6 @@
<h4>Scope One</h4>
<netui:anchor action="/nav">Navigate</netui:anchor><br />
<netui:anchor action="/changePageFlow">Change Page Flow</netui:anchor><br />
-Count: <netui:label value="${pageFlow.visits}"/>
+Count: <netui:span value="${pageFlow.visits}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageScope/scopeTwo/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageScope/scopeTwo/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageScope/scopeTwo/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -7,6 +7,6 @@
<h4>Scope Two</h4>
<netui:anchor action="/nav">Navigate</netui:anchor><br />
<netui:anchor action="/changePageFlow">Change Page Flow</netui:anchor><br />
-Count: <netui:label value="${pageFlow.visits}"/>
+Count: <netui:span value="${pageFlow.visits}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/readonlyAction/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/readonlyAction/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/readonlyAction/index.jsp
Tue Aug 3 15:48:42 2004
@@ -27,7 +27,7 @@
<ul>
<netui-data:repeater dataSource="pageFlow.history">
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeaterItem>
</netui-data:repeater>
</ul>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/returnToPage/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/returnToPage/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/returnToPage/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -7,6 +7,6 @@
<h4>Return To Page</h4>
<netui:anchor action="/nest" >Nest Page Flow</netui:anchor>
<br />
-Last Action: <netui:label value="${pageFlow.action}"/>
+Last Action: <netui:span value="${pageFlow.action}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/upload/results.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<body>
<h3>File Upload Results</h3>
- <i>Label:</i> <netui:label value="${pageInput.init.label}"/>
+ <i>Label:</i> <netui:span value="${pageInput.init.label}"/>
<br>
<br>
<i>File Contents:</i>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/urlBinding/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/urlBinding/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/urlBinding/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -11,8 +11,8 @@
<netui:parameter name="baz" value="param-baz"/>
</netui:anchor>
<hr />
-Foo <netui:label value="${param.foo}"/><br />
-Bar <netui:label value="${param.bar}"/><br />
-Baz <netui:label value="${param.baz}"/><br />
+Foo <netui:span value="${param.foo}"/><br />
+Bar <netui:span value="${param.bar}"/><br />
+Baz <netui:span value="${param.baz}"/><br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrc/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrc/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/webinfSrc/index.jsp
Tue Aug 3 15:48:42 2004
@@ -5,9 +5,9 @@
<netui:html>
<body>
- action called: <netui:label
value="${requestScope.actionMapping.path}"/>
+ action called: <netui:span value="${requestScope.actionMapping.path}"/>
<br>
- scope: <netui:label value="${requestScope.actionMapping.scope}"/>
+ scope: <netui:span value="${requestScope.actionMapping.scope}"/>
<br>
<br>
<netui:anchor action="toAction">toAction</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -17,25 +17,25 @@
<h3>Test 1</h3>
<em>Print a message from bundle1.</em>
<br/>
- <netui:label value="${bundle.theBundle1.message1}"/>
+ <netui:span value="${bundle.theBundle1.message1}"/>
<hr width="95%"/><br/>
<h3>Test 2</h3>
<em>Print a message from bundle2.</em>
<br/>
- <netui:label value="${bundle.theBundle2.message1}"/>
+ <netui:span value="${bundle.theBundle2.message1}"/>
<hr width="95%"/><br/>
<h3>Test 3</h3>
<em>Print a message from and nonexistant bundle An error is
expected.</em>
<br/>
- <netui:label value="${bundle.xtheBundle1.message1}"/>
+ <netui:span value="${bundle.xtheBundle1.message1}"/>
<hr width="95%"/><br/>
<h3>Test 4</h3>
<em>Print a nonexistant message from bundle An error is expected.</em>
<br/>
- <netui:label value="${bundle.theBundle1.message1x}"/>
+ <netui:span value="${bundle.theBundle1.message1x}"/>
<hr width="95%"/><br/>
<h3>Test 5</h3>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jsp3.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jsp3.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug26856/Jsp3.jsp
Tue Aug 3 15:48:42 2004
@@ -14,35 +14,35 @@
<h3>Test 1</h3>
<em>Message from default resource bundle.</em>
<br/>
- <netui:label value="${bundle.default.message1}"/>
+ <netui:span value="${bundle.default.message1}"/>
<hr width="95%"/>
<br/>
<h3>Test 2</h3>
<em>Message from named resource bundle, using quotes.</em>
<br/>
- <netui:label
value="${bundle[\"myMessages/miscJpf/bug26856\"].message1}"/>
+ <netui:span
value="${bundle[\"myMessages/miscJpf/bug26856\"].message1}"/>
<hr width="95%"/>
<br/>
<h3>Test 3</h3>
<em>Message from named resource bundle, using single quotes.</em>
<br/>
- <netui:label
value="${bundle['myMessages/miscJpf/bug26856'].message1}"/>
+ <netui:span value="${bundle['myMessages/miscJpf/bug26856'].message1}"/>
<hr width="95%"/>
<br/>
<h3>Test 4</h3>
<em>Non-existant message from default resource bundle.
"nonExistentMessage" bracketed with "?'s" is expected.</em>
<br/>
- <netui:label value="${bundle.default.nonExistentMessage}"/>
+ <netui:span value="${bundle.default.nonExistentMessage}"/>
<hr width="95%"/>
<br/>
<h3>Test 5</h3>
<em>Message from non-existant resource bundle. An error is
expected.</em>
<br/>
- <netui:label value="${bundle.missingBundle.nonExistentMessage}"/><br/>
+ <netui:span value="${bundle.missingBundle.nonExistentMessage}"/><br/>
<hr width="95%"/>
<br/>
@@ -50,9 +50,9 @@
<em>"Overloaded" bundle name.</em>
<br/>
<netui-data:declareBundle name="myBundle1"
bundlePath="miscJpf.bug26856.bundle2"/>
- <netui:label
value="${bundle[\"myBundle1/miscJpf/bug26856\"].message2}"/>
+ <netui:span
value="${bundle[\"myBundle1/miscJpf/bug26856\"].message2}"/>
<br/>
- <netui:label value="${bundle.myBundle1.message2}"/>
+ <netui:span value="${bundle.myBundle1.message2}"/>
<hr width="95%"/>
<br/>
@@ -66,14 +66,14 @@
<netui-data:messageArg value="Arg1"/>
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
- <netui:label value="${pageScope.formattedMessage}"/>
+ <netui:span value="${pageScope.formattedMessage}"/>
</li>
<li> <!-- Test 2 -->
<netui-data:message value="${bundle.myBundle1.message3}"
resultId="formattedMessage">
<netui-data:messageArg value="Arg0"/>
<netui-data:messageArg value="Arg1"/>
</netui-data:message>
- <netui:label value="${pageScope.formattedMessage}"/>
+ <netui:span value="${pageScope.formattedMessage}"/>
</li>
<li> <!-- Test 3 -->
<netui-data:message value="${bundle.myBundle1.message3}"
resultId="formattedMessage">
@@ -82,7 +82,7 @@
<netui-data:messageArg value="Arg2"/>
<netui-data:messageArg value="Arg3"/>
</netui-data:message>
- <netui:label value="${pageScope.formattedMessage}"/>
+ <netui:span value="${pageScope.formattedMessage}"/>
</li>
<li> <!-- Test 4 -->
<netui-data:message value="${bundle.myBundle1.message4}"
resultId="formattedMessage">
@@ -90,7 +90,7 @@
<netui-data:messageArg value="Arg1"/>
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
- <netui:label value="${pageScope.formattedMessage}"/>
+ <netui:span value="${pageScope.formattedMessage}"/>
</li>
<li> <!-- Test 5 -->
<netui-data:message value="${bundle.myBundle1.message5}"
resultId="formattedMessage">
@@ -98,7 +98,7 @@
<netui-data:messageArg value="Arg1"/>
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
- <netui:label value="${pageScope.formattedMessage}"/>
+ <netui:span value="${pageScope.formattedMessage}"/>
</li>
<li> <!-- Test 6 -->
<netui-data:message value="${bundle.myBundle1.message6}"
resultId="formattedMessage">
@@ -106,7 +106,7 @@
<netui-data:messageArg value="Arg1"/>
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
- <netui:label value="${pageScope.formattedMessage}"/>
+ <netui:span value="${pageScope.formattedMessage}"/>
</li>
<li> <!-- Test 7 -->
<netui-data:message value="${bundle.myBundle1.message7}"
resultId="errorMessage">
@@ -114,7 +114,7 @@
<netui-data:messageArg value="Arg1"/>
<netui-data:messageArg value="Arg2"/>
</netui-data:message>
- <netui:label value="${pageScope.errorMessage}"/>
+ <netui:span value="${pageScope.errorMessage}"/>
</li>
</ol>
<hr width="95%"/><br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug27848/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug27848/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug27848/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
<hr width="95%"/>
<br/>
<center>
- <netui:label value="${pageFlow.field1}" />
+ <netui:span value="${pageFlow.field1}" />
<br/><br/>
<netui:anchor action="jpfAction1">continue</netui:anchor>
</center>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -13,7 +13,7 @@
<netui-data:declarePageInput name="visit" type="int" />
<center>
<font color="blue">
- Page visit: <font color="blue">"<netui:label
value="${pageInput.visit}" />"</font>
+ Page visit: <font color="blue">"<netui:span
value="${pageInput.visit}" />"</font>
</font>
<br/><br/>
The 1st time you see this page, press here:
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug40862/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug40862/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug40862/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -17,7 +17,7 @@
<netui-data:repeater dataSource="pageFlow.strArr">
<netui-data:repeaterItem>
- <netui:label value="${container.item}" />
+ <netui:span value="${container.item}" />
<netui-data:getData resultId="item"
value="${container.item}"/>
<%
String currentItem = (String)
pageContext.getAttribute("item");
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/listenTo/listenToB/handled.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/listenTo/listenToB/handled.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/listenTo/listenToB/handled.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<body>
handled bothHave
<br>
- <font color="blue"><netui:label value="${requestScope.note}"/></font>
+ <font color="blue"><netui:span value="${requestScope.note}"/></font>
<br>
<netui:anchor action="begin">start over</netui:anchor>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/listenTo/listenToB/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/listenTo/listenToB/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/listenTo/listenToB/index.jsp
Tue Aug 3 15:48:42 2004
@@ -12,6 +12,6 @@
<body>
<h3>B</h3>
- <font color="blue"><netui:label value="${requestScope.note}"/></font>
+ <font color="blue"><netui:span value="${requestScope.note}"/></font>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anyBeanOverload/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anyBeanOverload/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anyBeanOverload/index.jsp
Tue Aug 3 15:48:42 2004
@@ -5,7 +5,7 @@
<html>
<body>
- <font color="red"><netui:label value="${pageFlow.message}"/></font>
+ <font color="red"><netui:span value="${pageFlow.message}"/></font>
<br>
<br>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anybean/nestingResult.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anybean/nestingResult.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anybean/nestingResult.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
<body>
<h3>Nesting Result</h3>
- msg: <netui:label value="${pageInput.result.msg}"/>
+ msg: <netui:span value="${pageInput.result.msg}"/>
<br>
<br>
<netui:anchor action="begin">go to start</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anybean/result.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anybean/result.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/anybean/result.jsp
Tue Aug 3 15:48:42 2004
@@ -10,12 +10,9 @@
<body>
<h3>Result</h3>
- foo: <b><netui:label value="${pageInput.foo}"/></b>
+ foo: <b><netui:span value="${pageInput.foo}"/></b>
<br>
<br>
<netui:anchor action="begin">go to start</netui:anchor>
</body>
</netui:html>
-
-
-
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/error.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/error.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/exceptions/error.jsp
Tue Aug 3 15:48:42 2004
@@ -11,7 +11,7 @@
<netui:form action="goBack">
- Message from method: <b><netui:label value="${pageFlow.messageFromMethod}"
/></b>
+ Message from method: <b><netui:span value="${pageFlow.messageFromMethod}"
/></b>
<br>
<br>
Exception message: <b><netui:exceptions showStackTrace="false"
showMessage="true"/></b>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/lifecycle/history.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/lifecycle/history.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/lifecycle/history.jsp
Tue Aug 3 15:48:42 2004
@@ -19,14 +19,14 @@
<netui-data:repeater dataSource="sessionScope.info">
<netui-data:repeaterItem>
<tr>
- <td><netui:label value="${container.item.requestNum}"/></td>
- <td><b><netui:label value="${container.item.label}"/></b></td>
- <td><netui:label value="${container.item.ctrlMessage}"/></td>
- <td><netui:label value="${container.item.request}"/></td>
- <td><netui:label value="${container.item.response}"/></td>
- <td><netui:label value="${container.item.session}"/></td>
- <td><netui:label value="${container.item.mapping}"/></td>
- <td><netui:label value="${container.item.servlet}"/></td>
+ <td><netui:span value="${container.item.requestNum}"/></td>
+ <td><b><netui:span value="${container.item.label}"/></b></td>
+ <td><netui:span value="${container.item.ctrlMessage}"/></td>
+ <td><netui:span value="${container.item.request}"/></td>
+ <td><netui:span value="${container.item.response}"/></td>
+ <td><netui:span value="${container.item.session}"/></td>
+ <td><netui:span value="${container.item.mapping}"/></td>
+ <td><netui:span value="${container.item.servlet}"/></td>
</tr>
</netui-data:repeaterItem>
</netui-data:repeater>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/index.jsp
Tue Aug 3 15:48:42 2004
@@ -4,14 +4,14 @@
<%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%>
<netui:html>
<body>
- action output string: <b><netui:label
value="${pageInput.goodString}"/></b>
+ action output string: <b><netui:span
value="${pageInput.goodString}"/></b>
<br>
action output array: <netui-data:repeater
dataSource="pageInput.goodArray">
<netui-data:repeaterHeader>
<ul>
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
</ul>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/lots.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/lots.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfPageInput/lots.jsp
Tue Aug 3 15:48:42 2004
@@ -9,14 +9,14 @@
</title>
</head>
<body>
- pi1: <netui:label value="${pageInput.pi1}"/>
+ pi1: <netui:span value="${pageInput.pi1}"/>
<br>
pi2: <netui-data:repeater dataSource="pageInput.pi2">
<netui-data:repeaterHeader>
<ul>
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
</ul>
@@ -33,7 +33,7 @@
subarray: <ul>
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter>
</ul>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input1.jsp
Tue Aug 3 15:48:42 2004
@@ -12,13 +12,13 @@
<tr class="tablebody">
<td>Foo:</td>
<td>
- <netui:label value="${actionForm.foo}"/>
+ <netui:span value="${actionForm.foo}"/>
</td>
</tr>
<tr class="tablebody">
<td>Bar:</td>
<td>
- <netui:label value="${actionForm.bar}"/>
+ <netui:span value="${actionForm.bar}"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input1_single.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input1_single.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input1_single.jsp
Tue Aug 3 15:48:42 2004
@@ -13,13 +13,13 @@
<tr class="tablebody">
<td>Foo:</td>
<td>
- <netui:label value="${actionForm.foo}"/>
+ <netui:span value="${actionForm.foo}"/>
</td>
</tr>
<tr class="tablebody">
<td>Bar:</td>
<td>
- <netui:label value="${actionForm.bar}"/>
+ <netui:span value="${actionForm.bar}"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input2.jsp
Tue Aug 3 15:48:42 2004
@@ -12,13 +12,13 @@
<tr class="tablebody">
<td>A:</td>
<td>
- <netui:label value="${actionForm.a}"/>
+ <netui:span value="${actionForm.a}"/>
</td>
</tr>
<tr class="tablebody">
<td>B:</td>
<td>
- <netui:label value="${actionForm.b}"/>
+ <netui:span value="${actionForm.b}"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input2_single.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input2_single.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/input2_single.jsp
Tue Aug 3 15:48:42 2004
@@ -12,13 +12,13 @@
<tr class="tablebody">
<td>A:</td>
<td>
- <netui:label value="${actionForm.a}"/>
+ <netui:span value="${actionForm.a}"/>
</td>
</tr>
<tr class="tablebody">
<td>B:</td>
<td>
- <netui:label value="${actionForm.b}"/>
+ <netui:span value="${actionForm.b}"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/inputSessionScope.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/inputSessionScope.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/inputSessionScope.jsp
Tue Aug 3 15:48:42 2004
@@ -12,13 +12,13 @@
<tr class="tablebody">
<td>A:</td>
<td>
- <netui:label value="${actionForm.a}"/>
+ <netui:span value="${actionForm.a}"/>
</td>
</tr>
<tr class="tablebody">
<td>B:</td>
<td>
- <netui:label value="${actionForm.b}"/>
+ <netui:span value="${actionForm.b}"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/inputSessionScope_single.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/inputSessionScope_single.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScopeForm/inputSessionScope_single.jsp
Tue Aug 3 15:48:42 2004
@@ -12,13 +12,13 @@
<tr class="tablebody">
<td>A:</td>
<td>
- <netui:label value="${actionForm.a}"/>
+ <netui:span value="${actionForm.a}"/>
</td>
</tr>
<tr class="tablebody">
<td>B:</td>
<td>
- <netui:label value="${actionForm.b}"/>
+ <netui:span value="${actionForm.b}"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/a/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/a/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/a/index.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
</head>
<body>
<h3>Page Flow A</h3>
- scope <b><netui:label value="${param.jpfScopeID}"/></b>
+ scope <b><netui:span value="${param.jpfScopeID}"/></b>
<br>
<netui:form action="begin">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/b/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/b/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/b/index.jsp
Tue Aug 3 15:48:42 2004
@@ -10,7 +10,7 @@
</head>
<body>
<h3>Page Flow B</h3>
- scope <b><netui:label value="${param.jpfScopeID}"/></b>
+ scope <b><netui:span value="${param.jpfScopeID}"/></b>
<br>
<netui:form action="begin">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToAction/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToAction/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/returnToTest/returnToAction/index.jsp
Tue Aug 3 15:48:42 2004
@@ -15,7 +15,7 @@
</h3>
<font color="Green">Number of times testAction called:
- <netui:label value="${pageFlow.testActionCount}"/></font>
+ <netui:span value="${pageFlow.testActionCount}"/></font>
<br>
<br>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<br/>
<netui-data:declarePageInput name="pgKey" type="java.lang.String"
/>
- PageInput value1: <netui:label value="${pageInput.pgKey}" />
+ PageInput value1: <netui:span value="${pageInput.pgKey}" />
<br/><br/>
<netui:anchor action="action1">Continue...</netui:anchor>
</center>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<br/>
<netui-data:declarePageInput name="pgKey" type="java.lang.String"
/>
- PageInput value2: <netui:label value="${pageInput.pgKey}" />
+ PageInput value2: <netui:span value="${pageInput.pgKey}" />
<br/><br/>
<netui:anchor action="action2">Continue...</netui:anchor>
</center>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp3.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp3.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test1/Jsp3.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<br/>
<netui-data:declarePageInput name="pgKey" type="java.lang.String"
/>
- PageInput value2: <netui:label value="${pageInput.pgKey}" />
+ PageInput value2: <netui:span value="${pageInput.pgKey}" />
<br/><br/>
<netui:anchor action="finish">Finish...</netui:anchor>
</center>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -15,13 +15,13 @@
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
<hr width="95%"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -15,13 +15,13 @@
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
<hr width="95%"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/sub1/SubJsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/sub1/SubJsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test10/sub1/SubJsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -15,13 +15,13 @@
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -17,25 +17,25 @@
<br/>
{pageInput.pgInput1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput1}"/>"
+ "<netui:span value="${pageInput.pgInput1}"/>"
</font>
<br/>
{pageInput.pgInput2}:
<font color="blue">"
- <netui:label value="${pageInput.pgInput2}"/>"
+ <netui:span value="${pageInput.pgInput2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -17,25 +17,25 @@
<br/>
{pageInput.pgInput1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput1}"/>"
+ "<netui:span value="${pageInput.pgInput1}"/>"
</font>
<br/>
{pageInput.pgInput2}:
<font color="blue">"
- <netui:label value="${pageInput.pgInput2}"/>"
+ <netui:span value="${pageInput.pgInput2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp3.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp3.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test11/Jsp3.jsp
Tue Aug 3 15:48:42 2004
@@ -17,25 +17,25 @@
<br/>
{pageInput.pgInput1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput1}"/>"
+ "<netui:span value="${pageInput.pgInput1}"/>"
</font>
<br/>
{pageInput.pgInput2}:
<font color="blue">"
- <netui:label value="${pageInput.pgInput2}"/>"
+ <netui:span value="${pageInput.pgInput2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test12/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -15,12 +15,12 @@
{pageInput.pgInput1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput1}"/>"
+ "<netui:span value="${pageInput.pgInput1}"/>"
</font>
<br/>
{pageInput.pgInput2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput2}"/>"
+ "<netui:span value="${pageInput.pgInput2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test14/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test14/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test14/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -16,11 +16,11 @@
<netui-data:declarePageInput name="pgInput2"
type="java.lang.String" />
<netui-data:declarePageInput name="pgInput3"
type="java.lang.String" />
- PageInput value1: <font color="blue">"<netui:label
value="${pageInput.XYZ&%#}" />"</font>
+ PageInput value1: <font color="blue">"<netui:span
value="${pageInput.XYZ&%#}" />"</font>
<br/>
- PageInput value2: <font color="blue">"<netui:label
value="${pageInput.pgInput2}" />"</font>
+ PageInput value2: <font color="blue">"<netui:span
value="${pageInput.pgInput2}" />"</font>
<br/>
- PageInput value3: <font color="blue">"<netui:label
value="${pageInput.pgInput3}" />"</font>
+ PageInput value3: <font color="blue">"<netui:span
value="${pageInput.pgInput3}" />"</font>
<br/><br/>
<netui:anchor action="finish">Finish...</netui:anchor>
</center>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test16/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test16/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test16/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -21,15 +21,15 @@
<netui-data:declarePageInput name="Name2" type="java.lang.String" />
<netui-data:declarePageInput name="BadName" type="java.lang.String" />
- PageInput value1: <font color="blue">"<netui:label
value="${pageInput.name1}" />"</font>
+ PageInput value1: <font color="blue">"<netui:span
value="${pageInput.name1}" />"</font>
<br/>
- PageInput value2: <font color="blue">"<netui:label
value="${pageInput.name2}" />"</font>
+ PageInput value2: <font color="blue">"<netui:span
value="${pageInput.name2}" />"</font>
<br/>
- PageInput value3: <font color="blue">"<netui:label
value="${pageInput.Name2}" />"</font>
+ PageInput value3: <font color="blue">"<netui:span
value="${pageInput.Name2}" />"</font>
<br/>
- PageInput value4: <font color="blue">"<netui:label
value="${pageInput.BadName}" />"</font>
+ PageInput value4: <font color="blue">"<netui:span
value="${pageInput.BadName}" />"</font>
<br/>
- PageInput value5: <font color="blue">"<netui:label
value="${pageInput.UndeclaredName}" />"</font>
+ PageInput value5: <font color="blue">"<netui:span
value="${pageInput.UndeclaredName}" />"</font>
<br/><br/>
<netui
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test17/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test17/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test17/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -12,33 +12,33 @@
<br/>
<center>
<br/>
- <h2><font color="blue">Testing netui:label</font></h2>
+ <h2><font color="blue">Testing netui:span</font></h2>
<br/><br/>
<netui-data:declarePageInput name="ObjectA" type="shared.ClassA" />
- Class A string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.stringValue}" />"</font>
+ Class A string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.stringValue}" />"</font>
<br/>
- Class B string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.stringValue}" />"</font>
+ Class B string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.stringValue}" />"</font>
<br/>
- Class C string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.stringValue}" />"</font>
+ Class C string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.stringValue}" />"</font>
<br/>
- Class D string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.classD.stringValue}" />"</font>
+ Class D string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.classD.stringValue}" />"</font>
<br/>
- Class E string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.classD.classE.stringValue}" />"</font>
+ Class E string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.classD.classE.stringValue}" />"</font>
<br/>
- Class F string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.stringValue}"
/>"</font>
+ Class F string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.stringValue}"
/>"</font>
<br/>
- Class G string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.stringValue}"
/>"</font>
+ Class G string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.stringValue}"
/>"</font>
<br/>
- Class H string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.stringValue}"
/>"</font>
+ Class H string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.stringValue}"
/>"</font>
<br/>
- Class I string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.classI.stringValue}"
/>"</font>
+ Class I string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.classI.stringValue}"
/>"</font>
<br/>
- Class J string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.classI.classJ.stringValue}"
/>"</font>
+ Class J string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.classI.classJ.stringValue}"
/>"</font>
<br/>
- Class K string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.classI.classJ.classK.stringValue}"
/>"</font>
+ Class K string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.classI.classJ.classK.stringValue}"
/>"</font>
<br/>
- [EMAIL PROTECTED]" <font color="blue">"<netui:label
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.classI.classJ.classK}"
/>"</font>
+ [EMAIL PROTECTED]" <font color="blue">"<netui:span
value="${pageInput.ObjectA.classB.classC.classD.classE.classF.classG.classH.classI.classJ.classK}"
/>"</font>
<br/><br/>
<netui:anchor action="action1">Continue...</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test21/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test21/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test21/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -16,7 +16,7 @@
<br/><br/>
<netui-data:declarePageInput name="ObjectA" type="shared.ClassA" />
- Class A string value. <font color="blue">"<netui:label
value="${pageInput.ObjectA.nonExistString}" />"</font>
+ Class A string value. <font color="blue">"<netui:span
value="${pageInput.ObjectA.nonExistString}" />"</font>
<br/><br/>
<netui:anchor action="finish">Finish...</netui:anchor>
</font>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test23/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -56,25 +56,25 @@
{pageInput.theForm.String1}:
<font color="blue">
- <netui:label value="${pageInput.theForm.string1}" />
+ <netui:span value="${pageInput.theForm.string1}" />
</font>
<br/>
{pageInput.theForm.String2}:
<font color="blue">
- <netui:label value="${pageInput.theForm.string2}" />
+ <netui:span value="${pageInput.theForm.string2}" />
</font>
<br/>
{pageInput.theForm.Int1}:
<font color="blue">
- <netui:label value="${pageInput.theForm.int1}" />
+ <netui:span value="${pageInput.theForm.int1}" />
</font>
<br/>
{pageInput.theForm.Int2}:
<font color="blue">
- <netui:label value="${pageInput.theForm.int2}" />
+ <netui:span value="${pageInput.theForm.int2}" />
</font>
<br/><br/>
<hr width="95%"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test24/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test24/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test24/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -18,7 +18,7 @@
PageInput context value:
<font color="blue">
- <netui:label value="${pageInput.string}" />
+ <netui:span value="${pageInput.string}" />
</font>
<br/><br/>
PageFlow context value:
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test24/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test24/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test24/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -18,12 +18,12 @@
PageInput context value:
<font color="blue">
- <netui:label value="${pageInput.string}" />
+ <netui:span value="${pageInput.string}" />
</font>
<br/><br/>
PageFlow context value:
<font color="blue">
- <netui:label value="${pageFlow.string}" />
+ <netui:span value="${pageFlow.string}" />
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test25/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test25/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test25/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<br/><br/>
PageInput context value in the main page:
<font color="blue">
- <netui:label value="${pageInput.string}" />
+ <netui:span value="${pageInput.string}" />
</font>
<br/><br/>
<netui:anchor action="finish">Finish...</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test25/template.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test25/template.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test25/template.jsp
Tue Aug 3 15:48:42 2004
@@ -17,7 +17,7 @@
<center>
PageInput context value in the template:
<font color="blue">
- <netui:label value="${pageInput.string}" />
+ <netui:span value="${pageInput.string}" />
</font>
<br/><br/>
</center>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -21,7 +21,7 @@
<%@ include file="include2.jsp" %>
<font color="deeppink">
- PageInput from this jsp: <netui:label value="${pageInput.string}"
/>
+ PageInput from this jsp: <netui:span value="${pageInput.string}" />
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/include1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/include1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/include1.jsp
Tue Aug 3 15:48:42 2004
@@ -4,7 +4,7 @@
<center>
<font color="tomato">
PageInput value from [%@ include]:
- <netui:label value="${pageInput.string}" />
+ <netui:span value="${pageInput.string}" />
</font>
<br/><br/>
</center>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/include2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/include2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test26/include2.jsp
Tue Aug 3 15:48:42 2004
@@ -1,5 +1,5 @@
<font color="brown">
PageInput value from [jsp:include]:
- <netui:label value="${pageInput.string}" />
+ <netui:span value="${pageInput.string}" />
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test29/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test29/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test29/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -16,7 +16,7 @@
</font></h3>
<br/><br/>
- PageInput value1: <netui:label value="${pageInput.myString}" />
+ PageInput value1: <netui:span value="${pageInput.myString}" />
<br/><br/>
<netui:anchor action="finish">Finish...</netui:anchor>
</center>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp11.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp11.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp11.jsp
Tue Aug 3 15:48:42 2004
@@ -13,7 +13,7 @@
<center>
<netui-data:declarePageInput name="pgInput"
type="java.lang.String" />
<br/>
- PageInput field: "<netui:label value="${pageInput.pgInput}" />"
+ PageInput field: "<netui:span value="${pageInput.pgInput}" />"
<br/>
<font color="blue">
<b>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp12.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp12.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp12.jsp
Tue Aug 3 15:48:42 2004
@@ -13,7 +13,7 @@
<center>
<netui-data:declarePageInput name="value1" type="java.lang.String"
/>
<br/>
- PageInput field: "<netui:label value="${pageInput.value1}" />"
+ PageInput field: "<netui:span value="${pageInput.value1}" />"
<br/>
<hr width="95%"/>
<br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp13.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp13.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp13.jsp
Tue Aug 3 15:48:42 2004
@@ -14,9 +14,9 @@
<netui-data:declarePageInput name="value1" type="java.lang.String"
/>
<netui-data:declarePageInput name="value2" type="java.lang.String"
/>
<br/>
- PageInput field1: "<netui:label value="${pageInput.value1}" />"
+ PageInput field1: "<netui:span value="${pageInput.value1}" />"
<br/>
- PageInput field2: "<netui:label value="${pageInput.value2}" />"
+ PageInput field2: "<netui:span value="${pageInput.value2}" />"
<br/>
<hr width="95%"/>
<br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp7.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp7.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test3/Jsp7.jsp
Tue Aug 3 15:48:42 2004
@@ -13,7 +13,7 @@
<center>
<netui-data:declarePageInput name="pgInput"
type="java.lang.String" />
<br/>
- PageInput field: "<netui:label value="${pageInput.pgInput}" />"
+ PageInput field: "<netui:span value="${pageInput.pgInput}" />"
<br/>
<font color="blue">
<b>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test4/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test4/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test4/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -19,9 +19,9 @@
<b>These two are from the {actionForm} context.</b>
<br/>
<netui:form action="action1">
- {actionForm.fld1}: <font color="blue"><netui:label
value="${actionForm.fld1}"/></font>
+ {actionForm.fld1}: <font color="blue"><netui:span
value="${actionForm.fld1}"/></font>
<br/>
- {actionForm.fld2}: <font color="blue"><netui:label
value="${actionForm.fld2}"/></font>
+ {actionForm.fld2}: <font color="blue"><netui:span
value="${actionForm.fld2}"/></font>
<br/>
</netui:form>
<hr width="95%"/>
@@ -29,9 +29,9 @@
<br/>
<b>These two are from the {pageInput} context.</b>
<br/><br/>
- {pageInput.theForm.fld1}: <font color="blue"><netui:label
value="${pageInput.theForm.fld1}" /></font>
+ {pageInput.theForm.fld1}: <font color="blue"><netui:span
value="${pageInput.theForm.fld1}" /></font>
<br/>
- {pageInput.theForm.fld2}: <font color="blue"><netui:label
value="${pageInput.theForm.fld2}" /></font>
+ {pageInput.theForm.fld2}: <font color="blue"><netui:span
value="${pageInput.theForm.fld2}" /></font>
<br/><br/>
<hr width="95%"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test5/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test5/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test5/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -15,9 +15,9 @@
<netui-data:declarePageInput name="pgInput1"
type="java.lang.String" />
<netui-data:declarePageInput name="pgInput2"
type="java.lang.String" />
- PageInput value1: <font color="blue">"<netui:label
value="${pageInput.pgInput1}" />"</font>
+ PageInput value1: <font color="blue">"<netui:span
value="${pageInput.pgInput1}" />"</font>
<br/>
- PageInput value2: <font color="blue">"<netui:label
value="${pageInput.pgInput2}" />"</font>
+ PageInput value2: <font color="blue">"<netui:span
value="${pageInput.pgInput2}" />"</font>
<br/><br/>
<netui:anchor action="finish">Finish...</netui:anchor>
</center>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test6/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test6/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test6/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -14,9 +14,9 @@
<netui-data:declarePageInput name="pgInput"
type="java.lang.String" />
<br/>
<netui:form action="finish">
- {actionForm.fld1}: <font color="blue">"<netui:label
value="${actionForm.fld1}"/>"</font>
+ {actionForm.fld1}: <font color="blue">"<netui:span
value="${actionForm.fld1}"/>"</font>
<br/>
- {actionForm.fld2}: <font color="blue">"<netui:label
value="${actionForm.fld2}"/>"</font>
+ {actionForm.fld2}: <font color="blue">"<netui:span
value="${actionForm.fld2}"/>"</font>
<br/>
</netui:form>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test7/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test7/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test7/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -23,49 +23,49 @@
<br/>
{pageInput.pgInputVal_1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputVal_1}"/>"
+ "<netui:span value="${pageInput.pgInputVal_1}"/>"
</font>
<br/>
{pageInput.pgInputVal_2}:
<font color="blue">"
- <netui:label value="${pageInput.pgInputVal_2}"/>"
+ <netui:span value="${pageInput.pgInputVal_2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/>
{pageInput.pgInputFormInner.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputFormInner.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputFormInner.fld1}"/>"
</font>
<br/>
{pageInput.pgInputFormInner.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputFormInner.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputFormInner.fld2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld3.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld3.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld3.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld3.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld3.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld3.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test8/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test8/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test8/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -17,25 +17,25 @@
<br/>
{pageInput.pgInput1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput1}"/>"
+ "<netui:span value="${pageInput.pgInput1}"/>"
</font>
<br/>
{pageInput.pgInput2}:
<font color="blue">"
- <netui:label value="${pageInput.pgInput2}"/>"
+ <netui:span value="${pageInput.pgInput2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test8/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test8/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test8/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -17,25 +17,25 @@
<br/>
{pageInput.pgInput1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput1}"/>"
+ "<netui:span value="${pageInput.pgInput1}"/>"
</font>
<br/>
{pageInput.pgInput2}:
<font color="blue">"
- <netui:label value="${pageInput.pgInput2}"/>"
+ <netui:span value="${pageInput.pgInput2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -20,25 +20,25 @@
<br/><br/>
{pageInput.pgInput1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput1}"/>"
+ "<netui:span value="${pageInput.pgInput1}"/>"
</font>
<br/>
{pageInput.pgInput2}:
<font color="blue">"
- <netui:label value="${pageInput.pgInput2}"/>"
+ <netui:span value="${pageInput.pgInput2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp3.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp3.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp3.jsp
Tue Aug 3 15:48:42 2004
@@ -20,25 +20,25 @@
<br/><br/>
{pageInput.pgInput1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput1}"/>"
+ "<netui:span value="${pageInput.pgInput1}"/>"
</font>
<br/>
{pageInput.pgInput2}:
<font color="blue">"
- <netui:label value="${pageInput.pgInput2}"/>"
+ <netui:span value="${pageInput.pgInput2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp4.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp4.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageInput/test9/Jsp4.jsp
Tue Aug 3 15:48:42 2004
@@ -20,25 +20,25 @@
<br/><br/>
{pageInput.pgInput1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInput1}"/>"
+ "<netui:span value="${pageInput.pgInput1}"/>"
</font>
<br/>
{pageInput.pgInput2}:
<font color="blue">"
- <netui:label value="${pageInput.pgInput2}"/>"
+ <netui:span value="${pageInput.pgInput2}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld1}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld1}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld1}"/>"
</font>
<br/>
{pageInput.pgInputForm.fld2}:
<font color="blue">
- "<netui:label value="${pageInput.pgInputForm.fld2}"/>"
+ "<netui:span value="${pageInput.pgInputForm.fld2}"/>"
</font>
<br/><br/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/resources/jsp/qaTraceResults.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/resources/jsp/qaTraceResults.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/resources/jsp/qaTraceResults.jsp
Tue Aug 3 15:48:42 2004
@@ -13,7 +13,7 @@
<ul>
<netui-data:repeater dataSource="sessionScope.QaTrace.tracePoints">
<li>
- <netui:label value="${container.item}" />
+ <netui:span value="${container.item}" />
</li>
</netui-data:repeater>
</ul>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test31/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test31/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test31/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<h3><font color="blue">
We will visit this page twice.
<br/><br/>
- Page visit: <netui:label value="${pageFlow.string}"/>
+ Page visit: <netui:span value="${pageFlow.string}"/>
</font></h3>
<br/><br/>
<hr width="95%"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test32/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test32/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test32/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<h3><font color="blue">
We will visit this page twice.
<br/><br/>
- Page visit: <netui:label value="${pageFlow.string}"/>
+ Page visit: <netui:span value="${pageFlow.string}"/>
</font></h3>
<br/><br/>
<hr width="95%"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test32/sub1/SubJsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test32/sub1/SubJsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test32/sub1/SubJsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<h3><font color="blue">
We will visit this page twice.
<br/><br/>
- Page visit: <netui:label value="${pageFlow.string}"/>
+ Page visit: <netui:span value="${pageFlow.string}"/>
</font></h3>
<br/><br/>
<hr width="95%"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test34/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test34/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test34/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<h3><font color="blue">
We will visit this page twice.
<br/><br/>
- Page visit: <netui:label value="${pageFlow.string}"/>
+ Page visit: <netui:span value="${pageFlow.string}"/>
</font></h3>
<br/><br/>
<hr width="95%"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test37/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test37/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test37/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<h3><font color="blue">
We will visit this page twice.
<br/><br/>
- Page visit: <netui:label value="${pageFlow.string}"/>
+ Page visit: <netui:span value="${pageFlow.string}"/>
</font></h3>
<br/><br/>
<hr width="95%"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test47/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test47/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test47/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<br/>
<center>
<netui:form action="action2">
- String 1: <netui:label value="${actionForm.string1}"/>
+ String 1: <netui:span value="${actionForm.string1}"/>
<br/>
- String 2: <netui:label value="${actionForm.string2}"/>
+ String 2: <netui:span value="${actionForm.string2}"/>
<br/><br/>
<netui:button>Continue...</netui:button>
</netui:form>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test48/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test48/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/returnTo/test48/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<br/>
<center>
<netui:form action="test48GlobalAction">
- String 1: <netui:label value="${actionForm.string1}"/>
+ String 1: <netui:span value="${actionForm.string1}"/>
<br/>
- String 2: <netui:label value="${actionForm.string2}"/>
+ String 2: <netui:span value="${actionForm.string2}"/>
<br/><br/>
<netui:button>Continue...</netui:button>
</netui:form>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/jpf1/Jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/jpf1/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/jpf1/Jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest1 - Jpf1.Jsp1.jsp
<br/>
- scope: <netui:label value="${pageFlow.scope}"/>
+ scope: <netui:span value="${pageFlow.scope}"/>
</span>
<netui:form action="finish">
<netui:button action="refresh" type="submit">Refresh
page</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/jpf2/Jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/jpf2/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/jpf2/Jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest1 - Jpf2.Jsp2.jsp
<br/>
- scope: <netui:label value="${pageFlow.scope}"/>
+ scope: <netui:span value="${pageFlow.scope}"/>
</span>
<netui:form action="finish">
<netui:button action="refresh" type="submit">Refresh
page</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/subJpf1/SubJsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/subJpf1/SubJsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest1/subJpf1/SubJsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest1 - SubJpf1.SubJsp1.jsp
<br/>
- scope: <netui:label value="${pageFlow.scope}"/>
+ scope: <netui:span value="${pageFlow.scope}"/>
</span>
<netui:form action="finish">
<netui:button action="finish" type="submit">Done</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/jpf1/Jsp1a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/jpf1/Jsp1a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/jpf1/Jsp1a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest2 - Jpf1.Jsp1a.jsp
<br/>
- PageFlow scope: <netui:label value="${pageFlow.scope}"/>
+ PageFlow scope: <netui:span value="${pageFlow.scope}"/>
<br/>
- Form field1: <netui:label value="${actionForm.string1}"/>
+ Form field1: <netui:span value="${actionForm.string1}"/>
</span>
<br/><br/>
<netui:button action="refresh" type="submit">Refresh
page</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/jpf2/Jsp2a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/jpf2/Jsp2a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/jpf2/Jsp2a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest2 - Jpf2.Jsp2a.jsp
<br/>
- PageFlow scope: <netui:label value="${pageFlow.scope}"/>
+ PageFlow scope: <netui:span value="${pageFlow.scope}"/>
<br/>
- Form field1: <netui:label value="${actionForm.string1}"/>
+ Form field1: <netui:span value="${actionForm.string1}"/>
</span>
<br/><br/>
<netui:button action="refresh" type="submit">Refresh
page</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/subJpf1/SubJsp1a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/subJpf1/SubJsp1a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest2/subJpf1/SubJsp1a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest2 - SubJpf1.SubJsp1a.jsp
<br/>
- Scope: <netui:label value="${pageFlow.scope}"/>
+ Scope: <netui:span value="${pageFlow.scope}"/>
</span>
<netui:form action="finish">
<netui:button action="finish" type="submit">Done</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/jpf1/Jsp1a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/jpf1/Jsp1a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/jpf1/Jsp1a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest3 - Jpf1.Jsp1a.jsp
<br/>
- PageFlow scope: <netui:label value="${pageFlow.scope}"/>
+ PageFlow scope: <netui:span value="${pageFlow.scope}"/>
<br/>
- Form field1: <netui:label value="${actionForm.string1}"/>
+ Form field1: <netui:span value="${actionForm.string1}"/>
</span>
<br/><br/>
<netui:anchor action="unsecure">Unsecure</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/jpf2/Jsp2a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/jpf2/Jsp2a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/jpf2/Jsp2a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest3 - Jpf2.Jsp2a.jsp
<br/>
- PageFlow scope: <netui:label value="${pageFlow.scope}"/>
+ PageFlow scope: <netui:span value="${pageFlow.scope}"/>
<br/>
- Form field1: <netui:label value="${actionForm.string1}"/>
+ Form field1: <netui:span value="${actionForm.string1}"/>
</span>
<br/><br/>
<netui:anchor action="unsecure">Unsecure</netui:anchor>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/subJpf1/SubJsp1a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/subJpf1/SubJsp1a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest3/subJpf1/SubJsp1a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest2 - SubJpf1.SubJsp1a.jsp
<br/>
- Scope: <netui:label value="${pageFlow.scope}"/>
+ Scope: <netui:span value="${pageFlow.scope}"/>
</span>
<netui:form action="finish">
<netui:button action="finish" type="submit">Done</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/jpf1/Jsp1a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/jpf1/Jsp1a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/jpf1/Jsp1a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest4 - Jpf1.Jsp1a.jsp
<br/>
- PageFlow scope: <netui:label value="${pageFlow.scope}"/>
+ PageFlow scope: <netui:span value="${pageFlow.scope}"/>
<br/>
- Form field1: <netui:label value="${actionForm.string1}"/>
+ Form field1: <netui:span value="${actionForm.string1}"/>
</span>
<br/><br/>
<netui:button action="goNested" type="submit">Goto
nested</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/jpf2/Jsp2a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/jpf2/Jsp2a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/jpf2/Jsp2a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest4 - Jpf2.Jsp2a.jsp
<br/>
- PageFlow scope: <netui:label value="${pageFlow.scope}"/>
+ PageFlow scope: <netui:span value="${pageFlow.scope}"/>
<br/>
- Form field1: <netui:label value="${actionForm.string1}"/>
+ Form field1: <netui:span value="${actionForm.string1}"/>
</span>
<br/><br/>
<netui:button action="goNested" type="submit">Goto
nested</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/subJpf1/SubJsp1a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/subJpf1/SubJsp1a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest4/subJpf1/SubJsp1a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest2 - SubJpf1.SubJsp1a.jsp
<br/>
- Scope: <netui:label value="${pageFlow.scope}"/>
+ Scope: <netui:span value="${pageFlow.scope}"/>
</span>
<netui:form action="finish">
<netui:button action="finish" type="submit">Done</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/jpf1/Jsp1a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/jpf1/Jsp1a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/jpf1/Jsp1a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest5 - Jpf1.Jsp1a.jsp
<br/>
- PageFlow scope: <netui:label value="${pageFlow.scope}"/>
+ PageFlow scope: <netui:span value="${pageFlow.scope}"/>
<br/>
- Form field1: <netui:label value="${actionForm.string1}"/>
+ Form field1: <netui:span value="${actionForm.string1}"/>
</span>
<br/><br/>
<netui:button action="jpf1GoNested" type="submit">Goto
nested</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/jpf2/Jsp2a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/jpf2/Jsp2a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/jpf2/Jsp2a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest5 - Jpf2.Jsp2a.jsp
<br/>
- PageFlow scope: <netui:label value="${pageFlow.scope}"/>
+ PageFlow scope: <netui:span value="${pageFlow.scope}"/>
<br/>
- Form field1: <netui:label value="${actionForm.string1}"/>
+ Form field1: <netui:span value="${actionForm.string1}"/>
</span>
<br/><br/>
<netui:button action="jpf2GoNested" type="submit">Goto
nested</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/subJpf1/SubJsp1a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/subJpf1/SubJsp1a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/scopedJpf/jpfTest5/subJpf1/SubJsp1a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest2 - SubJpf1.SubJsp1a.jsp
<br/>
- Scope: <netui:label value="${pageFlow.scope}"/>
+ Scope: <netui:span value="${pageFlow.scope}"/>
</span>
<netui:form action="finish">
<netui:button action="finish" type="submit">Done</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/singletonJpf/jpfTest6/subJpf1/SubJsp1a.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/singletonJpf/jpfTest6/subJpf1/SubJsp1a.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/singletonJpf/jpfTest6/subJpf1/SubJsp1a.jsp
Tue Aug 3 15:48:42 2004
@@ -12,7 +12,7 @@
<span style="font-size: 20px; color: green; font-weight: bold">
ScopedJpf JpfTest2 - SubJpf1.SubJsp1a.jsp
<br/>
- Scope: <netui:label value="${pageFlow.scope}"/>
+ Scope: <netui:span value="${pageFlow.scope}"/>
</span>
<netui:form action="finish">
<netui:button action="finish" type="submit">Done</netui:button>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheck/Results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheck/Results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheck/Results.jsp
Tue Aug 3 15:48:42 2004
@@ -11,14 +11,14 @@
<netui:anchor action="begin">Home</netui:anchor>
<ul>
<netui-data:repeater dataSource="pageFlow.resultsOne">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
<br/>
<h4>Results Two:</h4>
<ul>
<netui-data:repeater dataSource="pageFlow.resultsTwo">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheck/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheck/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheck/index.jsp
Tue Aug 3 15:48:42 2004
@@ -22,7 +22,7 @@
<caption class="normalAttr">CheckBox Group</caption>
<netui:checkBoxGroup dataSource="pageFlow.resultsOne"
optionsDataSource="${pageFlow.opts}" repeater="true">
<tr align="center"><td align="right"
width="25%"><netui:checkBoxOption value="${container.item.optionValue}" /></td>
- <td align="left"><netui:label
styleClass="${container.item.style}" value="${container.item.name}" />
+ <td align="left"><netui:span
styleClass="${container.item.style}" value="${container.item.name}" />
</td></tr>
</netui:checkBoxGroup>
</table>
@@ -32,7 +32,7 @@
<caption class="normalAttr">CheckBox Group Two</caption>
<tr><td>
<netui:checkBoxGroup dataSource="pageFlow.resultsTwo"
optionsDataSource="${pageFlow.opts}" repeater="true" >
- <netui:label styleClass="${container.item.style}"
value="${container.item.name}" />
+ <netui:span styleClass="${container.item.style}"
value="${container.item.name}" />
<netui:checkBoxOption value="${container.item.optionValue}"
/>
</netui:checkBoxGroup>
</td></tr>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheckOptionError/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheckOptionError/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatCheckOptionError/index.jsp
Tue Aug 3 15:48:42 2004
@@ -22,7 +22,7 @@
<caption class="normalAttr">CheckBox Group</caption>
<netui:checkBoxGroup dataSource="pageFlow.resultsOne"
optionsDataSource="${pageFlow.opts}">
<tr align="center"><td align="right"
width="25%"><netui:checkBoxOption value="${container.item.optionValue}" /></td>
- <td align="left"><netui:label
styleClass="${container.item.style}" value="${container.item.name}" />
+ <td align="left"><netui:span
styleClass="${container.item.style}" value="${container.item.name}" />
</td></tr>
</netui:checkBoxGroup>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadio/Results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadio/Results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadio/Results.jsp
Tue Aug 3 15:48:42 2004
@@ -8,8 +8,8 @@
</head>
<body>
<netui:anchor action="begin">Home</netui:anchor>
- <h4>Results One: <netui:label value="${pageFlow.resultsOne}"/></h4>
- <h4>Results Two: <netui:label value="${pageFlow.resultsTwo}"/></h4>
+ <h4>Results One: <netui:span value="${pageFlow.resultsOne}"/></h4>
+ <h4>Results Two: <netui:span value="${pageFlow.resultsTwo}"/></h4>
<br/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadio/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadio/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadio/index.jsp
Tue Aug 3 15:48:42 2004
@@ -22,7 +22,7 @@
<caption class="normalAttr">RadioButton Group</caption>
<netui:radioButtonGroup dataSource="pageFlow.resultsOne"
optionsDataSource="${pageFlow.opts}" repeater="true">
<tr align="center"><td align="right"
width="25%"><netui:radioButtonOption value="${container.item.optionValue}"
/></td>
- <td align="left"><netui:label
styleClass="${container.item.style}" value="${container.item.name}" />
+ <td align="left"><netui:span
styleClass="${container.item.style}" value="${container.item.name}" />
</td></tr>
</netui:radioButtonGroup>
</table>
@@ -32,7 +32,7 @@
<caption class="normalAttr">RadioButton Group Two</caption>
<tr><td>
<netui:radioButtonGroup dataSource="pageFlow.resultsTwo"
optionsDataSource="${pageFlow.opts}" repeater="true" >
- <netui:label styleClass="${container.item.style}"
value="${container.item.name}" />
+ <netui:span styleClass="${container.item.style}"
value="${container.item.name}" />
<netui:radioButtonOption
value="${container.item.optionValue}" />
</netui:radioButtonGroup>
</td></tr>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadioOptionError/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadioOptionError/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/RepeatRadioOptionError/index.jsp
Tue Aug 3 15:48:42 2004
@@ -22,7 +22,7 @@
<caption class="normalAttr">CheckBox Group</caption>
<netui:radioButtonGroup dataSource="pageFlow.resultsOne"
optionsDataSource="${pageFlow.opts}">
<tr align="center"><td align="right"
width="25%"><netui:radioButtonOption value="${container.item.optionValue}"
/></td>
- <td align="left"><netui:label
styleClass="${container.item.style}" value="${container.item.name}" />
+ <td align="left"><netui:span
styleClass="${container.item.style}" value="${container.item.name}" />
</td></tr>
</netui:radioButtonGroup>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskey/page2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskey/page2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskey/page2.jsp
Tue Aug 3 15:48:42 2004
@@ -16,15 +16,15 @@
<netui-data:repeaterHeader><ol></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<li>
- <netui:label value="${container.item}"
defaultValue=" "></netui:label>
+ <netui:span value="${container.item}"
defaultValue=" "></netui:span>
</li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ol></netui-data:repeaterFooter>
</netui-data:repeater><br>
- <b>Color:</b> <netui:label
value="${pageInput.form.color}"></netui:label><br/>
- <b>Description:</b> <netui:label
value="${pageInput.form.description}"></netui:label><br/>
- <b>Disabled:</b> <netui:label
value="${pageInput.form.disabled}"></netui:label><br/>
- <b>Name:</b> <netui:label
value="${pageInput.form.name}"></netui:label><br/>
- <b>Type:</b> <netui:label
value="${pageInput.form.type}"></netui:label><br/>
+ <b>Color:</b> <netui:span
value="${pageInput.form.color}"></netui:span><br/>
+ <b>Description:</b> <netui:span
value="${pageInput.form.description}"></netui:span><br/>
+ <b>Disabled:</b> <netui:span
value="${pageInput.form.disabled}"></netui:span><br/>
+ <b>Name:</b> <netui:span
value="${pageInput.form.name}"></netui:span><br/>
+ <b>Type:</b> <netui:span
value="${pageInput.form.type}"></netui:span><br/>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskeyGroup/page2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskeyGroup/page2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/accesskeyGroup/page2.jsp
Tue Aug 3 15:48:42 2004
@@ -22,11 +22,11 @@
<netui-data:repeaterHeader><ol></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<li>
- <netui:label value="${container.item}"
defaultValue=" "></netui:label>
+ <netui:span value="${container.item}"
defaultValue=" "></netui:span>
</li>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ol></netui-data:repeaterFooter>
</netui-data:repeater><br>
- <b>Type:</b> <netui:label
value="${pageInput.form.type}"></netui:label><br>
+ <b>Type:</b> <netui:span
value="${pageInput.form.type}"></netui:span><br>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/anchorActions/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/anchorActions/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/anchorActions/index.jsp
Tue Aug 3 15:48:42 2004
@@ -24,7 +24,7 @@
<netui-data:repeaterItem>
<li>
<netui:anchor action="${container.item}">
- <netui:label value="${container.item}"></netui:label>
+ <netui:span value="${container.item}"></netui:span>
</netui:anchor>
</li>
</netui-data:repeaterItem>
@@ -32,6 +32,6 @@
</netui-data:repeater>
<netui:anchor action="goErrors">Errors</netui:anchor><br>
<hr>
- <b>Last Action:</b> <netui:label value="${pageFlow.lastAction}"/>
+ <b>Last Action:</b> <netui:span value="${pageFlow.lastAction}"/>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/buttonSubmitTagId/begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/buttonSubmitTagId/begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/buttonSubmitTagId/begin.jsp
Tue Aug 3 15:48:42 2004
@@ -29,6 +29,6 @@
<netui:button type="submit" value="Delete" action="DeleteName"
tagId="NameDelete"></netui:button>
</netui:form>
<hr />
- <netui:label value="${pageFlow.action}"/>
+ <netui:span value="${pageFlow.action}"/>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/content/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/content/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/content/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -8,11 +8,11 @@
<body>
<h4>Content And Literal</h4>
<h4>Label</h4>
-nbsp [<netui:label value="${pageFlow.nbsp}"/>]<br />
-& [<netui:label value="${pageFlow.amp}"/>]<br />
-< [<netui:label value="${pageFlow.lessThan}"/>]<br />
-html [<netui:label value="${pageFlow.html}"/>]<br />
-text [<netui:label value="${pageFlow.text}"/>]<br />
+nbsp [<netui:span value="${pageFlow.nbsp}"/>]<br />
+& [<netui:span value="${pageFlow.amp}"/>]<br />
+< [<netui:span value="${pageFlow.lessThan}"/>]<br />
+html [<netui:span value="${pageFlow.html}"/>]<br />
+text [<netui:span value="${pageFlow.text}"/>]<br />
<h4>Content</h4>
nbsp [<netui:content value="${pageFlow.nbsp}"/>]<br />
& [<netui:content value="${pageFlow.amp}"/>]<br />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/dateConverter/showResults.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/dateConverter/showResults.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/dateConverter/showResults.jsp
Tue Aug 3 15:48:42 2004
@@ -10,9 +10,9 @@
</title>
</head>
<body>
- Date:<netui:label value="${pageInput.form.date}">
+ Date:<netui:span value="${pageInput.form.date}">
<netui:formatDate pattern="M/d/yy HH:mm"/>
- </netui:label><br/>
- Type:<netui:label value="${pageInput.form.type}"></netui:label><br/>
+ </netui:span><br/>
+ Type:<netui:span value="${pageInput.form.type}"></netui:span><br/>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/dateFormatString/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/dateFormatString/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/dateFormatString/index.jsp
Tue Aug 3 15:48:42 2004
@@ -17,15 +17,15 @@
</p>
<hr>
<netui:body><h4>In tags</h4>
- 2003/10/25: <netui:label value="${pageFlow.dateOne}"><netui:formatDate
pattern="MM/dd/yyyy" stringInputPattern="yy/MM/dd"/></netui:label> <br>
- 2003-10-25: <netui:label value="${pageFlow.dateTwo}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:label> <br>
- 2003.10.25: <netui:label
value="${pageFlow.dateThree}"><netui:formatDate pattern="MM/dd/yyyy"
stringInputPattern="yy.MM.dd"/></netui:label> <br>
+ 2003/10/25: <netui:span value="${pageFlow.dateOne}"><netui:formatDate
pattern="MM/dd/yyyy" stringInputPattern="yy/MM/dd"/></netui:span> <br>
+ 2003-10-25: <netui:span value="${pageFlow.dateTwo}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:span> <br>
+ 2003.10.25: <netui:span
value="${pageFlow.dateThree}"><netui:formatDate pattern="MM/dd/yyyy"
stringInputPattern="yy.MM.dd"/></netui:span> <br>
<hr ><h4>Data Binding</h4>
- 2003/10/25: <netui:label value="${pageFlow.dateOne}"><netui:formatDate
pattern="MM/dd/yyyy" stringInputPattern="${pageFlow.pattOne}"/></netui:label>
<br>
- 2003-10-25: <netui:label value="${pageFlow.dateTwo}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:label> <br>
- 2003.10.25: <netui:label
value="${pageFlow.dateThree}"><netui:formatDate pattern="MM/dd/yyyy"
stringInputPattern="${pageFlow.pattTwo}"/></netui:label> <br>
+ 2003/10/25: <netui:span value="${pageFlow.dateOne}"><netui:formatDate
pattern="MM/dd/yyyy" stringInputPattern="${pageFlow.pattOne}"/></netui:span>
<br>
+ 2003-10-25: <netui:span value="${pageFlow.dateTwo}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:span> <br>
+ 2003.10.25: <netui:span
value="${pageFlow.dateThree}"><netui:formatDate pattern="MM/dd/yyyy"
stringInputPattern="${pageFlow.pattTwo}"/></netui:span> <br>
<hr><h4>Errors</h4>
- 2003.10.25: <netui:label
value="${pageFlow.dateThree}"><netui:formatDate pattern="MM/dd/yyyy"
stringInputPattern="${pageFlow.pattError}"/></netui:label> <br>
- 2003.10.25: <netui:label
value="${pageFlow.dateThree}"><netui:formatDate pattern="MM/dd/yyyy"
stringInputPattern="${pageFlow.pattOne}"/></netui:label> <br>
+ 2003.10.25: <netui:span
value="${pageFlow.dateThree}"><netui:formatDate pattern="MM/dd/yyyy"
stringInputPattern="${pageFlow.pattError}"/></netui:span> <br>
+ 2003.10.25: <netui:span
value="${pageFlow.dateThree}"><netui:formatDate pattern="MM/dd/yyyy"
stringInputPattern="${pageFlow.pattOne}"/></netui:span> <br>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disable/results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disable/results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disable/results.jsp
Tue Aug 3 15:48:42 2004
@@ -21,7 +21,7 @@
<netui-data:repeater dataSource="requestScope.parameterNames">
<netui-data:repeaterHeader><ul></netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
<%
DataAccessProviderBean bean = (DataAccessProviderBean)
pageContext.getAttribute("container");
String name = (String) bean.getItem();
@@ -33,44 +33,44 @@
<hr>
<h4>Form Data</h4>
<table border="1" cellspacing="0">
- <tr><td>TextBox</td><td><netui:label
value="${requestScope.form.textBox}"/> </td></tr>
- <tr><td>TextArea</td><td><netui:label
value="${requestScope.form.textArea}"/> </td></tr>
+ <tr><td>TextBox</td><td><netui:span
value="${requestScope.form.textBox}"/> </td></tr>
+ <tr><td>TextArea</td><td><netui:span
value="${requestScope.form.textArea}"/> </td></tr>
<tr><td>Select/Options</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.select">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
<tr><td>Select/Options Source:</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.selectThree">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
<tr><td>Select (option Disabled):</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.selectTwo">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
- <tr><td>radioGroup</td><td><netui:label
value="${requestScope.form.radioGroup}"/> </td></tr>
- <tr><td>radioGroup2</td><td><netui:label
value="${requestScope.form.radioGroup2}"/> </td></tr>
- <tr><td>check1</td><td><netui:label
value="${requestScope.form.check1}"/> </td></tr>
- <tr><td>check2</td><td><netui:label
value="${requestScope.form.check2}"/> </td></tr>
+ <tr><td>radioGroup</td><td><netui:span
value="${requestScope.form.radioGroup}"/> </td></tr>
+ <tr><td>radioGroup2</td><td><netui:span
value="${requestScope.form.radioGroup2}"/> </td></tr>
+ <tr><td>check1</td><td><netui:span
value="${requestScope.form.check1}"/> </td></tr>
+ <tr><td>check2</td><td><netui:span
value="${requestScope.form.check2}"/> </td></tr>
<tr><td>CheckBox Group/Options Source:</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.checkOne">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
<tr><td>CheckBox Group/Options</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.checkTwo">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disableBinding/results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disableBinding/results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disableBinding/results.jsp
Tue Aug 3 15:48:42 2004
@@ -14,44 +14,44 @@
<hr>
<h4>Form Data</h4>
<table border="1" cellspacing="0">
- <tr><td>TextBox</td><td><netui:label
value="${requestScope.form.textBox}"/> </td></tr>
- <tr><td>TextArea</td><td><netui:label
value="${requestScope.form.textArea}"/> </td></tr>
+ <tr><td>TextBox</td><td><netui:span
value="${requestScope.form.textBox}"/> </td></tr>
+ <tr><td>TextArea</td><td><netui:span
value="${requestScope.form.textArea}"/> </td></tr>
<tr><td>Select/Options</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.select">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
<tr><td>Select/Options Source:</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.selectThree">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
<tr><td>Select (option Disabled):</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.selectTwo">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
- <tr><td>radioGroup</td><td><netui:label
value="${requestScope.form.radioGroup}"/> </td></tr>
- <tr><td>radioGroup2</td><td><netui:label
value="${requestScope.form.radioGroup2}"/> </td></tr>
- <tr><td>check1</td><td><netui:label
value="${requestScope.form.check1}"/> </td></tr>
- <tr><td>check2</td><td><netui:label
value="${requestScope.form.check2}"/> </td></tr>
+ <tr><td>radioGroup</td><td><netui:span
value="${requestScope.form.radioGroup}"/> </td></tr>
+ <tr><td>radioGroup2</td><td><netui:span
value="${requestScope.form.radioGroup2}"/> </td></tr>
+ <tr><td>check1</td><td><netui:span
value="${requestScope.form.check1}"/> </td></tr>
+ <tr><td>check2</td><td><netui:span
value="${requestScope.form.check2}"/> </td></tr>
<tr><td>CheckBox Group/Options Source:</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.checkOne">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
<tr><td>CheckBox Group/Options</td><td>
<ul>
<netui-data:repeater dataSource="requestScope.form.checkTwo">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</td></tr>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disableImageButton/results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disableImageButton/results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/disableImageButton/results.jsp
Tue Aug 3 15:48:42 2004
@@ -22,7 +22,7 @@
<netui-data:repeater dataSource="requestScope.parameterNames">
<netui-data:repeaterHeader><ul></netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
<%
DataAccessProviderBean bean = (DataAccessProviderBean)
pageContext.getAttribute("container");
String name = (String) bean.getItem();
@@ -34,7 +34,7 @@
<hr />
<h4>The textbox value</h4>
<table border="1" cellspacing="0">
- <tr><td>TextBox</td><td><netui:label
value="${requestScope.form.textBox}"/> </td></tr>
+ <tr><td>TextBox</td><td><netui:span
value="${requestScope.form.textBox}"/> </td></tr>
</table>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/except/ErrorPage.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/except/ErrorPage.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/except/ErrorPage.jsp
Tue Aug 3 15:48:42 2004
@@ -5,7 +5,7 @@
</head>
<body>
<h4>Report Exception</h4>
-Page Flow Message: <netui:label value="${pageFlow.message}"/><br />
+Page Flow Message: <netui:span value="${pageFlow.message}"/><br />
Exception Tag Message:<netui:exceptions showMessage="true"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/formatTags/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/formatTags/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/formatTags/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -8,99 +8,99 @@
<b>String Format</b>
<table border="1" cellspacing="0">
<tr><th>Truncate</ty><td>
-<netui:label value="${pageFlow.letters}">
+<netui:span value="${pageFlow.letters}">
<netui:formatString pattern="#-#####-#" truncate="true"/>
-</netui:label>
+</netui:span>
</td><td>
-<netui:label value="abcdefghijklmnopqrstuvwxyz">
+<netui:span value="abcdefghijklmnopqrstuvwxyz">
<netui:formatString pattern="#-#####-#" truncate="true"/>
-</netui:label>
+</netui:span>
</td><td> </td></tr>
<tr><th>No Truncate</th><td>
-<netui:label value="${pageFlow.letters}">
+<netui:span value="${pageFlow.letters}">
<netui:formatString pattern="#-#####-#" />
-</netui:label>
+</netui:span>
</td><td>
-<netui:label value="abcdefghijklmnopqrstuvwxyz">
+<netui:span value="abcdefghijklmnopqrstuvwxyz">
<netui:formatString pattern="#-#####-#"/>
-</netui:label>
+</netui:span>
</td><td> </td></tr>
<tr><th>Contains Hash</th>
-<td><pre><netui:label value="${pageFlow.hash}"><netui:formatString
pattern="#-#####-#" truncate="true"/></netui:label></pre></td>
+<td><pre><netui:span value="${pageFlow.hash}"><netui:formatString
pattern="#-#####-#" truncate="true"/></netui:span></pre></td>
<th>Contains spac</th>
-<td><pre><netui:label value="${pageFlow.spaces}"><netui:formatString
pattern="#-#####-#" truncate="true"/></netui:label></pre></td>
+<td><pre><netui:span value="${pageFlow.spaces}"><netui:formatString
pattern="#-#####-#" truncate="true"/></netui:span></pre></td>
</tr>
<tr><th>Hash Escape</th>
-<td><netui:label value="${pageFlow.letters}"><netui:formatString
pattern="$##-#####-#" truncate="true"/></netui:label></td>
+<td><netui:span value="${pageFlow.letters}"><netui:formatString
pattern="$##-#####-#" truncate="true"/></netui:span></td>
<th>Escape Chars</th>
-<td><netui:label value="${pageFlow.letters}"><netui:formatString
pattern="$$#-#####-#" truncate="true"/></netui:label></td>
+<td><netui:span value="${pageFlow.letters}"><netui:formatString
pattern="$$#-#####-#" truncate="true"/></netui:span></td>
</tr>
<tr><th>Bind to Pattern</th><td>
-<netui:label value="${pageFlow.letters}">
+<netui:span value="${pageFlow.letters}">
<netui:formatString pattern="${pageFlow.stringPattern}" truncate="true"/>
-</netui:label>
+</netui:span>
</td><td>
-<netui:label value="abcdefghijklmnopqrstuvwxyz">
+<netui:span value="abcdefghijklmnopqrstuvwxyz">
<netui:formatString pattern="${pageFlow.stringPattern}" truncate="true"/>
-</netui:label>
+</netui:span>
</td><td> </td></tr>
</table>
<b>Number Format</b>
<table border="1" cellspacing="0">
<tr><th>EN Currency</ty><td>
-<netui:label value="12345.67">
+<netui:span value="12345.67">
<netui:formatNumber language="EN" country = "US" type="currency"/>
-</netui:label>
+</netui:span>
<!-- removing the GB for the moment because this causes the test recorder
problems -->
<th>GB Currency</th><td>
-<netui:label value="12345.67">
+<netui:span value="12345.67">
<netui:formatNumber language="EN" country = "US" type="currency"/>
-</netui:label>
+</netui:span>
</td></tr>
<tr><th>EN Number</ty><td>
-<netui:label value="12345.67">
+<netui:span value="12345.67">
<netui:formatNumber language="EN" country = "US" type="number"/>
-</netui:label>
+</netui:span>
<th>GB Number</th><td>
-<netui:label value="12345.67">
+<netui:span value="12345.67">
<netui:formatNumber language="EN" country = "GB" type="number"/>
-</netui:label>
+</netui:span>
</td></tr>
<tr><th>EN Percentage</ty><td>
-<netui:label value=".167">
+<netui:span value=".167">
<netui:formatNumber language="EN" country = "US" type="percent"/>
-</netui:label>
+</netui:span>
<th>GB Percentage</th><td>
-<netui:label value=".167">
+<netui:span value=".167">
<netui:formatNumber language="EN" country = "GB" type="percent"/>
-</netui:label>
+</netui:span>
</td></tr>
<tr><th>Pattern</ty><td>
- <netui:label value="${pageFlow.number}">
+ <netui:span value="${pageFlow.number}">
<netui:formatNumber pattern="$#,###,###.00" />
- </netui:label>
+ </netui:span>
<th>Escaped Pattern</th><td>
- <netui:label value="${pageFlow.number}">
+ <netui:span value="${pageFlow.number}">
<netui:formatNumber pattern="\##,###,###.00" />
- </netui:label>
+ </netui:span>
</td></tr>
</table>
<b>Date Format</b>
<table border="1" cellspacing="0">
<tr><th>US Date</th><td>
-<netui:label value="${pageFlow.date}">
+<netui:span value="${pageFlow.date}">
<netui:formatDate language="EN" country = "US"/>
-</netui:label>
+</netui:span>
</td><th>GB Date</th><td>
-<netui:label value="${pageFlow.date}">
+<netui:span value="${pageFlow.date}">
<netui:formatDate language="EN" country = "GB"/>
-</netui:label>
+</netui:span>
</td></tr>
<tr><th>yyyy.MM.dd G 'at' HH:mm:ss z</th><td>
-<netui:label value="${pageFlow.date}">
+<netui:span value="${pageFlow.date}">
<netui:formatDate pattern="yyyy.MM.dd G 'at' HH:mm:ss z"/>
-</netui:label>
+</netui:span>
</td><th>yyyy.MM.dd G 'at' HH:mm:ss z (EN, GB)</th><td>
Removed because this is not handled by the test recorder correctly
</td></tr>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/hidden/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/hidden/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/hidden/index.jsp
Tue Aug 3 15:48:42 2004
@@ -20,7 +20,7 @@
<netui:hidden dataSource="actionForm.hidden"
dataInput="${pageFlow.hiddenValue}"/>
<netui:button value="post" type="submit"/>
</netui:form>
- Hidden: <netui:label value="${pageFlow.value}"/>
+ Hidden: <netui:span value="${pageFlow.value}"/>
<hr/>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/imageAnchorActions/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/imageAnchorActions/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/imageAnchorActions/index.jsp
Tue Aug 3 15:48:42 2004
@@ -27,7 +27,7 @@
</netui-data:repeaterItem>
<netui-data:repeaterFooter></ul></netui-data:repeaterFooter>
</netui-data:repeater>
- <b>Last Action:</b><netui:label value="${pageFlow.lastAction}"/><br>
+ <b>Last Action:</b><netui:span value="${pageFlow.lastAction}"/><br>
<hr>
<netui:anchor action="goErrors">Errors</netui:anchor><br>
</netui:body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelDefaultValues/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelDefaultValues/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelDefaultValues/index.jsp
Tue Aug 3 15:48:42 2004
@@ -9,13 +9,13 @@
</title>
</head>
<body>
- [nbsp]: '<netui:label escapeWhiteSpaceForHtml="false"
value="${pageFlow.value}" defaultValue=" "/>'<br />
- amp: '<netui:label value="${pageFlow.value}" defaultValue="&"/>'<br />
- &nbsp: '<netui:label value="${pageFlow.value}"
defaultValue="&nbsp;"/>'<br />
- &amp: '<netui:label value="${pageFlow.value}"
defaultValue="&"/>'<br />
- foo[copy]: '<netui:label value="${pageFlow.value}" defaultValue="foo
©"/>'<br />
- foo[nbsp nbsp]bar: '<netui:label value="${pageFlow.value}"
defaultValue="foo bar"/>'<br />
- [nbsp]: '<netui:label value="${pageFlow.value}"
defaultValue=" "/>'<br />
- spacer: '<netui:label value="${pageFlow.spacer}"/>'<br />
+ [nbsp]: '<netui:span escapeWhiteSpaceForHtml="false"
value="${pageFlow.value}" defaultValue=" "/>'<br />
+ amp: '<netui:span value="${pageFlow.value}" defaultValue="&"/>'<br />
+ &nbsp: '<netui:span value="${pageFlow.value}"
defaultValue="&nbsp;"/>'<br />
+ &amp: '<netui:span value="${pageFlow.value}" defaultValue="&"/>'<br
/>
+ foo[copy]: '<netui:span value="${pageFlow.value}" defaultValue="foo
©"/>'<br />
+ foo[nbsp nbsp]bar: '<netui:span value="${pageFlow.value}"
defaultValue="foo bar"/>'<br />
+ [nbsp]: '<netui:span value="${pageFlow.value}" defaultValue=" "/>'<br
/>
+ spacer: '<netui:span value="${pageFlow.spacer}"/>'<br />
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelDefaults/begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelDefaults/begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelDefaults/begin.jsp
Tue Aug 3 15:48:42 2004
@@ -20,15 +20,15 @@
<hr>
<table cellspacing="0" border="1" cellpadding="3">
- <tr><td>Null Object/No Default</td><td><netui:label
value="${pageFlow.nullValue}" /></td></tr>
- <tr><td>Null Object/Default</td><td><netui:label defaultValue="[NULL]"
value="${pageFlow.nullValue}" /></td></tr>
- <tr><td>Null Object/Bound Default</td><td><netui:label
defaultValue="${pageFlow.defaultBound}" value="${pageFlow.nullValue}"
/></td></tr>
- <tr><td>Null Object/Bound Null Default</td><td><netui:label
defaultValue="${pageFlow.nullValue}" value="${pageFlow.nullValue}" /></td></tr>
+ <tr><td>Null Object/No Default</td><td><netui:span
value="${pageFlow.nullValue}" /></td></tr>
+ <tr><td>Null Object/Default</td><td><netui:span defaultValue="[NULL]"
value="${pageFlow.nullValue}" /></td></tr>
+ <tr><td>Null Object/Bound Default</td><td><netui:span
defaultValue="${pageFlow.defaultBound}" value="${pageFlow.nullValue}"
/></td></tr>
+ <tr><td>Null Object/Bound Null Default</td><td><netui:span
defaultValue="${pageFlow.nullValue}" value="${pageFlow.nullValue}" /></td></tr>
- <tr><td>Null Object, Date Formatter/No Default</td><td><netui:label
value="${pageFlow.nullValue}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:label></td></tr>
- <tr><td>Null Object, Date Formatter/Default</td><td><netui:label
value="${pageFlow.nullValue}" defaultValue="[NULL]"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:label></td></tr>
- <tr><td>Null Object, Date Formatter/Bound Default</td><td><netui:label
value="${pageFlow.nullValue}"
defaultValue="${pageFlow.defaultDate}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:label></td></tr>
- <tr><td>Null Object, Date Formatter/Bound Null
Default</td><td><netui:label value="${pageFlow.nullValue}"
defaultValue="${pageFlow.nullValue}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:label></td></tr>
+ <tr><td>Null Object, Date Formatter/No Default</td><td><netui:span
value="${pageFlow.nullValue}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:span></td></tr>
+ <tr><td>Null Object, Date Formatter/Default</td><td><netui:span
value="${pageFlow.nullValue}" defaultValue="[NULL]"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:span></td></tr>
+ <tr><td>Null Object, Date Formatter/Bound Default</td><td><netui:span
value="${pageFlow.nullValue}"
defaultValue="${pageFlow.defaultDate}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:span></td></tr>
+ <tr><td>Null Object, Date Formatter/Bound Null Default</td><td><netui:span
value="${pageFlow.nullValue}"
defaultValue="${pageFlow.nullValue}"><netui:formatDate
pattern="MM/dd/yyyy"/></netui:span></td></tr>
</table>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelLiteral/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelLiteral/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelLiteral/index.jsp
Tue Aug 3 15:48:42 2004
@@ -11,12 +11,12 @@
</head>
<body>
<h4>Default</h4>
- <netui:label value="${pageFlow.litString}" />
+ <netui:span value="${pageFlow.litString}" />
<hr />
<h4>escapeWhiteSpaceForHtml=true</h4>
- <netui:label value="${pageFlow.litString}"
escapeWhiteSpaceForHtml="true"/>
+ <netui:span value="${pageFlow.litString}"
escapeWhiteSpaceForHtml="true"/>
<hr />
<h4>escapeWhiteSpaceForHtml=false</h4>
- <netui:label value="${pageFlow.litString}"
escapeWhiteSpaceForHtml="false"/>
+ <netui:span value="${pageFlow.litString}"
escapeWhiteSpaceForHtml="false"/>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelStyles/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelStyles/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/labelStyles/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -12,13 +12,13 @@
<body>
<h4>Content And Literal</h4>
<h4>Label With Style Attributes</h4>
-text [<netui:label value="${pageFlow.text}" style="color:blue"/>]<br />
-text 2 [<netui:label value="${pageFlow.text2}" style="color:red"/>]<br />
-html [<netui:label value="${pageFlow.html}" style="color:blue"/>]<br />
+text [<netui:span value="${pageFlow.text}" style="color:blue"/>]<br />
+text 2 [<netui:span value="${pageFlow.text2}" style="color:red"/>]<br />
+html [<netui:span value="${pageFlow.html}" style="color:blue"/>]<br />
<h4>Label With Styles</h4>
-text [<netui:label value="${pageFlow.text}" styleClass="red"/>]<br />
-text 2 [<netui:label value="${pageFlow.text2}" styleClass="blue"/>]<br />
-html [<netui:label value="${pageFlow.html}" styleClass="red"/>]<br />
+text [<netui:span value="${pageFlow.text}" styleClass="red"/>]<br />
+text 2 [<netui:span value="${pageFlow.text2}" styleClass="blue"/>]<br />
+html [<netui:span value="${pageFlow.html}" styleClass="red"/>]<br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/message/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -12,12 +12,12 @@
<netui-data:messageArg value="${pageScope.two}"/>
<netui-data:messageArg value="${pageScope.three}"/>
</netui-data:message>
-BAZ: <netui:label value="${pageScope.baz}"/><br>
+BAZ: <netui:span value="${pageScope.baz}"/><br>
<netui-data:message value="{1} of {0}" resultId="baz">
<netui-data:messageArg value="${pageScope.two}"/>
<netui-data:messageArg value="${pageScope.three}"/>
</netui-data:message>
-BAZ: <netui:label value="${pageScope.baz}"/>
+BAZ: <netui:span value="${pageScope.baz}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/multiSelect/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/multiSelect/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/multiSelect/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -18,10 +18,10 @@
</table>
</netui:form>
<br />
-<b>Select 1:</b> size = <netui:label value="${pageFlow.selectedSize}"/><br />
+<b>Select 1:</b> size = <netui:span value="${pageFlow.selectedSize}"/><br />
<db:repeater dataSource="pageFlow.selected">
<db:repeaterItem>
- <netui:label value="${container.item}"/><br />
+ <netui:span value="${container.item}"/><br />
</db:repeaterItem>
</db:repeater>
<br />
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/nullableSelect/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/nullableSelect/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/nullableSelect/index.jsp
Tue Aug 3 15:48:42 2004
@@ -37,6 +37,6 @@
<br/>
<netui:button value="postType" type="submit"/>
</netui:form><br>
- Type: <netui:label value="${pageFlow.selectedType}"/>
+ Type: <netui:span value="${pageFlow.selectedType}"/>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/onTest/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/onTest/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/onTest/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -188,7 +188,7 @@
</netui:checkBoxGroup><br />
<!-- LABEL: dataSource, dataformatas, style, styleClass, tabindex
-->
-<netui:label value="Checkbox 1"
+<netui:span value="Checkbox 1"
onClick="print_click(labelId);"
onKeyDown="print_keyDown(labelId);"
onKeyPress="print_keyPress(labelId);"
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/paramEncoding/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/paramEncoding/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/paramEncoding/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -11,6 +11,6 @@
<netui:parameter name="foo" value="${pageFlow.param}"/><br />
</netui:anchor>
<hr />
-Foo Value: <netui:label value="${pageFlow.foo}"/><br />
+Foo Value: <netui:span value="${pageFlow.foo}"/><br />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/paramMulti/results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/paramMulti/results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/paramMulti/results.jsp
Tue Aug 3 15:48:42 2004
@@ -12,10 +12,10 @@
<body>
<netui:anchor action="home">Home</netui:anchor>
<hr />
- <h4><netui:label value="${param.name}"/></h4>
+ <h4><netui:span value="${param.name}"/></h4>
<ul>
<netui-data:repeater dataSource="pageFlow.formFoo">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/primitiveOptionsDS/dumpBoxes.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/primitiveOptionsDS/dumpBoxes.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/primitiveOptionsDS/dumpBoxes.jsp
Tue Aug 3 15:48:42 2004
@@ -14,7 +14,7 @@
<netui-data:repeaterHeader><table class="tablebody"
border="1"></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr>
- <td><netui:label value="${container.item}"
defaultValue=" "></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" "></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></table></netui-data:repeaterFooter>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelect/Results.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelect/Results.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelect/Results.jsp
Tue Aug 3 15:48:42 2004
@@ -11,10 +11,10 @@
<netui:anchor action="begin">Home</netui:anchor>
<ul>
<netui-data:repeater dataSource="pageFlow.resultsOne">
- <li><netui:label value="${container.item}"/></li>
+ <li><netui:span value="${container.item}"/></li>
</netui-data:repeater>
</ul>
<br/>
- Results Two: <netui:label value="${pageFlow.resultsTwo}" />
+ Results Two: <netui:span value="${pageFlow.resultsTwo}" />
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelect/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelect/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelect/index.jsp
Tue Aug 3 15:48:42 2004
@@ -19,10 +19,10 @@
<netui:select dataSource="pageFlow.resultsOne"
optionsDataSource="${pageFlow.opts}" repeater="true" size="3"
multiple="true">
<netui:selectOption repeatingType="Option"
value="${container.item.optionValue}" styleClass="normalAttr">
- <netui:label value="${container.item.name}" />
+ <netui:span value="${container.item.name}" />
</netui:selectOption>
<netui:selectOption repeatingType="Null" value="null-opt"
styleClass="normalAttr">
- <netui:label value="[Nothing]" />
+ <netui:span value="[Nothing]" />
</netui:selectOption>
</netui:select>
</td></tr>
@@ -31,12 +31,12 @@
nullable="true">
<c:if test="${container.metadata.repeatingStage == '1'}">
<netui:selectOption repeatingType="Option"
value="${container.item.optionValue}" styleClass="normalAttr">
- <netui:label value="${container.item.name}" />
+ <netui:span value="${container.item.name}" />
</netui:selectOption>
</c:if>
<c:if test="${container.metadata.repeatingStage == '4'}">
<netui:selectOption repeatingType="Null" value="null-opt"
styleClass="normalAttr">
- <netui:label value="[Nothing]" />
+ <netui:span value="[Nothing]" />
</netui:selectOption>
</c:if>
</netui:select>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelectTypeError/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelectTypeError/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/repeatSelectTypeError/index.jsp
Tue Aug 3 15:48:42 2004
@@ -18,10 +18,10 @@
<netui:select dataSource="pageFlow.resultsOne"
optionsDataSource="${pageFlow.opts}" repeater="true" size="3"
multiple="true">
<netui:selectOption value="${container.item.optionValue}"
styleClass="normalAttr">
- <netui:label value="${container.item.name}" />
+ <netui:span value="${container.item.name}" />
</netui:selectOption>
<netui:selectOption repeatingType="Null" value="null-opt"
styleClass="normalAttr">
- <netui:label value="[Nothing]" />
+ <netui:span value="[Nothing]" />
</netui:selectOption>
</netui:select>
</td></tr>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/rtexpTagId/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/rtexpTagId/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/rtexpTagId/index.jsp
Tue Aug 3 15:48:42 2004
@@ -30,6 +30,6 @@
<br/>
<netui:button value="postForm" type="submit"/>
</netui:form>
- <br>Action: <netui:label value="${pageFlow.action}" tagId='<%= "tagid"
+ tagid++ %>'/>
+ <br>Action: <netui:span value="${pageFlow.action}" tagId='<%= "tagid"
+ tagid++ %>'/>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/runtimeErrors/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/runtimeErrors/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/runtimeErrors/index.jsp
Tue Aug 3 15:48:42 2004
@@ -8,7 +8,7 @@
</head>
<netui:body>
<netui:anchor action="next">Next</netui:anchor><br />
- <netui:label value="${pageflow.missing}" />
+ <netui:span value="${pageflow.missing}" />
<!-- report all runtime tag errors -->
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/runtimeErrors/next.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/runtimeErrors/next.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/runtimeErrors/next.jsp
Tue Aug 3 15:48:42 2004
@@ -7,7 +7,7 @@
<netui:base/>
</head>
<body>
- <netui:label value="${pageflow.missing}" />
+ <netui:span value="${pageflow.missing}" />
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/select/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/select/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/select/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -23,7 +23,7 @@
</table>
</netui:form>
<br />
-Select 1: <netui:label value="${pageFlow.selected}"/><br />
-Select 2: <netui:label value="${pageFlow.selected2}"/>
+Select 1: <netui:span value="${pageFlow.selected}"/><br />
+Select 2: <netui:span value="${pageFlow.selected2}"/>
</body>
</html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/sessionBean/jsp1.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/sessionBean/jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/sessionBean/jsp1.jsp
Tue Aug 3 15:48:42 2004
@@ -16,7 +16,7 @@
<netui:button value="Action3"></netui:button>
</netui:form>
<hr/>
- Session nameBean.name = '<netui:label
value="${sessionScope.nameBean.name}"/>'
+ Session nameBean.name = '<netui:span
value="${sessionScope.nameBean.name}"/>'
</p>
</body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/sessionBean/jsp2.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/sessionBean/jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/sessionBean/jsp2.jsp
Tue Aug 3 15:48:42 2004
@@ -10,8 +10,8 @@
</title>
</head>
<body>
- Page Input Form: <netui:label value="${pageInput.formInput.name}"/><br
/>
- Session My Bean: <netui:label value="${sessionScope.nameBean.name}"/>
+ Page Input Form: <netui:span value="${pageInput.formInput.name}"/><br
/>
+ Session My Bean: <netui:span value="${sessionScope.nameBean.name}"/>
<hr />
<netui:anchor action="Action3">Return to Form</netui:anchor>
</body>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/style/Begin.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/style/Begin.jsp
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/style/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -28,7 +28,7 @@
optionsDataSource="${actionForm.checkOptions}" />
<!-- LABEL:-->
-<netui:label value="Checkbox 1" style="Color: blue;font: bold 14pt sans-serif "
+<netui:span value="Checkbox 1" style="Color: blue;font: bold 14pt sans-serif "
/>
<!-- CHECKBOX: defaultValue, style, styleClass, tabindex
-->
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/styleClass/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/styleClass/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/styleClass/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -77,7 +77,7 @@
optionsDataSource="${actionForm.checkOptions}" />
<!-- LABEL:-->
-<netui:label value="Checkbox 1" styleClass="bigBlue"
+<netui:span value="Checkbox 1" styleClass="bigBlue"
/>
<!-- CHECKBOX: defaultValue, style, styleClass, tabindex
-->
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/tagIds/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/tagIds/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/tagIds/index.jsp
Tue Aug 3 15:48:42 2004
@@ -41,7 +41,7 @@
<netui:imageButton
src="./../../resources/images/folder_16_pad.gif"
tagId="imageButton"></netui:imageButton>
</netui:form>
<hr />
- <netui:label value="${pageFlow.action}" tagId="label"/> <br>
+ <netui:span value="${pageFlow.action}" tagId="label"/> <br>
<netui:anchor action="begin" tagId="anchor">Home</netui:anchor><br>
<netui:imageAnchor action="begin"
src="./../../resources/images/folder_16_pad.gif"
tagId="imageAnchor"></netui:imageAnchor><br>
<netui:image src="./../../resources/images/bar-background.gif"
tagId="image"></netui:image>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/tempNegate/Begin.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/tempNegate/Begin.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/tempNegate/Begin.jsp
Tue Aug 3 15:48:42 2004
@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"%>
<netui:html>
<body>
-<h4><netui:label value="${pageFlow.title}"/></h4>
+<h4><netui:span value="${pageFlow.title}"/></h4>
<c:if test="${pageFlow.visible}">
<p>Text from the Visible Tag - Should See</p>
</c:if>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAttributeBits/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAttributeBits/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAttributeBits/index.jsp
Tue Aug 3 15:48:42 2004
@@ -12,9 +12,9 @@
<tr valign="top">
<td>TreeHtmlAttributeInfo 1:</td>
<td>
- <netui:label value="${pageFlow.attributeInfo1.onIcon}"
defaultValue=" "/><br>
- <netui:label value="${pageFlow.attributeInfo1.onIconLink}"
defaultValue=" "/><br>
- <netui:label value="${pageFlow.attributeInfo1.onLabelLink}"
defaultValue=" "/><br>
+ <netui:span value="${pageFlow.attributeInfo1.onIcon}"
defaultValue=" "/><br>
+ <netui:span value="${pageFlow.attributeInfo1.onIconLink}"
defaultValue=" "/><br>
+ <netui:span value="${pageFlow.attributeInfo1.onLabelLink}"
defaultValue=" "/><br>
</td>
</tr>
</table>
@@ -23,9 +23,9 @@
<tr valign="top">
<td>TreeHtmlAttributeInfo 2:</td>
<td>
- <netui:label value="${pageFlow.attributeInfo2.onIcon}"
defaultValue=" "/><br>
- <netui:label value="${pageFlow.attributeInfo2.onIconLink}"
defaultValue=" "/><br>
- <netui:label value="${pageFlow.attributeInfo2.onLabelLink}"
defaultValue=" "/><br>
+ <netui:span value="${pageFlow.attributeInfo2.onIcon}"
defaultValue=" "/><br>
+ <netui:span value="${pageFlow.attributeInfo2.onIconLink}"
defaultValue=" "/><br>
+ <netui:span value="${pageFlow.attributeInfo2.onLabelLink}"
defaultValue=" "/><br>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/anchorTargets.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/anchorTargets.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/anchorTargets.jsp
Tue Aug 3 15:48:42 2004
@@ -19,7 +19,7 @@
<td valign="middle" align="right"><netui:anchor styleClass="normal"
action="goAnchorTest">Anchor Tests</netui:anchor></td>
</tr></table>
<p class="normal">Targets for the anchor tests</p>
- <p class="normal">Color: <netui:label value="${param.color}" /></p>
+ <p class="normal">Color: <netui:span value="${param.color}" /></p>
<p><netui:anchor styleClass="normal" linkName="bottomP">Go to
Bottom</netui:anchor></p>
<div style="height:300pt;width:200pt;border:thin solid;">
</div>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/checkboxResults.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/checkboxResults.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/checkboxResults.jsp
Tue Aug 3 15:48:42 2004
@@ -22,7 +22,7 @@
<td align="right"><netui:anchor styleClass="normal"
action="goCheckboxTest">Input Tests</netui:anchor></td>
</tr></table>
<p>
- Action: <netui:label value="${pageInput.action}"></netui:label>
+ Action: <netui:span value="${pageInput.action}"></netui:span>
</p>
<table border="1" cellspacing="0">
<tr class="tablehead" valign="top">
@@ -38,7 +38,7 @@
<netui-data:repeaterHeader><table class="tablebody"
border="0"></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr valign="top">
- <td><netui:label value="${container.item}"
defaultValue=" " styleClass="normal"></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" " styleClass="normal"></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></table></netui-data:repeaterFooter>
@@ -49,20 +49,20 @@
<netui-data:repeaterHeader><table class="tablebody"
border="0"></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr valign="top">
- <td><netui:label value="${container.item}"
defaultValue=" " styleClass="normal"></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" " styleClass="normal"></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></table></netui-data:repeaterFooter>
</netui-data:repeater>
</td>
- <td><netui:label value="${pageInput.formData.check1}"
defaultValue=" " styleClass="normal"></netui:label></td>
- <td><netui:label value="${pageInput.formData.check2}"
defaultValue=" " styleClass="normal"></netui:label></td>
+ <td><netui:span value="${pageInput.formData.check1}"
defaultValue=" " styleClass="normal"></netui:span></td>
+ <td><netui:span value="${pageInput.formData.check2}"
defaultValue=" " styleClass="normal"></netui:span></td>
<td>
<netui-data:repeater dataSource="pageInput.formData.optCbgMap">
<netui-data:repeaterHeader><table class="tablebody"
border="0"></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr valign="top">
- <td><netui:label value="${container.item}"
defaultValue=" " styleClass="normal"></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" " styleClass="normal"></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></table></netui-data:repeaterFooter>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/checkboxTest.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/checkboxTest.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/checkboxTest.jsp
Tue Aug 3 15:48:42 2004
@@ -40,7 +40,7 @@
<netui:checkBoxGroup dataSource="actionForm.optCbg"
optionsDataSource="${pageFlow.checkBoxOptions}"
repeater="true">
<tr><td align="right" class="normal2">
- <netui:label value="${container.item}" />
+ <netui:span value="${container.item}" />
</td><td>
<netui:checkBoxOption value="${container.item}" />
</td></tr>
@@ -67,7 +67,7 @@
<netui:checkBoxGroup dataSource="actionForm.optCbgMap"
optionsDataSource="${pageFlow.opts}"
repeater="true">
<netui:checkBoxOption
value="${container.item.optionValue}" />
- <netui:label
styleClass="${container.item.style}" value="${container.item.name}" /><br/>
+ <netui:span
styleClass="${container.item.style}" value="${container.item.name}" /><br/>
</netui:checkBoxGroup>
</td></tr></table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelResults.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelResults.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/formLabelResults.jsp
Tue Aug 3 15:48:42 2004
@@ -24,19 +24,19 @@
<tr valign="top">
<td class="normal">Value One:</td>
<td>
- <netui:label value="${pageInput.formData.valueOne}"
defaultValue=" " styleClass="normal"/>
+ <netui:span value="${pageInput.formData.valueOne}"
defaultValue=" " styleClass="normal"/>
</td>
</tr>
<tr valign="top">
<td class="normal">Value Two:</td>
<td>
- <netui:label value="${pageInput.formData.valueTwo}"
defaultValue=" " styleClass="normal"/>
+ <netui:span value="${pageInput.formData.valueTwo}"
defaultValue=" " styleClass="normal"/>
</td>
</tr>
<tr valign="top">
<td class="normal">Value Three:</td>
<td>
- <netui:label value="${pageInput.formData.valueThree}"
defaultValue=" " styleClass="normal"/>
+ <netui:span value="${pageInput.formData.valueThree}"
defaultValue=" " styleClass="normal"/>
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/labelTest.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/labelTest.jsp
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/labelTest.jsp
Tue Aug 3 15:48:42 2004
@@ -23,7 +23,7 @@
<h1 class="normalHead">Label Tests</h1>
<netui:anchor action="begin" rel="contents" styleClass="normal"
rev="chapter">Home</netui:anchor>
<div class="resultDiv">
- <p class="normal">Label: <netui:label value="${pageFlow.labelOne}"
styleClass="normalAttr"/></p>
+ <p class="normal">Label: <netui:span value="${pageFlow.labelOne}"
styleClass="normalAttr"/></p>
</div>
</netui:body>
</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/radioResults.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/radioResults.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/radioResults.jsp
Tue Aug 3 15:48:42 2004
@@ -22,7 +22,7 @@
<td align="right"><netui:anchor styleClass="normal"
action="goRadioTest">Radio Tests</netui:anchor></td>
</tr></table>
<p>
- Action: <netui:label value="${pageInput.action}"></netui:label>
+ Action: <netui:span value="${pageInput.action}"></netui:span>
</p>
<table class="tablebody" border="1" cellspacing="0">
<tr class="tablehead" valign="top">
@@ -33,17 +33,17 @@
</tr>
<tr valign="top">
<td>
- <netui:label value="${pageInput.formData.rbg}"
defaultValue=" " styleClass="normal"></netui:label>
+ <netui:span value="${pageInput.formData.rbg}"
defaultValue=" " styleClass="normal"></netui:span>
</td>
<td>
- <netui:label value="${pageInput.formData.rbgOpts}"
defaultValue=" " styleClass="normal"></netui:label>
+ <netui:span value="${pageInput.formData.rbgOpts}"
defaultValue=" " styleClass="normal"></netui:span>
</td>
<td>
- <netui:label value="${pageInput.formData.rbgOptsMap}"
defaultValue=" " styleClass="normal" />
+ <netui:span value="${pageInput.formData.rbgOptsMap}"
defaultValue=" " styleClass="normal" />
</td>
<td>
- <netui:label value="${pageInput.formData.rbgComplex}"
defaultValue=" " styleClass="normal" />
+ <netui:span value="${pageInput.formData.rbgComplex}"
defaultValue=" " styleClass="normal" />
</td>
</tr>
</table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/radioTest.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/radioTest.jsp
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/radioTest.jsp
Tue Aug 3 15:48:42 2004
@@ -41,7 +41,7 @@
orientation="horizontal"
repeater="true">
<netui:radioButtonOption value="${container.item}"
styleClass="normal" />
- <netui:label value="${container.item}"
styleClass="normal" />
+ <netui:span value="${container.item}"
styleClass="normal" />
</netui:radioButtonGroup>
</td>
</tr>
@@ -62,7 +62,7 @@
<netui:radioButtonGroup
dataSource="actionForm.rbgComplex" optionsDataSource="${pageFlow.opts}"
repeater="true">
<netui:radioButtonOption
value="${container.item.optionValue}" />
- <netui:label
styleClass="${container.item.style}" value="${container.item.name}" /><br />
+ <netui:span
styleClass="${container.item.style}" value="${container.item.name}" /><br />
</netui:radioButtonGroup>
</td></tr></table>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/selectResults.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/selectResults.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/selectResults.jsp
Tue Aug 3 15:48:42 2004
@@ -22,7 +22,7 @@
<td align="right"><netui:anchor styleClass="normal"
action="goSelectTest">Select Tests</netui:anchor></td>
</tr></table>
<p>
- Action: <netui:label value="${pageInput.action}"></netui:label>
+ Action: <netui:span value="${pageInput.action}"></netui:span>
</p>
<table class="tablebody" border="1" cellspacing="0">
<tr class="tablehead" valign="top">
@@ -32,26 +32,26 @@
<th class="normal">Nullable Select</th>
</tr>
<tr valign="top">
- <td><netui:label value="${pageInput.formData.sel}"
defaultValue=" " styleClass="normal"></netui:label></td>
+ <td><netui:span value="${pageInput.formData.sel}"
defaultValue=" " styleClass="normal"></netui:span></td>
<td>
<netui-data:repeater dataSource="pageInput.formData.multiSel">
<netui-data:repeaterHeader><table class="tablebody"
border="0"></netui-data:repeaterHeader>
<netui-data:repeaterItem>
<tr valign="top">
- <td><netui:label value="${container.item}"
defaultValue=" " styleClass="normal"></netui:label></td>
+ <td><netui:span value="${container.item}"
defaultValue=" " styleClass="normal"></netui:span></td>
</tr>
</netui-data:repeaterItem>
<netui-data:repeaterFooter></table></netui-data:repeaterFooter>
</netui-data:repeater>
</td>
- <td><netui:label value="${pageInput.formData.selOpts}"
defaultValue=" " styleClass="normal"></netui:label></td>
+ <td><netui:span value="${pageInput.formData.selOpts}"
defaultValue=" " styleClass="normal"></netui:span></td>
<td>
<ol>
<netui-data:repeater dataSource="pageInput.formData.nullable">
<netui-data:repeaterItem>
<li class="normal">
- <netui:label value="${container.item}"
defaultValue=" " />
+ <netui:span value="${container.item}"
defaultValue=" " />
</li>
</netui-data:repeaterItem>
</netui-data:repeater>
