From dd5dcb17b999be8d1efdd8fba759bbbb07d729af Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Tue, 30 May 2017 19:42:10 -0700
Subject: [PATCH] Practices gui - bootstrap light, no pure php in smarty, html
 escaping in smarty (#810)

---
 controllers/C_InsuranceCompany.class.php        |   1 +
 library/classes/Pharmacy.class.php              |   3 +-
 templates/document_categories/general_list.html |  24 ++---
 templates/documents/general_queue.html          |  54 +++++-----
 templates/hl7/general_parse.html                |  23 +++--
 templates/insurance_companies/general_edit.html | 127 ++++++++++++-----------
 templates/insurance_companies/general_list.html |  26 ++---
 templates/insurance_numbers/general_edit.html   |  91 ++++++++--------
 templates/insurance_numbers/general_list.html   |  59 ++++++-----
 templates/pharmacies/general_edit.html          |  49 +++++----
 templates/pharmacies/general_list.html          |  62 +++++------
 templates/practice_settings/general_list.html   |   2 +-
 templates/x12_partners/general_edit.html        | 132 +++++++++++++-----------
 templates/x12_partners/general_list.html        |  55 +++++-----
 14 files changed, 380 insertions(+), 328 deletions(-)
 rewrite templates/insurance_numbers/general_list.html (66%)
 rewrite templates/pharmacies/general_list.html (63%)
 rewrite templates/x12_partners/general_list.html (65%)

diff --git a/controllers/C_InsuranceCompany.class.php b/controllers/C_InsuranceCompany.class.php
index 9998bb99b..de400d4d9 100644
--- a/controllers/C_InsuranceCompany.class.php
+++ b/controllers/C_InsuranceCompany.class.php
@@ -14,6 +14,7 @@ class C_InsuranceCompany extends Controller {
 		$this->assign("CURRENT_ACTION", $GLOBALS['webroot']."/controller.php?" . "practice_settings&insurance_company&");
 		$this->assign("STYLE", $GLOBALS['style']);
 		$this->assign("WEB_ROOT", $GLOBALS['webroot'] );
+		$this->assign("SUPPORT_ENCOUNTER_CLAIMS", $GLOBALS['support_encounter_claims'] );
 		$this->InsuranceCompany = new InsuranceCompany();
 	}
 
diff --git a/library/classes/Pharmacy.class.php b/library/classes/Pharmacy.class.php
index 5645a8782..1b746ed89 100644
--- a/library/classes/Pharmacy.class.php
+++ b/library/classes/Pharmacy.class.php
@@ -24,7 +24,7 @@ class Pharmacy extends ORDataObject{
 	var $address;
 	var $transmit_method;
 	var $email;
-	var $transmit_method_array = array("","Print", "Email" ,"Fax");
+	var $transmit_method_array; //set in constructor
 
 	/**
 	 * Constructor sets all Prescription attributes to their default value
@@ -34,6 +34,7 @@ class Pharmacy extends ORDataObject{
 		$this->name = "";
 		$this->email = "";
 		$this->transmit_method = 1;
+		$this->transmit_method_array = array(xl("None Selected"), xl("Print"), xl("Email"), xl("Fax"));
 		$this->_table = "pharmacies";
 		$phone  = new PhoneNumber();
 		$phone->set_type(TYPE_WORK);
diff --git a/templates/document_categories/general_list.html b/templates/document_categories/general_list.html
index fc5ef9b93..53af789e7 100644
--- a/templates/document_categories/general_list.html
+++ b/templates/document_categories/general_list.html
@@ -14,13 +14,13 @@
 </style>
 {/literal}
 <script type="text/javascript">
-var deleteLabel="{xl t="Delete"}";
-var editLabel="{xl t="Edit"}";
+var deleteLabel="{xl t="Delete"|escape:'html'}";
+var editLabel="{xl t="Edit"|escape:'html'}";
 </script>
 <script type="text/javascript" src="{$WEBROOT}/library/js/CategoryTreeMenu.js?v={php}echo $GLOBALS['v_js_includes'];{/php}"></script>
 <table>
 	<tr>
-		<td height="20" valign="top">{xl t="Document Categories"}</td>
+		<td height="20" valign="top">{xl t="Document Categories"|escape:'html'}</td>
 	</tr>
 	<tr>
 		<td valign="top">{$tree_html}</td>
@@ -31,29 +31,29 @@ var editLabel="{xl t="Edit"}";
 		<td width="25"></td>
 		<td valign="top">
     {if $add_node eq true}
-		{xl t="This new category will be a sub-category of "} {$parent_name}<br>
+		{xl t="This new category will be a sub-category of "|escape:'html'} {$parent_name|escape:'html'}<br>
 		{/if}
 		<form method="post" action="{$FORM_ACTION}" onsubmit="return top.restoreSession()">
 
     <table>
       <tr>
-        <td>{xl t="Category Name"}&nbsp;</td>
-        <td><input type="text" name="name" value="{$NAME}" onKeyDown="PreventIt(event)" /></td>
+        <td>{xl t="Category Name"|escape:'html'}&nbsp;</td>
+        <td><input type="text" name="name" value="{$NAME|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
       </tr>
       <tr>
-        <td>{xl t="Value"}&nbsp;</td>
-		    <td><input type="text" name="value" value="{$VALUE}" onKeyDown="PreventIt(event)" ></td>
+        <td>{xl t="Value"|escape:'html'}&nbsp;</td>
+		    <td><input type="text" name="value" value="{$VALUE|escape:'html'}" onKeyDown="PreventIt(event)" ></td>
       </tr>
       <tr>
-        <td>{xl t="Access Control"}&nbsp;</td>
+        <td>{xl t="Access Control"|escape:'html'}&nbsp;</td>
 		    <td><select name="aco_spec">{$ACO_OPTIONS}</select></td>
       </tr>
     </table>
     &nbsp;<br />
 
-		<input type="submit" name="Add Category" value="{xl t='Save Category'}">
-		<input type="hidden" name="parent_is" value="{$parent_is}">
-		<input type="hidden" name="process" value="{$PROCESS}" />
+		<button type="submit" name="Add Category" class="btn btn-default btn-save">{xl t='Save Category'|escape:'html'}</button>
+		<input type="hidden" name="parent_is" value="{$parent_is|escape:'html'}">
+		<input type="hidden" name="process" value="{$PROCESS|escape:'html'}" />
 		</form>
 		</td>
 		{/if}
diff --git a/templates/documents/general_queue.html b/templates/documents/general_queue.html
index 57d2eeff7..fd814c11c 100644
--- a/templates/documents/general_queue.html
+++ b/templates/documents/general_queue.html
@@ -1,39 +1,33 @@
-{literal}
-<head>
-<script language="javascript">
-function submit_documents()
-{
-    top.restoreSession();
-    document.queue.submit();
-}
-</script>
-</head>
-{/literal}
-
-<a href="controller.php?practice_settings&{$TOP_ACTION}document_category&action=list" onclick="top.restoreSession()" class="css_button" >
-<span>{xl t='Edit Categories'}</span></a><a href="#" onclick="submit_documents();" class="css_button" target="_self" ><span>{xl t='Update files'}</span></a>
-<input type="hidden" name="process" value="{$PROCESS}" /><br><br>
+<div class="btn-group">
+    <a href="controller.php?practice_settings&{$TOP_ACTION}document_category&action=list" onclick="top.restoreSession()" class="btn btn-default btn-edit" >
+        {xl t='Edit Categories'|escape:'html'}
+    </a>
+    <a href="#" onclick="submit_documents();" class="btn btn-default btn-transmit" target="_self" onclick="top.restoreSession()">
+        {xl t='Update files'|escape:'html'}
+    </a>
+</div>
+<input type="hidden" name="process" value="{$PROCESS|escape:'html'}" /><br><br>
 
 <form name="queue" method="post" action="{$FORM_ACTION}" onsubmit="return top.restoreSession()">
-<table cellpadding="1" class="showborder">
+<table class="table table-responsive table-striped">
 	<tr class="center_display">
 		<td colspan="6">{$messages}</td>
 	</tr>
 	<tr class="showborder_head">
-		<th colspan="2" width="110px">{xl t='Name'}</td>
-		<th width="100px">{xl t='Date'}</td>
-		<th width="200px">{xl t='Patient'}</td>
-		<th colspan="2">{xl t='Category'}</td>
+		<th colspan="2" width="110px">{xl t='Name'|escape:'html'}</td>
+		<th width="100px">{xl t='Date'|escape:'html'}</td>
+		<th width="200px">{xl t='Patient'|escape:'html'}</td>
+		<th colspan="2">{xl t='Category'|escape:'html'}</td>
 	</tr>
 	{foreach name=queue_list from=$queue_files item=file}
 	<tr>
 		<td><input type="checkbox" name="files[{$file.document_id}][active]" value="1" {if is_numeric($file.patient_id)}checked{/if}></td>
 
-		<td><a href="{$file.web_path}" onclick="top.restoreSession()">{$file.filename}</a><input type="hidden" name="files[{$file.document_id}][name]" value="{$file.filename}"></td>
+		<td><a href="{$file.web_path}" onclick="top.restoreSession()">{$file.filename}</a><input type="hidden" name="files[{$file.document_id|escape:'html'}][name]" value="{$file.filename|escape:'html'}"></td>
 
-		<td>{$file.mtime}</td>
+		<td>{$file.mtime|escape:'html'}</td>
 
-		<td><input type="text" name="files[{$file.document_id}][patient_id]" size="5" value="{$file.patient_id}"><input type="hidden" name="patient_name" value=""></td>
+		<td><input type="text" name="files[{$file.document_id|escape:'html'}][patient_id]" size="5" value="{$file.patient_id|escape:'html'}"><input type="hidden" name="patient_name" value=""></td>
 
 		<td><a href="javascript:{literal}{}{/literal}" onclick="top.restoreSession();var URL='controller.php?patient_finder&find&form_id=queue{"['files[`$file.document_id`][patient_id]']"|escape:"url"}&form_name=patient_name'; window.open(URL, 'queue', 'toolbar=0,scrollbars=1,location=0,statusbar=1,menubar=0,resizable=1,width=450,height=400,left = 425,top = 250');"><img src="images/stock_search-16.png" border="0"</a>&nbsp;&nbsp;&nbsp;</td>
 		<td><select name="files[{$file.document_id}][category_id]">{$tree_html_listbox}</select></td>
@@ -41,10 +35,22 @@ function submit_documents()
 	</tr>
 	{foreachelse}
 	<tr height="25" class="center_display">
-		<td colspan="6">{xl t='No Documents Found'}</td>
+		<td colspan="6">{xl t='No Documents Found'|escape:'html'}</td>
 	</tr>
 	{/foreach}
 
 </table><br><br>
 
 </form>
+
+{literal}
+<head>
+<script language="javascript">
+function submit_documents()
+{
+    top.restoreSession();
+    document.queue.submit();
+}
+</script>
+</head>
+{/literal}
\ No newline at end of file
diff --git a/templates/hl7/general_parse.html b/templates/hl7/general_parse.html
index 4de1df9b6..694b7b448 100644
--- a/templates/hl7/general_parse.html
+++ b/templates/hl7/general_parse.html
@@ -1,7 +1,5 @@
 <html>
 <head>
-{php}html_header_show();{/php}
-
 </head>
 <body bgcolor="{$STYLE.BGCOLOR2}">
 <form name="prescribe" method="post" action="{$FORM_ACTION}" onsubmit="return top.restoreSession()">
@@ -13,31 +11,38 @@ PID|||PATID1234^5^M11||RYAN^HENRY^P||19610615|M||C|1200 N ELM STREET^^GREENSBORO
 NK1|JOHNSON^JOAN^K|WIFE||||||NK^NEXT OF KIN
 PV1|1|I|2000^2053^01||||004777^FISHER^BEN^J.|||SUR||||ADM|A0|</td></tr>-->
 <tr>
-<td colspan="2"><b>{xl t='Paste HL7 Data'}</b></td>
+<td colspan="2"><b>{xl t='Paste HL7 Data'|escape:'html'}</b></td>
 </tr>
 <tr height="25">
 	<td colspan="2" ><textarea rows="10" wrap="virtual" cols="70" name="hl7data"></textarea><br /><br />
 	</td></tr>
 	<tr class="text"><td colspan="2">
-	<a href="javascript:document.forms[0].reset();" class="css_button"><span>{xl t='Clear HL7 Data'}</span></a><a href="javascript:document.forms[0].submit();" class="css_button" ><span>{xl t='Parse HL7'}</span></a>
+	<div class="btn-group">
+	    <a href="javascript:document.forms[0].reset();" class="btn btn-default btn-delete" onclick="top.restoreSession()">
+	        {xl t='Clear HL7 Data'|escape:'html'}
+	    </a>
+	    <a href="javascript:document.forms[0].submit();" class="btn btn-default btn-transmit" onclick="top.restoreSession()">
+	        {xl t='Parse HL7'|escape:'html'}
+	    </a>
+	</div>
 	</td>
 
 {if $hl7_message_err}
-	<tr height="25"><td colspan="2">{$hl7_message_err}</td></tr>
+	<tr height="25"><td colspan="2">{$hl7_message_err|escape:'html'}</td></tr>
 {/if}
 {if $hl7_array}
-	<tr class="text"><td colspan="2">
+	<tr><td colspan="2">
 	<table class="showborder">
 	{foreach from=$hl7_array item=hl7item key=hl7key}
-	<tr height="25"><td colspan="3">{$hl7key}</td></tr>
+	<tr height="25"><td colspan="3">{$hl7key|escape:'html'}</td></tr>
 		{foreach from=$hl7item item=segment_val key=segment_name}
-			<tr><td>&nbsp;</td><td>{$segment_name}: </td><td>{$segment_val}</td></tr>
+			<tr><td>&nbsp;</td><td>{$segment_name|escape:'html'}: </td><td>{$segment_val|escape:'html'}</td></tr>
 		{/foreach}
 	{/foreach}
 	</table>
 	</td></tr>
 {/if}
-<input type="hidden" name="process" value="{$PROCESS}" />
+<input type="hidden" name="process" value="{$PROCESS|escape:'html'}" />
 </table>
 </form>
 
diff --git a/templates/insurance_companies/general_edit.html b/templates/insurance_companies/general_edit.html
index fbbecc506..6f07a10f8 100644
--- a/templates/insurance_companies/general_edit.html
+++ b/templates/insurance_companies/general_edit.html
@@ -1,121 +1,126 @@
-{literal}
-<script language="javascript">
-function submit_insurancecompany() {
-    if(document.insurancecompany.name.value.length>0) { 
-        top.restoreSession();
-	    document.insurancecompany.submit();
-		//Z&H Removed redirection
-    } else{
-        document.insurancecompany.name.style.backgroundColor="red";
-        document.insurancecompany.name.focus();
-    }
-}
-
-function jsWaitForDelay(delay) {
-     var startTime = new Date();
-     var endTime = null;
-     do {
-        endTime = new Date();
-     } while ((endTime - startTime) < delay);
-}
-</script>
-{/literal}
-<form name="insurancecompany" method="post" action="{$FORM_ACTION}">
+<form name="insurancecompany" method="post" action="{$FORM_ACTION}" onsubmit="return top.restoreSession()">
 <!-- it is important that the hidden form_id field be listed first, when it is called it populates any old information attached with the id, this allows for partial edits
 		if it were called last, the settings from the form would be overwritten with the old information-->
-<input type="hidden" name="form_id" value="{$insurancecompany->id}" />
+<input type="hidden" name="form_id" value="{$insurancecompany->id|escape:'html'}" />
 <table style="font-size:9pt;" width="500px" CELLSPACING="0" CELLPADDING="3">
 <tr>
-	<td width="220px" VALIGN="MIDDLE" >{xl t='Name'}</td>
+	<td width="220px" VALIGN="MIDDLE" >{xl t='Name'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="40" name="name" value="{$insurancecompany->get_name()}" onKeyDown="PreventIt(event)" /> ({xl t='Required'})
+		<input type="text" size="40" name="name" value="{$insurancecompany->get_name()|escape:'html'}" onKeyDown="PreventIt(event)" /> ({xl t='Required'|escape:'html'})
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Attn'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Attn'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="40" name="attn" value="{$insurancecompany->get_attn()}" onKeyDown="PreventIt(event)" />
+		<input type="text" size="40" name="attn" value="{$insurancecompany->get_attn()|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Address'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Address'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="40" name="address_line1" value="{$insurancecompany->address->line1}" onKeyDown="PreventIt(event)" />
+		<input type="text" size="40" name="address_line1" value="{$insurancecompany->address->line1|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Address'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Address'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="40" name="address_line2" value="{$insurancecompany->address->line2}" onKeyDown="PreventIt(event)" />
+		<input type="text" size="40" name="address_line2" value="{$insurancecompany->address->line2|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='City, State Zip'}</td>
+	<td VALIGN="MIDDLE" >{xl t='City, State Zip'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="25" name="city" value="{$insurancecompany->address->city}" onKeyDown="PreventIt(event)" /> , <input type="text" size="2" maxlength="2" name="state" value="{$insurancecompany->address->state}" onKeyDown="PreventIt(event)" /> <input type="text" size="5" name="zip" value="{$insurancecompany->address->zip}" onKeyDown="PreventIt(event)" />
+		<input type="text" size="25" name="city" value="{$insurancecompany->address->city|escape:'html'}" onKeyDown="PreventIt(event)" /> , <input type="text" size="2" maxlength="2" name="state" value="{$insurancecompany->address->state|escape:'html'}" onKeyDown="PreventIt(event)" /> <input type="text" size="5" name="zip" value="{$insurancecompany->address->zip|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Phone'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Phone'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input TYPE="TEXT" NAME="phone" SIZE="12" VALUE="{$insurancecompany->get_phone()}" onKeyDown="PreventIt(event)" />
+		<input TYPE="TEXT" NAME="phone" SIZE="12" VALUE="{$insurancecompany->get_phone()|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='CMS ID'}</td>
+	<td VALIGN="MIDDLE" >{xl t='CMS ID'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="15" name="cms_id" value="{$insurancecompany->get_cms_id()}" onKeyDown="PreventIt(event)" />
-{php} if ($GLOBALS['support_encounter_claims']) { {/php}
-    &nbsp;&nbsp;{xl t='For Encounter Claims'}:
-		<input type="text" size="15" name="alt_cms_id" value="{$insurancecompany->get_alt_cms_id()}" onKeyDown="PreventIt(event)" />
-{php} } {/php}
+		<input type="text" size="15" name="cms_id" value="{$insurancecompany->get_cms_id()|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
+{if $SUPPORT_ENCOUNTER_CLAIMS}
+<tr>
+    <td VALIGN="MIDDLE" >{xl t='CMS ID For Encounter Claims'}</td>
+    <td VALIGN="MIDDLE" >
+		<input type="text" size="15" name="alt_cms_id" value="{$insurancecompany->get_alt_cms_id()|escape:'html'}" onKeyDown="PreventIt(event)" />
+    </td>
+</tr>
+{/if}
 <tr>
-	<td VALIGN="MIDDLE">{xl t='Payer Type'}</td>
+	<td VALIGN="MIDDLE">{xl t='Payer Type'|escape:'html'}</td>
 	<td VALIGN="MIDDLE">
 		{html_options name="ins_type_code" options=$insurancecompany->ins_type_code_array selected=$insurancecompany->get_ins_type_code()}
 	</td>
 </tr>
-<!--
-This is now deprecated use the newer x12 partner code instead
 <tr>
-	<td COLSPAN="1" ALIGN="LEFT" VALIGN="MIDDLE">X12 Receiver ID</td>
-	<td COLSPAN="2" ALIGN="LEFT" VALIGN="MIDDLE">
-		<input type="text" name="x12_receiver_id" value="{$insurancecompany->get_x12_receiver_id()}" >
-	</td>
-</tr>-->
-<tr>
-	<td VALIGN="MIDDLE">{xl t='Default X12 Partner'}</td>
+	<td VALIGN="MIDDLE">{xl t='Default X12 Partner'|escape:'html'}</td>
 	<td VALIGN="MIDDLE">
 		{html_options name="x12_default_partner_id" options=$x12_partners selected=$insurancecompany->get_x12_default_partner_id()}
 	</td>
 </tr>
 {if $insurancecompany->get_inactive() eq 1 }
 <tr>
-     <td VALIGN="MIDDLE" >{xl t='Reactivate'}</td>
+     <td VALIGN="MIDDLE" >{xl t='Reactivate'|escape:'html'}</td>
      <td VALIGN="MIDDLE" >
- <input type='checkbox'  name='inactive' value="0"   /> 
+ <input type='checkbox'  name='inactive' value="0"   />
 
     </td>
 </tr>
 {/if}
 {if $insurancecompany->get_inactive() eq 0 }
 <tr>
-     <td VALIGN="MIDDLE" >{xl t='Deactivate'}</td>
+     <td VALIGN="MIDDLE" >{xl t='Deactivate'|escape:'html'}</td>
      <td VALIGN="MIDDLE" >
- <input type='checkbox'  name='inactive' value="1"   /> 
+ <input type='checkbox'  name='inactive' value="1"   />
 
     </td>
 </tr>
 {/if}
 <tr height="25"><td colspan=2>&nbsp;</td></tr>
 <tr>
-	<td colspan="2"><a href="javascript:submit_insurancecompany();" class="css_button"><span>{xl t='Save'}</span></a><a href="controller.php?practice_settings&insurance_company&action=list" class="css_button" onclick="top.restoreSession()">
-<span>{xl t='Cancel'}</span></a></td>
+	<td colspan="2">
+	    <div class="btn-group">
+	        <a href="javascript:submit_insurancecompany();" class="btn btn-default btn-save" onclick="top.restoreSession()">
+	            {xl t='Save'|escape:'html'}
+	        </a>
+	        <a href="controller.php?practice_settings&insurance_company&action=list" class="btn btn-link btn-cancel" onclick="top.restoreSession()">
+                {xl t='Cancel'|escape:'html'}
+            </a>
+        </div>
+    </td>
 </tr>
 </table>
-<input type="hidden" name="id" value="{$insurancecompany->id}" />
-<input type="hidden" name="process" value="{$PROCESS}" />
-</form>
\ No newline at end of file
+<input type="hidden" name="id" value="{$insurancecompany->id|escape:'html'}" />
+<input type="hidden" name="process" value="{$PROCESS|escape:'html'}" />
+</form>
+
+{literal}
+<script language="javascript">
+function submit_insurancecompany() {
+    if(document.insurancecompany.name.value.length>0) {
+        top.restoreSession();
+	    document.insurancecompany.submit();
+		//Z&H Removed redirection
+    } else{
+        document.insurancecompany.name.style.backgroundColor="red";
+        document.insurancecompany.name.focus();
+    }
+}
+
+function jsWaitForDelay(delay) {
+     var startTime = new Date();
+     var endTime = null;
+     do {
+        endTime = new Date();
+     } while ((endTime - startTime) < delay);
+}
+</script>
+{/literal}
\ No newline at end of file
diff --git a/templates/insurance_companies/general_list.html b/templates/insurance_companies/general_list.html
index 39119a89d..959451218 100644
--- a/templates/insurance_companies/general_list.html
+++ b/templates/insurance_companies/general_list.html
@@ -1,32 +1,32 @@
 <a href="controller.php?practice_settings&{$TOP_ACTION}insurance_company&action=edit" onclick="top.restoreSession()"
-   class="css_button">
-    {xl t='Add a Company'}</a>
+   class="btn btn-default btn-add">
+    {xl t='Add a Company'|escape:'html'}</a>
 
 <table class="table table-responsive table-striped">
     <thead>
         <tr>
-            <th>{xl t='Name'}</th>
-            <th>{xl t='City, State'}</th>
-            <th>{xl t='Default X12 Partner'}</th>
-            <th>{xl t='Deactivated'}</th>
+            <th>{xl t='Name'|escape:'html'}</th>
+            <th>{xl t='City, State'|escape:'html'}</th>
+            <th>{xl t='Default X12 Partner'|escape:'html'}</th>
+            <th>{xl t='Deactivated'|escape:'html'}</th>
         </tr>
     </thead>
     <tbody>
         {foreach from=$icompanies item=insurancecompany}
         <tr>
             <td>
-                <a href="{$CURRENT_ACTION}action=edit&id={$insurancecompany->id}" onsubmit="return top.restoreSession()">
-                    {$insurancecompany->name}&nbsp
+                <a href="{$CURRENT_ACTION}action=edit&id={$insurancecompany->id|escape:'html'}" onclick="top.restoreSession()">
+                    {$insurancecompany->name|escape:'html'}
                 </a>
             </td>
-            <td>{$insurancecompany->address->city} {$insurancecompany->address->state|upper}&nbsp;</td>
-            <td>{$insurancecompany->get_x12_default_partner_name()}&nbsp;</td>
-            <td>{if $insurancecompany->get_inactive() eq 1}{xl t='Yes'}{/if}&nbsp;</td>
+            <td>{$insurancecompany->address->city|escape:'html'} {$insurancecompany->address->state|upper|escape:'html'}&nbsp;</td>
+            <td>{$insurancecompany->get_x12_default_partner_name()|escape:'html'}&nbsp;</td>
+            <td>{if $insurancecompany->get_inactive() eq 1}{xl t='Yes'|escape:'html'}{/if}&nbsp;</td>
         </tr>
         {foreachelse}
         <tr>
-            <td colspan="3">{xl t='No Insurance Companies Found'}</td>
+            <td colspan="4">{xl t='No Insurance Companies Found'|escape:'html'}</td>
         </tr>
         {/foreach}
     </tbody>
-</table>
+</table>
\ No newline at end of file
diff --git a/templates/insurance_numbers/general_edit.html b/templates/insurance_numbers/general_edit.html
index 62d3d301c..c8fe8e78b 100644
--- a/templates/insurance_numbers/general_edit.html
+++ b/templates/insurance_numbers/general_edit.html
@@ -1,119 +1,128 @@
 {if $ERROR}
- {$ERROR}
+ {$ERROR|escape:'html'}
 {else}
-<form name="provider" method="post" action="{$FORM_ACTION}">
+<form name="provider" method="post" action="{$FORM_ACTION}" onsubmit="return top.restoreSession()">
 <!-- it is important that the hidden form_id field be listed first, when it is called it populates any old information attached with the id, this allows for partial edits
                 if it were called last, the settings from the form would be overwritten with the old information-->
-<input type="hidden" name="form_id" value="{$ins->id}" />
+<input type="hidden" name="form_id" value="{$ins->id|escape:'html'}" />
 
-<table class="showborder" CELLSPACING="0" CELLPADDING="3">
+<table class="table table-responsive table-striped">
 
 <tr><td colspan="5" style="border-style:none;" class="bold">
-   {$provider->get_name_display()}
+   {$provider->get_name_display()|escape:'html'}
 </td></tr>
 
 <tr  class="showborder_head">
-    <th class="small">{xl t='Company Name'}</th>
-    <th class="small">{xl t='Provider Number'}</th>
-    <th class="small">{xl t='Rendering Provider Number'}</th>
-    <th class="small">{xl t='Group Number'}</th>
+    <th class="small">{xl t='Company Name'|escape:'html'}</th>
+    <th class="small">{xl t='Provider Number'|escape:'html'}</th>
+    <th class="small">{xl t='Rendering Provider Number'|escape:'html'}</th>
+    <th class="small">{xl t='Group Number'|escape:'html'}</th>
 </tr>
 {foreach name=inums item=num_set from=$provider->get_insurance_numbers()}
 <tr>
     <td valign="middle">
-        <a href="{$CURRENT_ACTION}action=edit&id={$num_set->get_id()}&showform=true" onclick="top.restoreSession()">{$num_set->get_insurance_company_name()}&nbsp;</a>
+        <a href="{$CURRENT_ACTION}action=edit&id={$num_set->get_id()|escape:'html'}&showform=true" onclick="top.restoreSession()">
+            {$num_set->get_insurance_company_name()|escape:'html'}&nbsp;
+        </a>
     </td>
-    <td>{$num_set->get_provider_number()}&nbsp;</td>
-    <td>{$num_set->get_rendering_provider_number()}&nbsp;</td>
-    <td>{$num_set->get_group_number()}&nbsp;</td>
+    <td>{$num_set->get_provider_number()|escape:'html'}&nbsp;</td>
+    <td>{$num_set->get_rendering_provider_number()|escape:'html'}&nbsp;</td>
+    <td>{$num_set->get_group_number()|escape:'html'}&nbsp;</td>
 </tr>
 {foreachelse}
 <tr>
-   <td colspan="5">{xl t='No entries found, use the form below to add an entry.'}</td>
+   <td colspan="5">{xl t='No entries found, use the form below to add an entry.'|escape:'html'}</td>
 </tr>
 {/foreach}
 
 <tr> <td style="border-style:none;" colspan="5">
     <a href="{$CURRENT_ACTION}action=edit&id=&provider_id={$provider->get_id()}&showform=true"
-       class="css_button_small" style='margin-top:2px'
-       onclick="top.restoreSession()">
-            <span>{xl t='Add New'}</span>
+        class="btn btn-default btn-add" onclick="top.restoreSession()">
+        <span>{xl t='Add New'|escape:'html'}
     </a>
 </td> </tr>
 
 {php} if ( $_GET['showform'] == 'true' ) { {/php}
 <tr> <td style="border-style:none;" colspan="5">
 <br>
-<b><span>{if $ins->get_id() eq ""}{xl t='Add Provider Number'}{else}{xl t='Update Provider Number'}{/if}</span></b><br>
+<b><span>{if $ins->get_id() eq ""}{xl t='Add Provider Number'|escape:'html'}{else}{xl t='Update Provider Number'|escape:'html'}{/if}</span></b><br>
 	<table width="100%"><tr>
-        <td style="border-style:none;" width="200px" VALIGN="MIDDLE" >{xl t='Insurance Company'}</td>
+        <td style="border-style:none;" width="200px" VALIGN="MIDDLE" >{xl t='Insurance Company'|escape:'html'}</td>
         <td style="border-style:none;" VALIGN="MIDDLE" >
                 {if $ins->get_id() eq ""}
                         {html_options name="insurance_company_id" options=$ic_array values=$ic_array selected=$ins->get_insurance_company_id()}
                 {else}
-                 {$ins->get_insurance_company_name()}
+                 {$ins->get_insurance_company_name()|escape:'html'}
                 {/if}
         </td>
 </tr>
 <tr>
-        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Provider Number'}</td>
+        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Provider Number'|escape:'html'}</td>
         <td style="border-style:none;" VALIGN="MIDDLE" >
-           <input type="text" size="20" name="provider_number" value="{$ins->get_provider_number()}" onKeyDown="PreventIt(event)" />
+           <input type="text" size="20" name="provider_number" value="{$ins->get_provider_number()|escape:'html'}" onKeyDown="PreventIt(event)" />
         </td>
 </tr>
 <tr>
-        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Provider Number'} ({xl t='Type'})</td>
+        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Provider Number'} ({xl t='Type'|escape:'html'})</td>
         <td style="border-style:none;" VALIGN="MIDDLE" >
            {html_options name="provider_number_type" options=$ic_type_options_array values=$ins->provider_number_type_array selected=$ins->get_provider_number_type()}
         </td>
 </tr>
 <tr>
-        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Rendering Provider Number'}</td>
+        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Rendering Provider Number'|escape:'html'}</td>
         <td style="border-style:none;" VALIGN="MIDDLE" >
-                <input type="text" size="20" name="rendering_provider_number" value="{$ins->get_rendering_provider_number()}" onKeyDown="PreventIt(event)" />
+                <input type="text" size="20" name="rendering_provider_number" value="{$ins->get_rendering_provider_number()|escape:'html'}" onKeyDown="PreventIt(event)" />
 		</td>
 </tr>
 <tr>
-        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Rendering Provider Number'} ({xl t='Type'})</td>
+        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Rendering Provider Number'|escape:'html'} ({xl t='Type'|escape:'html'})</td>
         <td style="border-style:none;" VALIGN="MIDDLE" >
             {html_options name="rendering_provider_number_type" options=$ic_rendering_type_options_array values=$ins->rendering_provider_number_type_array selected=$ins->get_rendering_provider_number_type()}
         </td>
 </tr>
 <tr>
-        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Group Number'}</td>
+        <td style="border-style:none;" VALIGN="MIDDLE" >{xl t='Group Number'|escape:'html'}</td>
         <td style="border-style:none;" VALIGN="MIDDLE" >
-                <input type="text" size="20" name="group_number" value="{$ins->get_group_number()}" onKeyDown="PreventIt(event)" />
+                <input type="text" size="20" name="group_number" value="{$ins->get_group_number()|escape:'html'}" onKeyDown="PreventIt(event)" />
         </td>
 </tr>
 <tr><td style="border-style:none;"></td></tr>
 <tr>
         <td style="border-style:none;" colspan="2">
+    <div class="btn-group">
                 {if $ins->get_id() eq ""}
-                	<a href="javascript:submit_insurancenumbers_add();" class="css_button"><span>{xl t='Save'}</span></a>
+                	<a href="javascript:submit_insurancenumbers_add();" class="btn btn-default btn-save" onclick="top.restoreSession()">
+                        {xl t='Save'|escape:'html'}
+                    </a>
                 {else}
-                   	<a href="javascript:submit_insurancenumbers_update();" class="css_button"><span>{xl t='Save'}</span></a>
+                   	<a href="javascript:submit_insurancenumbers_update();" class="btn btn-default btn-save" onclick="top.restoreSession()">
+                        {xl t='Save'|escape:'html'}
+                    </a>
                 {/if}
 
-		<a href="controller.php?practice_settings&insurance_numbers&action=list" class="css_button" onclick="top.restoreSession()">
-<span>{xl t='Cancel'}</span></a>
+		<a href="controller.php?practice_settings&insurance_numbers&action=list" class="btn btn-link btn-cancel" onclick="top.restoreSession()">
+            {xl t='Cancel'|escape:'html'}
+        </a>
+    </div>
 </td> </tr>
 {php} } else { {/php}
-<input type="hidden" name="provider_number" value="{$ins->get_provider_number()}" />
-<input type="hidden" name="provider_number_type" value="{$ins->get_provider_number_type()}" />
-<input type="hidden" name="rendering_provider_number" value="{$ins->get_rendering_provider_number()}" />
-<input type="hidden" name="rendering_provider_number_type" value="{$ins->get_rendering_provider_number_type()}" />
-<input type="hidden" name="group_number" value="{$ins->get_group_number()}" />
+<input type="hidden" name="provider_number" value="{$ins->get_provider_number()|escape:'html'}" />
+<input type="hidden" name="provider_number_type" value="{$ins->get_provider_number_type()|escape:'html'}" />
+<input type="hidden" name="rendering_provider_number" value="{$ins->get_rendering_provider_number()|escape:'html'}" />
+<input type="hidden" name="rendering_provider_number_type" value="{$ins->get_rendering_provider_number_type()|escape:'html'}" />
+<input type="hidden" name="group_number" value="{$ins->get_group_number()|escape:'html'}" />
 
 {php} } {/php}
 
     </table>
 </td></tr>
 </table>
-<input type="hidden" name="id" value="{$ins->id}" />
-<input type="hidden" name="provider_id" value="{$ins->get_provider_id()}" />
-<input type="hidden" name="process" value="{$PROCESS}" />
+<input type="hidden" name="id" value="{$ins->id|escape:'html'}" />
+<input type="hidden" name="provider_id" value="{$ins->get_provider_id()|escape:'html'}" />
+<input type="hidden" name="process" value="{$PROCESS|escape:'html'}" />
 </form>
 {/if}
+
 {literal}
 <script language="javascript">
 function submit_insurancenumbers_update() {
@@ -138,4 +147,4 @@ function Waittoredirect(delaymsec) {
 <style type="text/css">
 text,select {font-size:9pt;}
 </style>
-{/literal}
+{/literal}
\ No newline at end of file
diff --git a/templates/insurance_numbers/general_list.html b/templates/insurance_numbers/general_list.html
dissimilarity index 66%
index 2b2d29ba7..4d849611c 100644
--- a/templates/insurance_numbers/general_list.html
+++ b/templates/insurance_numbers/general_list.html
@@ -1,28 +1,31 @@
-<table class="table table-responsive table-striped">
-    <thead>
-    <tr>
-        <th>{xl t='Name'}</th>
-        <th>&nbsp;</th>
-        <th>{xl t='Provider'} #</th>
-        <th>{xl t='Rendering'} #</th>
-        <th>{xl t='Group'} #</th>
-    </tr>
-    </thead>
-    <tbody>
-    {foreach from=$providers item=provider}
-    <tr>
-        <td><a href="{$CURRENT_ACTION}action=edit&id=default&provider_id={$provider->id}">{$provider->get_name_display()}</a>
-        </td>
-        <td>{xl t='Default'}&nbsp;</td>
-        <td>{$provider->get_provider_number_default()}&nbsp;</td>
-        <td>{$provider->get_rendering_provider_number_default()}&nbsp;</td>
-        <td>{$provider->get_group_number_default()}&nbsp;</td>
-    </tr>
-    {foreachelse}
-    <tr>
-        <td>{xl t='No Providers Found'}</td>
-    </tr>
-    {/foreach}
-    </tbody>
-</table>
-
+<table class="table table-responsive table-striped">
+    <thead>
+    <tr>
+        <th>{xl t='Name'|escape:'html'}</th>
+        <th>&nbsp;</th>
+        <th>{xl t='Provider'|escape:'html'} #</th>
+        <th>{xl t='Rendering'|escape:'html'} #</th>
+        <th>{xl t='Group'|escape:'html'} #</th>
+    </tr>
+    </thead>
+    <tbody>
+    {foreach from=$providers item=provider}
+    <tr>
+        <td>
+            <a href="{$CURRENT_ACTION}action=edit&id=default&provider_id={$provider->id|escape:'html'}" onclick="top.restoreSession()">
+                {$provider->get_name_display()|escape:'html'}
+            </a>
+        </td>
+        <td>{xl t='Default'|escape:'html'}&nbsp;</td>
+        <td>{$provider->get_provider_number_default()|escape:'html'}&nbsp;</td>
+        <td>{$provider->get_rendering_provider_number_default()|escape:'html'}&nbsp;</td>
+        <td>{$provider->get_group_number_default()|escape:'html'}&nbsp;</td>
+    </tr>
+    {foreachelse}
+    <tr>
+        <td>{xl t='No Providers Found'|escape:'html'}</td>
+    </tr>
+    {/foreach}
+    </tbody>
+</table>
+
diff --git a/templates/pharmacies/general_edit.html b/templates/pharmacies/general_edit.html
index e5d52d6a7..6aebe9501 100644
--- a/templates/pharmacies/general_edit.html
+++ b/templates/pharmacies/general_edit.html
@@ -1,66 +1,73 @@
-<form name="pharmacy" method="post" action="{$FORM_ACTION}">
+<form name="pharmacy" method="post" action="{$FORM_ACTION}" onsubmit="return top.restoreSession()">
 <!-- it is important that the hidden form_id field be listed first, when it is called is populates any old information attached with the id, this allows for partial edits
 		if it were called last, the settings from the form would be overwritten with the old information-->
-<input type="hidden" name="form_id" value="{$pharmacy->id}" />
+<input type="hidden" name="form_id" value="{$pharmacy->id|escape:'html'}" />
 <table style="font-size:9pt;" width="500px" CELLSPACING="0" CELLPADDING="3">
 <tr>
-	<td width="150px" VALIGN="MIDDLE" >{xl t='Name'}</td>
+	<td width="150px" VALIGN="MIDDLE" >{xl t='Name'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="40" name="name" value="{$pharmacy->name}" onKeyDown="PreventIt(event)" />({xl t='Required'})
+		<input type="text" size="40" name="name" value="{$pharmacy->name|escape:'html'}" onKeyDown="PreventIt(event)" />({xl t='Required'|escape:'html'})
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Address'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Address'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="40" name="address_line1" value="{$pharmacy->address->line1}" onKeyDown="PreventIt(event)" />
+		<input type="text" size="40" name="address_line1" value="{$pharmacy->address->line1|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Address'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Address'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="40" name="address_line2" value="{$pharmacy->address->line2}" onKeyDown="PreventIt(event)" />
+		<input type="text" size="40" name="address_line2" value="{$pharmacy->address->line2|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='City, State Zip'}</td>
+	<td VALIGN="MIDDLE" >{xl t='City, State Zip'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input type="text" size="25" name="city" value="{$pharmacy->address->city}" onKeyDown="PreventIt(event)" /> , <input type="text" size="2" maxlength="2" name="state" value="{$pharmacy->address->state}" onKeyDown="PreventIt(event)" /> <input type="text" size="5" name="zip" value="{$pharmacy->address->zip}" onKeyDown="PreventIt(event)" />
+		<input type="text" size="25" name="city" value="{$pharmacy->address->city|escape:'html'}" onKeyDown="PreventIt(event)" /> , <input type="text" size="2" maxlength="2" name="state" value="{$pharmacy->address->state|escape:'html'}" onKeyDown="PreventIt(event)" /> <input type="text" size="5" name="zip" value="{$pharmacy->address->zip|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Email'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Email'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input TYPE="TEXT" NAME="email" SIZE="35" VALUE="{$pharmacy->email}" onKeyDown="PreventIt(event)" />
+		<input TYPE="TEXT" NAME="email" SIZE="35" VALUE="{$pharmacy->email|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Phone'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Phone'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input TYPE="TEXT" NAME="phone" SIZE="12" VALUE="{$pharmacy->get_phone()}" onKeyDown="PreventIt(event)" />
+		<input TYPE="TEXT" NAME="phone" SIZE="12" VALUE="{$pharmacy->get_phone()|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Fax'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Fax'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
-		<input TYPE="TEXT" NAME="fax" SIZE="12" VALUE="{$pharmacy->get_fax()}" onKeyDown="PreventIt(event)" />
+		<input TYPE="TEXT" NAME="fax" SIZE="12" VALUE="{$pharmacy->get_fax()|escape:'html'}" onKeyDown="PreventIt(event)" />
 	</td>
 </tr>
 
 <tr>
-	<td VALIGN="MIDDLE" >{xl t='Default Method'}</td>
+	<td VALIGN="MIDDLE" >{xl t='Default Method'|escape:'html'}</td>
 	<td VALIGN="MIDDLE" >
 		<select name="transmit_method">{html_options options=$pharmacy->transmit_method_array selected=$pharmacy->transmit_method}</select>
 	</td>
 </tr>
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr>
-	<td colspan="2"><a href="javascript:submit_pharmacy();" class="css_button"><span>{xl t='Save'}</span></a><a href="controller.php?practice_settings&pharmacy&action=list" class="css_button" onclick="top.restoreSession()">
-<span>{xl t='Cancel'}</span></a>
+	<td colspan="2">
+	    <div class="btn-group">
+	        <a href="javascript:submit_pharmacy();" class="btn btn-default btn-save" onclick="top.restoreSession()">
+	            {xl t='Save'|escape:'html'}
+	        </a>
+	        <a href="controller.php?practice_settings&pharmacy&action=list" class="btn btn-link btn-cancel" onclick="top.restoreSession()">
+                {xl t='Cancel'|escape:'html'}
+            </a>
+        </div>
 	</td>
 </tr>
 </table>
-<input type="hidden" name="id" value="{$pharmacy->id}" />
-<input type="hidden" name="process" value="{$PROCESS}" />
+<input type="hidden" name="id" value="{$pharmacy->id|escape:'html'}" />
+<input type="hidden" name="process" value="{$PROCESS|escape:'html'}" />
 </form>
 
 {literal}
diff --git a/templates/pharmacies/general_list.html b/templates/pharmacies/general_list.html
dissimilarity index 63%
index 6270ec001..61117a513 100644
--- a/templates/pharmacies/general_list.html
+++ b/templates/pharmacies/general_list.html
@@ -1,29 +1,33 @@
-<a href="controller.php?practice_settings&{$TOP_ACTION}pharmacy&action=edit" onclick="top.restoreSession()" class="css_button" >
-<span>{xl t='Add a Pharmacy'}</span></a><br><br>
-
-<table class="table table-responsive table-striped">
-	<thead>
-        <tr>
-            <th>{xl t='Name'}</th>
-            <th>{xl t='Address'}</th>
-            <th>{xl t='Default Method'}</th>
-        </tr>
-    </thead>
-    <tbody>
-	{foreach from=$pharmacies item=pharmacy}
-	<tr>
-		<td><a href="{$CURRENT_ACTION}action=edit&id={$pharmacy->id}" onclick="top.restoreSession()">{$pharmacy->name}&nbsp;</a></td>
-		<td>
-		{if $pharmacy->address->line1 != ''}{$pharmacy->address->line1}, {/if}
-		{if $pharmacy->address->city != ''}{$pharmacy->address->city}, {/if}
-			{$pharmacy->address->state|upper} {$pharmacy->address->zip}&nbsp;</td>
-		<td>{$pharmacy->get_transmit_method_display()}&nbsp;
-	{foreachelse}</td>
-	</tr>
-
-	<tr>
-		<td colspan="3"><b>{xl t='No Pharmacies Found'}<b></td>
-	</tr>
-	{/foreach}
-    </tbody>
-</table>
+<a href="controller.php?practice_settings&{$TOP_ACTION}pharmacy&action=edit" onclick="top.restoreSession()" class="btn btn-default btn-add" >
+<span>{xl t='Add a Pharmacy'|escape:'html'}</span></a><br><br>
+
+<table class="table table-responsive table-striped">
+	<thead>
+        <tr>
+            <th>{xl t='Name'|escape:'html'}</th>
+            <th>{xl t='Address'|escape:'html'}</th>
+            <th>{xl t='Default Method'|escape:'html'}</th>
+        </tr>
+    </thead>
+    <tbody>
+	{foreach from=$pharmacies item=pharmacy}
+	<tr>
+		<td>
+		    <a href="{$CURRENT_ACTION}action=edit&id={$pharmacy->id|escape:'html'}" onclick="top.restoreSession()">
+		        {$pharmacy->name|escape:'html'}
+		    </a>
+		</td>
+		<td>
+		{if $pharmacy->address->line1 != ''}{$pharmacy->address->line1|escape:'html'}, {/if}
+		{if $pharmacy->address->city != ''}{$pharmacy->address->city|escape:'html'}, {/if}
+			{$pharmacy->address->state|upper} {$pharmacy->address->zip|escape:'html'}&nbsp;</td>
+		<td>{$pharmacy->get_transmit_method_display()|escape:'html'}&nbsp;
+	{foreachelse}</td>
+	</tr>
+
+	<tr>
+		<td colspan="3"><b>{xl t='No Pharmacies Found'|escape:'html'}<b></td>
+	</tr>
+	{/foreach}
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/templates/practice_settings/general_list.html b/templates/practice_settings/general_list.html
index 633d6943b..68bd29124 100644
--- a/templates/practice_settings/general_list.html
+++ b/templates/practice_settings/general_list.html
@@ -4,7 +4,7 @@
 
     <title>{xl t='Practice Settings'|escape:'html'}</title>
 
-    {headerTemplate assets='bootstrap-sidebar|common.js'}
+    {headerTemplate assets='bootstrap-sidebar|common'}
 
 </head>
 <body class="body_top" style="padding-top: 35px;">
diff --git a/templates/x12_partners/general_edit.html b/templates/x12_partners/general_edit.html
index 4e08ef770..929df5a0a 100644
--- a/templates/x12_partners/general_edit.html
+++ b/templates/x12_partners/general_edit.html
@@ -1,116 +1,124 @@
-{literal}
-<script language="javascript">
-function add_x12()
-{
-if (document.x12_partner.name.value.length>0)
-{
-top.restoreSession();
-document.x12_partner.submit();
-}
-else
-{
-document.x12_partner.name.style.backgroundColor="red";
-document.x12_partner.name.focus();
-}
-}
-
- function Waittoredirect(delaymsec) {
- var st = new Date();
- var et = null;
- do {
- et = new Date();
- } while ((et - st) < delaymsec);
-
-   }
-</script>
-{/literal}
-
-<form name="x12_partner" method="post" action="{$FORM_ACTION}">
+<form name="x12_partner" method="post" action="{$FORM_ACTION}" onsubmit="return top.restoreSession()">
 <table width="400px" style="font-size:9pt;" CELLSPACING="0" CELLPADDING="3" border="0">
     <tr>
-        <td colspan="2">{xl t='X12 Partner'}</td>
+        <td colspan="2">{xl t='X12 Partner'|escape:'html'}</td>
     </tr>
     <tr>
-        <td ALIGN="LEFT" VALIGN="MIDDLE" >{xl t='Partner'}&nbsp;{xl t='Name'}</td>
-        <td COLSPAN="2" ALIGN="LEFT" VALIGN="MIDDLE" ><input type="text" size="20" name="name" value="{$partner->get_name()}" onKeyDown="PreventIt(event)" /></td>
+        <td ALIGN="LEFT" VALIGN="MIDDLE" >{xl t='Partner'|escape:'html'}&nbsp;{xl t='Name'|escape:'html'}</td>
+        <td COLSPAN="2" ALIGN="LEFT" VALIGN="MIDDLE" ><input type="text" size="20" name="name" value="{$partner->get_name()|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
     </tr>
     <tr>
-        <td ALIGN="LEFT" VALIGN="MIDDLE" >{xl t='ID'}&nbsp;{xl t='Number'}&nbsp;({xl t='ETIN'})</td>
-        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="id_number" value="{$partner->get_id_number()}" onKeyDown="PreventIt(event)" /></td>
+        <td ALIGN="LEFT" VALIGN="MIDDLE" >{xl t='ID'|escape:'html'}&nbsp;{xl t='Number'|escape:'html'}&nbsp;({xl t='ETIN'|escape:'html'})</td>
+        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="id_number" value="{$partner->get_id_number()|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='User logon Required Indicator (ISA01~ use 00 or 03)'}</td>
-        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="2" name="x12_isa01" value="{$partner->get_x12_isa01()}" onKeyDown="PreventIt(event)" /></td>
+        <td VALIGN="MIDDLE" >{xl t='User logon Required Indicator (ISA01~ use 00 or 03)'|escape:'html'}</td>
+        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="2" name="x12_isa01" value="{$partner->get_x12_isa01()|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='User Logon (If 03 above, else leave spaces) (ISA02)'}</td>
-        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_isa02" value="{$partner->get_x12_isa02()}" onKeyDown="PreventIt(event)" /></td>
+        <td VALIGN="MIDDLE" >{xl t='User Logon (If 03 above, else leave spaces) (ISA02)'|escape:'html'}</td>
+        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_isa02" value="{$partner->get_x12_isa02()|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='User password required Indicator (ISA03~ use 00 or 01)'}</td>
-        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="2" name="x12_isa03" value="{$partner->get_x12_isa03()}" onKeyDown="PreventIt(event)" /></td>
+        <td VALIGN="MIDDLE" >{xl t='User password required Indicator (ISA03~ use 00 or 01)'|escape:'html'}</td>
+        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="2" name="x12_isa03" value="{$partner->get_x12_isa03()|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='User Password (ISA04~ if 01 above, else leave spaces)'}</td>
-        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_isa04" value="{$partner->get_x12_isa04()}" onKeyDown="PreventIt(event)" /></td>
+        <td VALIGN="MIDDLE" >{xl t='User Password (ISA04~ if 01 above, else leave spaces)'|escape:'html'}</td>
+        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_isa04" value="{$partner->get_x12_isa04()|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
     </tr>
-        <td VALIGN="MIDDLE" >{xl t='Sender ID Qualifier (ISA05)'}</td>
+        <td VALIGN="MIDDLE" >{xl t='Sender ID Qualifier (ISA05)'|escape:'html'}</td>
         <td COLSPAN="2" VALIGN="MIDDLE" >{html_options name="x12_isa05" options=$partner->get_idqual_array() selected=$partner->get_x12_isa05()}</td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='Sender ID (ISA06)'}</td>
-        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_sender_id" value="{$partner->get_x12_sender_id()}" onKeyDown="PreventIt(event)" /></td>
+        <td VALIGN="MIDDLE" >{xl t='Sender ID (ISA06)'|escape:'html'}</td>
+        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_sender_id" value="{$partner->get_x12_sender_id()|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='Receiver ID Qualifier (ISA07)'}</td>
+        <td VALIGN="MIDDLE" >{xl t='Receiver ID Qualifier (ISA07)'|escape:'html'}</td>
         <td COLSPAN="2" VALIGN="MIDDLE" >{html_options name="x12_isa07" options=$partner->get_idqual_array() selected=$partner->get_x12_isa07()}</td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='Receiver ID (ISA08)'}</td>
+        <td VALIGN="MIDDLE" >{xl t='Receiver ID (ISA08)'|escape:'html'}</td>
         <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_receiver_id" value="{$partner->get_x12_receiver_id()}" onKeyDown="PreventIt(event)" /></td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='Acknowledgment Requested (ISA14)'}</td>
+        <td VALIGN="MIDDLE" >{xl t='Acknowledgment Requested (ISA14)'|escape:'html'}</td>
         <td COLSPAN="2" VALIGN="MIDDLE" >{html_options name="x12_isa14" options=$partner->get_x12_isa14_array() selected=$partner->get_x12_isa14()}</td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='Usage Indicator (ISA15)'}</td>
+        <td VALIGN="MIDDLE" >{xl t='Usage Indicator (ISA15)'|escape:'html'}</td>
         <td COLSPAN="2" VALIGN="MIDDLE" >{html_options name="x12_isa15" options=$partner->get_x12_isa15_array() selected=$partner->get_x12_isa15()}</td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='Application Sender Code (GS02)'}</td>
-        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_gs02" value="{$partner->get_x12_gs02()}" onKeyDown="PreventIt(event)" /></td>
+        <td VALIGN="MIDDLE" >{xl t='Application Sender Code (GS02)'|escape:'html'}</td>
+        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_gs02" value="{$partner->get_x12_gs02()|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='Submitter EDI Access Number (PER06)'}</td>
-        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_per06" value="{$partner->get_x12_per06()}" onKeyDown="PreventIt(event)" /></td>
+        <td VALIGN="MIDDLE" >{xl t='Submitter EDI Access Number (PER06)'|escape:'html'}</td>
+        <td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_per06" value="{$partner->get_x12_per06()|escape:'html'}" onKeyDown="PreventIt(event)" /></td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='Version'}</td>
+        <td VALIGN="MIDDLE" >{xl t='Version'|escape:'html'}</td>
         <td COLSPAN="2" VALIGN="MIDDLE" >{html_options name="x12_version" options=$partner->get_x12_version_array() selected=$partner->get_x12_version()}</td>
     </tr>
     <tr>
-        <td VALIGN="MIDDLE" >{xl t='Processing'}&nbsp;{xl t='Format'}</td>
+        <td VALIGN="MIDDLE" >{xl t='Processing'|escape:'html'}&nbsp;{xl t='Format'|escape:'html'}</td>
         <td COLSPAN="2" VALIGN="MIDDLE" >{html_options name="processing_format" options=$partner->get_processing_format_array() selected=$partner->get_processing_format()}</td>
     </tr>
     <tr>
-	<td VALIGN="MIDDLE" >{xl t='Application Receiver Code (GS03 - If blank ISA08 will be used)'}</td>
-	<td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_gs03" value="{$partner->get_x12_gs03()}" onKeyDown="PreventIt(event)" maxlength="15"/></td>
+	<td VALIGN="MIDDLE" >{xl t='Application Receiver Code (GS03 - If blank ISA08 will be used)'|escape:'html'}</td>
+	<td COLSPAN="2" VALIGN="MIDDLE" ><input type="text" size="20" name="x12_gs03" value="{$partner->get_x12_gs03()|escape:'html'}" onKeyDown="PreventIt(event)" maxlength="15"/></td>
     </tr>
 <tr height="25"><td colspan="2">&nbsp;</td></tr>
 <tr>
 	<td colspan="2">
+    <div class="btn-group">
 		{if $partner->get_id() eq ""}
-			<a class="css_button" href="javascript:add_x12();"><span>{xl t='Save'}</span></a>
+			<a class="btn btn-default btn-save" href="javascript:add_x12();" onclick="top.restoreSession()">
+                {xl t='Save'|escape:'html'}
+            </a>
 
 		{else}
-			<a class="css_button" href="javascript:add_x12();"><span>{xl t='Save'}</span></a>
+			<a class="btn btn-default btn-save" href="javascript:add_x12();" onclick="top.restoreSession()">
+                {xl t='Save'|escape:'html'}
+            </a>
 		{/if}
-	<a href="controller.php?practice_settings&x12_partner&action=list"  class="css_button" onclick="top.restoreSession()">
-<span>{xl t='Cancel'}</span></a></td>
+	    <a href="controller.php?practice_settings&x12_partner&action=list"  class="btn btn-link btn-cancel" onclick="top.restoreSession()">
+            {xl t='Cancel'|escape:'html'}
+        </a>
+    </div>
+    </td>
 </tr>
 </table>
-<input type="hidden" name="id" value="{$partner->id}" />
-<input type="hidden" name="process" value="{$PROCESS}" />
+<input type="hidden" name="id" value="{$partner->id|escape:'html'}" />
+<input type="hidden" name="process" value="{$PROCESS|escape:'html'}" />
 <input type="hidden" name="sub" value="no" />
 </form>
+
+{literal}
+<script language="javascript">
+function add_x12()
+{
+if (document.x12_partner.name.value.length>0)
+{
+top.restoreSession();
+document.x12_partner.submit();
+}
+else
+{
+document.x12_partner.name.style.backgroundColor="red";
+document.x12_partner.name.focus();
+}
+}
+
+ function Waittoredirect(delaymsec) {
+ var st = new Date();
+ var et = null;
+ do {
+ et = new Date();
+ } while ((et - st) < delaymsec);
+
+   }
+</script>
+{/literal}
\ No newline at end of file
diff --git a/templates/x12_partners/general_list.html b/templates/x12_partners/general_list.html
dissimilarity index 65%
index 76f142fff..05aa2d2a6 100644
--- a/templates/x12_partners/general_list.html
+++ b/templates/x12_partners/general_list.html
@@ -1,26 +1,29 @@
-<a href="{$CURRENT_ACTION}action=edit&id=default" onclick="top.restoreSession()" class="css_button">
-    {xl t='Add New Partner'}
-</a>
-<table class="table table-responsive table-striped">
-    <thead>
-    <tr>
-        <th>{xl t='Name'}</th>
-        <th>{xl t='Sender ID'}</th>
-        <th>{xl t='Receiver ID'}</th>
-        <th>{xl t='Version'}</th>
-    </tr>
-    </thead>
-    {foreach from=$partners item=partner}
-    <tr>
-        <td><a href="{$CURRENT_ACTION}action=edit&x12_partner_id={$partner->id}" onclick="top.restoreSession()">{$partner->get_name()}&nbsp;</a>
-        </td>
-        <td>{$partner->get_x12_sender_id()}&nbsp;</td>
-        <td>{$partner->get_x12_receiver_id()}&nbsp;</td>
-        <td>{$partner->get_x12_version()}&nbsp;</td>
-    </tr>
-    {foreachelse}
-    <tr>
-        <td colspan="4">{xl t='No Partners Found'}</td>
-    </tr>
-    {/foreach}
-</table>
+<a href="{$CURRENT_ACTION}action=edit&id=default" onclick="top.restoreSession()" class="btn btn-default btn-add">
+    {xl t='Add New Partner'|escape:'html'}
+</a>
+<table class="table table-responsive table-striped">
+    <thead>
+    <tr>
+        <th>{xl t='Name'|escape:'html'}</th>
+        <th>{xl t='Sender ID'|escape:'html'}</th>
+        <th>{xl t='Receiver ID'|escape:'html'}</th>
+        <th>{xl t='Version'|escape:'html'}</th>
+    </tr>
+    </thead>
+    {foreach from=$partners item=partner}
+    <tr>
+        <td>
+            <a href="{$CURRENT_ACTION}action=edit&x12_partner_id={$partner->id|escape:'html'}" onclick="top.restoreSession()">
+                {$partner->get_name()|escape:'html'}&nbsp;
+            </a>
+        </td>
+        <td>{$partner->get_x12_sender_id()|escape:'html'}&nbsp;</td>
+        <td>{$partner->get_x12_receiver_id()|escape:'html'}&nbsp;</td>
+        <td>{$partner->get_x12_version()|escape:'html'}&nbsp;</td>
+    </tr>
+    {foreachelse}
+    <tr>
+        <td colspan="4">{xl t='No Partners Found'|escape:'html'}</td>
+    </tr>
+    {/foreach}
+</table>
-- 
2.11.4.GIT