Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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.
base fork: simplethemes/skeleton_wp
base: master
...
head fork: atomicpages/skeleton_wp
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 8 commits
  • 12 files changed
  • 0 commit comments
  • 2 contributors
Commits on Apr 21, 2012
@simplethemes Updated Docs 619ffa5
@simplethemes Jigoshop Updates
# fixed a path problem where jigoshop templates and  shortcodes were
not routing properly.
f9299f4
Commits on Apr 22, 2012
@simplethemes Jigoshop Update
Fix a problem where product catalog was not displaying properly.
8bca404
Commits on May 05, 2012
@kevinlangleyjr kevinlangleyjr Shouldn't be dependent on theme being in wp-content/themes/skeleton f…
…older. Switching function placement to just use variable instead
edfb657
Commits on May 12, 2012
@simplethemes Merge pull request #24 from klangley/master
Changed theme options image path
6e2f4aa
Commits on Jun 15, 2012
@simplethemes Fixed PHP Notice
Added error control operator to path inclusion.
165add4
@simplethemes Changed URI method in header.php
Changed  get_template_directory_uri() to get_stylesheet_directory_uri()
// Thanks @aurel-appsthru
e2062f0
@simplethemes Updated path variables
Updated translation path and options framework path.
9d6405e
View
8 README.md
@@ -6,6 +6,14 @@
**bbPress Demo**: [http://demos.simplethemes.com/skeleton/forums](http://demos.simplethemes.com/skeleton/forums "bbPress Theme Demo")
+**There are three branches available for this theme.**
+
+* **[standalone](https://github.com/simplethemes/skeleton_wp/tree/standalone):** Just the basic WordPress theme.
+* **[master](https://github.com/simplethemes/skeleton_wp):** Includes Jigoshop and bbPress styles
+* **[buddypress](https://github.com/simplethemes/skeleton_wp/tree/buddypress):** Basic starting point for use with BuddyPress (unsupported).
+
+
+
Skeleton, created by Casey Lee at [Simple Themes](http://www.simplethemes.com "WordPress Themes") is a simple, responsive WordPress theme based on the Skeleton Boilerplate.
It has several useful shortcodes, such as tabs, toggles, cross-browser CSS3 buttons, and layout columns.
It also includes a bbPress skin/stylesheet and sample child theme.
View
8 skeleton/admin/options-framework.php
@@ -169,8 +169,8 @@ function optionsframework_add_page() {
/* Loads the CSS */
function optionsframework_load_styles() {
- wp_enqueue_style('admin-style', OPTIONS_FRAMEWORK_DIRECTORY.'css/admin-style.css');
- wp_enqueue_style('color-picker', OPTIONS_FRAMEWORK_DIRECTORY.'css/colorpicker.css');
+ wp_enqueue_style('admin-style', OPTIONS_FRAMEWORK_URL.'css/admin-style.css');
+ wp_enqueue_style('color-picker', OPTIONS_FRAMEWORK_URL.'css/colorpicker.css');
}
/* Loads the javascript */
@@ -182,8 +182,8 @@ function optionsframework_load_scripts() {
// Enqueued scripts
wp_enqueue_script('jquery-ui-core');
- wp_enqueue_script('color-picker', OPTIONS_FRAMEWORK_DIRECTORY.'js/colorpicker.js', array('jquery'));
- wp_enqueue_script('options-custom', OPTIONS_FRAMEWORK_DIRECTORY.'js/options-custom.js', array('jquery'));
+ wp_enqueue_script('color-picker', OPTIONS_FRAMEWORK_URL.'js/colorpicker.js', array('jquery'));
+ wp_enqueue_script('options-custom', OPTIONS_FRAMEWORK_URL.'js/options-custom.js', array('jquery'));
}
function of_admin_head() {
View
16 skeleton/functions.php
@@ -57,11 +57,11 @@
/* Set Proper Parent/Child theme paths for inclusion
/*-----------------------------------------------------------------------------------*/
-define( 'PARENT_DIR', get_template_directory() );
-define( 'CHILD_DIR', get_stylesheet_directory() );
+@define( 'PARENT_DIR', get_template_directory() );
+@define( 'CHILD_DIR', get_stylesheet_directory() );
-define( 'PARENT_URL', get_template_directory_uri() );
-define( 'CHILD_URL', get_stylesheet_directory_uri() );
+@define( 'PARENT_URL', get_template_directory_uri() );
+@define( 'CHILD_URL', get_stylesheet_directory_uri() );
/*-----------------------------------------------------------------------------------*/
@@ -71,10 +71,10 @@
if ( !function_exists( 'optionsframework_init' ) ) {
- define('OPTIONS_FRAMEWORK_URL', PARENT_DIR . '/admin/');
- define('OPTIONS_FRAMEWORK_DIRECTORY', PARENT_URL . '/admin/');
+ define('OPTIONS_FRAMEWORK_URL', PARENT_URL . '/admin/');
+ define('OPTIONS_FRAMEWORK_DIRECTORY', PARENT_DIR . '/admin/');
-require_once (OPTIONS_FRAMEWORK_URL . 'options-framework.php');
+require_once (OPTIONS_FRAMEWORK_DIRECTORY . 'options-framework.php');
}
@@ -245,7 +245,7 @@ function skeleton_setup() {
// Make theme available for translation
// Translations can be filed in the /languages/ directory
- load_theme_textdomain( 'skeleton', PARENT_DIR . '/languages' );
+ load_theme_textdomain( 'smpl', PARENT_DIR . '/languages' );
$locale = get_locale();
$locale_file = PARENT_DIR . "/languages/$locale.php";
View
10 skeleton/header.php
@@ -67,7 +67,7 @@
html.ie .gallery .gallery-item img,
html.ie .gallery .gallery-item img.thumbnail,
html.ie .widget-container,
-html.ie #author-info {behavior: url("<?php echo get_template_directory_uri();?>/PIE.php");position: relative;}</style>
+html.ie #author-info {behavior: url("<?php echo get_stylesheet_directory_uri();?>/PIE.php");position: relative;}</style>
<![endif]-->
@@ -79,13 +79,13 @@
<!-- Favicons
================================================== -->
-<link rel="shortcut icon" href="<?php echo get_template_directory_uri();?>/images/favicon.ico">
+<link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri();?>/images/favicon.ico">
-<link rel="apple-touch-icon" href="<?php echo get_template_directory_uri();?>/images/apple-touch-icon.png">
+<link rel="apple-touch-icon" href="<?php echo get_stylesheet_directory_uri();?>/images/apple-touch-icon.png">
-<link rel="apple-touch-icon" sizes="72x72" href="<?php echo get_template_directory_uri();?>/images/apple-touch-icon-72x72.png" />
+<link rel="apple-touch-icon" sizes="72x72" href="<?php echo get_stylesheet_directory_uri();?>/images/apple-touch-icon-72x72.png" />
-<link rel="apple-touch-icon" sizes="114x114" href="<?php echo get_template_directory_uri();?>/images/apple-touch-icon-114x114.png" />
+<link rel="apple-touch-icon" sizes="114x114" href="<?php echo get_stylesheet_directory_uri();?>/images/apple-touch-icon-114x114.png" />
<link rel="pingback" href="<?php echo get_option('siteurl') .'/xmlrpc.php';?>" />
<link rel="stylesheet" id="custom" href="<?php echo home_url() .'/?get_styles=css';?>" type="text/css" media="all" />
View
54 skeleton/jigoshop/loop-shop.php
@@ -0,0 +1,54 @@
+<?php
+
+global $columns, $post, $per_page, $wp_query;
+
+do_action('jigoshop_before_shop_loop');
+
+$loop = 0;
+
+if (!isset($columns) || !$columns) $columns = apply_filters('loop_shop_columns', 3);
+if (!isset($per_page) || !$per_page) $per_page = apply_filters('loop_shop_per_page', get_option('posts_per_page'));
+
+if ($per_page > get_option('posts_per_page')) query_posts( array_merge( $wp_query->query, array( 'posts_per_page' => $per_page ) ) );
+
+ob_start();
+
+if (have_posts()) : while (have_posts()) : the_post(); $_product = &new jigoshop_product( $post->ID ); $loop++;
+
+ ?>
+ <li class="product <?php if ($loop%$columns==0) echo 'last'; if (($loop-1)%$columns==0) echo 'first'; ?>">
+
+ <?php do_action('jigoshop_before_shop_loop_item'); ?>
+
+ <a href="<?php the_permalink(); ?>">
+
+ <strong><?php the_title(); ?></strong>
+
+ <?php do_action('jigoshop_before_shop_loop_item_title', $post, $_product); ?>
+
+
+ <?php do_action('jigoshop_after_shop_loop_item_title', $post, $_product); ?>
+
+ </a>
+
+ <?php do_action('jigoshop_after_shop_loop_item', $post, $_product); ?>
+
+ </li><?php
+
+ if ($loop==$per_page) break;
+
+endwhile; endif;
+
+if ($loop==0) :
+
+ echo '<p class="info">'.__('No products found which match your selection.', 'jigoshop').'</p>';
+
+else :
+
+ $found_posts = ob_get_clean();
+
+ echo '<ul class="products">' . $found_posts . '</ul><div class="clear"></div>';
+
+endif;
+
+do_action('jigoshop_after_shop_loop');
View
0  skeleton/product_taxonomy.php → skeleton/jigoshop/product_taxonomy.php
File renamed without changes
View
0  skeleton/single-product.php → skeleton/jigoshop/single-product.php
File renamed without changes
View
0  skeleton/taxonomy-product_cat.php → skeleton/jigoshop/taxonomy-product_cat.php
File renamed without changes
View
0  skeleton/taxonomy-product_tag.php → skeleton/jigoshop/taxonomy-product_tag.php
File renamed without changes
View
55 skeleton/loop-shop.php
@@ -1,54 +1 @@
-<?php
-
-global $columns, $post, $per_page, $wp_query;
-
-do_action('jigoshop_before_shop_loop');
-
-$loop = 0;
-
-if (!isset($columns) || !$columns) $columns = apply_filters('loop_shop_columns', 3);
-if (!isset($per_page) || !$per_page) $per_page = apply_filters('loop_shop_per_page', get_option('posts_per_page'));
-
-if ($per_page > get_option('posts_per_page')) query_posts( array_merge( $wp_query->query, array( 'posts_per_page' => $per_page ) ) );
-
-ob_start();
-
-if (have_posts()) : while (have_posts()) : the_post(); $_product = &new jigoshop_product( $post->ID ); $loop++;
-
- ?>
- <li class="product <?php if ($loop%$columns==0) echo 'last'; if (($loop-1)%$columns==0) echo 'first'; ?>">
-
- <?php do_action('jigoshop_before_shop_loop_item'); ?>
-
- <a href="<?php the_permalink(); ?>">
-
- <strong><?php the_title(); ?></strong>
-
- <?php do_action('jigoshop_before_shop_loop_item_title', $post, $_product); ?>
-
-
- <?php do_action('jigoshop_after_shop_loop_item_title', $post, $_product); ?>
-
- </a>
-
- <?php do_action('jigoshop_after_shop_loop_item', $post, $_product); ?>
-
- </li><?php
-
- if ($loop==$per_page) break;
-
-endwhile; endif;
-
-if ($loop==0) :
-
- echo '<p class="info">'.__('No products found which match your selection.', 'jigoshop').'</p>';
-
-else :
-
- $found_posts = ob_get_clean();
-
- echo '<ul class="products">' . $found_posts . '</ul><div class="clear"></div>';
-
-endif;
-
-do_action('jigoshop_after_shop_loop');
+<?php jigoshop_get_template( 'jigoshop/loop-shop.php' ); ?>
View
17 skeleton/options.php
@@ -28,21 +28,18 @@ function optionsframework_option_name() {
*
*/
-function optionsframework_options() {
-
- // Background Defaults
-
+function optionsframework_options() {
+
+ // If using image radio buttons, define a directory path
+ $imagepath = get_bloginfo('template_directory') . '/images/';
+
+ // Background Defaults
$body_background_defaults = array(
'color' => '#fcfcfc',
- 'image' => site_url('wp-content/themes/skeleton/images/border_top.png'),
+ 'image' => $imagepath.'border_top.png',
'repeat' => 'repeat-x',
'position' => 'top center',
'attachment'=>'fixed');
-
-
-
- // If using image radio buttons, define a directory path
- $imagepath = get_bloginfo('template_directory') . '/images/';
$options = array();
View
18 skeleton_childtheme/functions.php
@@ -59,11 +59,11 @@
/* Set Proper Parent/Child theme paths for inclusion
/*-----------------------------------------------------------------------------------*/
-define( 'PARENT_DIR', get_template_directory() );
-define( 'CHILD_DIR', get_stylesheet_directory() );
+@define( 'PARENT_DIR', get_template_directory() );
+@define( 'CHILD_DIR', get_stylesheet_directory() );
-define( 'PARENT_URL', get_template_directory_uri() );
-define( 'CHILD_URL', get_stylesheet_directory_uri() );
+@define( 'PARENT_URL', get_template_directory_uri() );
+@define( 'CHILD_URL', get_stylesheet_directory_uri() );
@@ -74,9 +74,11 @@
if ( !function_exists( 'optionsframework_init' ) ) {
-define('OPTIONS_FRAMEWORK_URL', PARENT_DIR . '/admin/');
-define('OPTIONS_FRAMEWORK_DIRECTORY', get_bloginfo('template_directory') . '/admin/');
-require_once (OPTIONS_FRAMEWORK_URL . 'options-framework.php');
+ define('OPTIONS_FRAMEWORK_URL', PARENT_URL . '/admin/');
+ define('OPTIONS_FRAMEWORK_DIRECTORY', PARENT_DIR . '/admin/');
+
+require_once (OPTIONS_FRAMEWORK_DIRECTORY . 'options-framework.php');
+
}
if ( class_exists( 'jigoshop' ) ) {
@@ -228,7 +230,7 @@ function skeleton_setup() {
// Make theme available for translation
// Translations can be filed in the /languages/ directory
- load_theme_textdomain( 'skeleton', PARENT_DIR . '/languages' );
+ load_theme_textdomain( 'smpl', PARENT_DIR . '/languages' );
$locale = get_locale();
$locale_file = PARENT_DIR . "/languages/$locale.php";

No commit comments for this range

Something went wrong with that request. Please try again.