Index: lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml
===================================================================
diff -u
--- lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	(revision 0)
+++ lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery"
+        table="tl_laimag10_imagegallery"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-ImageGallery.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="created"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="create_date"
+        />
+
+        <property
+            name="updated"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="update_date"
+        />
+
+        <many-to-one
+            name="createdBy"
+            class="org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser"
+            cascade="save-update"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="create_by"
+        />
+
+        <property
+            name="title"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="title"
+        />
+
+        <property
+            name="lockWhenFinished"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="lock_on_finished"
+        />
+
+        <property
+            name="instructions"
+            type="text"
+            update="true"
+            insert="true"
+            column="instructions"
+        />
+
+        <property
+            name="nextImageTitle"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="next_image_title"
+        />
+
+        <set
+            name="imageGalleryItems"
+            lazy="true"
+            inverse="false"
+            cascade="all"
+            sort="unsorted"
+            order-by="create_date desc"
+        >
+
+            <key
+                column="imageGallery_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem"
+            />
+
+        </set>
+
+        <property
+            name="contentInUse"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="content_in_use"
+        />
+
+        <property
+            name="defineLater"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="define_later"
+        />
+
+        <property
+            name="contentId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="content_id"
+            unique="true"
+        />
+
+        <property
+            name="allowCommentImages"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_comment_images"
+        />
+
+        <property
+            name="allowShareImages"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_share_images"
+        />
+
+        <property
+            name="allowVote"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_vote"
+        />
+
+        <property
+            name="reflectInstructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="reflect_instructions"
+        />
+
+        <property
+            name="reflectOnActivity"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="reflect_on_activity"
+        />
+
+        <property
+            name="allowRank"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_rank"
+        />
+
+        <set
+            name="ratingCriterias"
+            lazy="true"
+            inverse="false"
+            cascade="all"
+            sort="unsorted"
+            order-by="order_id asc"
+        >
+
+            <key
+                column="tool_content_id"
+				property-ref="contentId"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.rating.model.RatingCriteria"
+            />
+
+        </set>
+
+        <property
+            name="notifyTeachersOnImageSumbit"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="image_submit_notify"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-ImageGallery.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r9dcdc46408a8664a0fb27f09ae58a340c15f5764 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9dcdc46408a8664a0fb27f09ae58a340c15f5764)
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -168,5 +168,8 @@
 label.learning.delete.image  =Delete image
 label.submit  =Finish
 
+label.rating.criterias  =Rating criterias
+label.add.criteria  =Add Criteria
+label.number.of.votes  ={0} / {1} votes
 
 #======= End labels: Exported 161 labels for en AU =====
Index: lams_tool_images/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 6d674e346dea6ce7a824366c8a7c315660677744)
+++ lams_tool_images/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -172,14 +172,6 @@
 			validate="false">			
 			<forward name="success" path="/pages/learning/parts/commentsarea.jsp" />
 		</action>
-		<action path="/learning/saveOrUpdateRating"
-			type="org.lamsfoundation.lams.tool.imageGallery.web.action.LearningAction"
-			parameter="saveOrUpdateRating"
-			name="imageRatingForm" 
-			scope="request" 
-			validate="false">			
-			<forward name="success" path="/pages/learning/parts/commentsarea.jsp" />
-		</action>
 		<action path="/learning/vote"
 			type="org.lamsfoundation.lams.tool.imageGallery.web.action.LearningAction"
 			parameter="vote"
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java
===================================================================
diff -u -r7041999fcaee0534c3b48e9cea84934662d2de51 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	(.../ImageGalleryConstants.java)	(revision 7041999fcaee0534c3b48e9cea84934662d2de51)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java	(.../ImageGalleryConstants.java)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -44,11 +44,8 @@
     public static final String PARAM_TITLE = "title";
     public static final String PARAM_COMMENTS = "comments";
     public static final String PARAM_CURRENT_IMAGE = "currentImage";
-    public static final String PARAM_CURRENT_RATING = "currentRating";
     public static final String PARAM_IS_VOTED = "isVoted";
     public static final String PARAM_IS_AUTHOR = "isAuthor";
-    public static final String PARAM_NUMBER_RATINGS = "numberRatings";
-    public static final String PARAM_AVERAGE_RATING = "averageRating";
 
     // for request attribute name
     public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
@@ -79,6 +76,7 @@
     public static final String ATTR_MEDIUM_IMAGE_DIMENSIONS = "mediumImageDimensions";
     public static final String ATTR_THUMBNAIL_IMAGE_DIMENSIONS = "thumbnailImageDimensions";
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
+    public static final String ATTR_RATING_DTOS = "ratingDtos";
     
     // error message keys
     public static final String ERROR_MSG_NOT_ALLOWED_FORMAT = "error.resource.image.not.alowed.format";
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
===================================================================
diff -u -r3ff38201dcc90ccdf402ac3ba094b0c05fd32d05 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision 3ff38201dcc90ccdf402ac3ba094b0c05fd32d05)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -122,7 +122,8 @@
 			<ref bean="eventNotificationService"/>
 		</property>
    		<property name="messageService"><ref bean="laimagMessageService"/></property>
-		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>  
+		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
+		<property name="ratingService"><ref bean="ratingService"/></property>
 		<property name="imageGalleryOutputFactory"><ref bean="imageGalleryOutputFactory"/></property> 
 				
     </bean>
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java
===================================================================
diff -u -r4d7dfe83093db060d8edeab425ce01543b38b530 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	(.../ImageGallery.java)	(revision 4d7dfe83093db060d8edeab425ce01543b38b530)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	(.../ImageGallery.java)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -23,25 +23,18 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.imageGallery.model;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryToolContentHandler;
+import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
 
 /**
  * ImageGallery
  * 
- * @hibernate.class table="tl_laimag10_imagegallery"
- * 
  */
 public class ImageGallery implements Cloneable {
 
@@ -56,13 +49,13 @@
     private String title;
 
     private String instructions;
-    
+
     private Long nextImageTitle;
 
     // advance
 
     private boolean allowVote;
-    
+
     private boolean allowCommentImages;
 
     private boolean allowShareImages;
@@ -75,6 +68,8 @@
 
     private boolean allowRank;
 
+    private Set<LearnerItemRatingCriteria> ratingCriterias;
+
     // general infomation
     private Date created;
 
@@ -88,7 +83,7 @@
     private boolean reflectOnActivity;
 
     private String reflectInstructions;
-    
+
     private boolean notifyTeachersOnImageSumbit;
 
     /**
@@ -116,6 +111,15 @@
 		item.setCreateBy(toContent.getCreatedBy());
 	    }
 	}
+
+	// reset contentId
+	if (toContent.getRatingCriterias() != null) {
+	    Set<LearnerItemRatingCriteria> criterias = toContent.getRatingCriterias();
+	    for (LearnerItemRatingCriteria criteria : criterias) {
+		criteria.setToolContentId(contentId);
+	    }
+	}
+
 	return toContent;
     }
 
@@ -126,21 +130,34 @@
 	try {
 	    imageGallery = (ImageGallery) super.clone();
 	    imageGallery.setUid(null);
+
+	    // clone imageGalleryItems as well
 	    if (imageGalleryItems != null) {
-		Iterator iter = imageGalleryItems.iterator();
-		Set set = new HashSet();
-		while (iter.hasNext()) {
-		    ImageGalleryItem item = (ImageGalleryItem) iter.next();
+		Set<ImageGalleryItem> newItems = new HashSet<ImageGalleryItem>();
+		for (ImageGalleryItem item : (Set<ImageGalleryItem>) imageGalleryItems) {
 		    ImageGalleryItem newItem = (ImageGalleryItem) item.clone();
 		    // just clone old file without duplicate it in repository
-		    set.add(newItem);
+		    newItems.add(newItem);
 		}
-		imageGallery.imageGalleryItems = set;
+		imageGallery.imageGalleryItems = newItems;
 	    }
-	    // clone ReourceUser as well
+
+	    // clone ImageGalleryUser as well
 	    if (createdBy != null) {
 		imageGallery.setCreatedBy((ImageGalleryUser) createdBy.clone());
 	    }
+
+	    // clone ratingCriterias as well
+	    if (ratingCriterias != null) {
+		Set<LearnerItemRatingCriteria> newCriterias = new HashSet<LearnerItemRatingCriteria>();
+		for (LearnerItemRatingCriteria criteria : (Set<LearnerItemRatingCriteria>) ratingCriterias) {
+		    LearnerItemRatingCriteria newCriteria = (LearnerItemRatingCriteria) criteria.clone();
+		    // just clone old file without duplicate it in repository
+		    newCriterias.add(newCriteria);
+		}
+		imageGallery.ratingCriterias = newCriterias;
+	    }
+
 	} catch (CloneNotSupportedException e) {
 	    ImageGallery.log.error("When clone " + ImageGallery.class + " failed");
 	}
@@ -159,14 +176,15 @@
 
 	final ImageGallery genericEntity = (ImageGallery) o;
 
-	return new EqualsBuilder().append(uid, genericEntity.uid).append(title, genericEntity.title).append(
-		instructions, genericEntity.instructions).append(created, genericEntity.created)
+	return new EqualsBuilder().append(uid, genericEntity.uid).append(title, genericEntity.title)
+		.append(instructions, genericEntity.instructions).append(created, genericEntity.created)
 		.append(updated, genericEntity.updated).append(createdBy, genericEntity.createdBy).isEquals();
     }
 
     @Override
     public int hashCode() {
-	return new HashCodeBuilder().append(uid).append(title).append(instructions).append(created).append(updated).append(createdBy).toHashCode();
+	return new HashCodeBuilder().append(uid).append(title).append(instructions).append(created).append(updated)
+		.append(createdBy).toHashCode();
     }
 
     /**
@@ -188,7 +206,6 @@
      * Returns the object's creation date
      * 
      * @return date
-     * @hibernate.property column="create_date"
      */
     public Date getCreated() {
 	return created;
@@ -207,7 +224,6 @@
      * Returns the object's date of last update
      * 
      * @return date updated
-     * @hibernate.property column="update_date"
      */
     public Date getUpdated() {
 	return updated;
@@ -225,23 +241,20 @@
     /**
      * @return Returns the userid of the user who created the Share imageGallery.
      * 
-     * @hibernate.many-to-one cascade="save-update" column="create_by"
-     * 
      */
     public ImageGalleryUser getCreatedBy() {
 	return createdBy;
     }
 
     /**
      * @param createdBy
-     *                The userid of the user who created this Share imageGallery.
+     *            The userid of the user who created this Share imageGallery.
      */
     public void setCreatedBy(ImageGalleryUser createdBy) {
 	this.createdBy = createdBy;
     }
 
     /**
-     * @hibernate.id column="uid" generator-class="native"
      */
     public Long getUid() {
 	return uid;
@@ -254,16 +267,14 @@
     /**
      * @return Returns the title.
      * 
-     * @hibernate.property column="title"
-     * 
      */
     public String getTitle() {
 	return title;
     }
 
     /**
      * @param title
-     *                The title to set.
+     *            The title to set.
      */
     public void setTitle(String title) {
 	this.title = title;
@@ -272,25 +283,21 @@
     /**
      * @return Returns the lockWhenFinish.
      * 
-     * @hibernate.property column="lock_on_finished"
-     * 
      */
     public boolean getLockWhenFinished() {
 	return lockWhenFinished;
     }
 
     /**
      * @param lockWhenFinished
-     *                Set to true to lock the imageGallery for finished users.
+     *            Set to true to lock the imageGallery for finished users.
      */
     public void setLockWhenFinished(boolean lockWhenFinished) {
 	this.lockWhenFinished = lockWhenFinished;
     }
 
     /**
      * @return Returns the instructions set by the teacher.
-     * 
-     * @hibernate.property column="instructions" type="text"
      */
     public String getInstructions() {
 	return instructions;
@@ -299,11 +306,9 @@
     public void setInstructions(String instructions) {
 	this.instructions = instructions;
     }
-    
+
     /**
      * @return Returns the next condecutive integer for constructing image title.
-     * 
-     * @hibernate.property column="next_image_title"
      */
     public Long getNextImageTitle() {
 	return nextImageTitle;
@@ -315,11 +320,6 @@
 
     /**
      * 
-     * 
-     * @hibernate.set lazy="true" inverse="false" cascade="all" order-by="create_date desc"
-     * @hibernate.collection-key column="imageGallery_uid"
-     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem"
-     * 
      * @return
      */
     public Set getImageGalleryItems() {
@@ -331,7 +331,6 @@
     }
 
     /**
-     * @hibernate.property column="content_in_use"
      * @return
      */
     public boolean isContentInUse() {
@@ -343,7 +342,6 @@
     }
 
     /**
-     * @hibernate.property column="define_later"
      * @return
      */
     public boolean isDefineLater() {
@@ -355,7 +353,6 @@
     }
 
     /**
-     * @hibernate.property column="content_id" unique="true"
      * @return
      */
     public Long getContentId() {
@@ -367,7 +364,6 @@
     }
 
     /**
-     * @hibernate.property column="allow_comment_images"
      * @return
      */
     public boolean isAllowCommentImages() {
@@ -379,7 +375,6 @@
     }
 
     /**
-     * @hibernate.property column="allow_share_images"
      * @return
      */
     public boolean isAllowShareImages() {
@@ -391,7 +386,6 @@
     }
 
     /**
-     * @hibernate.property column="allow_vote"
      * @return
      */
     public boolean isAllowVote() {
@@ -403,7 +397,6 @@
     }
 
     /**
-     * @hibernate.property column="reflect_instructions"
      * @return
      */
     public String getReflectInstructions() {
@@ -415,7 +408,6 @@
     }
 
     /**
-     * @hibernate.property column="reflect_on_activity"
      * @return
      */
     public boolean isReflectOnActivity() {
@@ -427,7 +419,6 @@
     }
 
     /**
-     * @hibernate.property column="allow_rank"
      * @return
      */
     public boolean isAllowRank() {
@@ -439,9 +430,20 @@
     }
 
     /**
-     * @hibernate.property column="image_submit_notify"
+     * 
      * @return
      */
+    public Set<LearnerItemRatingCriteria> getRatingCriterias() {
+	return ratingCriterias;
+    }
+
+    public void setRatingCriterias(Set<LearnerItemRatingCriteria> ratingCriterias) {
+	this.ratingCriterias = ratingCriterias;
+    }
+
+    /**
+     * @return
+     */
     public boolean isNotifyTeachersOnImageSumbit() {
 	return notifyTeachersOnImageSumbit;
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java
===================================================================
diff -u -r7041999fcaee0534c3b48e9cea84934662d2de51 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	(.../ImageGalleryItem.java)	(revision 7041999fcaee0534c3b48e9cea84934662d2de51)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java	(.../ImageGalleryItem.java)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -36,7 +36,6 @@
  * @hibernate.class table="tl_laimag10_imagegallery_item"
  * 
  * @author Andrey Balan
- * 
  */
 public class ImageGalleryItem implements Cloneable {
 
@@ -108,6 +107,7 @@
 	try {
 	    image = (ImageGalleryItem) super.clone();
 	    image.setUid(null);
+	    
 	    // clone ImageGalleryUser as well
 	    if (this.createBy != null) {
 		image.setCreateBy((ImageGalleryUser) this.createBy.clone());
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java
===================================================================
diff -u -rde59f382658daefe4f6679aaaea621284d1c72cc -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java	(.../ImageGallerySession.java)	(revision de59f382658daefe4f6679aaaea621284d1c72cc)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.java	(.../ImageGallerySession.java)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -30,7 +30,7 @@
 /**
  * ImageGallery
  * 
- * @author Dapeng Ni
+ * @author Andrey Balan
  * 
  * @hibernate.class table="tl_laimag10_session"
  * 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
diff -u -rbb597b8155375e6ac4dfe280f630d323b6e5e575 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision bb597b8155375e6ac4dfe280f630d323b6e5e575)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -28,21 +28,19 @@
 import java.util.Set;
 
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.rating.dto.RatingDTO;
+import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.imageGallery.dto.Summary;
 import org.lamsfoundation.lams.tool.imageGallery.dto.UserImageContributionDTO;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryAttachment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryConfigItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageRating;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageVote;
-import org.lamsfoundation.lams.usermanagement.User;
 
 /**
  * @author Dapeng.Ni
@@ -151,14 +149,13 @@
      */
     void deleteImage(Long toolSessionId, Long imageUid);
     
-    /**
-     * Save/update ImageRating.
-     * 
-     * @param rating
-     *            ImageRating
-     * @return
-     */
-    void saveOrUpdateImageRating(ImageRating rating);
+    List<RatingCriteria> getRatingCriterias(Long toolContentId);
+    
+    void saveOrUpdateRatingCriteria(RatingCriteria criteria);
+    
+    void deleteRatingCriteria(Long ratingCriteriaId);
+    
+    List<RatingDTO> getRatingDtos(ImageGallery imageGallery, Long imageUid, Long userId);
 
     /**
      * Save/update ImageVote.
@@ -216,15 +213,6 @@
     ImageGallery getImageGalleryByContentId(Long contentId);
     
     /**
-     * Returns imageRating by the given imageUid and userId
-     * 
-     * @param imageUid
-     * @param userId
-     * @return
-     */
-    ImageRating getImageRatingByImageAndUser(Long imageUid, Long userId);
-    
-    /**
      * Returns imageVote by the given imageUid and userId
      * 
      * @param imageUid
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -rcdec304befa7df4b107e2219638b27ef75fb49a5 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision cdec304befa7df4b107e2219638b27ef75fb49a5)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -33,6 +33,7 @@
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -52,10 +53,12 @@
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
-import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.rating.dto.RatingDTO;
+import org.lamsfoundation.lams.rating.model.RatingCriteria;
+import org.lamsfoundation.lams.rating.service.IRatingService;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolOutput;
@@ -152,6 +155,8 @@
     private IExportToolContentService exportContentService;
 
     private ICoreNotebookService coreNotebookService;
+    
+    private IRatingService ratingService;
 
     private IEventNotificationService eventNotificationService;
 
@@ -230,16 +235,6 @@
 	saveOrUpdateImageGallery(imageGallery);
     }
 
-    @Override
-    public ImageRating getImageRatingByImageAndUser(Long imageUid, Long userId) {
-	return imageRatingDao.getImageRatingByImageAndUser(imageUid, userId);
-    }
-
-    @Override
-    public void saveOrUpdateImageRating(ImageRating rating) {
-	imageRatingDao.saveObject(rating);
-    }
-
     public ImageVote getImageVoteByImageAndUser(Long imageUid, Long userId) {
 	return imageVoteDao.getImageVoteByImageAndUser(imageUid, userId);
     }
@@ -377,6 +372,22 @@
     public void updateEntry(NotebookEntry notebookEntry) {
 	coreNotebookService.updateEntry(notebookEntry);
     }
+    
+    @Override
+    public List<RatingCriteria> getRatingCriterias(Long toolContentId) {
+	List<RatingCriteria> ratingCriterias = ratingService.getCriteriasByToolContentId(toolContentId);
+	return ratingCriterias;
+    }
+    
+    @Override
+    public void saveOrUpdateRatingCriteria(RatingCriteria criteria) {
+	ratingService.saveOrUpdateRatingCriteria(criteria);
+    }
+    
+    @Override
+    public void deleteRatingCriteria(Long ratingCriteriaId) {
+	ratingService.deleteRatingCriteria(ratingCriteriaId);
+    }
 
     @Override
     public ImageGalleryUser getUser(Long uid) {
@@ -1092,6 +1103,10 @@
     public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 	this.coreNotebookService = coreNotebookService;
     }
+    
+    public void setRatingService(IRatingService ratingService) {
+	this.ratingService = ratingService;
+    }
 
     public void setEventNotificationService(IEventNotificationService eventNotificationService) {
 	this.eventNotificationService = eventNotificationService;
@@ -1134,9 +1149,7 @@
 	return images;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Deprecated
     public Object[] getRatingForGroup(Long imageUid, Long sessionId) {
 	List<ImageGalleryUser> users = imageGalleryUserDao.getBySessionID(sessionId);
 	Long numberRatings = new Long(0);
@@ -1157,6 +1170,20 @@
 
 	return new Object[] { numberRatings, averageRating };
     }
+    
+    @Override
+    public List<RatingDTO> getRatingDtos(ImageGallery imageGallery, Long imageUid, Long userId) {
+	List<RatingDTO> ratingDtos = new LinkedList<RatingDTO>();
+	
+	for (RatingCriteria criteria : imageGallery.getRatingCriterias()) {
+	    RatingDTO ratingDto = ratingService.getRatingDTOByUser(criteria.getRatingCriteriaId(), imageUid, userId.intValue());
+	    ratingDto.setRatingCriteria(criteria);
+	    
+	    ratingDtos.add(ratingDto);
+	}
+	
+	return ratingDtos;	
+    }
 
     // *****************************************************************************
     // private methods
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
diff -u -r7041999fcaee0534c3b48e9cea84934662d2de51 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7041999fcaee0534c3b48e9cea84934662d2de51)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -26,10 +26,11 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -52,11 +53,11 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
-import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
+import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryAttachment;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
 import org.lamsfoundation.lams.tool.imageGallery.service.IImageGalleryService;
@@ -223,6 +224,10 @@
 	SortedSet<ImageGalleryItem> imageGalleryItemList = getImageList(sessionMap);
 	imageGalleryItemList.clear();
 	imageGalleryItemList.addAll(items);
+	
+	// get rating criterias from DB
+	List<RatingCriteria> ratingCriterias = service.getRatingCriterias(contentId);
+	sessionMap.put(AttributeNames.ATTR_RATING_CRITERIAS, ratingCriterias);
 
 	sessionMap.put(ImageGalleryConstants.ATTR_IMAGE_GALLERY_FORM, imageGalleryForm);
 	sessionMap.put(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE, imageGallery.getNextImageTitle());
@@ -293,10 +298,10 @@
 
 	ImageGallery imageGallery = imageGalleryForm.getImageGallery();
 	IImageGalleryService service = getImageGalleryService();
+	Long contentId = imageGalleryForm.getImageGallery().getContentId();
 
 	// **********************************Get ImageGallery PO*********************
-	ImageGallery imageGalleryPO = service.getImageGalleryByContentId(imageGalleryForm.getImageGallery()
-		.getContentId());
+	ImageGallery imageGalleryPO = service.getImageGalleryByContentId(contentId);
 	if (imageGalleryPO == null) {
 	    // new ImageGallery, create it.
 	    imageGalleryPO = imageGallery;
@@ -327,7 +332,7 @@
 	// get back login user DTO
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	ImageGalleryUser imageGalleryUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()),
-		imageGalleryForm.getImageGallery().getContentId());
+		contentId);
 	if (imageGalleryUser == null) {
 	    imageGalleryUser = new ImageGalleryUser(user, imageGalleryPO);
 	}
@@ -368,7 +373,42 @@
 	    ImageGalleryItem delAtt = (ImageGalleryItem) iter.next();
 	    iter.remove();
 	}
+	
+	// ************************* Handle rating criterias *******************
+	List<RatingCriteria> ratingCriterias = (List<RatingCriteria>) sessionMap.get(AttributeNames.ATTR_RATING_CRITERIAS);
+	Map<Integer, RatingCriteria> mapOrderIdToRatingCriteria = new HashMap<Integer, RatingCriteria>();
+	for (RatingCriteria ratingCriteriaIter : ratingCriterias) {
+	    mapOrderIdToRatingCriteria.put(ratingCriteriaIter.getOrderId(), ratingCriteriaIter);
+	}
+	
+	int criteriaMaxOrderId = WebUtil.readIntParam(request, "criteriaMaxOrderId");
+	//i is equal to an old orderId
+	for (int i=1; i<=criteriaMaxOrderId; i++) {
+	    
+	    String criteriaTitle = WebUtil.readStrParam(request, "criteriaTitle" + i, true);
+	    
+	    RatingCriteria ratingCriteria = mapOrderIdToRatingCriteria.get(i);
+	    if (StringUtils.isNotBlank(criteriaTitle)) {
+		int newCriteriaOrderId = WebUtil.readIntParam(request, "criteriaOrderId" + i);
 
+		// modify existing one if it exists. add otherwise
+		if (ratingCriteria == null) {
+		    ratingCriteria = new LearnerItemRatingCriteria();
+		    ratingCriteria.setRatingCriteriaTypeId(LearnerItemRatingCriteria.LEARNER_ITEM_CRITERIA_TYPE);
+		    ((LearnerItemRatingCriteria) ratingCriteria).setToolContentId(contentId);
+		}
+
+		ratingCriteria.setOrderId(newCriteriaOrderId);
+		ratingCriteria.setTitle(criteriaTitle);
+		service.saveOrUpdateRatingCriteria(ratingCriteria);
+	    
+	    //delete
+	    } else if (ratingCriteria != null) {
+		service.deleteRatingCriteria(ratingCriteria.getRatingCriteriaId());
+	    }
+	    
+	}
+
 	// **********************************************
 	// finally persist imageGalleryPO again
 	service.saveOrUpdateImageGallery(imageGalleryPO);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
diff -u -r6c4f0e1c0f459cf029ae028396b5435a12eb7516 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 6c4f0e1c0f459cf029ae028396b5435a12eb7516)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	(.../LearningAction.java)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -37,7 +37,6 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionErrors;
@@ -49,12 +48,11 @@
 import org.apache.struts.action.ActionRedirect;
 import org.apache.struts.config.ForwardConfig;
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.events.DeliveryMethodMail;
-import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.rating.dto.RatingDTO;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment;
@@ -63,7 +61,6 @@
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageRating;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageVote;
 import org.lamsfoundation.lams.tool.imageGallery.service.IImageGalleryService;
 import org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryException;
@@ -74,7 +71,6 @@
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageRatingForm;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.MultipleImagesForm;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ReflectionForm;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -127,9 +123,6 @@
 	if (param.equals("addNewComment")) {
 	    return addNewComment(mapping, form, request, response);
 	}
-	if (param.equals("saveOrUpdateRating")) {
-	    return saveOrUpdateRating(mapping, form, request, response);
-	}
 	if (param.equals("vote")) {
 	    return vote(mapping, form, request, response);
 	}
@@ -203,6 +196,7 @@
 	sessionMap.put(ImageGalleryConstants.ATTR_LOCK_ON_FINISH, imageGallery.getLockWhenFinished());
 	sessionMap.put(ImageGalleryConstants.ATTR_USER_FINISHED,
 		imageGalleryUser != null && imageGalleryUser.isSessionFinished());
+	sessionMap.put(AttributeNames.PARAM_USER_ID, imageGalleryUser.getUserId());
 
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 	sessionMap.put(AttributeNames.ATTR_MODE, mode);
@@ -467,9 +461,7 @@
 	Long sessionId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_SESSION_ID);
 	IImageGalleryService service = getImageGalleryService();
 	ImageGallery imageGallery = service.getImageGalleryBySessionId(sessionId);
-	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-	ImageGalleryUser imageGalleryUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()),
-		sessionId);
+	Long userId = (Long) sessionMap.get(AttributeNames.PARAM_USER_ID);
 
 	Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID));
 	ImageGalleryItem image = service.getImageGalleryItemByUid(imageUid);
@@ -487,7 +479,7 @@
 	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
 	boolean isTeacher = mode != null && mode.isTeacher();
 	boolean isAuthor = !isTeacher && !image.isCreateByAuthor() && (createdBy != null)
-		&& (createdBy.getUserId().equals(imageGalleryUser.getUserId()));
+		&& (createdBy.getUserId().equals(userId));
 
 	if (imageGallery.isAllowCommentImages()) {
 	    TreeSet<ImageComment> comments = new TreeSet<ImageComment>(new ImageCommentComparator());
@@ -504,18 +496,13 @@
 	}
 
 	if (!isTeacher && imageGallery.isAllowRank()) {
-	    ImageRating imageRating = service.getImageRatingByImageAndUser(imageUid, imageGalleryUser.getUserId());
-	    int rating = imageRating == null ? 0 : imageRating.getRating();
-
-	    Object[] ratingForGroup = service.getRatingForGroup(imageUid, sessionId);
-	    sessionMap.put(ImageGalleryConstants.PARAM_NUMBER_RATINGS, ((Long) ratingForGroup[0]).toString());
-	    sessionMap.put(ImageGalleryConstants.PARAM_AVERAGE_RATING, ((Float) ratingForGroup[1]).toString());
-	    sessionMap.put(ImageGalleryConstants.PARAM_CURRENT_RATING, rating);
+	    List<RatingDTO> ratingDtos = service.getRatingDtos(imageGallery, imageUid, userId);
+	    sessionMap.put(ImageGalleryConstants.ATTR_RATING_DTOS, ratingDtos);
 	}
 
 	if (!isTeacher && imageGallery.isAllowVote()) {
 	    boolean isVotedForThisImage = false;
-	    ImageVote imageVote = service.getImageVoteByImageAndUser(image.getUid(), imageGalleryUser.getUserId());
+	    ImageVote imageVote = service.getImageVoteByImageAndUser(image.getUid(), userId);
 	    if (imageVote != null && imageVote.isVoted()) {
 		isVotedForThisImage = true;
 	    }
@@ -595,47 +582,6 @@
      * @param response
      * @return
      */
-    private ActionForward saveOrUpdateRating(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
-	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	Long sessionId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_SESSION_ID);
-	IImageGalleryService service = getImageGalleryService();
-
-	int rating = NumberUtils.stringToInt(((ImageRatingForm) form).getRating());
-	Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID));
-	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-	ImageGalleryUser imageGalleryUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()),
-		sessionId);
-	ImageRating imageRating = service.getImageRatingByImageAndUser(imageUid, imageGalleryUser.getUserId());
-
-	// persist ImageGalleryItem changes in DB
-	ImageGalleryItem dbImage = service.getImageGalleryItemByUid(imageUid);
-	if (imageRating == null) { // add
-	    imageRating = new ImageRating();
-	    imageRating.setCreateBy(imageGalleryUser);
-	    imageRating.setImageGalleryItem(dbImage);
-	}
-	imageRating.setRating(rating);
-	service.saveOrUpdateImageRating(imageRating);
-
-	// to make available new changes be visible in jsp page
-	sessionMap.put(ImageGalleryConstants.PARAM_CURRENT_IMAGE, dbImage);
-	sessionMap.put(ImageGalleryConstants.PARAM_CURRENT_RATING, rating);
-
-	request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(ImageGalleryConstants.SUCCESS);
-    }
-
-    /**
-     * Move down current item.
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
     private ActionForward vote(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	String sessionMapID = WebUtil.readStrParam(request, ImageGalleryConstants.ATTR_SESSION_MAP_ID);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java
===================================================================
diff -u -r7041999fcaee0534c3b48e9cea84934662d2de51 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 7041999fcaee0534c3b48e9cea84934662d2de51)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -48,7 +48,6 @@
 import org.lamsfoundation.lams.tool.imageGallery.dto.UserImageContributionDTO;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem;
-import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession;
 import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser;
 import org.lamsfoundation.lams.tool.imageGallery.service.IImageGalleryService;
 import org.lamsfoundation.lams.tool.imageGallery.service.ImageGalleryException;
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -0,0 +1,212 @@
+<% 
+ /**
+  * AuthoringRatingCriteria.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+
+<!-- begin tab content -->
+<script type="text/javascript">
+$(document).ready(function() { 
+	
+	// find max orderId
+	<c:set var="maxOrderId" value="0"/>
+	<c:forEach var="criteria" items="${criterias}" varStatus="status">
+		<c:if test="${criteria.orderId > maxOrderId}">
+			<c:set var="maxOrderId" value="${criteria.orderId}"/>
+		</c:if>
+	</c:forEach>
+	var maxOrderId = ${maxOrderId};
+	
+	function addCriteria() {
+		//increase maxOrderId by 1
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		
+		jQuery('<tr/>').append(jQuery('<td/>', {
+			'class': 'criteria-info',
+		    html: '<input type="hidden" name="criteriaOrderId' + maxOrderId + '" value="' + maxOrderId + '">' + 
+		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="">'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '40px',
+			html: '<img class="up-arrow" title="<fmt:message key="${upLabel}"/>">' + 
+		    		'<img class="down-arrow-disabled" title="<fmt:message key="${downLabel}"/>">'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<img class="delete-arrow" title="<fmt:message key="${deleteLabel}"/>" />'
+		})).appendTo('#criterias-table');
+		
+		reactivateArrows();
+	}
+	<c:if test="${empty criterias}">
+		addCriteria(); 
+		addCriteria();
+	</c:if>
+	
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".up-arrow", $this).addClass("up-arrow-disabled").removeClass("up-arrow");
+		        
+		    } else {
+		    	$(".up-arrow-disabled", $this).addClass("up-arrow").removeClass("up-arrow-disabled");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".down-arrow", $this).addClass("down-arrow-disabled").removeClass("down-arrow");
+		    	
+		    } else {
+		    	$(".down-arrow-disabled", $this).addClass("down-arrow").removeClass("down-arrow-disabled");
+		    }
+		});
+	}
+	
+	//upCriteria
+	 $( "body" ).on( "click", ".up-arrow", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var prevRow = currentRow.prev();
+		var prevCriteriaTd = $( ".criteria-info", prevRow);
+		var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(prevOrderId.val());
+		prevOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(prevRow);
+		prevCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 } );
+	 
+	//downCriteria
+	 $( "body" ).on( "click", ".down-arrow", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var nextRow = currentRow.next();
+		var nextCriteriaTd = $( ".criteria-info", nextRow);
+		var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(nextOrderId.val());
+		nextOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(nextRow);
+		nextCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 });
+	 
+	 //deleteCriteria
+	 $( "body" ).on( "click", ".delete-arrow", function() {
+		var currentRow = $(this).closest('tr');
+		currentRow.remove();
+		
+		reactivateArrows();
+	});
+	 
+	 //addCriteria
+	 $( "body" ).on( "click", "#add-criteria", function() {
+		 addCriteria();
+	});	 
+	 
+})
+</script>
+
+<div class="rating-criteria-tag">
+	<h2 class="spacer-left">
+		<fmt:message key="${headerLabel}" />
+	</h2>
+	<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+
+	<table class="alternative-color" cellspacing="0" id="criterias-table">
+
+		<c:forEach var="criteria" items="${criterias}" varStatus="status">
+			<tr>
+				
+				<td class="criteria-info">
+					<input type="hidden" name="criteriaOrderId${criteria.orderId}" value="${criteria.orderId}">
+					<input type="text" name="criteriaTitle${criteria.orderId}" value="${criteria.title}">
+				</td>
+				
+				<td width="40px">
+					<c:if test="${not status.first}">
+						<img class="up-arrow" title="<fmt:message key="${upLabel}"/>">
+						<c:if test="${status.last}">
+							<img class="up-arrow-disabled" title="<fmt:message key="${downLabel}"/>">
+						</c:if>
+					</c:if>
+
+					<c:if test="${not status.last}">
+						<c:if test="${status.first}">
+							<img class="down-arrow-disabled" title="<fmt:message key="${upLabel}"/>">
+						</c:if>
+
+						<img class="down-arrow" title="<fmt:message key="${downLabel}"/>">
+					</c:if>
+				</td>
+                
+				<td width="20px">
+					<img class="delete-arrow" title="<fmt:message key="${deleteLabel}"/>" />
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
+	
+	<div>
+		<a href="#nogo" class="button-add-item float-right" id="add-criteria">
+			<fmt:message key="${addLabel}" /> 
+		</a>
+	</div>
+	
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -0,0 +1,117 @@
+<% 
+ /**
+  * Rating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows rating stars widget
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="ratingDtos" required="false" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="disabled" required="false" rtexprvalue="true" %>
+<%@ attribute name="numberVotesLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:choose>
+	<c:when test='${empty disabled || disabled}'>
+		<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="ratingStarsClass" value="rating-stars"/>
+	</c:otherwise>
+</c:choose>
+<c:if test="${empty disabled}">
+	<c:set var="disabled" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty numberVotesLabel}">
+	<c:set var="numberVotesLabel" value="label.number.of.votes" scope="request"/>
+</c:if>
+
+<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+<script type="text/javascript">
+	//var for jquery.jRating.js
+	var pathToImageFolder = "${lams}images/css/";
+</script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+
+<!-- begin tab content -->
+<script type="text/javascript">
+	$(document).ready(function(){
+		setupJRating();
+	});
+	
+	function setupJRating() {
+		$(".rating-stars-new").filter($(".rating-stars")).jRating({
+		    phpPath : "${lams}servlet/rateItem",
+		    rateMax : 5,
+		    decimalLength : 1,
+			canRateAgain : true,
+			nbRates : 1000,
+			onSuccess : function(data, itemId){
+				
+			    $("#average-rating-" + itemId).html(data.averageRating);
+			    $("#number-of-votes-" + itemId).html(data.numberOfVotes);
+			    
+			    //callback function
+			    if (typeof onRatingSuccessCallback === "function") { 
+			        // safe to use the function
+			    	onRatingSuccessCallback(data.numOfRatings);
+			    }
+			    
+			    //disable rating feature in case maxRate limit reached
+			    //if (data.noMoreRatings) {
+			    	//$(".rating-stars").each(function() {
+			    		//$(this).jRating('readOnly');
+			    	//});
+			    //}
+			},
+			onError : function(){
+			    jError('Error. Please, retry');
+			}
+		});
+		
+		$(".rating-stars-new").filter($(".rating-stars-disabled")).jRating({
+	    	rateMax : 5,
+	    	isDisabled : true
+		});
+		
+		$(".rating-stars-new").removeClass("rating-stars-new");
+	}
+</script>
+
+<div class="rating-stars-holder">
+	<c:forEach var="ratingDto" items="${ratingDtos}" varStatus="status">
+		<c:set var="objectId" value="${ratingDto.ratingCriteria.ratingCriteriaId}-${ratingDto.itemId}"/>
+		
+		<h4>
+			${ratingDto.ratingCriteria.title}
+		</h4>
+	
+		<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDto.averageRating}" data-id="${objectId}">
+		</div>
+			
+		<div class="rating-stars-caption">
+			<fmt:message key="${numberVotesLabel}" >
+				<fmt:param>
+					<span id="average-rating-${objectId}">
+						<fmt:formatNumber value="${ratingDto.averageRating}" type="number" maxFractionDigits="1" />
+					</span>
+				</fmt:param>
+				<fmt:param>
+					<span id="number-of-votes-${objectId}">${ratingDto.numberOfVotes}</span>
+				</fmt:param>
+			</fmt:message>
+		</div>
+	
+	</c:forEach>
+
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r606581007abbdaee5483777096f32ffac1c3e3eb -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -426,6 +426,14 @@
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AuthoringRatingCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
    	</tag-file>   	
    	<tag-file>
        <name>headItems</name>
Index: lams_tool_images/web/includes/javascript/imageGallerycommon.js
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/web/includes/javascript/imageGallerycommon.js	(.../imageGallerycommon.js)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/includes/javascript/imageGallerycommon.js	(.../imageGallerycommon.js)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -1,10 +1,10 @@
-	function showBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.show(targetDiv+"_Busy");
-		}
+function showBusy(targetDiv){
+	if($(targetDiv+"_Busy") != null){
+		document.getElementById(targetDiv+"_Busy").style.display = '';
 	}
-	function hideBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.hide(targetDiv+"_Busy");
-		}				
-	}
+}
+function hideBusy(targetDiv){
+	if($(targetDiv+"_Busy") != null){
+		document.getElementById(targetDiv+"_Busy").style.display = 'none';
+	}				
+}
Index: lams_tool_images/web/pages/authoring/advance.jsp
===================================================================
diff -u -rdb681dba0a5e44ae9f4e4cf6b9bc575d6175212f -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision db681dba0a5e44ae9f4e4cf6b9bc575d6175212f)
+++ lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -1,6 +1,15 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <script lang="javascript">
+	$(document).ready(function() {
+	    $('#allowRank').click(function() {
+	        $("#criterias-holder").show("slow");
+	    });
+	    $('#allowVote').click(function() {
+	    	$("#criterias-holder").hide("slow");
+	    });//if(!$(this).is(":checked")) {
+	})
+
 	/**
 	 * Processes mouse click event on allowRatingsOrVote ckeckbox
 	 */
@@ -12,7 +21,8 @@
 		} else {
 			document.imageGalleryForm.allowVote.checked = false;
 			document.imageGalleryForm.allowRank.checked = false;
-		}		
+			$("#criterias-holder").hide("slow");
+		}
 	}
 
 	function uncheckNotifyTeachersOnImageSumbit() {
@@ -21,8 +31,8 @@
 	}
 </script>
 	
-<c:set var="formBean"
-	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="sessionMap"	value="${sessionScope[formBean.sessionMapID]}" />
 
 <!-- Advance Tab Content -->
 
@@ -44,8 +54,7 @@
 	</label>
 </p>
 
-<p>
-	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p style="margin-left:40px;">
 	<html:checkbox property="imageGallery.notifyTeachersOnImageSumbit" styleClass="noBorder" styleId="notifyTeachersOnImageSumbit"
 			disabled="${not formBean.imageGallery.allowShareImages}" >
 	</html:checkbox>
@@ -70,26 +79,30 @@
 	<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>
-
-	&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" />
-	</label>
+	<div style="margin-left:40px;">
+		<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}" 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" />
+		</label>
+		
+		<div id="criterias-holder" <c:if test="${!formBean.imageGallery.allowRank}"> style="display:none;"</c:if> >
+			<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" 
+				upLabel="label.authoring.up" downLabel="label.authoring.down"/>
+		</div>
+	</div>
 </p>
 
 <p>
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7041999fcaee0534c3b48e9cea84934662d2de51 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7041999fcaee0534c3b48e9cea84934662d2de51)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -9,7 +9,7 @@
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 
 	<script>
         function init(){
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
diff -u -r0e1a123434691d9876f2c7a50c0f18fef94647be -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0e1a123434691d9876f2c7a50c0f18fef94647be)
+++ lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -45,28 +45,46 @@
 	}
 	//The panel of imageGallery list panel
 	var imageGalleryListTargetDiv = "imageGalleryListArea";
-	
-	function deleteItem(idx,sessionMapID){
+	function deleteItem(idx, sessionMapID) {
 
 		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
 		
 		if (deletionConfirmed) {
 			var url = "<c:url value="/authoring/removeImage.do"/>";
 			var param = "imageIndex=" + idx +"&sessionMapID="+sessionMapID;;
 			deleteItemLoading();
-		    var myAjax = new Ajax.Updater(
-			    	imageGalleryListTargetDiv,
-			    	url,
-			    	{
-			    		method:'get',
-			    		parameters:param,
-			    		onComplete:deleteItemComplete,
-			    		evalScripts:false
-			    	}
-		    );
+			$("#" + imageGalleryListTargetDiv).load(
+				url,
+				{
+					itemIndex: idx,
+					reqID: reqIDVar.getTime(), 
+					sessionMapID: sessionMapID
+				},
+				function() {
+					deleteItemComplete();
+				}
+			);
 		}
 	}
 	
+	function deleteItem(idx,sessionMapID){
+		var url = "<c:url value="/authoring/removeItem.do"/>";
+	    var reqIDVar = new Date();
+		deleteItemLoading();
+	    
+		$("#" + resourceListTargetDiv).load(
+			url,
+			{
+				itemIndex: idx,
+				reqID: reqIDVar.getTime(), 
+				sessionMapID: sessionMapID
+			},
+			function() {
+				deleteItemComplete();
+			}
+		);
+	}
+	
 	function deleteItemLoading(){
 		showBusy(imageGalleryListTargetDiv);
 	}
@@ -78,41 +96,40 @@
 	function upImage(idx, sessionMapID){
 		var url = "<c:url value="/authoring/upImage.do"/>";
 	    var reqIDVar = new Date();
-		var param = "imageIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
 		deleteItemLoading();
-	    var myAjax = new Ajax.Updater(
-		    	imageGalleryListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:deleteItemComplete,
-		    		evalScripts:false
-		    	}
-	    );
+		$("#" + imageGalleryListTargetDiv).load(
+			url,
+			{
+				itemIndex: idx,
+				reqID: reqIDVar.getTime(), 
+				sessionMapID: sessionMapID
+			},
+			function() {
+				deleteItemComplete();
+			}
+		);
 	}
 	function downImage(idx, sessionMapID){
 		var url = "<c:url value="/authoring/downImage.do"/>";
 	    var reqIDVar = new Date();
-		var param = "imageIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
 		deleteItemLoading();
-	    var myAjax = new Ajax.Updater(
-		    	imageGalleryListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:deleteItemComplete,
-		    		evalScripts:false
-		    	}
-			);
+		$("#" + imageGalleryListTargetDiv).load(
+			url,
+			{
+				itemIndex: idx,
+				reqID: reqIDVar.getTime(), 
+				sessionMapID: sessionMapID
+			},
+			function() {
+				deleteItemComplete();
+			}
+		);
 	}
 	
 	function resizeOnMessageFrameLoad(){
 		var messageAreaFrame = document.getElementById("reourceInputArea");
 		messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 	}
-	    
 
 </script>
 <!-- Basic Tab Content -->
@@ -132,8 +149,8 @@
 			</div>
 			<lams:CKEditor id="imageGallery.instructions"
 				value="${formBean.imageGallery.instructions}"
-				contentFolderID="${formBean.contentFolderID}">
-				width="100%"
+				contentFolderID="${formBean.contentFolderID}"
+				width="100%">
 			</lams:CKEditor>
 		</td>
 	</tr>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -rbf49caa03b4d5d074f8c7dcfb3b761e66c57d58d -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision bf49caa03b4d5d074f8c7dcfb3b761e66c57d58d)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -20,7 +20,6 @@
 	<c:set var="mediumImageDimensions" value="${sessionMap.mediumImageDimensions}" />
 	<c:set var="thumbnailImageDimensions" value="${empty sessionMap.thumbnailImageDimensions ? 100 : sessionMap.thumbnailImageDimensions}" />
 
-	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/jquery.rating.css'/>"/>
 	<link rel="stylesheet" type="text/css" href="<lams:LAMSURL/>css/thickbox.css">
 	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/fotorama.css'/>"/>
 	<style media="screen,projection" type="text/css">
@@ -31,26 +30,18 @@
 		    	position: static;
 		  	}
 		}
-		#check-for-new-button, #add-new-image-button, #delete-button, #rating-stars {
-			float: right;
-			clear: both;
+		#check-for-new-button {
+			margin-top: 20px;
 		}
-		#add-new-image-button, #delete-button {
-			margin-top: 8px;
+		#check-for-new-button, #add-new-image-button, #delete-button {
 		}
-		#delete-button{
-			display:none;
+		.extra-controls-inner {
+			width: 60%;
+			margin: 0px auto;
 		}
-		#rating-stars {
-			padding-top: 20px;
-			width: 85px;
+		.extra-controls-inner2 {
 			text-align: center;
-			margin-right: 20px;
 		}
-		#rating-stars-text {
-			margin-bottom: 10px;
-			margin-top:5px;
-		}
 		.caption{
 			color:#0087e5; 
 			font:italic 14px georgia,serif;
@@ -59,9 +50,13 @@
 			font-style:italic; 
 			font-size:11px;
 		}
-		.extra-controls {
-			padding-bottom: 100px;
+		#extra-controls {
+			display: table-cell;
 		}
+		#comments-area {
+			display: table-cell;
+			min-width: 68%;
+		}
 		#comment-textarea {
 			margin-right:10px; 
 			width:99%;
@@ -71,10 +66,6 @@
 			float: right;
 			margin-top: 10px;
 		}
-		#comments-area {
-			margin-bottom: 50px;
-			padding-top: 50px;
-		}
 		table.forum {
 			border-bottom: none;
 			margin-bottom: 0;
@@ -92,12 +83,18 @@
 			text-align: center;
 			padding-top: 10px;
 		}
+		#image-info {
+			display: table; 
+			width: 100%;
+		}
+		
+		.space-bottom-top {
+			padding-top: 40px;
+		}
     </style>
     
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
- 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.rating.1.1.js'/>"></script>
  	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
- 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/thickbox.js'/>"></script>	
  	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/fotorama.js'/>"></script>
 	<script type="text/javascript">
 	
@@ -145,14 +142,6 @@
 				}
 			);
 	
-			$('#votingForm_vote').click(function() {
-				
-				$('#votingForm').ajaxSubmit( {
-					success: afterRatingSubmit  // post-submit callback
-				});
-				return false;
-			});
-	
 		});
 
 		function checkNew(){
@@ -164,23 +153,23 @@
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
 			return false;
 		}
-		function continueReflect(){
+		function continueReflect() {
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
 		
-		function deleteImage(){
+		function deleteImage(imageUid) {
 			var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
 			
 			if (deletionConfirmed) {
-				var imageUid = $('#commentsArea_imageUid').val();
 				document.location.href = "<c:url value="/learning/deleteImage.do"/>?sessionMapID=${sessionMapID}&imageUid=" + imageUid;
 			}
 			return false;
 		}
 
-		function addNewComment(currentImageUid, comment){
+		var imageInfoTargetDiv = "#image-info";
+		function addNewComment(currentImageUid, comment) {
 			var url = "<c:url value="/learning/addNewComment.do"/>";
-			$(commentsAreaTargetDiv).load(
+			$(imageInfoTargetDiv).load(
 				url,
 				{
 					currentImageUid: currentImageUid, 
@@ -190,95 +179,16 @@
 			);
 		}
 
-		//The panel of imageGallery list panel
-		var commentsAreaTargetDiv = "#comments-area";
-		function loadImageData(imageUid){
-			var url = "<c:url value="/learning/loadImageData.do"/>";
-			$(commentsAreaTargetDiv).load(
-				url,
+		function loadImageData(imageUid) {
+			
+			$(imageInfoTargetDiv).load(
+				"<c:url value="/learning/loadImageData.do"/>",
 				{
 					imageUid: imageUid, 
 					sessionMapID: "${sessionMapID}"
-				},
-				afterImageDataLoaded
-			);
-		}
-
-		function afterImageDataLoaded() {
-
-			var title = $('#commentsArea_title').val();
-			
-			var imageUid = $('#commentsArea_imageUid').val();
-			if (${imageGallery.allowRank && (mode != 'teacher')}) {
-
-				var numberRatings = $('#commentsArea_numberRatings').val();
-				$('#numberRatings').html(numberRatings);
-				
-				var currentRating = $('#commentsArea_currentRating').val();
-				setStarRatingChecked(currentRating);
-
-				var title = "<fmt:message key='label.learning.average.rating'/> " + $('#commentsArea_averageRating').val();
-				$('.star a').attr('title', title);
-
-				$('#ratingForm_imageUid').attr('value', imageUid);
-			}
-
-			if (${imageGallery.allowVote && (mode != 'teacher') && (not finishedLock)}) {	
-				var isVoted = $('#commentsArea_isVoted').val();
-				var votingFormLabel;
-				if (isVoted == "true") {
-
-					$('#votingForm_vote').attr('disabled', false);
-					$('#votingForm_vote').attr('checked', true);
-					votingFormLabel = "<fmt:message key='label.learning.unvote'/>";					
-					 
-				} else {
-					
-					$('#votingForm_vote').attr('disabled', false);
-					$('#votingForm_vote').attr('checked', false);
-					votingFormLabel = "<fmt:message key='label.learning.vote.here'/>";
-										
 				}
-				$('#votingForm_label').text(votingFormLabel);
-				$('#votingForm_imageUid').attr('value', imageUid);
-			} else if (${finishedLock}) {
-				var isVoted = $('#commentsArea_isVoted').val();
-				if (isVoted == "true") {
-					$('#votingForm_vote').attr('checked', true);
-				} else {
-					$('#votingForm_vote').attr('checked', false);
-				}
-			}
-			
-			//set visibility of "Delete image" button 
-			var isAuthor = $('#commentsArea_isAuthor').val()  == "true";
-			$("#delete-button").toggle(isAuthor);
-			
-		}
-		function setStarRatingChecked(currentRating){
-			$('#rating-stars-inputs').empty();
-			for (var i = 1; i <= 5; i = i + 1) {
-				var checked = (currentRating == i) ? "checked = 'checked' " : "";
-				$('#rating-stars-inputs').append('<input class="star" type="radio" name="rating" value="' + i + '"' + checked + '/>');
-			}
-			$('input[type=radio].star').rating({
-				readOnly: ${finishedLock},
-				callback: function() {
-			    	var options = { 
-			    		success: afterRatingSubmit  // post-submit callback
-			        }; 				
-			    				
-					$('#ratingForm').ajaxSubmit(options);
-					return false;
-				}
-			});
-		}		
-
-		// post-submit callback 
-		function afterRatingSubmit(responseText, statusText)  { 
-			var imageUid = $('#commentsArea_imageUid').val();
-			loadImageData(imageUid);
-		}     
+			);
+		}  
     </script>
    
 </lams:head>
@@ -314,75 +224,14 @@
 		<div class="fotorama-container">
 			<div class="fotorama"></div>
 		</div>
-		
-		<c:if test="${(mode != 'teacher') && (imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages)}">	
-			<div class="extra-controls">
-				
-				<%--Ranking/Voting area---------------------------------------%>
-	
-				<c:if test="${not empty sessionMap.imageGalleryList}">				
-					<div id="rating-stars">
-						<c:if test="${imageGallery.allowRank}">
-							<html:form action="learning/saveOrUpdateRating" method="post" styleId="ratingForm">
-								<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
-								<input type="hidden" name="imageUid" id="ratingForm_imageUid"/>
-								
-								<div id="rating-stars-inputs"> 
-									<input class="star" type="radio" name="rating" value="1" />
-									<input class="star" type="radio" name="rating" value="2" />
-									<input class="star" type="radio" name="rating" value="3" />
-									<input class="star" type="radio" name="rating" value="4" />
-									<input class="star" type="radio" name="rating" value="5" />						
-								</div>
-								
-								<br>
-								<div id="rating-stars-text">
-									<span id="numberRatings"></span>
-									<fmt:message key="label.learning.ratings" />
-								</div>
-							</html:form>
-						</c:if>
-						
-						<c:if test="${imageGallery.allowVote}">
-							<html:form action="learning/vote" method="post" styleId="votingForm">
-								<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
-								<input type="hidden" name="imageUid" id="votingForm_imageUid"/>
-								
-								<p class="small-space-top" style="margin-right: 0px">
-									<html:checkbox property="vote" styleClass="noBorder" styleId="votingForm_vote" />
-									<label for="votingForm_vote" id="votingForm_label"></label>
-								</p>
-								
-							</html:form>							
-						</c:if> 			
-					</div>
-				</c:if>
-				
-				<%--"Check for new", "Add new image" and "Delete" buttons---------------%>
-				
-				<c:if test="${imageGallery.allowShareImages}">
-					<a href="#nogo" onclick="return checkNew()" class="button" id="check-for-new-button"> 
-						<fmt:message key="label.check.for.new" /> 
-					</a>
-						
-					<c:if test="${not finishedLock}">
-						<a href="<html:rewrite page='/learning/newImageInit.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=480&modal=true" class="button thickbox" id="add-new-image-button">  
-							<fmt:message key="label.learning.add.new.image" />
-						</a>
-					</c:if>
-						
-					<a href="#nogo" onclick="return deleteImage();" class="button" id="delete-button"> 
-						<fmt:message key="label.learning.delete.image" /> 
-					</a>
-				</c:if>
-			</div>
-		</c:if>
 			
-		<%--Comments area----------------------------------------------%>	
-	 		
-		<div id="comments-area">
-			<%@ include file="/pages/learning/parts/commentsarea.jsp"%> 
-		</div>	
+		<%--Comments & Ranking/Voting area----------------------------------------------%>	
+	 	
+	 	<c:if test="${not empty sessionMap.imageGalleryList}">
+			<div id="image-info">
+				<%@ include file="/pages/learning/parts/commentsarea.jsp"%> 
+			</div>
+		</c:if>	
  
 		<%--Reflection--------------------------------------------------%>
 
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r7041999fcaee0534c3b48e9cea84934662d2de51 -r9d14ce6a68469c1cd7f0522a2d39387016e35f1e
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 7041999fcaee0534c3b48e9cea84934662d2de51)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 9d14ce6a68469c1cd7f0522a2d39387016e35f1e)
@@ -1,74 +1,155 @@
 <%@ include file="/common/taglibs.jsp"%>
 	
-<c:set var="commentsSessionMapID" value="${param.sessionMapID}" />
-<c:set var="commentsSessionMap" value="${sessionScope[commentsSessionMapID]}" />
-<c:set var="commentsMode" value="${commentsSessionMap.mode}" />
-<c:set var="commentsImageGallery" value="${commentsSessionMap.imageGallery}" />
-<c:set var="commentsImage" value="${commentsSessionMap.currentImage}" />
-<c:set var="commentsFinishedLock" value="${commentsSessionMap.finishedLock}" />
+<c:set var="sessionMapID" value="${param.sessionMapID}" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="imageGallery" value="${sessionMap.imageGallery}" />
+<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
-<input type="hidden" name="imageUid" id="commentsArea_imageUid" value="${commentsImage.uid}"/>
-<input type="hidden" name="title" id="commentsArea_title" value="<c:out value='${commentsImage.title}' />"/>
-<input type="hidden" name="originalImageWidth" id="commentsArea_originalImageWidth" value="${commentsImage.originalImageWidth}"/>
-<input type="hidden" name="originalImageHeight" id="commentsArea_originalImageHeight" value="${commentsImage.originalImageHeight}"/>
-<input type="hidden" name="originalFileUuid" id="commentsArea_originalFileUuid" value="${commentsImage.originalFileUuid}"/>
-<input type="hidden" name="averageRating" id="commentsArea_averageRating" value="${commentsSessionMap.averageRating}"/>
-<input type="hidden" name="numberRatings" id="commentsArea_numberRatings" value="${commentsSessionMap.numberRatings}"/>
-<input type="hidden" name="currentRating" id="commentsArea_currentRating" value="${commentsSessionMap.currentRating}"/>
-<input type="hidden" name="isVoted" id="commentsArea_isVoted" value="${commentsSessionMap.isVoted}"/>
-<input type="hidden" name="isAuthor" id="commentsArea_isAuthor" value="${commentsSessionMap.isAuthor}"/>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/thickbox.js'/>"></script>	
+<script type="text/javascript">
+	$(document).ready(function(){
+		$('#voting-form-checkbox').click(function() {
+			$('#voting-form').ajaxSubmit( {
+				success: afterRatingSubmit  // post-submit callback
+			});
+		});
+	});
 
-<c:if test="${commentsImageGallery.allowCommentImages && (not empty commentsSessionMap.imageGalleryList)}">
+	// post-submit callback 
+	function afterRatingSubmit(responseText, statusText)  {
+		var votingFormLabel;
+		if ($('#voting-form-checkbox').is(':checked')) {
+			votingFormLabel = "<fmt:message key='label.learning.unvote'/>";					
+				 
+		} else {
+			votingFormLabel = "<fmt:message key='label.learning.vote.here'/>";
+		}
+		$('#voting-form-label').text(votingFormLabel);
+	}
+</script>
 
-	<%@ include file="/common/messages.jsp"%>
+<%--Comments area---------------------------------------%>
+<div id="comments-area">
+	<c:if test="${imageGallery.allowCommentImages}">
 
-			<div class="field-name">
-				<fmt:message key="label.learning.comments" />
+		<%@ include file="/common/messages.jsp"%>
+	
+		<div class="field-name">
+			<fmt:message key="label.learning.comments" />
+		</div>
+		
+		<c:forEach var="comment" items="${sessionMap.comments}">
+		
+			<div>
+				<table cellspacing="0" class="forum">
+					<tr >
+						<th >
+							<fmt:message key="label.learning.by" />
+							<c:set var="author" value="${comment.createBy.firstName} ${comment.createBy.lastName}" />
+							<c:if test="${empty author}">
+								<c:set var="author">
+									<fmt:message key="label.default.user.name" />
+								</c:set>
+							</c:if>
+							<c:out value="${author}" escapeXml="true" /> - <lams:Date value="${comment.createDate}" />
+						</th>
+					</tr>
+						
+					<tr>
+						<td class="posted-by">
+						</td>
+					</tr>
+			
+					<tr>
+						<td>
+							<c:out value="${comment.comment}" escapeXml="false" />
+						</td>
+					</tr>
+						
+				</table>
 			</div>
+				
+		</c:forEach>
 	
-	<c:forEach var="comment" items="${commentsSessionMap.comments}">
+		<c:if test="${mode != 'teacher' && (not finishedLock)}">
+			<div >
+				<html:form action="learning/addNewComment" method="post">
+					<lams:STRUTS-textarea property="comment" rows="3" styleId="comment-textarea"/>		
+			
+					<html:button property="commentButton" onclick="javascript:addNewComment(${sessionMap.currentImage.uid}, document.getElementById('comment__lamshidden').value);" styleClass="button" styleId="comment-button">
+						<fmt:message key="label.learning.add.comment" />
+					</html:button>
+				</html:form>					
+			</div>
+		</c:if>
+				
+	</c:if>
+</div>
+
+<c:if test="${(mode != 'teacher') && (imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages)}">	
+	<div id="extra-controls">
+				
+		<%--Ranking area---------------------------------------%>
 	
-		<div>
-			<table cellspacing="0" class="forum">
-				<tr >
-					<th >
-						<fmt:message key="label.learning.by" />
-						<c:set var="author" value="${comment.createBy.firstName} ${comment.createBy.lastName}" />
-						<c:if test="${empty author}">
-							<c:set var="author">
-								<fmt:message key="label.default.user.name" />
-							</c:set>
-						</c:if>
-						<c:out value="${author}" escapeXml="true" /> - <lams:Date value="${comment.createDate}" />
-					</th>
-				</tr>
-					
-				<tr>
-					<td class="posted-by">
-					</td>
-				</tr>
+		<c:if test="${imageGallery.allowRank}">
+			<div class="extra-controls-inner">
+				<lams:Rating ratingDtos="${sessionMap.ratingDtos}" disabled="${finishedLock}"/>
+			</div>
+			<br><br>
+		</c:if>
 		
-				<tr>
-					<td>
-						<c:out value="${comment.comment}" escapeXml="false" />
-					</td>
-				</tr>
-					
-			</table>
-		</div>
+		<div class="extra-controls-inner2">
+				
+			<%--Voting area--------------%>
+		
+			<c:if test="${imageGallery.allowVote}">
+				<html:form action="learning/vote" method="post" styleId="voting-form">
+					<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
+					<input type="hidden" name="imageUid" value="${sessionMap.currentImage.uid}"/>
+								
+					<p class="small-space-top" style="margin-right: 0px">
+						<input type="checkbox" name="vote" class="noBorder" id="voting-form-checkbox" 
+								<c:if test="${finishedLock}">disabled="disabled"</c:if>	
+								<c:if test="${sessionMap.isVoted}">checked="checked"</c:if>	
+						/>
+						<label for="voting-form-checkbox" id="voting-form-label">
+							<c:choose>
+								<c:when test="${sessionMap.isVoted}">
+									<fmt:message key='label.learning.unvote'/>
+								</c:when>
+								<c:otherwise>
+									<fmt:message key='label.learning.vote.here'/>
+								</c:otherwise>
+							</c:choose>
+						</label>
+					</p>
+				</html:form>							
+			</c:if>
 			
-	</c:forEach>
-
-	<c:if test="${commentsMode != 'teacher' && (not commentsFinishedLock)}">
-		<div >
-			<html:form action="learning/addNewComment" method="post">
-				<lams:STRUTS-textarea property="comment" rows="3" styleId="comment-textarea"/>		
+			<%--"Check for new", "Add new image" and "Delete" buttons---------------%>
+				
+			<c:if test="${imageGallery.allowShareImages}">
+			
+				<a href="#nogo" onclick="return checkNew()" class="button" id="check-for-new-button"> 
+					<fmt:message key="label.check.for.new" /> 
+				</a>
+							
+				<c:if test="${not finishedLock}">
+					<br><br>
+					<a href="<html:rewrite page='/learning/newImageInit.do?sessionMapID='/>${sessionMapID}&KeepThis=true&TB_iframe=true&height=540&width=480&modal=true" class="button thickbox" id="add-new-image-button">  
+						<fmt:message key="label.learning.add.new.image" />
+					</a>
+				</c:if>
+				
+				<c:if test="${sessionMap.isAuthor}">
+					<br><br>
+					<a href="#nogo" onclick="return deleteImage(${sessionMap.currentImage.uid});" class="button" id="delete-button"> 
+						<fmt:message key="label.learning.delete.image" /> 
+					</a>
+				</c:if>
+			</c:if>
 		
-				<html:button property="commentButton" onclick="javascript:addNewComment(${commentsSessionMap.currentImage.uid}, document.getElementById('comment__lamshidden').value);" styleClass="button" styleId="comment-button">
-					<fmt:message key="label.learning.add.comment" />
-				</html:button>
-			</html:form>					
 		</div>
-	</c:if>
-				
+	</div>
 </c:if>