mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-10-18 00:06:26 +02:00
Code Issues Releases Wiki Activity

More Tinymce and form tweaks

Browse Source
This commit is contained in:
Cameron
2013-03-09 00:22:26 -08:00
parent 177d705509
commit 2682d9b872
5 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,8 +20,8 @@ e107::css('inline',"
}
span.badge { cursor: pointer }
span.label { cursor: pointer }
ul.glyphicons { list-style:none; margin-left:0px}
ul.glyphicons li { float:left; border-bottom:1px solid silver; cursor:pointer; width:160px; padding:5px; }
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; }
");
@@ -58,12 +58,15 @@ $(document).ready(function()
});
$('ul.glyphicons li').click(function () {
$('ul.glyphicons li, #glyph-save').click(function () {
//var color = $('input:select[name=glyph-color]:selected').val();
// alert(color);
var cls = $(this).find('i').attr('class');
var color = $('#glyph-color').val();
var custom = $('#glyph-custom').val();
var cls = (custom != '') ? custom : $(this).find('i').attr('class');
var html = '<i class=\"' + cls + '\"></i>&nbsp;';
// alert(html);
tinyMCEPopup.editor.execCommand('mceInsertContent', false, html);
tinyMCEPopup.close();
});
@@ -354,10 +357,10 @@ class e_bootstrap
);
$frm = e107::getForm();
$sel = array(''=>'Gray','icon-white'=>'White');
$sel = array(''=>'Dark Gray','icon-white'=>'White');
$text .= "<div style='padding:10px'>";
$text .= "<div>Color: ".$frm->selectbox('glyph-color',$sel)."</div>";
$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'>";
foreach($icons as $ic)