diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 8d9d50982..5428ac802 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -416,7 +416,7 @@ class page_admin_ui extends e_admin_ui 'page_template' => array('title'=> LAN_TEMPLATE, 'tab' => 0, 'type' => 'dropdown', 'width' => 'auto','filter' => true, 'batch'=>true, 'inline'=>true, 'writeParms'=>''), 'page_author' => array('title'=> LAN_AUTHOR, 'tab' => 0, 'type' => 'user', 'data'=>'int','width' => 'auto', 'thclass' => 'left'), - 'page_text' => array('title'=> CUSLAN_9, 'tab' => 0, 'type' => 'bbarea', 'data'=>'str', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1', 'writeParms'=>'media=page'), + 'page_text' => array('title'=> CUSLAN_9, 'tab' => 0, 'type' => 'bbarea', 'data'=>'str', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1', 'writeParms'=>'media=page&template=page'), // Options Tab. @@ -449,10 +449,10 @@ class page_admin_ui extends e_admin_ui protected $fieldpref = array("page_id","page_title","page_chapter","page_template","page_author","page_class"); protected $prefs = array( - 'listPages' => array('title'=> CUSLAN_29, 'type'=>'boolean'), - 'listBooks' => array('title'=> 'List Books/Chapters', 'type'=>'boolean'), - 'listBooksTemplate' => array('title'=> 'List Books/Chapters Template', 'type'=>'dropdown'), - 'pageCookieExpire' => array('title'=> CUSLAN_30, 'type'=>'number') //TODO Set default value to 84600 + 'listPages' => array('title'=> CUSLAN_29, 'type'=>'boolean'), + 'listBooks' => array('title'=> 'List Books/Chapters', 'type'=>'boolean'), + 'listBooksTemplate' => array('title'=> 'List Books/Chapters Template', 'type'=>'dropdown'), + 'pageCookieExpire' => array('title'=> CUSLAN_30, 'type'=>'number') //TODO Set default value to 84600 ); protected $books = array(); diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php index f2a85add7..f235ab5db 100644 --- a/e107_core/shortcodes/batch/bbcode_shortcodes.php +++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php @@ -31,17 +31,22 @@ class bbcode_shortcodes extends e_shortcode { $formats = array( 0 => array('[p][/p]','Paragraph'), - 1 => array('[h=2][/h]','Heading'), - 2 => array('[block][/block]','Block'), - 3 => array('[blockquote][/blockquote]', 'Quote'), - 4 => array('[code][/code]', 'Code') + 1 => array('[h=2][/h]','Heading 1'), + 2 => array('[h=2][/h]','Heading 2'), + 3 => array('[h=3][/h]','Heading 3'), + 4 => array('[h=4][/h]','Heading 4'), + 5 => array('[h=5][/h]','Heading 5'), + 6 => array('[h=5][/h]','Heading 6'), + 7 => array('[block][/block]','Block'), + 8 => array('[blockquote][/blockquote]', 'Quote'), + 9 => array('[code][/code]', 'Code') ); if(e_BOOTSTRAP) { $text = '
'; - $text .= ''; + $text .= ''; $text .= "Format"; $text .= ' '; $text .= "