Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r7086ae4ff560703d2a2859eed9d3b4c25dfdc44e -r13f904eca7f8ea334801f65d1d6be6bdeb950df0
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 7086ae4ff560703d2a2859eed9d3b4c25dfdc44e)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
@@ -167,24 +167,24 @@
 		</action>
 		
 		<!-- ========== BEGIN: Monitoring Definitions ============================== -->
-		<action path="/learning/summary"
+		<action path="/monitoring/summary"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
 			parameter="summary" >
-			<forward name="success" path="/pages/learning/monitoring.jsp" />
+			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 		</action>
-		<action path="/learning/listuser"
+		<action path="/monitoring/listuser"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
 			parameter="listuser" >
-			<forward name="success" path="/pages/learning/listuser.jsp" />
+			<forward name="success" path="/pages/monitoring/listuser.jsp" />
 		</action>
-		<action path="/learning/hideitem"
+		<action path="/monitoring/hideitem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
 			parameter="hideitem" >
-			<forward name="success" path="/pages/learning/monitoring.jsp" />
+			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 		</action>
-		<action path="/learning/showitem"
+		<action path="/monitoring/showitem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.MonitoringAction"
 			parameter="showitem" >
-			<forward name="success" path="/pages/learning/monitoring.jsp" />
+			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 		</action>
 				
\ No newline at end of file
Index: lams_tool_larsrc/db/sql/tool_insert.sql
===================================================================
diff -u -r27653cd039c7a5c282fed7bb692473179a4d89ec -r13f904eca7f8ea334801f65d1d6be6bdeb950df0
--- lams_tool_larsrc/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 27653cd039c7a5c282fed7bb692473179a4d89ec)
+++ lams_tool_larsrc/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
@@ -45,7 +45,7 @@
 'tool/larsrc11/learning/start.do?mode=author',
 'tool/larsrc11/learning/start.do?mode=teacher',
 'tool/larsrc11/authoring/start.do',
-'tool/larsrc11/monitoring.do',
+'tool/larsrc11/monitoring/summary.do',
 'tool/larsrc11/defineLater.do',
 'tool/larsrc11/exportPortfolio?mode=learner',
 'tool/larsrc11/exportPortfolio?mode=teacher',
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
===================================================================
diff -u -r7086ae4ff560703d2a2859eed9d3b4c25dfdc44e -r13f904eca7f8ea334801f65d1d6be6bdeb950df0
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	(.../ResourceItemVisitDAOHibernate.java)	(revision 7086ae4ff560703d2a2859eed9d3b4c25dfdc44e)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	(.../ResourceItemVisitDAOHibernate.java)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
@@ -28,30 +28,34 @@
 
 import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemVisitDAO;
 import org.lamsfoundation.lams.tool.rsrc.dto.Summary;
+import org.lamsfoundation.lams.tool.rsrc.model.Resource;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemVisitLog;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
 
 public class ResourceItemVisitDAOHibernate extends BaseDAOHibernate implements ResourceItemVisitDAO{
 	
 	private static final String FIND_BY_ITEM_AND_USER = "from " + ResourceItemVisitLog.class.getName()
 			+ " as r where r.user.userId = ? and r.resourceItem.uid=?";
 
 	private static final String FIND_BY_ITEM_BYSESSION = "from " + ResourceItemVisitLog.class.getName()
-			+ " as r where r.session_id = ? and r.resourceItem.uid=?";
+			+ " as r where r.sessionId = ? and r.resourceItem.uid=?";
 	
 	private static final String FIND_VIEW_COUNT_BY_USER = "select count(*) from " + ResourceItemVisitLog.class.getName() 
 			+ " as r where  r.sessionId=? and  r.user.userId =?";
 
-	private static final String FIND_SUMMARY = "select v.session_id, s.session_name,i.uid,i.item_type ,i.create_by_author" +
-			", i.is_hide, i.title, u.login_name, count(v.resource_item_uid) "
-		+" from tl_larsrc11_resource_item_visit_log as v , "
-		+" tl_larsrc11_resource_item as i, "
-		+" tl_larsrc11_user as u, "
-		+" tl_larsrc11_session as s, "
-		+"  tl_larsrc11_resource as r "
-		+" where i.uid = v.resource_item_uid and i.create_by = u.uid and v.session_id = s.session_id "
-		+" and s.resource_uid = r.uid "
-		+" and r.content_id =? "
-		+" group by v.session_id, .v.resource_item_uid ";
+	private static final String FIND_SUMMARY = "select v.sessionId, s.sessionName,i.uid,i.type ,i.createByAuthor" +
+			", i.hide, i.title, u.loginName, count(v.resourceItem) from  "
+		+ ResourceItemVisitLog.class.getName() + " as v , "
+		+ ResourceItem.class.getName() + "  as i, "
+		+ ResourceUser.class.getName() + "  as u, "
+		+ ResourceSession.class.getName() + " as s, "
+		+ Resource.class.getName() + "  as r "
+		+" where i.uid = v.resourceItem.uid and i.createBy.uid = u.uid and v.sessionId = s.sessionId "
+		+" and s.resource.uid = r.uid "
+		+" and r.contentId =? "
+		+" group by v.sessionId, v.resourceItem.uid ";
 	
 	public ResourceItemVisitLog getResourceItemLog(Long itemUid,Long userId){
 		List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER,new Object[]{userId,itemUid});
@@ -69,21 +73,21 @@
 
 	public List<Summary> getSummary(Long contentId) {
 		
-		List result =  getHibernateTemplate().find(FIND_SUMMARY,contentId);
-		List<Summary> summaryList = new ArrayList(result);
+		List<Object[]> result =  getHibernateTemplate().find(FIND_SUMMARY,contentId);
+		List<Summary> summaryList = new ArrayList<Summary>(result.size());
 		int idx=0;
-		for(Object obj : result){
-			List list = (List) obj;
+		for(Object[] list : result){
 			Summary sum = new Summary();
-			sum.setSessionId((Long) list.get(idx++));
-			sum.setSessionName((String) list.get(idx++));
-			sum.setItemUid((Long) list.get(idx++));
-			sum.setItemType((Short) list.get(idx++));
-			sum.setItemCreateByAuthor((Boolean) list.get(idx++));
-			sum.setItemHide((Boolean) list.get(idx++));
-			sum.setItemTitle((String) list.get(idx++));
-			sum.setUsername((String) list.get(idx++));
-			sum.setViewNumber((Integer) list.get(idx++));
+			sum.setSessionId((Long) list[idx++]);
+			sum.setSessionName((String) list[idx++]);
+			sum.setItemUid((Long) list[idx++]);
+			sum.setItemType((Short) list[idx++]);
+			sum.setItemCreateByAuthor((Boolean) list[idx++]);
+			sum.setItemHide((Boolean) list[idx++]);
+			sum.setItemTitle((String) list[idx++]);
+			sum.setUsername((String) list[idx++]);
+			sum.setViewNumber((Integer) list[idx++]);
+			summaryList.add(sum);
 		}
 		return summaryList;
 		
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
===================================================================
diff -u -r7086ae4ff560703d2a2859eed9d3b4c25dfdc44e -r13f904eca7f8ea334801f65d1d6be6bdeb950df0
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7086ae4ff560703d2a2859eed9d3b4c25dfdc44e)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
@@ -96,7 +96,6 @@
 		List<List> groupList = new ArrayList<List>();
 		Long sId = new Long(-1);
 		List<Summary> group = new ArrayList<Summary>();
-		;
 		for (Summary sum : list) {
 			if (!sId.equals(sum.getSessionId())) {
 				group = new ArrayList<Summary>();
Index: lams_tool_larsrc/web/common/fckeditorheader.jsp
===================================================================
diff -u -r318b6abe8422efe8b6bac112c6dc0fd15ba13873 -r13f904eca7f8ea334801f65d1d6be6bdeb950df0
--- lams_tool_larsrc/web/common/fckeditorheader.jsp	(.../fckeditorheader.jsp)	(revision 318b6abe8422efe8b6bac112c6dc0fd15ba13873)
+++ lams_tool_larsrc/web/common/fckeditorheader.jsp	(.../fckeditorheader.jsp)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
@@ -3,4 +3,3 @@
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
\ No newline at end of file
Index: lams_tool_larsrc/web/common/header.jsp
===================================================================
diff -u -r318b6abe8422efe8b6bac112c6dc0fd15ba13873 -r13f904eca7f8ea334801f65d1d6be6bdeb950df0
--- lams_tool_larsrc/web/common/header.jsp	(.../header.jsp)	(revision 318b6abe8422efe8b6bac112c6dc0fd15ba13873)
+++ lams_tool_larsrc/web/common/header.jsp	(.../header.jsp)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
@@ -23,3 +23,6 @@
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+
+	
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7086ae4ff560703d2a2859eed9d3b4c25dfdc44e -r13f904eca7f8ea334801f65d1d6be6bdeb950df0
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7086ae4ff560703d2a2859eed9d3b4c25dfdc44e)
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
@@ -3,8 +3,27 @@
 <html>
 	<head>
 		 <%@ include file="/common/header.jsp" %>
+	 <script>
+	    
+	    	var imgRoot="${lams}images/";
+		    var themeName="aqua";
+	        
+	        function init(){
+	        
+	            initTabSize(2);
+	            
+                selectTab(1); //select the default tab;
+	        }     
+	        
+	        function doSelectTab(tabId) {
+		    	// end optional tab controller stuff
+		    	selectTab(tabId);
+	        } 
+	        
+	        
+	    </script>		 
 	</head>
-	<body>
+	<body onLoad="init()">
 		<lams:Tabs>
 			<lams:Tab id="1" key="monitoring.tab.summary" />
 			<lams:Tab id="2" key="monitoring.tab.statistics" />
Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r7086ae4ff560703d2a2859eed9d3b4c25dfdc44e -r13f904eca7f8ea334801f65d1d6be6bdeb950df0
--- lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 7086ae4ff560703d2a2859eed9d3b4c25dfdc44e)
+++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
@@ -1 +1,71 @@
-<%@ include file="/common/taglibs.jsp" %>
\ No newline at end of file
+<%@ include file="/common/taglibs.jsp"%>
+
+<table border="0" cellspacing="3" width="98%">
+	<c:forEach var="group" items="${summaryList}">
+		<c:forEach var="item" items="${group}" varStatus="status">
+			<%-- display group name on first row--%>
+			<c:if test="${status.index == 0}">
+				<tr>
+					<td>
+						<fmt:message key="monitoring.label.group" />
+						${item.sessionName}
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<table border="0" cellspacing="3" width="98%">
+							<tr>
+								<th width="50">
+									<fmt:message key="monitoring.label.type" />
+								</th>
+								<th width="300">
+									<fmt:message key="monitoring.label.title" />
+								</th>
+								<th width="150">
+									<fmt:message key="monitoring.label.suggest" />
+								</th>
+								<th width="180" align="center">
+									<fmt:message key="monitoring.label.number.learners" />
+								</th>
+							</tr>
+							</c:if>
+							<tr>
+								<td>
+									<c:choose>
+										<c:when test="${item.itemType == 1}">
+											<fmt:message key="label.authoring.basic.resource.url"/>
+										</c:when>
+										<c:when test="${item.itemType == 2}">
+											<fmt:message key="label.authoring.basic.resource.file"/>
+										</c:when>
+										<c:when test="${item.itemType == 3}">
+											<fmt:message key="label.authoring.basic.resource.website"/>
+										</c:when>
+										<c:when test="${item.itemType == 4}">
+											<fmt:message key="label.authoring.basic.resource.learning.object"/>
+										</c:when>
+									</c:choose>
+								</td>
+								<td>
+									${item.itemTitle}
+								</td>
+								<td>
+									<c:if test="${!item.itemCreateByAuthor}">
+										${item.username}
+									</c:if>
+								</td>
+								<td align="center">
+									<c:set var="listUrl">
+										<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}'/>
+									</c:set>
+									<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
+								</td>
+							</tr>
+							<c:if test="${status.index == 0}">
+						</table>
+					</td>
+				</tr>
+							</c:if>
+		</c:forEach>
+	</c:forEach>
+</table>
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7086ae4ff560703d2a2859eed9d3b4c25dfdc44e -r13f904eca7f8ea334801f65d1d6be6bdeb950df0
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7086ae4ff560703d2a2859eed9d3b4c25dfdc44e)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 13f904eca7f8ea334801f65d1d6be6bdeb950df0)
@@ -1,10 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <table border="0" cellspacing="3" width="98%">
-	<c:forEach var="group" items="summaryList">
-		<c:forEach var="item" items="group" statusVar="status">
+	<c:forEach var="group" items="${summaryList}">
+		<c:forEach var="item" items="${group}" varStatus="status">
 			<%-- display group name on first row--%>
-			<c:if test="${status.index = 0}">
+			<c:if test="${status.index == 0}">
 				<tr>
 					<td>
 						<fmt:message key="monitoring.label.group" />
@@ -13,72 +13,74 @@
 				</tr>
 				<tr>
 					<td>
-						<table border="0" cellspacing="3">
+						<table border="0" cellspacing="3" width="98%">
 							<tr>
-								<th>
+								<th width="50">
 									<fmt:message key="monitoring.label.type" />
 								</th>
-								<th>
+								<th width="300">
 									<fmt:message key="monitoring.label.title" />
 								</th>
-								<th>
+								<th width="150">
 									<fmt:message key="monitoring.label.suggest" />
 								</th>
-								<th>
+								<th width="180" align="center">
 									<fmt:message key="monitoring.label.number.learners" />
 								</th>
-								<th>
+								<th width="30">
 									<!--hide/show-->
 								</th>
 							</tr>
 							</c:if>
 							<tr>
 								<td>
 									<c:choose>
-										<c:when test="${item.itemHide == 1}">
-											<fmt:message value="label.authoring.basic.resource.url"/>
+										<c:when test="${item.itemType == 1}">
+											<fmt:message key="label.authoring.basic.resource.url"/>
 										</c:when>
-										<c:when test="${item.itemHide == 2}">
-											<fmt:message value="label.authoring.basic.resource.file"/>
+										<c:when test="${item.itemType == 2}">
+											<fmt:message key="label.authoring.basic.resource.file"/>
 										</c:when>
-										<c:when test="${item.itemHide == 3}">
-											<fmt:message value="label.authoring.basic.resource.website"/>
+										<c:when test="${item.itemType == 3}">
+											<fmt:message key="label.authoring.basic.resource.website"/>
 										</c:when>
-										<c:when test="${item.itemHide == 4}">
-											<fmt:message value="label.authoring.basic.resource.learning.object"/>
+										<c:when test="${item.itemType == 4}">
+											<fmt:message key="label.authoring.basic.resource.learning.object"/>
 										</c:when>
 									</c:choose>
 								</td>
 								<td>
 									${item.itemTitle}
 								</td>
 								<td>
-									${item.username}
+									<c:if test="${!item.itemCreateByAuthor}">
+										${item.username}
+									</c:if>
 								</td>
-								<td>
+								<td align="center">
 									<c:set var="listUrl">
-										<c:url value='/montoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}'/>
+										<c:url value='/monitoring/listuser.do?toolSessionID=${item.sessionId}&itemUid=${item.itemUid}'/>
 									</c:set>
-									<a href="javascript:;" onclick="launchPopup("${listUrl}",'listuser')"> ${item.viewNumber}<a>
+									<a href="#" onclick="launchPopup('${listUrl}','listuser')"> ${item.viewNumber}<a>
 								</td>
 								<td>
 									<c:if test="${!item.itemCreateByAuthor}">
 										<c:choose>
 											<c:when test="${item.itemHide}">
-												<a href="<c:url value='/montoring/showitem.do'/>?itemUid=${item.itemUid}"> <fmt:message key="monitoring.label.show" /> </a>
+												<a href="<c:url value='/monitoring/showitem.do'/>?itemUid=${item.itemUid}"> <fmt:message key="monitoring.label.show" /> </a>
 											</c:when>
 											<c:otherwise>
-												<a href="<c:url value='/montoring/hideitem.do'/>?itemUid=${item.itemUid}"> <fmt:message key="monitoring.label.hide" /> </a>
+												<a href="<c:url value='/monitoring/hideitem.do'/>?itemUid=${item.itemUid}"> <fmt:message key="monitoring.label.hide" /> </a>
 											</c:otherwise>
 										</c:choose>
 									</c:if>
 								</td>
 							</tr>
-							<c:if test="${status.index = 0}">
+							<c:if test="${status.index == 0}">
 						</table>
 					</td>
 				</tr>
-			</c:if>
+							</c:if>
 		</c:forEach>
 	</c:forEach>
 </table>