[richfaces-svn-commits] JBoss Rich Faces SVN: r12442 - in trunk/test-applications/realworld: web/src/main/java/org/richfaces/realworld/fileupload and 13 other directories.

Author: amarkhel Date: 2009-01-27 12:36:47 -0500 (Tue, 27 Jan 2009) New Revision: 12442 Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/Constants.java trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/UserManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/RenderLogic.java trunk/test-applications/realworld/web/src/main/resources/messages_en.properties trunk/test-applications/realworld/web/src/main/resources/messages_ru.properties trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/image.xhtml trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/linkPanel.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/contextMenu/CMForAlbum.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/contextMenu/CMForImage.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/contextMenu/CMForUser.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/chooseMode.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/singleMode.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/breadCrumb.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/imageScroller.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/image/mainImage.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/imagePreview.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/message/history.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/message/incoming.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/message/outcoming.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/messages.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/misc/errorPanel.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/favoriteAlbums.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/tree.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/treeFriends.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/search/advancedSearch.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchResults.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/userPrefs.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/userPrefs/friendTab.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/userPrefs/loginPrefsTab.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/userPrefs/userPrefsTab.xhtml Log: Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/Constants.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/Constants.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/Constants.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -20,12 +20,13 @@ */ package org.richfaces.realworld.service; + public class Constants { public static final String ERROR_ID = "mainform:error"; public static final String CLEAR_ERROR_EVENT = "clearErrorEvent"; public static final String ADD_ERROR_EVENT = "addErrorEvent"; - public static final String ALBUM_WITH_THIS_NAME_ALREADY_PRESENT = "Album with this name already present!"; + public static final String UPLOAD_ROOT = "uploadRoot"; public static final String FILE_SEPARATOR = "file.separator"; public static final String SLASH = "/"; @@ -35,28 +36,28 @@ public static final int SINGLE_MODE_FILE_QUANTITY = 1; public static final String MULTY = "multy"; public static final String SINGLE = "single"; - public static final String FILE_PROCESSING_ERROR = "Error processing occured during upload"; + public static final String ADD_IMAGE_EVENT = "addImage"; - public static final String FILE_SAVE_ERROR = "Error occured during saving image to disk"; + public static final int KB = 1024; public static final String FILE_UPLOAD_CLEAR_EVENT = "fileUploadClear"; public static final String SHOW_FILE_UPLOAD_EVENT = "showFileUpload"; public static final String CHANGE_MODE_FILE_UPLOAD_EVENT = "changeMode"; public static final String JPEG = "jpeg"; - public static final String INVALID_LOGIN_OR_PASSWORD = "Invalid login or password"; + public static final String MAIN_OUTCOME = "main"; - public static final String LOGIN_SUCCESS = "You are successfully registered."; + public static final String REGISTER_LOGIN_NAME_ID = "register:loginName"; public static final String REGISTER_CONFIRM_PASSWORD_ID = "register:confirmPassword"; public static final String INDEX_OUTCOME = "index"; public static final String ADMIN_ROLE = "admin"; public static final String GUEST_ROLE = "guest"; public static final String UPDATE_MAIN_AREA_EVENT = "updateMainArea"; - public static final String WRONG_DND = "That album isn't yours, so you can't change it's location"; + public static final String TREE_ID = "tree"; public static final String CLEAR_EDITOR_EVENT = "clearEditor"; public static final String RE = "Re:"; - public static final String FRIEND_ERROR_MESSAGE = "This user won't be your friend!"; + public static final String SEND_MESSAGE_EVENT = "sendMessage"; public static final String HTTPS = "https://"; public static final String HTTP = "http://"; @@ -88,7 +89,7 @@ public static final String TREE_MY_ALBUMS_ITEM = "treeMyAlbumsItem"; public static final String TREE_ROOT_NODE_TYPE = "treeRoot"; public static final String DATASCROLLER_ID = "mainform:imageScroller"; - public static final String HAVENT_ACCESS = "You have no rights to view this album"; + public static final String FIRST = "first"; public static final String NEXT = "next"; public static final String LAST = "last"; @@ -109,7 +110,6 @@ public static final String USER_OUTCOMING_MESSAGES = "user-outcomeMessages"; public static final String MINUS = "-"; public static final String PLUS = "+"; - public static final String INVALID_SYNTAX = "Invalid syntax"; public static final char MINUS_SIGN = '-'; public static final char PLUS_SIGN = '+'; public static final String DATE_NAMED_PARAMETER = ":date"; Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -43,7 +43,8 @@ @In(value="entityManager") EntityManager em; - + @In("#{messages['invalid_syntax']}") + private String INVALID_SYNTAX; @SuppressWarnings("unchecked") public List<Image> searchImages(String searchPattern, String additionalParams, Map<String, Object> paramMap){ List<String> additions = new ArrayList<String>(); @@ -174,7 +175,7 @@ private boolean parse(String str, List<String> adds, List<String> removes){ str = str.trim(); if(str.startsWith(Constants.PLUS) || str.startsWith(Constants.MINUS) || str.endsWith(Constants.PLUS) || str.endsWith(Constants.MINUS) || str.length() == 0){ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.INVALID_SYNTAX)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(INVALID_SYNTAX)); return false; } if(str.lastIndexOf(Constants.PLUS_SIGN)==-1 && str.lastIndexOf(Constants.MINUS_SIGN)==-1){ @@ -204,7 +205,7 @@ signedPreviousChar=true; prevIndex =i; }else { - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.INVALID_SYNTAX)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(INVALID_SYNTAX)); return false; } }else if(c == Constants.MINUS_SIGN){ @@ -224,7 +225,7 @@ prevIndex =i; }else { - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.INVALID_SYNTAX)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(INVALID_SYNTAX)); return false; } }else{ Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -64,7 +64,10 @@ @In private User user; - + @In("#{messages['file_processing_error']}") + private String FILE_PROCESSING_ERROR; + @In("#{messages['file_saving_error']}") + private String FILE_SAVE_ERROR; @In(create = true) @Out FileWrapper fileWrapper; @@ -100,10 +103,10 @@ try { extractMetadata(file, image); } catch (JpegProcessingException e1) { - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.FILE_PROCESSING_ERROR)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR)); return; } catch (MetadataException me) { - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.FILE_PROCESSING_ERROR)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR)); return; } file.setImage(image); @@ -130,7 +133,7 @@ // Save file to disk String fileName = fileManager.transformToServerPath(file.getImage().getPath()); if(!fileManager.addImage(fileName, file.getData())){ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.FILE_SAVE_ERROR)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_SAVE_ERROR)); } // Update domain model Events.instance().raiseEvent(Constants.ADD_IMAGE_EVENT, file.getImage()); @@ -148,7 +151,7 @@ String fileName = fileManager.transformToServerPath(file.getImage() .getPath()); if(!fileManager.addImage(fileName, file.getData())){ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.FILE_SAVE_ERROR)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_SAVE_ERROR)); } // Update domain model Events.instance().raiseEvent(Constants.ADD_IMAGE_EVENT, file.getImage()); Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -47,7 +47,8 @@ @In(create=true) FileManager fileManager; - + @In("#{messages['file_processing_error']}") + private String FILE_PROCESSING_ERROR; @In(create=true) FileWrapper fileWrapper; public synchronized void paintImageFromByteArray(OutputStream stream, Object data) throws IOException { @@ -74,7 +75,7 @@ paintData = bufferedInputStream; paintData.read(data); } catch (FileNotFoundException e) { - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.FILE_PROCESSING_ERROR)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR)); return; } finally { fileInputStream.close(); @@ -95,14 +96,14 @@ BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream); InputStream paintData = bufferedInputStream; if (null == paintData) { - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.FILE_PROCESSING_ERROR)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR)); return; } try { BufferedImage images = ImageIO.read(paintData); ImageIO.write(images, Constants.JPEG, out); } catch (Exception e) { - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.FILE_PROCESSING_ERROR)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR)); return; } finally { fileInputStream.close(); Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -43,6 +43,9 @@ @In(create=true, required=true) private IAlbumAction albumAction; + @In("#{messages['album_present']}") + private String ALBUM_WITH_THIS_NAME_ALREADY_PRESENT; + @In(create=true) @Out TreeMyAlbumsItem treeMyAlbumsItem; @In(create=true, required=true) @Out @@ -71,7 +74,7 @@ if(nameChanged){ Album oldAlbum = getOldTreeNode(album); if(!renameDirectory(album, oldAlbum)){ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM_WITH_THIS_NAME_ALREADY_PRESENT); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, ALBUM_WITH_THIS_NAME_ALREADY_PRESENT); return; } renameImagesFromAlbum(album, oldAlbum); Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -50,6 +50,11 @@ public class Authenticator implements Serializable { + @In("#{messages['invalid_login']}") + private String INVALID_LOGIN_OR_PASSWORD; + @In("#{messages['login_success']}") + private String LOGIN_SUCCESS; + @In("#{messages['user.exist']}") private String USER_WITH_THIS_LOGIN_ALREADY_EXIST; @In("#{messages['user.confirm.error']}") private String CONFIRM_PASSWORD_NOT_EQUALS_PASSWORD; @@ -91,7 +96,7 @@ return true; } } catch (Exception nre) { - facesMessages.add(Constants.INVALID_LOGIN_OR_PASSWORD); + facesMessages.add(INVALID_LOGIN_OR_PASSWORD); return false; } return false; @@ -103,7 +108,7 @@ return ""; } userAction.register(user); - facesMessages.add(Constants.LOGIN_SUCCESS); + facesMessages.add(LOGIN_SUCCESS); return Constants.INDEX_OUTCOME; } Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -45,7 +45,8 @@ public class DnDManager implements DropListener { @In @Out TreeMyAlbumsItem treeMyAlbumsItem; - + @In("#{messages['album_present']}") + private String ALBUM_WITH_THIS_NAME_ALREADY_PRESENT; @In User user; @In(create=true) FileManager fileManager; @@ -74,7 +75,7 @@ return; } if(!renameDirectory(dragValue)){ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM_WITH_THIS_NAME_ALREADY_PRESENT); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, ALBUM_WITH_THIS_NAME_ALREADY_PRESENT); return; } renameImagesFromAlbum(dragValue); @@ -137,7 +138,7 @@ String directoryOld = fileManager.concat(user.getLogin(), dragValue.getAlbumPathFromParents(dragValue, fileManager.getFileSeparator(), true )); String directoryNew = fileManager.concat(user.getLogin() ,dropValue.getAlbumPathFromParents(dropValue, fileManager.getFileSeparator(), false), dragValue.getName()); if(!fileManager.renameDirectory(directoryOld, directoryNew)){ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.ALBUM_WITH_THIS_NAME_ALREADY_PRESENT); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, ALBUM_WITH_THIS_NAME_ALREADY_PRESENT); return; } Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/UserManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -48,7 +48,8 @@ @In("#{messages['addedtofriendsby']}") private String ADDED_TO_FRIENDS_MESSAGE; @In("#{messages['removedfromfriends']}") private String REMOVED_FROM_FRIENDS_MESSAGE_THEME; @In("#{messages['removedfromfriendsby']}") private String YOU_ARE_WERE_REMOVED_FROM_FRIENDS_MESSAGE; - + @In("#{messages['friend_error']}") + private String FRIEND_ERROR_MESSAGE; private static final long serialVersionUID = 6027103521084558931L; @In @@ -89,7 +90,7 @@ sendAcquireMessage(friend); } }else{ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.FRIEND_ERROR_MESSAGE)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FRIEND_ERROR_MESSAGE)); return; } } Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -59,6 +59,9 @@ private static final long serialVersionUID = 5656562187249324512L; + @In("#{messages['acess_not_granted']}") + private String HAVENT_ACCESS; + private Integer selectedImageIndex = 1; private Image selectedImage; @@ -137,13 +140,13 @@ public void showImage(Image image){ if(!image.getAlbum().isShared() && !image.getAlbum().getOwner().equals(user) && !user.getFriends().contains(image.getAlbum().getOwner())){ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.HAVENT_ACCESS)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); return; } Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.IMAGE_PREVIEW); setSelectedAlbum(image.getAlbum()); setSelectedImage(image); - setDataScrollerIndex(image.getAlbum().getIndex(image)); + setSelectedImageIndex(image.getAlbum().getIndex(image) + 1); setSelectedUser(image.getAlbum().getOwner()); } @@ -154,17 +157,17 @@ setSelectedUser(u); } - private void setDataScrollerIndex(int index) { + /*private void setDataScrollerIndex(int index) { UIComponent component = FacesContext.getCurrentInstance().getViewRoot(); UIDatascroller scroller = (UIDatascroller)component.findComponent(Constants.DATASCROLLER_ID); Map<String, Object> attributes = scroller.getDataTable().getAttributes(); attributes.put(UIDatascroller.SCROLLER_STATE_ATTRIBUTE, index+1); setSelectedImageIndex(index+1); - } + }*/ public void showAlbum(Album album){ if(!album.isShared() && !album.getOwner().equals(user) && !user.getFriends().contains(album.getOwner())){ - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(Constants.HAVENT_ACCESS)); + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); return; } Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.IMAGE_PREVIEW); @@ -196,7 +199,7 @@ setSelectedUser(a.getOwner()); } - public void showFileUpload(TreeAlbumItem item, boolean singleMode){ +/* public void showFileUpload(TreeAlbumItem item, boolean singleMode){ String i; if(singleMode){ i=Constants.SINGLE; @@ -207,7 +210,7 @@ Events.instance().raiseEvent(Constants.FILE_UPLOAD_CLEAR_EVENT); setSelectedAlbum(item.getAlbum()); this.setMainArea(NavigationEnum.FILE_UPLOAD); - } + }*/ public void showFileUpload(Album item, boolean singleMode){ String i; @@ -221,34 +224,7 @@ setSelectedAlbum(item); this.setMainArea(NavigationEnum.FILE_UPLOAD); } - - public void scrollerListener(DataScrollerEvent event) { - List<Image> images = getSelectedAlbum().getImages(); - if (event.getNewScrolVal().equals(Constants.PREVIOUS)) { - for(int index = 0 ; index < images.size(); index++){ - if(images.get(index) ==getSelectedImage()){ - setSelectedImage(images.get(index - 1)); - setSelectedImageIndex(index); - } - } - } else if (event.getNewScrolVal().equals(Constants.LAST)) { - setSelectedImage(images.get(images.size() - 1)); - setSelectedImageIndex(images.size()); - } else if (event.getNewScrolVal().equals(Constants.NEXT)) { - for(int index = 0 ; index < images.size(); index++){ - if(images.get(index) == getSelectedImage()){ - setSelectedImage(images.get(index + 1)); - setSelectedImageIndex(index + 2); - return; - } - } - } else if (event.getNewScrolVal().equals(Constants.FIRST)) { - setSelectedImage(images.get(0)); - setSelectedImageIndex(1); - } - } - @SuppressWarnings("unchecked") public Boolean adviseNodeSelected(UITree tree) { TreeRowKey<Object> treeRowKey = (TreeRowKey<Object>) tree.getRowKey(); @@ -315,25 +291,93 @@ index = -1; } setSelectedImage(getSelectedAlbum().getImages().get(index +1)); - UIComponent component = FacesContext.getCurrentInstance().getViewRoot(); - UIDatascroller scroller = (UIDatascroller)component.findComponent(Constants.DATASCROLLER_ID); - Map<String, Object> attributes = scroller.getDataTable().getAttributes(); - attributes.put(UIDatascroller.SCROLLER_STATE_ATTRIBUTE, index+2); setSelectedImageIndex(index+2); } - public SelectItem[] getAvailableIndexOfImages(){ + public boolean isFirstExist(){ + int index = getSelectedAlbum().getIndex(getSelectedImage()); + return index > 0; + } + + public boolean isLastExist(){ + int index = getSelectedAlbum().getIndex(getSelectedImage()); + int size = getSelectedAlbum().getCountImages(); + return index < size - 1; + } + + public boolean isNextExist(){ + int index = getSelectedAlbum().getIndex(getSelectedImage()); + int size = getSelectedAlbum().getCountImages(); + return index < size - 2; + } + + public boolean isPrevExist(){ + int index = getSelectedAlbum().getIndex(getSelectedImage()); + return index > 0; + } + + public void setNextIndex(){ + int index = getSelectedAlbum().getIndex(getSelectedImage()); + setSelectedImage(getSelectedAlbum().getImages().get(index +1)); + setSelectedImageIndex(index+2); + } + + public void setPrevIndex(){ + int index = getSelectedAlbum().getIndex(getSelectedImage()); + setSelectedImage(getSelectedAlbum().getImages().get(index - 1)); + setSelectedImageIndex(index - 2); + } + + public void setLastIndex(){ + int size = getSelectedAlbum().getCountImages(); + setSelectedImage(getSelectedAlbum().getImages().get(size - 1)); + setSelectedImageIndex(size); + } + + public void setFirstIndex(){ + setSelectedImage(getSelectedAlbum().getImages().get(0)); + setSelectedImageIndex(1); + } + + /*public void scrollerListener(DataScrollerEvent event) { + List<Image> images = getSelectedAlbum().getImages(); + if (event.getNewScrolVal().equals(Constants.PREVIOUS)) { + for(int index = 0 ; index < images.size(); index++){ + if(images.get(index) ==getSelectedImage()){ + setSelectedImage(images.get(index - 1)); + setSelectedImageIndex(index); + } + } + } else if (event.getNewScrolVal().equals(Constants.LAST)) { + setSelectedImage(images.get(images.size() - 1)); + setSelectedImageIndex(images.size()); + } else if (event.getNewScrolVal().equals(Constants.NEXT)) { + for(int index = 0 ; index < images.size(); index++){ + if(images.get(index) == getSelectedImage()){ + setSelectedImage(images.get(index + 1)); + setSelectedImageIndex(index + 2); + return; + } + } + } else if (event.getNewScrolVal().equals(Constants.FIRST)) { + setSelectedImage(images.get(0)); + setSelectedImageIndex(1); + } + + }*/ + + /*public SelectItem[] getAvailableIndexOfImages(){ SelectItem[] group = new SelectItem[getSelectedAlbum().getImages().size()]; for(int i = 0; i < getSelectedAlbum().getImages().size(); i++){ group[i] = new SelectItem(i+1); } return group; - } + }*/ public void updateSelectedItems(Image image){ setSelectedImage(image); Integer index = getSelectedAlbum().getIndex(getSelectedImage()); - setDataScrollerIndex(index); + setSelectedImageIndex(index+1); } public User getSelectedUser() { Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/RenderLogic.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/RenderLogic.java 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/RenderLogic.java 2009-01-27 17:36:47 UTC (rev 12442) @@ -71,7 +71,7 @@ } public boolean isUserGuest(){ - return identity.hasRole(Constants.GUEST_ROLE); + return !identity.hasRole(Constants.ADMIN_ROLE); } public boolean shouldRenderFileUpload(){ Modified: trunk/test-applications/realworld/web/src/main/resources/messages_en.properties =================================================================== --- trunk/test-applications/realworld/web/src/main/resources/messages_en.properties 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/resources/messages_en.properties 2009-01-27 17:36:47 UTC (rev 12442) @@ -157,11 +157,10 @@ scroller.last=Last scroller.prev=Prev scroller.next=Next -scroller.pager.begin=Image -scroller.pager.end=of #{conversationState.selectedAlbum.images.size} +scroller.pager=Image #{conversationState.selectedImageIndex} of #{conversationState.selectedAlbum.images.size} -image.rating=Current Rating: #{record.rank.rating} -image.numberVotes=Number of votes: #{record.rank.hits} +image.rating=Current Rating: #{conversationState.selectedImage.rank.rating} +image.numberVotes=Number of votes: #{conversationState.selectedImage.rank.hits} image.vote=Vote for this picture image.vote.short=Vote image.panelHeader=Image Preview: Selected Album: #{conversationState.selectedAlbum.name} @@ -255,4 +254,78 @@ nomatter=No Matter small=Small medium=Medium -full=Full size \ No newline at end of file +full=Full size + +file_processing_error=Error processing occured during upload +file_saving_error=Error occured during saving image to disk +invalid_login=Invalid login or password +login_success=You are successfully registered. +wrong_dnd=That album isn't yours, so you can't change it's location +friend_error=This user won't be your friend! +acess_not_granted=You have no rights to view this album +invalid_syntax=Invalid syntax +album_present=Album with this name already present! +album_deleteFromFavorite=Delete from favorite +album_show=Show album +album_reqForFriend=Send owner request for friendship +album_deleteFromFriends=Delete owner from friends +album_viewProfile=View profile of owner +album_sendMessage=Send message for owner +album_show_all=Show all albums of owner +album_show_history=Show message history with owner + + +image_showLinks=Show Links +image_addFavorites=Add to favorite images +image_deleteFavorites=Remove from favorite images +image_show_parent=Show parent album +image_show=Show image +image_addParentToFavorite=Add parent to favorite albums +image_removeParentFavorite=Remove parent from favorite albums +image_showParent=Show parent album + +user_profile=View profile +user_history=Show message history +user_show_albums=Show albums + +fileUpload_choosemode=Choose mode for upload: + +camera=Camera +uploaded=Uploaded at +size=Size +dimensions=Dimensions +sizeInKB=Size in KB +width=Width +height=Height +choose_camera=Choose camera: +choose_metatag=Choose metatag for search: +case_sensitive=Case-sensitive search +tooltip_top=Shared images with maximum rating will be showed +tooltip_worst=Shared images with minimum rating will be showed + +my_albums=My albums +my_friends=My friends +content=Content +closeHistory=Close history +history=History + +errorGeneral=OOOps..... Error happened +errorDetail=Error: #{error.message} + +albums=Albums: +images=Images: +my_albums=My albums +friends_albums=Friend albums +album=Album: +owner=Owner: +metatags=Metatags: +rating=Rating: +friends=Friends +friendsInfo=Friends info +viewProfile=View profile +show_albums=Show albums +show_history=Show message history +author=Author +owner=Owner +linkManagement=Link management +close=Close \ No newline at end of file Modified: trunk/test-applications/realworld/web/src/main/resources/messages_ru.properties =================================================================== --- trunk/test-applications/realworld/web/src/main/resources/messages_ru.properties 2009-01-27 16:09:34 UTC (rev 12441) +++ trunk/test-applications/realworld/web/src/main/resources/messages_ru.properties 2009-01-27 17:36:47 UTC (rev 12442) @@ -97,11 +97,10 @@ scroller.last=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u044F\u044F scroller.prev=\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0430\u044F scroller.next=\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0430\u044F -scroller.pager.begin=\u0418\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 -scroller.pager.end= \u0438\u0437 \#{conversationState.selectedAlbum.images.size} +scroller.pager=\u0418\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 #{conversationState.selectedImageIndex} \u0438\u0437 \#{conversationState.selectedAlbum.images.size} -image.rating=\u0422\u0435\u043A\u0443\u0449\u0438\u0439 \u0440\u0435\u0439\u0442\u0438\u043D\u0433\: \#{record.rank.rating} -image.numberVotes=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0433\u043E\u043B\u043E\u0441\u043E\u0432\: \#{record.rank.hits} +image.rating=\u0422\u0435\u043A\u0443\u0449\u0438\u0439 \u0440\u0435\u0439\u0442\u0438\u043D\u0433\: \#{conversationState.selectedImage.rank.rating} +image.numberVotes=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0433\u043E\u043B\u043E\u0441\u043E\u0432\: \#{conversationState.selectedImage.rank.hits} image.vote=\u041F\u0440\u043E\u0433\u043E\u043B\u043E\u0441\u043E\u0432\u0430\u0442\u044C \u0437\u0430 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 image.vote.short=\u0413\u043E\u043B\u043E\u0441\u043E\u0432\u0430\u0442\u044C image.panelHeader=\u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439\: \u0412\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0430\u043B\u044C\u0431\u043E\u043C\: \#{conversationState.selectedAlbum.name} @@ -196,3 +195,75 @@ small=\u041C\u0430\u043B\u0435\u043D\u044C\u043A\u0430\u044F medium=\u0421\u0440\u0435\u0434\u043D\u044F\u044F full=\u041F\u043E\u043B\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 + +file_processing_error=\u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0435 \u0444\u0430\u0439\u043B\u0430 +file_saving_error=\u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043F\u043E\u043F\u044B\u0442\u043A\u0430 \u043F\u0440\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0438 \u0444\u0430\u0439\u043B\u0430 \u043D\u0430 \u0434\u0438\u0441\u043A +invalid_login=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439 \u043B\u043E\u0433\u0438\u043D \u0438\u043B\u0438 \u043F\u0430\u0440\u043E\u043B\u044C +login_success=\u0412\u044B \u0443\u0441\u043F\u0435\u0448\u043D\u043E \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u044B +wrong_dnd=\u0412\u044B \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u043F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u044D\u0442\u043E\u0442 \u0430\u043B\u044C\u0431\u043E\u043C, \u0442\u0430\u043A \u043A\u0430\u043A \u043E\u043D \u043D\u0435 \u0432\u0430\u0448 +friend_error=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u043D\u0435 \u0445\u043E\u0447\u0435\u0442 \u0431\u044B\u0442\u044C \u0432\u0430\u0448\u0438\u043C \u0434\u0440\u0443\u0433\u043E\u043C\! +acess_not_granted=\u0412\u044B \u043D\u0435 \u0438\u043C\u0435\u0435\u0442\u0435 \u043F\u0440\u0430\u0432 \u0434\u043B\u044F \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u044D\u0442\u043E\u0433\u043E \u0430\u043B\u044C\u0431\u043E\u043C\u0430 +invalid_syntax=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0439 \u0441\u0438\u043D\u0442\u0430\u043A\u0441\u0438\u0441 +album_present=\u0410\u043B\u044C\u0431\u043E\u043C \u0441 \u0442\u0430\u043A\u0438\u043C \u0438\u043C\u0435\u043D\u0435\u043C \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442\! +album_deleteFromFavorite=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0437 \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u043E\u0433\u043E +album_show=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C +album_reqForFriend=\u041F\u043E\u0441\u043B\u0430\u0442\u044C \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0443 \u0437\u0430\u043F\u0440\u043E\u0441 \u043D\u0430 \u0434\u0440\u0443\u0436\u0431\u0443 +album_deleteFromFriends=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0430 \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430 \u0434\u0440\u0443\u0437\u0435\u0439 +album_viewProfile=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u043F\u0440\u043E\u0444\u0438\u043B\u044C \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0430 +album_sendMessage=\u041F\u043E\u0441\u043B\u0430\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0443 \u0430\u043B\u044C\u0431\u043E\u043C\u0430 +album_show_all=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u0441\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u044B \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0430 +album_show_history=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0441 \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0435\u043C \u0430\u043B\u044C\u0431\u043E\u043C\u0430 + + +image_showLinks=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0438 +image_addFavorites=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u043C \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u044F\u043C +image_deleteFavorites=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0437 \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0445 \u043A\u0430\u0440\u0442\u0438\u043D\u043E\u043A +image_show_parent=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C, \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0449\u0438\u0439 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 +image_show=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 +image_addParentToFavorite=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0432 \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u044B +image_removeParentFavorite=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0437 \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0445 \u0430\u043B\u044C\u0431\u043E\u043C\u043E\u0432 +image_showParent=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C, \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0449\u0438\u0439 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 + +user_profile=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u043F\u0440\u043E\u0444\u0438\u043B\u044C +user_history=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 +user_show_albums=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C\u044B + +fileUpload_choosemode=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0436\u0438\u043C \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438\: + +camera=\u041C\u043E\u0434\u0435\u043B\u044C \u043A\u0430\u043C\u0435\u0440\u044B +uploaded=\u0414\u0430\u0442\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 +size=\u0420\u0430\u0437\u043C\u0435\u0440 +dimensions=\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435 +sizeInKB=\u0420\u0430\u0437\u043C\u0435\u0440 \u0432 KB +width=\u0428\u0438\u0440\u0438\u043D\u0430 +height=\u0412\u044B\u0441\u043E\u0442\u0430 +choose_camera=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043C\u043E\u0434\u0435\u043B\u044C \u043A\u0430\u043C\u0435\u0440\u044B\: +choose_metatag=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043C\u0435\u0442\u0430\u0442\u044D\u0433\u0438 \u0434\u043B\u044F \u043F\u043E\u0438\u0441\u043A\u0430\: +case_sensitive=\u0423\u0447\u0438\u0442\u044B\u0432\u0430\u0442\u044C \u0440\u0435\u0433\u0438\u0441\u0442\u0440 +tooltip_top=\u0411\u0443\u0434\u0443\u0442 \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u044B \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 \u0441 \u043C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u043C \u0440\u0435\u0439\u0442\u0438\u043D\u0433\u043E\u043C +tooltip_worst=\u0411\u0443\u0434\u0443\u0442 \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u044B \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 \u0441 \u043C\u0438\u043D\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u043C \u0440\u0435\u0439\u0442\u0438\u043D\u0433\u043E\u043C + +my_albums=\u041C\u043E\u0438 \u0430\u043B\u044C\u0431\u043E\u043C\u044B +my_friends=\u041C\u043E\u0438 \u0434\u0440\u0443\u0437\u044C\u044F +content=\u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 +closeHistory=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 +history=\u0418\u0441\u0442\u043E\u0440\u0438\u044F \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 + +errorGeneral=\u0443\u043F\u0441....\u041F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430 +errorDetail=\u041E\u0448\u0438\u0431\u043A\u0430\: \#{error.message} + +albums=\u0418\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0430\u043B\u044C\u0431\u043E\u043C\u044B\: +images=\u0418\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F\: +friends_albums=\u0410\u043B\u044C\u0431\u043E\u043C\u044B \u0434\u0440\u0443\u0437\u0435\u0439 +album=\u0410\u043B\u044C\u0431\u043E\u043C\: +owner=\u0412\u043B\u0430\u0434\u0435\u043B\u0435\u0446 +metatags=\u041C\u0435\u0442\u0430\u0442\u044D\u0433\u0438\: +rating=\u0420\u0435\u0439\u0442\u0438\u043D\u0433\: +friends=\u0414\u0440\u0443\u0437\u044C\u044F +friendsInfo=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u0434\u0440\u0443\u0437\u044C\u044F\u0445 +viewProfile=\u041F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u043F\u0440\u043E\u0444\u0438\u043B\u044C +show_albums=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043B\u044C\u0431\u043E\u043C\u044B +show_history=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 +author=\u0410\u0432\u0442\u043E\u0440 +linkManagement=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0430\u043C\u0438 +close=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \ No newline at end of file Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/image.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/linkPanel.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/contextMenu/CMForAlbum.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/contextMenu/CMForImage.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/contextMenu/CMForUser.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/chooseMode.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/singleMode.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/breadCrumb.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/imageScroller.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/image/mainImage.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/imagePreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/message/history.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/message/incoming.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/message/outcoming.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/messages.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/misc/errorPanel.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/favoriteAlbums.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/tree.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/treeFriends.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/search/advancedSearch.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchResults.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/userPrefs/friendTab.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/userPrefs/loginPrefsTab.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/userPrefs/userPrefsTab.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld/web/src/main/webapp/includes/userPrefs.xhtml =================================================================== (Binary files differ)