1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00

Added custom search placeholder to media-manager browser. Fix for glyph colors on light admin theme.

This commit is contained in:
Cameron 2014-01-11 08:39:22 -08:00
parent 7bebfc1901
commit 1370a8fbec
2 changed files with 8 additions and 5 deletions

View File

@ -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);

View File

@ -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>";