Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -59,6 +59,7 @@
 label.authoring.advance.number.columns  =Columns to display images
 label.authoring.advance.allow.learner.share.images  =Allow learners to share their images
 label.authoring.advance.allow.learner.comment.images  =Allow learners to comment on images
+label.authoring.advance.allow.learner.ratings.or.vote  =Ratings or Vote
 label.authoring.advance.allow.learner.vote  =Allow learners to vote for their favorite images
 label.authoring.advance.allow.learner.rank  =Allow learners to rank the images
 label.authoring.cancel.button  =Cancel
@@ -76,8 +77,11 @@
 error.msg.upload.file.not.found  =Could not find upload file {0}.
 error.msg.zip.file.exception  =Could not handle zip file when uploading file.
 error.msg.file.not.found  =File not found exception occurs when uploading file.
-error.msg.ims.application  =ImscpApplicationException occurs when uploading resource item file.
+error.msg.ims.application  =ImscpApplicationException occurs when uploading original size image.
 error.msg.io.exception  =IOException occurs when uploading file.
+error.msg.repository.checked.exception  =Repository checked exception occurs when creating a smaller scale image.
+error.msg.item.not.found.exception  =Item not found exception occurs when creating a smaller scale image.
+error.msg.file.exception  =File exception occurs when creating a smaller scale image.
 error.msg.invaid.param.upload  =InvalidParameterException occured while trying to upload File.
 error.msg.default.content.not.find  =Could not retrieve default content record for this tool.
 authoring.msg.cancel.save  =Do you want to close this window without saving?
Index: lams_tool_images/db/sql/create_lams_tool_imageGallery.sql
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/db/sql/create_lams_tool_imageGallery.sql	(.../create_lams_tool_imageGallery.sql)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/db/sql/create_lams_tool_imageGallery.sql	(.../create_lams_tool_imageGallery.sql)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -6,14 +6,14 @@
 drop table if exists tl_laimag10_session;
 drop table if exists tl_laimag10_user;
 create table tl_laimag10_attachment (
-   uid bigint not null auto_increment,
+   attachment_uid bigint not null auto_increment,
    file_version_id bigint,
    file_type varchar(255),
    file_name varchar(255),
    file_uuid bigint,
    create_date datetime,
    imageGallery_uid bigint,
-   primary key (uid)
+   primary key (attachment_uid)
 )type=innodb;
 create table tl_laimag10_imageGallery (
    uid bigint not null auto_increment,
@@ -41,21 +41,21 @@
 )type=innodb;
 create table tl_laimag10_imageGallery_item (
    uid bigint not null auto_increment,
-   file_uuid bigint,
-   file_version_id bigint,
    description varchar(255),
    title varchar(255),
-   url text,
    create_by bigint,
    create_date datetime,
    create_by_author tinyint,
    sequence_id integer,
    is_hide tinyint,
-   file_type varchar(255),
-   file_name varchar(255),
-   open_url_new_window tinyint,
    imageGallery_uid bigint,
    session_uid bigint,
+   original_file_uuid bigint,
+   medium_file_uuid bigint,
+   thumbnail_file_uuid bigint,
+   file_version_id bigint,
+   file_type varchar(255),
+   file_name varchar(255),
    primary key (uid)
 )type=innodb;
 create table tl_laimag10_item_log (
@@ -106,7 +106,4 @@
  `allow_share_images`, `allow_vote`, `allow_rank`, `reflect_on_activity`) VALUES
   (1,NULL,NULL,NULL,'ImageGallery','0','0','Instructions ',1,null,null,0,0,${default_content_id},0,0,0,0,0);
   
-INSERT INTO `tl_laimag10_imageGallery_item` (`uid`, `file_uuid`, `file_version_id`, `description`, `title`, `url`, `create_by`, `create_date`, `create_by_author`, `sequence_id`, `is_hide`, `file_type`, `file_name`, `open_url_new_window`, `imageGallery_uid`, `session_uid`) VALUES 
-  (1,NULL,NULL,NULL,'Web Search','http://www.google.com ',null,NOW(),1,1,0,NULL,NULL,0,1,NULL);
-    
 SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_images/db/sql/table-schema.sql
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -17,7 +17,7 @@
 create table tl_laimag10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, imageGallery_uid bigint, primary key (uid));
 create table tl_laimag10_item_log (uid bigint not null auto_increment, access_date datetime, imageGallery_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid));
 create table tl_laimag10_imageGallery (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions text, next_image_title bigint, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_comment_images bit, allow_share_images bit, number_columns integer DEFAULT 3, allow_vote bit, reflect_instructions varchar(255), reflect_on_activity bit,allow_rank tinyint DEFAULT 0, primary key (uid));
-create table tl_laimag10_imageGallery_item (uid bigint not null auto_increment, file_uuid bigint, file_version_id bigint, description varchar(255), title varchar(255), url text, create_by bigint, create_date datetime, create_by_author bit, sequence_id integer, is_hide bit, file_type varchar(255), file_name varchar(255), open_url_new_window bit, imageGallery_uid bigint, session_uid bigint, primary key (uid));
+create table tl_laimag10_imageGallery_item (uid bigint not null auto_increment, description varchar(255), title varchar(255), create_by bigint, create_date datetime, create_by_author bit, sequence_id integer, is_hide bit, imageGallery_uid bigint, session_uid bigint, original_file_uuid bigint, medium_file_uuid bigint, thumbnail_file_uuid bigint, file_version_id bigint, file_type varchar(255), file_name varchar(255), primary key (uid));
 create table tl_laimag10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, imageGallery_uid bigint, session_id bigint, session_name varchar(250), primary key (uid));
 create table tl_laimag10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, imageGallery_uid bigint, session_finished bit, primary key (uid));
 alter table tl_laimag10_attachment add index FK_NEW_1821149711_1E7009430E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_1E7009430E79035 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	(.../Summary.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	(.../Summary.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -60,7 +60,6 @@
     private int viewNumber;
 
     // following is used for export portfolio programs:
-    private String url;
     private Long fileUuid;
     private Long fileVersionId;
     private String fileName;
@@ -90,9 +89,8 @@
 	    this.itemHide = item.isHide();
 	    this.itemTitle = item.getTitle();
 	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName();
-	    this.url = ImageGalleryWebUtils.protocol(item.getUrl());
 	    this.fileName = item.getFileName();
-	    this.fileUuid = item.getFileUuid();
+	    this.fileUuid = item.getOriginalFileUuid();
 	    this.fileVersionId = item.getFileVersionId();
 	} else {
 	    this.itemUid = new Long(-1);
@@ -117,9 +115,8 @@
 	    this.itemHide = item.isHide();
 	    this.itemTitle = item.getTitle();
 	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName();
-	    this.url = ImageGalleryWebUtils.protocol(item.getUrl());
 	    this.fileName = item.getFileName();
-	    this.fileUuid = item.getFileUuid();
+	    this.fileUuid = item.getOriginalFileUuid();
 	    this.fileVersionId = item.getFileVersionId();
 
 	} else {
@@ -208,14 +205,6 @@
 	this.fileVersionId = fileVersionId;
     }
 
-    public String getUrl() {
-	return url;
-    }
-
-    public void setUrl(String url) {
-	this.url = url;
-    }
-
     public boolean isInitGroup() {
 	return isInitGroup;
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	(.../ImageGallery.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	(.../ImageGallery.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -516,7 +516,7 @@
     }
 
     public void setNumberColumns(int numberColumns) {
-	numberColumns = numberColumns;
+	this.numberColumns = numberColumns;
     }
 
     /**
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.hbm.xml
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.hbm.xml	(.../ImageGalleryAttachment.hbm.xml)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.hbm.xml	(.../ImageGalleryAttachment.hbm.xml)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -13,7 +13,7 @@
 
         <id
             name="uid"
-            column="uid"
+            column="attachment_uid"
             type="java.lang.Long"
         >
             <generator class="native">
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.java	(.../ImageGalleryAttachment.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.java	(.../ImageGalleryAttachment.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -95,7 +95,7 @@
     // get/set methods
     // **********************************************************
     /**
-     * @hibernate.id column="uid" generator-class="native"
+     * @hibernate.id column="attachment_uid" generator-class="native"
      */
     public Long getUid() {
 	return uid;
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml	(.../ImageGalleryItem.hbm.xml)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml	(.../ImageGalleryItem.hbm.xml)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -26,53 +26,76 @@
         </id>
 
         <property
-            name="fileUuid"
+            name="title"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="title"
+            length="255"
+        />
+
+        <property
+            name="description"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="description"
+        />
+
+        <property
+            name="sequenceId"
+            type="int"
+            update="true"
+            insert="true"
+            column="sequence_id"
+        />
+
+        <property
+            name="originalFileUuid"
             type="java.lang.Long"
             update="true"
             insert="true"
-            column="file_uuid"
+            column="original_file_uuid"
         />
 
         <property
-            name="fileVersionId"
+            name="mediumFileUuid"
             type="java.lang.Long"
             update="true"
             insert="true"
-            column="file_version_id"
+            column="medium_file_uuid"
         />
 
         <property
-            name="description"
-            type="java.lang.String"
+            name="thumbnailFileUuid"
+            type="java.lang.Long"
             update="true"
             insert="true"
-            column="description"
+            column="thumbnail_file_uuid"
         />
 
         <property
-            name="sequenceId"
-            type="int"
+            name="fileVersionId"
+            type="java.lang.Long"
             update="true"
             insert="true"
-            column="sequence_id"
+            column="file_version_id"
         />
 
         <property
-            name="title"
+            name="fileType"
             type="java.lang.String"
             update="true"
             insert="true"
-            column="title"
-            length="255"
+            column="file_type"
         />
 
         <property
-            name="url"
+            name="fileName"
             type="java.lang.String"
             update="true"
             insert="true"
-            column="url"
-            length="65535"
+            column="file_name"
         />
 
         <many-to-one
@@ -109,30 +132,6 @@
             column="is_hide"
         />
 
-        <property
-            name="fileType"
-            type="java.lang.String"
-            update="true"
-            insert="true"
-            column="file_type"
-        />
-
-        <property
-            name="fileName"
-            type="java.lang.String"
-            update="true"
-            insert="true"
-            column="file_name"
-        />
-
-        <property
-            name="openUrlNewWindow"
-            type="boolean"
-            update="true"
-            insert="true"
-            column="open_url_new_window"
-        />
-
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ImageGalleryItem.xml
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	(.../ImageGalleryItem.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	(.../ImageGalleryItem.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -33,12 +33,13 @@
 /**
  * ImageGallery
  * 
- * @author Dapeng Ni
- * 
  * @hibernate.class table="tl_laimag10_imageGallery_item"
  * 
+ * @author Andrey Balan
+ * 
  */
 public class ImageGalleryItem implements Cloneable {
+
     private static final Logger log = Logger.getLogger(ImageGalleryItem.class);
 
     private Long uid;
@@ -49,12 +50,12 @@
 
     private int sequenceId;
 
-    private String url;
+    private Long originalFileUuid;
+    
+    private Long mediumFileUuid;
+    
+    private Long thumbnailFileUuid;
 
-    private boolean openUrlNewWindow;
-
-    private Long fileUuid;
-
     private Long fileVersionId;
 
     private String fileName;
@@ -73,20 +74,20 @@
 
     @Override
     public Object clone() {
-	ImageGalleryItem obj = null;
+	ImageGalleryItem image = null;
 	try {
-	    obj = (ImageGalleryItem) super.clone();
-	    (obj).setUid(null);
-	    // clone ReourceUser as well
+	    image = (ImageGalleryItem) super.clone();
+	    image.setUid(null);
+	    // clone ImageGalleryUser as well
 	    if (this.createBy != null) {
-		(obj).setCreateBy((ImageGalleryUser) this.createBy.clone());
+		image.setCreateBy((ImageGalleryUser) this.createBy.clone());
 	    }
 
 	} catch (CloneNotSupportedException e) {
 	    ImageGalleryItem.log.error("When clone " + ImageGalleryItem.class + " failed");
 	}
 
-	return obj;
+	return image;
     }
 
     // **********************************************************
@@ -109,31 +110,18 @@
     }
 
     /**
-     * @hibernate.property column="file_uuid"
-     * 
+     * @hibernate.property column="title" length="255"
      * @return
      */
-    public Long getFileUuid() {
-	return fileUuid;
+    public String getTitle() {
+	return title;
     }
 
-    public void setFileUuid(Long crUuid) {
-	this.fileUuid = crUuid;
+    public void setTitle(String title) {
+	this.title = title;
     }
 
     /**
-     * @hibernate.property column="file_version_id"
-     * @return
-     */
-    public Long getFileVersionId() {
-	return fileVersionId;
-    }
-
-    public void setFileVersionId(Long crVersionId) {
-	this.fileVersionId = crVersionId;
-    }
-
-    /**
      * @hibernate.property column="description"
      * @return
      */
@@ -146,9 +134,9 @@
     }
 
     /**
-     * Returns taskListItem sequence number.
+     * Returns image sequence number.
      * 
-     * @return taskListItem sequence number
+     * @return image sequence number
      * 
      * @hibernate.property column="sequence_id"
      */
@@ -157,40 +145,89 @@
     }
 
     /**
-     * Sets taskListItem sequence number.
+     * Sets image sequence number.
      * 
      * @param sequenceId
-     *                taskListItem sequence number
+     *                image sequence number
      */
     public void setSequenceId(int sequenceId) {
 	this.sequenceId = sequenceId;
     }
 
     /**
-     * @hibernate.property column="title" length="255"
+     * @hibernate.property column="original_file_uuid"
+     * 
      * @return
      */
-    public String getTitle() {
-	return title;
+    public Long getOriginalFileUuid() {
+	return originalFileUuid;
     }
 
-    public void setTitle(String title) {
-	this.title = title;
+    public void setOriginalFileUuid(Long originalFileUuid) {
+	this.originalFileUuid = originalFileUuid;
     }
+    
+    /**
+     * @hibernate.property column="medium_file_uuid"
+     * 
+     * @return
+     */
+    public Long getMediumFileUuid() {
+	return mediumFileUuid;
+    }
 
+    public void setMediumFileUuid(Long mediumFileUuid) {
+	this.mediumFileUuid = mediumFileUuid;
+    }
+
     /**
-     * @hibernate.property column="url" length="65535"
+     * @hibernate.property column="thumbnail_file_uuid"
+     * 
      * @return
      */
-    public String getUrl() {
-	return url;
+    public Long getThumbnailFileUuid() {
+	return thumbnailFileUuid;
     }
 
-    public void setUrl(String url) {
-	this.url = url;
+    public void setThumbnailFileUuid(Long thumbnailFileUuid) {
+	this.thumbnailFileUuid = thumbnailFileUuid;
     }
 
     /**
+     * @hibernate.property column="file_version_id"
+     * @return
+     */
+    public Long getFileVersionId() {
+	return fileVersionId;
+    }
+
+    public void setFileVersionId(Long crVersionId) {
+	this.fileVersionId = crVersionId;
+    }
+
+    /**
+     * @hibernate.property column="file_type"
+     */
+    public String getFileType() {
+	return fileType;
+    }
+
+    public void setFileType(String type) {
+	this.fileType = type;
+    }
+
+    /**
+     * @hibernate.property column="file_name"
+     */
+    public String getFileName() {
+	return fileName;
+    }
+
+    public void setFileName(String name) {
+	this.fileName = name;
+    }
+
+    /**
      * @hibernate.many-to-one cascade="none" column="create_by"
      * 
      * @return
@@ -239,40 +276,6 @@
 	this.isHide = isHide;
     }
 
-    /**
-     * @hibernate.property column="file_type"
-     */
-    public String getFileType() {
-	return fileType;
-    }
-
-    public void setFileType(String type) {
-	this.fileType = type;
-    }
-
-    /**
-     * @hibernate.property column="file_name"
-     */
-    public String getFileName() {
-	return fileName;
-    }
-
-    public void setFileName(String name) {
-	this.fileName = name;
-    }
-
-    /**
-     * @hibernate.property column="open_url_new_window"
-     * @return
-     */
-    public boolean isOpenUrlNewWindow() {
-	return openUrlNewWindow;
-    }
-
-    public void setOpenUrlNewWindow(boolean openUrlNewWindow) {
-	this.openUrlNewWindow = openUrlNewWindow;
-    }
-
     public void setComplete(boolean complete) {
 	this.complete = complete;
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -48,16 +48,6 @@
 public interface IImageGalleryService {
 
     /**
-     * Get file <code>IVersiondNode</code> by given package id and path.
-     * 
-     * @param packageId
-     * @param relPathString
-     * @return
-     * @throws ImageGalleryApplicationException
-     */
-    IVersionedNode getFileNode(Long packageId, String relPathString) throws ImageGalleryApplicationException;
-
-    /**
      * Get <code>ImageGallery</code> by toolContentID.
      * 
      * @param contentId
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -27,6 +27,7 @@
 import java.awt.Image;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileNotFoundException;
@@ -50,16 +51,20 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
+import javax.imageio.ImageIO;
+import javax.imageio.stream.FileImageInputStream;
 import javax.swing.ImageIcon;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
+import org.lamsfoundation.lams.contentrepository.FileException;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
 import org.lamsfoundation.lams.contentrepository.ITicket;
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
 import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
+import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
 import org.lamsfoundation.lams.contentrepository.LoginException;
 import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
@@ -99,6 +104,7 @@
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItemVisitLog;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
+import org.lamsfoundation.lams.tool.imageGallery.util.CircularByteBuffer;
 import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryToolContentHandler;
 import org.lamsfoundation.lams.tool.imageGallery.util.ReflectDTOComparator;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
@@ -113,8 +119,11 @@
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
 
+import sun.swing.ImageIconUIResource;
+
 import com.sun.image.codec.jpeg.JPEGCodec;
 import com.sun.image.codec.jpeg.JPEGImageEncoder;
+import com.sun.imageio.plugins.common.ImageUtil;
 
 /**
  * 
@@ -161,15 +170,6 @@
 
     private IEventNotificationService eventNotificationService;
 
-    public IVersionedNode getFileNode(Long itemUid, String relPathString) throws ImageGalleryApplicationException {
-	ImageGalleryItem item = (ImageGalleryItem) imageGalleryItemDao.getObject(ImageGalleryItem.class, itemUid);
-	if (item == null) {
-	    throw new ImageGalleryApplicationException("Reource item " + itemUid + " not found.");
-	}
-
-	return getFile(item.getFileUuid(), item.getFileVersionId(), relPathString);
-    }
-
     // *******************************************************************************
     // Service method
     // *******************************************************************************
@@ -267,13 +267,9 @@
 
     public ImageGalleryAttachment uploadInstructionFile(FormFile uploadFile, String fileType)
 	    throws UploadImageGalleryFileException {
-	if ((uploadFile == null) || StringUtils.isEmpty(uploadFile.getFileName())) {
-	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.upload.file.not.found",
-		    new Object[] { uploadFile }));
-	}
 
 	// upload file to repository
-	NodeKey nodeKey = processFile(uploadFile, fileType);
+	NodeKey nodeKey = uploadFormFile(uploadFile, fileType);
 
 	// create new attachement
 	ImageGalleryAttachment file = new ImageGalleryAttachment();
@@ -681,6 +677,24 @@
 	return contentId;
     }
 
+    public void uploadImageGalleryItemFile(ImageGalleryItem image, FormFile file) throws UploadImageGalleryFileException {
+
+	// upload file
+	NodeKey nodeKey = uploadFormFile(file, IToolContentHandler.TYPE_ONLINE);
+	image.setFileName(file.getFileName());
+	image.setFileType(file.getContentType());
+	image.setFileVersionId(nodeKey.getVersion());
+	image.setOriginalFileUuid(nodeKey.getUuid());
+
+	String mediumFileName = "medium_" + file.getFileName();
+	NodeKey mediumNodeKey = createScaledImage(nodeKey, mediumFileName, file.getContentType(), 640);
+	image.setMediumFileUuid(mediumNodeKey.getUuid());
+	
+	String thumbnailFileName = "thumbnail_" + file.getFileName();
+	NodeKey thumbnailNodeKey = createScaledImage(mediumNodeKey, thumbnailFileName, file.getContentType(), 100);
+	image.setThumbnailFileUuid(thumbnailNodeKey.getUuid());
+    }
+    
     /**
      * Process an uploaded file.
      * 
@@ -690,61 +704,27 @@
      * @throws RepositoryCheckedException
      * @throws InvalidParameterException
      */
-    private NodeKey processFile(FormFile file, String fileType) throws UploadImageGalleryFileException {
-	NodeKey node = null;
-	if ((file != null) && !StringUtils.isEmpty(file.getFileName())) {
-	    String fileName = file.getFileName();
-	    try {
-		node = imageGalleryToolContentHandler.uploadFile(file.getInputStream(), fileName,
-			file.getContentType(), fileType);
-		String rr = imageGalleryToolContentHandler.getFileNode(node.getUuid()).getPath();
-		String ff = "";
-	    } catch (InvalidParameterException e) {
-		throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.invaid.param.upload"));
-	    } catch (FileNotFoundException e) {
-		throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.file.not.found"));
-	    } catch (RepositoryCheckedException e) {
-		throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.repository"));
-	    } catch (IOException e) {
-		throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.io.exception"));
-	    }
+    private NodeKey uploadFormFile(FormFile file, String fileType) throws UploadImageGalleryFileException {
+	if ((file == null) || StringUtils.isEmpty(file.getFileName())) {
+	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.upload.file.not.found",
+		    new Object[] { file }));
 	}
-	return node;
-    }
 
-    public void uploadImageGalleryItemFile(ImageGalleryItem item, FormFile file) throws UploadImageGalleryFileException {
+	NodeKey node = null;
 	try {
-	    InputStream is = file.getInputStream();
-	    String fileName = file.getFileName();
-	    String fileType = file.getContentType();
-
-	    //TODO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//		String packageDirectory = ZipFileUtil.expandZip(is, fileName);
-//		String initFile = findWebsiteInitialItem(packageDirectory);
-//		if (initFile == null) {
-//		    throw new UploadImageGalleryFileException(messageService
-//			    .getMessage("error.msg.website.no.initial.file"));
-//		}
-
-	    
-	    
-	    // upload file
-	    NodeKey nodeKey = processFile(file, IToolContentHandler.TYPE_ONLINE);
-	    item.setFileUuid(nodeKey.getUuid());
-	    item.setFileVersionId(nodeKey.getVersion());
-		
-	    // create the package from the directory contents
-	    item.setFileType(fileType);
-	    item.setFileName(fileName);
+	    node = imageGalleryToolContentHandler.uploadFile(file.getInputStream(), file.getFileName(), file
+		    .getContentType(), fileType);
+	} catch (InvalidParameterException e) {
+	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.invaid.param.upload"));
 	} catch (FileNotFoundException e) {
-	    ImageGalleryServiceImpl.log.error(messageService.getMessage("error.msg.file.not.found") + ":"
-		    + e.toString());
 	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.file.not.found"));
+	} catch (RepositoryCheckedException e) {
+	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.repository"));
 	} catch (IOException e) {
-	    ImageGalleryServiceImpl.log.error(messageService.getMessage("error.msg.io.exception") + ":" + e.toString());
 	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.io.exception"));
 	}
-    }
+	return node;
+    }    
     
     /**
      * Reads an image in a file and creates a thumbnail in another file.
@@ -755,85 +735,62 @@
      *                The name of thumbnail file. Will be created if necessary.
      * @param maxDim
      *                The width and height of the thumbnail must be maxDim pixels or less.
+     * @throws UploadImageGalleryFileException 
      */
-    private static void createThumbnail(String orig, String thumb, int maxDim) {
+    private NodeKey createScaledImage(NodeKey nodeKey, String fileName, String contentType, int maxDim) throws UploadImageGalleryFileException {
+	NodeKey scaledNodeKey = null;
 	try {
-	    // Get the image from a file.
-	    Image inImage = new ImageIcon(orig).getImage();
+	    // Read the original image from the repository
+	    InputStream is = imageGalleryToolContentHandler.getFileNode(nodeKey.getUuid()).getFile();
+	    BufferedImage originalImage = ImageIO.read(is);
 
 	    // Determine the scale.
-	    double scale = (double) maxDim / (double) inImage.getHeight(null);
-	    if (inImage.getWidth(null) > inImage.getHeight(null)) {
-		scale = (double) maxDim / (double) inImage.getWidth(null);
+	    double scale = (double) maxDim / (double) originalImage.getHeight(null);
+	    if (originalImage.getWidth(null) > originalImage.getHeight(null)) {
+		scale = (double) maxDim / (double) originalImage.getWidth(null);
 	    }
 
-	    // Determine size of new image.
-	    // One of them
-	    // should equal maxDim.
-	    int scaledW = (int) (scale * inImage.getWidth(null));
-	    int scaledH = (int) (scale * inImage.getHeight(null));
+	    // Determine size of new image. One of them should equal maxDim.
+	    int scaledW = (int) (scale * originalImage.getWidth(null));
+	    int scaledH = (int) (scale * originalImage.getHeight(null));
 
-	    // Create an image buffer in
-	    // which to paint on.
-	    BufferedImage outImage = new BufferedImage(scaledW, scaledH, BufferedImage.TYPE_INT_RGB);
+	    // Create an image buffer in which to paint on.
+	    BufferedImage mediumFile = new BufferedImage(scaledW, scaledH, BufferedImage.TYPE_INT_RGB);
 
 	    // Set the scale.
 	    AffineTransform tx = new AffineTransform();
 
-	    // If the image is smaller than
-	    // the desired image size,
-	    // don't bother scaling.
+	    // If the image is smaller than the desired image size, don't bother scaling.
 	    if (scale < 1.0d) {
 		tx.scale(scale, scale);
 	    }
 
 	    // Paint image.
-	    Graphics2D g2d = outImage.createGraphics();
-	    g2d.drawImage(inImage, tx, null);
+	    Graphics2D g2d = mediumFile.createGraphics();
+	    g2d.drawImage(originalImage, tx, null);
 	    g2d.dispose();
 
-	    // JPEG-encode the image
-	    // and write to file.
-	    OutputStream os = new FileOutputStream(thumb);
-	    JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(os);
-	    encoder.encode(outImage);
-	    os.close();
-	} catch (IOException e) {
-	    e.printStackTrace();
-	}
-	System.exit(0);
-    }
+	    // buffer all data in a circular buffer of infinite size
+	    CircularByteBuffer cbb = new CircularByteBuffer(CircularByteBuffer.INFINITE_SIZE);
+	    ImageIO.write(mediumFile, "JPG", cbb.getOutputStream());
+	    cbb.getOutputStream().close();
 
-    /**
-     * Find out default.htm/html or index.htm/html in the given directory folder
-     * 
-     * @param packageDirectory
-     * @return
-     */
-    private String findWebsiteInitialItem(String packageDirectory) {
-	File file = new File(packageDirectory);
-	if (!file.isDirectory()) {
-	    return null;
-	}
+	    scaledNodeKey = imageGalleryToolContentHandler.uploadFile(cbb.getInputStream(), fileName, contentType, IToolContentHandler.TYPE_ONLINE);
 
-	File[] initFiles = file.listFiles(new FileFilter() {
-	    public boolean accept(File pathname) {
-		if ((pathname == null) || (pathname.getName() == null)) {
-		    return false;
-		}
-		String name = pathname.getName();
-		if (name.endsWith("default.html") || name.endsWith("default.htm") || name.endsWith("index.html")
-			|| name.endsWith("index.htm")) {
-		    return true;
-		}
-		return false;
-	    }
-	});
-	if ((initFiles != null) && (initFiles.length > 0)) {
-	    return initFiles[0].getName();
-	} else {
-	    return null;
+	} catch (FileException e) {
+	    ImageGalleryServiceImpl.log.error(messageService.getMessage("error.msg.file.exception") + ":" + e.toString());
+	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.file.exception"));
+	} catch (ItemNotFoundException e) {
+	    ImageGalleryServiceImpl.log.error(messageService.getMessage("error.msg.item.not.found.exception") + ":" + e.toString());
+	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.item.not.found.exception"));
+	} catch (RepositoryCheckedException e) {
+	    ImageGalleryServiceImpl.log.error(messageService.getMessage("error.msg.repository.checked.exception") + ":" + e.toString());
+	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.repository.checked.exception"));
+	} catch (IOException e) {
+	    ImageGalleryServiceImpl.log.error(messageService.getMessage("error.msg.io.exception") + ":" + e.toString());
+	    throw new UploadImageGalleryFileException(messageService.getMessage("error.msg.io.exception"));
 	}
+	return scaledNodeKey;
     }
 
     // *****************************************************************************
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/UploadImageGalleryFileException.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/UploadImageGalleryFileException.java	(.../UploadImageGalleryFileException.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/UploadImageGalleryFileException.java	(.../UploadImageGalleryFileException.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -25,6 +25,8 @@
 
 public class UploadImageGalleryFileException extends Exception {
 
+    private static final long serialVersionUID = 3993274086986425887L;
+
     public UploadImageGalleryFileException() {
 	super();
 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/BufferOverflowException.java
===================================================================
diff -u
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/BufferOverflowException.java	(revision 0)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/BufferOverflowException.java	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -0,0 +1,80 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program 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 General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.imageGallery.util;  
+ 
+/*
+ * Buffer Overflow Exception
+ * Copyright (C) 2002 Stephen Ostermiller
+ * http://ostermiller.org/contact.pl?regarding=Java+Utilities
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * See COPYING.TXT for details.
+ */
+
+
+import java.io.IOException;
+
+/**
+ * An indication that there was a buffer overflow.
+ *
+ * @author Stephen Ostermiller http://ostermiller.org/contact.pl?regarding=Java+Utilities
+ * @since ostermillerutils 1.00.00
+ */
+public class BufferOverflowException extends IOException {
+
+	/**
+	 * Serial version ID
+	 */
+	private static final long serialVersionUID = -322401823167626048L;
+
+	/**
+	 * Create a new Exception
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public BufferOverflowException(){
+		super();
+	}
+
+	/**
+	 * Create a new Exception with the given message.
+	 *
+	 * @param msg Error message.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public BufferOverflowException(String msg){
+		super(msg);
+	}
+}
+ 
\ No newline at end of file
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/CircularByteBuffer.java
===================================================================
diff -u
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/CircularByteBuffer.java	(revision 0)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/CircularByteBuffer.java	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -0,0 +1,835 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program 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 General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.imageGallery.util;  
+ 
+
+/*
+ * Circular Byte Buffer
+ * Copyright (C) 2002 Stephen Ostermiller
+ * http://ostermiller.org/contact.pl?regarding=Java+Utilities
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * See COPYING.TXT for details.
+ */
+
+
+import java.io.*;
+
+/**
+ * Implements the Circular Buffer producer/consumer model for bytes.
+ * More information about this class is available from <a target="_top" href=
+ * "http://ostermiller.org/utils/CircularByteBuffer.html">ostermiller.org</a>.
+ * <p>
+ * Using this class is a simpler alternative to using a PipedInputStream
+ * and a PipedOutputStream. PipedInputStreams and PipedOutputStreams don't support the
+ * mark operation, don't allow you to control buffer sizes that they use,
+ * and have a more complicated API that requires instantiating two
+ * classes and connecting them.
+ * <p>
+ * This class is thread safe.
+ *
+ * @see CircularCharBuffer
+ * @see CircularObjectBuffer
+ *
+ * @author Stephen Ostermiller http://ostermiller.org/contact.pl?regarding=Java+Utilities
+ * @since ostermillerutils 1.00.00
+ */
+public class CircularByteBuffer {
+
+	/**
+	 * The default size for a circular byte buffer.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	private final static int DEFAULT_SIZE = 1024;
+
+	/**
+	 * A buffer that will grow as things are added.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public final static int INFINITE_SIZE = -1;
+
+	/**
+	 * The circular buffer.
+	 * <p>
+	 * The actual capacity of the buffer is one less than the actual length
+	 * of the buffer so that an empty and a full buffer can be
+	 * distinguished.  An empty buffer will have the markPostion and the
+	 * writePosition equal to each other.  A full buffer will have
+	 * the writePosition one less than the markPostion.
+	 * <p>
+	 * There are three important indexes into the buffer:
+	 * The readPosition, the writePosition, and the markPosition.
+	 * If the InputStream has never been marked, the readPosition and
+	 * the markPosition should always be the same.  The bytes
+	 * available to be read go from the readPosition to the writePosition,
+	 * wrapping around the end of the buffer.  The space available for writing
+	 * goes from the write position to one less than the markPosition,
+	 * wrapping around the end of the buffer.  The bytes that have
+	 * been saved to support a reset() of the InputStream go from markPosition
+	 * to readPosition, wrapping around the end of the buffer.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected byte[] buffer;
+	/**
+	 * Index of the first byte available to be read.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected volatile int readPosition = 0;
+	/**
+	 * Index of the first byte available to be written.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected volatile int writePosition = 0;
+	/**
+	 * Index of the first saved byte. (To support stream marking.)
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected volatile int markPosition = 0;
+	/**
+	 * Number of bytes that have to be saved
+	 * to support mark() and reset() on the InputStream.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected volatile int markSize = 0;
+	/**
+	 * If this buffer is infinite (should resize itself when full)
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected volatile boolean infinite = false;
+	/**
+	 * True if a write to a full buffer should block until the buffer
+	 * has room, false if the write method should throw an IOException
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected boolean blockingWrite = true;
+	/**
+	 * The InputStream that can empty this buffer.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected InputStream in = new CircularByteBufferInputStream();
+	/**
+	 * true if the close() method has been called on the InputStream
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected boolean inputStreamClosed = false;
+	/**
+	 * The OutputStream that can fill this buffer.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected OutputStream out = new CircularByteBufferOutputStream();
+	/**
+	 * true if the close() method has been called on the OutputStream
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected boolean outputStreamClosed = false;
+
+	/**
+	 * Make this buffer ready for reuse.  The contents of the buffer
+	 * will be cleared and the streams associated with this buffer
+	 * will be reopened if they had been closed.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public void clear(){
+		synchronized (this){
+			readPosition = 0;
+			writePosition = 0;
+			markPosition = 0;
+			outputStreamClosed = false;
+			inputStreamClosed = false;
+		}
+	}
+
+	/**
+	 * Retrieve a OutputStream that can be used to fill
+	 * this buffer.
+	 * <p>
+	 * Write methods may throw a BufferOverflowException if
+	 * the buffer is not large enough.  A large enough buffer
+	 * size must be chosen so that this does not happen or
+	 * the caller must be prepared to catch the exception and
+	 * try again once part of the buffer has been consumed.
+	 *
+	 *
+	 * @return the producer for this buffer.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public OutputStream getOutputStream(){
+		return out;
+	}
+
+	/**
+	 * Retrieve a InputStream that can be used to empty
+	 * this buffer.
+	 * <p>
+	 * This InputStream supports marks at the expense
+	 * of the buffer size.
+	 *
+	 * @return the consumer for this buffer.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public InputStream getInputStream(){
+		return in;
+	}
+
+	/**
+	 * Get number of bytes that are available to be read.
+	 * <p>
+	 * Note that the number of bytes available plus
+	 * the number of bytes free may not add up to the
+	 * capacity of this buffer, as the buffer may reserve some
+	 * space for other purposes.
+	 *
+	 * @return the size in bytes of this buffer
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public int getAvailable(){
+		synchronized (this){
+			return available();
+		}
+	}
+
+	/**
+	 * Get the number of bytes this buffer has free for
+	 * writing.
+	 * <p>
+	 * Note that the number of bytes available plus
+	 * the number of bytes free may not add up to the
+	 * capacity of this buffer, as the buffer may reserve some
+	 * space for other purposes.
+	 *
+	 * @return the available space in bytes of this buffer
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public int getSpaceLeft(){
+		synchronized (this){
+			return spaceLeft();
+		}
+	}
+
+	/**
+	 * Get the capacity of this buffer.
+	 * <p>
+	 * Note that the number of bytes available plus
+	 * the number of bytes free may not add up to the
+	 * capacity of this buffer, as the buffer may reserve some
+	 * space for other purposes.
+	 *
+	 * @return the size in bytes of this buffer
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public int getSize(){
+		synchronized (this){
+			return buffer.length;
+		}
+	}
+
+	/**
+	 * double the size of the buffer
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	private void resize(){
+		byte[] newBuffer = new byte[buffer.length * 2];
+		int marked = marked();
+		int available = available();
+		if (markPosition <= writePosition){
+			// any space between the mark and
+			// the first write needs to be saved.
+			// In this case it is all in one piece.
+			int length = writePosition - markPosition;
+			System.arraycopy(buffer, markPosition, newBuffer, 0, length);
+		} else {
+			int length1 = buffer.length - markPosition;
+			System.arraycopy(buffer, markPosition, newBuffer, 0, length1);
+			int length2 = writePosition;
+			System.arraycopy(buffer, 0, newBuffer, length1, length2);
+		}
+		buffer = newBuffer;
+		markPosition = 0;
+		readPosition = marked;
+		writePosition = marked + available;
+	}
+
+	/**
+	 * Space available in the buffer which can be written.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	private int spaceLeft(){
+		if (writePosition < markPosition){
+			// any space between the first write and
+			// the mark except one byte is available.
+			// In this case it is all in one piece.
+			return (markPosition - writePosition - 1);
+		}
+		// space at the beginning and end.
+		return ((buffer.length - 1) - (writePosition - markPosition));
+	}
+
+	/**
+	 * Bytes available for reading.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	private int available(){
+		if (readPosition <= writePosition){
+			// any space between the first read and
+			// the first write is available.  In this case i
+			// is all in one piece.
+			return (writePosition - readPosition);
+		}
+		// space at the beginning and end.
+		return (buffer.length - (readPosition - writePosition));
+	}
+
+	/**
+	 * Bytes saved for supporting marks.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	private int marked(){
+		if (markPosition <= readPosition){
+			// any space between the markPosition and
+			// the first write is marked.  In this case i
+			// is all in one piece.
+			return (readPosition - markPosition);
+		}
+		// space at the beginning and end.
+		return (buffer.length - (markPosition - readPosition));
+	}
+
+	/**
+	 * If we have passed the markSize reset the
+	 * mark so that the space can be used.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	private void ensureMark(){
+		if (marked() >= markSize){
+			markPosition = readPosition;
+			markSize = 0;
+		}
+	}
+
+	/**
+	 * Create a new buffer with a default capacity.
+	 * Writing to a full buffer will block until space
+	 * is available rather than throw an exception.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public CircularByteBuffer(){
+		this (DEFAULT_SIZE, true);
+	}
+
+	/**
+	 * Create a new buffer with given capacity.
+	 * Writing to a full buffer will block until space
+	 * is available rather than throw an exception.
+	 * <p>
+	 * Note that the buffer may reserve some bytes for
+	 * special purposes and capacity number of bytes may
+	 * not be able to be written to the buffer.
+	 * <p>
+	 * Note that if the buffer is of INFINITE_SIZE it will
+	 * neither block or throw exceptions, but rather grow
+	 * without bound.
+	 *
+	 * @param size desired capacity of the buffer in bytes or CircularByteBuffer.INFINITE_SIZE.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public CircularByteBuffer(int size){
+		this (size, true);
+	}
+
+	/**
+	 * Create a new buffer with a default capacity and
+	 * given blocking behavior.
+	 *
+	 * @param blockingWrite true writing to a full buffer should block
+	 *        until space is available, false if an exception should
+	 *        be thrown instead.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public CircularByteBuffer(boolean blockingWrite){
+		this (DEFAULT_SIZE, blockingWrite);
+	}
+
+	/**
+	 * Create a new buffer with the given capacity and
+	 * blocking behavior.
+	 * <p>
+	 * Note that the buffer may reserve some bytes for
+	 * special purposes and capacity number of bytes may
+	 * not be able to be written to the buffer.
+	 * <p>
+	 * Note that if the buffer is of INFINITE_SIZE it will
+	 * neither block or throw exceptions, but rather grow
+	 * without bound.
+	 *
+	 * @param size desired capacity of the buffer in bytes or CircularByteBuffer.INFINITE_SIZE.
+	 * @param blockingWrite true writing to a full buffer should block
+	 *        until space is available, false if an exception should
+	 *        be thrown instead.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	public CircularByteBuffer(int size, boolean blockingWrite){
+		if (size == INFINITE_SIZE){
+			buffer = new byte[DEFAULT_SIZE];
+			infinite = true;
+		} else {
+			buffer = new byte[size];
+			infinite = false;
+		}
+		this.blockingWrite = blockingWrite;
+	}
+
+	/**
+	 * Class for reading from a circular byte buffer.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected class CircularByteBufferInputStream extends InputStream {
+
+		/**
+		 * Returns the number of bytes that can be read (or skipped over) from this
+		 * input stream without blocking by the next caller of a method for this input
+		 * stream. The next caller might be the same thread or or another thread.
+		 *
+		 * @return the number of bytes that can be read from this input stream without blocking.
+		 * @throws IOException if the stream is closed.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public int available() throws IOException {
+			synchronized (CircularByteBuffer.this){
+				if (inputStreamClosed) throw new IOException("InputStream has been closed, it is not ready.");
+				return (CircularByteBuffer.this.available());
+			}
+		}
+
+		/**
+		 * Close the stream. Once a stream has been closed, further read(), available(),
+		 * mark(), or reset() invocations will throw an IOException. Closing a
+		 * previously-closed stream, however, has no effect.
+		 *
+		 * @throws IOException never.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public void close() throws IOException {
+			synchronized (CircularByteBuffer.this){
+				inputStreamClosed = true;
+			}
+		}
+
+		/**
+		 * Mark the present position in the stream. Subsequent calls to reset() will
+		 * attempt to reposition the stream to this point.
+		 * <p>
+		 * The readAheadLimit must be less than the size of circular buffer, otherwise
+		 * this method has no effect.
+		 *
+		 * @param readAheadLimit Limit on the number of bytes that may be read while
+		 *    still preserving the mark. After reading this many bytes, attempting to
+		 *    reset the stream will fail.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public void mark(int readAheadLimit) {
+			synchronized (CircularByteBuffer.this){
+				//if (inputStreamClosed) throw new IOException("InputStream has been closed; cannot mark a closed InputStream.");
+				if (buffer.length - 1 > readAheadLimit) {
+					markSize = readAheadLimit;
+					markPosition = readPosition;
+				}
+			}
+		}
+
+		/**
+		 * Tell whether this stream supports the mark() operation.
+		 *
+		 * @return true, mark is supported.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public boolean markSupported() {
+			return true;
+		}
+
+		/**
+		 * Read a single byte.
+		 * This method will block until a byte is available, an I/O error occurs,
+		 * or the end of the stream is reached.
+		 *
+		 * @return The byte read, as an integer in the range 0 to 255 (0x00-0xff),
+		 *     or -1 if the end of the stream has been reached
+		 * @throws IOException if the stream is closed.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public int read() throws IOException {
+			while (true){
+				synchronized (CircularByteBuffer.this){
+					if (inputStreamClosed) throw new IOException("InputStream has been closed; cannot read from a closed InputStream.");
+					int available = CircularByteBuffer.this.available();
+					if (available > 0){
+						int result = buffer[readPosition] & 0xff;
+						readPosition++;
+						if (readPosition == buffer.length){
+							readPosition = 0;
+						}
+						ensureMark();
+						return result;
+					} else if (outputStreamClosed){
+						return -1;
+					}
+				}
+				try {
+					Thread.sleep(100);
+				} catch(Exception x){
+					throw new IOException("Blocking read operation interrupted.");
+				}
+			}
+		}
+
+		/**
+		 * Read bytes into an array.
+		 * This method will block until some input is available,
+		 * an I/O error occurs, or the end of the stream is reached.
+		 *
+		 * @param cbuf Destination buffer.
+		 * @return The number of bytes read, or -1 if the end of
+		 *   the stream has been reached
+		 * @throws IOException if the stream is closed.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public int read(byte[] cbuf) throws IOException {
+			return read(cbuf, 0, cbuf.length);
+		}
+
+		/**
+		 * Read bytes into a portion of an array.
+		 * This method will block until some input is available,
+		 * an I/O error occurs, or the end of the stream is reached.
+		 *
+		 * @param cbuf Destination buffer.
+		 * @param off Offset at which to start storing bytes.
+		 * @param len Maximum number of bytes to read.
+		 * @return The number of bytes read, or -1 if the end of
+		 *   the stream has been reached
+		 * @throws IOException if the stream is closed.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public int read(byte[] cbuf, int off, int len) throws IOException {
+			while (true){
+				synchronized (CircularByteBuffer.this){
+					if (inputStreamClosed) throw new IOException("InputStream has been closed; cannot read from a closed InputStream.");
+					int available = CircularByteBuffer.this.available();
+					if (available > 0){
+						int length = Math.min(len, available);
+						int firstLen = Math.min(length, buffer.length - readPosition);
+						int secondLen = length - firstLen;
+						System.arraycopy(buffer, readPosition, cbuf, off, firstLen);
+						if (secondLen > 0){
+							System.arraycopy(buffer, 0, cbuf, off+firstLen,  secondLen);
+							readPosition = secondLen;
+						} else {
+							readPosition += length;
+						}
+						if (readPosition == buffer.length) {
+							readPosition = 0;
+						}
+						ensureMark();
+						return length;
+					} else if (outputStreamClosed){
+						return -1;
+					}
+				}
+				try {
+					Thread.sleep(100);
+				} catch(Exception x){
+					throw new IOException("Blocking read operation interrupted.");
+				}
+			}
+		}
+
+		/**
+		 * Reset the stream.
+		 * If the stream has been marked, then attempt to reposition i
+		 * at the mark. If the stream has not been marked, or more bytes
+		 * than the readAheadLimit have been read, this method has no effect.
+		 *
+		 * @throws IOException if the stream is closed.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public void reset() throws IOException {
+			synchronized (CircularByteBuffer.this){
+				if (inputStreamClosed) throw new IOException("InputStream has been closed; cannot reset a closed InputStream.");
+				readPosition = markPosition;
+			}
+		}
+
+		/**
+		 * Skip bytes.
+		 * This method will block until some bytes are available,
+		 * an I/O error occurs, or the end of the stream is reached.
+		 *
+		 * @param n The number of bytes to skip
+		 * @return The number of bytes actually skipped
+		 * @throws IllegalArgumentException if n is negative.
+		 * @throws IOException if the stream is closed.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public long skip(long n) throws IOException, IllegalArgumentException {
+			while (true){
+				synchronized (CircularByteBuffer.this){
+					if (inputStreamClosed) throw new IOException("InputStream has been closed; cannot skip bytes on a closed InputStream.");
+					int available = CircularByteBuffer.this.available();
+					if (available > 0){
+						int length = Math.min((int)n, available);
+						int firstLen = Math.min(length, buffer.length - readPosition);
+						int secondLen = length - firstLen;
+						if (secondLen > 0){
+							readPosition = secondLen;
+						} else {
+							readPosition += length;
+						}
+						if (readPosition == buffer.length) {
+							readPosition = 0;
+						}
+						ensureMark();
+						return length;
+					} else if (outputStreamClosed){
+						return 0;
+					}
+				}
+				try {
+					Thread.sleep(100);
+				} catch(Exception x){
+					throw new IOException("Blocking read operation interrupted.");
+				}
+			}
+		}
+	}
+
+	/**
+	 * Class for writing to a circular byte buffer.
+	 * If the buffer is full, the writes will either block
+	 * until there is some space available or throw an IOException
+	 * based on the CircularByteBuffer's preference.
+	 *
+	 * @since ostermillerutils 1.00.00
+	 */
+	protected class CircularByteBufferOutputStream extends OutputStream {
+
+		/**
+		 * Close the stream, flushing it first.
+		 * This will cause the InputStream associated with this circular buffer
+		 * to read its last bytes once it empties the buffer.
+		 * Once a stream has been closed, further write() or flush() invocations
+		 * will cause an IOException to be thrown. Closing a previously-closed stream,
+		 * however, has no effect.
+		 *
+		 * @throws IOException never.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public void close() throws IOException {
+			synchronized (CircularByteBuffer.this){
+				if (!outputStreamClosed){
+					flush();
+				}
+				outputStreamClosed = true;
+			}
+		}
+
+		/**
+		 * Flush the stream.
+		 *
+		 * @throws IOException if the stream is closed.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public void flush() throws IOException {
+			if (outputStreamClosed) throw new IOException("OutputStream has been closed; cannot flush a closed OutputStream.");
+			if (inputStreamClosed) throw new IOException("Buffer closed by inputStream; cannot flush.");
+			// this method needs to do nothing
+		}
+
+		/**
+		 * Write an array of bytes.
+		 * If the buffer allows blocking writes, this method will block until
+		 * all the data has been written rather than throw an IOException.
+		 *
+		 * @param cbuf Array of bytes to be written
+		 * @throws BufferOverflowException if buffer does not allow blocking writes
+		 *   and the buffer is full.  If the exception is thrown, no data
+		 *   will have been written since the buffer was set to be non-blocking.
+		 * @throws IOException if the stream is closed, or the write is interrupted.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public void write(byte[] cbuf) throws IOException {
+			write(cbuf, 0, cbuf.length);
+		}
+
+		/**
+		 * Write a portion of an array of bytes.
+		 * If the buffer allows blocking writes, this method will block until
+		 * all the data has been written rather than throw an IOException.
+		 *
+		 * @param cbuf Array of bytes
+		 * @param off Offset from which to start writing bytes
+		 * @param len - Number of bytes to write
+		 * @throws BufferOverflowException if buffer does not allow blocking writes
+		 *   and the buffer is full.  If the exception is thrown, no data
+		 *   will have been written since the buffer was set to be non-blocking.
+		 * @throws IOException if the stream is closed, or the write is interrupted.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public void write(byte[] cbuf, int off, int len) throws IOException {
+			while (len > 0){
+				synchronized (CircularByteBuffer.this){
+					if (outputStreamClosed) throw new IOException("OutputStream has been closed; cannot write to a closed OutputStream.");
+					if (inputStreamClosed) throw new IOException("Buffer closed by InputStream; cannot write to a closed buffer.");
+					int spaceLeft = spaceLeft();
+					while (infinite && spaceLeft < len){
+						resize();
+						spaceLeft = spaceLeft();
+					}
+					if (!blockingWrite && spaceLeft < len) throw new BufferOverflowException("CircularByteBuffer is full; cannot write " + len + " bytes");
+					int realLen = Math.min(len, spaceLeft);
+					int firstLen = Math.min(realLen, buffer.length - writePosition);
+					int secondLen = Math.min(realLen - firstLen, buffer.length - markPosition - 1);
+					int written = firstLen + secondLen;
+					if (firstLen > 0){
+						System.arraycopy(cbuf, off, buffer, writePosition, firstLen);
+					}
+					if (secondLen > 0){
+						System.arraycopy(cbuf, off+firstLen, buffer, 0, secondLen);
+						writePosition = secondLen;
+					} else {
+						writePosition += written;
+					}
+					if (writePosition == buffer.length) {
+						writePosition = 0;
+					}
+					off += written;
+					len -= written;
+				}
+				if (len > 0){
+					try {
+						Thread.sleep(100);
+					} catch(Exception x){
+						throw new IOException("Waiting for available space in buffer interrupted.");
+					}
+				}
+			}
+		}
+
+		/**
+		 * Write a single byte.
+		 * The byte to be written is contained in the 8 low-order bits of the
+		 * given integer value; the 24 high-order bits are ignored.
+		 * If the buffer allows blocking writes, this method will block until
+		 * all the data has been written rather than throw an IOException.
+		 *
+		 * @param c number of bytes to be written
+		 * @throws BufferOverflowException if buffer does not allow blocking writes
+		 *   and the buffer is full.
+		 * @throws IOException if the stream is closed, or the write is interrupted.
+		 *
+		 * @since ostermillerutils 1.00.00
+		 */
+		@Override public void write(int c) throws IOException {
+			boolean written = false;
+			while (!written){
+				synchronized (CircularByteBuffer.this){
+					if (outputStreamClosed) throw new IOException("OutputStream has been closed; cannot write to a closed OutputStream.");
+					if (inputStreamClosed) throw new IOException("Buffer closed by InputStream; cannot write to a closed buffer.");
+					int spaceLeft = spaceLeft();
+					while (infinite && spaceLeft < 1){
+						resize();
+						spaceLeft = spaceLeft();
+					}
+					if (!blockingWrite && spaceLeft < 1) throw new BufferOverflowException("CircularByteBuffer is full; cannot write 1 byte");
+					if (spaceLeft > 0){
+						buffer[writePosition] = (byte)(c & 0xff);
+						writePosition++;
+						if (writePosition == buffer.length) {
+							writePosition = 0;
+						}
+						written = true;
+					}
+				}
+				if (!written){
+					try {
+						Thread.sleep(100);
+					} catch(Exception x){
+						throw new IOException("Waiting for available space in buffer interrupted.");
+					}
+				}
+			}
+		}
+	}
+}
+
+ 
\ No newline at end of file
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -204,6 +204,7 @@
 	    }
 
 	    imageGalleryForm.setImageGallery(imageGallery);
+	    imageGalleryForm.setAllowRatingsOrVote(imageGallery.isAllowVote() || imageGallery.isAllowRank());
 
 	    // initialize instruction attachment list
 	    List attachmentList = getAttachmentList(sessionMap);
@@ -233,7 +234,7 @@
 	    }
 	}
 	// init imageGallery item list
-	SortedSet<ImageGalleryItem> imageGalleryItemList = getImageGalleryItemList(sessionMap);
+	SortedSet<ImageGalleryItem> imageGalleryItemList = getImageList(sessionMap);
 	imageGalleryItemList.clear();
 	imageGalleryItemList.addAll(items);
 
@@ -381,14 +382,17 @@
 		service.deleteImageGalleryAttachment(delAtt.getUid());
 	    }// end remove from persist value
 	}
-
 	// copy back
 	imageGalleryPO.setAttachments(attPOSet);
+	
+	// ************************* Handle imageGallery allowRank item *******************
+	imageGalleryPO.setAllowRank(imageGalleryForm.isAllowRatingsOrVote() && !imageGalleryPO.isAllowVote());
+	
 	// ************************* Handle imageGallery items *******************
 	// Handle imageGallery items
 	Set itemList = new LinkedHashSet();
-	SortedSet topics = getImageGalleryItemList(sessionMap);
-	iter = topics.iterator();
+	SortedSet imageList = getImageList(sessionMap);
+	iter = imageList.iterator();
 	while (iter.hasNext()) {
 	    ImageGalleryItem item = (ImageGalleryItem) iter.next();
 	    if (item != null) {
@@ -416,10 +420,6 @@
 	    iter.remove();
 	}
 
-	// if miniview number is bigger than available items, then set it topics size
-	if (imageGalleryPO.getNumberColumns() > topics.size()) {
-	    imageGalleryPO.setNumberColumns((topics.size()));
-	}
 	// **********************************************
 	// finally persist imageGalleryPO again
 	service.saveOrUpdateImageGallery(imageGalleryPO);
@@ -634,7 +634,7 @@
 
 	int itemIdx = NumberUtils.stringToInt(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_INDEX), -1);
 	if (itemIdx != -1) {
-	    SortedSet<ImageGalleryItem> imageGalleryList = getImageGalleryItemList(sessionMap);
+	    SortedSet<ImageGalleryItem> imageGalleryList = getImageList(sessionMap);
 	    List<ImageGalleryItem> rList = new ArrayList<ImageGalleryItem>(imageGalleryList);
 	    ImageGalleryItem item = rList.remove(itemIdx);
 	    imageGalleryList.clear();
@@ -683,7 +683,7 @@
 
 	int imageIdx = NumberUtils.stringToInt(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_INDEX), -1);
 	if (imageIdx != -1) {
-	    SortedSet<ImageGalleryItem> taskListList = getImageGalleryItemList(sessionMap);
+	    SortedSet<ImageGalleryItem> taskListList = getImageList(sessionMap);
 	    List<ImageGalleryItem> rList = new ArrayList<ImageGalleryItem>(taskListList);
 	    // get current and the target item, and switch their sequnece
 	    ImageGalleryItem image = rList.get(imageIdx);
@@ -724,7 +724,7 @@
 	int itemIdx = NumberUtils.stringToInt(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_INDEX), -1);
 	ImageGalleryItem item = null;
 	if (itemIdx != -1) {
-	    SortedSet<ImageGalleryItem> imageGalleryList = getImageGalleryItemList(sessionMap);
+	    SortedSet<ImageGalleryItem> imageGalleryList = getImageList(sessionMap);
 	    List<ImageGalleryItem> rList = new ArrayList<ImageGalleryItem>(imageGalleryList);
 	    item = rList.get(itemIdx);
 	    if (item != null) {
@@ -827,7 +827,7 @@
      * @param request
      * @return
      */
-    private SortedSet<ImageGalleryItem> getImageGalleryItemList(SessionMap sessionMap) {
+    private SortedSet<ImageGalleryItem> getImageList(SessionMap sessionMap) {
 	SortedSet<ImageGalleryItem> list = (SortedSet<ImageGalleryItem>) sessionMap
 		.get(ImageGalleryConstants.ATTR_RESOURCE_ITEM_LIST);
 	if (list == null) {
@@ -887,14 +887,12 @@
 	    HttpServletRequest request) {
 	form.setDescription(item.getDescription());
 	form.setTitle(item.getTitle());
-	form.setUrl(item.getUrl());
-	form.setOpenUrlNewWindow(item.isOpenUrlNewWindow());
 	if (itemIdx >= 0) {
 	    form.setImageIndex(new Integer(itemIdx).toString());
 	}
 
-	if (item.getFileUuid() != null) {
-	    form.setFileUuid(item.getFileUuid());
+	if (item.getOriginalFileUuid() != null) {
+	    form.setFileUuid(item.getOriginalFileUuid());
 	    form.setFileVersionId(item.getFileVersionId());
 	    form.setFileName(item.getFileName());
 	    form.setHasFile(true);
@@ -907,80 +905,80 @@
      * Extract web from content to imageGallery item.
      * 
      * @param request
-     * @param itemForm
+     * @param imageForm
      * @throws ImageGalleryApplicationException
      */
     private void extractFormToImageGalleryItem(HttpServletRequest request,
-	    ImageGalleryItemForm itemForm) throws Exception {
+	    ImageGalleryItemForm imageForm) throws Exception {
 	/*
 	 * BE CAREFUL: This method will copy nessary info from request form to a old or new ImageGalleryItem instance.
 	 * It gets all info EXCEPT ImageGalleryItem.createDate and ImageGalleryItem.createBy, which need be set when
 	 * persisting this imageGallery item.
 	 */
 
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(itemForm.getSessionMapID());
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(imageForm.getSessionMapID());
 	// check whether it is "edit(old item)" or "add(new item)"
-	SortedSet<ImageGalleryItem> imageGalleryList = getImageGalleryItemList(sessionMap);
-	int imageIdx = NumberUtils.stringToInt(itemForm.getImageIndex(), -1);
-	ImageGalleryItem item = null;
+	SortedSet<ImageGalleryItem> imageList = getImageList(sessionMap);
+	int imageIdx = NumberUtils.stringToInt(imageForm.getImageIndex(), -1);
+	ImageGalleryItem image = null;
 
 	if (imageIdx == -1) { // add
-	    item = new ImageGalleryItem();
-	    item.setCreateDate(new Timestamp(new Date().getTime()));
+	    image = new ImageGalleryItem();
+	    image.setCreateDate(new Timestamp(new Date().getTime()));
 	    int maxSeq = 1;
-	    if (imageGalleryList != null && imageGalleryList.size() > 0) {
-		ImageGalleryItem last = imageGalleryList.last();
+	    if (imageList != null && imageList.size() > 0) {
+		ImageGalleryItem last = imageList.last();
 		maxSeq = last.getSequenceId() + 1;
 	    }
-	    item.setSequenceId(maxSeq);
-	    imageGalleryList.add(item);
+	    image.setSequenceId(maxSeq);
+	    imageList.add(image);
 	} else { // edit
-	    List<ImageGalleryItem> rList = new ArrayList<ImageGalleryItem>(imageGalleryList);
-	    item = rList.get(imageIdx);
+	    List<ImageGalleryItem> rList = new ArrayList<ImageGalleryItem>(imageList);
+	    image = rList.get(imageIdx);
 	}
 
 	// uploadImageGalleryItemFile 
 	// and setting file properties' fields: item.setFileUuid(); item.setFileVersionId(); item.setFileType(); item.setFileName();
-	if (itemForm.getFile() != null) {
+	if (imageForm.getFile() != null) {
 	    // if it has old file, and upload a new, then save old to deleteList
-	    ImageGalleryItem delAttItem = new ImageGalleryItem();
+	    ImageGalleryItem delImage = new ImageGalleryItem();
 	    boolean hasOld = false;
-	    if (item.getFileUuid() != null) {
+	    if (image.getOriginalFileUuid() != null) {
 		hasOld = true;
 		// be careful, This new ImageGalleryItem object never be save into database
 		// just temporarily use for saving fileUuid and versionID use:
-		delAttItem.setFileUuid(item.getFileUuid());
-		delAttItem.setFileVersionId(item.getFileVersionId());
+		delImage.setOriginalFileUuid(image.getOriginalFileUuid());
+		delImage.setFileVersionId(image.getFileVersionId());
 	    }
 	    IImageGalleryService service = getImageGalleryService();
 	    try {
-		service.uploadImageGalleryItemFile(item, itemForm.getFile());
+		service.uploadImageGalleryItemFile(image, imageForm.getFile());
 	    } catch (UploadImageGalleryFileException e) {
 		// if it is new add , then remove it!
 		if (imageIdx == -1) {
-		    imageGalleryList.remove(item);
+		    imageList.remove(image);
 		}
 		throw e;
 	    }
 	    // put it after "upload" to ensure deleted file added into list only no exception happens during upload
 	    if (hasOld) {
 		List delAtt = getDeletedItemAttachmentList(sessionMap);
-		delAtt.add(delAttItem);
+		delAtt.add(delImage);
 	    }
 	}
 	
-	String title = itemForm.getTitle();
+	String title = imageForm.getTitle();
 	if (StringUtils.isBlank(title)) {
 	    Long nextConsecutiveImageTitle = (Long) sessionMap.get(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE);
 	    sessionMap.put(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE, nextConsecutiveImageTitle+1);
 	    String imageLocalized = getImageGalleryService().getLocalisedMessage("label.authoring.image", null);
 	    title = imageLocalized + " " + nextConsecutiveImageTitle;
 	}
-	item.setTitle(title);
+	image.setTitle(title);
 	
-	item.setDescription(itemForm.getDescription());	
-	item.setCreateByAuthor(true);
-	item.setHide(false);
+	image.setDescription(imageForm.getDescription());	
+	image.setCreateByAuthor(true);
+	image.setHide(false);
     }
 
     /**
@@ -1001,10 +999,12 @@
 	}
 	
 	//check for allowed format : gif, png, jpg
-	String contentType = itemForm.getFile().getContentType();
-	if (StringUtils.isEmpty(contentType) || !(contentType.equals("image/gif") || contentType.equals("image/png") || contentType.equals("image/jpg"))) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(ImageGalleryConstants.ERROR_MSG_NOT_ALLOWED_FORMAT));
-	}	
+	if (itemForm.getFile() != null) {
+	    String contentType = itemForm.getFile().getContentType();
+	    if (StringUtils.isEmpty(contentType) || !(contentType.equals("image/gif") || contentType.equals("image/png") || contentType.equals("image/jpg") || contentType.equals("image/jpeg") || contentType.equals("image/pjpeg"))) {
+		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(ImageGalleryConstants.ERROR_MSG_NOT_ALLOWED_FORMAT));
+	    }	
+	}
 
 	return errors;
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java	(.../ImageGalleryForm.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryForm.java	(.../ImageGalleryForm.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -60,6 +60,7 @@
     private FormFile onlineFile;
 
     private ImageGallery imageGallery;
+    private boolean allowRatingsOrVote;
 
     public ImageGalleryForm() {
 	imageGallery = new ImageGallery();
@@ -133,5 +134,13 @@
     public void setContentFolderID(String contentFolderID) {
 	this.contentFolderID = contentFolderID;
     }
+    
+    public boolean isAllowRatingsOrVote() {
+	return allowRatingsOrVote;
+    }
 
+    public void setAllowRatingsOrVote(boolean allowRatingsOrVote) {
+	this.allowRatingsOrVote = allowRatingsOrVote;
+    }
+
 }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java	(.../ImageGalleryItemForm.java)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java	(.../ImageGalleryItemForm.java)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -30,9 +30,7 @@
  * ImageGallery Item Form.
  * 
  * @struts.form name="imageGalleryItemForm"
- * @author Steve.Ni
- * 
- * @version $Revision$
+ * @author Andrey Balan
  */
 public class ImageGalleryItemForm extends ActionForm {
     private String imageIndex;
@@ -43,8 +41,6 @@
 
     private String title;
     private String description;
-    private String url;
-    private boolean openUrlNewWindow;
     // flag of this item has attachment or not
     private boolean hasFile;
     private Long fileUuid;
@@ -76,28 +72,21 @@
 	this.title = title;
     }
 
-    public String getUrl() {
-	return url;
-    }
-
-    public void setUrl(String url) {
-	this.url = url;
-    }
-
-	/**
-	 * Returns ImageGallery order index.
-	 * 
-	 * @return ImageGallery order index
-	 */
+    /**
+     * Returns ImageGallery order index.
+     * 
+     * @return ImageGallery order index
+     */
     public String getImageIndex() {
 	return imageIndex;
     }
 
-	/**
-	 * Sets ImageGallery order index.
-	 * 
-	 * @param imageIndex ImageGallery order index
-	 */
+    /**
+     * Sets ImageGallery order index.
+     * 
+     * @param imageIndex
+     *                ImageGallery order index
+     */
     public void setImageIndex(String imageIndex) {
 	this.imageIndex = imageIndex;
     }
@@ -134,14 +123,6 @@
 	this.hasFile = hasFile;
     }
 
-    public boolean isOpenUrlNewWindow() {
-	return openUrlNewWindow;
-    }
-
-    public void setOpenUrlNewWindow(boolean openUrlNewWindow) {
-	this.openUrlNewWindow = openUrlNewWindow;
-    }
-
     public String getSessionMapID() {
 	return sessionMapID;
     }
Index: lams_tool_images/web/includes/css/lightbox.css
===================================================================
diff -u
--- lams_tool_images/web/includes/css/lightbox.css	(revision 0)
+++ lams_tool_images/web/includes/css/lightbox.css	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -0,0 +1,26 @@
+#lightbox{
+	background-color:#eee;
+	padding: 10px;
+	border-bottom: 2px solid #666;
+	border-right: 2px solid #666;
+	}
+#lightboxDetails{
+	font-size: 0.8em;
+	padding-top: 0.4em;
+	}	
+#lightboxCaption{ float: left; }
+#keyboardMsg{ float: right; }
+#closeButton{ top: 5px; right: 5px; }
+
+#lightbox img{ border: none; clear: both;} 
+#overlay img{ border: none; }
+
+#overlay{ background-image: url(../images/overlay.png); }
+
+* html #overlay{
+	background-color: #333;
+	back\ground-color: transparent;
+	background-image: url(../images/blank.gif);
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../images/overlay.png", sizingMethod="scale");
+	}
+	
\ No newline at end of file
Index: lams_tool_images/web/includes/images/blank.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_images/web/includes/images/close.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_images/web/includes/images/loading.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_images/web/includes/images/overlay.png
===================================================================
diff -u
Binary files differ
Index: lams_tool_images/web/includes/javascript/lightbox.js
===================================================================
diff -u
--- lams_tool_images/web/includes/javascript/lightbox.js	(revision 0)
+++ lams_tool_images/web/includes/javascript/lightbox.js	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -0,0 +1,428 @@
+/*
+	Lightbox JS: Fullsize Image Overlays 
+	by Lokesh Dhakar - http://www.huddletogether.com
+
+	Table of Contents
+	-----------------
+	Configuration
+	
+	Functions
+	- getPageScroll()
+	- getPageSize()
+	- pause()
+	- getKey()
+	- listenKey()
+	- showLightbox()
+	- hideLightbox()
+	- initLightbox()
+	- addLoadEvent()
+	
+	Function Calls
+	- addLoadEvent(initLightbox)
+
+*/
+
+
+
+//
+// Configuration
+//
+
+// If you would like to use a custom loading image or close button reference them in the next two lines.
+var loadingImage = pathToImageFolder + "loading.gif";		
+var closeButton = pathToImageFolder + "close.gif";
+
+
+//
+// getPageScroll()
+// Returns array with x,y page scroll values.
+// Core code from - quirksmode.org
+//
+function getPageScroll(){
+
+	var yScroll;
+
+	if (self.pageYOffset) {
+		yScroll = self.pageYOffset;
+	} else if (document.documentElement && document.documentElement.scrollTop){	 // Explorer 6 Strict
+		yScroll = document.documentElement.scrollTop;
+	} else if (document.body) {// all other Explorers
+		yScroll = document.body.scrollTop;
+	}
+
+	arrayPageScroll = new Array('',yScroll) 
+	return arrayPageScroll;
+}
+
+
+
+//
+// getPageSize()
+// Returns array with page width, height and window width, height
+// Core code from - quirksmode.org
+// Edit for Firefox by pHaez
+//
+function getPageSize(){
+	
+	var xScroll, yScroll;
+	
+	if (window.innerHeight && window.scrollMaxY) {	
+		xScroll = document.body.scrollWidth;
+		yScroll = window.innerHeight + window.scrollMaxY;
+	} else if (document.body.scrollHeight > document.body.offsetHeight){ // all but Explorer Mac
+		xScroll = document.body.scrollWidth;
+		yScroll = document.body.scrollHeight;
+	} else { // Explorer Mac...would also work in Explorer 6 Strict, Mozilla and Safari
+		xScroll = document.body.offsetWidth;
+		yScroll = document.body.offsetHeight;
+	}
+	
+	var windowWidth, windowHeight;
+	if (self.innerHeight) {	// all except Explorer
+		windowWidth = self.innerWidth;
+		windowHeight = self.innerHeight;
+	} else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode
+		windowWidth = document.documentElement.clientWidth;
+		windowHeight = document.documentElement.clientHeight;
+	} else if (document.body) { // other Explorers
+		windowWidth = document.body.clientWidth;
+		windowHeight = document.body.clientHeight;
+	}	
+	
+	// for small pages with total height less then height of the viewport
+	if(yScroll < windowHeight){
+		pageHeight = windowHeight;
+	} else { 
+		pageHeight = yScroll;
+	}
+
+	// for small pages with total width less then width of the viewport
+	if(xScroll < windowWidth){	
+		pageWidth = windowWidth;
+	} else {
+		pageWidth = xScroll;
+	}
+
+
+	arrayPageSize = new Array(pageWidth,pageHeight,windowWidth,windowHeight) 
+	return arrayPageSize;
+}
+
+
+//
+// pause(numberMillis)
+// Pauses code execution for specified time. Uses busy code, not good.
+// Code from http://www.faqts.com/knowledge_base/view.phtml/aid/1602
+//
+function pause(numberMillis) {
+	var now = new Date();
+	var exitTime = now.getTime() + numberMillis;
+	while (true) {
+		now = new Date();
+		if (now.getTime() > exitTime)
+			return;
+	}
+}
+
+//
+// getKey(key)
+// Gets keycode. If 'x' is pressed then it hides the lightbox.
+//
+
+function getKey(e){
+	if (e == null) { // ie
+		keycode = event.keyCode;
+	} else { // mozilla
+		keycode = e.which;
+	}
+	key = String.fromCharCode(keycode).toLowerCase();
+	
+	if(key == 'x'){ hideLightbox(); }
+}
+
+
+//
+// listenKey()
+//
+function listenKey () {	document.onkeypress = getKey; }
+	
+
+//
+// showLightbox()
+// Preloads images. Pleaces new image in lightbox then centers and displays.
+//
+function showLightbox(objLink)
+{
+	// prep objects
+	var objOverlay = document.getElementById('overlay');
+	var objLightbox = document.getElementById('lightbox');
+	var objCaption = document.getElementById('lightboxCaption');
+	var objImage = document.getElementById('lightboxImage');
+	var objLoadingImage = document.getElementById('loadingImage');
+	var objLightboxDetails = document.getElementById('lightboxDetails');
+
+	
+	var arrayPageSize = getPageSize();
+	var arrayPageScroll = getPageScroll();
+
+	// center loadingImage if it exists
+	if (objLoadingImage) {
+		objLoadingImage.style.top = (arrayPageScroll[1] + ((arrayPageSize[3] - 35 - objLoadingImage.height) / 2) + 'px');
+		objLoadingImage.style.left = (((arrayPageSize[0] - 20 - objLoadingImage.width) / 2) + 'px');
+		objLoadingImage.style.display = 'block';
+	}
+
+	// set height of Overlay to take up whole page and show
+	objOverlay.style.height = (arrayPageSize[1] + 'px');
+	objOverlay.style.display = 'block';
+
+	// preload image
+	imgPreload = new Image();
+
+	imgPreload.onload=function(){
+		objImage.src = objLink.href;
+
+		// center lightbox and make sure that the top and left values are not negative
+		// and the image placed outside the viewport
+		var lightboxTop = arrayPageScroll[1] + ((arrayPageSize[3] - 35 - imgPreload.height) / 2);
+		var lightboxLeft = ((arrayPageSize[0] - 20 - imgPreload.width) / 2);
+		
+		objLightbox.style.top = (lightboxTop < 0) ? "0px" : lightboxTop + "px";
+		objLightbox.style.left = (lightboxLeft < 0) ? "0px" : lightboxLeft + "px";
+
+
+		objLightboxDetails.style.width = imgPreload.width + 'px';
+		
+		if(objLink.getAttribute('title')){
+			objCaption.style.display = 'block';
+			//objCaption.style.width = imgPreload.width + 'px';
+			objCaption.innerHTML = objLink.getAttribute('title');
+		} else {
+			objCaption.style.display = 'none';
+		}
+		
+		// A small pause between the image loading and displaying is required with IE,
+		// this prevents the previous image displaying for a short burst causing flicker.
+		if (navigator.appVersion.indexOf("MSIE")!=-1){
+			pause(250);
+		} 
+
+		if (objLoadingImage) {	objLoadingImage.style.display = 'none'; }
+
+		// Hide select boxes as they will 'peek' through the image in IE
+		selects = document.getElementsByTagName("select");
+        for (i = 0; i != selects.length; i++) {
+                selects[i].style.visibility = "hidden";
+        }
+
+	
+		objLightbox.style.display = 'block';
+
+		// After image is loaded, update the overlay height as the new image might have
+		// increased the overall page height.
+		arrayPageSize = getPageSize();
+		objOverlay.style.height = (arrayPageSize[1] + 'px');
+		
+		// Check for 'x' keypress
+		listenKey();
+
+		return false;
+	}
+
+	imgPreload.src = objLink.href;
+	
+}
+
+
+
+
+
+//
+// hideLightbox()
+//
+function hideLightbox()
+{
+	// get objects
+	objOverlay = document.getElementById('overlay');
+	objLightbox = document.getElementById('lightbox');
+
+	// hide lightbox and overlay
+	objOverlay.style.display = 'none';
+	objLightbox.style.display = 'none';
+
+	// make select boxes visible
+	selects = document.getElementsByTagName("select");
+    for (i = 0; i != selects.length; i++) {
+		selects[i].style.visibility = "visible";
+	}
+
+	// disable keypress listener
+	document.onkeypress = '';
+}
+
+
+
+
+//
+// initLightbox()
+// Function runs on window load, going through link tags looking for rel="lightbox".
+// These links receive onclick events that enable the lightbox display for their targets.
+// The function also inserts html markup at the top of the page which will be used as a
+// container for the overlay pattern and the inline image.
+//
+function initLightbox()
+{
+	
+	if (!document.getElementsByTagName){ return; }
+	var anchors = document.getElementsByTagName("a");
+
+	// loop through all anchor tags
+	for (var i=0; i<anchors.length; i++){
+		var anchor = anchors[i];
+
+		if (anchor.getAttribute("href") && (anchor.getAttribute("rel") == "lightbox")){
+			anchor.onclick = function () {showLightbox(this); return false;}
+		}
+	}
+
+	// the rest of this code inserts html at the top of the page that looks like this:
+	//
+	// <div id="overlay">
+	//		<a href="#" onclick="hideLightbox(); return false;"><img id="loadingImage" /></a>
+	//	</div>
+	// <div id="lightbox">
+	//		<a href="#" onclick="hideLightbox(); return false;" title="Click anywhere to close image">
+	//			<img id="closeButton" />		
+	//			<img id="lightboxImage" />
+	//		</a>
+	//		<div id="lightboxDetails">
+	//			<div id="lightboxCaption"></div>
+	//			<div id="keyboardMsg"></div>
+	//		</div>
+	// </div>
+	
+	var objBody = document.getElementsByTagName("body").item(0);
+	
+	// create overlay div and hardcode some functional styles (aesthetic styles are in CSS file)
+	var objOverlay = document.createElement("div");
+	objOverlay.setAttribute('id','overlay');
+	objOverlay.onclick = function () {hideLightbox(); return false;}
+	objOverlay.style.display = 'none';
+	objOverlay.style.position = 'absolute';
+	objOverlay.style.top = '0';
+	objOverlay.style.left = '0';
+	objOverlay.style.zIndex = '90';
+ 	objOverlay.style.width = '100%';
+	objBody.insertBefore(objOverlay, objBody.firstChild);
+	
+	var arrayPageSize = getPageSize();
+	var arrayPageScroll = getPageScroll();
+
+	// preload and create loader image
+	var imgPreloader = new Image();
+	
+	// if loader image found, create link to hide lightbox and create loadingimage
+	imgPreloader.onload=function(){
+
+		var objLoadingImageLink = document.createElement("a");
+		objLoadingImageLink.setAttribute('href','#');
+		objLoadingImageLink.onclick = function () {hideLightbox(); return false;}
+		objOverlay.appendChild(objLoadingImageLink);
+		
+		var objLoadingImage = document.createElement("img");
+		objLoadingImage.src = loadingImage;
+		objLoadingImage.setAttribute('id','loadingImage');
+		objLoadingImage.style.position = 'absolute';
+		objLoadingImage.style.zIndex = '150';
+		objLoadingImageLink.appendChild(objLoadingImage);
+
+		imgPreloader.onload=function(){};	//	clear onLoad, as IE will flip out w/animated gifs
+
+		return false;
+	}
+
+	imgPreloader.src = loadingImage;
+
+	// create lightbox div, same note about styles as above
+	var objLightbox = document.createElement("div");
+	objLightbox.setAttribute('id','lightbox');
+	objLightbox.style.display = 'none';
+	objLightbox.style.position = 'absolute';
+	objLightbox.style.zIndex = '100';	
+	objBody.insertBefore(objLightbox, objOverlay.nextSibling);
+	
+	// create link
+	var objLink = document.createElement("a");
+	objLink.setAttribute('href','#');
+	objLink.setAttribute('title','Click to close');
+	objLink.onclick = function () {hideLightbox(); return false;}
+	objLightbox.appendChild(objLink);
+
+	// preload and create close button image
+	var imgPreloadCloseButton = new Image();
+
+	// if close button image found, 
+	imgPreloadCloseButton.onload=function(){
+
+		var objCloseButton = document.createElement("img");
+		objCloseButton.src = closeButton;
+		objCloseButton.setAttribute('id','closeButton');
+		objCloseButton.style.position = 'absolute';
+		objCloseButton.style.zIndex = '200';
+		objLink.appendChild(objCloseButton);
+
+		return false;
+	}
+
+	imgPreloadCloseButton.src = closeButton;
+
+	// create image
+	var objImage = document.createElement("img");
+	objImage.setAttribute('id','lightboxImage');
+	objLink.appendChild(objImage);
+	
+	// create details div, a container for the caption and keyboard message
+	var objLightboxDetails = document.createElement("div");
+	objLightboxDetails.setAttribute('id','lightboxDetails');
+	objLightbox.appendChild(objLightboxDetails);
+
+	// create caption
+	var objCaption = document.createElement("div");
+	objCaption.setAttribute('id','lightboxCaption');
+	objCaption.style.display = 'none';
+	objLightboxDetails.appendChild(objCaption);
+
+	// create keyboard message
+	var objKeyboardMsg = document.createElement("div");
+	objKeyboardMsg.setAttribute('id','keyboardMsg');
+	objKeyboardMsg.innerHTML = 'press <a href="#" onclick="hideLightbox(); return false;"><kbd>x</kbd></a> to close';
+	objLightboxDetails.appendChild(objKeyboardMsg);
+
+
+}
+
+
+
+
+//
+// addLoadEvent()
+// Adds event to window.onload without overwriting currently assigned onload functions.
+// Function found at Simon Willison's weblog - http://simon.incutio.com/
+//
+function addLoadEvent(func)
+{	
+	var oldonload = window.onload;
+	if (typeof window.onload != 'function'){
+    	window.onload = func;
+	} else {
+		window.onload = function(){
+		oldonload();
+		func();
+		}
+	}
+
+}
+
+
+
+addLoadEvent(initLightbox);	// run initLightbox onLoad
\ No newline at end of file
Index: lams_tool_images/web/pages/authoring/advance.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -1,4 +1,21 @@
 <%@ include file="/common/taglibs.jsp"%>
+
+<script lang="javascript">
+	/**
+	 * Processes mouse click event on allowRatingsOrVote ckeckbox
+	 */
+	function allowRatingsOrVoteClicked() {
+		document.imageGalleryForm.allowVote.disabled = ! eval(document.imageGalleryForm.allowVote.disabled); 
+		document.imageGalleryForm.allowRank.disabled = ! eval(document.imageGalleryForm.allowRank.disabled);
+		if (document.imageGalleryForm.allowRatingsOrVote.checked) {
+			document.imageGalleryForm.allowVote.checked = true;
+		} else {
+			document.imageGalleryForm.allowVote.checked = false;
+			document.imageGalleryForm.allowRank.checked = false;
+		}		
+	}
+</script>
+	
 <c:set var="formBean"
 	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
@@ -30,16 +47,29 @@
 </p>
 
 <p class="small-space-top">
-	<input type="radio" name="imageGallery.allowVote" value="${true}" styleId="allowVote"
-		<c:if test="${formBean.imageGallery.allowVote}">checked="checked"</c:if> 
+	<html:checkbox property="allowRatingsOrVote" styleClass="noBorder" styleId="allowRatingsOrVote"
+		onclick="allowRatingsOrVoteClicked();"
+	>
+	</html:checkbox>
+	<label for="allowRatingsOrVote">
+		<fmt:message key="label.authoring.advance.allow.learner.ratings.or.vote" />
+	</label>
+	<br><br>
+	
+	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+	<input type="radio" name="imageGallery.allowVote" value="${true}" id="allowVote"
+		<c:if test="${formBean.imageGallery.allowVote}">checked="checked"</c:if>
+		<c:if test="${not (formBean.imageGallery.allowVote or formBean.imageGallery.allowRank)}">disabled="disabled"</c:if> 
 	/>
 	<label for="allowVote">
 		<fmt:message key="label.authoring.advance.allow.learner.vote" />
 	</label>
 	<br><br>
 
-	<input type="radio" name="imageGallery.allowVote" value="${false}" styleId="allowRank"
-		<c:if test="${not formBean.imageGallery.allowVote}">checked="checked"</c:if> 
+	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+	<input type="radio" name="imageGallery.allowVote" value="${false}" id="allowRank"
+		<c:if test="${formBean.imageGallery.allowRank}">checked="checked"</c:if> 
+		<c:if test="${not (formBean.imageGallery.allowVote or formBean.imageGallery.allowRank)}">disabled="disabled"</c:if>		
 	/>
 	<label for="allowRank">
 		<fmt:message key="label.authoring.advance.allow.learner.rank" />
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -1,4 +1,9 @@
 <%@ include file="/common/taglibs.jsp"%>
+<script type="text/javascript"> 
+	var pathToImageFolder = "<html:rewrite page='/includes/images/'/>"; 
+</script>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/lightbox.js'/>" ></script>
+<link rel="stylesheet" href="<html:rewrite page='/includes/css/lightbox.css'/>"  type="text/css">
 <c:set var="formBean"
 	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <script lang="javascript">
Index: lams_tool_images/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -1,6 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
 		"http://www.w3.org/TR/html4/loose.dtd">
-
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 	<lams:head>
Index: lams_tool_images/web/pages/authoring/parts/itemattachment.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -8,6 +8,15 @@
 				<td>
 					<c:out value="${itemAttachment.fileName}" />
 				</td>
+				
+			<td width="3%" align="left">
+				<c:set var="viewURL">
+					<html:rewrite page="/download/?uuid=${itemAttachment.fileUuid}&preferDownload=false" />
+				</c:set>
+				<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')" class="button"> <fmt:message key="label.view" /> </a> &nbsp;
+			</td>
+				
+				
 				<td>
 					<a href="#"	onclick="removeItemAttachment(${itemAttachment.imageIndex})" class="button">
 						<fmt:message key="label.delete" /> 
@@ -23,3 +32,14 @@
 		<input type="file" name="file" />
 	</c:otherwise>
 </c:choose>
+<!-- 
+<c:choose>
+	<c:when test="${itemAttachment.hasFile}">
+			<iframe
+				id="externalSpreadsheet" name="externalSpreadsheet" src="<html:rewrite page='/download/?uuid=${itemAttachment.fileUuid}&preferDownload=false' />"
+				style="width:99%;" frameborder="no" height="385px"
+				scrolling="no">
+			</iframe>
+	</c:when>
+</c:choose>
+-->
Index: lams_tool_images/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r2ded08a63789390122f15ab1c3c70075ed0d2a2e
--- lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e)
@@ -1,4 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
+
 <c:set var="ctxPath" value="${pageContext.request.contextPath}"
 	scope="request" />
 
@@ -12,18 +13,24 @@
 		<img src="${ctxPath}/includes/images/indicator.gif"
 			style="display:none" id="imageGalleryListArea_Busy" />
 	</h2>
-
+	
 	<table class="alternative-color" id="itemTable" cellspacing="0">
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-		<c:forEach var="imageGallery" items="${sessionMap.imageGalleryList}"
-			varStatus="status">
+		<c:forEach var="image" items="${sessionMap.imageGalleryList}" varStatus="status">
 			<tr>
-				<td class="field-name align-right" width="4%">
-					<fmt:message key="label.authoring.basic.resource.image" />
+				<td class="field-name align-center" width="4%">
+					<c:set var="thumbnailPath">
+					   	<html:rewrite page='/download/?uuid='/>${image.thumbnailFileUuid}&preferDownload=false
+					</c:set>
+				 	<c:set var="mediumImagePath">
+	   					<html:rewrite page='/download/?uuid='/>${image.mediumFileUuid}&preferDownload=false
+					</c:set>					
+					<a href="${mediumImagePath}" rel="lightbox" title="Enlarge image"><img src="${thumbnailPath}" /></a>
 				</td>
-				<td> 
-					${imageGallery.title}
+				
+				<td>
+					<a href="${mediumImagePath}" rel="lightbox" title="Enlarge image">${image.title}</a>
 				</td>
 
 <%--				
@@ -34,7 +41,7 @@
 				</td>
 --%>
 				
-				<td width="40px" align="center">
+				<td width="40px" style="valign:bottom;">
 					<c:if test="${not status.first}">
 						<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
 							border="0" title="<fmt:message key="label.authoring.up"/>"
@@ -59,7 +66,7 @@
 					</c:if>
 				</td>
 				
-				<td width="20px">
+				<td width="20px" >
 					<img src="${tool}includes/images/edit.gif"
 						title="<fmt:message key="label.authoring.basic.resource.edit" />"
 						onclick="editItem(${status.index},'${sessionMapID}')" />