Skip to content

Commit 73488b5

Browse files
wluyimawluyima
committedMar 1, 2013
Revert "update all of these types of extension point links to use c:url so"
This reverts commit 83b2044.
1 parent b504d92 commit 73488b5

File tree

20 files changed

+24
-24
lines changed

20 files changed

+24
-24
lines changed
 

‎webapp/src/main/webapp/WEB-INF/template/gutter.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<openmrs:extensionPoint pointId="org.openmrs.gutter.tools" type="html">
2323
<openmrs:hasPrivilege privilege="${extension.requiredPrivilege}">
2424
<li>
25-
<a href="<c:url value="${extension.url}" />"><openmrs:message code="${extension.label}"/></a>
25+
<a href="${pageContext.request.contextPath}/${extension.url}"><openmrs:message code="${extension.label}"/></a>
2626
</li>
2727
</openmrs:hasPrivilege>
2828
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<openmrs:extensionPoint pointId="org.openmrs.admin.concepts.localHeader" type="html">
6060
<c:forEach items="${extension.links}" var="link">
6161
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
62-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
62+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
6363
</li>
6464
</c:forEach>
6565
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/encounters/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<openmrs:extensionPoint pointId="org.openmrs.admin.encounters.localHeader" type="html">
2020
<c:forEach items="${extension.links}" var="link">
2121
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
22-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
22+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
2323
</li>
2424
</c:forEach>
2525
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<c:if test="${form.formId != 1}">
2727
<openmrs:extensionPoint pointId="org.openmrs.admin.forms.formHeader" type="html" parameters="formId=${form.formId}">
2828
<c:forEach items="${extension.links}" var="link">
29-
| <a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
29+
| <a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
3030
</c:forEach>
3131
</openmrs:extensionPoint>
3232
</c:if>
@@ -327,4 +327,4 @@
327327
<div style="min-height: 300px"></div>
328328
</c:if>
329329

330-
<%@ include file="/WEB-INF/template/footer.jsp" %>
330+
<%@ include file="/WEB-INF/template/footer.jsp" %>

‎webapp/src/main/webapp/WEB-INF/view/admin/forms/formList.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<openmrs:extensionPoint pointId="org.openmrs.admin.forms.formListHeader" type="html">
2424
<c:forEach items="${extension.links}" var="link">
25-
| <a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
25+
| <a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
2626
</c:forEach>
2727
</openmrs:extensionPoint>
2828

‎webapp/src/main/webapp/WEB-INF/view/admin/forms/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<openmrs:extensionPoint pointId="org.openmrs.admin.forms.localHeader" type="html">
4141
<c:forEach items="${extension.links}" var="link">
4242
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
43-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
43+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
4444
</li>
4545
</c:forEach>
4646
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/hl7/localHeader.jsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
<openmrs:extensionPoint pointId="org.openmrs.admin.hl7.localHeader" type="html">
4242
<c:forEach items="${extension.links}" var="link">
4343
<li <c:if test='${fn:endsWith(pageContext.request.requestURI, link.key)}'>class="active"</c:if> >
44-
<a href="<c:url value="${link.key}" />">
44+
<a href="${pageContext.request.contextPath}/${link.key}">
4545
<openmrs:message code="${link.value}"/>
4646
</a>
4747
</li>
4848
</c:forEach>
4949
</openmrs:extensionPoint>
50-
</ul>
50+
</ul>

‎webapp/src/main/webapp/WEB-INF/view/admin/index.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<c:choose>
149149
<c:when test="${fn:startsWith(link.key, 'module/')}">
150150
<%-- Added for backwards compatibility for most links --%>
151-
<li><a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a></li>
151+
<li><a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a></li>
152152
</c:when>
153153
<c:otherwise>
154154
<%-- Allows for external absolute links --%>

‎webapp/src/main/webapp/WEB-INF/view/admin/locations/localHeader.jsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<openmrs:extensionPoint pointId="org.openmrs.admin.locations.localHeader" type="html">
2828
<c:forEach items="${extension.links}" var="link">
2929
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
30-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
30+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
3131
</li>
3232
</c:forEach>
3333
</openmrs:extensionPoint>
3434

35-
</ul>
35+
</ul>

‎webapp/src/main/webapp/WEB-INF/view/admin/maintenance/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<openmrs:hasPrivilege privilege="${extension.requiredPrivilege}">
6363
<c:forEach items="${extension.links}" var="link">
6464
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
65-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
65+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
6666
</li>
6767
</c:forEach>
6868
</openmrs:hasPrivilege>

‎webapp/src/main/webapp/WEB-INF/view/admin/modules/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<openmrs:extensionPoint pointId="org.openmrs.admin.modules.localHeader" type="html">
2020
<c:forEach items="${extension.links}" var="link">
2121
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
22-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
22+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
2323
</li>
2424
</c:forEach>
2525
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/observations/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<openmrs:extensionPoint pointId="org.openmrs.admin.observations.localHeader" type="html">
1313
<c:forEach items="${extension.links}" var="link">
1414
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
15-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
15+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
1616
</li>
1717
</c:forEach>
1818
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<openmrs:extensionPoint pointId="org.openmrs.admin.orders.localHeader" type="html">
2727
<c:forEach items="${extension.links}" var="link">
2828
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
29-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
29+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
3030
</li>
3131
</c:forEach>
3232
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/patients/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<openmrs:extensionPoint pointId="org.openmrs.admin.patients.localHeader" type="html">
3737
<c:forEach items="${extension.links}" var="link">
3838
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
39-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
39+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
4040
</li>
4141
</c:forEach>
4242
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/person/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<openmrs:extensionPoint pointId="org.openmrs.admin.person.localHeader" type="html">
2121
<c:forEach items="${extension.links}" var="link">
2222
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
23-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
23+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
2424
</li>
2525
</c:forEach>
2626
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/programs/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<openmrs:extensionPoint pointId="org.openmrs.admin.programs.localHeader" type="html">
2020
<c:forEach items="${extension.links}" var="link">
2121
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
22-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
22+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
2323
</li>
2424
</c:forEach>
2525
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/scheduler/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<openmrs:extensionPoint pointId="org.openmrs.admin.scheduler.localHeader" type="html">
1313
<c:forEach items="${extension.links}" var="link">
1414
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
15-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
15+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
1616
</li>
1717
</c:forEach>
1818
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/admin/users/localHeader.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<openmrs:extensionPoint pointId="org.openmrs.admin.users.localHeader" type="html">
3434
<c:forEach items="${extension.links}" var="link">
3535
<li <c:if test="${fn:endsWith(pageContext.request.requestURI, link.key)}">class="active"</c:if> >
36-
<a href="<c:url value="${link.key}" />"><openmrs:message code="${link.value}"/></a>
36+
<a href="${pageContext.request.contextPath}/${link.key}"><openmrs:message code="${link.value}"/></a>
3737
</li>
3838
</c:forEach>
3939
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp

+2-2
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
<openmrs:extensionPoint pointId="org.openmrs.findPatientPortlet.linksAtBottom" type="html"
213213
requiredClass="org.openmrs.module.web.extension.LinkExt">
214214
<openmrs:hasPrivilege privilege="${extension.requiredPrivilege}">
215-
<a href="<c:url value="${extension.url}" />"><openmrs:message code="${extension.label}"/></a>
215+
<a href="${extension.url}"><openmrs:message code="${extension.label}"/></a>
216216
<br/>
217217
</openmrs:hasPrivilege>
218218
</openmrs:extensionPoint>
@@ -222,7 +222,7 @@
222222
<openmrs:extensionPoint pointId="org.openmrs.findPatientPortlet.linksAtBottom" type="html"
223223
requiredClass="org.openmrs.module.web.extension.LinkExt">
224224
<openmrs:hasPrivilege privilege="${extension.requiredPrivilege}">
225-
<a href="<c:url value="${extension.url}" />"><openmrs:message code="${extension.label}"/></a>
225+
<a href="${extension.url}"><openmrs:message code="${extension.label}"/></a>
226226
<br/>
227227
</openmrs:hasPrivilege>
228228
</openmrs:extensionPoint>

‎webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<tr class="patientActionsRow">
2929
<td id="patientActionsPatientSummary">
3030
<openmrs:extensionPoint pointId="org.openmrs.patientDashboard.patientSummary" parameters="patientId=${model.patient.patientId}">
31-
<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>
31+
<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>
3232
</openmrs:extensionPoint>
3333
</td>
3434
</tr>

0 commit comments

Comments
 (0)
Please sign in to comment.