Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 5 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
76 functions.php
@@ -54,12 +54,14 @@ function bp_dtheme_setup() {
add_action( 'after_setup_theme', 'bp_dtheme_setup' );
// Load up Frisco theme options
-require_once ( get_stylesheet_directory() . '/theme-options.php' );
+require_once( get_stylesheet_directory() . '/theme-options.php' );
// Add main CSS and Google Font CSS
function bp_dtheme_enqueue_styles() {
// Bump this when changes are made to bust cache
$version = '20110818';
+ // Register our main stylesheet
+ wp_enqueue_style( 'bp-default-main', get_template_directory_uri() . '/_inc/css/default.css', array(), $version );
// Main CSS
wp_enqueue_style( 'frisco-main', get_stylesheet_directory_uri() . '/style.css', array(), $version );
// Google Font CSS
@@ -69,8 +71,8 @@ function bp_dtheme_enqueue_styles() {
add_action( 'wp_print_styles', 'bp_dtheme_enqueue_styles' );
// Add color choice CSS from theme options.
-add_action('wp_print_styles', 'add_colorcss');
-function add_colorcss() {
+add_action('wp_print_styles', 'frisco_add_colorcss');
+function frisco_add_colorcss() {
// If theme options are saved in the database
if( !get_option( 'frisco_theme_options' ) ) {
// Load stylesheet for color choice
@@ -84,8 +86,8 @@ function add_colorcss() {
}
// Add custom.css, if selected in theme options.
-add_action('wp_print_styles', 'add_customcss');
-function add_customcss() {
+add_action('wp_print_styles', 'frisco_add_customcss');
+function frisco_add_customcss() {
$options = get_option('frisco_theme_options');
@@ -99,8 +101,8 @@ function add_customcss() {
}
// Load up functions-custom.php, if the user has selected that option in theme options.
-add_action( 'after_setup_theme', 'add_custom_functions' );
-function add_custom_functions() {
+add_action( 'after_setup_theme', 'frisco_add_custom_functions' );
+function frisco_add_custom_functions() {
$options = get_option('frisco_theme_options');
if ( $options['customphp'] == 1 ) {
@@ -109,7 +111,7 @@ function add_custom_functions() {
}
// Add Google font CSS to header
-function add_google_font_css() {
+function frisco_add_google_font_css() {
$options = get_option('frisco_theme_options');
?>
<style type="text/css">
@@ -117,15 +119,15 @@ function add_google_font_css() {
</style>
<?php
}
-add_action ( 'wp_head', 'add_google_font_css' );
+add_action ( 'wp_head', 'frisco_add_google_font_css' );
// Add viewport settings for mobile access. From Less Framework (http://lessframework.com/)
-function add_responsive() {
+function frisco_add_responsive() {
?>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
<?php
}
-add_action ( 'bp_head', 'add_responsive' );
+add_action ( 'bp_head', 'frisco_add_responsive' );
// Show friendly message upon theme activation
function bp_dtheme_show_notice() {
@@ -154,111 +156,111 @@ function frisco_core_set_avatar_constants() {
add_action( 'bp_init', 'frisco_core_set_avatar_constants', 2 );
// Adding full width backgrounds requires some extra divs. We'll add those using actions starting below.
-function div_bp_before_header() {
+function frisco_div_bp_before_header() {
?>
<div id="bp-before-header" class="fullwidth">
<?php
}
-add_action ( 'bp_before_header', 'div_bp_before_header' );
+add_action ( 'bp_before_header', 'frisco_div_bp_before_header' );
// close the bp-before-header div
-function div_bp_after_header() {
+function frisco_div_bp_after_header() {
?>
</div>
<?php
}
-add_action ( 'bp_after_header', 'div_bp_after_header' );
+add_action ( 'bp_after_header', 'frisco_div_bp_after_header' );
// This could have gone in div_bp_after_header, but we might want to add something later.
-function div_bp_before_container() {
+function frisco_div_bp_before_container() {
?>
<div id="bp-before-container" class="fullwidth">
<?php
}
-add_action ( 'bp_before_container', 'div_bp_before_container' );
+add_action ( 'bp_before_container', 'frisco_div_bp_before_container' );
// close the bp-before-container div
-function div_bp_after_container() {
+function frisco_div_bp_after_container() {
?>
</div>
<?php
}
-add_action ( 'bp_after_container', 'div_bp_after_container' );
+add_action ( 'bp_after_container', 'frisco_div_bp_after_container' );
// Batten down the hatches, we're going full-width
-function div_bp_before_footer() {
+function frisco_div_bp_before_footer() {
?>
<div id="bp-before-footer" class="fullwidth">
<?php
}
-add_action ( 'bp_before_footer', 'div_bp_before_footer' );
+add_action ( 'bp_before_footer', 'frisco_div_bp_before_footer' );
// close the bp-before-footer div
-function div_bp_after_footer() {
+function frisco_div_bp_after_footer() {
?>
</div>
<?php
}
-add_action ( 'bp_after_footer', 'div_bp_after_footer' );
+add_action ( 'bp_after_footer', 'frisco_div_bp_after_footer' );
// Batten down the hatches, we're going full-width
-function div_bp_before_activity_post_form() {
+function frisco_div_bp_before_activity_post_form() {
?>
<div id="bp-before-activity-post-form">
<?php
}
-add_action ( 'bp_before_activity_post_form', 'div_bp_before_activity_post_form' );
+add_action ( 'bp_before_activity_post_form', 'frisco_div_bp_before_activity_post_form' );
// close the bp-before-activity-post-form div
-function div_bp_after_activity_post_form() {
+function frisco_div_bp_after_activity_post_form() {
?>
</div>
<?php
}
-add_action ( 'bp_after_activity_post_form', 'div_bp_after_activity_post_form' );
+add_action ( 'bp_after_activity_post_form', 'frisco_div_bp_after_activity_post_form' );
// Batten down the hatches, we're going full-width
-function div_bp_before_member_header() {
+function frisco_div_bp_before_member_header() {
?>
<div id="bp-before-member-header">
<?php
}
-add_action ( 'bp_before_member_header', 'div_bp_before_member_header' );
+add_action ( 'bp_before_member_header', 'frisco_div_bp_before_member_header' );
// close the bp-before-member-header div
-function div_bp_after_member_header() {
+function frisco_div_bp_after_member_header() {
?>
</div>
<?php
}
-add_action ( 'bp_after_member_header', 'div_bp_after_member_header' );
+add_action ( 'bp_after_member_header', 'frisco_div_bp_after_member_header' );
// Batten down the hatches, we're going full-width
-function div_bp_before_group_header() {
+function frisco_div_bp_before_group_header() {
?>
<div id="bp-before-group-header">
<?php
}
-add_action ( 'bp_before_group_header', 'div_bp_before_group_header' );
+add_action ( 'bp_before_group_header', 'frisco_div_bp_before_group_header' );
// close the bp-before-group-header div
-function div_bp_after_group_header() {
+function frisco_div_bp_after_group_header() {
?>
</div>
<?php
}
-add_action ( 'bp_after_group_header', 'div_bp_after_group_header' );
+add_action ( 'bp_after_group_header', 'frisco_div_bp_after_group_header' );
// Add site credits by filtering exising text in footer.php from bp-default.
-add_filter('gettext', 'sitecredits', 20, 3);
+add_filter('gettext', 'frisco_sitecredits', 20, 3);
/**
* Edit the default credits to add Frisco link. Remove it if you'd like or modify it to display whatever you want.
*
* @link http://codex.wordpress.org/Plugin_API/Filter_Reference/gettext
*/
-function sitecredits( $translated_text, $untranslated_text, $domain ) {
+function frisco_sitecredits( $translated_text, $untranslated_text, $domain ) {
$custom_field_text = 'Proudly powered by <a href="%1$s">WordPress</a> and <a href="%2$s">BuddyPress</a>.';
if ( $untranslated_text === $custom_field_text ) {
return 'Proudly powered by <a href="http://wordpress.org">WordPress</a>, <a href="http://buddypress.org">BuddyPress</a> and the <a href="http://friscotheme.com/">Frisco Theme</a>.';
View
61 header.php
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+ <head profile="http://gmpg.org/xfn/11">
+ <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ) ?>; charset=<?php bloginfo( 'charset' ) ?>" />
+ <title><?php wp_title( '|', true, 'right' ); bloginfo( 'name' ); ?></title>
+
+ <?php do_action( 'bp_head' ) ?>
+
+ <link rel="pingback" href="<?php bloginfo( 'pingback_url' ) ?>" />
+
+ <?php
+ if ( is_singular() && bp_is_blog_page() && get_option( 'thread_comments' ) )
+ wp_enqueue_script( 'comment-reply' );
+
+ wp_head();
+ ?>
+ </head>
+
+ <body <?php body_class() ?> id="bp-default">
+
+ <?php do_action( 'bp_before_header' ) ?>
+
+ <div id="header">
+ <div id="search-bar" role="search">
+ <div class="padder">
+ <h1 id="logo" role="banner"><a href="<?php echo home_url(); ?>" title="<?php _ex( 'Home', 'Home page banner link title', 'buddypress' ); ?>"><?php bp_site_name(); ?></a></h1>
+
+ <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
+ <label for="search-terms" class="accessibly-hidden"><?php _e( 'Search for:', 'buddypress' ); ?></label>
+ <input type="text" id="search-terms" name="search-terms" value="<?php echo isset( $_REQUEST['s'] ) ? esc_attr( $_REQUEST['s'] ) : ''; ?>" />
+
+ <?php echo bp_search_form_type_select() ?>
+
+ <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+
+ <?php wp_nonce_field( 'bp_search_form' ) ?>
+
+ </form><!-- #search-form -->
+
+ <?php do_action( 'bp_search_login_bar' ) ?>
+
+ </div><!-- .padder -->
+ </div><!-- #search-bar -->
+
+ <div class="nav-wrap">
+ <div id="navigation" role="navigation">
+
+ <?php wp_nav_menu( array( 'container' => false, 'menu_id' => 'nav', 'theme_location' => 'primary', 'fallback_cb' => 'bp_dtheme_main_nav' ) ); ?>
+
+ </div>
+ </div>
+
+ <?php do_action( 'bp_header' ) ?>
+
+ </div><!-- #header -->
+
+ <?php do_action( 'bp_after_header' ) ?>
+ <?php do_action( 'bp_before_container' ) ?>
+
+ <div id="container">
View
0  images/mystery-man-50.jpg 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  images/mystery-man.jpg 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
19 members/single/home.php
@@ -40,30 +40,31 @@
<div id="item-body">
<?php do_action( 'bp_before_member_body' );
-
+
if ( bp_is_user_activity() || !bp_current_component() ) :
- locate_template( array( 'members/single/activity.php' ), true );
+ locate_template( array( 'members/single/activity.php' ), true );
elseif ( bp_is_user_blogs() ) :
- locate_template( array( 'members/single/blogs.php' ), true );
+ locate_template( array( 'members/single/blogs.php' ), true );
elseif ( bp_is_user_friends() ) :
- locate_template( array( 'members/single/friends.php' ), true );
+ locate_template( array( 'members/single/friends.php' ), true );
elseif ( bp_is_user_groups() ) :
- locate_template( array( 'members/single/groups.php' ), true );
+ locate_template( array( 'members/single/groups.php' ), true );
elseif ( bp_is_user_messages() ) :
- locate_template( array( 'members/single/messages.php' ), true );
+ locate_template( array( 'members/single/messages.php' ), true );
elseif ( bp_is_user_profile() ) :
- locate_template( array( 'members/single/profile.php' ), true );
+ locate_template( array( 'members/single/profile.php' ), true );
elseif ( bp_is_user_forums() ) :
- locate_template( array( 'members/single/forums.php' ), true );
-
+ locate_template( array( 'members/single/forums.php' ), true );
+
elseif ( bp_is_user_settings() ) :
locate_template( array( 'members/single/settings.php' ), true );
+
// If nothing sticks, load a generic template
else :
locate_template( array( 'members/single/plugins.php' ), true );
View
12 readme.txt
@@ -1,9 +1,7 @@
--- Frisco ---
-A clean and simple child theme for BuddyPress 1.5+. Frisco uses the BuddyPress default theme as its parent theme. BuddyPress must be active for Frisco to function.
+A clean and simple child theme for BuddyPress 1.5+. Frisco uses the BuddyPress default theme as its parent theme. BuddyPress must be active for Frisco to function.
-For help with Frisco, or for more information, please visit the BuddyPress forums or go to http://friscotheme.com/.
-
-For screenshots, see https://s3.amazonaws.com/frisco/screenshot-1.png, https://s3.amazonaws.com/frisco/screenshot-2.png, https://s3.amazonaws.com/frisco/screenshot-3.png, and https://s3.amazonaws.com/frisco/screenshot-4.png
+For help with Frisco, or for more information, please visit go to http://friscotheme.com/
--- Installation ---
Upload and activate the Frisco theme under "Appearance > Themes" menu in your WordPress admin area.
@@ -12,4 +10,8 @@ Upload and activate the Frisco theme under "Appearance > Themes" menu in your Wo
Go to "Appearance > Theme Options" to configure basic color and font options.
--- Credits ---
-Google Web Fonts - http://www.google.com/webfonts
+Google Web Fonts - http://www.google.com/webfonts
+
+--- Changelog ---
+1.5.02 CSS bugs and readme.txt
+1.5.01 Basic functionality
View
60 style.css
@@ -1,10 +1,10 @@
/**
- * Theme Name: Frisco
+ * Theme Name: Frisco for BuddyPress
* Theme URI: http://friscotheme.com
- * Description: Derived almost entirely from the BuddyPress Default theme, the Frisco adds some minor HTML changes and a fresh coat of CSS.
- * Version: 1.5
+ * Description: Derived almost entirely from the BuddyPress Default theme, Frisco for BuddyPress adds some minor HTML changes and a fresh coat of CSS. There is some responsivenss built-in to the theme, and this will be improved in future versions.
+ * Version: 1.5.01
* Author: David Carson
- * Author URI: http://friscotheme.com
+ * Author URI: http://davidtcarson.com
* License: GNU General Public License v2.0
* License URI: http://www.gnu.org/licenses/gpl-2.0.html
* Template: bp-default
@@ -13,9 +13,6 @@
*/
-/* Inherit the default theme styles */
-@import url( ../../plugins/buddypress/bp-themes/bp-default/_inc/css/default.css );
-
/*----------------------------------------------------------------------------------------------------------------------------
Frisco Styles - Overriding bp-default css.
----------------------------------------------------------------------------------------------------------------------------*/
@@ -37,6 +34,8 @@ body#bp-default #wp-admin-bar .padder {
min-width: 960px;
margin: 0 auto;
clear:both;
+ background: #EAEAEA;
+ float: left;
}
body,
h1,
@@ -115,7 +114,9 @@ body.blog div#container,
body.single div#container,
body.archive div#container,
body.error404 div#container,
-body.activation div#container {
+body.activation div#container,
+body.search-results div#container,
+body.search-no-results div#container {
width: 960px;
-webkit-box-shadow: 0 1px 4px rgba(0,0,0,0.27), 0 0 40px rgba(0,0,0,0.06) inset;
-moz-box-shadow: 0 1px 4px rgba(0,0,0,0.27), 0 0 40px rgba(0,0,0,0.06) inset;
@@ -126,7 +127,9 @@ body.page div#content .padder,
body.blog div#content .padder,
body.single div#content .padder,
body.archive div#content .padder,
-body.activation div#content .padder {
+body.activation div#content .padder,
+body.search-results div#content .padder,
+body.search-no-results div#content .padder {
margin-right: 226px;
background: #FFF;
}
@@ -306,7 +309,7 @@ div.activity-meta a.acomment-reply {
border: none;
}
div.activity-meta a.acomment-reply:hover,
-.activity-comments a.acomment-reply:hover {
+.activity-comments a.acomment-reply:hover, {
background: #FFA200;
color: #FFF;
}
@@ -363,7 +366,6 @@ body a.delete-activity-single:hover {
color: #333;
height: auto;
margin-bottom: 0;
- border-bottom: 1px solid #CCC;
filter: none;
padding: 0;
}
@@ -606,8 +608,7 @@ nav li.selected a {
min-height: 30px;
width: 100%;
z-index: 99999;
- margin-top: 1em;
- margin-bottom: 1em;
+ margin: 0 auto;
}
#header #navigation {
z-index: 99999;
@@ -641,7 +642,7 @@ div#message.updated {
body.profile div#message.updated {
margin: 10px auto;
}
-div#message.updated p, #item-header div#message p {
+#item-header div#message p {
background: #DFFCD9;
border: none;
color: #7B6B01;
@@ -690,7 +691,9 @@ input[type="submit"],
input[type="reset"],
input[type="button"],
div.generic-button a,
-body .navigation a {
+body .navigation a,
+body.single a.comment-reply-link,
+body.page a.comment-reply-link {
background: #CDCDCD;
background: -moz-linear-gradient(top, #FBFBFB 0%, #CDCDCD 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FBFBFB), color-stop(100%,#CDCDCD));
@@ -724,7 +727,9 @@ input[type="submit"]:hover,
input[type="reset"]:hover,
input[type="button"]:hover,
div.generic-button a:hover,
-body .navigation a:hover {
+body .navigation a:hover,
+body.single a.comment-reply-link:hover,
+body.page a.comment-reply-link:hover {
background: #B3B3B3;
background: -moz-linear-gradient(top, #FBFBFB 0%, #B3B3B3 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FBFBFB), color-stop(100%,#B3B3B3));
@@ -733,7 +738,7 @@ body .navigation a:hover {
background: -ms-linear-gradient(top, #FBFBFB 0%,#B3B3B3 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FBFBFB', endColorstr='#B3B3B3',GradientType=0 );
background: linear-gradient(top, #FBFBFB 0%,#B3B3B3 100%);
- border-color: #aaa #888 #888 #aaa;
+ border-color: #AAA #888 #888 #AAA;
border-right: 1px solid #888;
border-style: solid;
border-width: 1px;
@@ -1112,6 +1117,27 @@ body.profile .bp-widget h4 {
display: none;
}
+body.single a.comment-reply-link,
+body.page a.comment-reply-link {
+ font-size: 11px;
+ font-weight: normal;
+}
+body.search-results h2.pagetitle,
+body.search-no-results h2.pagetitle {
+ display: none;
+}
+.nav-wrap {
+ width: 100%;
+ float: left;
+ margin: 0 auto;
+ background: #FFF;
+ padding: 1em 0;
+ border-bottom: 1px solid #CCCCCC;
+}
+body.activity div#message.updated {
+ display: none;
+}
+
/*--------------------------------------------------------------
The media queries below were taken from Less Framework (http://lessframework.com/).
--------------------------------------------------------------*/

No commit comments for this range

Something went wrong with that request. Please try again.