Revert "update all of these types of extension point links to use c:u…

…rl so" This reverts commit 83b2044.
openmrs · Mar 1, 2013 · 73488b5 · 73488b5
1 parent b504d92
commit 73488b5
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 24 deletions.
diff --git a/webapp/src/main/webapp/WEB-INF/template/gutter.jsp b/webapp/src/main/webapp/WEB-INF/template/gutter.jsp
@@ -22,7 +22,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.gutter.tools" type="html">
 		<openmrs:hasPrivilege privilege="${extension.requiredPrivilege}">
 			<li>
-			<a href="<c:url value="${extension.url}" />"><openmrs:message code="${extension.label}"/></a>
+			<a href="${pageContext.request.contextPath}/${extension.url}"><openmrs:message code="${extension.label}"/></a>
 			</li>
 		</openmrs:hasPrivilege>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp
@@ -59,7 +59,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.concepts.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/encounters/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/encounters/localHeader.jsp
@@ -19,7 +19,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.encounters.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
@@ -26,7 +26,7 @@
 <c:if test="${form.formId != 1}">
 	<openmrs:extensionPoint pointId="org.openmrs.admin.forms.formHeader" type="html" parameters="formId=${form.formId}">
 		<c:forEach items="${extension.links}" var="link">
-			| <a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+			| <a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 		</c:forEach>
 	</openmrs:extensionPoint>
 </c:if>
@@ -327,4 +327,4 @@
 <div style="min-height: 300px"></div>
 </c:if>
 
-<%@ include file="/WEB-INF/template/footer.jsp" %>
+<%@ include file="/WEB-INF/template/footer.jsp" %>
diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/forms/formList.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/forms/formList.jsp
@@ -22,7 +22,7 @@
 
 <openmrs:extensionPoint pointId="org.openmrs.admin.forms.formListHeader" type="html">
 	<c:forEach items="${extension.links}" var="link">
-		| <a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+		| <a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 	</c:forEach>
 </openmrs:extensionPoint>
 

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/forms/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/forms/localHeader.jsp
@@ -40,7 +40,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.forms.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/hl7/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/hl7/localHeader.jsp
@@ -41,10 +41,10 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.hl7.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test='${fn:endsWith(pageContext.request.requestURI, link.key)}'>class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />">
+					<a href="${pageContext.request.contextPath}/${link.key}">
 						<openmrs:message code="${link.value}"/>
 					</a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>
-</ul>
+</ul>
diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/index.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/index.jsp
@@ -148,7 +148,7 @@
 									<c:choose>
 										<c:when test="${fn:startsWith(link.key, 'module/')}">
 											<%-- Added for backwards compatibility for most links --%>
-											<li><a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a></li>
+											<li><a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a></li>
 										</c:when>
 										<c:otherwise>
 											<%-- Allows for external absolute links  --%>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/locations/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/locations/localHeader.jsp
@@ -27,9 +27,9 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.locations.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>
 
-</ul>
+</ul>
diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/maintenance/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/maintenance/localHeader.jsp
@@ -62,7 +62,7 @@
 		<openmrs:hasPrivilege privilege="${extension.requiredPrivilege}">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 		</openmrs:hasPrivilege>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/modules/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/modules/localHeader.jsp
@@ -19,7 +19,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.modules.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/observations/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/observations/localHeader.jsp
@@ -12,7 +12,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.observations.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp
@@ -26,7 +26,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.orders.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/patients/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/patients/localHeader.jsp
@@ -36,7 +36,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.patients.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/person/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/person/localHeader.jsp
@@ -20,7 +20,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.person.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/programs/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/programs/localHeader.jsp
@@ -19,7 +19,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.programs.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/scheduler/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/scheduler/localHeader.jsp
@@ -12,7 +12,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.scheduler.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/users/localHeader.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/users/localHeader.jsp
@@ -33,7 +33,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.admin.users.localHeader" type="html">
 			<c:forEach items="${extension.links}" var="link">
 				<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
-					<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
+					<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
 				</li>
 			</c:forEach>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp b/webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp
@@ -212,7 +212,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.findPatientPortlet.linksAtBottom" type="html"
 		requiredClass="org.openmrs.module.web.extension.LinkExt">
 		<openmrs:hasPrivilege privilege="${extension.requiredPrivilege}">
-			<a href="<c:url value="${extension.url}" />"><openmrs:message code="${extension.label}"/></a>
+			<a href="${extension.url}"><openmrs:message code="${extension.label}"/></a>
 			<br/>
 		</openmrs:hasPrivilege>
 	</openmrs:extensionPoint>
@@ -222,7 +222,7 @@
 	<openmrs:extensionPoint pointId="org.openmrs.findPatientPortlet.linksAtBottom" type="html"
 		requiredClass="org.openmrs.module.web.extension.LinkExt">
 		<openmrs:hasPrivilege privilege="${extension.requiredPrivilege}">
-			<a href="<c:url value="${extension.url}" />"><openmrs:message code="${extension.label}"/></a>
+			<a href="${extension.url}"><openmrs:message code="${extension.label}"/></a>
 			<br/>
 		</openmrs:hasPrivilege>
 	</openmrs:extensionPoint>

diff --git a/webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp b/webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
@@ -28,7 +28,7 @@
 		<tr class="patientActionsRow">
 			<td id="patientActionsPatientSummary">
 				<openmrs:extensionPoint pointId="org.openmrs.patientDashboard.patientSummary" parameters="patientId=${model.patient.patientId}">
-					<a href="javascript:window.open('<c:url value="${extension.url}" />?patientId=${model.patient.patientId}', 'summaryWindow', 'toolbar=no,width=660,height=600,resizable=yes,scrollbars=yes').focus()">${extension.label}</a>
+					<a href="javascript:window.open('${extension.url}?patientId=${model.patient.patientId}', 'summaryWindow', 'toolbar=no,width=660,height=600,resizable=yes,scrollbars=yes').focus()">${extension.label}</a>
 				</openmrs:extensionPoint>
 			</td>
 		</tr>