From 8b0c9c79a30bb46021f341fc428dde6eff2e4409 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 21 Apr 2013 02:00:08 -0700 Subject: [PATCH] Bbcode button styling and fixes. --- .../shortcodes/batch/bbcode_shortcodes.php | 80 ++++++++++++++++--- e107_handlers/admin_ui.php | 2 +- e107_languages/English/lan_ren_help.php | 2 +- e107_themes/bootstrap/admin_style.css | 10 ++- e107_web/js/core/admin.jquery.css | 2 +- 5 files changed, 82 insertions(+), 14 deletions(-) diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php index 8a92e4b94..adf996190 100644 --- a/e107_core/shortcodes/batch/bbcode_shortcodes.php +++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php @@ -29,8 +29,37 @@ class bbcode_shortcodes extends e_shortcode // The BBcode Buttons. function bb_format($id) { - - $text = " @@ -38,6 +67,7 @@ class bbcode_shortcodes extends e_shortcode "; + return $text; @@ -107,7 +137,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,7 +153,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; @@ -131,11 +161,37 @@ class bbcode_shortcodes extends e_shortcode function bb_fontsize($id) // FIXME CSS issues { - - $data = "size"; - $formid = $id."_"; - $event = $this->getEvent('expandit',$formid, LANHELP_22); + if(deftrue('e_BOOTSTRAP')) + { + $tp = e107::getParser(); + + $sizes = array(7,8,9,10,11,12,14,15,18,20,22,24,26,28,30,36); + + $text = '
'; + $text .= ''; + $text .= "\n"; + $text .= ''; + $text .= ""; + $text .= "
"; + + return $text; + } + + // Legacy BC Support + + + $data = "size"; + $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}'> "; @@ -149,10 +205,14 @@ class bbcode_shortcodes extends e_shortcode "; $sizes = array(7,8,9,10,11,12,14,15,18,20,22,24,26,28,30,36); - foreach($sizes as $s){ + foreach($sizes as $s) + { $text .= "\n"; } - $text .=" \n + $text .=" + + + \n \n"; return $text; } diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index c3db95352..799acaf4f 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -5296,7 +5296,7 @@ class e_admin_form_ui extends e_form
".LAN_LABEL_LABEL_SELECTED." ".$filter_pre." -
+
".$this->text('searchquery', $current_query[0], 50, $input_options)." ".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))." ".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')." diff --git a/e107_languages/English/lan_ren_help.php b/e107_languages/English/lan_ren_help.php index c6ded52f8..f71acc4b5 100644 --- a/e107_languages/English/lan_ren_help.php +++ b/e107_languages/English/lan_ren_help.php @@ -60,7 +60,7 @@ define("LANHELP_45", "Insert image from directory: "); define("LANHELP_46", "* No files found in: "); define("LANHELP_47", "Insert flash: [flash=width,height]http://www.example.com/file.swf[/flash]"); -define("LANHELP_48", "YouTube video: [youtube=tiny|small|medium|big|huge|width,height]6kYjxJmk0wc[/youtube]"); +define("LANHELP_48", "YouTube video: [youtube=tiny | small | medium | big | huge | width,height]6kYjxJmk0wc[/youtube]"); define("LANHELP_49", "Paragraph: [p=class name]Paragraph text[/p]"); define("LANHELP_50", "Heading: for H2 [h]Heading text[/h] or [h=2]Heading text[/h]"); define("LANHELP_51", "Disable HTML new lines for enclosed text: [nobr]text[/nobr]"); diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index ef7d04312..54bd0be3d 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -126,8 +126,16 @@ td.options { } legend { display:none } -.btn { vertical-align: top; } +.bootstrap-select.btn-group, .bootstrap-select.btn-group[class*="span"] { + margin-bottom: 0px; + +} + + +/* +.btn { vertical-align: top; } +*/ input::-webkit-input-placeholder { font-style:italic } diff --git a/e107_web/js/core/admin.jquery.css b/e107_web/js/core/admin.jquery.css index 0d50e322c..d33b111c4 100644 --- a/e107_web/js/core/admin.jquery.css +++ b/e107_web/js/core/admin.jquery.css @@ -19,7 +19,7 @@ a.media-select-icon { text-align:center; vertical-align:middle; margin:1px; bo a.media-select-icon:hover { border:1px solid red; } .media-select-container { padding:10px; } -.media-select-active { border: 2px solid silver; } + .media-select-active { border: 1px solid silver; } .e-moving { background-color: silver; } tr.highlight-even { background-color: silver; }