mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-10-12 05:24:38 +02:00
Code Issues Releases Wiki Activity

Modal styling and size fixes.

Browse Source
This commit is contained in:
Cameron
2013-03-17 05:39:08 -07:00
parent e232331c4f
commit bba822d5ce
9 changed files with 69 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e107_plugins/tinymce/plugins/e107bbcode/dialog.php
View File

@@ -15,13 +15,13 @@ e107::css('inline',"
.selectEmote { display:inline-block; cursor:pointer;margin:3px }
body { text-align:center }
.area { border-left: 1px solid rgb(221, 221, 221); border-bottom: 1px solid rgb(221, 221, 221);
background-color: rgb(246, 246, 246); margin-top:-1px; padding:20px;
.area {
margin-top:-1px; padding:20px;
}
span.badge { cursor: pointer }
span.label { cursor: pointer }
ul.glyphicons { list-style:none; margin-left:0px; font-size:120%}
ul.glyphicons li { float:left; border-bottom:1px solid silver; cursor:pointer; width:190px; padding:5px; }
ul.glyphicons li { float:left; cursor:pointer; width:190px; padding:5px; }
a, li { outline: 0; }
");
@@ -169,7 +169,7 @@ class e_bootstrap
</tr>
<tr>
<td>Button Url</td>
<td><p>".$frm->text('buttonUrl','',255)."</p></td>
<td><p>".$frm->text('buttonUrl','',255,'size=xxlarge')."</p></td>
</tr>
@@ -362,10 +362,13 @@ class e_bootstrap
$text .= "<div class='area'>";
$text .= "<div class='inline-form'>Color: ".$frm->selectbox('glyph-color',$sel)." Custom: ".$frm->text('glyph-custom','').$frm->button('glyph-save','Go')."</div>";
$text .= "<ul class='glyphicons clearfix'>";
$text .= "<ul class='glyphicons well clearfix'>";
$inverse = (e107::getPref('admincss') == "admin_dark.css") ? " icon-white" : "";
foreach($icons as $ic)
{
$text .= '<li><i class="'.$ic.'"></i> '.$ic.'</li>';
$text .= '<li><i class="'.$ic.$inverse.'"></i> '.$ic.'</li>';
$text .= "\n";
}

3
e107_plugins/tinymce/plugins/e107bbcode/parser.php
View File

@@ -67,7 +67,8 @@ if($_POST['mode'] == 'tobbcode')
$content = str_replace($srch, $repl, $content);
// resize the thumbnail to match wysiwyg width/height.
$psrch = '/<img src="{e_BASE}thumb.php\?src=([\S]*)w=([\d]*)&amp;h=([\d]*)"(.*)width="([\d]*)" height="([\d]*)"/i';
$psrch = '/<img[^>]*src="{e_BASE}thumb.php\?src=([\S]*)w=([\d]*)&amp;h=([\d]*)"(.*)width="([\d]*)" height="([\d]*)"/i';
$prepl = '<img src="{e_BASE}thumb.php?src=$1w=$5&amp;h=$6"$4width="$5" height="$6" ';
$content = preg_replace($psrch, $prepl, $content);