richfaces-svn-commits
March 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 552 discussions
JBoss Rich Faces SVN: r13004 - trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-18 12:13:22 -0400 (Wed, 18 Mar 2009)
New Revision: 13004
Modified:
trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml
Log:
https://jira.jboss.org/jira/browse/RF-6419
Added skinning and standard components skinning
Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml 2009-03-18 16:12:35 UTC (rev 13003)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml 2009-03-18 16:13:22 UTC (rev 13004)
@@ -1,51 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
- <managed-bean>
- <managed-bean-name>editor</managed-bean-name>
- <managed-bean-class>org.docs.Editor</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
- <managed-property>
- <property-name>edit</property-name>
- <property-class>java.lang.String</property-class>
- <value/>
- </managed-property>
- </managed-bean>
- <managed-bean>
- <managed-bean-name>colorPicker</managed-bean-name>
- <managed-bean-class>org.docs.ColorPicker</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>colorMode</property-name>
- <property-class>java.lang.String</property-class>
- <value/>
- </managed-property>
- <managed-property>
- <property-name>flat</property-name>
- <property-class>java.lang.String</property-class>
- <value/>
- </managed-property>
- <managed-property>
- <property-name>showEvent</property-name>
- <property-class>java.lang.String</property-class>
- <value/>
- </managed-property>
- <managed-property>
- <property-name>value</property-name>
- <property-class>java.lang.String</property-class>
- <value/>
- </managed-property>
- </managed-bean>
- <application>
- <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
- <locale-config>
- <default-locale>en</default-locale>
- <supported-locale>bg</supported-locale>
- <supported-locale>de</supported-locale>
- <supported-locale>en</supported-locale>
- <supported-locale>fr</supported-locale>
- <supported-locale>tr</supported-locale>
- </locale-config>
- </application>
-</faces-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <managed-bean>
+ <managed-bean-name>editor</managed-bean-name>
+ <managed-bean-class>org.docs.Editor</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ <managed-property>
+ <property-name>edit</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>colorPicker</managed-bean-name>
+ <managed-bean-class>org.docs.ColorPicker</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>colorMode</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ <managed-property>
+ <property-name>flat</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ <managed-property>
+ <property-name>showEvent</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ <managed-property>
+ <property-name>value</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>queue</managed-bean-name>
+ <managed-bean-class>org.docs.Queue</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>skin</managed-bean-name>
+ <managed-bean-class>org.docs.Skin</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ <managed-property>
+ <property-name>skin</property-name>
+ <property-class>java.lang.String</property-class>
+ <value>blueSky</value>
+ </managed-property>
+ <managed-property>
+ <property-name>standardSkinning</property-name>
+ <property-class>java.lang.String</property-class>
+ <value>enable</value>
+ </managed-property>
+ </managed-bean>
+ <application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ <locale-config>
+ <default-locale>en</default-locale>
+ <supported-locale>bg</supported-locale>
+ <supported-locale>de</supported-locale>
+ <supported-locale>en</supported-locale>
+ <supported-locale>fr</supported-locale>
+ <supported-locale>tr</supported-locale>
+ </locale-config>
+ </application>
+</faces-config>
Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml 2009-03-18 16:12:35 UTC (rev 13003)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml 2009-03-18 16:13:22 UTC (rev 13004)
@@ -18,9 +18,15 @@
<context-param>
<param-name>org.richfaces.SKIN</param-name>
- <param-value>blueSky</param-value>
+ <param-value>#{skin.skin}</param-value>
</context-param>
+ <context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING</param-name>
+ <param-value>#{skin.standardSkinning}</param-value>
+</context-param>
+
+
<!-- Seam -->
<listener>
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r13003 - trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-18 12:12:35 -0400 (Wed, 18 Mar 2009)
New Revision: 13003
Modified:
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-6419
Added skinning and standard components skinning
Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml 2009-03-18 15:39:42 UTC (rev 13002)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml 2009-03-18 16:12:35 UTC (rev 13003)
@@ -12,8 +12,32 @@
</rich:toolBarGroup>
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
+
+ <h:outputText value="Standard controls skinning:" />
+ <h:form>
-
+ <h:selectOneRadio value="#{skin.standardSkinning}" onchange="submit()" >
+ <f:selectItem id="item1" itemLabel="Enable" itemValue="enable" />
+ <f:selectItem id="item2" itemLabel="Disable" itemValue="disable" />
+ </h:selectOneRadio>
+ </h:form>
+
+
+ <h:outputText value="Select skin:" />
+<h:form>
+
+ <h:selectOneMenu id="select" value="#{skin.skin}" onchange="submit()">
+ <f:selectItem itemLabel="plain" itemValue="plain" />
+ <f:selectItem itemLabel="emeraldTown" itemValue="emeraldTown" />
+ <f:selectItem itemLabel="blueSky" itemValue="blueSky" />
+ <f:selectItem itemLabel="wine" itemValue="wine" />
+ <f:selectItem itemLabel="japanCherry" itemValue="japanCherry" />
+ <f:selectItem itemLabel="ruby" itemValue="ruby" />
+ <f:selectItem itemLabel="classic" itemValue="classic" />
+ <f:selectItem itemLabel="deepMarine" itemValue="deepMarine" />
+ </h:selectOneMenu>
+
+ </h:form>
</rich:toolBarGroup>
</rich:toolBar>
Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml 2009-03-18 15:39:42 UTC (rev 13002)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml 2009-03-18 16:12:35 UTC (rev 13003)
@@ -26,15 +26,34 @@
iconGroupTopPosition="right"
iconCollapsedTopGroup="chevronDown"
iconCollapsedTopPosition="right">
-<rich:panelMenuGroup label="RichFaces Components">
+<rich:panelMenuGroup label="Rich Components">
<rich:panelMenuItem>
-<h:outputLink value="colorPicker.seam">color picker</h:outputLink>
+<h:outputLink value="colorPicker.seam">rich:colorPicker</h:outputLink>
</rich:panelMenuItem>
+
+
+</rich:panelMenuGroup>
+<rich:panelMenuGroup label="A4J Components">
<rich:panelMenuItem>
-<h:outputLink value="demo.seam">demo</h:outputLink>
+<h:outputLink value="queue.seam">a4j:queue</h:outputLink>
</rich:panelMenuItem>
+
</rich:panelMenuGroup>
+
+
+<rich:panelMenuGroup label="Framework">
+<rich:panelMenuItem>
+<h:outputLink value="empty.seam">empty</h:outputLink>
+</rich:panelMenuItem>
+</rich:panelMenuGroup>
+
+<rich:panelMenuGroup label="Skinnability">
+<rich:panelMenuItem>
+<h:outputLink value="empty.seam">empty</h:outputLink>
+</rich:panelMenuItem>
+
+</rich:panelMenuGroup>
</rich:panelMenu>
</div>
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r13002 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-03-18 11:39:42 -0400 (Wed, 18 Mar 2009)
New Revision: 13002
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuItemTest.java
Log:
RF-6523
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuItemTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuItemTest.java 2009-03-18 14:13:58 UTC (rev 13001)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuItemTest.java 2009-03-18 15:39:42 UTC (rev 13002)
@@ -95,7 +95,7 @@
AutoTester autoTester = getAutoTester(this);
autoTester.renderPage(template, null);
writeStatus("Test ajaxSingle attribute in case of validation failures of both external and processed components");
- autoTester.testAjaxSingleWithProcesExternalValidation(true);
+ autoTester.testAjaxSingleWithProcesExternalValidation(false);
}
@Test
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r13001 - trunk/ui/fileUpload/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-03-18 10:13:58 -0400 (Wed, 18 Mar 2009)
New Revision: 13001
Modified:
trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
Log:
https://jira.jboss.org/jira/browse/RF-6153 description is corrected
Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2009-03-18 12:22:01 UTC (rev 13000)
+++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2009-03-18 14:13:58 UTC (rev 13001)
@@ -282,7 +282,7 @@
<property>
<name>onfileuploadcomplete</name>
<classname>java.lang.String</classname>
- <description>HTML: script expression; file was uploaded to server</description>
+ <description>HTML: script expression; a file is uploaded to the server</description>
</property>
<property>
<name>addControlLabel</name>
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r13000 - in trunk/test-applications/realworld2: ejb/src/main/java/org/richfaces/realworld/service and 17 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-18 08:22:01 -0400 (Wed, 18 Mar 2009)
New Revision: 13000
Added:
trunk/test-applications/realworld2/web/src/main/webapp/includes/album.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/albumEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/albums.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageEditInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/imageEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/images.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/menu.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/tree.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/publicShelves.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelves.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelves.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css
Removed:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/TagCloudHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/TagList.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumEditBlock.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumsPreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/anonimShelfs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploadPanel.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/multyMode.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imagePreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/mainImage.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/scroller.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/shelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/shelfs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageEditBlock.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagesPreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/status.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/
trunk/test-applications/realworld2/web/src/main/webapp/includes/register/
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfEditBlock.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfPreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/
trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbumEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userImageEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userImages.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/components.xml
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/album.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/shelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/realworld2/web/src/main/webapp/error.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/index.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/main.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/register.xhtml
Log:
Refactoring pages
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -83,8 +83,9 @@
@org.hibernate.annotations.Fetch(org.hibernate.annotations.FetchMode.SUBSELECT)
private List<Image> images = new ArrayList<Image>();
+ @NotNull
@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
- @JoinColumn(name = "PARENT_SHELF_ID", nullable = true)
+ @JoinColumn(name = "PARENT_SHELF_ID", nullable = false)
@org.hibernate.annotations.ForeignKey(name = "FK_SHELF_PARENT_ID")
private Shelf shelf;
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -21,10 +21,13 @@
import org.hibernate.validator.Length;
import org.hibernate.validator.NotEmpty;
import org.hibernate.validator.NotNull;
+import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
@Entity
@Name("shelf")
+(a)Scope(ScopeType.CONVERSATION)
@Table(name = "shelfs")
public class Shelf implements Serializable {
@@ -169,4 +172,5 @@
public void setShared(boolean shared) {
this.shared = shared;
}
+
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -132,7 +132,7 @@
@org.hibernate.annotations.OrderBy(clause = "NAME asc")
private List<Album> albums = new ArrayList<Album>();
- @OneToMany(mappedBy = "owner", cascade = { CascadeType.ALL}, fetch = FetchType.LAZY)
+ @OneToMany(mappedBy = "owner", cascade = { CascadeType.ALL})
@org.hibernate.annotations.LazyCollection(org.hibernate.annotations.LazyCollectionOption.EXTRA)
@org.hibernate.annotations.OrderBy(clause = "NAME asc")
private List<Shelf> shelfs = new ArrayList<Shelf>();
@@ -229,6 +229,9 @@
throw new IllegalArgumentException("Null shelf");
}
shelf.setOwner(null);
+ for(Album a : shelf.getAlbums()){
+ removeAlbum(a);
+ }
shelfs.remove(shelf);
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -41,6 +41,7 @@
public void addAlbum(Album album, boolean isFlushNeeded) {
em.persist(album);
user.addAlbum(album);
+ album.getShelf().addAlbum(album);
if(isFlushNeeded){
em.flush();
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -53,6 +53,7 @@
public void deleteShelf(Shelf shelf, boolean isFlushNeeded){
user.removeShelf(shelf);
+ em.remove(shelf);
if(isFlushNeeded){
em.flush();
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -5,10 +5,17 @@
import java.io.File;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.util.Properties;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
+import org.jboss.seam.Component;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.contexts.Contexts;
+import org.richfaces.realworld.manager.FileManager;
+
/**
* @author Andrey Markavtsov
*
@@ -17,9 +24,7 @@
static final String IMAGE_SRC = "/WEB-INF/Upload";
- static final String UPLOAD_ROOT_PARAMETER = "uploadRoot";
-
/* (non-Javadoc)
* @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
*/
@@ -34,37 +39,40 @@
try {
String uploadFolderPath = sce.getServletContext().getRealPath(IMAGE_SRC);
if (uploadFolderPath != null) {
- String uploadDest = sce.getServletContext().getInitParameter(UPLOAD_ROOT_PARAMETER);
- if (uploadDest == null) {
- throw new NullPointerException("UploadRoot was not defined");
- }
-
- File uploadFolder = new File(uploadFolderPath);
- File uploadDestFolder = new File(uploadDest);
-
- if (!uploadFolder.exists()) {
- throw new FileNotFoundException("Upload folder does not exists in " + IMAGE_SRC);
- }
-
- if (!uploadDestFolder.exists()) {
- uploadDestFolder.mkdirs();
- }else{
- for (String f : uploadDestFolder.list()) {
- File temp = new File(uploadDestFolder, f);
- temp.delete();
- }
- uploadDestFolder.delete();
- uploadDestFolder.mkdirs();
- }
-
- CopyFile.copyDirectory(uploadFolder, uploadDestFolder);
+ String uploadRootPath = detectUploadRoot(sce.getServletContext().getInitParameter("uploadRoot"));
+ CopyFile.copyDirectory(new File(uploadFolderPath), new File(uploadRootPath));
+ Properties prop = new Properties();
+ prop.put("uploadRoot", uploadRootPath);
+ prop.store(new FileOutputStream("realworld.properties"), null);
}
-
-
}catch (Exception e) {
System.out.println(e);
}
+ }
+ private String detectUploadRoot(String initParameter) {
+ if(initParameter != null){
+ if(fileExist(initParameter)){
+ return initParameter;
+ }else{
+ return getTempPath();
+ }
+ }else{
+ return getTempPath();
+ }
+
}
+
+ private String getTempPath() {
+ return System.getProperty("java.io.tmpdir") + "realworld" + File.separator;
+ }
+ private boolean fileExist(String initParameter) {
+ File temp = new File(initParameter);
+ if(temp.exists()){
+ return true;
+ }else{
+ return temp.mkdirs();
+ }
+ }
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -28,6 +28,7 @@
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.core.Events;
+import org.jboss.seam.faces.FacesMessages;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
@@ -54,10 +55,14 @@
@In(create=true)
FileManager fileManager;
-
+ @In FacesMessages facesMessages;
@In @Out Model model;
public void addAlbum(Album album){
+ if(album.getShelf() == null){
+ facesMessages.addToControl("form2:shelf", "Shelf must be not-null", null);
+ return;
+ }
albumAction.addAlbum(album, flushStrategy.isDatabaseStoreStrategy());
addDirectory();
model.setSelectedImage(null);
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -76,7 +76,7 @@
@In(create = true)
IUserAction userAction;
- @In(create = true)
+ @In
FileManager fileManager;
@In(create=true) @Out Model model;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -53,7 +53,7 @@
@In @Out Model model;
- @In(create=true)
+ @In
private User user;
public void selectShelfs(){
@@ -150,6 +150,9 @@
return album.getOwner().equals(user) || album.getShelf().isShared();
}
+ public boolean isUserShelf(Shelf shelf){
+ return shelf.getOwner()!=null && shelf.getOwner().getId().equals(user.getId());
+ }
public boolean isUserAlbum(Album album){
if(album == null || album.getOwner() == null){
return false;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -26,11 +26,13 @@
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
+import java.util.Properties;
import javax.faces.context.FacesContext;
import javax.imageio.ImageIO;
@@ -39,14 +41,18 @@
import javax.imageio.stream.ImageInputStream;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.Startup;
import org.richfaces.realworld.service.Constants;
@Name("fileManager")
-(a)Scope(ScopeType.CONVERSATION)
+(a)Scope(ScopeType.APPLICATION)
+@AutoCreate
public class FileManager {
+ private static final String REALWORLD_PROPERTIES = "realworld.properties";
private static final String _SMALL160 = "_small160";
private static final String _SMALL120 = "_small120";
private static final String _SMALL80 = "_small80";
@@ -60,25 +66,33 @@
return uploadRoot;
}
+ public FileManager() throws FileNotFoundException, IOException{
+ if(uploadRoot != null){
+ return;
+ }
+ Properties prop = new Properties();
+ prop.load(new FileInputStream(REALWORLD_PROPERTIES));
+ this.setUploadRoot(prop.get("uploadRoot").toString());
+ }
+
public void setUploadRoot(String uploadRootPath) throws IOException {
if (uploadRootPath != null) {
this.uploadRoot = new File(uploadRootPath);
+ for (String f : uploadRoot.list()) {
+ File temp = new File(uploadRoot, f);
+ temp.delete();
+ }
+ uploadRoot.delete();
+ uploadRoot.mkdirs();
this.uploadRootPath = this.uploadRoot.getCanonicalPath()
- + File.separator;
+ + File.separator;
} else {
this.uploadRoot = null;
this.uploadRootPath = null;
}
}
- public FileManager() throws IOException {
- FacesContext fc = FacesContext.getCurrentInstance();
- if (fc != null) {
- // TODO nick - ask Andrei if we can throw exception here
- this.setUploadRoot(fc.getExternalContext().getInitParameter(
- Constants.UPLOAD_ROOT));
- }
- }
+
private File getFileByPath(String path) {
if (this.uploadRoot != null) {
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -72,6 +72,6 @@
Events.instance().raiseEvent(Constants.ADD_IMAGE_EVENT, file.getImage());
}
fileWrapper.getFiles().clear();
- Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT,NavigationEnum.IMAGE_PREVIEW);
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT,NavigationEnum.ALBUM_IMAGE_PREVIEW);
}
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -73,7 +73,7 @@
public void addImage(Image image) {
imageAction.addImage(image, flushStrategy.isDatabaseStoreStrategy());
model.setSelectedAlbum(image.getAlbum());
- Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.IMAGE_PREVIEW);
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
Events.instance().raiseEvent("imageAdded");
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -21,23 +21,21 @@
package org.richfaces.realworld.manager;
public enum NavigationEnum {
- IMAGE_PREVIEW("includes/imagePreview.xhtml"),
- ANONYM("includes/anonimShelfs.xhtml"),
+ ANONYM("includes/publicShelves.xhtml"),
FILE_UPLOAD("includes/fileUpload.xhtml"),
USER_PREFS("includes/userPrefs.xhtml"),
SEARCH("includes/search.xhtml"),
- ALBUM_PREVIEW("includes/userAlbum.xhtml"),
- ALBUM_IMAGE_PREVIEW("/includes/userImage.xhtml"),
- SHELF_PREVIEW("/includes/userShelf.xhtml"),
- ALL_SHELFS("/includes/userShelfs.xhtml"),
+ ALBUM_PREVIEW("includes/album.xhtml"),
+ ALBUM_IMAGE_PREVIEW("/includes/image.xhtml"),
+ SHELF_PREVIEW("/includes/shelf.xhtml"),
+ ALL_SHELFS("/includes/userShelves.xhtml"),
TAGS("includes/tag.xhtml"),
- ALL_ALBUMS("/includes/userAlbums.xhtml"),
- ALL_IMAGES("/includes/userImages.xhtml"),
- ALBUM_IMAGE_EDIT("/includes/userImageEdit.xhtml"),
- ALBUM_EDIT("/includes/userAlbumEdit.xhtml"),
- SHELF_EDIT("/includes/userShelfEdit.xhtml");
+ ALL_ALBUMS("/includes/albums.xhtml"),
+ ALL_IMAGES("/includes/images.xhtml"),
+ ALBUM_IMAGE_EDIT("/includes/imageEdit.xhtml"),
+ ALBUM_EDIT("/includes/albumEdit.xhtml"),
+ SHELF_EDIT("/includes/shelfEdit.xhtml");
-
private NavigationEnum(String t){
template=t;
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -3,12 +3,14 @@
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.security.auth.login.LoginException;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.End;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.log.Log;
@@ -24,9 +26,6 @@
@Scope(ScopeType.CONVERSATION)
public class RegistrationManager {
- @In("#{messages['login_success']}")
- private String LOGIN_SUCCESS;
-
@In FlushStrategy flushStrategy;
@In("#{messages['user.exist']}") private String USER_WITH_THIS_LOGIN_ALREADY_EXIST;
@@ -42,7 +41,6 @@
@In FacesMessages facesMessages;
@In(create=true) PasswordHolder passwordHolder;
-
@In(create = true)
IUserAction userAction;
@@ -53,8 +51,7 @@
}
user.setPasswordHash(passwordHolder.hash(user.getPassword()));
userAction.register(user, flushStrategy.isDatabaseStoreStrategy());
- facesMessages.add(LOGIN_SUCCESS);
- return "main";
+ return "index";
}
public String goToRegister(){
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -30,6 +30,7 @@
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Shelf;
@@ -55,6 +56,11 @@
@In
private User user;
+ public void initEdit(){
+ Shelf shelf = new Shelf();
+ Contexts.getConversationContext().set("shelf", shelf);
+ }
+
public void addShelf(Shelf shelf){
shelfAction.addShelf(shelf, flushStrategy.isDatabaseStoreStrategy());
model.setSelectedImage(null);
@@ -64,6 +70,10 @@
Events.instance().raiseEvent("clearTree");
}
+ public List<Shelf> getAvailableShelfs(User user){
+ return user.getShelfs();
+ }
+
public void editShelf(Shelf shelf){
shelfAction.editShelf(shelf, flushStrategy.isDatabaseStoreStrategy());
model.setSelectedShelf(shelf);
@@ -78,9 +88,7 @@
}
shelfAction.deleteShelf(shelf, flushStrategy.isDatabaseStoreStrategy());
deleteDirectories(directoriesToDelete);
- model.setSelectedImage(null);
- model.setSelectedAlbum(null);
- model.setSelectedShelf(null);
+ model.resetModel(NavigationEnum.ALL_SHELFS, model.getSelectedUser(), null, null, null, null);
Events.instance().raiseEvent("clearTree");
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -76,14 +76,19 @@
@Observer(value = "albumDeleted", create = false)
public void onAlbumDeleted(){
- updateStatistics(countAlbums-1, countImages - 1);
+ updateStatistics(countAlbums-1, countImages);
}
@Observer(value = "albumAdded", create = false)
public void onAlbumAdded(){
- updateStatistics(countAlbums+1, countImages - 1);
+ updateStatistics(countAlbums+1, countImages);
}
+ @Observer(value = "fileAdded", create = false)
+ public void onFileAdded(){
+ updateStatistics(countAlbums, countImages+1);
+ }
+
private void updateStatistics(Long i, Long j) {
countAlbums = i;
countImages = j;
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/TagCloudHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/TagCloudHelper.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/TagCloudHelper.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -1,60 +0,0 @@
-/**
- *
- */
-package org.richfaces.realworld.ui;
-
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.core.Events;
-import org.richfaces.realworld.manager.NavigationEnum;
-import org.richfaces.realworld.service.IImageAction;
-
-
-/**
- * Tag cloud backing bean
- * @author Andrey Markavtsov
- *
- */
-
-@Name("tagCloudBean")
-(a)Scope(ScopeType.CONVERSATION)
-public class TagCloudHelper {
- @In(create=true) IImageAction imageAction;
- /** Min possible rank for tag */
- static final int MIN_RANK = 0;
-
- /** Max possible rank for tag */
- static final int MAX_RANK = 100;
-
- /** Scope of existed css classes for each rank. Should be defined ordered ASC by rank */
- static final String [] TAG_CSS_CLASSSES = new String []
- {"tag-cloud-rank1", "tag-cloud-rank2",
- "tag-cloud-rank3", "tag-cloud-rank4",
- "tag-cloud-rank5", "tag-cloud-rank6",
- "tag-cloud-rank7" } ;
-
- /** Count of possible ranks' css classes */
- static final int TAG_RANK_LEVELS_COUNT = TAG_CSS_CLASSSES.length;
-
- /** Defines the step to the neighbouring rank */
- int RANK_LEVEL_STEP = (MAX_RANK ) / TAG_RANK_LEVELS_COUNT;;
-
-
-
- /**
- * Calculates css class name for tag with rank defined
- * @param rank - tags rank
- * @return css class name
- */
- public String getTagCssClass(Integer rank) {
- int i = rank / RANK_LEVEL_STEP;
- return TAG_CSS_CLASSSES[i];
- }
-
- public void selectTag(String tag){
- Events.instance().raiseEvent("updateMainArea", NavigationEnum.TAGS);
- Events.instance().raiseEvent("updateSelectedTag",imageAction.getTagByName(tag));
- }
-}
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/TagList.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/TagList.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/TagList.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -1,61 +0,0 @@
-package org.richfaces.realworld.ui;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Create;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Observer;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Unwrap;
-
-@Name("tagList")
-(a)Scope(ScopeType.APPLICATION)
-public class TagList {
-
- @In
- protected EntityManager entityManager;
- protected Map<String, Integer> tagMap;
-
- @Create
- public void onCreate() {
- fetchTags();
- }
-
- @Unwrap
- public Map<String, Integer> getTagMap() {
- return tagMap;
- }
-
- @Observer(value = "imageAdded", create = false)
- synchronized public void fetchTags() {
- List<Object[]> results = entityManager
- .createQuery(
- "select t.tag as name, t.images.size+t.albums.size from MetaTag t order by t.images.size+t.albums.size desc")
- .setMaxResults(100).getResultList();
- tagMap = transformToMap(results);
- }
-
- private Map<String, Integer> transformToMap(List<Object[]> results) {
- Map<String, Integer> temp = new HashMap<String, Integer>();
- for(int i=0; i< results.size(); i++){
- temp.put(results.get(i)[0].toString(), Integer.parseInt(results.get(i)[1].toString()));
- }
- return temp;
- }
-
- @Observer(value = "imageEdited", create = false)
- public void ImageEdited(){
- fetchTags();
- }
-
- @Observer(value = "imageDeleted", create = false)
- public void ImageDeleted(){
- fetchTags();
- }
-}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-03-18 12:22:01 UTC (rev 13000)
@@ -21,6 +21,7 @@
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.manager.FileManager;
import org.richfaces.realworld.manager.Model;
+import org.richfaces.realworld.manager.RegistrationManager;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IUserAction;
import org.richfaces.realworld.util.FlushStrategy;
@@ -40,7 +41,6 @@
FileManager fileManager;
@In FlushStrategy flushStrategy;
@In(create=true) @Out Model model;
-
@In
User user;
@@ -64,7 +64,7 @@
if (avatarData != null) {
try {
BufferedImage image = fileManager.bitmapToImage(avatarData.getPath(),"JPG" );
- fileManager.imageToBitmap(image, fileManager.getUploadRoot() + user.getLogin() +
+ fileManager.imageToBitmap(image, fileManager.getUploadRoot().getCanonicalPath()+ "/" + user.getLogin() +
"/avatar.jpg", "JPG");
} catch (IOException e) {
Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("File IO Error"));
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/components.xml 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/components.xml 2009-03-18 12:22:01 UTC (rev 13000)
@@ -33,6 +33,9 @@
<transaction:ejb-transaction />
<security:identity authenticate-method="#{authenticator.authenticate}"/>
<component name="passwordHolder" digestAlgorithm="SHA-1" charset="UTF-8"/>
+ <component name="org.jboss.seam.ui.entityConverter">
+ <property name="entityManager">#{em}</property>
+</component>
<event type="org.jboss.seam.security.notLoggedIn">
<action execute="#{redirect.captureCurrentView}"/>
<action execute="#{identity.tryLogin()}"/>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/album.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/shelf.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-18 12:22:01 UTC (rev 13000)
@@ -81,7 +81,7 @@
<context-param>
<param-name>uploadRoot</param-name>
- <param-value>/srv/www/jboss-portal/server/default/data/Upload/</param-value>
+ <param-value>/srv/upload/as</param-value>
</context-param>
<context-param>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/error.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumEditBlock.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumsPreview.xhtml
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/album.xhtml (from rev 12952, trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/albumEdit.xhtml (from rev 12917, trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbumEdit.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/albums.xhtml (from rev 12956, trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/anonimShelfs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/contextMenu/CMForShelf.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploadPanel.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/multyMode.xhtml
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml (from rev 12922, trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/multyMode.xhtml)
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload.xhtml
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml (from rev 12973, trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageEditInfo.xhtml (from rev 12917, trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageEditBlock.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml (from rev 12973, trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imagePreview.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/mainImage.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/scroller.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/shelf.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/shelfs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageEditBlock.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagesPreview.xhtml
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/image.xhtml (from rev 12917, trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/imageEdit.xhtml (from rev 12917, trunk/test-applications/realworld2/web/src/main/webapp/includes/userImageEdit.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/images.xhtml (from rev 12956, trunk/test-applications/realworld2/web/src/main/webapp/includes/userImages.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/menu.xhtml (from rev 12934, trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/tree.xhtml (from rev 12973, trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree.xhtml)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/status.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/publicShelves.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/publicShelves.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfInfo.xhtml (from rev 12952, trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfPreview.xhtml)
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelves.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelves.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfEditBlock.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfPreview.xhtml
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf.xhtml (from rev 12917, trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelf.xhtml)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfEdit.xhtml (from rev 12917, trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfEdit.xhtml)
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbumEdit.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImageEdit.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImages.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefs.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelf.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfEdit.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelves.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelves.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/index.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar.xhtml
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml (from rev 12984, trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/main.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/register.xhtml
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css (from rev 12984, trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css)
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css 2009-03-18 12:22:01 UTC (rev 13000)
@@ -0,0 +1,720 @@
+.main-body {
+ margin: 0px;
+ background: url(../img/shell/page_bg.gif) repeat-x #D7D7D7;
+ height: 100%;
+}
+
+.header-panel {
+ height: 116px;
+ border: none;
+ padding: 0px;
+ background: none;
+}
+
+.header-panel-body {
+ padding: 0px;
+}
+
+.header-content-div {
+ height: 79px;
+ position: relative;
+}
+
+.user-info-div {
+ position: absolute;
+ font-weight: bold;
+ color: #ffffff;
+ right: 20px;
+ top: 45px;
+}
+
+.top-right-menu {
+ position: absolute;
+ right: 8px;
+ top: 14px;
+}
+
+.top-right-menu-toolbar {
+ background: none;
+ border: none;
+}
+
+.top-right-menu-item {
+ vertical-align: top;
+ padding: 0px;
+}
+
+.top-right-menu-item a {
+ font-size: 11px;
+ color: #ffffff;
+ text-decoration: none;
+ font-weight: normal;
+ padding: 0px 8px 0px 15px;
+}
+
+.main-menu-panel {
+ height: 37px;
+ position: relative;
+ border: none;
+ padding: 0px;
+ background: url(../img/shell/general_panelbar_bg.gif) repeat-x #A84807;
+}
+
+.main-menu-panel-body {
+ border: none;
+ padding: 0px;
+}
+
+.body-main-panel {
+ background: url(../img/shell/general_panel_bg.gif) right top repeat-y;
+ height: 100%;
+ padding: 0px;
+ border: none;
+}
+
+.body-main-panel-header {
+ height: 15px;
+ background: url(../img/shell/general_panel_header_bg.gif) right top;
+ font-size: 1px;
+ padding: 0px;
+ border: none;
+}
+
+.footer-panel {
+ height: 82px;
+ position: relative;
+ background: url(../img/shell/footer_bg.gif) repeat-x #000000;
+ border: none;
+ padding: 0px;
+}
+
+.footer-panel-content {
+ position: absolute;
+ left: 8px;
+ top: 51px;
+}
+
+.body-main-panel-body{
+ padding: 15px 35px 15px 15px;
+}
+
+.bottom-right-menu-item {
+ vertical-align: top;
+ padding: 0px 15px 0px 8px;
+}
+
+.bottom-right-menu-item-content {
+ font-size: 11px;
+ color: #ffffff;
+ text-decoration: none;
+}
+
+.logged-user {
+ color: #FF7D2A;
+ padding:0 8px 0 0;
+}
+
+.main-menu-toolbar {
+ background: none;
+ border: none;
+}
+
+.main-menu-toolbar-content a {
+ color: #FFFFFF;
+ font-size: 11px;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+.main-menu-toolbar-content{
+ width: 100%;
+}
+
+.table-boby-column1{
+ vertical-align: top;
+}
+
+.table-boby-column2{
+ vertical-align: top;
+}
+
+.main-menu-table{
+ width: 100%;
+}
+
+.menu-cloumn1{
+ width: 90%
+}
+.menu-cloumn2{
+ width: 10%
+}
+
+.login-panel{
+ width: 400px;
+}
+
+input[type='submit'], input[type='button'], button {
+ background: #414141;
+ color: white;
+ margin: 5px;
+ border-color: black;
+}
+
+.login-table-col{
+ text-align: center;
+}
+
+.login-table-col2{
+ text-align: left;
+ font-weight: bold;
+}
+
+.login-body-table-col{
+ align: middle;
+ vertical-align: middle;
+ height: 100%;
+}
+
+.main-image{
+ border: none;
+}
+
+.all-images{
+ border: none;
+}
+
+.message {
+ border: 1px solid #FFCC00;
+ padding: 5px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ background-color: #F0F8FF;
+ font-size: 12px;
+ color: red;
+}
+
+.name {
+ vertical-align: top;
+ font-weight: bold;
+ width: 115px;
+ float: left;
+ padding: 5px;
+ margin-top: 3px;
+ clear: left;
+}
+.value {
+ float: left;
+ padding: 5px;
+}
+
+.error {
+ float: left;
+ padding: 5px;
+ color: red;
+}
+.errors {
+ color: red;
+ vertical-align: middle;
+}
+img.errors {
+ padding-right: 5px;
+}
+.errors input {
+ border: 1px solid red;
+}
+.errors textarea {
+ border: 1px solid red;
+}
+
+.required {
+ color: red;
+ padding-left: 2px;
+}
+
+.rich-stglpanel-body {
+ overflow: auto;
+}
+.top {
+ vertical-align: top;
+}
+.info {
+ height: 202px;
+ overflow: auto;
+}
+
+.a4j-status {
+ border: 1px solid white;
+ padding: 5px;
+ position: absolute;
+ z-index: 3;
+ left: 50%;
+ top: 40px;
+}
+
+.tag-cloud-rank1 {
+ text-decoration: none;
+ font-size: 8px;
+ color: gray;
+}
+
+.tag-cloud-rank2 {
+ text-decoration: none;
+ font-size: 9px;
+ color: yellow;
+}
+
+.tag-cloud-rank3 {
+ text-decoration: none;
+ font-size: 10px;
+ color: blue;
+}
+
+.tag-cloud-rank4 {
+ text-decoration: none;
+ font-size: 11px;
+ color: green;
+}
+
+.tag-cloud-rank5 {
+ text-decoration: none;
+ font-size: 12px;
+ color: brown;
+}
+
+.tag-cloud-rank6 {
+ text-decoration: none;
+ font-size: 14px;
+ color: red;
+}
+
+.tag-cloud-rank7 {
+ text-decoration: none;
+ font-size: 18px;
+ color: black;
+}
+
+a{color : #DF6400;}
+h1{font-size : 175%; font-weight : normal; margin : 0px;}
+.h1-style{
+ font-size : 175%; font-weight : normal; margin : 0px;
+}
+
+.content_box {padding : 15px 35px 15px 35px;}
+.content_box p {margin : 0px 0px 5px 0px; FONT-SIZE : 12PX}
+
+.preview_box_album_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
+.preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_album_80 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;}
+.preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_album_80 div.album_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
+
+.preview_box_album_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute; border: 0px;}
+.preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_album_120 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;}
+.preview_box_album_120 div.album_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_album_120 div.album_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
+
+.preview_box_album_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute; border: 0px;}
+.preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_album_160 table img{margin: 0px 0px 1px 1px; border : 1px solid #FFFFFF;}
+.preview_box_album_160 div.album_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_album_160 div.album_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
+
+
+
+.preview_box_photo_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
+.preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_80 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
+.preview_box_photo_80 div.photo_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_photo_80 div.photo_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
+
+.preview_box_photo_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute; border: 0px;}
+.preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_120 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
+.preview_box_photo_120 div.photo_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_photo_120 div.photo_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
+
+.preview_box_photo_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute; border: 0px;}
+.preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_160 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
+.preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
+
+.preview_box_photo_nav {width : 100px; height : 100px; position : relative; float : left; margin : 0px 2px 0px 0px;}
+.preview_box_photo_nav img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
+.preview_box_photo_nav table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
+.preview_box_photo_nav table img.sel{margin: 0px 0px 0px 0px; border : 3px solid #DF6400;}
+
+.search-div {
+ height: 65px;
+ width: 339px;
+ position: absolute;
+ top: 64px;
+ right: 0px;
+ margin-right: 0px;
+}
+
+.search-img-bg {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+}
+
+.search-label {
+ position: absolute;
+ color: rgb(255, 255, 255);
+ font-weight: bold;
+ top: 22px;
+ left: 20px;
+}
+
+.search-find-button {
+ position: absolute;
+ color: rgb(255, 255, 255);
+ font-weight: bold;
+ top: 21px;
+ left: 277px;
+ text-decoration: none;
+}
+
+.search-input {
+ border: 0px none ;
+ background: transparent none repeat scroll 0% 0%;
+ width: 176px;
+ height: 17px;
+ position: absolute;
+ top: 20px;
+ left: 73px;
+ -moz-background-clip: -moz-initial;
+ -moz-background-origin: -moz-initial;
+ -moz-background-inline-policy: -moz-initial;
+ font-weight: bold;
+}
+
+.search-img {
+ width: 61px;
+ height: 18px;
+ position: absolute;
+ top: 20px;
+ left: 261px;
+}
+
+.search-option-div {
+ position: absolute;
+ top: 41px;
+ left: 197px;
+}
+
+.search-option-link {
+ color: rgb(255, 255, 255);
+ text-decoration: none;
+}
+
+.search-options {
+ background: transparent none repeat scroll 0% 0%;
+ overflow: hidden;
+ height: 90px;
+ width: 327px;
+ position: absolute;
+ top: 107px;
+ right: 5px;
+ -moz-background-clip: -moz-initial;
+ -moz-background-origin: -moz-initial;
+ -moz-background-inline-policy: -moz-initial;
+}
+
+.search-option-img {
+ position: absolute;
+ bottom: 0px;
+ left: 0px;
+}
+
+.search-options-div1 {
+ position: absolute;
+ color: white;
+ top: 7px;
+ left: 45px;
+}
+
+.search-options-div2 {
+ border-top: 1px solid rgb(56, 56, 56);
+ position: absolute;
+ color: white;
+ top: 32px;
+ padding-top: 3px;
+ left: 38px;
+}
+
+.search-hide-options-div {
+ position: absolute;
+ top: 70px;
+ left: 163px;
+}
+
+.search-hide-options-link {
+ color: rgb(255, 255, 255);
+ text-decoration: none;
+}
+
+.dr-tree-h-text {
+ white-space: normal;
+}
+
+.tree-selected-node{
+ font-weight: bold;
+ background: #F1F1F1;
+ border: #FFFFFF 1px solid;
+}
+
+.dr-tree-h-ic-div {
+ margin: 0px;
+ padding-left: 0px;
+ padding-bottom: 5px;
+}
+
+.avatar {
+ width: 100px;
+}
+
+.rich-tree-node rich-cm-attached {
+ padding-top: 3px;
+}
+
+.dr-tree-h-ic-img{
+ width: 25px;
+}
+
+.dr-insldr-vert-spacer {
+ padding: 0px;
+}
+
+.shelf-header-table{
+ border-collapse : collapse;
+ margin-bottom : 15px;
+}
+
+.shelf-header-table h1{
+ margin-bottom : 4px;
+}
+
+.shelf-header-table-col2{
+ padding : 8px 0px 0px 20px;
+ vertical-align : top;
+ white-space : nowrap;
+}
+
+.additional-info-text{
+ color : #666666;
+}
+
+.album-header-table{
+ border-collapse : collapse;
+ margin-bottom : 15px;
+}
+
+.album-header-table h1{
+ margin-bottom : 4px;
+}
+
+.album-header-table-col2{
+ padding : 8px 0px 0px 20px;
+ vertical-align : top;
+ white-space : nowrap;
+}
+
+.album-cover-image{
+ border : 2px solid #FFFFFF;
+}
+
+.image-header-table{
+ border-collapse : collapse;
+ margin-bottom : 15px;
+}
+
+.image-header-table h1{
+ margin-bottom : 4px;
+}
+
+.image-header-table-col2{
+ padding : 8px 0px 0px 20px;
+ vertical-align : top;
+ white-space : nowrap;
+}
+
+.image-cover-image{
+ border : 2px solid #FFFFFF;
+}
+
+.mainImage-div{
+ padding-top : 10px;
+}
+
+.mainImage-table{
+ border-collapse : collapse;
+ margin-bottom : 5px;
+}
+
+.mainImage-table-col1{
+ padding-right : 10px;
+ padding-left : 30px;
+ text-align : right;
+}
+
+.mainImage-table-col3{
+ padding-bottom : 5px
+}
+
+.buttons-body{
+ cursor : pointer;
+ margin : 0px 0px 0px 0px;
+ position : relative;
+ width : 103px;
+ height : 28px;
+}
+
+.buttons-body-image{
+ position : absolute;
+ top : 0px;
+ left : 0px;
+ border: 0px;
+}
+.buttons-body-text-div{
+ position : absolute;
+ color : #ffffff;
+ top : 7px;
+ left : 8px;
+}
+.buttons-body-spacer-image{
+ position : absolute;
+ top : 0px;
+ left : 0px;
+ border: 0px;
+}
+
+.slideshow-outerdiv{
+ cursor : pointer;
+ margin-bottom : 7px
+}
+
+.comment-table{
+ border-collapse : collapse;
+ margin-bottom : 20px;
+}
+.comment-deleteLink{
+ margin : 1px 0px 7px 0px;
+ background : #f1f1f1;
+ padding : 3px 4px 4px 4px;
+}
+.comment-text{
+ margin : 0px 0px 10px 0px;
+ padding : 0px 4px 0px 4px;
+}
+
+.image-edit-div{
+ margin : 10px 0px 30px 30px;
+ width : 504px;
+ background : #f1f1f1;
+}
+.image-edit-div-table{
+ border-collapse : collapse;
+}
+
+.main-menu-icons-outer-div {
+ cursor: pointer;
+ float: left;
+ padding: 4px 2px 0px 2px;
+}
+
+.main-menu-icons-left-div {
+ height: 23px;
+ float: left;
+}
+
+.main-menu-icons-middle-div {
+ height: 23px;
+ float: left;
+ background: url(../img/shell/informer_bg.png) top left no-repeat;
+ color: #FFFFFF;
+ padding: 4px 0px 0px 0px;
+}
+
+.main-menu-icons-right-div {
+ height : 23px;
+ float : left;
+ width : 10px;
+ overflow : hidden;
+ position : relative;
+}
+.main-menu-icons-backgroung-img {
+ position : absolute;
+ top : 0px;
+ right : 0px;
+ border: 0px;
+}
+.main-menu-separator-img{
+ float:left;
+ margin : 8px 15px 0px 15px;
+ border : 0px;
+}
+.main-menu-add-icons-img{
+ padding : 4px 0px 0px 5px;
+ border : 0px;
+}
+
+.rich-tabpanel-content{
+ border: none;
+ background: none;
+}
+.rich-tabhdr-side-cell{
+ border: none;
+}
+.rich-tabhdr-side-border{
+ border: none;
+ background: none;
+}
+.rich-tab-bottom-line{
+ border: none;
+ background: none;
+}
+
+.rich-tab-active{
+ border-right: 1px solid;
+ border-right-color: black;
+ border-left: 0px;
+ border-top: 0px;
+ font-size : 175%;
+ background: none;
+ font-weight : normal;
+ margin : 4px;
+}
+
+.rich-tab-inactive{
+ border-right: 1px solid;
+ border-right-color: black;
+ border-left: 0px;
+ border-top: 0px;
+ background: none;
+ color : #DF6400;
+ text-decoration: underline;
+ cursor: pointer;
+}
+
+.top-right-bottom-menu-item {
+ vertical-align: top;
+ padding: 0px;
+}
+
+.top-right-bottom-menu-item-link a{
+ font-size: 11px;
+ color: #ffffff;
+ text-decoration: none;
+ font-weight: normal;
+ padding: 0px 0px 0px 15px;
+}
\ No newline at end of file
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-18 10:18:58 UTC (rev 12999)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-18 12:22:01 UTC (rev 13000)
@@ -1,720 +0,0 @@
-.main-body {
- margin: 0px;
- background: url(../img/shell/page_bg.gif) repeat-x #D7D7D7;
- height: 100%;
-}
-
-.header-panel {
- height: 116px;
- border: none;
- padding: 0px;
- background: none;
-}
-
-.header-panel-body {
- padding: 0px;
-}
-
-.header-content-div {
- height: 79px;
- position: relative;
-}
-
-.user-info-div {
- position: absolute;
- font-weight: bold;
- color: #ffffff;
- right: 20px;
- top: 45px;
-}
-
-.top-right-menu {
- position: absolute;
- right: 8px;
- top: 14px;
-}
-
-.top-right-menu-toolbar {
- background: none;
- border: none;
-}
-
-.top-right-menu-item {
- vertical-align: top;
- padding: 0px;
-}
-
-.top-right-menu-item a {
- font-size: 11px;
- color: #ffffff;
- text-decoration: none;
- font-weight: normal;
- padding: 0px 8px 0px 15px;
-}
-
-.main-menu-panel {
- height: 37px;
- position: relative;
- border: none;
- padding: 0px;
- background: url(../img/shell/general_panelbar_bg.gif) repeat-x #A84807;
-}
-
-.main-menu-panel-body {
- border: none;
- padding: 0px;
-}
-
-.body-main-panel {
- background: url(../img/shell/general_panel_bg.gif) right top repeat-y;
- height: 100%;
- padding: 0px;
- border: none;
-}
-
-.body-main-panel-header {
- height: 15px;
- background: url(../img/shell/general_panel_header_bg.gif) right top;
- font-size: 1px;
- padding: 0px;
- border: none;
-}
-
-.footer-panel {
- height: 82px;
- position: relative;
- background: url(../img/shell/footer_bg.gif) repeat-x #000000;
- border: none;
- padding: 0px;
-}
-
-.footer-panel-content {
- position: absolute;
- left: 8px;
- top: 51px;
-}
-
-.body-main-panel-body{
- padding: 15px 35px 15px 15px;
-}
-
-.bottom-right-menu-item {
- vertical-align: top;
- padding: 0px 15px 0px 8px;
-}
-
-.bottom-right-menu-item-content {
- font-size: 11px;
- color: #ffffff;
- text-decoration: none;
-}
-
-.logged-user {
- color: #FF7D2A;
- padding:0 8px 0 0;
-}
-
-.main-menu-toolbar {
- background: none;
- border: none;
-}
-
-.main-menu-toolbar-content a {
- color: #FFFFFF;
- font-size: 11px;
- font-weight: bold;
- text-decoration: none;
-}
-
-.main-menu-toolbar-content{
- width: 100%;
-}
-
-.table-boby-column1{
- vertical-align: top;
-}
-
-.table-boby-column2{
- vertical-align: top;
-}
-
-.main-menu-table{
- width: 100%;
-}
-
-.menu-cloumn1{
- width: 90%
-}
-.menu-cloumn2{
- width: 10%
-}
-
-.login-panel{
- width: 400px;
-}
-
-input[type='submit'], input[type='button'], button {
- background: #414141;
- color: white;
- margin: 5px;
- border-color: black;
-}
-
-.login-table-col{
- text-align: center;
-}
-
-.login-table-col2{
- text-align: left;
- font-weight: bold;
-}
-
-.login-body-table-col{
- align: middle;
- vertical-align: middle;
- height: 100%;
-}
-
-.main-image{
- border: none;
-}
-
-.all-images{
- border: none;
-}
-
-.message {
- border: 1px solid #FFCC00;
- padding: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- background-color: #F0F8FF;
- font-size: 12px;
- color: red;
-}
-
-.name {
- vertical-align: top;
- font-weight: bold;
- width: 115px;
- float: left;
- padding: 5px;
- margin-top: 3px;
- clear: left;
-}
-.value {
- float: left;
- padding: 5px;
-}
-
-.error {
- float: left;
- padding: 5px;
- color: red;
-}
-.errors {
- color: red;
- vertical-align: middle;
-}
-img.errors {
- padding-right: 5px;
-}
-.errors input {
- border: 1px solid red;
-}
-.errors textarea {
- border: 1px solid red;
-}
-
-.required {
- color: red;
- padding-left: 2px;
-}
-
-.rich-stglpanel-body {
- overflow: auto;
-}
-.top {
- vertical-align: top;
-}
-.info {
- height: 202px;
- overflow: auto;
-}
-
-.a4j-status {
- border: 1px solid white;
- padding: 5px;
- position: absolute;
- z-index: 3;
- left: 50%;
- top: 40px;
-}
-
-.tag-cloud-rank1 {
- text-decoration: none;
- font-size: 8px;
- color: gray;
-}
-
-.tag-cloud-rank2 {
- text-decoration: none;
- font-size: 9px;
- color: yellow;
-}
-
-.tag-cloud-rank3 {
- text-decoration: none;
- font-size: 10px;
- color: blue;
-}
-
-.tag-cloud-rank4 {
- text-decoration: none;
- font-size: 11px;
- color: green;
-}
-
-.tag-cloud-rank5 {
- text-decoration: none;
- font-size: 12px;
- color: brown;
-}
-
-.tag-cloud-rank6 {
- text-decoration: none;
- font-size: 14px;
- color: red;
-}
-
-.tag-cloud-rank7 {
- text-decoration: none;
- font-size: 18px;
- color: black;
-}
-
-a{color : #DF6400;}
-h1{font-size : 175%; font-weight : normal; margin : 0px;}
-.h1-style{
- font-size : 175%; font-weight : normal; margin : 0px;
-}
-
-.content_box {padding : 15px 35px 15px 35px;}
-.content_box p {margin : 0px 0px 5px 0px; FONT-SIZE : 12PX}
-
-.preview_box_album_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
-.preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_album_80 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;}
-.preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_album_80 div.album_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
-
-.preview_box_album_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute; border: 0px;}
-.preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_album_120 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;}
-.preview_box_album_120 div.album_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_album_120 div.album_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
-
-.preview_box_album_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute; border: 0px;}
-.preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_album_160 table img{margin: 0px 0px 1px 1px; border : 1px solid #FFFFFF;}
-.preview_box_album_160 div.album_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_album_160 div.album_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
-
-
-
-.preview_box_photo_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
-.preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_photo_80 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
-.preview_box_photo_80 div.photo_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_photo_80 div.photo_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
-
-.preview_box_photo_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute; border: 0px;}
-.preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_photo_120 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
-.preview_box_photo_120 div.photo_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_photo_120 div.photo_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
-
-.preview_box_photo_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute; border: 0px;}
-.preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_photo_160 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
-.preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px}
-
-.preview_box_photo_nav {width : 100px; height : 100px; position : relative; float : left; margin : 0px 2px 0px 0px;}
-.preview_box_photo_nav img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
-.preview_box_photo_nav table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
-.preview_box_photo_nav table img.sel{margin: 0px 0px 0px 0px; border : 3px solid #DF6400;}
-
-.search-div {
- height: 65px;
- width: 339px;
- position: absolute;
- top: 64px;
- right: 0px;
- margin-right: 0px;
-}
-
-.search-img-bg {
- position: absolute;
- top: 0px;
- left: 0px;
-}
-
-.search-label {
- position: absolute;
- color: rgb(255, 255, 255);
- font-weight: bold;
- top: 22px;
- left: 20px;
-}
-
-.search-find-button {
- position: absolute;
- color: rgb(255, 255, 255);
- font-weight: bold;
- top: 21px;
- left: 277px;
- text-decoration: none;
-}
-
-.search-input {
- border: 0px none ;
- background: transparent none repeat scroll 0% 0%;
- width: 176px;
- height: 17px;
- position: absolute;
- top: 20px;
- left: 73px;
- -moz-background-clip: -moz-initial;
- -moz-background-origin: -moz-initial;
- -moz-background-inline-policy: -moz-initial;
- font-weight: bold;
-}
-
-.search-img {
- width: 61px;
- height: 18px;
- position: absolute;
- top: 20px;
- left: 261px;
-}
-
-.search-option-div {
- position: absolute;
- top: 41px;
- left: 197px;
-}
-
-.search-option-link {
- color: rgb(255, 255, 255);
- text-decoration: none;
-}
-
-.search-options {
- background: transparent none repeat scroll 0% 0%;
- overflow: hidden;
- height: 90px;
- width: 327px;
- position: absolute;
- top: 107px;
- right: 5px;
- -moz-background-clip: -moz-initial;
- -moz-background-origin: -moz-initial;
- -moz-background-inline-policy: -moz-initial;
-}
-
-.search-option-img {
- position: absolute;
- bottom: 0px;
- left: 0px;
-}
-
-.search-options-div1 {
- position: absolute;
- color: white;
- top: 7px;
- left: 45px;
-}
-
-.search-options-div2 {
- border-top: 1px solid rgb(56, 56, 56);
- position: absolute;
- color: white;
- top: 32px;
- padding-top: 3px;
- left: 38px;
-}
-
-.search-hide-options-div {
- position: absolute;
- top: 70px;
- left: 163px;
-}
-
-.search-hide-options-link {
- color: rgb(255, 255, 255);
- text-decoration: none;
-}
-
-.dr-tree-h-text {
- white-space: normal;
-}
-
-.tree-selected-node{
- font-weight: bold;
- background: #F1F1F1;
- border: #FFFFFF 1px solid;
-}
-
-.dr-tree-h-ic-div {
- margin: 0px;
- padding-left: 0px;
- padding-bottom: 5px;
-}
-
-.avatar {
- width: 100px;
-}
-
-.rich-tree-node rich-cm-attached {
- padding-top: 3px;
-}
-
-.dr-tree-h-ic-img{
- width: 25px;
-}
-
-.dr-insldr-vert-spacer {
- padding: 0px;
-}
-
-.shelf-header-table{
- border-collapse : collapse;
- margin-bottom : 15px;
-}
-
-.shelf-header-table h1{
- margin-bottom : 4px;
-}
-
-.shelf-header-table-col2{
- padding : 8px 0px 0px 20px;
- vertical-align : top;
- white-space : nowrap;
-}
-
-.additional-info-text{
- color : #666666;
-}
-
-.album-header-table{
- border-collapse : collapse;
- margin-bottom : 15px;
-}
-
-.album-header-table h1{
- margin-bottom : 4px;
-}
-
-.album-header-table-col2{
- padding : 8px 0px 0px 20px;
- vertical-align : top;
- white-space : nowrap;
-}
-
-.album-cover-image{
- border : 2px solid #FFFFFF;
-}
-
-.image-header-table{
- border-collapse : collapse;
- margin-bottom : 15px;
-}
-
-.image-header-table h1{
- margin-bottom : 4px;
-}
-
-.image-header-table-col2{
- padding : 8px 0px 0px 20px;
- vertical-align : top;
- white-space : nowrap;
-}
-
-.image-cover-image{
- border : 2px solid #FFFFFF;
-}
-
-.mainImage-div{
- padding-top : 10px;
-}
-
-.mainImage-table{
- border-collapse : collapse;
- margin-bottom : 5px;
-}
-
-.mainImage-table-col1{
- padding-right : 10px;
- padding-left : 30px;
- text-align : right;
-}
-
-.mainImage-table-col3{
- padding-bottom : 5px
-}
-
-.buttons-body{
- cursor : pointer;
- margin : 0px 0px 0px 0px;
- position : relative;
- width : 103px;
- height : 28px;
-}
-
-.buttons-body-image{
- position : absolute;
- top : 0px;
- left : 0px;
- border: 0px;
-}
-.buttons-body-text-div{
- position : absolute;
- color : #ffffff;
- top : 7px;
- left : 8px;
-}
-.buttons-body-spacer-image{
- position : absolute;
- top : 0px;
- left : 0px;
- border: 0px;
-}
-
-.slideshow-outerdiv{
- cursor : pointer;
- margin-bottom : 7px
-}
-
-.comment-table{
- border-collapse : collapse;
- margin-bottom : 20px;
-}
-.comment-deleteLink{
- margin : 1px 0px 7px 0px;
- background : #f1f1f1;
- padding : 3px 4px 4px 4px;
-}
-.comment-text{
- margin : 0px 0px 10px 0px;
- padding : 0px 4px 0px 4px;
-}
-
-.image-edit-div{
- margin : 10px 0px 30px 30px;
- width : 504px;
- background : #f1f1f1;
-}
-.image-edit-div-table{
- border-collapse : collapse;
-}
-
-.main-menu-icons-outer-div {
- cursor: pointer;
- float: left;
- padding: 4px 2px 0px 2px;
-}
-
-.main-menu-icons-left-div {
- height: 23px;
- float: left;
-}
-
-.main-menu-icons-middle-div {
- height: 23px;
- float: left;
- background: url(../img/shell/informer_bg.png) top left no-repeat;
- color: #FFFFFF;
- padding: 4px 0px 0px 0px;
-}
-
-.main-menu-icons-right-div {
- height : 23px;
- float : left;
- width : 10px;
- overflow : hidden;
- position : relative;
-}
-.main-menu-icons-backgroung-img {
- position : absolute;
- top : 0px;
- right : 0px;
- border: 0px;
-}
-.main-menu-separator-img{
- float:left;
- margin : 8px 15px 0px 15px;
- border : 0px;
-}
-.main-menu-add-icons-img{
- padding : 4px 0px 0px 5px;
- border : 0px;
-}
-
-.rich-tabpanel-content{
- border: none;
- background: none;
-}
-.rich-tabhdr-side-cell{
- border: none;
-}
-.rich-tabhdr-side-border{
- border: none;
- background: none;
-}
-.rich-tab-bottom-line{
- border: none;
- background: none;
-}
-
-.rich-tab-active{
- border-right: 1px solid;
- border-right-color: black;
- border-left: 0px;
- border-top: 0px;
- font-size : 175%;
- background: none;
- font-weight : normal;
- margin : 4px;
-}
-
-.rich-tab-inactive{
- border-right: 1px solid;
- border-right-color: black;
- border-left: 0px;
- border-top: 0px;
- background: none;
- color : #DF6400;
- text-decoration: underline;
- cursor: pointer;
-}
-
-.top-right-bottom-menu-item {
- vertical-align: top;
- padding: 0px;
-}
-
-.top-right-bottom-menu-item-link a{
- font-size: 11px;
- color: #ffffff;
- text-decoration: none;
- font-weight: normal;
- padding: 0px 0px 0px 15px;
-}
\ No newline at end of file
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12999 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-18 06:18:58 -0400 (Wed, 18 Mar 2009)
New Revision: 12999
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
Log:
https://jira.jboss.org/jira/browse/RF-6534
The .rich-table-firstrow is commented out for now.
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2009-03-18 10:08:09 UTC (rev 12998)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2009-03-18 10:18:58 UTC (rev 12999)
@@ -448,10 +448,10 @@
<entry>rich-table-row</entry>
<entry>Defines styles for a table row</entry>
</row>
- <row>
+ <!--row>
<entry>rich-table-firstrow</entry>
<entry>Defines styles for a table start row</entry>
- </row>
+ </row-->
<row>
<entry>rich-table-footercell</entry>
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12998 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-18 06:08:09 -0400 (Wed, 18 Mar 2009)
New Revision: 12998
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
Log:
https://jira.jboss.org/jira/browse/RF-5737
org.richfaces.CONTROL_SKINNING_LEVEL option is documented
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-03-18 09:58:40 UTC (rev 12997)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-03-18 10:08:09 UTC (rev 12998)
@@ -3155,7 +3155,7 @@
<para> However, if you don't want the RichFaces components and standard HTML
controls to be skinned automatically and perform the skinnability implementation
yourself, you might encounter with a problem, namely standard HTML controls in such
- browsers as Opera and Safari will affected by standard controls skinning featured. (
+ browsers as Opera and Safari will be affected by standard controls skinning. (
<link linkend="ScriptsandStylesLoadStrategy">Here</link> you can get more
details on how to disable skinnability.) </para>
<para> In brief, to disable the skinnability mechanism of RichFaces you need to set the
@@ -3205,8 +3205,8 @@
<title>XCSS File Format</title>
<para> XCSS files are the core of RichFaces components skinnability. </para>
<para> XCSS is an XML formatted CSS that adds extra functionality to the skinning
- process </para>
- <para> XCSS extends skinning possibilities by parsing the XCSS file that contains all
+ process.
+ XCSS extends skinning possibilities by parsing the XCSS file that contains all
look-and-feel parameters of a particular component into a standard CSS file that a
web browser can recognize. </para>
<para> XCSS file contains CSS properties and skin parameters mappings. Mapping of a CSS
@@ -3225,7 +3225,7 @@
</u:selector>
...
]]></programlisting>
- <para> During processing the code in the shown example will be parsed into a standard
+ <para> During processing the code in the shown example is parsed into a standard
CSS format. </para>
<programlisting role="CSS"><![CDATA[...
.rich-component-name {
@@ -3369,7 +3369,7 @@
</listitem>
<listitem>
<para>
- <property>SKIN-NAME.properties</property> - a XCSS file that contains
+ <property>SKIN-NAME.properties</property> - a file that contains
properties of the new skin. Location:
"\src\main\resources\SKIN-PACKAGE\SKIN-NAME\css\"
</para>
@@ -3399,7 +3399,7 @@
</listitem>
<listitem>
<para>
- <property>gradientType</property> is a predefined property to set
+ <property>gradientType</property> - a predefined property to set
the type of gradient applied to the new skin. Possible values are
glass, plastic, plain. More information on gradient implementation
you can find further in this chapter. </para>
@@ -3423,7 +3423,7 @@
</listitem>
<listitem>
<para>
- <property>SKIN-NAME-ext.xcss</property> / If the command is executed with
+ <property>SKIN-NAME-ext.xcss</property> If the command is executed with
the "DcreateExt" key set to "true", the configuration
SKIN-NAME-ext.xcss file that imports XCSS file defining styles for the
standard controls will be created. Location:
@@ -3439,11 +3439,11 @@
<para>Now you can start editing the XCSS files located in
"\src\main\resources\SKIN-PACKAGE\SKIN-NAME\css\". New style properties
can be assigned to the selectors (the selectors listed in the XCSS files) in two
- ways, which are both valid, and it'up to the developer what way to choose. </para>
+ ways, which are both valid, and it'up to you what way to choose. </para>
<itemizedlist>
<listitem>
- <para>Applying a standard CSS coding approach, i.e. you can add css properties
- to the given selectors are you normally do while doing CSS coding. The only
+ <para>Standard CSS coding approach, i.e. you can add CSS properties
+ to the given selectors. The only
thing, you have to keep in mind is that the selectors must be inside
<code><f:verbatim> <![CDATA[ ...]]>
</f:verbatim></code> tags.</para>
@@ -3601,7 +3601,7 @@
<para>All the changes that were planned to be preformed are done and now you can
proceed to building the new PlugnSkinDemo skin and import it into the project.
As you read in the previous section, the skin should be built in the
- "P-n-S" folder of the skin project be executing <code>mvn clean
+ "P-n-S" folder of the skin project by executing <code>mvn clean
install</code> command. This procedure results in creating a
"target" folder that contains a .jar file with a compiled new skin, it
our case the file is named "P-n-S-1.0.-SNAPSHOT.jar". The next step is
@@ -3633,7 +3633,7 @@
<param-value>enable</param-value>
</context-param>
]]></programlisting>
- <para>The result of both action is displayed on the figure below.</para>
+ <para>The result of both operations is displayed on the figure below.</para>
<figure>
<title>Plug-n-Skin feature in action. </title>
<mediaobject>
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12997 - trunk/test-applications/jsp/src/main/webapp/ColorPicker.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-03-18 05:58:40 -0400 (Wed, 18 Mar 2009)
New Revision: 12997
Modified:
trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.xhtml
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.xhtml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.xhtml 2009-03-18 09:53:39 UTC (rev 12996)
+++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.xhtml 2009-03-18 09:58:40 UTC (rev 12997)
@@ -3,7 +3,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich" id="calendarSubviewID">
- <rich:colorPicker binding="#{colorPicker.htmlColorPicker}"
+ <rich:colorPicker binding="#{colorPicker.component}"
colorMode="#{colorPicker.colorMode}" converter="colorPickerConverter"
converterMessage="#{colorPicker.converterMessage}"
disabled="#{colorPicker.disabled}" flat="#{colorPicker.flat}"
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12996 - trunk/test-applications/jsp/src/main/webapp/ColorPicker.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-03-18 05:53:39 -0400 (Wed, 18 Mar 2009)
New Revision: 12996
Modified:
trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.xhtml
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.xhtml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.xhtml 2009-03-17 21:44:47 UTC (rev 12995)
+++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.xhtml 2009-03-18 09:53:39 UTC (rev 12996)
@@ -4,7 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich" id="calendarSubviewID">
<rich:colorPicker binding="#{colorPicker.htmlColorPicker}"
- colorMode="hex" converter="colorPickerConverter"
+ colorMode="#{colorPicker.colorMode}" converter="colorPickerConverter"
converterMessage="#{colorPicker.converterMessage}"
disabled="#{colorPicker.disabled}" flat="#{colorPicker.flat}"
id="colorPickerID" immediate="#{colorPicker.immediate}"
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12995 - in trunk/docs: common-resources/en/src/main/css and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-03-17 17:44:47 -0400 (Tue, 17 Mar 2009)
New Revision: 12995
Added:
trunk/docs/common-resources/en/src/main/images/close_org.png
Modified:
trunk/docs/cdkguide/pom.xml
trunk/docs/common-resources/en/src/main/css/html-common.css
trunk/docs/common-resources/en/src/main/script/toggle.js
trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
trunk/docs/faq/pom.xml
trunk/docs/migrationguide/pom.xml
trunk/docs/realworld_app_guide/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-6428 - FeedBack was added to all Guides
Modified: trunk/docs/cdkguide/pom.xml
===================================================================
--- trunk/docs/cdkguide/pom.xml 2009-03-17 18:18:11 UTC (rev 12994)
+++ trunk/docs/cdkguide/pom.xml 2009-03-17 21:44:47 UTC (rev 12995)
@@ -101,12 +101,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/docs/common-resources/en/src/main/css/html-common.css
===================================================================
--- trunk/docs/common-resources/en/src/main/css/html-common.css 2009-03-17 18:18:11 UTC (rev 12994)
+++ trunk/docs/common-resources/en/src/main/css/html-common.css 2009-03-17 21:44:47 UTC (rev 12995)
@@ -132,135 +132,181 @@
/* Feedback styles */
-* html div#feedback-wrapper {position: absolute;
-top:expression(eval(document.compatMode &&
-document.compatMode=='CSS1Compat') ?
-documentElement.scrollTop
-+(documentElement.clientHeight-this.clientHeight)
-: document.body.scrollTop
-+(document.body.clientHeight-this.clientHeight));}
+.problemLayer {
+ position: absolute;
+ left: 34%;
+ top: 20%;
+ width: 400px;
+ height: 110px;
+ z-index: 2;
+ background: #fff;
+ display: none;
+}
-* html #feedback-maincontainer {position: absolute;
+.time_out_div {
+ height: 100%;
+ width: 100%;
+ min-height: 100%;
+ background-color: #5781AF;
+ filter:alpha(opacity=50);
+ opacity: 0.5;
+ -moz-opacity: 0.5;
+ -khtml-opacity: 0.5;
+ z-index: 99;
+ position: fixed;
+ top: 0;
+ left: 0;
+ display: none;
+}
+
+* html div#feedback-wrapper, * html div#feedback-maincontainer, * html div#time_out_div {
+position: absolute;
top:expression(eval(document.compatMode &&
document.compatMode=='CSS1Compat') ?
documentElement.scrollTop
+(documentElement.clientHeight-this.clientHeight)
: document.body.scrollTop
-+(document.body.clientHeight-this.clientHeight));}
-
-#feedback-wrapper{
- margin: 0px;
- padding: 0px;
- position:fixed;
- bottom:0px;
- right:0px;
- height:322px;
- width: 100px;
- overflow: hidden;
++(document.body.clientHeight-this.clientHeight));
}
-#feedback-link{
- float: left;
- display: block;
+#feedback-maincontainer{
+ font-family: Arial;
+ font-size: 14px;
+ display:none;
+ background: #F5F5F5;
+ border: 8px solid #7F9DB9;
+ height:420px;
+ left:30%;
+ position:fixed;
+ text-align:left;
+ top:20%;
+ bottom:20%;
+ width:500px;
+ z-index:100;
}
-
-
-#feedback-header{
- background-color: #AAB3BD;
- text-align: center;
- color: white;
+* html #feedback-maincontainer {
+ width:480px;
+}
+#feedback-maincontainer div#guide_words{
+ margin: 0px 20px 0px 20px !important;
+ font-size: 12px;
+}
+.feedback-helper, #summary-helper-left{
+ color: #ff3333;
+ font-size: 10px;
+ float:left;
+
+}
+#summary-helper-left{
+ float:right;
+ color: #5781AF;
+ padding-right:5px;
+}
+
+.clear{
+ clear:both;
+}
+*html #feedback-maincontainer{
+ width: 500px;
+}
+*html #feedback-header{
width: 100%;
- font-weight: bold;
- position: relative;
- height: 20px;
- padding: 0px;
- margin:0px;
}
+#feedback-header{
+ background-color:#5781AF;
+ border-bottom: 2px solid #ccc;
+ color:white;
+ font-weight:bold;
+ font-size: 16px;
+ height:20px;
+ margin:0;
+ padding:10px 0 10px 20px;
+ position:relative;
+ text-align:left;
+}
#feedback-close{
display:block;
position:absolute;
- right:2px;
- top:2px;
+ right:9px;
+ top:6px;
width:12px;
border: 0px;
}
-#feedback-state{
- font-weight: bold;
- height: 20px;
- width: 508px;
- line-height: 20px;
- overflow: hidden;
-}
-
-#feedback-maincontainer{
- z-index:2000;
- text-align: center;
- background: #F5F5F5;
- border: 1px solid #CCC;
- position: fixed;
- bottom: 0px;
- right: 120px;
-}
-*html #feedback-maincontainer{
- width: 520px;
-}
-
#feedback-mailform{
- margin: 0px 20px 0px 20px;
+ margin: 0px 20px 0px 20px !important;
padding-bottom:5px;
+ text-align:left;
}
*html #feedback-mailform{
margin: 0px 20px 0px 0px;
padding-bottom:5px;
}
-
-.feedback-textbox-div{
- font-weight: bold;
- margin-bottom:5px;
- text-align: right;
- color: #415973;
+#feedback-mailform textarea, #feedback-mailform input, #feedback-mailform label{
+ font-family: Arial,Helvetica,sans-serif;
+ width:450px;
}
-
-#feedback-emailContent{
- width: 200px;
- height: 150px;
- padding: 2px;
+#feedback-mailform input, #feedback-mailform label{
+ display:block;
}
+#feedback-mailform label{
+ margin-top: 10px;
+}
+#feedback-mailform label span{
+ color: #ff0000
+}
+#feedback-mailform textarea{
+ font-size: 14px;
+ height: 100px;
+ padding: 2px;
+}
+#feedback-mailform textarea#feedback-environment{
+ height: 50px;
+}
.feedback-formbutton{
font-size: 12px;
font-family: Arial, Helvetica, sans-serif;
- color: #415973;
+ color: #999;
+ margin: 15px 20px;
}
-.feedback-textbox, #feedback-emailContent{
- background-color:#FFFFFF;
- border:1px solid #A5ACB2;
- padding:2px 1px 3px 5px;
- width: 400px;
- font-size: 12px;
- font-family: Arial, Helvetica, sans-serif;
- color: #000;
-}
-.feedback-button-container{
- margin: 0px 5px 0px 0px;
-}
-
.feedback-images{
border:0;
margin:0;
display: inline;
}
#feedback-iFrame {
- height: 20px;
- width: 508px;
- line-height: 20px;
- overflow: hidden;
- border: none;
- background-color: #F5F5F5;
+ background-color:#F5F5F5;
+ border:medium none;
+ height:90%;
+ line-height:20px;
+ overflow:visible;
+ width:100%;
+ display:none;
}
+#feedback-wrapper{
+ margin: 0px;
+ padding: 0px;
+ position:fixed;
+ bottom:0px;
+ right:0px;
+ height:322px;
+ width: 100px;
+ overflow: hidden;
+ cursor:pointer;
+}
+
+#feedback-link{
+ float: left;
+ display: block;
+}
+
+#feedback-link img{
+ width: 100px;
+}
+
Added: trunk/docs/common-resources/en/src/main/images/close_org.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/common-resources/en/src/main/images/close_org.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/docs/common-resources/en/src/main/script/toggle.js
===================================================================
--- trunk/docs/common-resources/en/src/main/script/toggle.js 2009-03-17 18:18:11 UTC (rev 12994)
+++ trunk/docs/common-resources/en/src/main/script/toggle.js 2009-03-17 21:44:47 UTC (rev 12995)
@@ -1,41 +1,112 @@
-/*
-// attach handler to window object
- Event.observe(window,'load',initializeEmailClient,false);
+var inputCorrect = false;
+var textCorrect = false;
-// initialize email application
-function initializeEmailClient(){
- Event.observe('feedback-mailform', 'submit', sendEmail);
+function getPlace(){
+ if(navigator.appName=="Microsoft Internet Explorer" && parseFloat(navigator.appVersion) < 7){
+ document.getElementById('place').style.display = "block";
+ }
}
+
+function showPopup(_popupId) {
+ document.getElementById(_popupId).style.display = "block";
+ document.getElementById('timeOutDiv').style.display = "block";
+ document.getElementById("feedback-maincontainer").style.display = "block";
+ getPlace();
+}
- // send http request
-function sendEmail(e){
+function hidePopup(_popupId, form, iFrame, but, container) {
+ document.getElementById(_popupId).style.display = "none";
+ document.getElementById('timeOutDiv').style.display = "none";
+ document.getElementById(iFrame).style.display = "none";
+ document.getElementById(form).style.display = "block";
+ document.getElementById(but).style.display = "inline";
+ document.getElementById(container).style.left="30%";
+ document.getElementById(container).style.top="20%";
+ document.getElementById(container).style.width="500px";
+ getPlace();
+}
- // prevent form from submitting
- Event.stop(e);
- var params='subject='+$F('subject')+'&emailContent='+escape($F('emailContent'))+'&senderName='+$F('senderName')+'&from='+$F('from')+'&path='+window.location;
- var xmlobj=new Ajax.Updater('feedback-state','http://192.168.0.194:8090/feedback/FeedbackRF',{method:'get',parameters: params});
+function showIFrame(form, iFrame, but, container){
+ document.getElementById(form).style.display = "none";
+ document.getElementById(but).style.display = "none";
+ document.getElementById(iFrame).style.display = "block";
+ document.getElementById(container).style.height="99%";
+ document.getElementById(container).style.left="10%";
+ document.getElementById(container).style.top="0";
+ document.getElementById(container).style.width="80%";
+ document.getElementById("guide_words").style.display = "none";
+
}
-*/
-function feedbackAppear(){
- document.getElementById('feedback-maincontainer').style.display = "block";
- }
- function feedbackClose(){
- document.getElementById('feedback-maincontainer').style.display = "none";
- }
-
- window.onload = function(){
- var array = new Array();
- for(i=2; i<=6; i++){
- array[i]=document.getElementsByTagName('h'+i).item('a');
- }
- for (var i in array){
- if(array[i] != null && array[i].className == 'title'){
- array[i].childNodes[0].setAttribute("href",window.location.toString().replace(/#[0-9A-Za-z_\-]*/, "")+"#"+array[i].childNodes[0].id);
- }
- }
- }
-
+function fillForm(form){
+ document.getElementById(form).attributes['action'].value =
+ document.getElementById(form).attributes['action'].value
+ +'&priority='+document.getElementById('priority').value
+ +'&summary='+document.getElementById('feedback-summary').value
+ +'&description='+document.getElementById('feedback-description').value
+ +'&environment='+document.getElementById('feedback-environment').value
+ +'&components='+document.getElementById('components').value
+ +'&versions='+document.getElementById('versions').value
+ +'&customfield_12310031='+document.getElementById('customfield_12310031').value;
+}
+function submitForm(form, iFrame, but, container){
+ document.getElementById(form).submit();
+ showIFrame(form, iFrame, but, container);
+}
+
+function setFieldFlag(type, flag){
+ if(type=="textarea"){
+ textCorrect = flag;
+ }else if(type=="text"){
+ inputCorrect = flag;
+ }
+}
+function countLeft(fieldToCheck, count, max) {
+ var field = document.getElementById(fieldToCheck);
+ var left = 'none';
+ var char_count = field.value.length;
+ var fullStr = field.value + " ";
+ var initial_whitespace_rExp = /^[^A-Za-z0-9]+/gi;
+ var left_trimmedStr = fullStr.replace(initial_whitespace_rExp, "");
+ var non_alphanumerics_rExp = rExp = /[^A-Za-z0-9]+/gi;
+ var cleanedStr = left_trimmedStr.replace(non_alphanumerics_rExp, " ");
+ var splitString = cleanedStr.split(" ");
+ var word_count = splitString.length -1;
+ if (fullStr.length <2) {
+ word_count = 0;
+ }
+ if (field.value.length > max){
+ field.value = field.value.substring(0, max);
+ }else if(count != "none"){
+ left = document.getElementById(count);
+ if(navigator.appName=="Microsoft Internet Explorer"){
+ left.innerText = max - field.value.length;
+ }else{
+ left.textContent = max - field.value.length;
+ }
+
+ }
+ if (word_count >= 1){
+ setFieldFlag(field.type, true);
+ }else{
+ setFieldFlag(field.type, false);
+ }
+ if(inputCorrect && textCorrect){
+ document.getElementById("feedback-submit").disabled=false;
+ document.getElementById("feedback-submit").style.color="#415973";
+ }else{
+ document.getElementById("feedback-submit").disabled=true;
+ document.getElementById("feedback-submit").style.color="#999";
+ }
+}
+
+
+function init(input, textarea){
+ document.getElementById("feedback-submit").disabled=true;
+ countLeft(input, "left", 255);
+ countLeft(textarea, "none", 500);
+}
+
function dbToggle(node, expandText, collapseText) {
var dt = node.parentNode;
if (dt.nodeName.toLowerCase() == 'dt') {
@@ -78,4 +149,4 @@
show: function(node) {
node.style.display = "";
}
-};
+};
\ No newline at end of file
Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-03-17 18:18:11 UTC (rev 12994)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-03-17 21:44:47 UTC (rev 12995)
@@ -10,8 +10,8 @@
<xsl:import href="collapsing-navigation.xsl"/>
<!--xsl:param name="generate.toc" select="'book toc'"/-->
- <xsl:param name="toc.section.depth" select="5"/>
-
+ <xsl:param name="toc.section.depth" select="5"/>
+
<!--
From: xhtml/docbook.xsl
@@ -82,17 +82,54 @@
<xsl:apply-templates select="." mode="class.attribute"/>
<xsl:apply-templates mode="titlepage.mode"/>
</div>
-</xsl:template>
-
- <xsl:template name="feedback">
- <div id="feedback-maincontainer" style="display:none">
+</xsl:template>
+<xsl:template name="feedback">
+ <!--[if IE 6]><iframe frameborder="0" class="problemLayer" id="place"><xsl:text> </xsl:text></iframe><![endif]-->
+ <div class="time_out_div" id="timeOutDiv"><xsl:text> </xsl:text></div>
+ <div id="feedback-maincontainer">
+ <h3 id="feedback-header">
+ Create new RichFaces Documentation Jira issue
+ <a href="#" onclick="hidePopup('feedback-maincontainer', 'feedback-mailform', 'feedback-iFrame','feedback-submit', 'feedback-maincontainer');" id="feedback-close">
+ <img src="images/close_org.png" class="feedback-images" />
+ </a>
+ </h3>
+ <iframe id='feedback-iFrame' name="feedback-iFrame"><xsl:text> </xsl:text></iframe>
+ <form onsubmit="return validate_form()" id="feedback-mailform" method="post" action="https://jira.jboss.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310..." target="feedback-iFrame">
+ <input type="hidden" id="priority" name="priority" value="3" />
+ <input type="hidden" id="components" name="components" value="12311170" />
+ <input type="hidden" id="versions" name="versions" value="12312451" />
+ <input type="hidden" id="customfield_12310031" name="customfield_12310031" value="Documentation (Ref Guide, User Guide, etc.)" />
+
+ <label for="summary">Summary</label>
+ <input type="text" id="feedback-summary" name="feedback-summary" title="Summarize the subject of the issue in a few words" maxlength="255" onKeyDown="countLeft('feedback-summary', 'left', 255);"
+ onKeyUp="countLeft('feedback-summary', 'left', 255);"/>
+ <div id="summary-helper-left" class="feedback-helper">
+ <span id="left">255</span> characters left
+ </div>
+ <div class="clear"><xsl:text> </xsl:text></div>
+ <label for="feedback-description">Description</label>
+ <textarea id="feedback-description" name="feedback-description" title="Provide more details about the issue" onKeyDown="countLeft('feedback-description', 'none', 500);"
+ onKeyUp="countLeft('feedback-description', 'none', 500);"><xsl:text> </xsl:text></textarea>
+ <div class="clear"><xsl:text> </xsl:text></div>
+ <label for="feedback-environment">Environment</label>
+ <textarea id="feedback-environment" name="feedback-environment" title="Describe your environment"><xsl:text> </xsl:text></textarea>
+ </form>
+ <div id="guide_words">This will launch the RichFaces Jira page - to complete your feedback please login if needed, and submit the Jira.</div>
+ <input type="button" id="feedback-submit" value="Proceed to Jira" name="submit" class="feedback-formbutton" title="Proceed to create new issue" onclick="fillForm('feedback-mailform'); submitForm('feedback-mailform', 'feedback-iFrame', 'feedback-submit', 'feedback-maincontainer');"/>
+ </div>
+ <div id="feedback-wrapper">
+ <a id="feedback-link" onclick="showPopup('feedback-maincontainer');">
+ <img src="images/feedback_logo.png" class="feedback-images" onload="init('feedback-summary', 'feedback-description');"/>
+ </a>
+ </div>
+ <!--div id="feedback-maincontainer" style="display:none">
<div id="feedback-header">
Send your remarks, comments or wishes to doc team
</div>
- <a href="#" onclick="feedbackClose();" id="feedback-close">
- <img src="images/close.png" class="feedback-images" />
+ <a href="#" onclick="feedbackClose();" id="feedback-close">
+ <img src="images/close.png" class="feedback-images" />
</a>
- <!--div id="feedback-state"><xsl:text> </xsl:text></div-->
+ <div id="feedback-state"><xsl:text> </xsl:text></div>
<iframe id='feedback-iFrame' name="feedback-iFrame"><xsl:text> </xsl:text></iframe>
<form id="feedback-mailform" method="post" action="http://192.168.0.194:8090/feedbackRF/FeedbackRF" target="feedback-iFrame">
<div class="feedback-textbox-div">
@@ -117,9 +154,9 @@
</form>
</div>
<div id="feedback-wrapper">
- <a id="feedback-link" onclick="feedbackAppear();">
- <img src="images/feedback_logo.png" class="feedback-images" width="100px"/>
- </a>
- </div>
+ <a id="feedback-link" onclick="feedbackAppear();">
+ <img src="images/feedback_logo.png" class="feedback-images" width="100px"/>
+ </a>
+ </div-->
</xsl:template>
</xsl:stylesheet>
Modified: trunk/docs/faq/pom.xml
===================================================================
--- trunk/docs/faq/pom.xml 2009-03-17 18:18:11 UTC (rev 12994)
+++ trunk/docs/faq/pom.xml 2009-03-17 21:44:47 UTC (rev 12995)
@@ -155,12 +155,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0-200803311754</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-200803311754</version>
+ <version>1.1.0</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/docs/migrationguide/pom.xml
===================================================================
--- trunk/docs/migrationguide/pom.xml 2009-03-17 18:18:11 UTC (rev 12994)
+++ trunk/docs/migrationguide/pom.xml 2009-03-17 21:44:47 UTC (rev 12995)
@@ -99,12 +99,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
Modified: trunk/docs/realworld_app_guide/pom.xml
===================================================================
--- trunk/docs/realworld_app_guide/pom.xml 2009-03-17 18:18:11 UTC (rev 12994)
+++ trunk/docs/realworld_app_guide/pom.xml 2009-03-17 21:44:47 UTC (rev 12995)
@@ -101,12 +101,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<type>jdocbook-style</type>
</dependency>
<dependency>
15 years, 10 months
- 1
- 0