From richfaces-svn-commits at lists.jboss.org Tue Apr  7 14:10:10 2009
Content-Type: multipart/mixed; boundary="===============4446343331928128586=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r13417 - in
 trunk/test-applications/realworld2/web/src/main/webapp: includes/image and 2
 other directories.
Date: Tue, 07 Apr 2009 14:10:09 -0400
Message-ID: <E1LrFkP-0002Bk-Un@committer01.frg.pub.inap.atl.jboss.com>

--===============4446343331928128586==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: nbelaevski
Date: 2009-04-07 14:10:09 -0400 (Tue, 07 Apr 2009)
New Revision: 13417

Added:
   trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/temp=
lates/
Modified:
   trunk/test-applications/realworld2/web/src/main/webapp/includes/image/im=
ageInfo.xhtml
   trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/ima=
geScroller.xhtml
   trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realwo=
rld.css
Log:
Image scroller updated

Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/i=
mage/imageInfo.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/m=
isc/imageScroller.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/im=
ageScroller.xhtml	2009-04-07 17:50:57 UTC (rev 13416)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/im=
ageScroller.xhtml	2009-04-07 18:10:09 UTC (rev 13417)
@@ -3,72 +3,61 @@
 	xmlns:h=3D"http://java.sun.com/jsf/html"
 	xmlns:f=3D"http://java.sun.com/jsf/core"
 	xmlns:a4j=3D"http://richfaces.org/a4j"
-	xmlns:rich=3D"http://richfaces.org/rich"
-	xmlns:richx=3D"http://richfaces.org/richx">
-	=

-<style>
-.rich-datascr-button {
-	background-color: #CECECE;
-}
-</style>
-	=

-<richx:imageDataScroller reRender=3D"tree"
-		scrollerListener=3D"#{controller.scroll}" id=3D"imageScroller"
-		fastControls=3D"hide"
-		boundaryControls=3D"hide"
-		pageVar=3D"pageVar"
-		styleClass=3D"imageScroller"
-		inactiveStyleClass=3D"imageScroller-inactive"
-		tableStyleClass=3D"imageScroller-table"
-		maxPages=3D"5"
-		for=3D"mainImage" align=3D"left" page=3D"#{model.selectedImageIndex}">
-		<f:facet name=3D"activePage">
-			<h:panelGroup layout=3D"block" styleClass=3D"preview_box_photo_80" styl=
e=3D"margin: 0px; margin-right: 3px">
-			<h:graphicImage style=3D"border: 2px solid red" styleClass=3D"pr_photo_=
bg" value=3D"/img/shell/frame_photo_80.png" />
-			<h:panelGrid cellpadding=3D"0">
-				<h:panelGroup>
-								<a4j:mediaOutput element=3D"img" =

-									createContent=3D"#{imageLoader.paintImage}" =

-									style=3D"border : 2px solid #FFFFFF;"
-									value=3D"#{fileManager.transformPath(model.selectedAlbum.images[p=
ageVar].path, '_small80')}">
-									<f:param value=3D"#{imageSizeHelper.currentDimension.x}" name=3D"=
x" />
-								</a4j:mediaOutput>
-					<br/>
+	xmlns:rich=3D"http://richfaces.org/rich">
+
+	<h:panelGroup layout=3D"block" id=3D"imagesTable"
+		style=3D"margin: 30px 0px 40px 30px; float: left; position: relative; le=
ft: -2px;">
+		<a4j:repeat value=3D"#{model.selectedAlbum.images}" rows=3D"5" var=3D"im=
g"
+			id=3D"repeat" rowKeyVar=3D"rk">
+
+			<a4j:outputPanel layout=3D"block"
+				styleClass=3D"preview_box_photo_nav #{model.selectedImage =3D=3D img ?=
 'preview_box_photo_current' : 'preview_box_photo_default'}">
+				<h:panelGroup layout=3D"block" styleClass=3D"preview_box_photo_80">
+					<h:graphicImage styleClass=3D"pr_photo_bg"
+						value=3D"/img/shell/frame_photo_80.png" />
+					<h:panelGrid cellpadding=3D"0">
+						<h:panelGroup>
+							<a4j:mediaOutput element=3D"img"
+								createContent=3D"#{imageLoader.paintImage}"
+								value=3D"#{fileManager.transformPath(img.path, '_small80')}">
+								<f:param value=3D"#{imageSizeHelper.currentDimension.x}" name=3D"x=
" />
+							</a4j:mediaOutput>
+							<br />
+						</h:panelGroup>
+					</h:panelGrid>
+					<h:panelGroup layout=3D"block" styleClass=3D"photo_name">#{img.name}<=
/h:panelGroup>
+					<h:panelGroup layout=3D"block" styleClass=3D"photo_data">#{rk + 1}</h=
:panelGroup>
 				</h:panelGroup>
-			</h:panelGrid>	=

-			<h:panelGroup layout=3D"block" styleClass=3D"photo_name">#{model.select=
edAlbum.images[pageVar].name}</h:panelGroup>
-			<h:panelGroup layout=3D"block" styleClass=3D"photo_data">#{pageVar+1}</=
h:panelGroup>
-			</h:panelGroup>
-		</f:facet>
-		<f:facet name=3D"inactivePage">
-			<h:panelGroup layout=3D"block" styleClass=3D"preview_box_photo_80" styl=
e=3D"margin: 0px">
-			<h:graphicImage styleClass=3D"pr_photo_bg" value=3D"/img/shell/frame_ph=
oto_80.png" />
-			<h:panelGrid cellpadding=3D"0">
-				<h:panelGroup>
-								<a4j:mediaOutput element=3D"img" =

-									createContent=3D"#{imageLoader.paintImage}" =

-									style=3D"border : 2px solid #FFFFFF;"
-									value=3D"#{fileManager.transformPath(model.selectedAlbum.images[p=
ageVar].path, '_small80')}">
-									<f:param value=3D"#{imageSizeHelper.currentDimension.x}" name=3D"=
x" />
-								</a4j:mediaOutput>
-					<br/>
-				</h:panelGroup>
-			</h:panelGrid>				=

-			<h:panelGroup layout=3D"block" styleClass=3D"photo_name">#{model.select=
edAlbum.images[pageVar].name}</h:panelGroup>
-						<h:panelGroup layout=3D"block" styleClass=3D"photo_data">#{pageVar+1=
}</h:panelGroup>
-			</h:panelGroup>
-		</f:facet>
-		<f:facet name=3D"previous">
-			<h:graphicImage styleClass=3D"imageScroller-leftArr" value=3D"img/shell=
/arr_left.png"></h:graphicImage>
-		</f:facet>
-		<f:facet name=3D"previous_disabled">
-			<h:graphicImage styleClass=3D"imageScroller-leftArr" value=3D"img/shell=
/arr_left_dis.png"></h:graphicImage>
-		</f:facet>
-		<f:facet name=3D"next">
-			<h:graphicImage styleClass=3D"imageScroller-rightArr" value=3D"img/shel=
l/arr_right.png"></h:graphicImage>
-		</f:facet>
-		<f:facet name=3D"next_disabled">
-			<h:graphicImage styleClass=3D"imageScroller-rightArr" value=3D"img/shel=
l/arr_right_dis.png"></h:graphicImage>
-		</f:facet>
-	</richx:imageDataScroller>
+
+				<a4j:support event=3D"onclick"
+					rendered=3D"#{model.selectedImage !=3D img}"
+					reRender=3D"mainImage, imagesTable"
+					action=3D"#{controller.showImage(img)}" />
+			</a4j:outputPanel>
+		</a4j:repeat>
+
+		<rich:datascroller styleClass=3D"image-scroller" lastPageMode=3D"full"
+			for=3D"repeat" reRender=3D"imagesTable" boundaryControls=3D"hide"
+			stepControls=3D"hide">
+			<f:facet name=3D"pages">
+				<h:outputText />
+			</f:facet>
+			<f:facet name=3D"fastforward">
+				<h:graphicImage styleClass=3D"image-scroller-right-arrow"
+					value=3D"img/shell/arr_right.png" />
+			</f:facet>
+			<f:facet name=3D"fastforward_disabled">
+				<h:graphicImage styleClass=3D"image-scroller-right-arrow"
+					value=3D"img/shell/arr_right_dis.png" />
+			</f:facet>
+			<f:facet name=3D"fastrewind">
+				<h:graphicImage styleClass=3D"image-scroller-left-arrow"
+					value=3D"img/shell/arr_left.png" />
+			</f:facet>
+			<f:facet name=3D"fastrewind_disabled">
+				<h:graphicImage styleClass=3D"image-scroller-left-arrow"
+					value=3D"img/shell/arr_left_dis.png" />
+			</f:facet>
+		</rich:datascroller>
+	</h:panelGroup>
 </ui:composition>
\ No newline at end of file

Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet=
/realworld.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realw=
orld.css	2009-04-07 17:50:57 UTC (rev 13416)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realw=
orld.css	2009-04-07 18:10:09 UTC (rev 13417)
@@ -362,8 +362,44 @@
 .preview_box_photo_nav img.pr_photo_bg {width : 100px; height : 100px; pos=
ition : absolute; border: 0px;}
 .preview_box_photo_nav table{position : relative; width : 100px; height : =
100px; text-align : center; vertical-align : middle; border-collapse : coll=
apse;}
 .preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px sol=
id #FFFFFF;}
-.preview_box_photo_nav table img.sel{margin: 0px 0px 0px 0px; border : 3px=
 solid #DF6400;}
-	=

+.preview_box_photo_current table img{margin: 0px 0px 0px 0px; border : 3px=
 solid #DF6400;}
+
+.preview_box_photo_default table {
+	cursor: pointer;
+}
+
+.image-scroller {
+	position: relative;
+	left: 0px;
+	top: 0px;
+}
+
+.image-scroller table {
+	position: absolute;
+	left: 0px;
+	top: 0px;
+	width: 100%;
+}
+
+.image-scroller, .image-scroller * {
+	border-style: none;
+	background-color: transparent;
+}
+		=

+.image-scroller-left-arrow {
+	position: absolute; =

+	top: 80px; =

+	left: -35px;
+	z-index: 2;
+}
+		=

+.image-scroller-right-arrow {
+	position: absolute; =

+	top: 80px; =

+	right: -33px;
+	z-index: 2;
+}
+
 .search-div {
 	height: 65px; =

 	width: 339px; =

@@ -886,41 +922,6 @@
 	font-weight: bold;
 }
 =

-.imageScroller {
-	border: none;
-	position: relative;
-	float: left;
-	background-color: #CECECE;
-}
-
-.imageScroller-inactive table {
-	border: none;
-	cursor: pointer;
-}
-		=

-.imageScroller-table {
-	border: none;
-	background-color: #CECECE;
-}
-		=

-.imageScroller-table td {
-	border: none;
-}
-		=

-.imageScroller-leftArr {
-	position: absolute;
-	left: -10px;
-	bottom: 5px;
-	z-index: 2;
-}
-		=

-.imageScroller-rightArr {
-	position: absolute;
-	right: -10px;
-	bottom: 5px;
-	z-index: 2;
-}
-
 .slideshow-table{
 	width: 100%;
 	height: 100%;


--===============4446343331928128586==--