mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-16 12:36:26 +02:00
Code Issues Releases Wiki Activity

Admin-UI: Media-Manager layout enhancements.

Browse Source
This commit is contained in:
Cameron
2015-07-19 17:10:03 -07:00
parent 23a5be23eb
commit 650041b5aa
6 changed files with 100 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/footer.php
View File

@ -172,7 +172,11 @@ if (varset($e107_popup) != 1)
} }
else else
{ {
echo($rinfo ? "\n<div class='e-footer-info muted center' style='padding-bottom:20px; margin-top:10px'><small>{$rinfo}</small></div>\n" : "");
if(!deftrue('e_IFRAME'))
{
echo($rinfo ? "\n<div class='e-footer-info muted center' style='padding-bottom:20px; margin-top:10px'><small>{$rinfo}</small></div>\n" : "");
}
} }
} // End of regular-page footer (the above NOT done for popups) } // End of regular-page footer (the above NOT done for popups)

8
e107_admin/image.php
View File

@ -45,11 +45,15 @@ if(isset($_POST['submit_cancel_show']))
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
if($_GET['action'] == 'dialog')
{
e107::css('inline', "body { background-color: #373737 } ");
}
if(vartrue($_GET['action']) == 'nav' && e_AJAX_REQUEST) //XXX Doesn't work correctly inside the class for some reason if(vartrue($_GET['action']) == 'nav' && e_AJAX_REQUEST) //XXX Doesn't work correctly inside the class for some reason
{ {
define("e_IFRAME",true); define("e_IFRAME",true);
// require_once(e_ADMIN."auth.php"); // require_once(e_ADMIN."auth.php");
$bbcodeMode = ($_GET['bbcode']=='img') ? 'bbcode=img' : FALSE; $bbcodeMode = ($_GET['bbcode']=='img') ? 'bbcode=img' : FALSE;
@ -1087,7 +1091,7 @@ class media_admin_ui extends e_admin_ui
$options['bbcode'] = ($this->getQuery('bbcode')=='img') ? 'img' : FALSE; $options['bbcode'] = ($this->getQuery('bbcode')=='img') ? 'img' : FALSE;
$text = "<ul class='nav nav-tabs'>\n"; $text = "<ul id='admin-ui-media-manager' class='nav nav-tabs'>\n";
if($this->getQuery('bbcode') != 'video' && $this->getQuery('bbcode') != 'glyph') if($this->getQuery('bbcode') != 'video' && $this->getQuery('bbcode') != 'glyph')
{ {

9
e107_handlers/media_class.php
View File

@ -658,23 +658,24 @@ class e_media
$data_src = $this->mediaSelectNav($category,$tagid, $option); // ."&amp;from=0"; $data_src = $this->mediaSelectNav($category,$tagid, $option); // ."&amp;from=0";
// Inline style to override jquery-ui stuff. // Inline style to override jquery-ui stuff.
$text .= "<div class='btn-group'> $text .= "<div>
<div id='admin-ui-media-manager-search' class='input-append form-inline' 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."' /> <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. // $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.
$text .= "<button type='button' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$data_src."' >Go</button>"; // Manual filter, if onkeyup ajax fails for some reason. $text .= "<button type='button' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$data_src."' >Go</button>"; // Manual filter, if onkeyup ajax fails for some reason.
$text .= "<button type='button' title='previous page' class='btn btn-default e-nav e-media-nav e-tip' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='down' data-nav-inc='".$limit."' data-src='".$data_src."' >&laquo;</button>"; // see next page of images. $text .= "<button id='admin-ui-media-nav-down' type='button' title='previous page' class='btn btn-default e-nav e-media-nav e-tip' style='outline:0' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='down' data-nav-inc='".$limit."' data-src='".$data_src."'>&laquo;</button>"; // see next page of images.
$text .= "<button type='button' title='next page' class='btn btn-default e-nav e-media-nav e-tip' style='text-align:center' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='up' data-nav-inc='".$limit."' data-src='".$data_src."' >&raquo;</button>"; // see next page of images. $text .= "<button id='admin-ui-media-nav-up' type='button' title='next page' class='btn btn-default e-nav e-media-nav e-tip' style='outline:0;text-align:center' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='up' data-nav-inc='".$limit."' data-src='".$data_src."' >&raquo;</button>"; // see next page of images.
$text .= "</div></div>"; $text .= "</div></div>";
$text .= "<div id='admin-ui-media-select-count' class='media-select-count' style='text-align:right; display:block'> Displaying ".($frm +1)."-".($dipTotal)." of ".$total." images.</div>\n";
$text .= " $text .= "
<div id='media-select-container'>"; <div id='media-select-container'>";
} }
$text .= "<div class='media-select-count' style='text-align:right; display:block'> Displaying ".($frm +1)."-".($dipTotal)." of ".$total." images.</div>\n"; $text .= "<div id='admin-ui-media-select-count-hidden' class='media-select-count' data-media-select-current-limit='".$dipTotal."' style='text-align:right; display:none'> Displaying ".($frm +1)."-".($dipTotal)." of ".$total." images.</div>\n";
if($bbcode == null) // e107 Media Manager - new-image mode. if($bbcode == null) // e107 Media Manager - new-image mode.

4
e107_themes/bootstrap3/admin_dark.css
View File

@ -55,6 +55,10 @@ tr.highlight-even, .table-striped > tbody > tr.highlight-even { background-colo
#admin-ui-nav-menu a.link-active { color: #fff } #admin-ui-nav-menu a.link-active { color: #fff }
#admin-ui-media-manager.nav-tabs { background-color: #212121 }
.tab-content { background-color: #373737 }
iframe { border:3px solid red; }
/* /*
.bootstrap-select, bootstrap-select button .bootstrap-select, bootstrap-select button
{ {

2
e107_themes/bootstrap3/admin_style.css
View File

@ -7,6 +7,8 @@ body { padding-top: 75px; }
} }
button, button:active { outline: 0; }
.container { width: 100% } .container { width: 100% }
.well { padding:10px; } .well { padding:10px; }

74
e107_web/js/core/mediaManager.js
View File

@ -381,15 +381,30 @@ $(document).ready(function()
var loading = $(e).attr('data-loading'); // image to show loading. var loading = $(e).attr('data-loading'); // image to show loading.
var search = $('#media-search').val(); // image to show loading. var search = $('#media-search').val(); // image to show loading.
var nav = $(e).attr('data-nav-inc'); var nav = $(e).attr('data-nav-inc');
var dir = $(e).attr('data-nav-dir');
var curTotal = $('#admin-ui-media-select-count-hidden').attr('data-media-select-current-limit');
var total = $(e).attr('data-nav-total');
if(nav !== null && navid !==null) if(nav !== null && navid !==null)
{ {
eNav(e,navid); eNav(e,navid);
} }
var src = $(e).attr("data-src"); if(dir == 'down' && curTotal == 20)
{
// $('#admin-ui-media-nav-down').prop("disabled",false);
return false;
}
if(target != null) if(dir == 'up' && curTotal == total)
{
// $('#admin-ui-media-nav-up').prop("disabled",false);
return false;
}
if(target !== null)
{ {
id = '#' + target; id = '#' + target;
} }
@ -399,6 +414,7 @@ $(document).ready(function()
$(id).html("<img src='"+loading+"' alt='' />"); $(id).html("<img src='"+loading+"' alt='' />");
} }
var src = $(e).attr("data-src"); // heep here.
if(src === null) // old way - href='myscript.php#id-to-target if(src === null) // old way - href='myscript.php#id-to-target
{ {
var tmp = src.split('#'); var tmp = src.split('#');
@ -411,16 +427,62 @@ $(document).ready(function()
src = src + '&search='+search; src = src + '&search='+search;
} }
$(id).fadeOut('fast'); if(dir == 'down')
{
outDir = 'right';
inDir = 'left';
}
else
{
outDir = 'left';
inDir = 'right';
}
$('#e-modal-loading', window.parent.document).show();
$('iframe', window.parent.document).attr('scrolling', 'no'); // hide the scrollbar.
$.get(src, function( data ) {
$(id).hide('slide', { direction: outDir }, 1200, function(){
// alert('done');
$(id ).html( data );
newVal = $('#admin-ui-media-select-count-hidden').text();
$('#admin-ui-media-select-count').text(newVal).fadeIn();
$(id).show('slide', { direction: inDir },1200,function(){
$('#e-modal-loading', window.parent.document).hide();
});
});
});
$('iframe', window.parent.document).attr('scrolling', 'auto');
return false;
/*
//TODO Animate. //TODO Animate.
$(id).load(src,function() { $(id).load(src,function() {
// alert(src); // alert(src);
$(id).fadeIn('fast'); // $(id).fadeIn('fast');
// $(this).show('slow'); // .slideLeft(); $(id).show('slow');
// $(this).show('slow'); // ;
}); });
*/
} }