From c567fd265be9a140ab712b10d50082cbfe8396e5 Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 15 Jan 2014 02:56:39 -0800 Subject: [PATCH] Bootstrap3 styling fixes and some removal of deprecated save_prefs() usage. --- e107_admin/auth.php | 2 +- e107_admin/cpage.php | 2 +- .../shortcodes/batch/page_shortcodes.php | 2 +- e107_handlers/form_handler.php | 28 +++++++++---------- e107_handlers/menumanager_class.php | 4 ++- e107_handlers/theme_handler.php | 3 +- e107_plugins/featurebox/includes/item.php | 2 +- .../news/templates/news_menu_template.php | 4 +-- e107_themes/bootstrap3/style.css | 2 +- page.php | 7 +++-- 10 files changed, 30 insertions(+), 26 deletions(-) diff --git a/e107_admin/auth.php b/e107_admin/auth.php index 6268cb6ab..be6ec6df9 100644 --- a/e107_admin/auth.php +++ b/e107_admin/auth.php @@ -24,7 +24,7 @@ define('e_CAPTCHA_FONTCOLOR','#F9A533'); // Required for a clean v1.x -> v2 upgrade. $core = e107::getConfig('core'); -if($core->get('admintheme') != 'bootstrap') +if($core->get('admintheme') != 'bootstrap' && $core->get('admintheme') != 'bootstrap3') { $core->update('admintheme','bootstrap'); $core->update('adminstyle','infopanel'); diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 77192d861..5585adf6f 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -135,7 +135,7 @@ class page_chapters_ui extends e_admin_ui 'chapter_meta_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'textarea', 'width' => 'auto', 'thclass' => 'left','readParms' => 'expand=...&truncate=150&bb=1', 'readonly'=>FALSE), 'chapter_meta_keywords' => array('title'=> "Meta Keywords", 'type' => 'tags', 'inline'=>true, 'width' => 'auto', 'thclass' => 'left', 'readonly'=>FALSE), - 'chapter_sef' => array('title'=> "SEF Url String", 'type' => 'text', 'width' => 'auto', 'readonly'=>FALSE, 'inline'=>true, 'writeParms'=>'size=xxlarge'), // Display name + 'chapter_sef' => array('title'=> "SEF Url String", 'type' => 'text', 'width' => 'auto', 'readonly'=>FALSE, 'inline'=>true, 'writeParms'=>'size=xxlarge&inline-empty=1'), // Display name 'chapter_manager' => array('title'=> "Can be edited by", 'type' => 'userclass', 'inline'=>true, 'width' => 'auto', 'data' => 'int','batch'=>TRUE, 'filter'=>TRUE), 'chapter_order' => array('title'=> LAN_ORDER, 'type' => 'text', 'width' => 'auto', 'thclass' => 'right', 'class'=> 'right' ), diff --git a/e107_core/shortcodes/batch/page_shortcodes.php b/e107_core/shortcodes/batch/page_shortcodes.php index 9e8e7c6f5..d26cb522e 100644 --- a/e107_core/shortcodes/batch/page_shortcodes.php +++ b/e107_core/shortcodes/batch/page_shortcodes.php @@ -194,7 +194,7 @@ class cpage_shortcodes extends e_shortcode $size = vartrue($options['size'], ""); $inc = ($size) ? " btn-".$size : ""; - return ''.$text.''; + return ''.$text.''; } diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index bad6ff8e9..e493601f7 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -418,7 +418,7 @@ class e_form { $text = ""; $text .= ""; - $text .= ""; //TODO Common LAN. + $text .= ""; //TODO Common LAN. } $avFiles = e107::getFile()->get_files(e_AVATAR_DEFAULT,".jpg|.png|.gif|.jpeg|.JPG|.GIF|.PNG"); @@ -605,7 +605,7 @@ class e_form $cat = vartrue($sc_parameters['media']) ? $tp->toDB($sc_parameters['media']) : "_common_file"; $default_label = ($default) ? $default : "Choose a file"; - $label = "".basename($default_label).""; + $label = "".basename($default_label).""; $sc_parameters['mode'] = 'main'; $sc_parameters['action'] = 'dialog'; @@ -831,7 +831,7 @@ class e_form if(vartrue($options['generate'])) { - $gen = ' Generate Show
'; + $gen = ' Generate Show
'; } if(vartrue($options['strength'])) @@ -1544,26 +1544,26 @@ class e_form case 'edit': $image = ADMIN_EDIT_ICON_PATH; $icon = "e-edit-32"; - $options['class'] = $options['class'] == 'action' ? 'btn action edit' : $options['class']; + $options['class'] = $options['class'] == 'action' ? 'btn btn-default action edit' : $options['class']; break; case 'delete': $image = ADMIN_DELETE_ICON_PATH; $icon = "e-delete-32"; - $options['class'] = $options['class'] == 'action' ? 'btn action delete' : $options['class']; + $options['class'] = $options['class'] == 'action' ? 'btn btn-default action delete' : $options['class']; $options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"'; break; case 'execute': $image = ADMIN_EXECUTE_ICON_PATH; $icon = "e-execute-32"; - $options['class'] = $options['class'] == 'action' ? 'btn action execute' : $options['class']; + $options['class'] = $options['class'] == 'action' ? 'btn btn-default action execute' : $options['class']; break; case 'view': $image = ADMIN_VIEW_ICON_PATH; $icon = "e-view-32"; - $options['class'] = $options['class'] == 'action' ? 'btn action view' : $options['class']; + $options['class'] = $options['class'] == 'action' ? 'btn btn-default action view' : $options['class']; break; } $options['title'] = $title;//shorthand @@ -2414,7 +2414,7 @@ class e_form { $mode = preg_replace('/[^\w]/', '', vartrue($_GET['mode'], '')); $from = intval(vartrue($_GET['from'],0)); - $value .= "".ADMIN_SORT_ICON." "; + $value .= "".ADMIN_SORT_ICON." "; } $cls = false; @@ -2430,7 +2430,7 @@ class e_form ".LAN_EDIT.""; */ - $value .= " + $value .= " ".ADMIN_EDIT_ICON.""; } @@ -2440,12 +2440,12 @@ class e_form $cls = (deftrue($parms['deleteClass'])) ? constant($parms['deleteClass']) : $parms['deleteClass']; if(check_class($cls)) { - $value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn'.$delcls)); + $value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default'.$delcls)); } } else { - $value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn'.$delcls)); + $value .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default'.$delcls)); } } //$attributes['type'] = 'text'; @@ -2646,8 +2646,8 @@ class e_form $ttl = vartrue($parms['expand']); if($ttl == 1) { - $ttl = $expand.""; - $ttl1 = ""; + $ttl = $expand.""; + $ttl1 = ""; } $expands = ''.defset($ttl, $ttl).""; @@ -4160,7 +4160,7 @@ class form $name = ($form_name ? " id='".$form_name."' name='".$form_name."'" : ""); $image = ($form_image ? " src='".$form_image."' " : ""); $tooltip = ($form_tooltip ? " title='".$form_tooltip."' " : ""); - return "\n"; + return "\n"; } function form_textarea($form_name, $form_columns, $form_rows, $form_value, $form_js = "", $form_style = "", $form_wrap = "", $form_readonly = "", $form_tooltip = "") { diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php index e4cf8c181..b915e0642 100644 --- a/e107_handlers/menumanager_class.php +++ b/e107_handlers/menumanager_class.php @@ -1626,6 +1626,8 @@ class e_menuManager { } $pref['menuconfig_list'] = vartrue($tmp); - save_prefs(); + + e107::getConfig()->setPref($pref)->save(false,true,false); + // save_prefs(); } } // end of Class. \ No newline at end of file diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 59e8171a0..2ff533d90 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -27,7 +27,7 @@ class themeHandler var $themeConfigObj = null; var $noLog = FALSE; - private $approvedAdminThemes = array('bootstrap'); + private $approvedAdminThemes = array('bootstrap','bootstrap3'); public $allowedCategories = array('generic', 'adult', @@ -1686,6 +1686,7 @@ class themeHandler $pref['admintheme'] = $themeArray[$this->id]; $pref['admincss'] = file_exists(e_THEME.$pref['admintheme'].'/admin_dark.css') ? 'admin_dark.css' : 'admin_light.css'; $e107cache->clear_sys(); + if(save_prefs()) { // Default Message diff --git a/e107_plugins/featurebox/includes/item.php b/e107_plugins/featurebox/includes/item.php index 0fccd4ef6..5becf4b71 100644 --- a/e107_plugins/featurebox/includes/item.php +++ b/e107_plugins/featurebox/includes/item.php @@ -90,7 +90,7 @@ class plugin_featurebox_item extends e_model $title = vartrue($parm['text']) ? defset($parm['text']) : LAN_MORE; $alt = $tp->toAttribute($this->get('fb_title'), false, 'TITLE'); - $buttonCls = vartrue($parm['button']) ? 'class="btn btn-primary" ' : ""; + $buttonCls = vartrue($parm['button']) ? 'class="btn btn-primary btn-featurebox" ' : ""; diff --git a/e107_plugins/news/templates/news_menu_template.php b/e107_plugins/news/templates/news_menu_template.php index 14d39892c..bcbfcf111 100644 --- a/e107_plugins/news/templates/news_menu_template.php +++ b/e107_plugins/news/templates/news_menu_template.php @@ -64,7 +64,7 @@ $NEWS_MENU_TEMPLATE['other']['item'] = '
{NEWSIMAGE=placeholder}

{NEWSTITLE}

{NEWSSUMMARY}

-

'.LAN_READ_MORE.' »

+

'.LAN_READ_MORE.' »

'; $NEWS_MENU_TEMPLATE['other']['end'] = ""; @@ -82,7 +82,7 @@ $NEWS_MENU_TEMPLATE['other2']['start'] = "