mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

Issue #1138 - Fix for media browser.

Browse Source
This commit is contained in:
Cameron
2015-07-16 13:41:15 -07:00
parent c217137076
commit 9cdf27900b
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/image.php
View File

@@ -1327,7 +1327,7 @@ class media_admin_ui extends e_admin_ui
'type' =>'glyph',
'tagid' => $this->getQuery('tagid'),
'action' =>'glyph', // Used by AJAX to identify correct function.
'perPage' => 84,
'perPage' => 80,
'gridClass' => 'media-carousel-item-glyph pull-left',
'bbcode' =>'glyph',
'close' => 'true'

8
e107_handlers/media_class.php
View File

@@ -659,7 +659,7 @@ class e_media
// Inline style to override jquery-ui stuff.
$text .= "<div class='btn-group'>
<div class='input-append' style='margin-top:10px;font-size:12px'>
<div id='admin-ui-media-manager-search' class='input-append form-inline' style='margin-top:10px;font-size:12px'>
<input type='text' id='media-search' placeholder='Search...' name='search' value='' class='e-tip' data-target='media-select-container' data-src='".$data_src."' />
";
// $text .= "<input type='button' value='Go' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' /> "; // Manual filter, if onkeyup ajax fails for some reason.
@@ -1088,7 +1088,7 @@ class e_media
'previewUrl' => $defaultThumb ,
'thumbUrl' => $defaultThumb,
'title' => '',
'gridClass' => 'span2',
'gridClass' => 'span2 col-md-2',
'bbcode' => ''
);
@@ -1143,7 +1143,7 @@ class e_media
return;
}
$indicators = '<ol class="carousel-indicators span2" style="top:-40px">
$indicators = '<ol class="carousel-indicators col-md-2 span2" style="top:-40px">
<li data-target="#'.$uniqueID.'" data-slide-to="0" class="active"></li>';
foreach($slides as $key=>$v)
@@ -1243,7 +1243,7 @@ class e_media
{
$searchPlaceholder = varset($parm['searchPlaceholder'], LAN_SEARCH);
$text = '<div class="btn-group"><span class="input-append">';
$text = '<div class="btn-group"><span class="input-append form-inline">';
$text .= "<input type='text' class='e-ajax-keyup input-xxlarge ' placeholder= '".$searchPlaceholder."...' title=\"".$searchToolttip."\" name='search' value='' data-target='media-browser-container-".$parm['action']."' data-src='".$data_src."' />";
// $text .= "<span class='field-help'>bablalal</span>";
// $text .= '<button class="btn btn-primary" name="'.$submitName.'" type="submit">'.LAN_GO.'</button>';

7
e107_themes/bootstrap3/admin_style.css
View File

@@ -51,6 +51,8 @@ body { padding-top: 75px; }
a.core-mainpanel-link-icon { height:80px; width: 100%; padding-top:20px; }
a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
.carousel-indicators { top:10px; max-width: 200px; height: 40px; margin-left: 100px; }
/* TODO - use col-xx-x markup where core-mainpanel-block occurs. ? */
@media (max-width: 1700px){
@@ -125,6 +127,8 @@ table label.checkbox { margin-left: 20px }
#admin-ui-list-filter .row-fluid { margin-left: -15px; margin-right: -15px }
#admin-ui-list-no-records-found { margin-bottom: 0 }
#admin-ui-media-manager-search { margin-bottom: 20px }
.panel-default:hover { transition: color .50s ease-in-out; -moz-transition: color .50s ease-in-out; -webkit-transition: color .50s ease-in-out; color: #fff }
#admin-ui-edit { }
@@ -861,8 +865,9 @@ footer { padding-top:150px; padding-bottom:20px; color: rgb(153, 153, 153); }
}
.media-select-count {
margin-top:-40px;
margin-top:-60px;
padding:10px;
padding-bottom:20px;
}
a.e-media-select