Author: ilya_shaikovsky Date: 2009-01-09 14:05:09 -0500 (Fri, 09 Jan 2009) New Revision: 12182 Modified: trunk/samples/richfaces-demo/src/main/webapp/css/common.css trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/mpusage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/editTable.xhtml Log: modals markup corrected. "X" control position. Modified: trunk/samples/richfaces-demo/src/main/webapp/css/common.css =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2009-01-09 18:19:22 UTC (rev 12181) +++ trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2009-01-09 19:05:09 UTC (rev 12182) @@ -1,4 +1,8 @@ - +.hidelink{ + padding-top:2px; + padding-right:1px; + cursor:pointer; +} .demo_fieldset { margin : 20px; border : 1px solid #ACBECE; Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml 2009-01-09 18:19:22 UTC (rev 12181) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml 2009-01-09 19:05:09 UTC (rev 12182) @@ -39,7 +39,7 @@ <f:facet name="header">Edit Day:</f:facet> <f:facet name="controls"> <h:panelGroup> - <h:graphicImage value="/images/modal/close.png" style="cursor:pointer" id="hidelink"/> + <h:graphicImage value="/images/modal/close.png" id="hidelink" styleClass="hidelink"/> <rich:componentControl for="panel" attachTo="hidelink" operation="hide" event="onclick"/> </h:panelGroup> </f:facet> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/mpusage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/mpusage.xhtml 2009-01-09 18:19:22 UTC (rev 12181) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/mpusage.xhtml 2009-01-09 19:05:09 UTC (rev 12182) @@ -12,7 +12,7 @@ </f:facet> <f:facet name="controls"> <h:panelGroup> - <h:graphicImage value="/images/modal/close.png" style="cursor:pointer" id="hidelink"/> + <h:graphicImage value="/images/modal/close.png" styleClass="hidelink" id="hidelink"/> <rich:componentControl for="panel" attachTo="hidelink" operation="hide" event="onclick"/> </h:panelGroup> </f:facet> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/editTable.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/editTable.xhtml 2009-01-09 18:19:22 UTC (rev 12181) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/editTable.xhtml 2009-01-09 19:05:09 UTC (rev 12182) @@ -84,7 +84,7 @@ <f:facet name="controls"> <h:panelGroup> <h:graphicImage value="/images/modal/close.png" - style="cursor:pointer" id="hidelink" /> + id="hidelink" styleClass="hidelink"/> <rich:componentControl for="editPanel" attachTo="hidelink" operation="hide" event="onclick" /> </h:panelGroup> @@ -110,7 +110,7 @@ </h:panelGrid> </h:form> </rich:modalPanel> - <rich:modalPanel id="deletePanel" autosized="true"> + <rich:modalPanel id="deletePanel" autosized="true" width="200"> <f:facet name="header"> <h:outputText value="Delete this car from list?" style="padding-right:15px;" /> @@ -118,20 +118,28 @@ <f:facet name="controls"> <h:panelGroup> <h:graphicImage value="/images/modal/close.png" - style="cursor:pointer" id="hidelink2" /> + styleClass="hidelink" id="hidelink2" /> <rich:componentControl for="deletePanel" attachTo="hidelink2" operation="hide" event="onclick" /> </h:panelGroup> </f:facet> <h:form> - <h:panelGrid columns="2" width="100%"> + <table width="100%"> + <tbody> + <tr> + <td align="center" width="50%"> <a4j:commandButton value="Yes" ajaxSingle="true" action="#{dataTableScrollerBean.delete}" oncomplete="#{rich:component('deletePanel')}.hide();" reRender="table" /> + </td> + <td align="center" width="50%"> <a4j:commandButton value="Cancel" onclick="#{rich:component('deletePanel')}.hide();return false;" /> - </h:panelGrid> + </td> + </tr> + </tbody> + </table> </h:form> </rich:modalPanel> <a4j:status onstart="#{rich:component('wait')}.show()" onstop="#{rich:component('wait')}.hide()"/>