From 370bdab7bf0cddb7ebb02f64faa8f1ccefdde181 Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Sun, 26 Mar 2017 11:46:34 -0700
Subject: [PATCH] minor changes to prior commit

---
 interface/forms/procedure_order/new.php | 16 ++++++++--------
 library/options.inc.php                 | 14 +++++++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/interface/forms/procedure_order/new.php b/interface/forms/procedure_order/new.php
index 90348f57e..66f35a6ea 100644
--- a/interface/forms/procedure_order/new.php
+++ b/interface/forms/procedure_order/new.php
@@ -213,13 +213,16 @@ $enrow = sqlQuery("SELECT p.fname, p.mname, p.lname, fe.date FROM " .
 <html>
 <head>
 <?php html_header_show(); ?>
-<script src="<?php echo $GLOBALS['assets_static_relative'] ?>/jquery-min-1-9-1/index.js"></script>
-<script src="<?php echo $GLOBALS['assets_static_relative'] ?>/bootstrap-3-3-4/dist/js/bootstrap.min.js"></script>
-
 
 <link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css" />
+<link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative'] ?>/bootstrap-3-3-4/dist/css/bootstrap.min.css">
+<?php if($_SESSION['language_direction'] == 'rtl'): ?>
+<link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative'];?>/bootstrap-rtl-3-3-4/dist/css/bootstrap-rtl.min.css" type="text/css">
+<?php endif; ?>
 <link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.min.css">
 
+
+
 <style>
 
 td {
@@ -236,7 +239,7 @@ td {
   width: 60%;
   margin: 0 auto;
 }
-.table 
+.table
 {
   border: #ddd solid 1px ;
 }
@@ -247,11 +250,8 @@ td {
 <script type="text/javascript" src="../../../library/dialog.js?v=<?php echo $v_js_includes; ?>"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/textformat.js?v=<?php echo $v_js_includes; ?>"></script>
 <script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.full.min.js"></script>
+<script src="<?php echo $GLOBALS['assets_static_relative'] ?>/bootstrap-3-3-4/dist/js/bootstrap.min.js"></script>
 
-<link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative'] ?>/bootstrap-3-3-4/dist/css/bootstrap.min.css">
-<?php if($_SESSION['language_direction'] == 'rtl'): ?>
-<link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative'];?>/bootstrap-rtl-3-3-4/dist/css/bootstrap-rtl.min.css" type="text/css">
-<?php endif; ?>
 <script language='JavaScript'>
 
 // This invokes the find-procedure-type popup.
diff --git a/library/options.inc.php b/library/options.inc.php
index a9438f364..df67f9d08 100644
--- a/library/options.inc.php
+++ b/library/options.inc.php
@@ -87,7 +87,7 @@ function generate_select_list($tag_name, $list_id, $currvalue, $title, $empty_na
             $tag_name_esc = $tag_name_esc . "[]";
         }
 
-  $s .= "<select class='form-control' name='$tag_name_esc'";
+  $s .= "<select name='$tag_name_esc'";
 
 	if ($multiple) {
 		$s .= " multiple='multiple'";
@@ -101,10 +101,14 @@ function generate_select_list($tag_name, $list_id, $currvalue, $title, $empty_na
 
 	$s .= " id='$tag_id_esc'";
 
-	if ($class) {
-                $class_esc = attr($class);
-		$s .= " class='$class_esc'";
-	}
+  if (!empty($class)) {
+    $class_esc = attr($class);
+    $s .= " class='form-control $class_esc'";
+  }
+  else {
+    $s .= " class='form-control'";
+  }
+
 	if ($onchange) {
 		$s .= " onchange='$onchange'";
 	}
-- 
2.11.4.GIT

