Empt65

api/license-header.txt

@@ -0,0 +1,7 @@
+This Source Code Form is subject to the terms of the Mozilla Public License, 
+v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under 
+the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS 
+graphic logo is a trademark of OpenMRS Inc.

omod/license-header.txt

@@ -0,0 +1,7 @@
+This Source Code Form is subject to the terms of the Mozilla Public License, 
+v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under 
+the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS 
+graphic logo is a trademark of OpenMRS Inc.

omod/src/main/webapp/admin/programs/conversionForm.jsp

@@ -17,6 +17,7 @@
 <openmrs:htmlInclude file="/dwr/util.js" />
 
 <form method="post" id="theForm">
+
 <table>
 	<tr>
 		<td><openmrs:message code="Program.conversion.programWorkflow"/>:<span class="required">*</span></td>

omod/src/main/webapp/resources/scripts/jquery-ui/js/openmrsSearch.js

@@ -851,14 +851,15 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler,
                     attributeValue = rowData.attributes[a.name];
                     if(attributeValue == null)
                         attributeValue = '';
-
                     rRowData.push(attributeValue);
                 });
             }
-
+            for (k in rRowData)
+            {
+                rRowData[k] = $j("<div>").text(rRowData[k]).html();
+            }
             return rRowData;
         },
-
         _fireEvent: function(eventType, data) {
             //TODO also pass 'this'
         },

omod/src/main/webapp/template/headerFull.jsp

@@ -175,7 +175,7 @@
 			</openmrs:forEachAlert>
 
 			<c:if test="${msg != null}">
-				<div id="openmrs_msg"><openmrs:message code="${msg}" text="${msg}" arguments="${msgArgs}"  htmlEscape="false" /></div>
+				<div id="openmrs_msg"><openmrs:message code="<c:out value='${msg}'/>" text="<c:out value='${msg}'/>" arguments="<c:out value='${msgArgs}'/>" htmlEscape="false" /></div>
 			</c:if>
 			<c:if test="${err != null}">
 				<div id="openmrs_error"><openmrs:message code="${err}" text="${err}" arguments="${errArgs}" htmlEscape="false"/></div>

omod/src/main/webapp/template/headerMinimal.jsp

@@ -94,7 +94,7 @@
 	<div id="pageBody">
 		<div id="contentMinimal">
 			<c:if test="${msg != null}">
-				<div id="openmrs_msg"><openmrs:message code="${msg}" text="${msg}" arguments="${msgArgs}" htmlEscape="false" /></div>
+				<div id="openmrs_msg"><openmrs:message code="<c:out value='${msg}'/>" text="<c:out value='${msg}'/>" arguments="<c:out value='${msgArgs}'/>" htmlEscape="false" /></div>
 			</c:if>
 			<c:if test="${err != null}">
 				<div id="openmrs_error"><openmrs:message code="${err}" text="${err}" arguments="${errArgs}"/></div>