From 28db46022bc937003c9d22b5445312ab9095c58a Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 16 Oct 2014 17:31:38 -0700
Subject: [PATCH] Issue #684 Disabled drop-down restyling due to validation
 alert issues.

---
 e107_handlers/admin_ui.php       |  6 ++++--
 e107_handlers/form_handler.php   | 25 +++++++++++++++++--------
 e107_web/js/core/admin.jquery.js | 18 +++++++++---------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 2ff2c34d4..578d4b853 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -5559,8 +5559,9 @@ class e_admin_form_ui extends e_form
 		// TODO - core ui-batch-option class!!! REMOVE INLINE STYLE!
 		// XXX Quick Fix for styling - correct. 
 		$text = "
-			<div class='navbar navbar-inner left' style='padding-left:30px; padding-top:6px; margin-top:-20px;border-top:0px'>
-         		<img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action' />
+			<div class='navbar navbar-inner left' style='padding-left:15px; padding-top:8px; margin-top:-20px;border-top:0px'>
+				<div class='input-append'>
+         		<img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action' style='padding-top:5px' />
 				".$this->select_open('etrigger_batch', array('class' => 'tbox select batch e-autosubmit reset', 'id' => false))."
 					".$this->option(LAN_BATCH_LABEL_SELECTED, '', false)."
 					".($allow_copy ? $this->option(LAN_COPY, 'copy', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')."					
@@ -5571,6 +5572,7 @@ class e_admin_form_ui extends e_form
 					".$this->renderBatchFilter('batch')."
 				".$this->select_close()."
 				".$this->admin_button('e__execute_batch', 'e__execute_batch', 'batch e-hide-if-js', LAN_GO, array('id' => false))."
+				</div>
 			</div>
 		";
 
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 8ab5e7700..a131360c0 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -409,12 +409,14 @@ class e_form
 		}
 			
 		$mlength = vartrue($maxlength) ? "maxlength=".$maxlength : "";
+		
+		$type = varset($options['type']) == 'email' ? 'email' : 'text'; // used by $this->email(); 
 				
 		$options = $this->format_options('text', $name, $options);
 		
 	
 		//never allow id in format name-value for text fields
-		return "<input type='text' name='{$name}' value='{$value}' {$mlength} ".$this->get_attributes($options, $name)." />";
+		return "<input type='".$type."' name='{$name}' value='{$value}' {$mlength} ".$this->get_attributes($options, $name)." />";
 	}
 
 
@@ -450,11 +452,8 @@ class e_form
 	
 	function email($name, $value, $maxlength = 200, $options = array())
 	{
-		$options = $this->format_options('text', $name, $options);
-				
-		//never allow id in format name-value for text fields
-		return "<input type='email' name='{$name}' value='{$value}' maxlength='{$maxlength}' ".$this->get_attributes($options, $name)." />
-		";
+		$options['type'] = 'email';
+		return $this->text($name,$value,$maxlength,$options);
 	}
 
 
@@ -1573,7 +1572,11 @@ class e_form
 
 		if(isset($options['default']))
 		{
-			$text .= $this->option($options['default'], varset($options['defaultValue']));
+			if($options['default'] === 'blank')
+			{
+				$options['default'] = '&nbsp;';			
+			}
+			$text .= $this->option($options['default'], varset($options['defaultValue'],''));
 		}
 		elseif($defaultBlank)
 		{
@@ -3419,8 +3422,14 @@ class e_form
 				$ret =  $this->text($key, e107::getIPHandler()->ipDecode($value), 32, $parms);
 			break;
 
-			case 'url':
 			case 'email':
+				$maxlength = vartrue($parms['maxlength'], 255);
+				unset($parms['maxlength']);
+				$ret =  vartrue($parms['pre']).$this->email($key, $value, $maxlength, $parms).vartrue($parms['post']); // vartrue($parms['__options']) is limited. See 'required'=>true
+			break;
+
+			case 'url':
+		//	case 'email':
 			case 'text':
 			case 'password': // encrypts to md5 when saved. 
 				$maxlength = vartrue($parms['maxlength'], 255);
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index 19e034175..92a3415a9 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -31,23 +31,23 @@ $(document).ready(function()
 				return text;	
 				}
 			});
-	 	});
+		});
 	
 		/* Switch to Tab containing invalid form field. */
 		$('input[type=submit],button[type=submit]').on('click', function() {
 			
 			var id 		= $(this).closest('form').attr('id');
 			var found 	= false;
-		          
-            $('#'+id).find(':invalid').each(function(index, node) {
+		       
+			 $('#'+id).find('input:invalid,select:invalid,textarea:invalid').each(function(index, node) {
 			
 				var tab = $('#'+node.id).closest('.tab-pane').attr('id');
-		
-				if(tab && (found == false))
+			
+				if(tab && (found === false))
 				{
 					$('a[href="#'+tab+'"]').tab('show');
 					found = true;
-					//alert(node.id+' : '+tab);
+				//	alert(node.id+' : '+tab + ' '.index);
 				}
 			//   var label = $('label[for=' + node.id + ']');
             });
@@ -55,8 +55,7 @@ $(document).ready(function()
             return true;
 		});
 	
-	 	
-		 	
+	
 
 		// run tips on title attribute. 
 		$(".e-tip").each(function() {
@@ -319,7 +318,8 @@ $(document).ready(function()
 			
 			if(multi === undefined)
 			{
-				$(this).selectpicker();	
+			//	 $(this).selectpicker();	// causes HTML5 validation alert to be hidden. 
+				return;
 			}
 			else
 			{