[richfaces-svn-commits] JBoss Rich Faces SVN: r13425 - in trunk/test-applications/realworld2/web/src/main/webapp/includes: album and 3 other directories.

Author: amarkhel Date: 2009-04-08 06:01:51 -0400 (Wed, 08 Apr 2009) New Revision: 13425 Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/inputNumberSlider.xhtml Removed: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/imageScroller.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/inputNumberSlider.xhtml Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/albumUnvisited.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/images.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/modalPanels.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfUnvisited.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedImages.xhtml Log: Refactoring Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumInfo.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/albumUnvisited.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml =================================================================== (Binary files differ) Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml (from rev 13419, trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/imageScroller.xhtml) =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml (rev 0) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageScroller.xhtml 2009-04-08 10:01:51 UTC (rev 13425) @@ -0,0 +1,63 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <h:panelGroup layout="block" id="imagesTable" + style="margin: 30px 0px 40px 30px; float: left; position: relative; left: -2px;"> + <a4j:repeat value="#{model.selectedAlbum.images}" rows="5" var="img" + id="repeat" rowKeyVar="rk"> + + <a4j:outputPanel layout="block" + styleClass="preview_box_photo_nav #{model.selectedImage == img ? 'preview_box_photo_current' : 'preview_box_photo_default'}"> + <h:panelGroup layout="block" styleClass="preview_box_photo_80"> + <h:graphicImage styleClass="pr_photo_bg" + value="/img/shell/frame_photo_80.png" /> + <h:panelGrid cellpadding="0"> + <h:panelGroup> + <a4j:mediaOutput element="img" + createContent="#{imageLoader.paintImage}" + value="#{fileManager.transformPath(img.path, '_small80')}"> + <f:param value="#{imageSizeHelper.currentDimension.x}" name="x" /> + </a4j:mediaOutput> + <br /> + </h:panelGroup> + </h:panelGrid> + <h:panelGroup layout="block" styleClass="photo_name">#{img.name}</h:panelGroup> + <h:panelGroup layout="block" styleClass="photo_data">#{rk + 1}</h:panelGroup> + </h:panelGroup> + + <a4j:support event="onclick" + rendered="#{model.selectedImage != img}" + reRender="mainImage, imagesTable" + action="#{controller.showImage(img)}" /> + </a4j:outputPanel> + </a4j:repeat> + + <rich:datascroller styleClass="image-scroller" lastPageMode="full" + for="repeat" reRender="imagesTable" boundaryControls="hide" + stepControls="hide"> + <f:facet name="pages"> + <h:outputText /> + </f:facet> + <f:facet name="fastforward"> + <h:graphicImage styleClass="image-scroller-right-arrow" + value="img/shell/arr_right.png" /> + </f:facet> + <f:facet name="fastforward_disabled"> + <h:graphicImage styleClass="image-scroller-right-arrow" + value="img/shell/arr_right_dis.png" /> + </f:facet> + <f:facet name="fastrewind"> + <h:graphicImage styleClass="image-scroller-left-arrow" + value="img/shell/arr_left.png" /> + </f:facet> + <f:facet name="fastrewind_disabled"> + <h:graphicImage styleClass="image-scroller-left-arrow" + value="img/shell/arr_left_dis.png" /> + </f:facet> + </rich:datascroller> + </h:panelGroup> +</ui:composition> \ No newline at end of file Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/inputNumberSlider.xhtml (from rev 13423, trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/inputNumberSlider.xhtml) =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/image/inputNumberSlider.xhtml (rev 0) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/image/inputNumberSlider.xhtml 2009-04-08 10:01:51 UTC (rev 13425) @@ -0,0 +1,14 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:richx="http://richfaces.org/richx"> + <div><rich:inputNumberSlider enableManualInput="false" + value="#{imageSizeHelper.value}" minValue="80" maxValue="200" + showArrows="false" showBoundaryValues="true" showInput="false" + step="40"> + <a4j:support event="onchange" reRender="userAlbumImages" /> + </rich:inputNumberSlider></div> +</ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/images.xhtml =================================================================== (Binary files differ) Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/imageScroller.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/imageScroller.xhtml 2009-04-08 09:55:22 UTC (rev 13424) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/imageScroller.xhtml 2009-04-08 10:01:51 UTC (rev 13425) @@ -1,63 +0,0 @@ -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - - <h:panelGroup layout="block" id="imagesTable" - style="margin: 30px 0px 40px 30px; float: left; position: relative; left: -2px;"> - <a4j:repeat value="#{model.selectedAlbum.images}" rows="5" var="img" - id="repeat" rowKeyVar="rk"> - - <a4j:outputPanel layout="block" - styleClass="preview_box_photo_nav #{model.selectedImage == img ? 'preview_box_photo_current' : 'preview_box_photo_default'}"> - <h:panelGroup layout="block" styleClass="preview_box_photo_80"> - <h:graphicImage styleClass="pr_photo_bg" - value="/img/shell/frame_photo_80.png" /> - <h:panelGrid cellpadding="0"> - <h:panelGroup> - <a4j:mediaOutput element="img" - createContent="#{imageLoader.paintImage}" - value="#{fileManager.transformPath(img.path, '_small80')}"> - <f:param value="#{imageSizeHelper.currentDimension.x}" name="x" /> - </a4j:mediaOutput> - <br /> - </h:panelGroup> - </h:panelGrid> - <h:panelGroup layout="block" styleClass="photo_name">#{img.name}</h:panelGroup> - <h:panelGroup layout="block" styleClass="photo_data">#{rk + 1}</h:panelGroup> - </h:panelGroup> - - <a4j:support event="onclick" - rendered="#{model.selectedImage != img}" - reRender="mainImage, imagesTable" - action="#{controller.showImage(img)}" /> - </a4j:outputPanel> - </a4j:repeat> - - <rich:datascroller styleClass="image-scroller" lastPageMode="full" - for="repeat" reRender="imagesTable" boundaryControls="hide" - stepControls="hide"> - <f:facet name="pages"> - <h:outputText /> - </f:facet> - <f:facet name="fastforward"> - <h:graphicImage styleClass="image-scroller-right-arrow" - value="img/shell/arr_right.png" /> - </f:facet> - <f:facet name="fastforward_disabled"> - <h:graphicImage styleClass="image-scroller-right-arrow" - value="img/shell/arr_right_dis.png" /> - </f:facet> - <f:facet name="fastrewind"> - <h:graphicImage styleClass="image-scroller-left-arrow" - value="img/shell/arr_left.png" /> - </f:facet> - <f:facet name="fastrewind_disabled"> - <h:graphicImage styleClass="image-scroller-left-arrow" - value="img/shell/arr_left_dis.png" /> - </f:facet> - </rich:datascroller> - </h:panelGroup> -</ui:composition> \ No newline at end of file Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/inputNumberSlider.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/inputNumberSlider.xhtml 2009-04-08 09:55:22 UTC (rev 13424) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/inputNumberSlider.xhtml 2009-04-08 10:01:51 UTC (rev 13425) @@ -1,14 +0,0 @@ -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:richx="http://richfaces.org/richx"> - <div><rich:inputNumberSlider enableManualInput="false" - value="#{imageSizeHelper.value}" minValue="80" maxValue="200" - showArrows="false" showBoundaryValues="true" showInput="false" - step="40"> - <a4j:support event="onchange" reRender="userAlbumImages" /> - </rich:inputNumberSlider></div> -</ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/modalPanels.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-04-08 09:55:22 UTC (rev 13424) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-04-08 10:01:51 UTC (rev 13425) @@ -5,8 +5,8 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> <a4j:outputPanel rendered="#{result.size() > 0}" id="imagesList"> - <rich:datascroller for="imageList" reRender="userAlbumImages"></rich:datascroller> - <ui:include src="/includes/misc/inputNumberSlider.xhtml"> + <rich:datascroller for="imageList" reRender="userAlbumImages"/> + <ui:include src="/includes/image/inputNumberSlider.xhtml"> <ui:param name="reRenderArea" value="imagesList" /> </ui:include> <br/><br/> Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfUnvisited.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedImages.xhtml =================================================================== (Binary files differ)