From 1370a8fbec7a5b170694d7479acf0de16ef2433d Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sat, 11 Jan 2014 08:39:22 -0800
Subject: [PATCH] Added custom search placeholder to media-manager browser. Fix
 for glyph colors on light admin theme.

---
 e107_admin/image.php          | 5 ++---
 e107_handlers/media_class.php | 8 ++++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/e107_admin/image.php b/e107_admin/image.php
index 437e156ad..1f34c5720 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -1331,9 +1331,8 @@ class media_admin_ui extends e_admin_ui
 				); 	
 			}
 			
-			$parms = array('width' => 200, 'height'=>113, 'type'=>'image', 'tagid'=> $this->getQuery('tagid'), 'action'=>'youtube');
-			
-				
+			$parms = array('width' => 200, 'height'=>113, 'type'=>'image', 'tagid'=> $this->getQuery('tagid'), 'action'=>'youtube','searchPlaceholder'=>'Search Youtube');
+		
 			$text = e107::getMedia()->browserCarousel($items, $parms);
 		
 		
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index b5b10dbfb..15198e9d7 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -1049,7 +1049,7 @@ class e_media
 				}
 				elseif($data['type'] == 'glyph')
 				{
-					$text .= "\n<span style='margin:7px;display:inline-block; color:white'>".$tp->toGlyph($data['thumbUrl'],false)."</span>";	
+					$text .= "\n<span style='margin:7px;display:inline-block;color: inherit'>".$tp->toGlyph($data['thumbUrl'],false)."</span>";	
 				}		
 				$text .= "\n</a>\n\n";
 				
@@ -1111,11 +1111,15 @@ class e_media
 			$carouselID = 'myCarousel-'.$parm['action'];
 		
 			//$text = "<form class='form-search' action='".e_SELF."?".e_QUERY."' id='core-plugin-list-form' method='get'>";
+					
+					
 						
 			if(!e_AJAX_REQUEST)
 			{
+				$searchPlaceholder = varset($parm['searchPlaceholder'], LAN_SEARCH);
+				
 				$text = '<div class="btn-group"><span class="input-append">';
-				$text .= "<input type='text' class='e-ajax-keyup e-tip' placeholder= 'Search...' title='Enter some text to filter results' name='search' value=''  data-target='media-browser-container-".$parm['action']."' data-src='".$data_src."' />";	
+				$text .= "<input type='text' class='e-ajax-keyup e-tip' placeholder= '".$searchPlaceholder."...' title='Enter some text to filter results' name='search' value=''  data-target='media-browser-container-".$parm['action']."' data-src='".$data_src."' />";	
 			//	$text .= '<button class="btn btn-primary" name="'.$submitName.'" type="submit">'.LAN_GO.'</button>';
 				$text .= '<a class="btn btn-primary" href="#'.$carouselID.'" data-slide="prev">&lsaquo;</a><a class="btn btn-primary" href="#'.$carouselID.'" data-slide="next">&rsaquo;</a>';
 				$text .= "</span>";