From dbd25a74caeab8f4a9c8fc8618722ee856904130 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 14 Jul 2015 18:24:46 -0700 Subject: [PATCH] Issue #1138 - Dark style re-created from scratch. --- e107_admin/prefs.php | 4 +- .../shortcodes/batch/bbcode_shortcodes.php | 4 +- e107_handlers/form_handler.php | 9 +- e107_themes/bootstrap3/admin_style.css | 13 +- e107_themes/bootstrap3/admin_template.php | 2 +- e107_themes/bootstrap3/admin_theme.php | 50 +- e107_themes/bootstrap3/css/bootstrap_dark.css | 7206 +++++++++++++++++ 7 files changed, 7251 insertions(+), 37 deletions(-) create mode 100644 e107_themes/bootstrap3/css/bootstrap_dark.css diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index 1029fe923..78a22f09c 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -1650,14 +1650,14 @@ $text .= " - ".$frm->textarea('signup_text', $pref['signup_text'], 2, 1)." + ".$frm->textarea('signup_text', $pref['signup_text'], 3, 80)." - ".$frm->textarea('signup_text_after', $pref['signup_text_after'], 2, 1)." + ".$frm->textarea('signup_text_after', $pref['signup_text_after'], 3, 80)." diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php index 88d7c3db9..afe74554a 100644 --- a/e107_core/shortcodes/batch/bbcode_shortcodes.php +++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php @@ -84,7 +84,7 @@ class bbcode_shortcodes extends e_shortcode // $data = "[table]\n[tr]\n\t[td]Cell 1[/td]\n\t[td]Cell 2[/td]\n[/tr]\n[/table]"; // works with jquery, but not onclick. $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 .= ""; $text .= $this->button(e_IMAGE_ABS."bbcode/table.png", 'table' ); $text .= ""; @@ -111,7 +111,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($this->var['trigger'],$data,LANHELP_36); $event = $this->getEvent('addtext',$data,LANHELP_36); - $text = ""; + $text = ""; $text .= $this->button(e_IMAGE_ABS."bbcode/list.png", 'list', LANHELP_36); diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index c1acf161e..eb6f83d9c 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -1504,7 +1504,7 @@ class e_form $selector = 'jstarget:'.$selector; if($id) $id = $this->name2id($id); - return $this->checkbox($name, $selector, false, array('id' => $id,'class' => 'checkbox toggle-all','label'=>$label)); + return $this->checkbox($name, $selector, false, array('id' => $id,'class' => 'checkbox checkbox-inline toggle-all','label'=>$label)); } function uc_checkbox($name, $current_value, $uc_options, $field_options = array()) @@ -1582,12 +1582,13 @@ class e_form $text = ""; - + // return print_a($options,true); if($labelFound) // Bootstrap compatible markup { + $defaultClass = (deftrue('BOOTSTRAP') === 3) ? 'radio-inline' : 'radio inline'; $dis = (!empty($options['disabled'])) ? " disabled" : ""; - $text .= "