Author: abelevich Date: 2008-02-28 05:16:14 -0500 (Thu, 28 Feb 2008) New Revision: 6390 Modified: trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx Log: Modified: trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx =================================================================== --- trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-02-28 10:15:45 UTC (rev 6389) +++ trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-02-28 10:16:14 UTC (rev 6390) @@ -50,17 +50,18 @@ variables.setVariable("cancelIcon", cancelIcon); } - String controllClass = (String)component.getAttributes().get("controllClass"); - variables.setVariable("controllClass", controllClass); - String controllHoveredClass = (String)component.getAttributes().get("controllHoveredClass"); - variables.setVariable("controllHoveredClass", controllHoveredClass); - String controllPressedClass = (String)component.getAttributes().get("controllPressedClass"); - variables.setVariable("controllPressedClass", controllPressedClass);*/ + String controlClass = (String)component.getAttributes().get("controlClass"); + variables.setVariable("controlClass", controlClass); + String controlHoveredClass = (String)component.getAttributes().get("controlHoveredClass"); + variables.setVariable("controlHoveredClass", controlHoveredClass); + String controlPressedClass = (String)component.getAttributes().get("controlPressedClass"); + variables.setVariable("controlPressedClass", controlPressedClass);*/ + ]]> </jsp:scriptlet> <f:resource var="spacer" name="images/spacer.gif"/> -<span id="#{clientId}" class="rich-inplace-select-default-state" +<span id="#{clientId}" class="rich-inplace-select-view" x:passThruWithExclusions="id,styleClass,class,style"> <input id="#{clientId}tabber" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" /> <img id="#{clientId}inplaceStrut" src="#{spacer}" class="rich-inplace-select-strut"/> @@ -74,7 +75,7 @@ readonly="readonly" class="rich-inplace-select-field"/> <input id='#{clientId}inplaceValue' name='#{clientId}inplaceValue' type='hidden' value='#{fieldValue}'/> - <div id="#{clientId}bar" class="rich-inplace-select-btn-set" style="display:none;"> + <div id="#{clientId}bar" class="rich-inplace-select-control-set" style="display:none;"> <div class="rich-inplace-select-shadow" id="#{clientId}btns_shadow"> <table cellpadding="0" cellspacing="0" border="0" class="rich-inplace-select-shadow-size"> <tr> @@ -96,8 +97,8 @@ </table> </div> <div id="#{clientId}buttons" style="position : relative"> - <input id="#{clientId}ok" type="image" src="#{saveIcon}" class="rich-inplace-select-btn" onmousedown="this.className='rich-inplace-select-btn-press'" onmouseout="this.className='rich-inplace-select-btn'" onmouseup="this.className='rich-inplace-select-btn'"/> - <input id="#{clientId}cancel" type="image" src="#{cancelIcon}" class="rich-inplace-select-btn" onmousedown="this.className='rich-inplace-select-btn-press'" onmouseout="this.className='rich-inplace-select-btn'" onmouseup="this.className='rich-inplace-select-btn'"/> + <input id="#{clientId}ok" type="image" src="#{saveIcon}" class="rich-inplace-select-control" onmousedown="this.className='rich-inplace-select-control-press'" onmouseout="this.className='rich-inplace-select-control'" onmouseup="this.className='rich-inplace-select-control'"/> + <input id="#{clientId}cancel" type="image" src="#{cancelIcon}" class="rich-inplace-select-control" onmousedown="this.className='rich-inplace-select-control-press'" onmouseout="this.className='rich-inplace-select-control'" onmouseup="this.className='rich-inplace-select-control'"/> </div> </div> @@ -134,26 +135,17 @@ </span> <script type="text/javascript"> Richfaces.InplaceSelect.CLASSES = { - FIELD : {CLASSES: - {NORMAL : "rich-combobox-font-inactive rich-combobox-input-inactive #{inputInactiveClass}", - ACTIVE : "rich-combobox-font rich-combobox-input #{inputClass}", - DISABLED : "rich-combobox-font-disabled rich-combobox-input-disabled #{inputDisabledClass}"}, - STYLE : - {NORMAL : "#{inputStyle}", - ACTIVE : "#{inputStyle}", - DISABLED : "#{inputDisabledStyle}"} - }, COMBO_LIST : { - LIST : {CLASSES :{ACTIVE : "rich-inplace-select-list-scroll rich-inplace-select-list-decoration rich-inplace-select-list-position #{listClass}"}, - STYLE : {ACTIVE: "#{listStyle}"} - }, + LIST : {CLASSES :{ACTIVE : "rich-inplace-select-list-scroll rich-inplace-select-list-decoration rich-inplace-select-list-position #{listClass}" + } + }, ITEM : {NORMAL : "rich-inplace-select-item rich-inplace-select-font #{itemClass}", - SELECTED : "rich-inplace-select-item rich-inplace-select-font rich-inplace-select-selected-item #{itemSelectedClass}" - } - }, - COMPONENT : {CHANGED : {NORMAL : 'rich-inplace rich-inplace-select-default-state rich-inplace-select-changed-state #{component.attributes["changedClass"]}', HOVERED : '#{component.attributes["changedHoveredClass"]}'}, - VIEW : {NORMAL : 'rich-inplace rich-inplace-select-default-state #{component.attributes["viewClass"]}', HOVERED : '#{component.attributes["viewHoveredClass"]}'}, - EDITABLE : 'rich-inplace rich-inplace-select-edit-state #{component.attributes["editClass"]}' + SELECTED : 'rich-inplace-select-item rich-inplace-select-font rich-inplace-select-selected-item #{itemSelectedClass}' + } + }, + COMPONENT : {CHANGED : {NORMAL : 'rich-inplace rich-inplace-select-view rich-inplace-select-changed #{component.attributes["changedClass"]}', HOVERED : '#{component.attributes["changedHoverClass"]}'}, + VIEW : {NORMAL : 'rich-inplace rich-inplace-select-view #{component.attributes["viewClass"]}', HOVERED : '#{component.attributes["viewHoverClass"]}'}, + EDITABLE : 'rich-inplace rich-inplace-select-edit #{component.attributes["editClass"]}' } }; @@ -161,9 +153,9 @@ showControls : #{component.attributes["showControls"]}, applyFromControlsOnly : #{component.attributes["applyFromControlsOnly"]}, editEvent : '#{component.attributes["editEvent"]}', - verticalPosition : '#{component.attributes["controlsPosition"]}', - horizontalPosition : '#{component.attributes["controlsHorizontalAlign"]}', - inputWidth : '#{component.attributes["inputWidth"]}', + verticalPosition : '#{component.attributes["controlsVerticalPosition"]}', + horizontalPosition : '#{component.attributes["controlsHorizontalPosition"]}', + inputWidth : '#{component.attributes["selectWidth"]}', inputMinWidth : '#{component.attributes["minSelectWidth"]}', inputMaxWidth : '#{component.attributes["maxSelectWidth"]}' }; @@ -174,7 +166,7 @@ onviewactivated : #{this:getAsEventHandler(context, component, "onviewactivated")}}; var richInplaceList = new Richfaces.InplaceSelectList('list#{clientId}', 'listParent#{clientId}', true, - Richfaces.InplaceSelect.CLASSES.COMBO_LIST, '100px', '100px', #{this:getItemsTextAsJSArray(context, component)}, null, + Richfaces.InplaceSelect.CLASSES.COMBO_LIST, '#{component.attributes["listWidth"]}', '#{component.attributes["listHeight"]}', #{this:getItemsTextAsJSArray(context, component)}, null, '#{clientId}inplaceTmpValue', 'shadow#{clientId}', 0, 0); var richInplaceSelect = new Richfaces.InplaceSelect(richInplaceList, '#{clientId}', '#{clientId}inplaceTmpValue', '#{clientId}inplaceValue', '#{clientId}tabber', '#{clientId}inplaceStrut', @@ -182,4 +174,4 @@ ['#{clientId}bar', '#{clientId}ok', '#{clientId}cancel', '#{clientId}buttons', '#{clientId}btns_shadow']); </script> -</f:root> \ No newline at end of file +</f:root>