[richfaces-svn-commits] JBoss Rich Faces SVN: r14242 - in branches/community/3.3.X/examples/photoalbum/source/web/src/main: java/org/richfaces/photoalbum/search and 12 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue May 19 13:28:00 EDT 2009
Author: amarkhel
Date: 2009-05-19 13:27:59 -0400 (Tue, 19 May 2009)
New Revision: 14242
Modified:
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java
branches/community/3.3.X/examples/photoalbum/source/web/src/main/resources/messages_en.properties
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/albumInfo.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/albumsList.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/createAlbum.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/albumUnvisited.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageEditInfo.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageInfo.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/menu.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/tree.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/misc/slideShowPooler.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/register.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search/result/userResult.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelfInfo.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelvesList.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelfUnvisited.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/tag.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userAlbums.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userImages.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userSharedAlbums.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userSharedImages.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/layout/template.xhtml
branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/stylesheet/photoalbum.css
Log:
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -88,6 +88,7 @@
if (Environment.isInProduction() && user.isPreDefined()) {
//If true assume that login failed
loginFailed();
+ user = new User();
return false;
}
identity.addRole(Constants.ADMIN_ROLE);
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -111,6 +111,7 @@
return;
}
//Prepare to show in UI
+ fileWrapper.setComplete(false);
fileWrapper.getFiles().add(image);
Events.instance().raiseEvent(Constants.IMAGE_ADDED_EVENT, image);
//Delete temporary file
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -26,6 +26,10 @@
*/
import java.io.Serializable;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.context.AjaxContext;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -167,6 +171,7 @@
public void showNextImage(){
if(!active){
errorDetected = true;
+ addMainAreaToRerender();
return;
}
//reset index if we reached last image
@@ -178,6 +183,7 @@
if(slideshowIndex == startSlideshowIndex){
stopSlideshow();
errorDetected = true;
+ addMainAreaToRerender();
return;
}
selectedImage = model.getImages().get(slideshowIndex);
@@ -189,6 +195,7 @@
Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.IMAGE_RECENTLY_DELETED_ERROR);
active = false;
errorDetected = true;
+ addMainAreaToRerender();
model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, this.selectedImage.getAlbum().getOwner(), this.selectedImage.getAlbum().getShelf(), this.selectedImage.getAlbum(), null, this.selectedImage.getAlbum().getImages());
return;
}
@@ -209,4 +216,15 @@
public void setErrorDetected(boolean errorDetected) {
this.errorDetected = errorDetected;
}
+
+ private void addMainAreaToRerender() {
+ try {
+ FacesContext fc = FacesContext.getCurrentInstance();
+ AjaxContext ac = AjaxContext.getCurrentInstance();
+ UIComponent mainArea = fc.getViewRoot().findComponent(Constants.MAINAREA_ID);
+ ac.addComponentToAjaxRender(mainArea);
+ } catch (Exception e) {
+ System.err.print(e.getMessage());
+ }
+ }
}
\ No newline at end of file
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -5,7 +5,8 @@
import java.util.List;
-import org.richfaces.photoalbum.service.ISearchAction;
+import org.richfaces.photoalbum.search.ISearchAction;
+import org.richfaces.photoalbum.service.PhotoAlbumException;
/**
* Abstract class, that represent base functionality for particular search option(album, shelf, etc..)
@@ -38,8 +39,9 @@
* @param searchQuery - query to search
* @param searchInMyAlbums - is search in users albums will be performed
* @param searchInShared - is search in shared albums will be performed
+ * @throws PhotoAlbumException - in case of wrong search parameters
*/
- public abstract void search(ISearchAction action, String searchQuery, boolean searchInMyAlbums, boolean searchInShared);
+ public abstract void search(ISearchAction action, String searchQuery, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException;
public boolean getSelected() {
return selected;
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -14,7 +14,8 @@
import org.jboss.seam.core.Events;
import org.richfaces.photoalbum.manager.NavigationEnum;
import org.richfaces.photoalbum.service.Constants;
-import org.richfaces.photoalbum.service.ISearchAction;
+import org.richfaces.photoalbum.service.PhotoAlbumException;
+import org.richfaces.photoalbum.search.ISearchAction;
/**
* Class, that encapsulate functionality related to search process.
* @author Andrey Markavtsov
@@ -65,7 +66,7 @@
StringBuilder s = new StringBuilder();
for(ISearchOption option:options) {
if(option.getSelected()){
- s.append(option.getName() + Constants.COMMA);
+ s.append(option.getName() + Constants.COMMA + " ");
}
}
if (s.length() >= 2) {
@@ -98,8 +99,12 @@
selectedKeyword = keywords.get(0).trim();
while (it.hasNext()) {
ISearchOption option = it.next();
- if (option.getSelected()) {
- option.search(searchAction, selectedKeyword , seachInMyAlbums, searchInShared);
+ try{
+ if (option.getSelected()) {
+ option.search(searchAction, selectedKeyword , seachInMyAlbums, searchInShared);
+ }
+ }catch(PhotoAlbumException e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, option.getName() + ":" + e.getMessage());
}
}
}
@@ -117,8 +122,12 @@
selectedKeyword = keyword.trim();
while (it.hasNext()) {
ISearchOption option = it.next();
- if (option.getSelected()) {
- option.search(searchAction,selectedKeyword , seachInMyAlbums, searchInShared);
+ try{
+ if (option.getSelected()) {
+ option.search(searchAction, selectedKeyword , seachInMyAlbums, searchInShared);
+ }
+ }catch(PhotoAlbumException e){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, option.getName() + ":" + e.getMessage());
}
}
}
@@ -195,7 +204,7 @@
public boolean isResultExist(){
for(ISearchOption option : options){
- if(option.getSelected() && option.getSearchResult().size() > 0){
+ if(option.getSelected() && option.getSearchResult() != null && option.getSearchResult().size() > 0){
return true;
}
}
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -4,7 +4,8 @@
import java.util.List;
import org.richfaces.photoalbum.domain.Album;
-import org.richfaces.photoalbum.service.ISearchAction;
+import org.richfaces.photoalbum.search.ISearchAction;
+import org.richfaces.photoalbum.service.PhotoAlbumException;
/**
* Class, that encapsulate functionality related to search by album entity.
* @author Andrey Markavtsov
@@ -36,7 +37,7 @@
* @see org.richfaces.photoalbum.search.ISearchOption#search()
*/
@Override
- public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) {
+ public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException {
List<Album> searchByAlbum = action.searchByAlbum(q, searchInMyAlbums, searchInShared);
if(searchByAlbum != null){
setSearchResult(searchByAlbum);
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -7,7 +7,8 @@
import java.util.List;
import org.richfaces.photoalbum.domain.Image;
-import org.richfaces.photoalbum.service.ISearchAction;
+import org.richfaces.photoalbum.search.ISearchAction;
+import org.richfaces.photoalbum.service.PhotoAlbumException;
/**
* Class, that encapsulate functionality related to search by image entity.
@@ -39,7 +40,7 @@
* @see org.richfaces.photoalbum.search.ISearchOption#search()
*/
@Override
- public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) {
+ public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException {
List<Image> searchByImage = action.searchByImage(q, searchInMyAlbums, searchInShared);
if(searchByImage != null){
setSearchResult(searchByImage);
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -7,7 +7,8 @@
import java.util.List;
import org.richfaces.photoalbum.domain.Shelf;
-import org.richfaces.photoalbum.service.ISearchAction;
+import org.richfaces.photoalbum.search.ISearchAction;
+import org.richfaces.photoalbum.service.PhotoAlbumException;
/**
* Class, that encapsulate functionality related to search by shelf entity.
@@ -49,7 +50,7 @@
*/
@Override
public void search(ISearchAction action, String searchQuery,
- boolean searchInMyAlbums, boolean searchInShared) {
+ boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException {
List<Shelf> list = action.searchByShelves(searchQuery, searchInMyAlbums, searchInShared);
if(list != null){
setSearchResult(list);
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -7,7 +7,8 @@
import java.util.List;
import org.richfaces.photoalbum.domain.MetaTag;
-import org.richfaces.photoalbum.service.ISearchAction;
+import org.richfaces.photoalbum.search.ISearchAction;
+import org.richfaces.photoalbum.service.PhotoAlbumException;
/**
* Class, that encapsulate functionality related to search by metatag entity.
@@ -49,7 +50,7 @@
*/
@Override
public void search(ISearchAction action, String searchQuery,
- boolean searchInMyAlbums, boolean searchInShared) {
+ boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException {
List<MetaTag> searchByTags = action.searchByTags(searchQuery, searchInMyAlbums, searchInShared);
if(searchByTags != null){
setSearchResult(searchByTags);
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java 2009-05-19 17:27:59 UTC (rev 14242)
@@ -7,7 +7,8 @@
import java.util.List;
import org.richfaces.photoalbum.domain.User;
-import org.richfaces.photoalbum.service.ISearchAction;
+import org.richfaces.photoalbum.search.ISearchAction;
+import org.richfaces.photoalbum.service.PhotoAlbumException;
/**
* Class, that encapsulate functionality related to search by user entity.
@@ -48,7 +49,7 @@
* @see org.richfaces.photoalbum.search.ISearchOption#search(org.richfaces.photoalbum.service.ISearchAction)
*/
@Override
- public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) {
+ public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) throws PhotoAlbumException {
List<User> searchByUsers = action.searchByUsers(q, searchInMyAlbums, searchInShared);
if(searchByUsers != null){
setSearchResult(searchByUsers);
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/resources/messages_en.properties
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/resources/messages_en.properties 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/resources/messages_en.properties 2009-05-19 17:27:59 UTC (rev 14242)
@@ -261,17 +261,16 @@
keywords=Keywords:
user_profile_=User profile
message_authorHeader=Author
-all_new_images=All new images
+all_new_images_shelf=All new images(#{model.images.size()}) in shelf #{model.selectedShelf.name}
+all_new_images_album=All new images(#{model.images.size()}) in album #{model.selectedAlbum.name}
in_album=in album
public_shelves=Pre-defined Shelves
-all_images=All images
-related_to_tag=related to tag
+all_images=All images(#{model.images.size()}) related to tag #{model.selectedTag.tag}
my_all_albums=My all albums
my_all_photos=My all images
ok=Ok
-all_shared_albums=All shared albums
-of_user=of user
-all_shared_images=All shared images
+all_shared_albums=All shared albums(#{model.selectedUser.sharedAlbums.size()}) of user #{model.selectedUser.login}
+all_shared_images=All shared images(#{model.selectedUser.sharedImages.size()}) of user #{model.selectedUser.login}
my_album_shelves=My album shelves
cancel=Cancel
save=Save
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/albumInfo.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/albumsList.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/album/createAlbum.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/albumUnvisited.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/fileUpload.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageEditInfo.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/menu.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/index/tree.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/misc/slideShowPooler.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/register.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search/result/userResult.xhtml
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-05-19 17:27:59 UTC (rev 14242)
@@ -20,7 +20,7 @@
</h:panelGroup>
</h:panelGrid>
<h:panelGroup layout="block" styleClass="photo_name">
- <strong>#{searchedUser.firstName} #{searchedUser.secondName}</strong>
+ <h:outputText class="bold" value="#{searchedUser.firstName} #{searchedUser.secondName}"/>
</h:panelGroup>
<h:panelGroup layout="block" styleClass="photo_data">
<h:outputText value="#{searchedUser.birthDate}" >
@@ -28,7 +28,8 @@
</h:outputText>
</h:panelGroup>
<h:panelGroup layout="block" styleClass="photo_data">
- <a4j:commandLink reRender="treePanel, mainArea" actionListener="#{controller.showSharedAlbums(searchedUser)}" ><h:outputText value="#{searchedUser.sharedAlbums.size} #{messages['albums_small']} "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(searchedUser)}"><h:outputText value="#{searchedUser.sharedImages.size} #{messages['photos']}"/></a4j:commandLink>
+ <a4j:commandLink reRender="treePanel, mainArea" actionListener="#{controller.showSharedAlbums(searchedUser)}" >
+ <h:outputText value="#{searchedUser.sharedAlbums.size} #{messages['albums_small']} "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(searchedUser)}"><h:outputText value=" #{searchedUser.sharedImages.size} #{messages['photos']}"/></a4j:commandLink>
</h:panelGroup>
</h:panelGroup>
</a4j:repeat>
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/search.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelfInfo.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelvesList.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/shelfUnvisited.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/tag.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userAlbums.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userImages.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userSharedAlbums.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/includes/userSharedImages.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/layout/template.xhtml
===================================================================
(Binary files differ)
Modified: branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/stylesheet/photoalbum.css
===================================================================
--- branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/stylesheet/photoalbum.css 2009-05-18 15:37:29 UTC (rev 14241)
+++ branches/community/3.3.X/examples/photoalbum/source/web/src/main/webapp/stylesheet/photoalbum.css 2009-05-19 17:27:59 UTC (rev 14242)
@@ -294,7 +294,9 @@
.errors textarea {
border: 1px solid red;
}
-
+.bold {
+ font-weight:bold;
+}
.required {
color: red;
padding-left: 2px;
@@ -565,7 +567,12 @@
border-collapse : collapse;
margin-bottom : 15px;
}
-
+.user-prefs-button{
+ text-align:center;
+ margin-top : 10px;
+ margin-left:auto;
+ margin-right:auto;
+}
.shelf-header-table h1{
margin-bottom : 4px;
}
@@ -888,8 +895,14 @@
.search-criteria {
color: #666666;
+ padding-bottom:7px;
}
+.search-keyword {
+ color: #666666;
+ padding-bottom:25px;
+}
+
.shelf-edit {
margin : 10px 0px 30px 30px;
width : 504px;
More information about the richfaces-svn-commits
mailing list