[richfaces-svn-commits] JBoss Rich Faces SVN: r13605 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/ui and 8 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Apr 16 08:26:32 EDT 2009
Author: amarkhel
Date: 2009-04-16 08:26:31 -0400 (Thu, 16 Apr 2009)
New Revision: 13605
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java
trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumEditInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/albumEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/avatar.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/register.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css
Log:
Fixing bugs
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-04-16 12:26:17 UTC (rev 13604)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-04-16 12:26:31 UTC (rev 13605)
@@ -10,7 +10,6 @@
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.core.Events;
import org.richfaces.realworld.manager.NavigationEnum;
@@ -65,6 +64,10 @@
}
public void search() {
+ if(!isSearchOptionSelected()){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SEARCH_NO_OPTIONS_ERROR);
+ return;
+ }
keywords = new ArrayList<String>();
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SEARCH);
keywords = parse(searchQuery);
@@ -79,6 +82,10 @@
}
public void search(String keyword) {
+ if(!isSearchOptionSelected()){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.SEARCH_NO_OPTIONS_ERROR);
+ return;
+ }
Iterator<ISearchOption> it = options.iterator();
selectedKeyword = keyword.trim();
while (it.hasNext()) {
@@ -97,6 +104,17 @@
return selectedOption != null;
}
+ private boolean isSearchOptionSelected() {
+ boolean isOptionSelected = false;
+ for(ISearchOption i : options){
+ if(i.getSelected()){
+ isOptionSelected = true;
+ break;
+ }
+ }
+ return isOptionSelected;
+ }
+
public void processSelection() {
Iterator<ISearchOption> it = options.iterator();
while (it.hasNext()) {
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java 2009-04-16 12:26:17 UTC (rev 13604)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java 2009-04-16 12:26:31 UTC (rev 13605)
@@ -14,7 +14,7 @@
*
*/
@Name("imageSizeHelper")
- at Scope(ScopeType.EVENT)
+ at Scope(ScopeType.PAGE)
public class ImageSizeHelper {
int value = Constants.DEFAULT_IMAGE_SIZEVALUE;
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-04-16 12:26:17 UTC (rev 13604)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-04-16 12:26:31 UTC (rev 13605)
@@ -24,14 +24,12 @@
*
*/
@Name("userPrefsBean")
- at Scope(ScopeType.CONVERSATION)
+ at Scope(ScopeType.EVENT)
public class UserPrefsHelper implements Serializable{
private static final long serialVersionUID = -1767281809514660171L;
@In IUserAction userAction;
- Boolean avatarModalOpened = false;
-
@In(required=false, scope=ScopeType.CONVERSATION) @Out(required=false, scope=ScopeType.CONVERSATION) private File avatarData;
static final SelectItem[] sexs = new SelectItem[] {
@@ -47,14 +45,6 @@
avatarData = item.getFile();
}
- public Boolean getAvatarModalOpened() {
- return avatarModalOpened;
- }
-
- public void setAvatarModalOpened(Boolean avatarModalOpened) {
- this.avatarModalOpened = avatarModalOpened;
- }
-
public File getAvatarData() {
return avatarData;
}
Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-04-16 12:26:17 UTC (rev 13604)
+++ trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-04-16 12:26:31 UTC (rev 13605)
@@ -137,7 +137,7 @@
login.header=Please login here
login.login=Login
-login.userName=Username
+login.userName=Login
login.password=Password
login.register=Register
@@ -148,7 +148,7 @@
user.registration=Registration
user.reginfo=Registration Info:
user.firstname=First name
-user.secondname=Second Name
+user.secondname=Second name
user.login=Login
user.password=Password
user.email=Email
@@ -251,7 +251,7 @@
no_results_found=No results found
options=Options
in=in
-in_shared_albums=in Shared Albums
+in_shared_albums=in Shared
hide_options=Hide options
add_shelf=Add shelf
shelf_name=Shelf name
@@ -284,7 +284,7 @@
faq=F.A.Q.
about_demo_at_jbosswiki=About Demo at JBossWiki
about_demo_at_jbossforum=About Demo at JBossForum
-in_my_albums=in My Albums
+in_my_albums=in My
albums_small=albums
photos=photos
name=Name:
@@ -293,4 +293,4 @@
search=Search
find=Find
-my_album:=My Album:
\ No newline at end of file
+my_album:\=My Album\:
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumEditInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/albumEdit.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/avatar.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/register.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css 2009-04-16 12:26:17 UTC (rev 13604)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css 2009-04-16 12:26:31 UTC (rev 13605)
@@ -90,6 +90,59 @@
border: none;
}
+.avatarUpload .file-upload-stop-button{
+ display:none;
+}
+
+.file-upload-button{
+ background:#B34801;
+ color: #FFFFFF;
+ border:1px solid #888888;
+}
+
+
+.avatarUpload .rich-fileupload-ico {
+padding-left:7px;
+}
+.avatarUpload .rich-fileupload-toolbar-decor {
+width:100%;
+background-color:#D7D7D7;
+border-bottom:0px;
+border-left:0px;
+border-top:0px;
+padding:0px;
+}
+
+.avatarUpload .rich-fileupload-ico-add {
+background-image:none;
+}
+
+.avatarUpload .rich-fileupload-button-border{
+border:0px ;
+margin:0px;
+}
+
+.avatarUpload .rich-fileupload-list-decor {
+width:100%;
+background-color:D7D7D7;
+border-bottom:0px;
+border-left:0px;
+border-top:0px;
+padding:0px;
+}
+.avatarUpload .rich-fileupload-button-light{
+ padding:0px;
+ background:#B34801;
+ cursor:pointer;
+ border:1px solid #B34801;
+ }
+
+ .avatarUpload .rich-fileupload-button{
+ padding:0px;
+ background:#B34801;
+ border:1px solid #888888;
+ }
+
.footer-panel {
height: 82px;
position: relative;
More information about the richfaces-svn-commits
mailing list