@@ -21,13 +21,13 @@

<script type="text/html" id="menu-action">
<i data-bind="css: icon,text:helperText" class="fa closeButton"></i>
<div class='menuLabel' data-bind="text:label,click: menuActionClick,css: {menuDisabled: ! enabled()}"></div>
<a class='menuLabel' href="#" data-bind="text:label,click: menuActionClick,css: {menuDisabled: ! enabled()}"></a>

</script>
<script type="text/html" id="menu-header">
<i data-bind="css: icon" class="fa closeButton"></i>
<div class="menuSection">
<div class='menuLabel' data-bind="text:label"></div>
<div class='menuLa-bel' data-bind="text:label"></div>
<ul class="menuEntries" name="menuEntries" data-bind="foreach: children">
<li data-bind="template: {name:header ? 'menu-header' : 'menu-action', data: $data }"></li>
</ul>
@@ -14,45 +14,41 @@
* along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
*
* @package OpenEMR
* @author Robert Down <robertdown@live.com>
* @author Kevin Yeh <kevin.y@integralemr.com>
* @link http://www.open-emr.org
*/
?>

<script type="text/html" id="patient-data-template">
<div>
<span class="patientDataColumn">
<div class="patientInfo">
<b>
<span>
<?php echo xlt("Patient"); ?>:
</span>
<!-- ko if: patient -->
<a data-bind="click:refreshPatient,with: patient" href="#">
<span data-bind="text: pname()"></span>(<span data-bind="text: pubpid"></span>)
</a>
<!-- /ko -->
<!-- ko ifnot: patient -->
<span><?php echo xlt("None");?></span>
<!-- /ko -->

<!-- ko if: patient -->
<span class="clear" data-bind="click:clearPatient"><?php echo xlt("Clear") ?></span>
<!-- /ko -->
</b>
</div>
<div class="patientInfo">
<b>
<!-- ko if: patient -->
<span data-bind="text:patient().str_dob()"></span>
<!-- /ko -->
</b>
</div>
<div>
<span class="patientDataColumn">
<div class="patientInfo">
<?php echo xlt("Patient"); ?>:
<!-- ko if: patient -->
<a class="ptName" data-bind="click:refreshPatient,with: patient" href="#">
<span data-bind="text: pname()"></span>(<span data-bind="text: pubpid"></span>)
</a>
<!-- /ko -->
<!-- ko ifnot: patient -->
<?php echo xlt("None");?>
<!-- /ko -->
<!-- ko if: patient -->
<strong><a href="#" class="clear" data-bind="click:clearPatient" title="<?php echo xlt("Clear") ?>">
<i class="fa fa-times"></i>
</a></strong>
<!-- /ko -->
</div>
<div class="patientInfo">
<!-- ko if: patient -->
<span data-bind="text:patient().str_dob()"></span>
<!-- /ko -->
</div>
</span>
<span class="patientDataColumn">
&nbsp;
<!-- ko if: patient -->
<!-- ko with: patient -->
<!-- ko if: patient -->
<!-- ko with: patient -->
<div>
<span>Selected Encounter:</span>
<!-- ko if:selectedEncounter() -->
@@ -61,15 +57,15 @@
<!-- /ko -->
<!-- ko if:!selectedEncounter() -->
<?php echo xlt("None") ?>
<!-- /ko -->
<!-- /ko -->
</div>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
</span>
<span class="patientDataColumn patientEncountersColumn">
<!-- ko if: patient -->
<!-- ko with: patient -->
<!-- ko if: patient -->
<!-- ko with: patient -->

<span class="patientEncounterList" >
<div data-bind="click: clickNewEncounter"><?php echo xlt("New Encounter");?></div>
<div data-bind="click: clickEncounterList"><?php echo xlt("Past Encounter List");?>
@@ -90,8 +86,8 @@
</tbody>
</table>
</span>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->

</span>
</div>
@@ -25,26 +25,25 @@
<i class="fa fa-caret-up menu_arrow" id="patient_caret" title="<?php echo xla('Toggle the Patient Panel'); ?>" aria-hidden="true"></i>
</span>
<!-- ko foreach: tabsList -->
<span class="tabSpan bgcolor2" data-bind="click: tabClicked, css: {tabNotchosen: !visible()}">
<span data-bind="text: title, click: tabClicked, css: {tabHidden: !visible()}"></span>
<span class="typcn typcn-refresh" data-bind="click: tabRefresh"></span>
<div class="tabSpan bgcolor2" data-bind="click: tabClicked, css: {tabNotchosen: !visible()}">
<span class="tabTitle" data-bind="text: title, click: tabClicked, css: {tabHidden: !visible()}"></span>
<span class="fa fa-fw fa-refresh" data-bind="click: tabRefresh"></span>
<!--ko if:!locked() -->
<span class="typcn typcn-lock-open" data-bind="click: tabLockToggle"></span>
<span class="fa fa-fw fa-unlock" data-bind="click: tabLockToggle"></span>
<!-- /ko -->
<!--ko if:locked() -->
<span class="typcn typcn-lock-closed" data-bind="click: tabLockToggle"></span>
<span class="fa fa-fw fa-lock" data-bind="click: tabLockToggle"></span>
<!-- /ko -->

<!-- ko if:closable-->
<span class="typcn typcn-delete" data-bind="click: tabClose"></span>
<!-- /ko -->
</span>
<span class="fa fa-fw fa-times" data-bind="click: tabClose"></span>
<!-- /ko -->
</div>
<!-- /ko -->
<span class="tabNotchosen" style="width:100%"></span>
</div>
</script>
<script type="text/html" id="tabs-frames">

<!-- ko foreach: tabs.tabsList -->
<div class="frameDisplay" data-bind="visible:visible">
<iframe data-bind="location: $data, iframeName: $data.name, ">