Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.5 -r1.6
--- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	13 Nov 2008 00:05:52 -0000	1.5
+++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties	14 Nov 2008 13:01:59 -0000	1.6
@@ -55,7 +55,6 @@
 label.authoring.offline.filelist  =Offline file list
 label.authoring.online.delete  =Delete
 label.authoring.offline.delete  =Delete
-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
Index: lams_tool_images/db/sql/create_lams_tool_imageGallery.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/db/sql/create_lams_tool_imageGallery.sql,v
diff -u -r1.6 -r1.7
--- lams_tool_images/db/sql/create_lams_tool_imageGallery.sql	13 Nov 2008 00:05:53 -0000	1.6
+++ lams_tool_images/db/sql/create_lams_tool_imageGallery.sql	14 Nov 2008 13:01:59 -0000	1.7
@@ -36,7 +36,6 @@
    content_id bigint unique,
    allow_comment_images tinyint,
    allow_share_images tinyint,
-   number_columns integer DEFAULT 3,
    allow_vote tinyint,
    voted_image_uid bigint DEFAULT 0,
    reflect_instructions varchar(255), 
Index: lams_tool_images/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/db/sql/table-schema.sql,v
diff -u -r1.6 -r1.7
--- lams_tool_images/db/sql/table-schema.sql	13 Nov 2008 00:05:53 -0000	1.6
+++ lams_tool_images/db/sql/table-schema.sql	14 Nov 2008 13:01:59 -0000	1.7
@@ -23,7 +23,7 @@
 drop table if exists tl_laimag10_configuration;
 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, voted_image_uid bigint DEFAULT 0, reflect_instructions varchar(255), reflect_on_activity bit,allow_rank tinyint DEFAULT 0, 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, allow_vote bit, voted_image_uid bigint DEFAULT 0, 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, description text, 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), average_rating FLOAT(7,1) DEFAULT 0, number_ratings integer DEFAULT 0, primary key (uid));
 create table tl_laimag10_image_comment (uid bigint not null auto_increment, comment text, imageGallery_item_uid bigint, create_by bigint, create_date datetime, primary key (uid));
 create table tl_laimag10_image_rating (uid bigint not null auto_increment, rating integer, imageGallery_item_uid bigint, create_by bigint, primary key (uid));
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java,v
diff -u -r1.4 -r1.5
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	13 Nov 2008 00:05:52 -0000	1.4
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	14 Nov 2008 13:01:59 -0000	1.5
@@ -68,8 +68,6 @@
     
     private Long votedImageUid;
 
-    private int numberColumns;
-
     private boolean allowCommentImages;
 
     private boolean allowShareImages;
@@ -508,18 +506,6 @@
     }
 
     /**
-     * @hibernate.property column="number_columns"
-     * @return
-     */
-    public int getNumberColumns() {
-	return numberColumns;
-    }
-
-    public void setNumberColumns(int numberColumns) {
-	this.numberColumns = numberColumns;
-    }
-
-    /**
      * @hibernate.property column="allow_vote"
      * @return
      */
Index: lams_tool_images/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/advance.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_images/web/pages/authoring/advance.jsp	19 Oct 2008 22:17:03 -0000	1.2
+++ lams_tool_images/web/pages/authoring/advance.jsp	14 Nov 2008 13:01:59 -0000	1.3
@@ -77,28 +77,6 @@
 </p>
 
 <p>
-	<html:select property="imageGallery.numberColumns"	styleId="numberColumns" style="width:50px">
-		<c:forEach begin="1" end="6" varStatus="status">
-			<c:choose>
-				<c:when
-					test="${formBean.imageGallery.numberColumns == status.index}">
-					<option value="${status.index}" selected="true">
-						${status.index}
-					</option>
-				</c:when>
-				<c:otherwise>
-					<option value="${status.index}">
-						${status.index}
-					</option>
-				</c:otherwise>
-			</c:choose>
-		</c:forEach>
-	</html:select>
-
-	<fmt:message key="label.authoring.advance.number.columns" />
-</p>
-
-<p>
 	<html:checkbox property="imageGallery.reflectOnActivity"
 		styleClass="noBorder" styleId="reflectOn">
 	</html:checkbox>
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/authoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_images/web/pages/authoring/authoring.jsp	11 Oct 2008 12:04:14 -0000	1.1
+++ lams_tool_images/web/pages/authoring/authoring.jsp	14 Nov 2008 13:01:59 -0000	1.2
@@ -46,7 +46,7 @@
 
  
 </lams:head>
-<body class="stripes" onLoad="init()">
+<body class="stripes" onLoad="init();">
 <div id="page">
 		<h1>
 			<fmt:message key="label.authoring.heading" />
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/basic.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_images/web/pages/authoring/basic.jsp	19 Oct 2008 22:17:03 -0000	1.2
+++ lams_tool_images/web/pages/authoring/basic.jsp	14 Nov 2008 13:01:59 -0000	1.3
@@ -1,11 +1,12 @@
 <%@ 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)%>" />
+
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <script lang="javascript">
 <!-- Common Javascript functions for LAMS -->
 
@@ -64,7 +65,7 @@
 		    		method:'get',
 		    		parameters:param,
 		    		onComplete:deleteItemComplete,
-		    		evalScripts:true
+		    		evalScripts:false
 		    	}
 	    );
 	}
@@ -73,6 +74,7 @@
 	}
 	function deleteItemComplete(){
 		hideBusy(imageGalleryListTargetDiv);
+		initLightbox();
 	}
 	
 	function upImage(idx, sessionMapID){
@@ -87,7 +89,7 @@
 		    		method:'get',
 		    		parameters:param,
 		    		onComplete:deleteItemComplete,
-		    		evalScripts:true
+		    		evalScripts:false
 		    	}
 	    );
 	}
@@ -103,7 +105,7 @@
 		    		method:'get',
 		    		parameters:param,
 		    		onComplete:deleteItemComplete,
-		    		evalScripts:true
+		    		evalScripts:false
 		    	}
 	    );
 	}
@@ -145,7 +147,7 @@
 
 <p>
 	<iframe
-		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px';initLightbox();"
 		id="reourceInputArea" name="reourceInputArea"
 		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
 		scrolling="no">
Index: lams_tool_images/web/pages/authoring/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/parts/itemlist.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_images/web/pages/authoring/parts/itemlist.jsp	21 Oct 2008 14:10:10 -0000	1.3
+++ lams_tool_images/web/pages/authoring/parts/itemlist.jsp	14 Nov 2008 13:01:59 -0000	1.4
@@ -7,14 +7,14 @@
 	<lams:WebAppURL />
 </c:set>
 
-<div id="itemList">
+
+<div id="itemList" >
 	<h2 class="spacer-left">
 		<fmt:message key="label.authoring.basic.image.list" />
-		<img src="${ctxPath}/includes/images/indicator.gif"
-			style="display:none" id="imageGalleryListArea_Busy" />
+		<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="imageGalleryListArea_Busy" />
 	</h2>
-	
-	<table class="alternative-color" id="itemTable" cellspacing="0">
+
+	<table class="alternative-color" id="itemTable" cellspacing="0" > 
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 		<c:forEach var="image" items="${sessionMap.imageGalleryList}" varStatus="status">
@@ -26,21 +26,13 @@
 				 	<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>
+					<a href="${mediumImagePath}" rel="lightbox" title="${image.title}" ><img src="${thumbnailPath}" alt="${image.title}"/></a>
 				</td>
 				
 				<td style="vertical-align:middle;">
 					<a href="${mediumImagePath}" rel="lightbox" title="Enlarge image">${image.title}</a>
 				</td>
 
-<%--				
-				<td>
-						<a href="#"
-							onclick="previewItem(${status.index},'${sessionMapID}')"> <fmt:message
-								key="label.authoring.basic.resource.preview" /> </a>
-				</td>
---%>
-				
 				<td width="40px" style="vertical-align:middle;">
 					<c:if test="${not status.first}">
 						<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
@@ -84,10 +76,11 @@
 
 <%-- This script will works when a new resoruce item submit in order to refresh "ImageGallery List" panel. --%>
 <script lang="javascript">
-
 	if(window.top != null){
 		window.top.hideMessage();
 		var obj = window.top.document.getElementById('imageGalleryListArea');
 		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	} else {
+		initLightbox();
 	}
 </script>