Author: amarkhel
Date: 2009-05-11 13:04:55 -0400 (Mon, 11 May 2009)
New Revision: 14106
Added:
trunk/examples/photoalbum/source/web/src/main/webapp/img/help/
trunk/examples/photoalbum/source/web/src/main/webapp/img/help/dnd.png
trunk/examples/photoalbum/source/web/src/main/webapp/img/help/image_size.png
trunk/examples/photoalbum/source/web/src/main/webapp/img/help/slide_show.png
trunk/examples/photoalbum/source/web/src/main/webapp/img/help/tree.png
trunk/examples/photoalbum/source/web/src/main/webapp/img/icons/help_sign.png
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/buttonHelp.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_predefined.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_user.xhtml
Removed:
trunk/examples/photoalbum/source/web/src/main/webapp/img/icons/help.gif
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_build_descr.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_click_descr.xhtml
Modified:
trunk/examples/photoalbum/source/
trunk/examples/photoalbum/source/ejb/src/main/resources/META-INF/persistence.xml
trunk/examples/photoalbum/source/web/META-INF/MANIFEST.MF
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/ui/Help.java
trunk/examples/photoalbum/source/web/src/main/webapp/WEB-INF/web.xml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageInfo.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageList.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageScroller.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/inputNumberSlider.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/status.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/tree.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/misc/help.xhtml
trunk/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
Log:
Property changes on: trunk/examples/photoalbum/source
___________________________________________________________________
Name: svn:ignore
+ target
Modified:
trunk/examples/photoalbum/source/ejb/src/main/resources/META-INF/persistence.xml
===================================================================
---
trunk/examples/photoalbum/source/ejb/src/main/resources/META-INF/persistence.xml 2009-05-11
15:41:30 UTC (rev 14105)
+++
trunk/examples/photoalbum/source/ejb/src/main/resources/META-INF/persistence.xml 2009-05-11
17:04:55 UTC (rev 14106)
@@ -11,8 +11,8 @@
<properties>
<property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
<property name="hibernate.hbm2ddl.auto"
value="create-drop"/>
- <property name="hibernate.show_sql" value="true"/>
- <property name="hibernate.format_sql" value="true"/>
+ <!--<property name="hibernate.show_sql"
value="true"/>
+ <property name="hibernate.format_sql"
value="true"/>-->
<property name="jboss.entity.manager.factory.jndi.name"
value="java:/photoalbumEntityManager"/>
<property name="hibernate.transaction.manager_lookup_class"
value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
Modified: trunk/examples/photoalbum/source/web/META-INF/MANIFEST.MF
===================================================================
--- trunk/examples/photoalbum/source/web/META-INF/MANIFEST.MF 2009-05-11 15:41:30 UTC (rev
14105)
+++ trunk/examples/photoalbum/source/web/META-INF/MANIFEST.MF 2009-05-11 17:04:55 UTC (rev
14106)
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.7.0.jar commons-digester-2.0.jar commo
- ns-logging-1.1.1.jar jboss-seam-debug-2.1.1.GA.jar jboss-seam-jul-2.1
- .1.GA.jar jboss-seam-remoting-2.1.1.GA.jar jboss-seam-ui-2.1.1.GA.jar
- jhighlight-1.0.jar jsf-facelets-1.1.15.B1.jar junit-3.8.jar metadata
- -extractor-2.4.0-beta1.jar richfaces-impl-3.3.1-SNAPSHOT.jar richface
- s-ui-3.3.1-SNAPSHOT.jar
+Class-Path: commons-beanutils-1.7.0.jar commons-digester-1.8.1.jar com
+ mons-logging-1.1.1.jar jboss-seam-debug-2.1.1.GA.jar jboss-seam-jul-2
+ .1.1.GA.jar jboss-seam-remoting-2.1.1.GA.jar jboss-seam-ui-2.1.1.GA.j
+ ar jhighlight-1.0.jar jsf-facelets-1.1.15.B1.jar junit-3.8.jar metada
+ ta-extractor-2.4.0-beta1.jar richfaces-impl-3.3.1-SNAPSHOT.jar richfa
+ ces-ui-3.3.1-SNAPSHOT.jar
Modified:
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/ui/Help.java
===================================================================
---
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/ui/Help.java 2009-05-11
15:41:30 UTC (rev 14105)
+++
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/ui/Help.java 2009-05-11
17:04:55 UTC (rev 14106)
@@ -10,7 +10,7 @@
@AutoCreate
public class Help {
- private String page = "/includes/help/tree_click_descr.xhtml";
+ private String page = "/includes/help/tree_predefined.xhtml";
public String getPage() {
return page;
Modified: trunk/examples/photoalbum/source/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/webapp/WEB-INF/web.xml 2009-05-11
15:41:30 UTC (rev 14105)
+++ trunk/examples/photoalbum/source/web/src/main/webapp/WEB-INF/web.xml 2009-05-11
17:04:55 UTC (rev 14106)
@@ -70,7 +70,7 @@
<param-value>/WEB-INF/tags/photoalbum-taglib.xml</param-value>
</context-param>
- <!-- <context-param>
+ <!--<context-param>
<param-name>facelets.REFRESH_PERIOD</param-name>
<param-value>-1</param-value>
</context-param>-->
Added: trunk/examples/photoalbum/source/web/src/main/webapp/img/help/dnd.png
===================================================================
(Binary files differ)
Property changes on:
trunk/examples/photoalbum/source/web/src/main/webapp/img/help/dnd.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/examples/photoalbum/source/web/src/main/webapp/img/help/image_size.png
===================================================================
(Binary files differ)
Property changes on:
trunk/examples/photoalbum/source/web/src/main/webapp/img/help/image_size.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/examples/photoalbum/source/web/src/main/webapp/img/help/slide_show.png
===================================================================
(Binary files differ)
Property changes on:
trunk/examples/photoalbum/source/web/src/main/webapp/img/help/slide_show.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/examples/photoalbum/source/web/src/main/webapp/img/help/tree.png
===================================================================
(Binary files differ)
Property changes on:
trunk/examples/photoalbum/source/web/src/main/webapp/img/help/tree.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Deleted: trunk/examples/photoalbum/source/web/src/main/webapp/img/icons/help.gif
===================================================================
(Binary files differ)
Added: trunk/examples/photoalbum/source/web/src/main/webapp/img/icons/help_sign.png
===================================================================
(Binary files differ)
Property changes on:
trunk/examples/photoalbum/source/web/src/main/webapp/img/icons/help_sign.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
===================================================================
(Binary files differ)
Added:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/buttonHelp.xhtml
===================================================================
(Binary files differ)
Property changes on:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/buttonHelp.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Deleted:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_build_descr.xhtml
===================================================================
(Binary files differ)
Deleted:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_click_descr.xhtml
===================================================================
(Binary files differ)
Copied:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_predefined.xhtml
(from rev 14100,
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_build_descr.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_user.xhtml
(from rev 14100,
trunk/examples/photoalbum/source/web/src/main/webapp/includes/help/tree_click_descr.xhtml)
===================================================================
(Binary files differ)
Modified:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
Modified:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageList.xhtml
===================================================================
(Binary files differ)
Modified:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageScroller.xhtml
===================================================================
---
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageScroller.xhtml 2009-05-11
15:41:30 UTC (rev 14105)
+++
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageScroller.xhtml 2009-05-11
17:04:55 UTC (rev 14106)
@@ -6,6 +6,7 @@
xmlns:rich="http://richfaces.org/rich">
<h:panelGroup layout="block" id="imagesTable"
style="margin: 30px 0px 40px 30px; float: left; position: relative; left:
-2px;">
+ <h:panelGrid columns="2">
<a4j:repeat value="#{model.selectedAlbum.images}" rows="5"
var="img"
id="repeat" rowKeyVar="rk">
@@ -33,7 +34,11 @@
action="#{controller.showImage(img)}" />
</a4j:outputPanel>
</a4j:repeat>
-
+ <a4j:commandLink
actionListener="#{help.navigateTo('/includes/help/imageScrollerHelp.xhtml')}"
oncomplete="#{rich:component('helpPanel')}.show()"
+ reRender="helpPanel">
+ <h:graphicImage style="border:none;"
value="/img/icons/help_sign.png"></h:graphicImage>
+ </a4j:commandLink>
+ </h:panelGrid>
<rich:datascroller page="#{controller.page}"
styleClass="image-scroller" lastPageMode="full"
for="repeat" reRender="imagesTable"
boundaryControls="hide"
stepControls="hide">
@@ -57,5 +62,6 @@
value="img/shell/arr_left_dis.png" />
</f:facet>
</rich:datascroller>
+
</h:panelGroup>
</ui:composition>
\ No newline at end of file
Modified:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/inputNumberSlider.xhtml
===================================================================
---
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/inputNumberSlider.xhtml 2009-05-11
15:41:30 UTC (rev 14105)
+++
trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/inputNumberSlider.xhtml 2009-05-11
17:04:55 UTC (rev 14106)
@@ -5,10 +5,15 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
xmlns:richx="http://richfaces.org/richx">
- <div><rich:inputNumberSlider enableManualInput="false"
+ <div><h:panelGrid columns="2">
+ <rich:inputNumberSlider enableManualInput="false"
value="#{imageSizeHelper.value}" minValue="80"
maxValue="200"
showArrows="false" showBoundaryValues="true"
showInput="false"
step="40" width="100">
<a4j:support event="onchange" reRender="userAlbumImages" />
- </rich:inputNumberSlider></div>
+ </rich:inputNumberSlider><a4j:commandLink
actionListener="#{help.navigateTo('/includes/help/inputSliderHelp.xhtml')}"
oncomplete="#{rich:component('helpPanel')}.show()"
+ reRender="helpPanel">
+ <h:graphicImage style="border:none;"
value="/img/icons/help_sign.png"></h:graphicImage>
+ </a4j:commandLink>
+ </h:panelGrid></div>
</ui:composition>
\ No newline at end of file
Modified:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/status.xhtml
===================================================================
(Binary files differ)
Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/tree.xhtml
===================================================================
(Binary files differ)
Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/misc/help.xhtml
===================================================================
(Binary files differ)
Modified:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
===================================================================
(Binary files differ)