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