From 20f85994b530587347d2f521064353c61d836047 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 16 Mar 2013 02:05:04 -0700 Subject: [PATCH] bbcode button styling --- e107_admin/users.php | 4 ++-- .../shortcodes/batch/bbcode_shortcodes.php | 22 +++++++++--------- e107_handlers/form_handler.php | 2 +- e107_images/bbcode/fontsize.png | Bin 3719 -> 3714 bytes e107_images/bbcode/table.png | Bin 0 -> 1217 bytes e107_plugins/tinymce/e_meta.php | 6 ++++- e107_themes/bootstrap/admin_style.css | 2 ++ e107_themes/templates/bbcode_template.php | 2 ++ e107_web/js/core/all.jquery.css | 6 ++--- 9 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 e107_images/bbcode/table.png diff --git a/e107_admin/users.php b/e107_admin/users.php index a24d37c80..ccb4f5c90 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -1220,10 +1220,10 @@ class users_admin_ui extends e_admin_ui ".USRLAN_128." - +
".$frm->text('loginname', varset($user_data['user_loginname']), varset($pref['loginname_maxlength'], 30))."   ".$frm->checkbox_label(USRLAN_170, 'generateloginname', 1, varset($pref['predefinedLoginName'], false))." - +
diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php index b74e17dc3..7de743cc7 100644 --- a/e107_core/shortcodes/batch/bbcode_shortcodes.php +++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php @@ -50,7 +50,7 @@ class bbcode_shortcodes extends e_shortcode $data = "[table][tr][td]Cell 1[/td][td]Cell 2[/td][/tr][/table]"; $event = $this->getEvent('addtext',$data,'Insert a table',1); $text = ""; - $text .= ""; + $text .= ""; return $text; } @@ -74,7 +74,7 @@ class bbcode_shortcodes extends e_shortcode // $data = "[list]\n[*]Item 1\n[*]Item 2\n[/list]"; // works with jquery, but not onclick. $event = $this->getEvent('addtext',$data,LANHELP_36); $text = ""; - $text .= ""; + $text .= ""; return $text; } @@ -83,7 +83,7 @@ class bbcode_shortcodes extends e_shortcode $data = "[youtube]*[/youtube]"; $event = $this->getEvent('addinput',$data,LANHELP_48); $text = ""; - $text .=""; + $text .=""; return $text; } @@ -92,7 +92,7 @@ class bbcode_shortcodes extends e_shortcode $data = "[link=*]*[/link]"; $event = $this->getEvent('addinput',$data,LANHELP_35); $text = "\n"; - $text .=""; + $text .=""; return $text; } @@ -108,7 +108,7 @@ class bbcode_shortcodes extends e_shortcode list($tag,$tmp) = explode("--",$this->var['tagid']); // works with $frm->bbarea to detect textarea from first half of tag. } $text = ""; - $text .= ""; + $text .= ""; $text .= "\n"; return $text; } @@ -123,8 +123,8 @@ class bbcode_shortcodes extends e_shortcode { list($tag,$tmp) = explode("--",$this->var['tagid']); // works with $frm->bbarea to detect textarea from first half of tag. } - $text = ""; - $text .= ""; + $text = ""; + $text .= ""; $text .= "\n"; return $text; } @@ -136,8 +136,8 @@ class bbcode_shortcodes extends e_shortcode $formid = $id."_"; $event = $this->getEvent('expandit',$formid, LANHELP_22); - $text = "var['tagid']}')\" data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'> - "; + $text = "var['tagid']}')\" data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'> + "; $text .=" @@ -378,7 +378,7 @@ class bbcode_shortcodes extends e_shortcode if($_onclick_func == 'e-dialog') { // $tagid = "news-body"; - $pre = "\n"; + $pre = "\n"; $post = "\n"; } @@ -388,7 +388,7 @@ class bbcode_shortcodes extends e_shortcode if($bbcode[$parm]) // default - insert text. { $text = $pre; - $text .= ""; + $text .= ""; $text .= $post; } diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index ac96a6dad..8db7400b2 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -2757,7 +2757,7 @@ class e_form case 'number': $maxlength = vartrue($parms['maxlength'], 255); unset($parms['maxlength']); - if(!vartrue($parms['size'])) $parms['size'] = 15; + if(!vartrue($parms['size'])) $parms['size'] = 'mini'; if(!vartrue($parms['class'])) $parms['class'] = 'tbox number e-spinner'; if(!$value) $value = '0'; $ret = vartrue($parms['pre']).$this->text($key, $value, $maxlength, $parms).vartrue($parms['post']); diff --git a/e107_images/bbcode/fontsize.png b/e107_images/bbcode/fontsize.png index eac1e23a0717d1cffdcd2cc9762ff4a0c5a580dc..34d8c719d0c6f944565217f49140ea975ec05b3b 100644 GIT binary patch delta 213 zcmV;`04o279fBPpiBL{Q4GJ0x0000DNk~Le0000L0000L2m=5B0G`QJq_H8m4S$qL zL_t(|+N98-4nYAFhw<-w0-NLo1W%v{f+h>9qTF!mU~&V3 zOE5U2`@B$DiGTL1t6 diff --git a/e107_images/bbcode/table.png b/e107_images/bbcode/table.png new file mode 100644 index 0000000000000000000000000000000000000000..2174de3a00285b4334bf5307094c58ea0b49d9b6 GIT binary patch literal 1217 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQak|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!WZB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L$o& z6x?nx!>Lyv=oo!av?4__ObD2EKuma|1#;lYJ~a=R){B6NT4;;@7hr}+2=EDU<>%)w zDk}Q)XwrlQ8?K((Z|s%awEWYfM~^nm4OxEd&m=3O8^<#ytvdAS)6b@^rjwT+-Rdhk zv|-k!LzmX=ytKVI>C~-HL2+4=R(<;S@86+KRrg;0UA*DY(NmWeEm|~d*AJj2e;XZB zfs{f?kYDhB{D2`QM*1yK?R-xc$B>F!Jr}%%niT|C0+b|N3^nANd0zd^pDEbsrp;ab z^ToQAO*-{Xc?z4S#ZJ7rZnJpG;+HvdKlD~6J+lxyyZW8Eh|`(P0;{xUb!~Wh+h=de zg!R(z_kOB*eNouYRw~@tEntSh&n}nLGM}@@9V(<3oY4?`{Odv+^UAKkWFCeSvKyC1 z&tZG+mvL=nag$te?lnyhPkx>H;_s8U*RV)1EW4-@u{nD`BhaY~p00i_>zopr0I*NN A-2eap literal 0 HcmV?d00001 diff --git a/e107_plugins/tinymce/e_meta.php b/e107_plugins/tinymce/e_meta.php index 20cca8af9..b37711b4d 100644 --- a/e107_plugins/tinymce/e_meta.php +++ b/e107_plugins/tinymce/e_meta.php @@ -14,6 +14,10 @@ if (!defined('e107_INIT')) { exit; } +e107::css('inline',' +a.e-wysiwyg-toggle { margin-top:5px } +'); + if(e_WYSIWYG || strpos(e_SELF,"tinymce/admin_config.php") ) { if(e_PAGE != 'image.php') @@ -29,7 +33,7 @@ if(e_WYSIWYG || strpos(e_SELF,"tinymce/admin_config.php") ) if(ADMIN) { $insert = "$('#'+id).after('
"; - $insert .= "Switch to bbcode<\/a>"; + $insert .= "Switch to bbcode<\/a>"; if(e_PAGE == 'mailout.php') { diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 2187bef44..7f94f34e2 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -94,6 +94,8 @@ a.brand:hover img { .sidebar-nav { font-size:15px; } } + +img.image-selector { margin-bottom:0px; } .nav-collapse { margin-top:8px; } .dropdown-menu { box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.3); } diff --git a/e107_themes/templates/bbcode_template.php b/e107_themes/templates/bbcode_template.php index ec6f66eb6..c36a3d4e0 100644 --- a/e107_themes/templates/bbcode_template.php +++ b/e107_themes/templates/bbcode_template.php @@ -55,10 +55,12 @@ $BBCODE_TEMPLATE_SUBMITNEWS = " $BBCODE_TEMPLATE_ADMIN = " {BB_HELP=admin}
+
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}{BB=justify}{BB=center}{BB=left} {BB=right}{BB=bq}{BB=list}{BB=table}{BB=fontcol}{BB=fontsize}{BB=emotes} {BB_PREIMAGEDIR} {BB=preimage}{BB=prefile}{BB=flash}{BB=youtube} +
"; diff --git a/e107_web/js/core/all.jquery.css b/e107_web/js/core/all.jquery.css index 9478053e4..79b0ae591 100644 --- a/e107_web/js/core/all.jquery.css +++ b/e107_web/js/core/all.jquery.css @@ -10,7 +10,7 @@ img.e-rate { } .e-rate-status { font-weight:bold;vertical-align:middle; padding-right:4px; width:140px; display:inline-block; text-align:right } .e-rate-status-download { text-align:left; } .e-rate-votes { vertical-align:middle; display:inline-block; width:100px } -select.e-bb { margin-top:4px; display:inline-block; vertical-align:top } -.bbcode_buttons { border:1px solid transparent; background-color: #FFFFFF } -.bbcode_buttons:hover { background-color: silver; border:1px solid black; } +select.e-bb { margin-top:0px; width:100px } +.bbcode_buttons { } +.bbcode_buttons:hover { }