From f2bdbe0171aefc77418afbbcb19c159a90561813 Mon Sep 17 00:00:00 2001
From: Nilesh Prasad <prasadnilesh96@gmail.com>
Date: Tue, 15 Aug 2017 22:52:40 +0530
Subject: [PATCH 1/2] minor ui-changes in adminsitartion and cleanup

---
 interface/forms/fee_sheet/new.php             |  2 +-
 interface/forms/patient_encounter/common.php  | 14 ++---
 interface/usergroup/addrbook_list.php         | 51 +++++++++----------
 interface/usergroup/facilities.php            | 48 +++++++++--------
 interface/usergroup/facility_user.php         | 19 ++++---
 interface/usergroup/usergroup_admin.php       | 44 +++++++---------
 patients/messaging/messages.php               |  4 +-
 .../document_categories/general_list.php      | 10 ----
 .../document_categories/general_upload.php    | 11 ----
 templates/documents/general_list.php          | 29 ++++-------
 .../insurance_companies/general_edit.php      | 26 +++++-----
 templates/insurance_numbers/general_edit.php  | 14 ++---
 templates/pharmacies/general_edit.php         | 20 ++++----
 13 files changed, 128 insertions(+), 164 deletions(-)

diff --git a/interface/forms/fee_sheet/new.php b/interface/forms/fee_sheet/new.php
index b6918ffe5..39ded1a5f 100644
--- a/interface/forms/fee_sheet/new.php
+++ b/interface/forms/fee_sheet/new.php
@@ -1070,7 +1070,7 @@ function newEvt() {
    <?php echo xlt('for'); ?>&nbsp;
   </td>
   <td>
-   <input type='text' class="form-control" name='search_term' value=''> &nbsp;
+   <input type='text' class="form-control input-sm" name='search_term' value=''> &nbsp;
   </td>
   <td>
    <input type='submit' name='bn_search' value='<?php echo xla('Search');?>'>
diff --git a/interface/forms/patient_encounter/common.php b/interface/forms/patient_encounter/common.php
index dcc58466f..1bbc70e8b 100644
--- a/interface/forms/patient_encounter/common.php
+++ b/interface/forms/patient_encounter/common.php
@@ -167,7 +167,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
  <div class="row">
   <div class="col-xs-12 col-sm-4 col-lg-4 ">
     <?php echo xlt('Consultation Brief Description'); ?>:
-    <textarea class="form-control" name='reason' cols='40' rows='12' wrap='virtual'>
+    <textarea class="form-control input-sm" name='reason' cols='40' rows='12' wrap='virtual'>
       <?php echo $viewmode ? text($result['reason']) : text($GLOBALS['default_chief_complaint']); ?>
     </textarea>
     <hr>  
@@ -178,7 +178,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
     <tr>
      <td class='bold'><?php echo xlt('Visit Category:'); ?></td>
      <td class='text'>
-      <select class="form-control" name='pc_catid' id='pc_catid'>
+      <select class="form-control input-sm" name='pc_catid' id='pc_catid'>
       <option value='_blank'>-- <?php echo xlt('Select One'); ?> --</option>
         <?php
         $cres = sqlStatement("SELECT pc_catid, pc_catname " .
@@ -198,7 +198,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
     <tr>
      <td class='bold'><?php echo xlt('Place of Service:'); ?></td>
      <td class='text'>
-      <select class="form-control" name='facility_id' onChange="bill_loc()">
+      <select class="form-control input-sm" name='facility_id' onChange="bill_loc()">
         <?php
 
         if ($viewmode) {
@@ -241,7 +241,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
 ?>
      <td class='bold'><?php echo xlt('Sensitivity:'); ?></td>
      <td class='text'>
-      <select class="form-control" name='form_sensitivity'>
+      <select class="form-control input-sm" name='form_sensitivity'>
 <?php
   foreach ($sensitivities as $value) {
    // Omit sensitivities to which this user does not have access.
@@ -278,7 +278,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
     <tr>
      <td class='bold' ><?php echo xlt('Date of Service:'); ?></td>
      <td class='text' >
-       <input type='text' class="form-control" size='10' name='form_date' id='form_date' <?php echo $disabled ?>
+       <input type='text' class="form-control input-sm" size='10' name='form_date' id='form_date' <?php echo $disabled ?>
               value='<?php echo $viewmode ? oeFormatShortDate(substr($result['date'], 0, 10)) : date($DateFormat); ?>'
               title='<?php echo xla('Date of Service'); ?>'/>
      </td>
@@ -287,7 +287,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
     <tr<?php if ($GLOBALS['ippf_specific']) echo " style='visibility:hidden;'"; ?>>
      <td class='bold' ><?php echo xlt('Onset/hosp. date:'); ?></td>
      <td class='text' ><!-- default is blank so that while generating claim the date is blank. -->
-      <input type='text' class="form-control" size='10' name='form_onset_date' id='form_onset_date' 
+      <input type='text' class="form-control input-sm" size='10' name='form_onset_date' id='form_onset_date' 
              value='<?php echo $viewmode && $result['onset_date']!='0000-00-00 00:00:00' ? oeFormatShortDate(substr($result['onset_date'], 0, 10)) : ''; ?>'
              title='<?php echo xla('Date of onset or hospitalization'); ?>'/>
      </td>
@@ -311,7 +311,7 @@ class="css_button link_submit" onClick="top.restoreSession()"><span><?php echo x
        onclick="top.restoreSession()"><span><?php echo xlt('Add'); ?></span></a>
     </div>
     
-    <select multiple class="form-control" name='issues[]' size='8' 
+    <select multiple class="form-control input-sm" name='issues[]' size='8' 
       title='<?php echo xla('Hold down [Ctrl] for multiple selections or to unselect'); ?>'>
         <?php
         while ($irow = sqlFetchArray($ires)) {
diff --git a/interface/usergroup/addrbook_list.php b/interface/usergroup/addrbook_list.php
index c3985340a..77a3ae690 100755
--- a/interface/usergroup/addrbook_list.php
+++ b/interface/usergroup/addrbook_list.php
@@ -32,6 +32,7 @@
  require_once("$srcdir/formdata.inc.php");
  require_once("$srcdir/options.inc.php");
  require_once("$srcdir/htmlspecialchars.inc.php");
+ require_once("$srcdir/headers.inc.php");
 
  $popup = empty($_GET['popup']) ? 0 : 1;
 
@@ -83,8 +84,10 @@
 <html>
 
 <head>
+<?php call_required_libraries(true,true,false,false);
+      resolveFancyboxCompatibility();
+?>
 
-<link rel="stylesheet" href='<?php echo $css_header ?>' type='text/css'>
 <title><?php echo xlt('Address Book'); ?></title>
 
 <!-- style tag moved into proper CSS file -->
@@ -96,36 +99,44 @@
 <div id="addressbook_list">
 <form method='post' action='addrbook_list.php' onsubmit='return top.restoreSession()'>
 
-<table>
+<table class="table">
  <tr class='search'> <!-- bgcolor='#ddddff' -->
   <td>
    <?php echo xlt('Organization')?>:
    <input type='entry' name='form_organization' size='10' value='<?php echo attr($_POST['form_organization']); ?>'
-    class='text' title='<?php echo xla("All or part of the organization") ?>' />&nbsp;
+    class='text' title='<?php echo xla("All or part of the organization") ?>' />
+  </td>
+  <td>
    <?php echo xlt('First Name')?>:
    <input type='entry' name='form_fname' size='10' value='<?php echo attr($_POST['form_fname']); ?>'
-    class='text' title='<?php echo xla("All or part of the first name") ?>' />&nbsp;
+    class='text' title='<?php echo xla("All or part of the first name") ?>' />
+  </td>
+  <td>
    <?php echo xlt('Last Name')?>:
    <input type='entry' name='form_lname' size='10' value='<?php echo attr($_POST['form_lname']); ?>'
-    class='text' title='<?php echo xla("All or part of the last name") ?>' />&nbsp;
+    class='text' title='<?php echo xla("All or part of the last name") ?>' />
+  </td>
+  <td>
    <?php echo xlt('Specialty')?>:
    <input type='entry' name='form_specialty' size='10' value='<?php echo attr($_POST['form_specialty']); ?>'
-    class='text' title='<?php echo xla("Any part of the desired specialty") ?>' />&nbsp;
-<?php
+    class='text' title='<?php echo xla("Any part of the desired specialty") ?>' />
+  </td>
+  <td>
+ <?php
   echo xlt('Type') . ": ";
   // Generates a select list named form_abook_type:
-  echo generate_select_list("form_abook_type", "abook_type", $_REQUEST['form_abook_type'], '', 'All');
+  echo generate_select_list("form_abook_type", "abook_type", $_REQUEST['form_abook_type'], '', 'All');  
 ?>
+  </td>
    <input type='checkbox' name='form_external' value='1'<?php if ($form_external) echo ' checked'; ?>
     title='<?php echo xla("Omit internal users?") ?>' />
    <?php echo xlt('External Only')?>&nbsp;&nbsp;
    <input type='submit' title='<?php echo xla("Use % alone in a field to just sort on that column") ?>' class='button' name='form_search' value='<?php echo xla("Search")?>' />
    <input type='button' class='button' value='<?php echo xla("Add New"); ?>' onclick='doedclick_add(document.forms[0].form_abook_type.value)' />
-</td>
 </tr>
 </table>
-
-<table>
+    
+<table class="table">
  <tr class='head'>
   <td title='<?php echo xla('Click to view or edit'); ?>'><?php echo xlt('Organization'); ?></td>
   <td><?php echo xlt('Name'); ?></td>
@@ -181,6 +192,7 @@ class='text' title='<?php echo xla("Any part of the desired specialty") ?>' />&n
  }
 ?>
 </table>
+<hr>
 <div style="display: none;">
   <a class="iframe addrbookedit_modal"></a>
 </div>
@@ -191,10 +203,7 @@ class='text' title='<?php echo xla("Any part of the desired specialty") ?>' />&n
 
 <!--Adding Jquery Plugins-->
 
-<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.3.2.js"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/common.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/fancybox/jquery.fancybox-1.2.6.js"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery-ui.js"></script>
 
 <script language="JavaScript">
@@ -219,20 +228,8 @@ function doedclick_edit(userid) {
  dlgopen('addrbook_edit.php?userid=' + userid, '_blank', 700, 550);
 }
 
-$(document).ready(function(){
-  // initialise fancy box
-  enable_modals();
-
-  // initialise a link
-  $(".addrbookedit_modal").fancybox( {
-    'overlayOpacity' : 0.0,
-    'showCloseButton' : true,
-    'frameHeight' : 550,
-    'frameWidth' : 700
-  });
-});
 
 </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/interface/usergroup/facilities.php b/interface/usergroup/facilities.php
index b0b9ae0d1..72771c0ba 100644
--- a/interface/usergroup/facilities.php
+++ b/interface/usergroup/facilities.php
@@ -36,6 +36,7 @@
 require_once("../../library/acl.inc");
 require_once("$srcdir/sql.inc");
 require_once("$srcdir/formdata.inc.php");
+require_once("$srcdir/headers.inc.php");
 
 $alertmsg = '';
 
@@ -98,13 +99,11 @@
 ?>
 <html>
 <head>
-<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
-<link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['webroot'] ?>/library/js/fancybox/jquery.fancybox-1.2.6.css" media="screen" />
-<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.3.2.js"></script>
+<?php 
+    call_required_libraries(true,true,false,false);
+    resolveFancyboxCompatibility();
+?>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/common.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/fancybox/jquery.fancybox-1.2.6.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery-ui.js"></script>
 
 <script type="text/javascript">
 
@@ -119,7 +118,7 @@
         'overlayOpacity' : 0.0,
         'showCloseButton' : true,
         'frameHeight' : 460,
-        'frameWidth' : 650
+        'frameWidth' : 650        
     });
 
     // special size for
@@ -133,26 +132,31 @@
 });
 
 </script>
-<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
 </head>
 
 <body class="body_top">
 
 <div>
     <div>
-    <table><tr><td>
-        <b><?php echo xlt('Facilities'); ?></b>&nbsp;</td><td>
-         <a href="facilities_add.php" class="iframe addfac_modal css_button"><span><?php echo xlt('Add');?></span></a>
-         </td></tr>
+    <table>
+        <tr>
+            <td>
+                <b><?php echo xlt('Facilities'); ?></b>&nbsp;
+            </td>
+            <td>
+                 <a href="facilities_add.php" class="iframe addfac_modal css_button"><span><?php echo xlt('Add');?></span></a>
+            </td>
+        </tr>
     </table>
     </div>
-    <div class="tabContainer" style="width:550px;">
+    <br>
+    <div>
         <div>
-<table cellpadding="1" cellspacing="0" class="showborder">
-    <tr class="showborder_head" height="22">
-        <th style="border-style:1px solid #000" width="140px"><?php echo xlt('Name'); ?></th>
-        <th style="border-style:1px solid #000" width="320px"><?php echo xlt('Address'); ?></th>
-        <th style="border-style:1px solid #000"><?php echo xlt('Phone'); ?></th>
+    <table class="table table-hover">
+    <tr>
+        <th><?php echo xlt('Name'); ?></th>
+        <th><?php echo xlt('Address'); ?></th>
+        <th><?php echo xlt('Phone'); ?></th>
     </tr>
      <?php
         $fres = 0;
@@ -171,8 +175,8 @@
           if ($iter3{state}!="")$varstate=$iter3{state}.",";
     ?>
     <tr height="22">
-       <td valign="top" class="text"><b><a href="facility_admin.php?fid=<?php echo $iter3{id};?>" class="iframe medium_modal"><span><?php echo htmlspecialchars($iter3{name});?></span></a></b>&nbsp;</td>
-       <td valign="top" class="text"><?php echo htmlspecialchars($varstreet.$varcity.$varstate.$iter3{country_code}." ".$iter3{postal_code}); ?>&nbsp;</td>
+       <td><b><a href="facility_admin.php?fid=<?php echo $iter3{id};?>" class="iframe medium_modal"><span><?php echo htmlspecialchars($iter3{name});?></span></a></b>&nbsp;</td>
+       <td><?php echo htmlspecialchars($varstreet.$varcity.$varstate.$iter3{country_code}." ".$iter3{postal_code}); ?>&nbsp;</td>
        <td><?php echo htmlspecialchars($iter3{phone});?>&nbsp;</td>
     </tr>
 <?php
@@ -181,7 +185,7 @@
  if (count($result2)<=0)
   {?>
   <tr height="25">
-        <td colspan="3"  style="text-align:center;font-weight:bold;"> <?php echo xlt( "Currently there are no facilities." ); ?></td>
+        <td colspan="3"> <?php echo xlt( "Currently there are no facilities." ); ?></td>
     </tr>
   <?php }
 ?>
@@ -198,4 +202,4 @@
 </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/interface/usergroup/facility_user.php b/interface/usergroup/facility_user.php
index 1c666bb9d..f8749f3e8 100644
--- a/interface/usergroup/facility_user.php
+++ b/interface/usergroup/facility_user.php
@@ -33,6 +33,7 @@
 
 
 require_once("../globals.php");
+require_once("$srcdir/headers.inc.php");
 require_once("$srcdir/sql.inc");
 require_once("$srcdir/formdata.inc.php");
 require_once("$srcdir/options.inc.php");
@@ -67,12 +68,10 @@
 ?>
 <html>
 <head>
-<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
-<link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['webroot'] ?>/library/js/fancybox/jquery.fancybox-1.2.6.css" media="screen" />
-<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.3.2.js"></script>
+<?php call_required_libraries(true,true,false,false);
+      resolveFancyboxCompatibility();
+?>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/common.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/fancybox/jquery.fancybox-1.2.6.js"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery-ui.js"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery.easydrag.handler.beta2.js"></script>
 
@@ -138,11 +137,11 @@
 	<div style="width:400px;">
 		<div>
 
-			<table cellpadding="1" cellspacing="0" class="showborder">
+			<table class="table table-hover" cellpadding="1" cellspacing="0" class="showborder">
 				<tbody><tr height="22" class="showborder_head">
-					<th width="180px"><b><?php echo xlt('Username'); ?></b></th>
-					<th width="270px"><b><?php echo xlt('Full Name'); ?></b></th>
-					<th width="190px"><b><span class="bold"><?php echo xlt('Facility'); ?></span></b></th>
+					<th><b><?php echo xlt('Username'); ?></b></th>
+					<th><b><?php echo xlt('Full Name'); ?></b></th>
+					<th><b><span class="bold"><?php echo xlt('Facility'); ?></span></b></th>
                                         <?php
                                         foreach ($l_arr as $layout_entry) {
                                           echo "<th width='100px'><b><span class='bold'>" . text(xl_layout_label($layout_entry['title'])) . "&nbsp;</span></b></th>";
@@ -174,4 +173,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/interface/usergroup/usergroup_admin.php b/interface/usergroup/usergroup_admin.php
index 319fc8083..ee05ad0b7 100644
--- a/interface/usergroup/usergroup_admin.php
+++ b/interface/usergroup/usergroup_admin.php
@@ -25,7 +25,8 @@
 require_once("$srcdir/sql.inc");
 require_once("$srcdir/auth.inc");
 require_once("$srcdir/formdata.inc.php");
-require_once ($GLOBALS['srcdir'] . "/classes/postmaster.php");
+require_once($GLOBALS['srcdir'] . "/classes/postmaster.php");
+require_once("$srcdir/headers.inc.php");
 
 $alertmsg = '';
 $bg_msg = '';
@@ -374,14 +375,11 @@
 ?>
 <html>
 <head>
+<?php call_required_libraries(true,true,false,false);
+      resolveFancyboxCompatibility();
+?>
 
-<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
-<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
-<link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['webroot'] ?>/library/js/fancybox/jquery.fancybox-1.2.6.css" media="screen" />
-<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.3.2.js"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/common.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/fancybox/jquery.fancybox-1.2.6.js"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery-ui.js"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/js/jquery.easydrag.handler.beta2.js"></script>
 <script type="text/javascript">
@@ -425,7 +423,7 @@ function authorized_clicked() {
     <div>
        <table>
       <tr >
-        <td><b><?php echo xlt('User / Groups'); ?></b></td>
+        <td><b><?php echo xlt('User / Groups'); ?></b>&nbsp;&nbsp;</td>
         <td><a href="usergroup_admin_add.php" class="iframe_medium css_button"><span><?php echo xlt('Add User'); ?></span></a>
         </td>
         <td><a href="facility_user.php" class="css_button"><span><?php echo xlt('View Facility Specific User Information'); ?></span></a>
@@ -433,12 +431,10 @@ function authorized_clicked() {
       </tr>
     </table>
     </div>
-    <div style="width:650px;">
-        <div>
 
-<form name='userlist' method='post' action='usergroup_admin.php' onsubmit='return top.restoreSession()'>
+<form name='userlist' method='post' action='usergroup_admin.php' onsubmit='return top.restoreSession()'><br>
     <input type='checkbox' name='form_inactive' value='1' onclick='submit()' <?php if ($form_inactive) echo 'checked '; ?>/>
-    <span class='text' style = "margin-left:-3px"> <?php echo xlt('Include inactive users'); ?> </span>
+    <span class='text'> <?php echo xlt('Include inactive users'); ?> </span>
 </form>
 <?php
 if($set_active_msg == 1){
@@ -450,11 +446,12 @@ function authorized_clicked() {
 }
 
 ?>
-<table cellpadding="1" cellspacing="0" class="showborder">
-    <tbody><tr height="22" class="showborder_head">
-        <th width="180px"><b><?php echo xlt('Username'); ?></b></th>
-        <th width="270px"><b><?php echo xlt('Real Name'); ?></b></th>
-        <th width="320px"><b><span class="bold"><?php echo xlt('Additional Info'); ?></span></b></th>
+<div class="table-responsive">
+<table class="table table-hover">
+    <tr height="22">
+        <th><b><?php echo xlt('Username'); ?></b></th>
+        <th><b><?php echo xlt('Real Name'); ?></b></th>
+        <th><b><span><?php echo xlt('Additional Info'); ?></span></b></th>
         <th><b><?php echo xlt('Authorized'); ?>?</b></th>
 
         <?php
@@ -470,8 +467,8 @@ function authorized_clicked() {
   } else {
       $iter{"authorized"} = "";
   }
-  print "<tr height=20  class='text' style='border-bottom: 1px dashed;'>
-        <td class='text'><b><a href='user_admin.php?id=" . $iter{"id"} .
+  print "<tr>
+        <td><b><a href='user_admin.php?id=" . $iter{"id"} .
     "' class='iframe_medium' onclick='top.restoreSession()'><span>" . $iter{"username"} . "</span></a></b>" ."&nbsp;</td>
     <td><span class='text'>" . attr($iter{"fname"}) . ' ' . attr($iter{"lname"}) ."</span>&nbsp;</td>
     <td><span class='text'>" . attr($iter{"info"}) . "</span>&nbsp;</td>
@@ -481,7 +478,8 @@ function authorized_clicked() {
   print "</tr>\n";
 }
 ?>
-    </tbody></table>
+    </table>
+    </div>
 <?php
 if (empty($GLOBALS['disable_non_default_groups'])) {
   $res = sqlStatement("select * from groups order by name");
@@ -500,11 +498,7 @@ function authorized_clicked() {
   }
 }
 ?>
-        </div>
-    </div>
 </div>
-
-
 <script language="JavaScript">
 <?php
   if ($alertmsg = trim($alertmsg)) {
@@ -514,4 +508,4 @@ function authorized_clicked() {
 </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/patients/messaging/messages.php b/patients/messaging/messages.php
index cdb313290..b197ce09a 100644
--- a/patients/messaging/messages.php
+++ b/patients/messaging/messages.php
@@ -634,13 +634,13 @@ class="pull-right glyphicon glyphicon-warning-sign text-danger"></span></span> -
                                 <div class="form-group">
                                     <label class="col-sm-1 col-md-1" for="selSendto"><?php echo xlt('To'); ?></label>
                                     <div class="col-sm-3 col-md-3">
-                                        <select class="form-control" id="selSendto" ng-model="selrecip" ng-options="recip.userid as recip.username for recip in authrecips track by recip.userid"></select>
+                                        <select class="form-control input-sm" id="selSendto" ng-model="selrecip" ng-options="recip.userid as recip.username for recip in authrecips track by recip.userid"></select>
                                     </div>
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-1 col-md-1" for="title"><?php echo xlt('Subject'); ?></label>
                                     <div class="col-sm-6 col-md-6">
-                                    <input type='text' list='listid' name='title' id='title' class="form-control" ng-model='compose.title'>
+                                    <input type='text' list='listid' name='title' id='title' class="form-control input-sm" ng-model='compose.title'>
                                     <datalist id='listid'>
                                             <option><?php echo xlt('Unassigned'); ?></option>
                                         <option label='<?php echo xlt('Insurance'); ?>' value='<?php echo xlt('Insurance'); ?>'/>
diff --git a/templates/document_categories/general_list.php b/templates/document_categories/general_list.php
index a795692d2..e5c0fafb5 100644
--- a/templates/document_categories/general_list.php
+++ b/templates/document_categories/general_list.php
@@ -1,16 +1,6 @@
 
  <style type="text/css" title="mystyles" media="all">
-<!--
-.treeMenuDefault {
-	font-style: italic;
-}
 
-.treeMenuBold {
-	font-style: italic;
-	font-weight: bold;
-}
-
--->
 </style>
 
 <script type="text/javascript">
diff --git a/templates/document_categories/general_upload.php b/templates/document_categories/general_upload.php
index 0a725e6b4..89c771ae7 100644
--- a/templates/document_categories/general_upload.php
+++ b/templates/document_categories/general_upload.php
@@ -4,17 +4,6 @@
 
 
  <style type="text/css" title="mystyles" media="all">
-<!--
-td {
-	font-size:8pt;
-	font-family:helvetica;
-}
-a {
-	font-size:8pt;
-	font-family:helvetica;
-}
-
--->
 </style>
 </head>
 <body bgcolor="<?php echo $this->style.BGCOLOR2;?>">
diff --git a/templates/documents/general_list.php b/templates/documents/general_list.php
index 0a9398fba..325aeb140 100644
--- a/templates/documents/general_list.php
+++ b/templates/documents/general_list.php
@@ -28,25 +28,16 @@
 	</tr>
 </table>
 </div>
-<div id="documents_actions">
-		<!--{if $message}
-			<div class='text' style="margin-bottom:-10px; margin-top:-8px"><i>{$message}</i></div><br>
-		{/if}-->
-                                        <?php
-                                            if($this->message){ ?>
-                                                <div class='text' style="margin-bottom:-10px; margin-top:-8px"><i><?php echo $this->message;    ?></i></div><br>
-                                            <?php } ?>
-                                                
-                                            <?php if($this->messages) {?>    
-                                                <div class='text' style="margin-bottom:-10px; margin-top:-8px"><i><?php echo $this->messages;   ?></i></div><br>
-                                            <?php } 
-                                            echo $this->activity;?>
-                                                
-                                       <!--{if $messages}
-                                                <div class='text' style="margin-bottom:-10px; margin-top:-8px"><i>{$messages}</i></div><br>
-		{/if}
-		{$activity}
-                                        -->
+<div id="documents_actions">		
+    <?php
+        if($this->message){ ?>
+            <div class='text' style="margin-bottom:-10px; margin-top:-8px"><i><?php echo $this->message;    ?></i></div><br>
+        <?php } ?>
+            
+        <?php if($this->messages) {?>    
+            <div class='text' style="margin-bottom:-10px; margin-top:-8px"><i><?php echo $this->messages;   ?></i></div><br>
+        <?php } 
+        echo $this->activity;?>                                      
 </div>
 </body>
 </html>
diff --git a/templates/insurance_companies/general_edit.php b/templates/insurance_companies/general_edit.php
index cf8e951b5..ecb153e35 100644
--- a/templates/insurance_companies/general_edit.php
+++ b/templates/insurance_companies/general_edit.php
@@ -28,55 +28,55 @@ function jsWaitForDelay(delay) {
 <tr>
     <td><?php echo xlt("Name");?> </td>
     <td>
-        <input type="text" class="form-control" size="40" name="name" value="<?php echo $this->insurancecompany->get_name();?>" onKeyDown="PreventIt(event)" /> 
+        <input type="text" class="form-control input-sm" size="40" name="name" value="<?php echo $this->insurancecompany->get_name();?>" onKeyDown="PreventIt(event)" /> 
         *Required
     </td>
 </tr>
 <tr>
     <td><?php echo xlt("Attn");?> </td>
     <td>
-        <input type="text" class="form-control" size="40" name="attn" value="<?php echo $this->insurancecompany->get_attn();?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm" size="40" name="attn" value="<?php echo $this->insurancecompany->get_attn();?>" onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 
 <tr>
     <td><?php echo xlt("Address")."(".xlt("line1").")";?> </td>
     <td>
-        <input type="text" class="form-control" size="40" name="address_line1" value="<?php $this->insurancecompany->address->line1;?>" 
+        <input type="text" class="form-control input-sm" size="40" name="address_line1" value="<?php $this->insurancecompany->address->line1;?>" 
                onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 <tr>
     <td><?php echo xlt("Address")."(".xlt("line2").")";?> </td>
     <td>
-        <input type="text" class="form-control" size="40" name="address_line2" value="<?php echo $this->insurancecompany->address->line2;?>" 
+        <input type="text" class="form-control input-sm" size="40" name="address_line2" value="<?php echo $this->insurancecompany->address->line2;?>" 
                onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 <tr>
     <td><?php echo xlt("City").",".xlt("state").",".xlt("zip");?> </td>
     <td class="form-inline">
-        <input type="text" class="form-control" size="25" name="city" value="<?php echo $this->insurancecompany->address->city;?>" onKeyDown="PreventIt(event)" /> , 
-        <input type="text" class="form-control" size="2" maxlength="2" name="state" value="<?php echo $this->insurancecompany->address->state;?>"
+        <input type="text" class="form-control input-sm" size="25" name="city" value="<?php echo $this->insurancecompany->address->city;?>" onKeyDown="PreventIt(event)" /> , 
+        <input type="text" class="form-control input-sm" size="2" maxlength="2" name="state" value="<?php echo $this->insurancecompany->address->state;?>"
                onKeyDown="PreventIt(event)" /> ,
-        <input type="text" class="form-control" size="5" name="zip" value="<?php $this->insurancecompany->address->zip;?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm" size="5" name="zip" value="<?php $this->insurancecompany->address->zip;?>" onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 <tr>
     <td><?php echo xlt("Phone");?> </td>
     <td>
-        <input type="text" class="form-control" NAME="phone" SIZE="12" VALUE="<?php echo$this->insurancecompany->get_phone();?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm" NAME="phone" SIZE="12" VALUE="<?php echo$this->insurancecompany->get_phone();?>" onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 <tr>
     
     <td><?php echo xlt("CMS ID");?> </td>
     <td>
-        <input type="text" class="form-control" size="15" name="cms_id" value="<?php echo $this->insurancecompany->get_cms_id();?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm" size="15" name="cms_id" value="<?php echo $this->insurancecompany->get_cms_id();?>" onKeyDown="PreventIt(event)" />
     
         <?php if ($GLOBALS['support_encounter_claims']) {?>
                     &nbsp;&nbsp;For Encounter Claims:
-                    <input type="text" class="form-control" size="15" name="alt_cms_id" value="<?php echo $this->insurancecompany->get_alt_cms_id();?>" onKeyDown="PreventIt(event)" />
+                    <input type="text" class="form-control input-sm" size="15" name="alt_cms_id" value="<?php echo $this->insurancecompany->get_alt_cms_id();?>" onKeyDown="PreventIt(event)" />
         <?php }?>           
                     
 
@@ -87,7 +87,7 @@ function jsWaitForDelay(delay) {
     <td>
         <!--{html_options name="ins_type_code" options=$insurancecompany->ins_type_code_array 
         selected=$insurancecompany->get_ins_type_code()}-->
-        <select class="form-control" name="ins_type_code">
+        <select class="form-control input-sm" name="ins_type_code">
             <?php foreach ($this->insurancecompany->ins_type_code_array   as $key => $value) 
                 { 
                 if($key==$this->insurancecompany->get_ins_type_code() ) { ?>
@@ -104,14 +104,14 @@ function jsWaitForDelay(delay) {
 <tr>
     <td COLSPAN="1" ALIGN="LEFT" >X12 Receiver ID</td>
     <td COLSPAN="2" ALIGN="LEFT" >
-        <input type="text" class="form-control" name="x12_receiver_id" value="{$insurancecompany->get_x12_receiver_id()}" >
+        <input type="text" class="form-control input-sm" name="x12_receiver_id" value="{$insurancecompany->get_x12_receiver_id()}" >
     </td>
 </tr>-->
 <tr>
     <td><?php echo xlt("Default X12 Partner");?></td>
     <td>
         <!--{html_options name="x12_default_partner_id" options=$x12_partners selected=$insurancecompany->get_x12_default_partner_id()}-->
-        <select class="form-control" name="x12_default_partner_id">
+        <select class="form-control input-sm" name="x12_default_partner_id">
             <?php foreach ($this->x12_partners  as $key => $value) 
                 { 
                 if($key==$this->insurancecompany->get_x12_default_partner_id() ) { ?>
diff --git a/templates/insurance_numbers/general_edit.php b/templates/insurance_numbers/general_edit.php
index 3f0d3ae04..16797594e 100644
--- a/templates/insurance_numbers/general_edit.php
+++ b/templates/insurance_numbers/general_edit.php
@@ -39,7 +39,7 @@
 <?php } } 
 else { ?>
 <tr>
-   <td colspan="5"><?php echo xlt("No entries found").",".xlt("use the form below to add an entry")";?></td>
+   <td colspan="5"><?php echo xlt("No entries found").",".xlt("use the form below to add an entry");?></td>
 </tr>
 <?php } ?>
 
@@ -67,7 +67,7 @@ class="css_button" style='margin-top:2px'
             <td><?php echo xlt("Insurance Company");?></td>
             <td>
                     <?php if($this->ins->get_id() =="") { ?>
-                    <select class="form-control" name="insurance_company_id">
+                    <select class="form-control input-sm" name="insurance_company_id">
                         <?php foreach ($this->ic_array as $key => $value) 
                         { 
                             if($key==$this->ins->get_insurance_company_id() ) { ?>
@@ -85,7 +85,7 @@ class="css_button" style='margin-top:2px'
 <tr>
         <td><?php echo xlt("Provider Number");?></td>
         <td>
-           <input type="text" class="form-control" size="20" name="provider_number" value="<?php $this->ins->get_provider_number();?>" onKeyDown="PreventIt(event)" />
+           <input type="text" class="form-control input-sm" size="20" name="provider_number" value="<?php $this->ins->get_provider_number();?>" onKeyDown="PreventIt(event)" />
         </td>
 </tr>
 <tr>
@@ -95,7 +95,7 @@ class="css_button" style='margin-top:2px'
            values=$ins->provider_number_type_array 
            selected=$ins->get_provider_number_type()}-->
            
-           <select class="form-control" name="provider_number_type">
+           <select class="form-control input-sm" name="provider_number_type">
                         <?php foreach ($this->ic_type_options_array  as $key => $value) 
                         { 
                             if($key==$this->ins->get_provider_number_type() ) { ?>
@@ -112,7 +112,7 @@ class="css_button" style='margin-top:2px'
 <tr>
         <td><?php echo xlt("Rendering Provider Number");?></td>
         <td>
-                <input type="text" class="form-control" size="20" name="rendering_provider_number" value="<?php echo $this->ins->get_rendering_provider_number();?>" 
+                <input type="text" class="form-control input-sm" size="20" name="rendering_provider_number" value="<?php echo $this->ins->get_rendering_provider_number();?>" 
                        onKeyDown="PreventIt(event)" />
         </td>
 </tr>
@@ -123,7 +123,7 @@ class="css_button" style='margin-top:2px'
             values=$ins->rendering_provider_number_type_array 
             selected=$ins->get_rendering_provider_number_type()}
            -->
-           <select class="form-control" name="rendering_provider_number_type">
+           <select class="form-control input-sm" name="rendering_provider_number_type">
                <?php foreach ($this->ic_rendering_type_options_array   as $key => $value) 
                         { 
                             if($key==$this->ins->get_rendering_provider_number_type() ) { ?>
@@ -139,7 +139,7 @@ class="css_button" style='margin-top:2px'
 <tr>
         <td><?php echo xlt("Group Number");?></td>
         <td>
-                <input type="text" class="form-control" size="20" name="group_number" value="<?php echo $this->ins->get_group_number(); ?>" 
+                <input type="text" class="form-control input-sm" size="20" name="group_number" value="<?php echo $this->ins->get_group_number(); ?>" 
                        onKeyDown="PreventIt(event)" />
         </td>
 </tr>
diff --git a/templates/pharmacies/general_edit.php b/templates/pharmacies/general_edit.php
index d63328a8b..cf03fa1b8 100644
--- a/templates/pharmacies/general_edit.php
+++ b/templates/pharmacies/general_edit.php
@@ -7,52 +7,52 @@
 <tr>
     <td><?php echo xlt("Name");?> </td>
     <td>
-        <input type="text" class="form-control" size="40" name="name" value="<?php echo $this->pharmacy->name;?>" onKeyDown="PreventIt(event)" />(Required)
+        <input type="text" class="form-control input-sm" size="40" name="name" value="<?php echo $this->pharmacy->name;?>" onKeyDown="PreventIt(event)" />(Required)
     </td>
 </tr>
 <tr>
     <td><?php echo xlt("Address")."(".xlt("line1").")";?></td>
     <td>
-        <input type="text" class="form-control" size="40" name="address_line1" value="<?php echo $this->pharmacy->address->line1;?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm" size="40" name="address_line1" value="<?php echo $this->pharmacy->address->line1;?>" onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 <tr>
     <td><?php echo xlt("Address")."(".xlt("line2").")";?></td>
     <td >
-        <input type="text" class="form-control" size="40" name="address_line2" value="<?php echo $this->pharmacy->address->line2;?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm input-sm" size="40" name="address_line2" value="<?php echo $this->pharmacy->address->line2;?>" onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 <tr>
     <td><?php echo xlt("City").",".xlt("state").",".xlt("zip");?></td>
     <td class="form-group form-inline">        
-        <input type="text" class="form-control " size="25" name="city" value="<?php echo $this->pharmacy->address->city;?>" onKeyDown="PreventIt(event)" /> , 
-        <input type="text" class="form-control " size="2" maxlength="2" name="state" value="<?php echo $this->pharmacy->address->state;?>" onKeyDown="PreventIt(event)" /> ,
-        <input type="text" class="form-control " size="5" name="zip" value="<?php $this->pharmacy->address->zip;?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm " size="25" name="city" value="<?php echo $this->pharmacy->address->city;?>" onKeyDown="PreventIt(event)" /> , 
+        <input type="text" class="form-control input-sm " size="2" maxlength="2" name="state" value="<?php echo $this->pharmacy->address->state;?>" onKeyDown="PreventIt(event)" /> ,
+        <input type="text" class="form-control input-sm " size="5" name="zip" value="<?php $this->pharmacy->address->zip;?>" onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 <tr>
     <td  ><?php echo xlt("Email");?></td>
     <td >
-        <input type="text" class="form-control" NAME="email" SIZE="35" VALUE="<?php echo $this->pharmacy->email;?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm" NAME="email" SIZE="35" VALUE="<?php echo $this->pharmacy->email;?>" onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 <tr>
     <td><?php echo xlt("Phone");?></td>
     <td>
-        <input type="text" class="form-control" NAME="phone" SIZE="12" VALUE="<?php echo $this->pharmacy->get_phone();?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm" NAME="phone" SIZE="12" VALUE="<?php echo $this->pharmacy->get_phone();?>" onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 <tr>
     <td><?php echo xlt("Fax");?></td>
     <td>
-        <input type="text" class="form-control" NAME="fax" SIZE="12" VALUE="<?php echo $this->pharmacy->get_fax();?>" onKeyDown="PreventIt(event)" />
+        <input type="text" class="form-control input-sm" NAME="fax" SIZE="12" VALUE="<?php echo $this->pharmacy->get_fax();?>" onKeyDown="PreventIt(event)" />
     </td>
 </tr>
 
 <tr>
     <td><?php echo xlt("Default Method");?></td>
     <td>
-        <select class="form-control" name="transmit_method">
+        <select class="form-control input-sm" name="transmit_method">
             <!--{html_options    options=$pharmacy->transmit_method_array  selected=$pharmacy->transmit_method}-->
             <?php foreach ($this->pharmacy->transmit_method_array as $key => $value) 
                 { 

From fc5e7c038a13342723bd3a90a36420db109e8645 Mon Sep 17 00:00:00 2001
From: Nilesh Prasad <prasadnilesh96@gmail.com>
Date: Sat, 19 Aug 2017 14:01:54 +0530
Subject: [PATCH 2/2] resolves layout issues in frames,smaller form-control

---
 .../encounter/superbill_custom_full.php       | 88 ++++++++++---------
 interface/super/edit_globals.php              | 20 ++---
 2 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/interface/patient_file/encounter/superbill_custom_full.php b/interface/patient_file/encounter/superbill_custom_full.php
index ea24e66dc..f58ab192b 100644
--- a/interface/patient_file/encounter/superbill_custom_full.php
+++ b/interface/patient_file/encounter/superbill_custom_full.php
@@ -44,6 +44,7 @@
 require_once("$srcdir/options.inc.php");
 require_once("$srcdir/formatting.inc.php");
 require_once("$srcdir/formdata.inc.php");
+require_once("$srcdir/headers.inc.php");
 
 // Translation for form fields.
 function ffescape($field) {
@@ -233,12 +234,14 @@ function bucks($amount) {
 
 <html>
 <head>
+<style>
+  
+</style>
 <title><?php echo xlt("Codes"); ?></title>
-<?php html_header_show(); ?>
-<link rel="stylesheet" href="<?php echo attr($css_header);?>" type="text/css">
-<script type="text/javascript" src="../../../library/dialog.js"></script>
-<script type="text/javascript" src="../../../library/textformat.js"></script>
-
+<?php 
+      html_header_show(); 
+      call_required_libraries(true,false,false,false);
+?>
 <script language="JavaScript">
 
 // This is for callback by the find-code popup.
@@ -377,11 +380,8 @@ function getCTMask() {
 <br>
 
 <center>
-<table border='0' cellpadding='0' cellspacing='0'>
-
- <tr>
-  <td colspan="3"> <?php echo xlt('Not all fields are required for all codes or code types.'); ?><br><br></td>
- </tr>
+ <?php echo xlt('Not all fields are required for all codes or code types.'); ?>
+<table class="table">
 
  <tr>
   <td><?php echo xlt('Type'); ?>:</td>
@@ -390,7 +390,7 @@ function getCTMask() {
   <td>
 
    <?php if ($mode != "modify") { ?>
-     <select name="code_type">
+     <select name="code_type" class="form-control input-sm">
    <?php } ?>
 
    <?php $external_sets = array(); ?>
@@ -410,34 +410,35 @@ function getCTMask() {
    <?php } ?>
 
    <?php if ($mode == "modify") { ?>
-      <input type='text' size='4' name='code_type' readonly='readonly' style='display:none' value='<?php echo attr($code_type) ?>' />
+      <input type='text' class="form-control input-sm" name='code_type' readonly='readonly' style='display:none' value='<?php echo attr($code_type) ?>' />
       <?php echo attr($code_type_name_external) ?>
    <?php } ?>
-
-   &nbsp;&nbsp;
-   <?php echo xlt('Code'); ?>:
-
+   </td>
+   <td>
+   <?php echo xlt('Code'); ?>:      
    <?php if ($mode == "modify") { ?>
-     <input type='text' size='6' name='code' readonly='readonly' value='<?php echo attr($code) ?>' />
+     <input type='text' name='code' class="form-control input-sm" readonly='readonly' value='<?php echo attr($code) ?>' />
    <?php } else { ?>
-     <input type='text' size='6' name='code' value='<?php echo attr($code) ?>'
+     <input type='text' size='6' name='code' class="form-control input-sm" value='<?php echo attr($code) ?>'
       onkeyup='maskkeyup(this,getCTMask())'
       onblur='maskblur(this,getCTMask())'
      />
    <?php } ?>
+   </td>
 
 <?php if (modifiers_are_used()) { ?>
-   &nbsp;&nbsp;<?php echo xlt('Modifier'); ?>:
+    <td>
+   <?php echo xlt('Modifier'); ?>:
    <?php if ($mode == "modify") { ?>
-     <input type='text' size='3' name='modifier' readonly='readonly' value='<?php echo attr($modifier) ?>'>
+     <input type='text' class="form-control input-sm" size='3' name='modifier' readonly='readonly' value='<?php echo attr($modifier) ?>'>
    <?php } else { ?>
-     <input type='text' size='3' name='modifier' value='<?php echo attr($modifier) ?>'>
+     <input type='text' class="form-control input-sm" size='3' name='modifier' value='<?php echo attr($modifier) ?>'>
    <?php } ?>
 <?php } else { ?>
    <input type='hidden' name='modifier' value=''>
 <?php } ?>
-
-   &nbsp;&nbsp;
+    </td>
+    <td>
    <input type='checkbox' name='active' value='1'<?php if (!empty($active) || ($mode == 'modify' && $active == NULL) ) echo ' checked'; ?> />
    <?php echo xlt('Active');
    if($GLOBALS['bill_to_patient'] ==1) {?>
@@ -454,9 +455,9 @@ function getCTMask() {
   <td>
 
    <?php if ($mode == "modify") { ?>
-     <input type='text' size='50' name="code_text" readonly="readonly" value='<?php echo attr($code_text) ?>'>
+     <input type='text'  class="form-control input-sm" size='50' name="code_text" readonly="readonly" value='<?php echo attr($code_text) ?>'>
    <?php } else { ?>
-     <input type='text' size='50' name="code_text" value='<?php echo attr($code_text) ?>'>
+     <input type='text'  class="form-control input-sm" size='50' name="code_text" value='<?php echo attr($code_text) ?>'>
    <?php } ?>
 
   </td>
@@ -469,12 +470,15 @@ function getCTMask() {
 <?php
 generate_form_field(array('data_type'=>1,'field_id'=>'superbill','list_id'=>'superbill'), $superbill);
 ?>
-   &nbsp;&nbsp;
+   </td>
+   <td>
    <input type='checkbox' title='<?php echo xlt("Syndromic Surveillance Report") ?>' name='reportable' value='1'<?php if (!empty($reportable)) echo ' checked'; ?> />
-   <?php echo xlt('Diagnosis Reporting'); ?>
-   &nbsp;&nbsp;&nbsp;&nbsp;
+   <?php echo xlt('Diagnosis Reporting'); ?>   
+   </td>
+   <td>
    <input type='checkbox' title='<?php echo xlt("Service Code Finance Reporting") ?>' name='financial_reporting' value='1'<?php if (!empty($financial_reporting)) echo ' checked'; ?> />
    <?php echo xlt('Service Reporting'); ?>
+   </td>
   </td>
  </tr>
 
@@ -482,7 +486,7 @@ function getCTMask() {
   <td><?php echo xlt('CYP Factor'); ?>:</td>
   <td></td>
   <td>
-   <input type='text' size='10' maxlength='20' name="cyp_factor" value='<?php echo attr($cyp_factor) ?>'>
+   <input type='text'  class="form-control input-sm" size='10' maxlength='20' name="cyp_factor" value='<?php echo attr($cyp_factor) ?>'>
   </td>
  </tr>
 
@@ -490,7 +494,7 @@ function getCTMask() {
   <td><?php echo xlt('Relate To'); ?>:</td>
   <td></td>
   <td>
-   <input type='text' size='50' name='related_desc'
+   <input type='text'  class="form-control input-sm" size='50' name='related_desc'
     value='<?php echo attr($related_desc) ?>' onclick="sel_related()"
     title='<?php echo xla('Click to select related code'); ?>' readonly />
    <input type='hidden' name='related_code' value='<?php echo attr($related_code) ?>' />
@@ -544,22 +548,21 @@ function getCTMask() {
    <input type="hidden" name="code_type_name_external" value="<?php echo attr($code_type_name_external) ?>">
    <input type="hidden" name="code_external" value="<?php echo attr($code_external) ?>">
    <?php if ($mode == "modify") { ?>
-     <a href='javascript:submitModifyComplete();' class='link'>[<?php echo xlt('Update'); ?>]</a>
+     <a href='javascript:submitModifyComplete();' class='css_button'><?php echo xlt('Update'); ?></a>
    <?php } else { ?>
-     <a href='javascript:submitUpdate();' class='link'>[<?php echo xlt('Update'); ?>]</a>
+     <a href='javascript:submitUpdate();' class='btn btn-primary'><?php echo xlt('Update'); ?></a>
      &nbsp;&nbsp;
-     <a href='javascript:submitAdd();' class='link'>[<?php echo xlt('Add as New'); ?>]</a>
+     <a href='javascript:submitAdd();' class='btn btn-primary'><?php echo xlt('Add as New'); ?></a>
    <?php } ?>
   </td>
  </tr>
 
 </table>
-<br>
-<table border='0' cellpadding='5' cellspacing='0' width='96%'>
+<table class="table">
  <tr>
 
   <td class='text'>
-   <select name='filter[]' multiple='multiple'>
+   <select class="form-control input-sm" name='filter[]' multiple='multiple'>
 <?php
 foreach ($code_types as $key => $value) {
   echo "<option value='" . attr($value['id']) . "'";
@@ -568,10 +571,10 @@ function getCTMask() {
 }
 ?>
    </select>
-   &nbsp;&nbsp;&nbsp;&nbsp;
+  
 
-   <input type="text" name="search" size="5" value="<?php echo attr($search) ?>">&nbsp;
-   <input type="submit" name="go" value='<?php echo xla('Search'); ?>'>&nbsp;&nbsp;
+  <input type="text" class="form-control input-sm" name="search" size="5" value="<?php echo attr($search) ?>"><br>
+   <input type="submit" class="btn btn-primary" name="go" value='<?php echo xla('Search'); ?>'>&nbsp;&nbsp;
    <input type='checkbox' title='<?php echo xlt("Only Show Diagnosis Reporting Codes") ?>' name='search_reportable' value='1'<?php if (!empty($search_reportable)) echo ' checked'; ?> />
    <?php echo xlt('Diagnosis Reporting Only'); ?>
    &nbsp;&nbsp;&nbsp;&nbsp;
@@ -599,7 +602,7 @@ function getCTMask() {
 
 </form>
 
-<table border='0' cellpadding='5' cellspacing='0' width='96%'>
+<table class="table">
  <tr>
   <td><span class='bold'><?php echo xlt('Code'); ?></span></td>
   <td><span class='bold'><?php echo xlt('Mod'); ?></span></td>
@@ -710,6 +713,9 @@ function getCTMask() {
  }
 ?>
 </script>
+<script type="text/javascript">
+    $("#form_superbill").addClass('form-control input-sm');
+</script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/interface/super/edit_globals.php b/interface/super/edit_globals.php
index dbe92aa81..04eb4e537 100644
--- a/interface/super/edit_globals.php
+++ b/interface/super/edit_globals.php
@@ -364,7 +364,7 @@ function checkBackgroundServices(){
     echo " <tr $srch_cl title='" . attr($flddesc) . "'  id='".attr($fldid)."' value='".attr($fldvalue)."'><td><b>" . text($fldname) . "</b></td><td>\n";
 
     if (is_array($fldtype)) {
-      echo "  <select class='form-control' name='form_$i' id='form_$i'>\n";
+      echo "  <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
       foreach ($fldtype as $key => $value) {
         if ($_GET['mode'] == "user") {
           if ($globalValue == $key) $globalTitle = $value;
@@ -399,7 +399,7 @@ function checkBackgroundServices(){
       if ($_GET['mode'] == "user") {
         $globalTitle = $globalValue;
       }
-      echo "  <input type='text' class='form-control form-rounded' name='form_$i' id='form_$i' " .
+      echo "  <input type='text' class='form-control input-sm' name='form_$i' id='form_$i' " .
         "size='6' maxlength='15' value='" . attr($fldvalue) . "' />\n";
     }
 
@@ -407,7 +407,7 @@ function checkBackgroundServices(){
       if ($_GET['mode'] == "user") {
         $globalTitle = $globalValue;
       }
-      echo "  <input type='text' class='form-control form-rounded' name='form_$i' id='form_$i' " .
+      echo "  <input type='text' class='form-control input-sm' name='form_$i' id='form_$i' " .
         "size='50' maxlength='255' value='" . attr($fldvalue) . "' />\n";
     }
     else if ($fldtype == 'pwd') {
@@ -428,7 +428,7 @@ function checkBackgroundServices(){
 
     else if ($fldtype == 'lang') {
       $res = sqlStatement("SELECT * FROM lang_languages ORDER BY lang_description");
-      echo "  <select class='form-control' name='form_$i' id='form_$i'>\n";
+      echo "  <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
       while ($row = sqlFetchArray($res)) {
         echo "   <option value='" . attr($row['lang_description']) . "'";
         if ($row['lang_description'] == $fldvalue) echo " selected";
@@ -449,7 +449,7 @@ function checkBackgroundServices(){
         $order = "title, seq";
     }
       $res = sqlStatement("SELECT option_id, title FROM list_options WHERE list_id = ? AND activity=1 ORDER BY " . $order, array('apptstat'));
-      echo "  <select class='form-control' name='form_$i' id='form_$i'>\n";
+      echo "  <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
       if ($flddef ==" ") {
       $top_choice = "All";
       }else{
@@ -534,7 +534,7 @@ function checkBackgroundServices(){
 
     else if ($fldtype == 'all_code_types') {
       global $code_types;
-      echo "  <select class='form-control' name='form_$i' id='form_$i'>\n";
+      echo "  <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
       foreach (array_keys($code_types) as $code_key ) {
         echo "   <option value='" . attr($code_key) . "'";
         if ($code_key == $fldvalue) echo " selected";
@@ -547,7 +547,7 @@ function checkBackgroundServices(){
 
     else if ($fldtype == 'm_lang') {
       $res = sqlStatement("SELECT * FROM lang_languages  ORDER BY lang_description");
-      echo "  <select multiple name='form_{$i}[]' class='form-control' id='form_{$i}[]' size='3'>\n";
+      echo "  <select multiple name='form_{$i}[]' class='form-control input-sm' id='form_{$i}[]' size='3'>\n";
       while ($row = sqlFetchArray($res)) {
         echo "   <option value='" . attr($row['lang_description']) . "'";
         foreach ($glarr as $glrow) {
@@ -578,7 +578,7 @@ function checkBackgroundServices(){
       $themedir = "$webserver_root/interface/themes";
       $dh = opendir($themedir);
       if ($dh) {
-        echo "  <select class='form-control' name='form_$i' id='form_$i'>\n";
+        echo "  <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
         while (false !== ($tfname = readdir($dh))) {
           // Only show files that contain style_ as options
           //  Skip style_blue.css since this is used for
@@ -609,7 +609,7 @@ function checkBackgroundServices(){
       $themedir = "$webserver_root/interface/themes";
       $dh = opendir($themedir);
       if ($dh) {
-        echo "  <select class='form-control' name='form_$i' id='form_$i'>\n";
+        echo "  <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
         while (false !== ($tfname = readdir($dh))) {
           // Only show files that contain tabs_style_ as options
           if (!preg_match("/^tabs_style_.*\.css$/", $tfname)) continue;
@@ -632,7 +632,7 @@ function checkBackgroundServices(){
       if ($_GET['mode'] == "user") {
         $globalTitle = $globalValue;
       }
-      echo "  <select class='form-control' name='form_$i' id='form_$i'>\n";
+      echo "  <select class='form-control input-sm' name='form_$i' id='form_$i'>\n";
       for ($h = 0; $h < 24; ++$h) {
         echo "<option value='$h'";
         if ($h == $fldvalue) echo " selected";