Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java	7 Jun 2011 20:58:39 -0000	1.2
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java	8 Jun 2011 12:31:16 -0000	1.3
@@ -115,7 +115,8 @@
     public static final String ATTR_USER_FINISHED = "userFinished";
     
     public static final String ATTR_ITEM = "item";
-    public static final String ATTR_REMOTE_TOOL_URL = "toolUrl";
+    public static final String ATTR_LAUNCH_URL = "launchUrl";
+    public static final String ATTR_SECURE_LAUNCH_URL = "secureLaunchUrl";
     public static final String ATTR_REMOTE_TOOL_KEY = "toolKey";
     public static final String ATTR_REMOTE_TOOL_SECRET = "toolSecret";
     public static final String ATTR_BUTTON_TEXT = "buttonText";
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	7 Jun 2011 20:58:39 -0000	1.2
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java	8 Jun 2011 12:31:16 -0000	1.3
@@ -325,8 +325,10 @@
 	    
 	    CommonCartridgeItem resource = uploadedCartridgeResources.get(i);
 	    
-	    String launchUrl = request.getParameter(CommonCartridgeConstants.ATTR_REMOTE_TOOL_URL + i);
+	    String launchUrl = request.getParameter(CommonCartridgeConstants.ATTR_LAUNCH_URL + i);
 	    resource.setLaunchUrl(launchUrl);
+	    String secureLaunchUrl = request.getParameter(CommonCartridgeConstants.ATTR_SECURE_LAUNCH_URL + i);
+	    resource.setSecureLaunchUrl(secureLaunchUrl);
 	    String toolKey = request.getParameter(CommonCartridgeConstants.ATTR_REMOTE_TOOL_KEY + i);
 	    resource.setKey(toolKey);
 	    String toolSecret = request.getParameter(CommonCartridgeConstants.ATTR_REMOTE_TOOL_SECRET + i);
@@ -1049,11 +1051,13 @@
      */
     private ActionErrors validateCommonCartridgeItem(CommonCartridgeItemForm itemForm) {
 	ActionErrors errors = new ActionErrors();
-	if (StringUtils.isBlank(itemForm.getTitle())) {
-//	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(CommonCartridgeConstants.ERROR_MSG_TITLE_BLANK));
-	}
 
 	if (itemForm.getItemType() == CommonCartridgeConstants.RESOURCE_TYPE_BASIC_LTI) {
+	    if (StringUtils.isBlank(itemForm.getTitle())) {
+		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+			CommonCartridgeConstants.ERROR_MSG_TITLE_BLANK));
+	    }	    
+	    
 	    if (StringUtils.isBlank(itemForm.getUrl())) {
 		errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
 			CommonCartridgeConstants.ERROR_MSG_URL_BLANK));
Index: lams_tool_imscc/web/includes/javascript/commonCartridgeItem.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/includes/javascript/commonCartridgeItem.js,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/includes/javascript/commonCartridgeItem.js	28 May 2011 18:03:49 -0000	1.1
+++ lams_tool_imscc/web/includes/javascript/commonCartridgeItem.js	8 Jun 2011 12:31:16 -0000	1.2
@@ -5,14 +5,6 @@
     var itemAttachmentTargetDiv = "itemAttachmentArea";
     var singleInstructionHeight = 40;
     
-	function removeInstruction(idx){
-	    var param = $("#instructionForm").serialize() + "&removeIdx="+idx;
-	    removeInstructionLoading();
-	    $.post(removeInstructionUrl, param, function(xml) {
-	    	removeInstructionComplete();	
-	    	document.getElementById("instructionArea").innerHTML = xml;
-	    });
-	}
 	function removeItemAttachment(idx){
 	    removeItemAttachmentLoading();
 		$("#" + itemAttachmentTargetDiv).load(
@@ -22,65 +14,15 @@
 			}
 		);	    
 	}
-	function addInstruction(){
-	    var param = $("#instructionForm").serialize();
-		addInstructionLoading();
-	    $.post(addInstructionUrl, param, function(xml) {
-	    	addInstructionComplete();
-	    	document.getElementById("instructionArea").innerHTML = xml;
-	    });
-	    return false;
-
-	}
-	function adjustInstructionsDisplayAreaHeight(adjustAmount){
-		var obj = window.top.document.getElementById('reourceInputArea');
-		obj.style.height=obj.contentWindow.document.body.scrollHeight+adjustAmount+'px';
-	}
-	function upItem(itemIdx){
-		if(itemIdx == 0)
-			return;
-		var currId = "instructionItemDesc" + itemIdx;
-		var repId = "instructionItemDesc" + (--itemIdx);
-		switchValue(currId,repId);
-	}
-	function downItem(itemIdx,maxSize){
-		if(itemIdx == (maxSize -1))
-			return;
-		var currId = "instructionItemDesc" + itemIdx;
-		var repId = "instructionItemDesc" + (++itemIdx);
-		switchValue(currId,repId);
-	}
-	function switchValue(currId,repId){
-		var temp = document.getElementById(repId).value;
-		document.getElementById(repId).value = document.getElementById(currId).value;
-		document.getElementById(currId).value = temp;
-	}
-	function removeInstructionLoading(){
-		showBusy(instructionTargetDiv);
-	}
-	function removeInstructionComplete(){
-		hideBusy(instructionTargetDiv);
-		adjustInstructionsDisplayAreaHeight(-singleInstructionHeight);
-	}
 	function removeItemAttachmentLoading(){
 		showBusy(itemAttachmentTargetDiv);
 	}
 	function removeItemAttachmentComplete(){
 		hideBusy(itemAttachmentTargetDiv);
 	}
-	function addInstructionLoading(){
-		showBusy(instructionTargetDiv);
-	}
-	function addInstructionComplete(){
-		hideBusy(instructionTargetDiv);
-		adjustInstructionsDisplayAreaHeight(singleInstructionHeight);
-	}
 	
 	function submitCommonCartridgeItem(){
 		$("#commonCartridgeItemForm").submit();
 		// after submit, it direct to itemlist.jsp, 
 		// then refresh "basic tab" commonCartridgelist and close this window.
 	}
-	function cancelCommonCartridgeItem(){
-		window.top.hideMessage();
-	}
Index: lams_tool_imscc/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/basic.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/web/pages/authoring/basic.jsp	7 Jun 2011 20:58:39 -0000	1.2
+++ lams_tool_imscc/web/pages/authoring/basic.jsp	8 Jun 2011 12:31:16 -0000	1.3
@@ -1,48 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
-<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">
 
-	function showMessage(url) {
-		var area=document.getElementById("reourceInputArea");
-		if(area != null){
-			area.style.width="650px";
-			area.style.height="100%";
-			area.src=url;
-			area.style.display="block";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="none";
-		}
-		location.hash = "reourceInputArea";
-	}
-	function hideMessage(){
-		var area=document.getElementById("reourceInputArea");
-		if(area != null){
-			area.style.width="0px";
-			area.style.height="0px";
-			area.style.display="none";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="block";
-		}
-	}
-
 	function previewItem(type,idx,sessionMapID){
 		//1:url, 2:file, 3:website,4:learning object
 		//This mode is special for unsaved author page. It is different with the author mode in preview 
 		var myUrl = "<c:url value='/reviewItem.do?mode=author_session&itemIndex='/>"+idx+"&sessionMapID="+sessionMapID;
 		launchPopup(myUrl,"Review");
 	}
 	
-	function editItem(idx,sessionMapID){
-		 var reqIDVar = new Date();
-		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
-		showMessage(url);
-	}
-	
 	var commonCartridgeListTargetDiv = "#commonCartridgeListArea";
 	function deleteItem(idx,sessionMapID){
 		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
@@ -66,7 +32,6 @@
 		};
 	}
 	
-	
 	function deleteItemLoading(){
 		showBusy(commonCartridgeListTargetDiv);
 	}
@@ -138,12 +103,3 @@
 		<fmt:message key="label.authoring.basic.upload.common.cartridge" />
 	</a>
 </p>
-
-<p>
-	<iframe
-		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
-		id="reourceInputArea" name="reourceInputArea"
-		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
-		scrolling="no">
-	</iframe>
-</p>
Index: lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp	28 May 2011 18:03:43 -0000	1.1
+++ lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp	8 Jun 2011 12:31:16 -0000	1.2
@@ -6,9 +6,25 @@
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<lams:css style="tabbed" />
+		
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/commonCartridgeItem.js'/>"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery-1.5.1.min.js"></script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.form.js'/>"></script>
+		<script type="text/javascript">
+    		function formSubmit(){
+    			$('#commonCartridgeItemForm').ajaxSubmit({
+    				target: $("#commonCartridgeListArea", self.parent.document),
+    				success: function() {
+    					self.parent.refreshThickbox()
+    					self.parent.tb_remove();
+    				}
+    			});
+    		}
+		</script>
 	</lams:head>
-	<body class="tabpart">
+	
+	<body class="stripes" onload="parent.resizeIframe();">
+	<div id="content" style="width: 93%; ">	
 
 		<!-- Basic Info Form-->
 		<%@ include file="/common/messages.jsp"%>
@@ -80,14 +96,17 @@
 
 		</html:form>
 
+		<br />
 		<lams:ImgButtonWrapper>
-			<a href="#" onclick="submitCommonCartridgeItem()" class="button-add-item">
+			<a href="javascript:;" onclick="self.parent.tb_remove();" class="button space-left right-buttons space-right ">
+				<fmt:message key="label.cancel" /> 
+			</a>		
+			<a href="#" onclick="formSubmit()" class="button-add-item right-buttons space-left">
 				<fmt:message key="label.authoring.basic.add.url" />
 			</a>
-			<a href="javascript:;" onclick="cancelCommonCartridgeItem()" class="button space-left">
-				<fmt:message key="label.cancel" /> 
-			</a>
 		</lams:ImgButtonWrapper>
-		<br />
+		
+		
+	</div>
 	</body>
 </lams:html>
Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	7 Jun 2011 20:58:39 -0000	1.2
+++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	8 Jun 2011 12:31:16 -0000	1.3
@@ -11,27 +11,32 @@
 	</lams:head>
 	
 	<body class="stripes" onload="parent.resizeIframe();">
-	<div id="content" style="width: 90%; text-align: center;">
+	<div id="content" style="width: 93%; text-align: center;">
 		<%@ include file="/common/messages.jsp"%>
 		<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="commonCartridgeItemForm" enctype="multipart/form-data">
 			<html:hidden property="sessionMapID" />
 			<input type="hidden" name="itemType" id="itemType" value="2" />
 			<html:hidden property="itemIndex" />
 
-			<h2 class="no-space-left">
+			<h1 class="space-bottom">
 				<fmt:message key="label.authoring.basic.upload.common.cartridge" />
-			</h2>
-			<br />
+			</h1>
 			
 			<c:set var="itemAttachment" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 			<div id="itemAttachmentArea">
 				<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
-			<a href="#" onclick="submitCommonCartridgeItem()" class="button"><fmt:message
-					key="button.upload" /> </a>				
 			</div>
-			<br /><br />
+			
+			<lams:ImgButtonWrapper >
+				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left right-buttons">
+					<fmt:message key="label.cancel" /> 
+				</a>
+				<a href="#" onclick="submitCommonCartridgeItem();" onmousedown="self.focus();" class="button right-buttons">
+					<fmt:message key="button.upload" />
+				</a>
+			</lams:ImgButtonWrapper>
+			<br />
 
-
 		</html:form>
 		
 	</div>	
Index: lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	28 May 2011 18:03:43 -0000	1.1
+++ lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	8 Jun 2011 12:31:16 -0000	1.2
@@ -25,15 +25,20 @@
 						</span>
 						${commonCartridge.title}
 					</td>
-					<td width="10%">
+					<td width="9%">
 						<a href="#"
 							onclick="previewItem(1,${status.index},'${sessionMapID}')"> <fmt:message
 								key="label.authoring.basic.resource.verify.url" /> </a>
 					</td>
 					<td width="5%">
-						<img src="${tool}includes/images/edit.gif"
-							title="<fmt:message key="label.authoring.basic.resource.edit" />"
-							onclick="editItem(${status.index},'${sessionMapID}')" />
+					
+						<c:set var="editItemUrl" >
+							<c:url value='/authoring/editItemInit.do'/>?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true
+						</c:set>		
+						<a href="${editItemUrl}" class="thickbox" style="border-style: none;"> 
+							<img src="${tool}includes/images/edit.gif"
+								title="<fmt:message key="label.authoring.basic.resource.edit" />" style="border-style: none;"/>
+						</a>
 
 					</td>
 					<td width="5%">
Index: lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	7 Jun 2011 20:58:39 -0000	1.1
+++ lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	8 Jun 2011 12:31:16 -0000	1.2
@@ -15,12 +15,12 @@
 		<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery-1.5.1.min.js"></script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.form.js'/>"></script>
-		
 		<script type="text/javascript">
     		function formSubmit(){
     			$('#itemForm').ajaxSubmit({
     				target: $("#commonCartridgeListArea", self.parent.document),
     				success: function() {
+    					self.parent.refreshThickbox();
     					self.parent.tb_remove();
     				}
     			});
@@ -29,13 +29,13 @@
 	</lams:head>
 
 	<body class="stripes" onload="parent.resizeIframe();">
-	<div id="content" style="width: 95%;">
+	<div id="content" style="width: 93%;">
 		<%@ include file="/common/messages.jsp"%>
 
 <form id="itemForm" name="itemForm" action="<c:url value='/authoring/selectResources.do'/>">
 <input type="hidden" value="${sessionMapID}" name="sessionMapID"> 
 <div>
-	<h1 class="space-bottom">
+	<h1 class="small-space-bottom">
 		<fmt:message key="label.authoring.select.available.resources" />
 	</h1>
 
@@ -61,11 +61,18 @@
 						</a>
 						
 						<div class="monitoring-advanced" id="advancedDiv${status.index}" style="display:none">
-
+							
 							<div class="field-name space-top">
 								<fmt:message key="label.authoring.basic.bascilti.url" />
-							</div>
-							<input type="text" name="toolUrl${status.index}" value="${resource.launchUrl}" size="55" />
+							</div>							
+							<c:choose>
+								<c:when test="${(empty resource.launchUrl) && !(empty resource.secureLaunchUrl)}">
+									<input type="text" name="secureLaunchUrl${status.index}" value="${resource.secureLaunchUrl}" size="55" />
+								</c:when>
+								<c:otherwise>
+									<input type="text" name="launchUrl${status.index}" value="${resource.launchUrl}" size="55" />
+								</c:otherwise>
+							</c:choose>
 							
 							<div class="field-name space-top">
 								<fmt:message key="label.authoring.basic.bascilti.key" />
@@ -104,7 +111,7 @@
 </div>
 </form>
 
-	<br />
+
 	<lams:ImgButtonWrapper >
 		<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left right-buttons">
 			<fmt:message key="label.cancel" />