[richfaces-svn-commits] JBoss Rich Faces SVN: r19728 - in trunk/ui/input/ui/src: main/templates and 1 other directories.

Author: abelevich Date: 2010-10-28 10:15:26 -0400 (Thu, 28 Oct 2010) New Revision: 19728 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml Log: add name attributes to the inputs Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-10-28 13:58:50 UTC (rev 19727) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-10-28 14:15:26 UTC (rev 19728) @@ -26,10 +26,8 @@ import java.util.HashMap; import java.util.Map; -import javax.faces.application.Resource; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; -import javax.faces.application.ResourceHandler; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; @@ -153,13 +151,7 @@ } public String getResourcePath(FacesContext context, String resourceName) { - if (resourceName != null) { - ResourceHandler resourceHandler = context.getApplication() - .getResourceHandler(); - Resource resource = resourceHandler.createResource(resourceName); - return resource.getRequestPath(); - } - return null; + return RenderKitUtils.getResourcePath(context, resourceName); } public String getStateStyleClass(UIComponent component, InplaceState inplaceState) { Modified: trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-28 13:58:50 UTC (rev 19727) +++ trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-28 14:15:26 UTC (rev 19728) @@ -44,11 +44,11 @@ </span> <c:if test="#{!isDisable(inplaceState)}"> - <input id="#{clientId}Focus" type="image" style="position: absolute; top: 0px; left: 0px; outline-style: none;" class="rf-is-none" /> + <input id="#{clientId}Focus" type="image" name="#{clientId}Focus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" class="rf-is-none" /> <span id="#{clientId}Edit" class="#{getEditStyleClass(component, inplaceState)}"> - <input id="#{clientId}selValue" name="#{clientId}" type="hidden" value="#{getValue(facesContext, component)}"/> - <input id="#{clientId}Input" autocomplete="off" + <input id="#{clientId}selValue" name="#{clientId}" type="hidden" value="#{getInputValue(facesContext, component)}"/> + <input id="#{clientId}Input" name="#{clientId}Input" autocomplete="off" type="text" value="#{getSelectInputLabel(facesContext, component)}" class="rf-is-fld" style="width: #{component.attributes['inputWidth']};" readonly="readonly" cdk:passThrough="tabIndex"> @@ -64,11 +64,11 @@ <span class="rf-is-shdw-b"></span> <span id="#{clientId}Btn" style="position : relative;"> - <input type="image" id="#{clientId}Okbtn" + <input type="image" name="#{clientId}Okbtn" id="#{clientId}Okbtn" src="#{getResourcePath(facesContext, 'org.richfaces/ico_ok.gif')}" class="rf-is-btn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" /> - <input type="image" id="#{clientId}Cancelbtn" + <input name="#{clientId}Okbtn" type="image" id="#{clientId}Cancelbtn" src="#{getResourcePath(facesContext,'org.richfaces/ico_cancel.gif')}" class="rf-is-btn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" /> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2010-10-28 13:58:50 UTC (rev 19727) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2010-10-28 14:15:26 UTC (rev 19728) @@ -1,40 +1,45 @@ <span class="rf-is-d-s" id="form:inplaceSelectDefault"> - <span class="rf-is-lbl" id="form:inplaceSelectDefaultLabel">Edit Text</span> - <input class="rf-is-none" id="form:inplaceSelectDefaultFocus" - style="position: absolute; top: 0px; left: 0px; outline-style: none;" - type="image" /> - <span class="rf-is-edit rf-is-none" id="form:inplaceSelectDefaultEdit"> - <input id="form:inplaceSelectDefaultselValue" name="form:inplaceSelectDefault" - type="hidden" value="Edit Text" /> - <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectDefaultInput" - readonly="readonly" style="width: ;" type="text" /> - <span class="rf-is-lst-cord" id="form:inplaceSelectDefaultList" - style="display: none"> - <span class="rf-is-lst-pos" style="width: 250px"> - <span class="rf-is-shdw"> - <span class="rf-is-shdw-t"></span> - <span class="rf-is-shdw-l"></span> - <span class="rf-is-shdw-r"></span> - <span class="rf-is-shdw-b"></span> - <span class="rf-is-lst-dec"> - <span class="rf-is-lst-scrl" style="height: 100px"> - <span id="form:inplaceSelectDefaultItems"> - <span id="form:inplaceSelectDefaultItem0" class="rf-is-opt">Label#1 - </span> - <span id="form:inplaceSelectDefaultItem1" class="rf-is-opt">Label#2 - </span> - <span id="form:inplaceSelectDefaultItem2" class="rf-is-opt">Label#3 - </span> - <span id="form:inplaceSelectDefaultItem3" class="rf-is-opt">Label#4 - </span> - </span> - </span> - </span> - </span> - </span> - </span> - </span> - <script type="text/javascript"> - //ignored - </script> + <span class="rf-is-lbl" id="form:inplaceSelectDefaultLabel"> + Edit Text + </span> + <input class="rf-is-none" id="form:inplaceSelectDefaultFocus" name="form:inplaceSelectDefaultFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image"/> + <span class="rf-is-edit rf-is-none" id="form:inplaceSelectDefaultEdit"> + <input id="form:inplaceSelectDefaultselValue" name="form:inplaceSelectDefault" type="hidden"/> + <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectDefaultInput" name="form:inplaceSelectDefaultInput" readonly="readonly" style="width: ;" type="text"/> + <span class="rf-is-lst-cord" id="form:inplaceSelectDefaultList" style="display: none"> + <span class="rf-is-lst-pos" style="width: 250px"> + <span class="rf-is-shdw"> + <span class="rf-is-shdw-t"> + </span> + <span class="rf-is-shdw-l"> + </span> + <span class="rf-is-shdw-r"> + </span> + <span class="rf-is-shdw-b"> + </span> + <span class="rf-is-lst-dec"> + <span class="rf-is-lst-scrl" style="height: 100px"> + <span id="form:inplaceSelectDefaultItems"> + <span id="form:inplaceSelectDefaultItem0" class="rf-is-opt"> + Label#1 + </span> + <span id="form:inplaceSelectDefaultItem1" class="rf-is-opt"> + Label#2 + </span> + <span id="form:inplaceSelectDefaultItem2" class="rf-is-opt"> + Label#3 + </span> + <span id="form:inplaceSelectDefaultItem3" class="rf-is-opt"> + Label#4 + </span> + </span> + </span> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + //ignored + </script> </span> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-10-28 13:58:50 UTC (rev 19727) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-10-28 14:15:26 UTC (rev 19728) @@ -1,63 +1,64 @@ <span class="rf-is-d-s rf-is-e-s" id="form:inplaceSelectEdit"> - <span class="rf-is-lbl" id="form:inplaceSelectEditLabel">Edit Text</span> - <input class="rf-is-none" id="form:inplaceSelectEditFocus" - style="position: absolute; top: 0px; left: 0px; outline-style: none;" - type="image" /> - <span class="rf-is-edit" id="form:inplaceSelectEditEdit"> - <input id="form:inplaceSelectEditselValue" name="form:inplaceSelectEdit" - type="hidden" value="Edit Text" /> - <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectEditInput" - readonly="readonly" style="width: ;" type="text" /> - <span class="rf-is-btn-prepos"> - <span class="rf-is-btn-pos"> - <span class="rf-is-shdw" id="form:inplaceSelectEditBtnshadow"> - <span class="rf-is-shdw-t"></span> - <span class="rf-is-shdw-l"></span> - <span class="rf-is-shdw-r"></span> - <span class="rf-is-shdw-b"></span> - <span id="form:inplaceSelectEditBtn" style="position : relative;"> - <input class="rf-is-btn" id="form:inplaceSelectEditOkbtn" - onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" - onmouseup="this.className='rf-is-btn'" - src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" - type="image" /> - <input class="rf-is-btn" id="form:inplaceSelectEditCancelbtn" - onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" - onmouseup="this.className='rf-is-btn'" - src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" - type="image" /> - <br /> - </span> - </span> - </span> - </span> - <span class="rf-is-lst-cord" id="form:inplaceSelectEditList" - style="display: none"> - <span class="rf-is-lst-pos" style="width: 250px"> - <span class="rf-is-shdw"> - <span class="rf-is-shdw-t"></span> - <span class="rf-is-shdw-l"></span> - <span class="rf-is-shdw-r"></span> - <span class="rf-is-shdw-b"></span> - <span class="rf-is-lst-dec"> - <span class="rf-is-lst-scrl" style="height: 100px"> - <span id="form:inplaceSelectEditItems"> - <span id="form:inplaceSelectEditItem0" class="rf-is-opt">Label#1 - </span> - <span id="form:inplaceSelectEditItem1" class="rf-is-opt">Label#2 - </span> - <span id="form:inplaceSelectEditItem2" class="rf-is-opt">Label#3 - </span> - <span id="form:inplaceSelectEditItem3" class="rf-is-opt">Label#4 - </span> - </span> - </span> - </span> - </span> - </span> - </span> - </span> - <script type="text/javascript"> - //ignored - </script> + <span class="rf-is-lbl" id="form:inplaceSelectEditLabel"> + Edit Text + </span> + <input class="rf-is-none" id="form:inplaceSelectEditFocus" name="form:inplaceSelectEditFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image"/> + <span class="rf-is-edit" id="form:inplaceSelectEditEdit"> + <input id="form:inplaceSelectEditselValue" name="form:inplaceSelectEdit" type="hidden"/> + <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectEditInput" name="form:inplaceSelectEditInput" readonly="readonly" style="width: ;" type="text"/> + <span class="rf-is-btn-prepos"> + <span class="rf-is-btn-pos"> + <span class="rf-is-shdw" id="form:inplaceSelectEditBtnshadow"> + <span class="rf-is-shdw-t"> + </span> + <span class="rf-is-shdw-l"> + </span> + <span class="rf-is-shdw-r"> + </span> + <span class="rf-is-shdw-b"> + </span> + <span id="form:inplaceSelectEditBtn" style="position : relative;"> + <input class="rf-is-btn" id="form:inplaceSelectEditOkbtn" name="form:inplaceSelectEditOkbtn" onmousedown="this.className=&apos;rf-is-btn-press&apos;" onmouseout="this.className=&apos;rf-is-btn&apos;" onmouseup="this.className=&apos;rf-is-btn&apos;" src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" type="image"/> + <input class="rf-is-btn" id="form:inplaceSelectEditCancelbtn" name="form:inplaceSelectEditOkbtn" onmousedown="this.className=&apos;rf-is-btn-press&apos;" onmouseout="this.className=&apos;rf-is-btn&apos;" onmouseup="this.className=&apos;rf-is-btn&apos;" src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" type="image"/> + <br/> + </span> + </span> + </span> + </span> + <span class="rf-is-lst-cord" id="form:inplaceSelectEditList" style="display: none"> + <span class="rf-is-lst-pos" style="width: 250px"> + <span class="rf-is-shdw"> + <span class="rf-is-shdw-t"> + </span> + <span class="rf-is-shdw-l"> + </span> + <span class="rf-is-shdw-r"> + </span> + <span class="rf-is-shdw-b"> + </span> + <span class="rf-is-lst-dec"> + <span class="rf-is-lst-scrl" style="height: 100px"> + <span id="form:inplaceSelectEditItems"> + <span id="form:inplaceSelectEditItem0" class="rf-is-opt"> + Label#1 + </span> + <span id="form:inplaceSelectEditItem1" class="rf-is-opt"> + Label#2 + </span> + <span id="form:inplaceSelectEditItem2" class="rf-is-opt"> + Label#3 + </span> + <span id="form:inplaceSelectEditItem3" class="rf-is-opt"> + Label#4 + </span> + </span> + </span> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + //ignored + </script> </span> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-10-28 13:58:50 UTC (rev 19727) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-10-28 14:15:26 UTC (rev 19728) @@ -1,64 +1,64 @@ <span class="rf-is-d-s" id="form:inplaceSelectWithControls"> - <span class="rf-is-lbl" id="form:inplaceSelectWithControlsLabel">Edit Text</span> - <input class="rf-is-none" id="form:inplaceSelectWithControlsFocus" - style="position: absolute; top: 0px; left: 0px; outline-style: none;" - type="image" /> - <span class="rf-is-edit rf-is-none" id="form:inplaceSelectWithControlsEdit"> - <input id="form:inplaceSelectWithControlsselValue" name="form:inplaceSelectWithControls" - type="hidden" value="Edit Text" /> - <input autocomplete="off" class="rf-is-fld" - id="form:inplaceSelectWithControlsInput" readonly="readonly" style="width: ;" - type="text" /> - <span class="rf-is-btn-prepos"> - <span class="rf-is-btn-pos"> - <span class="rf-is-shdw" id="form:inplaceSelectWithControlsBtnshadow"> - <span class="rf-is-shdw-t"></span> - <span class="rf-is-shdw-l"></span> - <span class="rf-is-shdw-r"></span> - <span class="rf-is-shdw-b"></span> - <span id="form:inplaceSelectWithControlsBtn" style="position : relative;"> - <input class="rf-is-btn" id="form:inplaceSelectWithControlsOkbtn" - onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" - onmouseup="this.className='rf-is-btn'" - src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" - type="image" /> - <input class="rf-is-btn" id="form:inplaceSelectWithControlsCancelbtn" - onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" - onmouseup="this.className='rf-is-btn'" - src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" - type="image" /> - <br /> - </span> - </span> - </span> - </span> - <span class="rf-is-lst-cord" id="form:inplaceSelectWithControlsList" - style="display: none"> - <span class="rf-is-lst-pos" style="width: 250px"> - <span class="rf-is-shdw"> - <span class="rf-is-shdw-t"></span> - <span class="rf-is-shdw-l"></span> - <span class="rf-is-shdw-r"></span> - <span class="rf-is-shdw-b"></span> - <span class="rf-is-lst-dec"> - <span class="rf-is-lst-scrl" style="height: 100px"> - <span id="form:inplaceSelectWithControlsItems"> - <span id="form:inplaceSelectWithControlsItem0" class="rf-is-opt">Label#1 - </span> - <span id="form:inplaceSelectWithControlsItem1" class="rf-is-opt">Label#2 - </span> - <span id="form:inplaceSelectWithControlsItem2" class="rf-is-opt">Label#3 - </span> - <span id="form:inplaceSelectWithControlsItem3" class="rf-is-opt">Label#4 - </span> - </span> - </span> - </span> - </span> - </span> - </span> - </span> - <script type="text/javascript"> - //ignore - </script> + <span class="rf-is-lbl" id="form:inplaceSelectWithControlsLabel"> + Edit Text + </span> + <input class="rf-is-none" id="form:inplaceSelectWithControlsFocus" name="form:inplaceSelectWithControlsFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image"/> + <span class="rf-is-edit rf-is-none" id="form:inplaceSelectWithControlsEdit"> + <input id="form:inplaceSelectWithControlsselValue" name="form:inplaceSelectWithControls" type="hidden"/> + <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectWithControlsInput" name="form:inplaceSelectWithControlsInput" readonly="readonly" style="width: ;" type="text"/> + <span class="rf-is-btn-prepos"> + <span class="rf-is-btn-pos"> + <span class="rf-is-shdw" id="form:inplaceSelectWithControlsBtnshadow"> + <span class="rf-is-shdw-t"> + </span> + <span class="rf-is-shdw-l"> + </span> + <span class="rf-is-shdw-r"> + </span> + <span class="rf-is-shdw-b"> + </span> + <span id="form:inplaceSelectWithControlsBtn" style="position : relative;"> + <input class="rf-is-btn" id="form:inplaceSelectWithControlsOkbtn" name="form:inplaceSelectWithControlsOkbtn" onmousedown="this.className=&apos;rf-is-btn-press&apos;" onmouseout="this.className=&apos;rf-is-btn&apos;" onmouseup="this.className=&apos;rf-is-btn&apos;" src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" type="image"/> + <input class="rf-is-btn" id="form:inplaceSelectWithControlsCancelbtn" name="form:inplaceSelectWithControlsOkbtn" onmousedown="this.className=&apos;rf-is-btn-press&apos;" onmouseout="this.className=&apos;rf-is-btn&apos;" onmouseup="this.className=&apos;rf-is-btn&apos;" src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" type="image"/> + <br/> + </span> + </span> + </span> + </span> + <span class="rf-is-lst-cord" id="form:inplaceSelectWithControlsList" style="display: none"> + <span class="rf-is-lst-pos" style="width: 250px"> + <span class="rf-is-shdw"> + <span class="rf-is-shdw-t"> + </span> + <span class="rf-is-shdw-l"> + </span> + <span class="rf-is-shdw-r"> + </span> + <span class="rf-is-shdw-b"> + </span> + <span class="rf-is-lst-dec"> + <span class="rf-is-lst-scrl" style="height: 100px"> + <span id="form:inplaceSelectWithControlsItems"> + <span id="form:inplaceSelectWithControlsItem0" class="rf-is-opt"> + Label#1 + </span> + <span id="form:inplaceSelectWithControlsItem1" class="rf-is-opt"> + Label#2 + </span> + <span id="form:inplaceSelectWithControlsItem2" class="rf-is-opt"> + Label#3 + </span> + <span id="form:inplaceSelectWithControlsItem3" class="rf-is-opt"> + Label#4 + </span> + </span> + </span> + </span> + </span> + </span> + </span> + </span> + <script type="text/javascript"> + //ignored + </script> </span> \ No newline at end of file