Commits

Doug Stewart committed 44e8793

Changes in options handling.

Comments (0)

Files changed (2)

 // Theme Hook Alliance Hooks
 require_once( LBLG_FUNCTIONS_DIR . 'tha-theme-hooks.php' );
 
-
 // Register theme support for various core WordPress functionality
 require_once( LBLG_FUNCTIONS_DIR . 'supports.php' );
 
 
 // bbPress-related code, only loaded if bbP is active
 if( function_exists( 'bbp_get_current_user_id' ) )
-	require_once( LBLG_FUNCTIONS_DIR . 'bbpress.php' );
-	
-// wp-less, from Sancho the Fat
-require_once( LBLG_INCLUDE_DIR . 'wp-less/wp-less.php' );
+	require_once( LBLG_FUNCTIONS_DIR . 'bbpress.php' );

includes/parent-options.php

 }	
 
 $css_layouts_tmp = asort($css_layouts);
-//$css_layouts_tmp = array_unshift($css_layouts, "Select a layout:", "*none*");
 
 $alt_stylesheets_tmp = asort($alt_stylesheets);
 $alt_stylesheets_tmp = array_unshift($alt_stylesheets, "Select a stylesheet:", "*none*");
 
 $parent_options_array = array(
-	"tabs" => array( 'general', 'mobile' ),
+	"tabs" => array( 'general', 'styling', 'mobile' ),
 	
 	"general" => array(
 			"name"		=> __( 'General', 'lblg' ),
 			"type"		=> "tab",
 			"contents"	=> array(
+				"blog_meta_info" => array(	"name" => __( 'Blog Meta Info', 'lblg' ),
+						"type" => "subhead"),
+
+				"display_footer_copyright" => array(	"name" => __( 'Display Copyright', 'lblg' ),
+						"desc" => __( 'Display your copyright information in the footer<br /><br /><b>Default:</b> true', 'lblg' ), 
+						"std" => "1",
+						"type" => "checkbox"),
+
+				"footer_copyright" => array(	"name" => __( 'Copyright Statement', 'lblg' ),
+						"desc" => sprintf( __( 'The following text will be displayed by default: <b><p>%s %s</p></b>', 'lblg' ), get_bloginfo('name'), lblg_copyright() ),
+						"std" => "",
+						"type" => "textarea",
+						"options" => array("rows" => "5",
+										   "cols" => "40") ),
+
+				"display_footer_credits" => array(	"name" => __( 'Display Credits', 'lblg' ),
+						"desc" => __( 'Display your site credits in the footer<br /><br /><b>Default:</b> true', 'lblg' ), 
+						"std" => "1",
+						"type" => "checkbox"),
+
+				"footer_credit_text" => array(	"name" => __( 'Footer Credits', 'lblg' ),
+						"desc" => sprintf( __( 'Footer credit text defaults to: <b><p>Powered by %s %s and %s</p></b> Change it to fit your site. (I would appreciate the link love, though, if you would leave it in...)  HTML should work just fine, raw PHP not so much.', 'lblg' ), '<a href="http://wordpress.org">WordPress</a>', get_bloginfo('version'), '<a href="http://literalbarrage.org/blog/code/elbee-elgee">Elbee Elgee</a>' ),
+						"std" => "",
+						"type" => "textarea",
+						"options" => array("rows" => "5",
+										   "cols" => "40") ),
+
+				"archives_excerpt" => array(	"name" => __( 'Archives/Excerpt', 'lblg'),
+						"desc" => sprintf( __( 'Use %sthe_excerpt()%s to display a shortened version of your posts\' content on archive pages.<br /><br /><b>Default:</b> true', 'lblg' ), '<a href="http://codex.wordpress.org/Function_Reference/the_excerpt">', '</a>' ),
+						"std" => "1",
+						"type" => "checkbox" ),
+			)
+	),
+	
+	"styling" => array(
+		"name"		=> __( 'Styling', 'lblg' ),
+		"type"		=> "tab",
+		"contents"	=> array(
 				"style_options" => array(	"name" => __( 'Style Options', 'lblg' ),
 						"type" => "subhead"),
 
 			    		"options" => $css_layouts),
 
 				"use_custom_header" => array(	"name" => __('Use Custom Headers', 'lblg' ),
-						"desc" => sprintf( __( 'Check this box if you wish to use WordPress\'s built-in %sCustom Header Image API%s to define a custom image for your theme', 'lblg' ), '<a href="http://codex.wordpress.org/Custom_Headers">', '</a>' ),
+						"desc" => sprintf( __( 'Use WordPress\'s built-in %sCustom Header Image API%s to define a custom image for your theme<br /><br /><b>Default:</b> true', 'lblg' ), '<a href="http://codex.wordpress.org/Custom_Headers">', '</a>' ),
 						"std" => "1",
 						"type" => "checkbox"),
 
 						"desc" => __( 'Check this box if you want the header to dynamically resize to the size of header images', 'lblg' ),
 						"std" => "1",
 						"type" => "checkbox"),
-
-				"blog_meta_info" => array(	"name" => __( 'Blog Meta Info', 'lblg' ),
-						"type" => "subhead"),
-
-				"display_footer_copyright" => array(	"name" => __( 'Display Copyright', 'lblg' ),
-						"desc" => __( 'Check this box to display your copyright information in the footer', 'lblg' ), 
-						"std" => "1",
-						"type" => "checkbox"),
-
-				"footer_copyright" => array(	"name" => __( 'Copyright Statement', 'lblg' ),
-						"desc" => sprintf( __( 'The following text will be displayed by default: <b><p>%s %s</p></b>', 'lblg' ), get_bloginfo('name'), lblg_copyright() ),
-						"std" => "",
-						"type" => "textarea",
-						"options" => array("rows" => "5",
-										   "cols" => "40") ),
-
-				"display_footer_credits" => array(	"name" => __( 'Display Credits', 'lblg' ),
-						"desc" => __( 'Check this box to display your site credits in the footer', 'lblg' ), 
-						"std" => "1",
-						"type" => "checkbox"),
-
-				"footer_credit_text" => array(	"name" => __( 'Footer Credits', 'lblg' ),
-						"desc" => sprintf( __( 'Footer credit text defaults to: <b><p>Powered by %s %s and %s</p></b> Change it to fit your site. (I would appreciate the link love, though, if you would leave it in...)  HTML should work just fine, raw PHP not so much.', 'lblg' ), '<a href="http://wordpress.org">WordPress</a>', get_bloginfo('version'), '<a href="http://literalbarrage.org/blog/code/elbee-elgee">Elbee Elgee</a>' ),
-						"std" => "",
-						"type" => "textarea",
-						"options" => array("rows" => "5",
-										   "cols" => "40") ),
-			)
+		)
 	),
 	
-	"styling" => array(),
-	
 	"mobile" => array(
 				"name" => __( 'Mobile/Responsive', 'lblg' ),
 				"type" => "tab",
 								   "type" => "subhead" ),
 			
 			"disable_bp_js" => array( "name" => __( 'Disable BuddyPress JavaScript/AJAX', 'lblg' ),
-									  "desc" => __( 'Elbee Elgee automatically integrates the BuddyPress default theme javascript and AJAX functionality. You may switch this off, though the experience will degrade somewhat.', 'lblg' ),
+									  "desc" => __( 'Elbee Elgee automatically integrates the BuddyPress default theme javascript and AJAX functionality. You may switch this off, though the experience will degrade somewhat.<br /><br /><b>Default:</b> false', 'lblg' ),
 									  "std" => "0",
 									  "type" => "checkbox" ),
 									
 			"disable_bp_css" => array( "name" => __( 'Disable BuddyPress CSS', 'lblg' ),
-									   "desc" => __( "Elbee Elgee comes with basic CSS styles that give BuddyPress pages a standard look and feel. You can extend upon these styles in your child theme's CSS or simply disable them and construct your own.", 'lblg' ),
+									   "desc" => __( "Elbee Elgee comes with basic CSS styles that give BuddyPress pages a standard look and feel. You can extend upon these styles in your child theme's CSS or simply disable them and construct your own.<br /><br /><b>Default:</b> false", 'lblg' ),
 									   "std" => "0",
 									   "type" => "checkbox" ),
 			
 			"disable_bp_searchform" => array( "name" => __( 'Disable BuddyPress search form', 'lblg' ),
-											  "desc" => __( 'Disables the BP search form in the site header.', 'lblg' ),
+											  "desc" => __( 'Disables the BP search form in the site header.<br /><br /><b>Default:</b> false', 'lblg' ),
 											  "std" => "0",
 											  "type" => "checkbox" ),
 			
 			"disable_bp_menu" => array( "name" => __( 'Disable custom BuddyPress menu', 'lblg' ),
-										"desc" => __( 'Disables the BP menu in the site header.', 'lblg' ),
+										"desc" => __( 'Disables the BP menu in the site header.<br /><br /><b>Default:</b> falsee', 'lblg' ),
 										"std" => "0",
 										"type" => "checkbox" ),
 		),
 			"bbp_subhead" => array( "name" => __( 'bbPress-specific Options', 'lblg' ),
 									"type" => "subhead"),
 			"bbp_force_1_column" => array( "name" => __( 'Disable Sidebar Widget Areas', 'lblg' ),
-												  "desc" => __( 'Disable the sidebar widget areas, essentially forcing all bbPress forum/topic screens to use 1 column layouts. <br /> (Can increase readability/functionality of bbPress forums, depending upon your chosen layout).', 'lblg' ),
+												  "desc" => __( 'Disable the sidebar widget areas, essentially forcing all bbPress forum/topic screens to use 1 column layouts. <br /> (Can increase readability/functionality of bbPress forums, depending upon your chosen layout).<br /><br /><b>Default:</b> false', 'lblg' ),
 												  "type" => "checkbox",
 												  "std" => "0" ),
 			"bbp_disable_footer" => array( "name" => __( 'Disable Footer Widget Areas', 'lblg' ),
-												  "desc" => __( 'Disable the footer widget areas when viewing bbPress forums/topics.', 'lblg' ),
+												  "desc" => __( 'Disable the footer widget areas when viewing bbPress forums/topics.<br /><br /><b>Default:</b> false', 'lblg' ),
 												  "type" => "checkbox",
 												  "std" => "0" ),
 		),
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.