diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index c833bdd5e..ead2814e1 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -336,12 +336,12 @@ class news_admin_ui extends e_admin_ui 'news_sef' => array('title' => 'SEF URL', 'type' => 'text', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), 'user_name' => array('title' => LAN_NEWS_50, 'type' => 'text', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), 'news_datestamp' => array('title' => LAN_NEWS_32, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'parms' => 'mask=%A %d %B %Y', 'filter'=>true), - 'news_category' => array('title' => NWSLAN_6, 'type' => 'dropdown', 'data' => 'int', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), + 'news_category' => array('title' => NWSLAN_6, 'type' => 'dropdown', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_start' => array('title' => "Start", 'type' => 'datestamp', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'parms' => 'mask=%A %d %B %Y'), 'news_end' => array('title' => "End", 'type' => 'datestamp', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'parms' => 'mask=%A %d %B %Y'), - 'news_class' => array('title' => NWSLAN_22, 'type' => 'userclasses', 'data' => 'int', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), + 'news_class' => array('title' => NWSLAN_22, 'type' => 'userclasses', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_render_type' => array('title' => LAN_TEMPLATE, 'type' => 'comma', 'width' => 'auto', 'thclass' => 'center', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_sticky' => array('title' => LAN_NEWS_28, 'type' => 'boolean', 'data' => 'int' , 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_allow_comments' => array('title' => NWSLAN_15, 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false,'batch'=>true, 'filter'=>true,'readParms'=>'reverse=1','writeParms'=>'reverse=1'), @@ -441,7 +441,7 @@ class news_admin_ui extends e_admin_ui function settingsPage() { - $this->newspost->show_news_prefs(); + return $this->newspost->show_news_prefs(); } @@ -2890,7 +2890,7 @@ class admin_newspost "; - echo e107::getMessage()->render().$text; + return e107::getMessage()->render().$text; // e107::getRender()->tablerender(NWSLAN_90, e107::getMessage()->render().$text); } diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index b57c6bdf3..966c15820 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -588,7 +588,7 @@ class users_ext $text .= " ".EXTLAN_14." - "; foreach($ue->user_extended_types as $key => $val) { $selected = (vartrue($current['user_extended_struct_type']) == $key) ? " selected='selected'": ""; @@ -637,7 +637,7 @@ class users_ext $text .= "
\n"; $text .= "
"; - $text .= EXTLAN_62."
".EXTLAN_63."
".EXTLAN_63."
"; // Field Value - $text .= EXTLAN_64."
"; - $text .= LAN_ORDER."
".EXTLAN_44." - "; foreach($this->catNums as $k) { $sel = ($k == varset($current['user_extended_struct_parent'])) ? " selected='selected' " : ""; @@ -745,7 +745,7 @@ class users_ext
".EXTLAN_18." - "; $_r = array('0' => EXTLAN_65, '1' => EXTLAN_66, '2' => EXTLAN_67); foreach($_r as $k => $v) //FIXME change to $frm->selectbox() @@ -786,7 +786,7 @@ class users_ext ".EXTLAN_49." - "; if($current_hide) { diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 00669897c..8d59aafbb 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -859,7 +859,7 @@ class admin_shortcodes function sc_admin_siteinfo($parm='') { - if($parm == 'creditsonly' && e_PAGE != "credits.php") + if($parm == 'creditsonly' && e_PAGE != "credits.php" && e_PAGE != "phpinfo.php") { return; } diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 29e7fa472..43cc67211 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -2816,7 +2816,7 @@ class e_form
".$options['legend']." ".vartrue($options['table_pre'])." - +
".$this->colGroup($fields, $current_fields)." ".$this->thead($fields, $current_fields, varset($options['head_query']), varset($options['query']))." diff --git a/e107_languages/English/admin/help/search.php b/e107_languages/English/admin/help/search.php index 62d1f81b6..f066dfb5f 100644 --- a/e107_languages/English/admin/help/search.php +++ b/e107_languages/English/admin/help/search.php @@ -11,14 +11,12 @@ if (!defined('e107_INIT')) { exit; } $caption = "Search Help"; $text = " -

If your MySQL server version supports it you can switch to the MySQL sort method which is faster than the PHP sort method. See preferences. -

-

+

If your site includes Ideographic languages such as Chinese and Japanese you must use the PHP sort method and switch whole word matching off. -

+ "; $ns->tablerender($caption, $text); ?> \ No newline at end of file diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 95000aa8b..e60d41932 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -664,6 +664,17 @@ i.searchquery { } + +.nav-header { + padding-bottom:10px; +} + +.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a +{ + background-color: rgb(230, 230, 230); + border-bottom: 1px solid rgb(221, 221, 221); + color: rgb(153, 153, 153); +} /* body { background-color: rgb(68, 68, 68); }