Changeset 704341
- Timestamp:
- 04/26/2013 05:42:26 PM (13 years ago)
- Location:
- catalyst-connect/trunk
- Files:
-
- 4 edited
-
catalyst-connect.php (modified) (3 diffs)
-
inc/admin.php (modified) (1 diff)
-
inc/frontend.php (modified) (13 diffs)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
catalyst-connect/trunk/catalyst-connect.php
r592625 r704341 1 1 <?php 2 2 /** 3 * Catalyst Connect is a simple plugin that allows you to add Twitter Bootstrap functionality to you site.3 * Catalyst Connect is a simple plugin that makes integrating the BuddyPress, BBPress and WooCommerce Plugins with Catalyst a breeze. 4 4 * 5 5 * @author The Catalyst Team <info@catalysttheme.com> 6 * @version 1.0 6 * @version 1.0.1 7 7 * @package catalyst-connect 8 8 */ … … 12 12 Plugin URI: http://catalysttheme.com/plugins/catalyst-connect/ 13 13 Description: Catalyst Connect is a simple, yet powerful Plugin that makes integrating the BuddyPress, BBPress and WooCommerce Plugins with Catalyst a breeze. 14 Version: 1.0 14 Version: 1.0.1 15 15 Author: The Catalyst Team 16 16 Author URI: http://catalysttheme.com … … 21 21 22 22 define( 'CATALYSTCONNECT_OPTIONS_NAME', 'catalyst_connect' ); 23 define( 'CATALYSTCONNECT_VERSION', '1.0 ' );23 define( 'CATALYSTCONNECT_VERSION', '1.0.1' ); 24 24 define( 'CATALYSTCONNECT_MIN_WP_VERSION', '3.0' ); 25 25 -
catalyst-connect/trunk/inc/admin.php
r592625 r704341 51 51 function validate_options($options) { 52 52 // see http://codex.wordpress.org/Data_Validation for more info 53 $options['post_text'] = $options['post_text'] ; 54 $options['add_to_all'] = wp_filter_nohtml_kses( $options['add_to_all'] ); 55 $options['text_position'] = wp_filter_nohtml_kses( $options['text_position'] ); 53 $options['disable_buddypress_connect_css'] = $options['disable_buddypress_connect_css']; 54 $options['disable_buddypress_connect'] = $options['disable_buddypress_connect']; 55 $options['disable_bbpress_connect_css'] = $options['disable_bbpress_connect_css']; 56 $options['disable_bbpress_connect'] = $options['disable_bbpress_connect']; 57 $options['woocommerce_breadcrumbs'] = $options['woocommerce_breadcrumbs']; 58 $options['disable_woocommerce_connect_css'] = $options['disable_woocommerce_connect_css']; 59 $options['disable_woocommerce_connect'] = $options['disable_woocommerce_connect']; 56 60 return $options; 57 61 } -
catalyst-connect/trunk/inc/frontend.php
r592625 r704341 16 16 17 17 if ( class_exists( 'BuddyPress' ) && ! $this->get_option('disable_buddypress_connect') ) { 18 add_action( 'wp', 'catalyst_conn nect_buddypress_actions' );18 add_action( 'wp', 'catalyst_connect_buddypress_actions' ); 19 19 20 20 if ( ! $this->get_option('disable_buddypress_connect_css') ) { 21 21 // Add Catalyst/BuddyPress Custom CSS code 22 add_action( 'wp_head', 'catalyst_conn nect_buddypress_custom_css' );22 add_action( 'wp_head', 'catalyst_connect_buddypress_custom_css' ); 23 23 } 24 24 } … … 26 26 * Add/Remove Action certain elements to make Catalyst more compatible with BuddyPress 27 27 */ 28 function catalyst_conn nect_buddypress_actions() {28 function catalyst_connect_buddypress_actions() { 29 29 // Re-position the Catalyst Custom Layout globals so they still take effect when BuddyPress is active 30 30 remove_action( 'wp','catalyst_layout_globals' ); … … 39 39 40 40 // Wrap the BuddyPress "primary" Div ID around the Catalyst "content-wrap" div 41 add_action( 'catalyst_hook_before_content_wrap', 'catalyst_conn nect_buddypress_open_primary' );42 add_action( 'catalyst_hook_after_content_wrap', 'catalyst_conn nect_buddypress_close_primary' );41 add_action( 'catalyst_hook_before_content_wrap', 'catalyst_connect_buddypress_open_primary' ); 42 add_action( 'catalyst_hook_after_content_wrap', 'catalyst_connect_buddypress_close_primary' ); 43 43 } 44 44 … … 46 46 * Echo Custom CSS to address some Catalyst/BuddyPress styling issues 47 47 */ 48 function catalyst_conn nect_buddypress_custom_css() {48 function catalyst_connect_buddypress_custom_css() { 49 49 echo "\n" . '<!-- Begin Catalyst/BuddyPress Custom CSS -->' . "\n"; 50 50 echo '<style type="text/css">' . "\n"; … … 57 57 * Echo opening BuddyPress "primary" div ID 58 58 */ 59 function catalyst_conn nect_buddypress_open_primary() {59 function catalyst_connect_buddypress_open_primary() { 60 60 echo '<div id="primary">' . "\n"; 61 61 } … … 64 64 * Echo closing BuddyPress "primary" div ID 65 65 */ 66 function catalyst_conn nect_buddypress_close_primary() {66 function catalyst_connect_buddypress_close_primary() { 67 67 echo '</div><!-- end #primary -->' . "\n"; 68 68 } 69 69 70 70 if ( class_exists( 'bbPress' ) && ! $this->get_option('disable_bbpress_connect') ) { 71 add_action( 'wp', 'catalyst_conn nect_bbpress_actions' );71 add_action( 'wp', 'catalyst_connect_bbpress_actions' ); 72 72 73 73 if ( ! $this->get_option('disable_bbpress_connect_css') ) { 74 74 // Add Catalyst/BBPress Custom CSS code 75 add_action( 'wp_head', 'catalyst_conn nect_bbpress_custom_css' );75 add_action( 'wp_head', 'catalyst_connect_bbpress_custom_css' ); 76 76 } 77 77 } … … 79 79 * Remove common Catalyst post elements that don't quite fit in the BBPress pages 80 80 */ 81 function catalyst_conn nect_bbpress_actions() {81 function catalyst_connect_bbpress_actions() { 82 82 if ( is_bbpress() ) { 83 83 remove_action( 'catalyst_hook_before_loop', 'catalyst_build_breadcrumbs' ); … … 91 91 * Echo Custom CSS to address some Catalyst/BBPress styling issues 92 92 */ 93 function catalyst_conn nect_bbpress_custom_css() {93 function catalyst_connect_bbpress_custom_css() { 94 94 echo "\n" . '<!-- Begin Catalyst/BBPress Custom CSS -->' . "\n"; 95 95 echo '<style type="text/css">' . "\n"; 96 echo '.bbPress #content article p { padding: 0; } .bbPress #content article ul li p { padding: 0 0 20px; } .bbPress #content article ul { padding: 0; } .bbPress #content article ul li { margin: 0; list-style: none; } .bbPress .post-format-icon { display: none; }' . "\n";96 echo '.bbPress #content article p, .bbpress #content article p { padding: 0; } .bbPress #content article ul li p, .bbpress #content article ul li p { padding: 0 0 20px; } .bbPress #content article ul, .bbpress #content article ul { padding: 0; } .bbPress #content article ul li, .bbpress #content article ul li { margin: 0; list-style: none; } .bbPress .post-format-icon, .bbpress .post-format-icon { display: none; }' . "\n"; 97 97 echo '</style>' . "\n"; 98 98 echo '<!-- End Catalyst/BBPress Custom CSS -->' . "\n\n"; … … 100 100 101 101 if ( class_exists( 'Woocommerce' ) && ! $this->get_option('disable_woocommerce_connect') ) { 102 add_action( 'wp', 'catalyst_conn nect_woocommerce_actions' );102 add_action( 'wp', 'catalyst_connect_woocommerce_actions' ); 103 103 104 104 if ( $this->get_option('woocommerce_breadcrumbs') == 'cat' ) { … … 233 233 if ( ! $this->get_option('disable_woocommerce_connect_css') ) { 234 234 // Add Catalyst/WooCommerce Custom CSS code 235 add_action( 'wp_head', 'catalyst_conn nect_woocommerce_custom_css' );235 add_action( 'wp_head', 'catalyst_connect_woocommerce_custom_css' ); 236 236 } 237 237 } … … 239 239 * Add/Remove Action certain elements to make Catalyst more compatible with WooCommerce 240 240 */ 241 function catalyst_conn nect_woocommerce_actions() {241 function catalyst_connect_woocommerce_actions() { 242 242 // Remove WooCommerce content wrappers. 243 243 remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10); … … 271 271 * Echo Custom CSS to address some Catalyst/WooCommerce styling issues 272 272 */ 273 function catalyst_conn nect_woocommerce_custom_css() {273 function catalyst_connect_woocommerce_custom_css() { 274 274 echo "\n" . '<!-- Begin Catalyst/WooCommerce Custom CSS -->' . "\n"; 275 275 echo '<style type="text/css">' . "\n"; … … 285 285 function load_frontend_custom() { 286 286 if( !empty($this->frontend_css) ) { 287 $this->load_ admin_css();287 $this->load_frontend_css(); 288 288 } 289 289 290 290 if( !empty($this->frontend_js) ) { 291 $this->load_ admin_scripts();291 $this->load_frontend_scripts(); 292 292 } 293 293 } -
catalyst-connect/trunk/readme.txt
r592776 r704341 3 3 Tags: catalyst, catalystwp, dynamik, cobaltapps, buddypress, bbpress, woocommerce 4 4 Requires at least: 3.0 5 Tested up to: 3. 4.16 Stable tag: 1.0 5 Tested up to: 3.5.1 6 Stable tag: 1.0.1 7 7 License: GPLv2 or later 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 65 65 66 66 1.0 Initial release 67 68 1.0.1 Updated bbPress specific styles to work with the latest bbPress release
Note: See TracChangeset
for help on using the changeset viewer.