Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/learning/wiki.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_wiki/web/pages/learning/wiki.jsp	17 Mar 2012 09:28:58 -0000	1.21
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	19 Mar 2012 14:39:35 -0000	1.22
@@ -99,6 +99,9 @@
 			</c:choose>
 		</c:if>
 	</div>
+	<c:if test="${currentWikiPage.deleted}">
+		<p class="warning"><fmt:message key="label.wiki.removed" /></p>
+	</c:if>
 
 	&nbsp; 
 
@@ -115,7 +118,7 @@
 		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	
 		<!-- Set up edit and add flags -->
-		<c:set var="editableFlag" value="${currentWikiPage.editable and not maxEditsReached}" />
+		<c:set var="editableFlag" value="${currentWikiPage.editable and not maxEditsReached and not currentWikiPage.deleted}" />
 		<c:set var="addFlag" value="${wikiDTO.allowLearnerCreatePages and not maxEditsReached}" />
 	
 	
@@ -165,8 +168,8 @@
 					
 					<c:if test="${currentWikiPage.title != mainWikiPage.title && editableFlag}">
 						&nbsp;
-						<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
-							title="<fmt:message key="label.wiki.remove.toolTip"></fmt:message>"
+						<a href="javascript:doRemove('<fmt:message key="label.wiki.remove.mark.confirm"></fmt:message>')"
+							title="<fmt:message key="label.wiki.remove.mark.toolTip"></fmt:message>"
 						>
 							<fmt:message key="label.wiki.remove"></fmt:message>
 						</a>