Tab layout, second commit with main codebase modifications, take 3.

Includes modifications and integration work by bradymiller.
bradymiller · Aug 6, 2016 · e461943 · e461943
1 parent 3c7abe3
commit e461943
Show file tree

Hide file tree

Showing 61 changed files with 2,469 additions and 27 deletions.
diff --git a/custom/download_qrda.php b/custom/download_qrda.php
@@ -48,7 +48,8 @@
 <head>
 <?php html_header_show();?>
 
-<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">	
+<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
+<script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>    
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/textformat.js"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/dialog.js"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery-1.4.3.min.js"></script>

diff --git a/custom/export_qrda_xml.php b/custom/export_qrda_xml.php
@@ -1474,6 +1474,7 @@
 <html>
 <head>
 <?php html_header_show();?>
+<script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>        
 <link rel=stylesheet href="<?php echo $css_header;?>" type="text/css">
 <title><?php echo xlt('Export QRDA Report'); ?></title>
 

diff --git a/custom/export_registry_xml.php b/custom/export_registry_xml.php
@@ -189,6 +189,7 @@ function getMeasureNumber($row) {
 <html>
 <head>
 <?php html_header_show();?>
+<script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>        
 <link rel=stylesheet href="<?php echo $css_header;?>" type="text/css">
 <title><?php echo htmlspecialchars( xl('Export PQRI Report'), ENT_NOQUOTES); ?></title>
 </head>

diff --git a/interface/de_identification_forms/de_identification_screen1.php b/interface/de_identification_forms/de_identification_screen1.php
@@ -77,11 +77,11 @@ function set_related(s,type) {
 function get_values(type)
 {
  if(type == "diagnosis")
-	dlgopen('find_code_popup.php', '_blank', 500, 400);
+	dlgopen('find_code_popup.php', '_blank', 500, 400,true);
  else if(type == "drugs")
-   dlgopen('find_drug_popup.php', '_blank', 500, 400);
+   dlgopen('find_drug_popup.php', '_blank', 500, 400,true);
  else if(type == "immunizations")
-   dlgopen('find_immunization_popup.php', '_blank', 500, 400);
+   dlgopen('find_immunization_popup.php', '_blank', 500, 400,true);
 }
 
 //remove item selected from list 

diff --git a/interface/drugs/add_edit_drug.php b/interface/drugs/add_edit_drug.php
@@ -109,6 +109,7 @@ function numericff($name) {
 
 </style>
 
+<script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>
 <script type="text/javascript" src="../../library/topdialog.js"></script>
 <script type="text/javascript" src="../../library/dialog.js"></script>
 <script type="text/javascript" src="../../library/textformat.js"></script>

diff --git a/interface/drugs/add_edit_lot.php b/interface/drugs/add_edit_lot.php
@@ -105,6 +105,7 @@ function genWarehouseList($tag_name, $currvalue, $title, $class='') {
 td { font-size:10pt; }
 </style>
 
+<script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>
 <style  type="text/css">@import url(../../library/dynarch_calendar.css);</style>
 <script type="text/javascript" src="../../library/textformat.js"></script>
 <script type="text/javascript" src="../../library/dynarch_calendar.js"></script>

diff --git a/interface/drugs/dispense_drug.php b/interface/drugs/dispense_drug.php
@@ -197,6 +197,7 @@ function send_email($subject, $body) {
  else { // HTML output
 ?>
 <html>
+<script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>
 <head>
 <?php html_header_show();?>
 <style type="text/css">

diff --git a/interface/forms/physical_exam/edit_diagnoses.php b/interface/forms/physical_exam/edit_diagnoses.php
@@ -17,6 +17,7 @@
 <html>
 <head>
 <?php html_header_show();?>
+<script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>    
 <title><?php xl('Edit Diagnoses for','e');?><?php echo $line_id ?></title>
 <link rel="stylesheet" href='<?php  echo $css_header ?>' type='text/css'>
 

diff --git a/interface/main/calendar/add_edit_event.php b/interface/main/calendar/add_edit_event.php
@@ -44,6 +44,7 @@
 require_once($GLOBALS['srcdir'].'/acl.inc');
 require_once($GLOBALS['srcdir'].'/patient_tracker.inc.php');
 require_once($GLOBALS['incdir']."/main/holidays/Holidays_Controller.php");
+
  //Check access control
  if (!acl_check('patients','appt','',array('write','wsome') ))
    die(xl('Access not allowed'));
@@ -77,7 +78,7 @@
  $info_msg = "";
 
  ?>
-
+ <script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>
  <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery.js"></script>
 
  <?php

diff --git a/interface/main/calendar/find_appt_popup.php b/interface/main/calendar/find_appt_popup.php
@@ -28,10 +28,12 @@
 
  include_once("../../globals.php");
  include_once("$srcdir/patient.inc");
- ///////
  require_once(dirname(__FILE__)."/../../../library/appointments.inc.php");
-require_once($GLOBALS['incdir']."/main/holidays/Holidays_Controller.php");
+ require_once($GLOBALS['incdir']."/main/holidays/Holidays_Controller.php");
 
+ ?>
+    <script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>
+<?php
  // check access controls
  if (!acl_check('patients','appt','',array('write','wsome') ))
   die(xlt('Access not allowed'));
@@ -208,7 +210,8 @@ function doOneDay($catid, $udate, $starttime, $duration, $prefcatid) {
 
   if ($ckavail) {
     // The chosen appointment time is available.
-    echo "<html><script language='JavaScript'>\n";
+    echo "<html>"
+      . "<script language='JavaScript'>\n";
     echo "function mytimeout() {\n";
     echo " opener.top.restoreSession();\n";
     echo " opener.document.forms[0].submit();\n";

diff --git a/interface/main/calendar/find_patient_popup.php b/interface/main/calendar/find_patient_popup.php
@@ -52,7 +52,7 @@
 <?php html_header_show();?>
 <title><?php echo htmlspecialchars( xl('Patient Finder'), ENT_NOQUOTES); ?></title>
 <link rel="stylesheet" href='<?php echo $css_header ?>' type='text/css'>
-
+<script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>
 <style>
 form {
     padding: 0px;

diff --git a/interface/main/dated_reminders/dated_reminders_add.php b/interface/main/dated_reminders/dated_reminders_add.php
@@ -116,7 +116,9 @@
              $output .= '<div style="text-size:2em; text-align:center; color:red">* '.xlt('Please select a valid recipient').'</div> ';
            }else{    
 // --------- echo javascript            
-             echo '<html><body><script language="JavaScript">'; 
+             echo '<html><body>'
+                  ."<script type=\"text/javascript\" src=\"". $webroot ."/interface/main/tabs/js/include_opener.js\"></script>"    
+                  .'<script language="JavaScript">'; 
 // ------------ 1) refresh parent window this updates if sent to self 
              echo '  if (opener && !opener.closed && opener.updateme) opener.updateme("new");';     
 // ------------ 2) communicate with user      
@@ -146,7 +148,8 @@
   ?>    
 <html>
   <head>
-    <title><?php echo xlt('Send a Reminder') ?></title>  
+    <title><?php echo xlt('Send a Reminder') ?></title>
+    <script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>
     <link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">                                       
     <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/topdialog.js"></script>
     <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/dialog.js"></script>  

diff --git a/interface/main/finder/dynamic_finder.php b/interface/main/finder/dynamic_finder.php
@@ -41,7 +41,7 @@
 <html>
 <head>
 <?php html_header_show(); ?>
-
+    <title><?php echo xlt("Patient Finder"); ?></title>
 <link rel="stylesheet" href="<?php echo $css_header; ?>" type="text/css">
 
 <style type="text/css">
@@ -121,9 +121,9 @@
   else {
    top.restoreSession();
 <?php if ($GLOBALS['concurrent_layout']) { ?>
-   document.location.href = "../../patient_file/summary/demographics.php?set_pid=" + newpid;
+   top.RTop.location = "../../patient_file/summary/demographics.php?set_pid=" + newpid;
 <?php } else { ?>
-   top.location.href = "../../patient_file/patient_file.php?set_pid=" + newpid;
+   top.location = "../../patient_file/patient_file.php?set_pid=" + newpid;
 <?php } ?>
   }
  } );

diff --git a/interface/main/finder/patient_select.php b/interface/main/finder/patient_select.php
@@ -42,6 +42,7 @@
 <html>
 <head>
 <?php html_header_show();?>
+<script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>    
 
 <link rel=stylesheet href="<?php echo $css_header;?>" type="text/css">
 <style>

diff --git a/interface/main/main_screen.php b/interface/main/main_screen.php
@@ -102,6 +102,16 @@
 
 $nav_area_width = '130';
 if (!empty($GLOBALS['gbl_nav_area_width'])) $nav_area_width = $GLOBALS['gbl_nav_area_width'];
+
+// This is where will decide whether to use tabs layout or non-tabs layout
+// Note that this screen does not appear to support user specific globals since
+// guessing the globals are collected before authentication and setting of the user.
+// If want to support per user selection of tabs layout, will need to look into this.
+if (!$GLOBALS['new_tabs_layout']) {
+  $_REQUEST['tabs'] = "false";
+}
+require_once("tabs/redirect.php");
+
 ?>
 <html>
 <head>

diff --git a/interface/main/tabs/css/iframe_close.png b/interface/main/tabs/css/iframe_close.png
diff --git a/interface/main/tabs/css/menu.css b/interface/main/tabs/css/menu.css
@@ -0,0 +1,102 @@
+/**
+ * Copyright (C) 2016 Kevin Yeh <kevin.y@integralemr.com>
+ *
+ * LICENSE: This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
+ *
+ * @package OpenEMR
+ * @author  Kevin Yeh <kevin.y@integralemr.com>
+ * @link    http://www.open-emr.org
+ */
+
+.appMenu div
+{
+    margin: 3px;
+}
+.appMenu > span
+{
+    float: left;
+}
+.appMenu ul
+{
+    list-style:none;
+    margin:0;
+    padding:0;
+}
+.appMenu li
+{
+    width: 100%;
+}
+.menuHeader{
+    font-weight: bold;
+}
+.menuSection{
+    position: relative;
+}
+.menuLabel
+{
+    width: 100%;
+}
+.menuSection >.menuLabel
+{
+    font-weight: bold;
+}
+.menuSection > .menuEntries{
+    background-color:lightskyblue;
+    display: none;
+    position: absolute;
+    left: 0;
+    top: 100%;
+    z-index:1000;
+}
+
+.menuSection > .menuEntries .menuEntries {
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 100%;
+    z-index:10000;
+}
+.menuSection:hover > .menuEntries{
+    display: block;
+}
+
+.menuLabel
+{
+    cursor: pointer;
+}
+.menuLabel:hover
+{
+    color: red;
+}
+.menuDisabled
+{
+    color:lightgray;
+}
+
+#username
+{
+    cursor: pointer;
+}
+#username > .userfunctions
+{
+    background-color:lightskyblue;
+    display: none;
+}
+#username:hover > .userfunctions
+{
+    display: block;
+}
+
+#username > .userfunctions > div:hover
+{
+    color: red;
+}