Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Moving Allergy/Problem lists to the bottom of the overview tab in the…

… dashboard - TRUNK-1756

git-svn-id: http://svn.openmrs.org/openmrs/trunk@15775 5bac5841-c719-aa4e-b3fe-cce5062f897a
  • Loading branch information...
commit 58df69a9420718c0a529a5760fb415b12f824ad5 1 parent becdd22
bwolfe authored
Showing with 21 additions and 21 deletions.
  1. +21 −21 webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
View
42 webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
@@ -180,22 +180,6 @@
<p>
</c:if>
-<openmrs:hasPrivilege privilege="View Allergies">
-<div id="patientActiveListsAllergyBoxHeader" class="boxHeader${model.patientVariation}"><spring:message code="ActiveLists.allergy.title" /></div>
-<div id="patientActiveListsAllergyBox" class="box${model.patientVariation}">
- <openmrs:portlet url="activeListAllergy" patientId="${patient.patientId}" parameters="type=allergy"/>
-</div>
-<br/>
-</openmrs:hasPrivilege>
-
-<openmrs:hasPrivilege privilege="View Problems">
-<div id="patientActiveListsProblemBoxHeader" class="boxHeader${model.patientVariation}"><spring:message code="ActiveLists.problem.title" /></div>
-<div id="patientActiveListsProblemBox" class="box${model.patientVariation}">
- <openmrs:portlet url="activeListProblem" patientId="${patient.patientId}" parameters="type=problem"/>
-</div>
-<br/>
-</openmrs:hasPrivilege>
-
<openmrs:hasPrivilege privilege="View Patient Programs">
<div id="patientProgramsBoxHeader" class="boxHeader${model.patientVariation}"><spring:message code="Program.title"/></div>
<div id="patientProgramsBox" class="box${model.patientVariation}">
@@ -214,9 +198,25 @@
</c:if>
<openmrs:hasPrivilege privilege="View Relationships">
-<div id="patientRelationshipsBoxHeader" class="boxHeader${model.patientVariation}"><spring:message code="Relationship.relationships" /></div>
-<div id="patientRelationshipsBox" class="box${model.patientVariation}">
- <openmrs:portlet url="personRelationships" size="normal" patientId="${patient.patientId}" />
-</div>
-<br/>
+ <div id="patientRelationshipsBoxHeader" class="boxHeader${model.patientVariation}"><spring:message code="Relationship.relationships" /></div>
+ <div id="patientRelationshipsBox" class="box${model.patientVariation}">
+ <openmrs:portlet url="personRelationships" size="normal" patientId="${patient.patientId}" />
+ </div>
+ <br/>
+</openmrs:hasPrivilege>
+
+<openmrs:hasPrivilege privilege="View Allergies">
+ <div id="patientActiveListsAllergyBoxHeader" class="boxHeader${model.patientVariation}"><spring:message code="ActiveLists.allergy.title" /></div>
+ <div id="patientActiveListsAllergyBox" class="box${model.patientVariation}">
+ <openmrs:portlet url="activeListAllergy" patientId="${patient.patientId}" parameters="type=allergy"/>
+ </div>
+ <br/>
+</openmrs:hasPrivilege>
+
+<openmrs:hasPrivilege privilege="View Problems">
+ <div id="patientActiveListsProblemBoxHeader" class="boxHeader${model.patientVariation}"><spring:message code="ActiveLists.problem.title" /></div>
+ <div id="patientActiveListsProblemBox" class="box${model.patientVariation}">
+ <openmrs:portlet url="activeListProblem" patientId="${patient.patientId}" parameters="type=problem"/>
+ </div>
+ <br/>
</openmrs:hasPrivilege>
Please sign in to comment.
Something went wrong with that request. Please try again.