richfaces-svn-commits
March 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 552 discussions
JBoss Rich Faces SVN: r12865 - in trunk/test-applications/realworld2/web/src/main/webapp: layout and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-06 11:22:29 -0500 (Fri, 06 Mar 2009)
New Revision: 12865
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree2.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar-backup.xhtml
Log:
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree2.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar-backup.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12864 - management/design/realWorldDemo/prototypes.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2009-03-06 10:49:28 -0500 (Fri, 06 Mar 2009)
New Revision: 12864
Added:
management/design/realWorldDemo/prototypes/desc_draft.odt
Log:
RF-6441: Demo "how it's done" pop-ups
Added: management/design/realWorldDemo/prototypes/desc_draft.odt
===================================================================
(Binary files differ)
Property changes on: management/design/realWorldDemo/prototypes/desc_draft.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12863 - in trunk/test-applications/realworld2/web/src/main/webapp: includes/panelBar and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-06 10:44:54 -0500 (Fri, 06 Mar 2009)
New Revision: 12863
Modified:
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/includes/panelBar/tree2.xhtml
Log:
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/includes/panelBar/tree2.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12862 - in trunk/test-applications/realworld2: ejb/src/main/java/org/richfaces/realworld/service and 9 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-06 10:43:19 -0500 (Fri, 06 Mar 2009)
New Revision: 12862
Added:
trunk/test-applications/realworld2/web/src/main/webapp/includes/anonimShelfs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree2.xhtml
Removed:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeAlbumItem.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeRootItem.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeShelfItem.java
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/service/IShelfAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java
trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
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/DnDManager.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/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/navigation/NavigationEnum.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java
trunk/test-applications/realworld2/web/src/main/webapp/index.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar-backup.xhtml
Log:
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-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -56,6 +56,9 @@
@org.hibernate.annotations.OrderBy(clause = "NAME asc")
private List<Album> childAlbums = new ArrayList<Album>();
+ @NotNull
+ private boolean shared;
+
@Temporal(TemporalType.TIMESTAMP)
private Date created;
@@ -163,4 +166,12 @@
public void setCreated(Date created) {
this.created = created;
}
+
+ public boolean isShared() {
+ return shared;
+ }
+
+ public void setShared(boolean shared) {
+ this.shared = shared;
+ }
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java 2009-03-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -1,9 +1,12 @@
package org.richfaces.realworld.service;
+import java.util.List;
+
import javax.ejb.Local;
import org.richfaces.realworld.domain.Shelf;
+import org.richfaces.realworld.domain.User;
@Local
public interface IShelfAction {
@@ -13,4 +16,6 @@
public void deleteShelf(Shelf shelf);
public void editShelf(Shelf shelf);
+
+ public List<Shelf> getShelfs(User user);
}
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-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -20,7 +20,10 @@
*/
package org.richfaces.realworld.service;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
@@ -58,4 +61,14 @@
em.flush();
}
+ public List<Shelf> getShelfs(User user) {
+ Set<Shelf> sh = new HashSet<Shelf>();
+ List<Shelf> shelfs = em.createQuery("from Shelf s where s.shared=true")
+ .getResultList();
+ sh.addAll(shelfs);
+ sh.addAll(user.getShelfs());
+ shelfs.clear();
+ shelfs.addAll(sh);
+ return shelfs;
+ }
}
Modified: trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-06 15:43:19 UTC (rev 12862)
@@ -2,10 +2,10 @@
INSERT INTO Users(user_id, firstname, secondname, email, login, passwordHash, birthdate, sex, doNotShowMail, informAboutNews, hasAvatar) VALUES (2, 'Nick', 'Curtis', 'nkurtis(a)iba.com', 'Viking', '8cb2237d0679ca88db6464eac60da96345513964', '1978-01-08', 1, 1, 1, 0);
INSERT INTO Users(user_id, firstname, secondname, email, login, passwordHash, birthdate, sex, doNotShowMail, informAboutNews, hasAvatar) VALUES (3, 'John', 'Smith', 'jsmith(a)jboss.com', 'Noname', '8cb2237d0679ca88db6464eac60da96345513964', '1970-01-08', 1, 1, 1, 0);
-INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created) VALUES (1, 'Nature', 'Nature pictures', 1, '2008-12-18');
-INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created) VALUES (2, 'Sport', 'Nature pictures', 1, '2008-12-18');
-INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created) VALUES (3, 'Water', 'Nature pictures', 2, '2008-12-18');
-INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created) VALUES (4, 'Flowers', 'Nature pictures', 3, '2008-12-18');
+INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created, shared) VALUES (1, 'Nature', 'Nature pictures', 1, '2008-12-18', true);
+INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created,shared) VALUES (2, 'Sport', 'Nature pictures', 1, '2008-12-18', true);
+INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created,shared) VALUES (3, 'Water', 'Nature pictures', 2, '2008-12-18', true);
+INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created,shared) VALUES (4, 'Flowers', 'Nature pictures', 3, '2008-12-18', true);
INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (15, 'Water', 'Rivers pictures', true, 2, 3, '2008-12-18');
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-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -39,8 +39,6 @@
import org.richfaces.realworld.fileupload.FileManager;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IAlbumAction;
-import org.richfaces.realworld.tree.TreeAlbumItem;
-import org.richfaces.realworld.tree.TreeRootItem;
import org.richfaces.realworld.util.ConversationState;
@Name("albumManager")
@@ -64,8 +62,6 @@
public void setOncomplete(String oncomplete) {
this.oncomplete = oncomplete;
}
-
- @In(required=false, create=false) @Out(required=false) TreeRootItem treeRoot;
@In(create=true, required=true) @Out
private Album album;
@@ -82,12 +78,12 @@
public void addAlbum(Album album){
albumAction.addAlbum(album);
- addAlbumToTree();
addDirectory();
//Update conversation state
conversationState.setSelectedImage(null);
conversationState.setSelectedAlbum(album);
Events.instance().raiseEvent("albumAdded");
+ Events.instance().raiseEvent("clearTree");
setOncomplete();
}
@@ -95,15 +91,6 @@
album = new Album();
album.setParent(shelf);
}
-
- private void addAlbumToTree() {
- if(album.getParent() != null){
- TreeNode shelf = treeRoot.findShelf(album.getParent());
- shelf.addChild(album.getId(), new TreeAlbumItem(album.getId(),shelf, album));
- }else{
- treeRoot.addChild(album.getId(), new TreeAlbumItem(album.getId(),treeRoot, album));
- }
- }
public void editAlbum(Album album){
albumAction.editAlbum(album);
@@ -114,23 +101,14 @@
public void deleteAlbum(Album album){
//Update domain model
String string = album.getId().toString();
- removeFromTree(album);
albumAction.deleteAlbum(album);
deleteDirectory(string);
conversationState.setSelectedImage(null);
conversationState.setSelectedAlbum(null);
Events.instance().raiseEvent("albumDeleted");
+ Events.instance().raiseEvent("clearTree");
}
- private void removeFromTree(Album album2) {
- if(album.getParent() != null){
- TreeNode shelf = treeRoot.findShelf(album.getParent());
- shelf.removeChild(album.getId());
- }else{
- treeRoot.removeChild(album.getId());
- }
- }
-
private void deleteDirectory(String albumName) {
fileManager.deleteDirectory(user.getLogin(), albumName);
}
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-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -54,6 +54,7 @@
public class Authenticator implements Serializable
{
+ @In(create=true) ShelfManager shelfManager;
@In("#{messages['invalid_login']}")
private String INVALID_LOGIN_OR_PASSWORD;
@In("#{messages['login_success']}")
@@ -96,6 +97,7 @@
credentials.setUsername(username);
try {
identity.authenticate();
+ shelfManager.clearShelfs();
} catch (LoginException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -109,6 +111,7 @@
if (wantLoginAnonymous()) {
identity.addRole(Constants.GUEST_ROLE);
userAction.loginAnonymous();
+ conversationState.setMainArea(NavigationEnum.ANONYM);
return true;
}
try {
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-03-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -27,6 +27,7 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
+import org.jboss.seam.core.Events;
import org.richfaces.component.Dropzone;
import org.richfaces.event.DropEvent;
import org.richfaces.event.DropListener;
@@ -38,13 +39,10 @@
import org.richfaces.realworld.fileupload.FileManager;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IAlbumAction;
-import org.richfaces.realworld.tree.TreeAlbumItem;
-import org.richfaces.realworld.tree.TreeRootItem;
@Name("dndManager")
public class DnDManager implements DropListener {
- @In(required=false, create=false) @Out(required=false) TreeRootItem treeRoot;
@In("#{messages['album_present']}")
private String ALBUM_WITH_THIS_NAME_ALREADY_PRESENT;
@In User user;
@@ -76,17 +74,14 @@
}
private void handleShelf(Album dragValue, Shelf dropValue) {
- TreeNode<Object> itemParent = null;
- TreeNode<Object> itemParentNew = null;
if(dragValue.getParent() != null ){
- itemParent = treeRoot.findShelf(dragValue.getParent());
- itemParentNew = treeRoot.findShelf(dropValue);
if(dragValue.getParent().equals(dropValue)){
//Parent album contain this album
return;
}else{
- itemParent.removeChild(dragValue.getId());
- itemParentNew.addChild(dragValue.getId(), new TreeAlbumItem(dragValue.getId(), itemParentNew, dragValue));
+ dropValue.addChildAlbum(dragValue);
+ albumAction.flush();
+ Events.instance().raiseEvent("clearTree");
}
}
addTreeToRerender();
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-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -36,7 +36,6 @@
import org.richfaces.realworld.navigation.NavigationEnum;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IImageAction;
-import org.richfaces.realworld.tree.TreeAlbumItem;
import org.richfaces.realworld.util.ConversationState;
@Name("imageManager")
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-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -29,15 +29,18 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.core.Events;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.fileupload.FileManager;
+import org.richfaces.realworld.navigation.NavigationEnum;
+import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IShelfAction;
-import org.richfaces.realworld.tree.TreeRootItem;
-import org.richfaces.realworld.tree.TreeShelfItem;
+
import org.richfaces.realworld.util.ConversationState;
@Name("shelfManager")
@@ -46,6 +49,7 @@
private static final long serialVersionUID = 2631634926126857691L;
+ private List<Shelf> shelfs;
@In private FileManager fileManager;
@In(create=true, required=true)
private IShelfAction shelfAction;
@@ -65,7 +69,6 @@
public void setOncomplete(String oncomplete) {
this.oncomplete = oncomplete;
}
- @In(required=false, create=false) @Out(required=false) TreeRootItem treeRoot;
@In(create=true, required=true) @Out
private Shelf shelf;
@@ -78,17 +81,14 @@
public void addShelf(Shelf shelf){
shelfAction.addShelf(shelf);
- addShelfToTree();
//Update conversation state
conversationState.setSelectedImage(null);
conversationState.setSelectedAlbum(null);
conversationState.setSelectedShelf(shelf);
setOncomplete();
+ Events.instance().raiseEvent("clearTree");
}
- private void addShelfToTree() {
- treeRoot.addChild(shelf.getId(), new TreeShelfItem(shelf.getId(), treeRoot, shelf));
- }
public void editShelf(Shelf shelf){
shelfAction.editShelf(shelf);
@@ -102,18 +102,26 @@
directoriesToDelete.add(user.getLogin() + "/" +a.getId());
}
shelfAction.deleteShelf(shelf);
- removeFromTree(shelf);
deleteDirectories(directoriesToDelete);
conversationState.setSelectedImage(null);
conversationState.setSelectedAlbum(null);
conversationState.setSelectedShelf(null);
+ Events.instance().raiseEvent("clearTree");
}
private void deleteDirectories(List<String> directoriesToDelete) {
fileManager.deleteDirectories(directoriesToDelete);
}
-
- private void removeFromTree(Shelf shelf2) {
- treeRoot.removeChild(shelf2.getId());
+
+ public List<Shelf> getShelfs(){
+ if(shelfs == null){
+ shelfs = shelfAction.getShelfs(user);
+ }
+ return shelfs;
}
+
+ @Observer("clearTree")
+ public void clearShelfs(){
+ shelfs = null;
+ }
}
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-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -32,6 +32,7 @@
import org.jboss.seam.annotations.Scope;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.IUserAction;
@@ -107,4 +108,6 @@
countAlbums = i;
countImages = j;
}
+
+
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -22,6 +22,7 @@
public enum NavigationEnum {
IMAGE_PREVIEW("includes/imagePreview.xhtml"),
+ ANONYM("includes/anonimShelfs.xhtml"),
FILE_UPLOAD("includes/fileUpload.xhtml"),
USER_PREFS("includes/userPrefs.xhtml"),
SEARCH("includes/search.xhtml"),
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeAlbumItem.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeAlbumItem.java 2009-03-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeAlbumItem.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -1,111 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package org.richfaces.realworld.tree;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.faces.model.SelectItem;
-
-import org.richfaces.model.TreeNode;
-import org.richfaces.realworld.domain.Album;
-import org.richfaces.realworld.domain.Image;
-import org.richfaces.realworld.service.Constants;
-
-public class TreeAlbumItem implements TreeNode<Object> {
-
- private static final String ALBUM_NODE_TYPE = "album";
-
- private static final long serialVersionUID = 6514596192023597908L;
-
- private long id;
- private Album album;
- TreeNode parent;
-
- public TreeAlbumItem(long id, TreeNode<Object> parent, Album album) {
- this.id = id;
- this.parent = parent;
- this.album = album;
- }
-
- public void addChild(Object identifier, TreeNode<Object> child) {
-
- }
-
- public TreeNode<Object> getChild(Object id) {
- return null;
- }
-
- public Iterator<Map.Entry<Object, TreeNode<Object>>> getChildren() {
- return null;
- }
-
- public Object getData() {
- return this;
- }
-
- public TreeNode<Object> getParent() {
- return parent;
- }
-
- public boolean isLeaf() {
- return true;
- }
-
- public void removeChild(Object id) {
-
- }
-
- public void setData(Object data) {
- }
-
- public void setParent(TreeNode<Object> parent) {
- this.parent = parent;
- }
-
- public long getId() {
- return id;
- }
-
- public Album getAlbum() {
- if(album == null){
- System.out.println();
- }
- return album;
- }
-
- public void setAlbum(Album album) {
- this.album = album;
- }
-
- public String getType() {
- return Constants.ALBUM_NODE_TYPE;
- }
-
- public String toString(){
- return this.getAlbum().getName();
- }
-
-}
-
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeRootItem.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeRootItem.java 2009-03-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeRootItem.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -1,130 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package org.richfaces.realworld.tree;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.faces.model.SelectItem;
-
-import org.jboss.seam.ScopeType;
-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.richfaces.model.TreeNode;
-import org.richfaces.realworld.domain.Album;
-import org.richfaces.realworld.domain.Shelf;
-import org.richfaces.realworld.domain.User;
-import org.richfaces.realworld.service.IUserAction;
-
-@Name("treeRoot")
-(a)Scope(ScopeType.CONVERSATION)
-public class TreeRootItem implements TreeNode {
-
- private static final String TREE_ROOT_NODE_TYPE = "treeRoot";
-
- @In IUserAction userAction;
- @In @Out
- private User user;
-
- private static final long serialVersionUID = -3530085227471752526L;
-
- private Map<Long, TreeNode> childs = null;
-
- public Map<Long, TreeNode> getChilds() {
- if (this.childs==null) {
- initData();
- }
- return this.childs;
- }
-
- public void addChild(Object identifier, TreeNode child) {
- getChilds().put((Long)identifier, (TreeNode)child);
- child.setParent(this);
- }
-
- public TreeNode getChild(Object id) {
- return (TreeNode) childs.get(id);
- }
-
- public Iterator getChildren() {
- return getChilds().entrySet().iterator();
- }
-
- public Object getData() {
- return this;
- }
-
- public TreeNode getParent() {
- return null;
- }
-
- public boolean isLeaf() {
- return getChilds().isEmpty();
- }
-
- public void removeChild(Object id) {
- childs.remove(id);
- }
-
- public void setData(Object data) {
- }
-
- public void setParent(TreeNode parent) {
- }
-
- public String getType() {
- return TREE_ROOT_NODE_TYPE;
- }
-
- private void initData() {
- transformAlbumsToMap();
- }
-
- private void transformAlbumsToMap() {
- childs = new HashMap<Long, TreeNode>();
- for(Shelf shelf:user.getShelfs()){
- TreeShelfItem shelfNode = new TreeShelfItem(shelf.getId(), this, shelf);
- addChild(shelf.getId(), shelfNode);
- }
- for(Album album:userAction.getRootAlbums(user)){
- TreeAlbumItem albumNode = new TreeAlbumItem(album.getId(), this, album);
- addChild(album.getId(), albumNode);
- }
- }
-
- public TreeAlbumItem getAlbumByName(String albumName) {
- for(Map.Entry<Long, TreeNode> entry : getChilds().entrySet()){
- if(entry.getValue() instanceof TreeAlbumItem && ((TreeAlbumItem)entry.getValue()).getAlbum().getName().equals(albumName)){
- return (TreeAlbumItem)entry.getValue();
- }
- }
- return null;
- }
-
- public TreeNode findShelf(Shelf parent) {
- return childs.get(parent.getId());
- }
-}
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeShelfItem.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeShelfItem.java 2009-03-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tree/TreeShelfItem.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -1,96 +0,0 @@
-package org.richfaces.realworld.tree;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.richfaces.model.TreeNode;
-import org.richfaces.realworld.domain.Album;
-import org.richfaces.realworld.domain.Shelf;
-import org.richfaces.realworld.service.Constants;
-
-public class TreeShelfItem implements TreeNode<Object> {
-
-private static final long serialVersionUID = 6514596192023597908L;
-
- private long id;
- private Shelf shelf;
- TreeNode parent;
- private Map<Long, TreeNode> childs = null;
-
- public TreeShelfItem(long id, TreeNode<Object> parent, Shelf shelf) {
- this.id = id;
- this.parent = parent;
- this.shelf = shelf;
- init();
- }
-
- private void init() {
- childs = new HashMap<Long, TreeNode>();
- for(Album album:shelf.getChildAlbums()){
- TreeAlbumItem albumNode = new TreeAlbumItem(album.getId(), this, album);
- addChild(album.getId(), albumNode);
- }
- }
-
- public void addChild(Object identifier, TreeNode<Object> child) {
- getChilds().put((Long)identifier, (TreeNode)child);
- child.setParent(this);
- }
-
- public TreeNode getChild(Object id) {
- return (TreeNode) childs.get(id);
- }
-
- public Iterator getChildren() {
- return getChilds().entrySet().iterator();
- }
-
- public Object getData() {
- return this;
- }
-
- public TreeNode getParent() {
- return parent;
- }
-
- public boolean isLeaf() {
- return getChilds().isEmpty();
- }
-
- public void removeChild(Object id) {
- childs.remove(id);
- }
-
- public void setData(Object data) {
- shelf = (Shelf)data;
- }
-
- public void setParent(TreeNode parent) {
- this.parent = parent;
- }
-
- public String getType() {
- return "shelf";
- }
-
- public Map<Long, TreeNode> getChilds() {
- return childs;
- }
-
- public void setChilds(Map<Long, TreeNode> childs) {
- this.childs = childs;
- }
-
- public Shelf getShelf() {
- return shelf;
- }
-
- public void setShelf(Shelf shelf) {
- this.shelf = shelf;
- }
-
-}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-06 15:20:34 UTC (rev 12861)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-06 15:43:19 UTC (rev 12862)
@@ -46,9 +46,8 @@
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.navigation.NavigationEnum;
import org.richfaces.realworld.service.Constants;
-import org.richfaces.realworld.tree.TreeAlbumItem;
-import org.richfaces.realworld.tree.TreeShelfItem;
+
@Name("conversationState")
@Scope(ScopeType.CONVERSATION)
@Synchronized(timeout=200000)
@@ -298,24 +297,24 @@
@SuppressWarnings("unchecked")
public Boolean adviseNodeSelected(UITree tree) {
- TreeRowKey<Object> treeRowKey = (TreeRowKey<Object>) tree.getRowKey();
- TreeNode<Object> treeNode = (TreeNode<Object>) tree.getRowData(treeRowKey);
- if (treeNode instanceof TreeAlbumItem) {
- TreeAlbumItem currentNode = (TreeAlbumItem) treeNode;
- boolean selected = currentNode.getAlbum() == getSelectedAlbum();
+ Object currentNode = tree.getRowData();
+ if (currentNode instanceof Album) {
+ boolean selected = currentNode == getSelectedAlbum();
return selected;
+ }else if(currentNode instanceof Shelf){
+ return currentNode == getSelectedShelf() && getSelectedAlbum() == null;
}
return null;
}
@SuppressWarnings("unchecked")
public Boolean adviseNodeOpened(UITree tree) {
- TreeRowKey<Object> treeRowKey = (TreeRowKey<Object>) tree.getRowKey();
- TreeNode<Object> treeNode = (TreeNode<Object>) tree.getRowData(treeRowKey);
- if (treeNode instanceof TreeAlbumItem) {
- TreeAlbumItem currentNode = (TreeAlbumItem) treeNode;
- boolean selected = currentNode.getAlbum() == getSelectedAlbum();
+ Object currentNode = tree.getRowData();
+ if (currentNode instanceof Album) {
+ boolean selected = currentNode == getSelectedAlbum();
return selected;
+ }else if(currentNode instanceof Shelf){
+ return currentNode == getSelectedShelf();
}
return null;
}
@@ -323,19 +322,16 @@
@SuppressWarnings("unchecked")
public void processSelection(NodeSelectedEvent event) {
HtmlTree tree = (HtmlTree) event.getComponent();
- TreeNode<Object> currentNode = (TreeNode<Object>)tree.getModelTreeNode(tree.getRowKey());
- if(currentNode instanceof TreeAlbumItem){
+ Object currentNode = tree.getRowData();
+ //TreeNode<Object> currentNode = (TreeNode<Object>)tree.getModelTreeNode(tree.getRowKey());
+ if(currentNode instanceof Album){
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW);
- TreeAlbumItem node = (TreeAlbumItem)currentNode;
- Album album = node.getAlbum();
- setSelectedAlbum(album);
- setSelectedShelf(album.getParent());
- }else if(currentNode instanceof TreeShelfItem){
+ setSelectedAlbum((Album)currentNode);
+ setSelectedShelf(((Album)currentNode).getParent());
+ }else if(currentNode instanceof Shelf){
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW);
- TreeShelfItem node = (TreeShelfItem)currentNode;
- Shelf shelf = node.getShelf();
setSelectedAlbum(null);
- setSelectedShelf(shelf);
+ setSelectedShelf((Shelf)currentNode);
}
setSelectedUser(user);
setSelectedImage(null);
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/anonimShelfs.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/anonimShelfs.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree2.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree2.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/index.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar-backup.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12861 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-03-06 10:20:34 -0500 (Fri, 06 Mar 2009)
New Revision: 12861
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
https://jira.jboss.org/jira/browse/RF-6476
part 1
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2009-03-06 15:01:39 UTC (rev 12860)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2009-03-06 15:20:34 UTC (rev 12861)
@@ -1549,18 +1549,30 @@
getQueryString : function() {
var qs = "";
var iname ;
+ var querySegments = [];
+ var paramName;
for ( var k in this._query ){
if(typeof Object.prototype[k] == 'undefined'){
iname = this._query[k];
+ paramName = this._encode(k);
if( iname instanceof Object ){
for ( var l=0; l< iname.length; l++ ) {
- qs += this._encode(k) + "=" + this._encode(iname[l]) + "&";
+ querySegments.push(paramName);
+ querySegments.push("=");
+ querySegments.push(this._encode(iname[l]));
+ querySegments.push("&");
}
} else {
- qs += this._encode(k) + "=" + this._encode(iname) + "&";
+ querySegments.push(paramName);
+ querySegments.push("=");
+ querySegments.push(this._encode(iname));
+ querySegments.push("&");
}
}
}
+
+ qs = querySegments.join("");
+
LOG.debug("QueryString: "+qs);
return qs;
},
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12860 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-03-06 10:01:39 -0500 (Fri, 06 Mar 2009)
New Revision: 12860
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxInclude/ajaxIncludeAutoTest.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxIncludeTest.java
Log:
RF-6308 RF-6307
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxInclude/ajaxIncludeAutoTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxInclude/ajaxIncludeAutoTest.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxInclude/ajaxIncludeAutoTest.xhtml 2009-03-06 15:01:39 UTC (rev 12860)
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.autoTestTemplate}">
+ <ui:define name="component">
+ <a4j:include id="componentId" rendered="#{autoTestBean.rendered}"
+ viewId="/pages/ajaxInclude/step2.xhtml"
+ style="width: 100%; color: yellow"
+ styleClass="noname"
+ onclick="EventQueue.fire('onclick')"
+ onmousedown="EventQueue.fire('onmousedown')"
+ onmousemove="EventQueue.fire('onmousemove')"
+ onmouseup="EventQueue.fire('onmouseup')"
+ onmouseout="EventQueue.fire('onmouseout')"
+ onmouseover="EventQueue.fire('onmouseover')"
+ onkeydown="EventQueue.fire('onkeydown')"
+ onkeypress="EventQueue.fire('onkeypress')"
+ onkeyup="EventQueue.fire('onkeyup')"
+ />
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxIncludeTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxIncludeTest.java 2009-03-06 13:13:46 UTC (rev 12859)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxIncludeTest.java 2009-03-06 15:01:39 UTC (rev 12860)
@@ -119,7 +119,7 @@
* component with rendered = false is not present on the page,
* style and classes, standard HTML attributes are output to client
*/
- //@Test
+ @Test
public void testStandardAttributes(Template template) {
AutoTester autoTester = getAutoTester(this);
autoTester.renderPage(template, null);
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12859 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2009-03-06 08:13:46 -0500 (Fri, 06 Mar 2009)
New Revision: 12859
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml
trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml
trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml
trunk/docs/userguide/en/src/main/docbook/included/poll.xml
Log:
RF-5118 - The <a4j:actionparam> and <rich:dragIndicator> components names had been corrected in the dev guide.
Modified: trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2009-03-06 13:04:58 UTC (rev 12858)
+++ trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2009-03-06 13:13:46 UTC (rev 12859)
@@ -117,7 +117,7 @@
<programlisting role="XML"><![CDATA[...
<h:column>
<rich:dragSupport dragIndicator=":form:iii" dragType="text">
- <a4j:actionParam value="#{caps.name}" name="name"/>
+ <a4j:actionparam value="#{caps.name}" name="name"/>
</rich:dragSupport>
<h:outputText value="#{caps.name}"/>
</h:column>
@@ -140,7 +140,7 @@
<h:column>
<a4j:outputPanel>
<rich:dragSupport dragIndicator=":form:iii" dragType="text">
- <a4j:actionParam value="#{caps.name}" name="name"/>
+ <a4j:actionparam value="#{caps.name}" name="name"/>
</rich:dragSupport>
<h:outputText value="#{caps.name}"/>
</a4j:outputPanel>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2009-03-06 13:04:58 UTC (rev 12858)
+++ trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2009-03-06 13:13:46 UTC (rev 12859)
@@ -145,7 +145,7 @@
]]></programlisting>
<para>What happens on the page:</para>
<figure>
- <title>"typeMapping" helps to add some extra information to <rich:drag indicator> </title>
+ <title><emphasis><property>"typeMapping"</property></emphasis> helps to add some extra information to <emphasis role="bold"><property><rich:dragIndicator></property></emphasis> </title>
<mediaobject>
<imageobject>
<imagedata fileref="images/dropSupport1a.png" />
@@ -181,7 +181,7 @@
<h:column>
<a4j:outputPanel>
<rich:dragSupport dragIndicator=":form:ind" dragType="text">
- <a4j:actionParam value="#{caps.name}" name="name"/>
+ <a4j:actionparam value="#{caps.name}" name="name"/>
</rich:dragSupport>
<h:outputText value="#{caps.name}"/>
</a4j:outputPanel>
Modified: trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml 2009-03-06 13:04:58 UTC (rev 12858)
+++ trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml 2009-03-06 13:13:46 UTC (rev 12859)
@@ -86,7 +86,7 @@
...
<a4j:jsFunction name="callScript" data="#{bean.someProperty1}"
reRender="someComponent" oncomplete="myScript(data.subProperty1, data.subProperty2)">
- <a4j:actionParam name="param_name" assignTo="#{bean.someProperty2}"/>
+ <a4j:actionparam name="param_name" assignTo="#{bean.someProperty2}"/>
</a4j:jsFunction>
...
</h:form>
@@ -96,7 +96,7 @@
<para> The <emphasis role="bold">
<property><a4j:jsFunction></property>
</emphasis> allows to use <emphasis role="bold">
- <property><a4j:actionParam></property>
+ <property><a4j:actionparam></property>
</emphasis> or pure <emphasis role="bold">
<property><f:param></property>
</emphasis> for passing any number of parameters of the JavaScript function into Ajax request.
Modified: trunk/docs/userguide/en/src/main/docbook/included/poll.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/poll.xml 2009-03-06 13:04:58 UTC (rev 12858)
+++ trunk/docs/userguide/en/src/main/docbook/included/poll.xml 2009-03-06 13:13:46 UTC (rev 12859)
@@ -119,7 +119,7 @@
<a4j:commandButton style="width:120px" id="control"
value="#{userBean.pollEnabled?'Stop':'Start'} Polling"
reRender="poll, grid">
- <a4j:actionParam name="polling" value="#{!userBean.pollEnabled}"
+ <a4j:actionparam name="polling" value="#{!userBean.pollEnabled}"
assignTo="#{userBean.pollEnabled}"/>
</a4j:commandButton>
</h:panelGrid>
@@ -203,14 +203,14 @@
</ulink>
how to create a HTML banner.
</para>
- <para>
+ <para>
<ulink url="http://wiki.jboss.org/auth/wiki/RichFacesCookbook/SlideShow">Here</ulink>
you can find information how to make a Slide Show with help of the
<emphasis role="bold">
<property><rich:effect></property></emphasis>
and <emphasis role="bold">
<property><a4j:poll></property>
- </emphasis> components.
+ </emphasis> components.
</para>
<para>
<ulink
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12858 - trunk/test-applications/realworld2/web/src/main/webapp/includes/image.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-06 08:04:58 -0500 (Fri, 06 Mar 2009)
New Revision: 12858
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageEditBlock.xhtml
Log:
correct syntax
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageEditBlock.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12857 - in trunk/test-applications/realworld2/web/src/main: webapp/includes/image and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-06 08:02:11 -0500 (Fri, 06 Mar 2009)
New Revision: 12857
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageEditBlock.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml
Log:
Realworld: update image editing markup and functionality
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-06 13:02:03 UTC (rev 12856)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-06 13:02:11 UTC (rev 12857)
@@ -70,8 +70,8 @@
public void editImage(Image image){
imageAction.editImage(image);
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
Events.instance().raiseEvent("imageEdited");
- Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
}
@Observer(Constants.ADD_IMAGE_EVENT)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageEditBlock.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12856 - in trunk/test-applications/realworld2/ejb/src/main: java/org/richfaces/realworld/service and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-06 08:02:03 -0500 (Fri, 06 Mar 2009)
New Revision: 12856
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
Log:
Realworld: update image editing markup and functionality
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-03-06 11:51:05 UTC (rev 12855)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-03-06 13:02:03 UTC (rev 12856)
@@ -149,6 +149,9 @@
inverseJoinColumns = @JoinColumn(name = "USER_ID")
)
private List<User> sharedOwners = new ArrayList<User>();
+
+ @NotNull
+ private boolean allowComments;
// ********************** Accessor Methods ********************** //
@@ -341,4 +344,20 @@
imageTags.remove(metatag);
}
}
+
+ /**
+ * @return the allowComments
+ */
+ public boolean isAllowComments() {
+ return allowComments;
+ }
+
+ /**
+ * @param allowCommennts the allowComments to set
+ */
+ public void setAllowComments(boolean allowComments) {
+ this.allowComments = allowComments;
+ }
+
+
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-03-06 11:51:05 UTC (rev 12855)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-03-06 13:02:03 UTC (rev 12856)
@@ -52,7 +52,7 @@
}
image.getImageTags().clear();
setTags(image, image.getMeta());*/
- image.setImageTags(null);
+ /*image.setImageTags(null);
String[] tokens = image.getMeta().split(",");
for(String token:tokens){
MetaTag t =(MetaTag) em.createQuery("from MetaTag t where t.tag =:token").setParameter("token", token).getSingleResult();
@@ -65,7 +65,7 @@
t.addImage(image);
image.addMetaTag(t);
}
- }
+ }*/
em.flush();
}
Modified: trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-06 11:51:05 UTC (rev 12855)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-06 13:02:03 UTC (rev 12856)
@@ -18,95 +18,95 @@
INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (27, 'Very very very very very very very long album name ', 'Long name test', true, 1, 2, '2008-12-18');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (1, 'korana', 'Viking/15/korana.jpg', 'korana', '2008-12-18', 15, 'Canon S3', 1024, 1917.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (2, 'korana2', 'Viking/15/korana2.jpg', 'korana2', '2008-12-18', 15, 'Canon S3', 1024, 949.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (3, 'Re4ka', 'Viking/15/Re4ka.jpg', 'Re4ka', '2008-12-18', 15, 'Canon S3', 1024, 412.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (4, 'river10', 'Viking/15/river10.jpg', 'river10', '2008-12-18', 15, 'Canon S3', 1024, 276.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (5, 'river11', 'Viking/15/river11.jpg', 'river11', '2008-12-18', 15, 'Canon S3', 1024, 187.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (6, 'river12', 'Viking/15/river12.jpg', 'river12', '2008-12-18', 15, 'Canon S3', 1024, 265.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (7, 'river13', 'Viking/15/river13.jpg', 'river13', '2008-12-18', 15, 'Canon S3', 1024, 106.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (8, 'river2', 'Viking/15/river2.jpg', 'river2', '2008-12-18', 15, 'Canon S3', 1024, 130.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (9, 'river3', 'Viking/15/river3.jpg', 'river3', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (10, 'river4', 'Viking/15/river4.jpg', 'river4', '2008-12-18', 15, 'Canon S3', 1024, 267.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (11, 'river5', 'Viking/15/river5.jpg', 'river5', '2008-12-18', 15, 'Canon S3', 1024, 176.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (12, 'river6', 'Viking/15/river6.jpg', 'river6', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (13, 'river7', 'Viking/15/river7.jpg', 'river7', '2008-12-18', 15, 'Canon S3', 1024, 201.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (14, 'river8', 'Viking/15/river8.jpg', 'river8', '2008-12-18', 15, 'Canon S3', 1024, 278.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (15, 'river9', 'Viking/15/river9.jpg', 'river9', '2008-12-18', 15, 'Canon S3', 1024, 210.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (16, 'river_and_torrents', 'Viking/15/river_and_torrents.jpg', 'river_and_torrents', '2008-12-18', 15, 'Canon S3', 1024, 161.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (1, 'korana', 'Viking/15/korana.jpg', 'korana', '2008-12-18', 15, 'Canon S3', 1024, 1917.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (2, 'korana2', 'Viking/15/korana2.jpg', 'korana2', '2008-12-18', 15, 'Canon S3', 1024, 949.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (3, 'Re4ka', 'Viking/15/Re4ka.jpg', 'Re4ka', '2008-12-18', 15, 'Canon S3', 1024, 412.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (4, 'river10', 'Viking/15/river10.jpg', 'river10', '2008-12-18', 15, 'Canon S3', 1024, 276.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (5, 'river11', 'Viking/15/river11.jpg', 'river11', '2008-12-18', 15, 'Canon S3', 1024, 187.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (6, 'river12', 'Viking/15/river12.jpg', 'river12', '2008-12-18', 15, 'Canon S3', 1024, 265.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (7, 'river13', 'Viking/15/river13.jpg', 'river13', '2008-12-18', 15, 'Canon S3', 1024, 106.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (8, 'river2', 'Viking/15/river2.jpg', 'river2', '2008-12-18', 15, 'Canon S3', 1024, 130.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (9, 'river3', 'Viking/15/river3.jpg', 'river3', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (10, 'river4', 'Viking/15/river4.jpg', 'river4', '2008-12-18', 15, 'Canon S3', 1024, 267.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (11, 'river5', 'Viking/15/river5.jpg', 'river5', '2008-12-18', 15, 'Canon S3', 1024, 176.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (12, 'river6', 'Viking/15/river6.jpg', 'river6', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (13, 'river7', 'Viking/15/river7.jpg', 'river7', '2008-12-18', 15, 'Canon S3', 1024, 201.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (14, 'river8', 'Viking/15/river8.jpg', 'river8', '2008-12-18', 15, 'Canon S3', 1024, 278.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (15, 'river9', 'Viking/15/river9.jpg', 'river9', '2008-12-18', 15, 'Canon S3', 1024, 210.000000, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (16, 'river_and_torrents', 'Viking/15/river_and_torrents.jpg', 'river_and_torrents', '2008-12-18', 15, 'Canon S3', 1024, 161.000000, 768, '2008-12-01', true);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (17, 'Sport1', 'amarkhel/20/sport.jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (18, 'Sport1', 'amarkhel/20/sport (1).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (19, 'Sport1', 'amarkhel/20/sport (2).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (20, 'Sport1', 'amarkhel/20/sport (3).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (21, 'Sport1', 'amarkhel/20/sport (4).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (22, 'Sport1', 'amarkhel/20/sport (5).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (23, 'Sport1', 'amarkhel/20/sport (6).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (24, 'Sport1', 'amarkhel/20/sport (7).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (25, 'Sport1', 'amarkhel/20/sport (8).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (26, 'Sport1', 'amarkhel/20/sport (9).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (27, 'Sport1', 'amarkhel/20/sport (10).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (28, 'Sport1', 'amarkhel/20/sport (11).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (29, 'Sport1', 'amarkhel/20/sport (12).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (30, 'Sport1', 'amarkhel/20/sport (13).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (31, 'Sport1', 'amarkhel/20/sport (14).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (32, 'Sport1', 'amarkhel/20/sport (15).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (33, 'Sport1', 'amarkhel/20/sport (16).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (34, 'Sport1', 'amarkhel/20/sport (17).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (17, 'Sport1', 'amarkhel/20/sport.jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (18, 'Sport1', 'amarkhel/20/sport (1).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', false);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (19, 'Sport1', 'amarkhel/20/sport (2).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (20, 'Sport1', 'amarkhel/20/sport (3).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (21, 'Sport1', 'amarkhel/20/sport (4).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (22, 'Sport1', 'amarkhel/20/sport (5).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (23, 'Sport1', 'amarkhel/20/sport (6).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (24, 'Sport1', 'amarkhel/20/sport (7).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (25, 'Sport1', 'amarkhel/20/sport (8).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (26, 'Sport1', 'amarkhel/20/sport (9).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (27, 'Sport1', 'amarkhel/20/sport (10).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (28, 'Sport1', 'amarkhel/20/sport (11).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (29, 'Sport1', 'amarkhel/20/sport (12).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (30, 'Sport1', 'amarkhel/20/sport (13).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (31, 'Sport1', 'amarkhel/20/sport (14).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (32, 'Sport1', 'amarkhel/20/sport (15).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (33, 'Sport1', 'amarkhel/20/sport (16).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (34, 'Sport1', 'amarkhel/20/sport (17).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (35, 'Fun', 'amarkhel/23/travel.jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 627, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (36, 'Fun', 'amarkhel/23/travel (1).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1200, 20, 800, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (37, 'Fun', 'amarkhel/23/travel (2).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1200, 20, 800, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (38, 'Fun', 'amarkhel/23/travel (3).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 747, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (39, 'Fun', 'amarkhel/23/travel (4).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (40, 'Fun', 'amarkhel/23/travel (5).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 1075, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (41, 'Fun', 'amarkhel/23/travel (6).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 760, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (42, 'Fun', 'amarkhel/23/travel (7).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 1023, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (43, 'Fun', 'amarkhel/23/travel (8).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 723, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (44, 'Fun', 'amarkhel/23/travel (9).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1028, 20, 967, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (45, 'Fun', 'amarkhel/23/travel (10).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 622, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (46, 'Fun', 'amarkhel/23/travel (11).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (47, 'Fun', 'amarkhel/23/travel (12).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (48, 'Fun', 'amarkhel/23/travel (13).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (49, 'Fun', 'amarkhel/23/travel (14).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (50, 'Fun', 'amarkhel/23/travel (15).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1036, 20, 1036, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (51, 'Fun', 'amarkhel/23/travel (16).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 627, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (35, 'Fun', 'amarkhel/23/travel.jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 627, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (36, 'Fun', 'amarkhel/23/travel (1).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1200, 20, 800, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (37, 'Fun', 'amarkhel/23/travel (2).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1200, 20, 800, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (38, 'Fun', 'amarkhel/23/travel (3).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 747, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (39, 'Fun', 'amarkhel/23/travel (4).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (40, 'Fun', 'amarkhel/23/travel (5).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 1075, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (41, 'Fun', 'amarkhel/23/travel (6).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 760, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (42, 'Fun', 'amarkhel/23/travel (7).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 1023, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (43, 'Fun', 'amarkhel/23/travel (8).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 723, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (44, 'Fun', 'amarkhel/23/travel (9).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1028, 20, 967, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (45, 'Fun', 'amarkhel/23/travel (10).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 622, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (46, 'Fun', 'amarkhel/23/travel (11).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (47, 'Fun', 'amarkhel/23/travel (12).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (48, 'Fun', 'amarkhel/23/travel (13).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (49, 'Fun', 'amarkhel/23/travel (14).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (50, 'Fun', 'amarkhel/23/travel (15).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1036, 20, 1036, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (51, 'Fun', 'amarkhel/23/travel (16).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 627, '2008-12-01', true);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (52, 'Fun', 'amarkhel/25/beach (1).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 850, 20, 600, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (53, 'Fun', 'amarkhel/25/beach (2).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 800, 20, 600, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (54, 'Fun', 'amarkhel/25/beach (3).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 768, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (55, 'Fun', 'amarkhel/25/beach (4).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1600, 20, 1200, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (56, 'Fun', 'amarkhel/25/beach (5).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1000, 20, 807, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (57, 'Fun', 'amarkhel/25/beach (6).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 608, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (58, 'Fun', 'amarkhel/25/beach (7).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 768, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (59, 'Fun', 'amarkhel/25/beach (8).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 668, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (60, 'Fun', 'amarkhel/25/beach (9).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 800, 20, 553, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (61, 'Fun', 'amarkhel/25/beach (10).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 603, 20, 900, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (62, 'Fun', 'amarkhel/25/beach (11).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1023, 20, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (63, 'Fun', 'amarkhel/25/beach (12).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 732, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (64, 'Fun', 'amarkhel/25/beach (13).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 660, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (65, 'Fun', 'amarkhel/25/beach (14).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 681, 20, 1025, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (66, 'Fun', 'amarkhel/25/beach.jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 940, 20, 625, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (52, 'Fun', 'amarkhel/25/beach (1).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 850, 20, 600, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (53, 'Fun', 'amarkhel/25/beach (2).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 800, 20, 600, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (54, 'Fun', 'amarkhel/25/beach (3).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 768, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (55, 'Fun', 'amarkhel/25/beach (4).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1600, 20, 1200, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (56, 'Fun', 'amarkhel/25/beach (5).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1000, 20, 807, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (57, 'Fun', 'amarkhel/25/beach (6).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 608, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (58, 'Fun', 'amarkhel/25/beach (7).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 768, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (59, 'Fun', 'amarkhel/25/beach (8).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 668, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (60, 'Fun', 'amarkhel/25/beach (9).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 800, 20, 553, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (61, 'Fun', 'amarkhel/25/beach (10).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 603, 20, 900, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (62, 'Fun', 'amarkhel/25/beach (11).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1023, 20, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (63, 'Fun', 'amarkhel/25/beach (12).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 732, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (64, 'Fun', 'amarkhel/25/beach (13).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 660, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (65, 'Fun', 'amarkhel/25/beach (14).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 681, 20, 1025, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (66, 'Fun', 'amarkhel/25/beach.jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 940, 20, 625, '2008-12-01', true);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (67, 'Fun', 'Noname/26/flowers (1).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (68, 'Fun', 'Noname/26/flowers (2).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 683, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (69, 'Fun', 'Noname/26/flowers (3).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (70, 'Fun', 'Noname/26/flowers (4).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 900, 20, 602, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (71, 'Fun', 'Noname/26/flowers (5).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 686, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (72, 'Fun', 'Noname/26/flowers (6).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 800, 20, 600, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (73, 'Fun', 'Noname/26/flowers (7).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1200, 20, 969, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (74, 'Fun', 'Noname/26/flowers (8).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 821, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (75, 'Fun', 'Noname/26/flowers (9).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (76, 'Fun', 'Noname/26/flowers (10).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 912, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (77, 'Fun', 'Noname/26/flowers (11).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 663, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (78, 'Fun', 'Noname/26/flowers (12).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (79, 'Fun', 'Noname/26/flowers (13).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 700, 20, 1052, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (80, 'Fun', 'Noname/26/flowers (14).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 906, 20, 1024, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (81, 'Fun', 'Noname/26/flowers (15).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (82, 'Fun', 'Noname/26/flowers (16).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1206, 20, 868, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded) VALUES (83, 'Fun', 'Noname/26/flowers.jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 582, 20, 800, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (67, 'Fun', 'Noname/26/flowers (1).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (68, 'Fun', 'Noname/26/flowers (2).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 683, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (69, 'Fun', 'Noname/26/flowers (3).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (70, 'Fun', 'Noname/26/flowers (4).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 900, 20, 602, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (71, 'Fun', 'Noname/26/flowers (5).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 686, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (72, 'Fun', 'Noname/26/flowers (6).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 800, 20, 600, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (73, 'Fun', 'Noname/26/flowers (7).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1200, 20, 969, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (74, 'Fun', 'Noname/26/flowers (8).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 821, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (75, 'Fun', 'Noname/26/flowers (9).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (76, 'Fun', 'Noname/26/flowers (10).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 912, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (77, 'Fun', 'Noname/26/flowers (11).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 663, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (78, 'Fun', 'Noname/26/flowers (12).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (79, 'Fun', 'Noname/26/flowers (13).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 700, 20, 1052, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (80, 'Fun', 'Noname/26/flowers (14).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 906, 20, 1024, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (81, 'Fun', 'Noname/26/flowers (15).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (82, 'Fun', 'Noname/26/flowers (16).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1206, 20, 868, '2008-12-01', true);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (83, 'Fun', 'Noname/26/flowers.jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 582, 20, 800, '2008-12-01', true);
INSERT INTO metatags(metatag_id, tag) VALUES (1, 'Beach');
INSERT INTO metatags(metatag_id, tag) VALUES (2, 'Cool');
15 years, 2 months
- 1
- 0