Skip to:
Content

BuddyPress.org

Changeset 561


Ignore:
Timestamp:
11/21/2008 03:33:24 PM (18 years ago)
Author:
apeatling
Message:

Moved CSS layout structure to the components and not the themes. This allows components to define basic layout without relying on the theme.

This will also make using existing WordPress themes as member themes far easier. The component CSS can be over-ridden in the theme.

Location:
trunk
Files:
12 added
3 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-activity.php

    r539 r561  
    1111include_once( 'bp-activity/bp-activity-templatetags.php' );
    1212include_once( 'bp-activity/bp-activity-widgets.php' );
     13include_once( 'bp-activity/bp-activity-cssjs.php' );
    1314//include_once( 'bp-activity/bp-activity-ajax.php' );
    14 //include_once( 'bp-activity/bp-activity-cssjs.php' );
    1515//include_once( 'bp-activity/bp-activity-admin.php' );
    1616
  • trunk/bp-activity/bp-activity-cssjs.php

    r358 r561  
    11<?php
    22
     3function bp_activity_add_structure_css() {
     4        /* Enqueue the structure CSS file to give basic positional formatting for components */
     5        wp_enqueue_style( 'bp-activity-structure', site_url() . '/wp-content/mu-plugins/bp-activity/css/structure.css' );       
     6}
     7add_action( 'bp_styles', 'bp_activity_add_structure_css' );
     8
     9
    310?>
  • trunk/bp-blogs/bp-blogs-cssjs.php

    r373 r561  
    11<?php
    22
    3 function bp_blogs_add_admin_css() {
    4         global $bp, $wpdb;
     3function bp_blogs_add_structure_css() {
     4        /* Enqueue the structure CSS file to give basic positional formatting for components */
     5        wp_enqueue_style( 'bp-blogs-structure', site_url() . '/wp-content/mu-plugins/bp-blogs/css/structure.css' );     
     6}
     7add_action( 'bp_styles', 'bp_blogs_add_structure_css' );
    58
    6         if ( $wpdb->blogid == $bp['current_homebase_id'] ) {
    7                 if ( strpos( $_GET['page'], 'bp-blogs' ) !== false ) {
    8                         wp_enqueue_style('bp-blogs-admin-css', site_url() . '/wp-content/mu-plugins/bp-blogs/admin-tabs/admin.css');
    9                 }
    10         }
    11 }
    12 add_action( "admin_menu", 'bp_blogs_add_admin_css' );
     9
     10?>
  • trunk/bp-core/bp-core-cssjs.php

    r517 r561  
    4040 */
    4141function bp_core_add_css() {
    42         if ( is_user_logged_in() || ( (int)get_site_option( 'show-loggedout-adminbar' ) && !is_user_logged_in() ) )
     42        if ( is_user_logged_in() || ( (int)get_site_option( 'show-loggedout-adminbar' ) && !is_user_logged_in() ) ) {
    4343                wp_enqueue_style( 'bp-admin-bar', site_url() . '/wp-content/mu-plugins/bp-core/css/admin-bar.css' );
    44 
    45         /* If you want custom css styles, include a custom-styles.css file in /bp-core/css/custom-styles.css */
    46         if ( file_exists(ABSPATH . MUPLUGINDIR . '/bp-core/css/custom-styles.css') )
    47                 wp_enqueue_style( 'bp-core-custom-styles', site_url() . MUPLUGINDIR . '/bp-core/css/custom-styles.css' );               
     44               
     45                if ( get_bloginfo('text_direction') == 'rtl' && file_exists( ABSPATH . MUPLUGINDIR . '/bp-core/css/admin-bar-rtl.css' ) )
     46                        wp_enqueue_style( 'bp-admin-bar-rtl', site_url() . '/wp-content/mu-plugins/bp-core/css/admin-bar-rtl.css' );   
     47        }
    4848       
    4949        wp_print_styles();
    … …  
    5151add_action( 'wp_head', 'bp_core_add_css' );
    5252
     53/**
     54 * bp_core_add_structure_css()
     55 *
     56 * Add the CSS to add layout structure to BP pages in any WordPress theme.
     57 *
     58 * @package BuddyPress Core
     59 * @uses get_option() Selects a site setting from the DB.
     60 */
     61function bp_core_add_structure_css() {
     62        /* Enqueue the structure CSS file to give basic positional formatting for components */
     63        wp_enqueue_style( 'bp-core-structure', site_url() . '/wp-content/mu-plugins/bp-core/css/structure.css' );       
     64}
     65add_action( 'bp_styles', 'bp_core_add_structure_css' );
    5366
    5467/**
    … …  
    6780        if ( strpos( $_GET['page'], 'bp-core/admin-mods' ) !== false ) {
    6881                wp_enqueue_script('password-strength-meter');
    69         }
    70 
    71         if ( strpos( $_GET['page'], 'bp-core/homebase-creation' ) !== false ) {
    72                 wp_enqueue_script('prototype');
    73                 wp_enqueue_script('scriptaculous-root');
    74                 wp_enqueue_script('cropper');
    75                 add_action( 'admin_head', 'bp_core_add_cropper_js' );
    7682        }
    7783}
  • trunk/bp-core/bp-core-templatetags.php

    r552 r561  
    372372}
    373373
     374function bp_styles() {
     375        do_action( 'bp_styles' );
     376        wp_print_styles();
     377}
     378
    374379/* Template functions for fetching globals, without querying the DB again
    375380   also means we dont have to use the $bp variable in the template (looks messy) */
  • trunk/bp-friends/bp-friends-cssjs.php

    r373 r561  
    1414add_action( 'template_redirect', 'friends_add_js' );
    1515
     16function friends_add_structure_css() {
     17        /* Enqueue the structure CSS file to give basic positional formatting for components */
     18        wp_enqueue_style( 'bp-friends-structure', site_url() . '/wp-content/mu-plugins/bp-friends/css/structure.css' );
     19}
     20add_action( 'bp_styles', 'friends_add_structure_css' );
     21
    1622?>
  • trunk/bp-messages/bp-messages-cssjs.php

    r373 r561  
    4141add_action( 'template_redirect', 'messages_add_js' );
    4242
     43function messages_add_structure_css() {
     44        /* Enqueue the structure CSS file to give basic positional formatting for components */
     45        wp_enqueue_style( 'bp-messages-structure', site_url() . '/wp-content/mu-plugins/bp-messages/css/structure.css' );       
     46}
     47add_action( 'bp_styles', 'messages_add_structure_css' );
     48
     49
    4350?>
  • trunk/bp-wire.php

    r527 r561  
    88include_once( 'bp-wire/bp-wire-ajax.php' );
    99include_once( 'bp-wire/bp-wire-templatetags.php' );
    10 //include_once( 'bp-wire/bp-wire-cssjs.php' );
     10include_once( 'bp-wire/bp-wire-cssjs.php' );
    1111//include_once( 'bp-wire/bp-wire-admin.php' );
    1212
  • trunk/bp-wire/bp-wire-cssjs.php

    r344 r561  
    11<?php
    22
     3function bp_wire_add_structure_css() {
     4        /* Enqueue the structure CSS file to give basic positional formatting for components */
     5        wp_enqueue_style( 'bp-wire-structure', site_url() . '/wp-content/mu-plugins/bp-wire/css/structure.css' );       
     6}
     7add_action( 'bp_styles', 'bp_wire_add_structure_css' );
     8
     9
    310?>
  • trunk/bp-xprofile.php

    r524 r561  
    660660        delete_usermeta( $user_id, 'bp_core_avatar_v2_path' );
    661661}
     662add_action( 'wpmu_delete_user', 'xprofile_remove_data_on_user_deletion', 1 );
    662663add_action( 'delete_user', 'xprofile_remove_data_on_user_deletion', 1 );
    663664
  • trunk/bp-xprofile/bp-xprofile-cssjs.php

    r502 r561  
    11<?php
    22
    3 function xprofile_add_signup_css() {
    4         if ( $_SERVER['SCRIPT_NAME'] == '/wp-signup.php' )
    5                 echo '<link rel="stylesheet" href="' . site_url() . '/wp-content/mu-plugins/bp-xprofile/css/signup.css" type="text/css" />';
    6 }
    7 add_action( 'wp_head', 'xprofile_add_signup_css' );
    8 
    9 function xprofile_add_signup_js() {
     3function xprofile_add_js() {
    104        if ( $_SERVER['SCRIPT_NAME'] == '/wp-signup.php' )
    115                wp_enqueue_script( 'jquery' );
    126}
    13 add_action( 'wp', 'xprofile_add_signup_js' );
     7add_action( 'wp', 'xprofile_add_js' );
     8
     9function xprofile_add_css() {
     10        if ( $_SERVER['SCRIPT_NAME'] == '/wp-signup.php' )
     11                wp_enqueue_style( 'bp-xprofile-signup', site_url() . '/wp-content/mu-plugins/bp-xprofile/css/signup.css' );     
     12       
     13        wp_print_styles();
     14}
     15add_action( 'wp_head', 'xprofile_add_css' );
     16
     17function xprofile_add_structure_css() {
     18        /* Enqueue the structure CSS file to give basic positional formatting for xprofile pages */
     19        wp_enqueue_style( 'bp-xprofile-structure', site_url() . '/wp-content/mu-plugins/bp-xprofile/css/structure.css' );       
     20}
     21add_action( 'bp_styles', 'xprofile_add_structure_css' );
    1422
    1523function xprofile_add_admin_css() {
Note: See TracChangeset for help on using the changeset viewer.