mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Fixed visibility of drag-n-drop message. Media-manager "Files" tab fixed.

Browse Source
This commit is contained in:
Cameron
2021-02-07 13:26:36 -08:00
parent 7698773f0e
commit 62815a965a
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
e107_admin/image.php
View File

@@ -1229,7 +1229,7 @@ class media_admin_ui extends e_admin_ui
$cat = $this->getQuery('for'); $cat = $this->getQuery('for');
$file = (preg_match('/_file(_[\d]{1,2})?$/',$cat)) ? TRUE : FALSE; $file = (preg_match('/_file(_[\d]{1,2})?$/',$cat)) ? true : false;
$mes = e107::getMessage(); $mes = e107::getMessage();
$mes->addDebug('For:' .$cat); $mes->addDebug('For:' .$cat);
$mes->addDebug('Bbcode: ' .$this->getQuery('bbcode')); $mes->addDebug('Bbcode: ' .$this->getQuery('bbcode'));
@@ -1246,10 +1246,12 @@ class media_admin_ui extends e_admin_ui
if($file) if($file)
{ {
// echo $this->fileTab($cat); // FIXME use this instead.
$this->setFileListMode($cat); $this->setFileListMode($cat);
echo $this->mediaSelectUpload('file'); echo $this->mediaSelectUpload('file');
$tagid = e107::getParser()->filter($this->getQuery('tagid')); $tagid = e107::getParser()->filter($this->getQuery('tagid'));
echo '<div class="media-select-file-footer"><a class="btn btn-danger e-media-select-file-none e-dialog-close" data-target="'.$tagid.'" data-target-label="'.LAN_CHOOSE_FILE.'" href="#" ><span><i class="fa fa-ban"></i> '.IMALAN_167.'</span></a></div>'; echo '<div class="media-select-file-footer"><a class="btn btn-danger e-media-select-file-none e-dialog-close" data-target="'.$tagid.'" data-target-label="'.LAN_CHOOSE_FILE.'" href="#" ><span><i class="fa fa-ban"></i> '.IMALAN_167.'</span></a></div>';
@@ -1472,24 +1474,10 @@ class media_admin_ui extends e_admin_ui
$text = "<ul id='admin-ui-media-manager' class='nav nav-tabs'>\n"; $text = "<ul id='admin-ui-media-manager' class='nav nav-tabs'>\n";
$bbcodeQuery = $this->getQuery('bbcode'); $bbcodeQuery = $this->getQuery('bbcode');
if($bbcodeQuery !== 'video' && $bbcodeQuery !== 'glyph') // files.
{ $text .= "<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#core-media-select'>".$tp->toGlyph('fa-file').ADLAN_CL_5."</a></li>\n";
$text .= "<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#core-media-select'>".ADLAN_105."</a></li>\n";
}
else
{
if($bbcodeQuery === 'glyph')
{
$glyphActive = 'active';
}
else
{
$youtubeActive = 'active';
}
}
if(varset($options['bbcode']) === 'img') if(varset($options['bbcode']) === 'img')

2
e107_themes/bootstrap3/admin_style.css
View File

@@ -336,7 +336,7 @@ td .mediaselector-multi .mediaselector-container { margin-bottom: 20px }
display: block; display: block;
margin-top: 35%; margin-top: 35%;
text-align: center; text-align: center;
opacity: 0.2; opacity: 0.5;
} }
.dz-drag-hover { outline:2px dotted silver } .dz-drag-hover { outline:2px dotted silver }