mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-31 10:01:56 +02:00
Code Issues Releases Wiki Activity

Issue #434 - TinyMce Video and Glyph insert issue.

Browse Source
This commit is contained in:
Cameron
2014-05-31 23:15:26 -07:00
parent 0d063b82a8
commit 04afb156ae
5 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e107_admin/image.php
View File

@@ -1031,13 +1031,22 @@ class media_admin_ui extends e_admin_ui
$text = "<ul class='nav nav-tabs'>\n";
if($this->getQuery('bbcode') != 'video')
if($this->getQuery('bbcode') != 'video' && $this->getQuery('bbcode') != 'glyph')
{
$text .= "<li class='active'><a data-toggle='tab' href='#core-media-select'>Choose from Library</a></li>\n";
}
else
{
$videoActive = 'active';
if($this->getQuery('bbcode') == 'glyph')
{
$glyphActive = 'active';
}
else
{
$videoActive = 'active';
}
}
if($this->getQuery('bbcode') != 'video' && $this->getQuery('bbcode') !='glyph')
@@ -1052,7 +1061,7 @@ class media_admin_ui extends e_admin_ui
if($this->getQuery('glyphs') == 1 || $this->getQuery('bbcode') == 'glyph')
{
$text .= "<li><a data-toggle='tab' href='#core-media-glyphs'>Glyphs</a></li>\n";
$text .= "<li class='{$glyphActive}'><a data-toggle='tab' href='#core-media-glyphs'>Glyphs</a></li>\n";
}
if($this->getQuery('video') == 1 || $this->getQuery('bbcode') == 'video')
@@ -1071,9 +1080,9 @@ class media_admin_ui extends e_admin_ui
$text .= "
</ul>
<div class='tab-content'>";
<div class='tab-content media-manager'>";
if($this->getQuery('bbcode') != 'video')
if($this->getQuery('bbcode') != 'video' && $this->getQuery('bbcode') != 'glyph')
{
$text .= "<div class='tab-pane active' id='core-media-select'>
<div class='table' style='display:block'>";
@@ -1164,7 +1173,7 @@ class media_admin_ui extends e_admin_ui
if($this->getQuery('glyphs') == 1 || $this->getQuery('bbcode') == 'glyph')
{
//TODO
$text .= "<div class='tab-pane clearfix' id='core-media-glyphs' style='font-size:24px'>";
$text .= "<div class='tab-pane clearfix {$glyphActive}' id='core-media-glyphs' style='font-size:24px'>";
$text .= $this->glyphTab();
@@ -1260,7 +1269,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' => 90,
'perPage' => 84,
'gridClass' => 'media-carousel-item-glyph pull-left',
'bbcode' =>'glyph',
'close' => 'true'