1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00

Media-Manager speed optimization

This commit is contained in:
Cameron
2013-02-23 23:08:30 -08:00
parent a91438f519
commit 231f062e9a
10 changed files with 70 additions and 43 deletions

View File

@@ -27,16 +27,19 @@ e107::coreLan('footer', true);
// DEPRECATED - plugins should load their lans manually // DEPRECATED - plugins should load their lans manually
// plugin autoload, will be removed in the future! // plugin autoload, will be removed in the future!
// here mostly because of BC reasons // here mostly because of BC reasons
$_plugins = e107::getPref('plug_installed'); if(!deftrue('e_MINIMAL'))
if(is_array($_plugins) && count($_plugins) > 0)
{ {
$_plugins = e107::getPref('plug_installed');
if(is_array($_plugins) && count($_plugins) > 0)
{
$_plugins = array_keys($_plugins); $_plugins = array_keys($_plugins);
foreach ($_plugins as $_p) foreach ($_plugins as $_p)
{ {
e107::loadLanFiles($_p, 'admin'); e107::loadLanFiles($_p, 'admin');
} }
}
} }
// Get Icon constants, theme override (theme/templates/admin_icons_template.php) is allowed // Get Icon constants, theme override (theme/templates/admin_icons_template.php) is allowed
include_once(e107::coreTemplatePath('admin_icons')); include_once(e107::coreTemplatePath('admin_icons'));

View File

@@ -442,6 +442,10 @@ if ($e107_popup != 1)
//removed check strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE //removed check strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE
parse_admin($ADMIN_HEADER); parse_admin($ADMIN_HEADER);
} }
else
{
e107::css("inline","body { padding:10px } "); // default padding for iFrame-only.
}
e107::getDb()->db_Mark_Time('(End: Parse Admin Header)'); e107::getDb()->db_Mark_Time('(End: Parse Admin Header)');
} }

View File

@@ -13,6 +13,11 @@
* *
*/ */
if($_GET['action'] == 'dialog')
{
define('e_MINIMAL',true);
}
if (!defined('e107_INIT')) if (!defined('e107_INIT'))
{ {
require_once("../class2.php"); require_once("../class2.php");

View File

@@ -2396,7 +2396,7 @@ class e107
unset($_REQUEST['ajax_used']); // removed because it's auto-appended from JS (AJAX), could break something... unset($_REQUEST['ajax_used']); // removed because it's auto-appended from JS (AJAX), could break something...
//$GLOBALS['_E107'] - minimal mode - here because of the e_AJAX_REQUEST //$GLOBALS['_E107'] - minimal mode - here because of the e_AJAX_REQUEST
if(isset($GLOBALS['_E107']['minimal']) || e_AJAX_REQUEST) if(isset($GLOBALS['_E107']['minimal']) || e_AJAX_REQUEST || deftrue('e_MINIMAL'))
{ {
$_e107vars = array('forceuserupdate', 'online', 'theme', 'menus', 'prunetmp'); $_e107vars = array('forceuserupdate', 'online', 'theme', 'menus', 'prunetmp');

View File

@@ -543,13 +543,15 @@ class e_media
$text .= "&nbsp;<button type='button' title='previous page' class='btn 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='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >&laquo;</button>"; // see next page of images. $text .= "&nbsp;<button type='button' title='previous page' class='btn 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='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >&laquo;</button>"; // see next page of images.
$text .= "<button type='button' title='next page' class='btn 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='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >&raquo;</button>"; // see next page of images. $text .= "<button type='button' title='next page' class='btn 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='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >&raquo;</button>"; // see next page of images.
$text .= "</div> $text .= "</div>";
$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 class='media-select-count' style='text-align:right; display:block'> 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.
{ {
$onclick_clear = "parent.document.getElementById('{$tagid}').value = ''; $onclick_clear = "parent.document.getElementById('{$tagid}').value = '';

View File

@@ -690,6 +690,28 @@ i.searchquery {
display: none !important; display: none !important;
content: none; content: none;
} }
/* Color Box */
.mediaBody h4 {
padding:10px 10px;
}
.media-select-count {
margin-top:-40px;
padding:10px;
}
#cboxOverlay{ background-color:#000000;}
#colorbox{
-moz-border-radius:9px;
-webkit-border-radius:9px;
border-radius:9px;
-moz-box-shadow:5px 5px 20px #000000;
-webkit-box-shadow:5px 5px 20px #000000;
box-shadow:5px 5px 20px #000000;
background-color:white;
}
/* /*

View File

@@ -6,13 +6,13 @@
#cboxOverlay{position:fixed; width:100%; height:100%;} #cboxOverlay{position:fixed; width:100%; height:100%;}
#cboxMiddleLeft, #cboxBottomLeft{clear:left;} #cboxMiddleLeft, #cboxBottomLeft{clear:left;}
#cboxContent{position:relative;} #cboxContent{position:relative;}
#cboxLoadedContent{overflow:auto;} #cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
#cboxTitle{margin:0;} #cboxTitle{margin:0;}
#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;} #cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
.cboxPhoto{float:left; margin:auto; border:0; display:block;} .cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
.cboxIframe{width:100%; height:100%; display:block; border:0;} .cboxIframe{width:100%; height:100%; display:block; border:0;}
#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;} #colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
/* /*
User Style: User Style:
@@ -44,15 +44,22 @@
.cboxIframe{background:#fff;} .cboxIframe{background:#fff;}
#cboxError{padding:50px; border:1px solid #ccc;} #cboxError{padding:50px; border:1px solid #ccc;}
#cboxLoadedContent{margin-bottom:28px;} #cboxLoadedContent{margin-bottom:28px;}
#cboxTitle{position:absolute;bottom:4px; left:0; text-align:center; width:100%; color:#949494;} #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
#cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;} #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
#cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}
#cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
#cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
#cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;} #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
#cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;} #cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
#cboxPrevious:hover{background-position:-75px -25px;} #cboxPrevious:hover{background-position:-75px -25px;}
#cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;} #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
#cboxNext:hover{background-position:-50px -25px;} #cboxNext:hover{background-position:-50px -25px;}
#cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}
#cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
#cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;} #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
#cboxClose:hover{background-position:-25px -25px;} #cboxClose:hover{background-position:-25px -25px;}
@@ -95,21 +102,3 @@
.cboxIE6 #cboxMiddleRight { .cboxIE6 #cboxMiddleRight {
_behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')"); _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')");
} }
.mediaBody{
font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
scrollbar-3dlight-color:#F0F0EE;
scrollbar-arrow-color:#676662;
scrollbar-base-color:#F0F0EE;
scrollbar-darkshadow-color:#DDDDDD;
scrollbar-face-color:#E0E0DD;
scrollbar-highlight-color:#F0F0EE;
scrollbar-shadow-color:#F0F0EE;
scrollbar-track-color:#F5F5F5;
background:#F0F0EE;
padding:0;
margin:8px 8px 0 8px;
}
.mediaBody h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
.mediaBody td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

File diff suppressed because one or more lines are too long

View File

@@ -390,12 +390,12 @@ $(document).ready(function()
iframe:true, iframe:true,
width:"60%", width:"60%",
height:"70%", height:"70%",
preloading:false,
speed:10, speed:10,
opacity: 0.7, opacity: 0.7,
fastIframe:false, fastIframe: false,
onComplete: function() { onComplete: function() {
$("iframe").contents().find("body").addClass("mediaBody"); // $("iframe").contents().find("body").addClass("mediaBody");
} }

View File

@@ -284,7 +284,7 @@ $(document).ready(function()
$(id).load(src,function() { $(id).load(src,function() {
// alert(src); // alert(src);
// $(this).hide(); // $(this).hide();
// $(this).SlideUp(); // $(this).SlideLeft();
}); });