framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
Ben Word
2014-10-24 17:56:17 -05:00
parent 9b8eb85fb6 246594f230
commit 7dd0f0b755
17 changed files with 62 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@@ -1,3 +1,12 @@
### 7.0.2: October 24th, 2014
* Simplify comments, use core comment form and list
* Remove HTML5 shiv from Modernizr build
* Move JavaScript to footer
* Update hEntry schema to use `updated` instead of `published`
* Move variables into `main.less`
* Add `roots_body_class` function that checks for page slug in `body_class`
* Move `wp_footer` from footer template into `base.php`
### 7.0.1: August 15th, 2014
* Move `<main>` and `.sidebar` markup out of PHP and into LESS
* Define `WP_ENV` if it is not already defined

1
assets/less/_bootstrap.less
View File

@@ -6,7 +6,6 @@
// Variables
@import "../vendor/bootstrap/less/variables";
@import "_variables"; // Bootstrap variable overrides and custom variables
// Mixins: Utilities
@import "../vendor/bootstrap/less/mixins/hide-text";

3
assets/less/main.less
View File

@@ -1,6 +1,9 @@
// Bootstrap
@import "_bootstrap";
// Variable overrides and custom variables
@import "_variables";
// Roots
@import "_global"; // Base styling & custom mixins
@import "components/_buttons"; // Button tweaks

2
base.php
View File

@@ -27,5 +27,7 @@
<?php get_template_part('templates/footer'); ?>
<?php wp_footer(); ?>
</body>
</html>

2
bower.json
View File

@@ -1,6 +1,6 @@
{
"name": "roots",
"version": "7.0.1",
"version": "7.0.2",
"homepage": "http://roots.io",
"authors": [
"Ben Word <ben@benword.com>"

1
functions.php
View File

@@ -19,7 +19,6 @@ $roots_includes = array(
'lib/titles.php', // Page titles
'lib/nav.php', // Custom nav modifications
'lib/gallery.php', // Custom [gallery] modifications
'lib/comments.php', // Custom comments modifications
'lib/scripts.php', // Scripts and stylesheets
'lib/extras.php', // Custom functions
);

88
lang/roots.pot
View File

@@ -1,5 +1,4 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,10 +19,12 @@ msgid "an out-of-date link"
msgstr ""
#: base.php:6
msgid "You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience."
msgid ""
"You are using an <strong>outdated</strong> browser. Please <a href=\"http://"
"browsehappy.com/\">upgrade your browser</a> to improve your experience."
msgstr ""
#: functions.php:29
#: functions.php:28
msgid "Error locating %s for inclusion"
msgstr ""
@@ -48,7 +49,9 @@ msgid "%s Theme Activation"
msgstr ""
#: lib/activation.php:52
msgid "These settings are optional and should usually be used only on a fresh installation"
msgid ""
"These settings are optional and should usually be used only on a fresh "
"installation"
msgstr ""
#: lib/activation.php:59 lib/activation.php:62
@@ -110,11 +113,11 @@ msgstr ""
msgid "Continued"
msgstr ""
#: lib/init.php:36
#: lib/init.php:40
msgid "Primary"
msgstr ""
#: lib/init.php:45
#: lib/init.php:49
msgid "Footer"
msgstr ""
@@ -146,21 +149,10 @@ msgstr ""
msgid "Not Found"
msgstr ""
#: templates/comment.php:4
msgid "%1$s"
msgstr ""
#: templates/comment.php:5
msgid "(Edit)"
msgstr ""
#: templates/comment.php:9
msgid "Your comment is awaiting moderation."
msgstr ""
#: templates/comments.php:9
msgid "One Response to &ldquo;%2$s&rdquo;"
msgid_plural "%1$s Responses to &ldquo;%2$s&rdquo;"
msgctxt "comments title"
msgid "One response to &ldquo;%2$s&rdquo;"
msgid_plural "%1$s responses to &ldquo;%2$s&rdquo;"
msgstr[0] ""
msgstr[1] ""
@@ -172,58 +164,10 @@ msgstr ""
msgid "Newer comments &rarr;"
msgstr ""
#: templates/comments.php:30 templates/comments.php:35
#: templates/comments.php:31
msgid "Comments are closed."
msgstr ""
#: templates/comments.php:42
msgid "Leave a Reply"
msgstr ""
#: templates/comments.php:42
msgid "Leave a Reply to %s"
msgstr ""
#: templates/comments.php:45
msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
msgstr ""
#: templates/comments.php:50
msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
msgstr ""
#: templates/comments.php:51
msgid "Log out of this account"
msgstr ""
#: templates/comments.php:51
msgid "Log out &raquo;"
msgstr ""
#: templates/comments.php:55
msgid "Name"
msgstr ""
#: templates/comments.php:55 templates/comments.php:59
msgid " (required)"
msgstr ""
#: templates/comments.php:59
msgid "Email (will not be published)"
msgstr ""
#: templates/comments.php:63
msgid "Website"
msgstr ""
#: templates/comments.php:68
msgid "Comment"
msgstr ""
#: templates/comments.php:71
msgid "Submit Comment"
msgstr ""
#: templates/content-single.php:11
msgid "Pages:"
msgstr ""
@@ -239,6 +183,7 @@ msgstr ""
#: templates/searchform.php:4 templates/searchform.php:6
msgid "Search"
msgstr ""
#. Theme Name of the plugin/theme
msgid "Roots Starter Theme"
msgstr ""
@@ -248,7 +193,10 @@ msgid "http://roots.io/starter-theme/"
msgstr ""
#. Description of the plugin/theme
msgid "Roots is a WordPress starter theme based on HTML5 Boilerplate & Bootstrap. <a href=\"https://github.com/roots/roots/contributors\">Contribute on GitHub</a>"
msgid ""
"Roots is a WordPress starter theme based on HTML5 Boilerplate & Bootstrap. "
"<a href=\"https://github.com/roots/roots/contributors\">Contribute on "
"GitHub</a>"
msgstr ""
#. Author of the plugin/theme

52
lib/comments.php
View File

@@ -1,52 +0,0 @@
<?php
/**
* Use Bootstrap's media object for listing comments
*
* @link http://getbootstrap.com/components/#media
*/
class Roots_Walker_Comment extends Walker_Comment {
function start_lvl(&$output, $depth = 0, $args = array()) {
$GLOBALS['comment_depth'] = $depth + 1; ?>
<ul <?php comment_class('media list-unstyled comment-' . get_comment_ID()); ?>>
<?php
}
function end_lvl(&$output, $depth = 0, $args = array()) {
$GLOBALS['comment_depth'] = $depth + 1;
echo '</ul>';
}
function start_el(&$output, $comment, $depth = 0, $args = array(), $id = 0) {
$depth++;
$GLOBALS['comment_depth'] = $depth;
$GLOBALS['comment'] = $comment;
if (!empty($args['callback'])) {
call_user_func($args['callback'], $comment, $args, $depth);
return;
}
extract($args, EXTR_SKIP); ?>
<li id="comment-<?php comment_ID(); ?>" <?php comment_class('media comment-' . get_comment_ID()); ?>>
<?php include(locate_template('templates/comment.php')); ?>
<?php
}
function end_el(&$output, $comment, $depth = 0, $args = array()) {
if (!empty($args['end-callback'])) {
call_user_func($args['end-callback'], $comment, $args, $depth);
return;
}
// Close ".media-body" <div> located in templates/comment.php, and then the comment's <li>
echo "</div></li>\n";
}
}
function roots_get_avatar($avatar, $type) {
if (!is_object($type)) { return $avatar; }
$avatar = str_replace("class='avatar", "class='avatar pull-left media-object", $avatar);
return $avatar;
}
add_filter('get_avatar', 'roots_get_avatar', 10, 2);

2
lib/init.php
View File

@@ -25,7 +25,7 @@ function roots_setup() {
// Add HTML5 markup for captions
// http://codex.wordpress.org/Function_Reference/add_theme_support#HTML5
add_theme_support('html5', array('caption'));
add_theme_support('html5', array('caption', 'comment-form', 'comment-list'));
// Tell the TinyMCE editor to use a custom stylesheet
add_editor_style('/assets/css/editor-style.css');

6
lib/scripts.php
View File

@@ -8,7 +8,7 @@
* Enqueue scripts in the following order:
* 1. jquery-1.11.1.min.js via Google CDN
* 2. /theme/assets/js/vendor/modernizr.min.js
* 3. /theme/assets/js/scripts.js (in footer)
* 3. /theme/assets/js/scripts.js
*
* Google Analytics is loaded after enqueued scripts if:
* - An ID has been defined in config.php
@@ -46,7 +46,7 @@ function roots_scripts() {
*/
if (!is_admin() && current_theme_supports('jquery-cdn')) {
wp_deregister_script('jquery');
wp_register_script('jquery', $assets['jquery'], array(), null, false);
wp_register_script('jquery', $assets['jquery'], array(), null, true);
add_filter('script_loader_src', 'roots_jquery_local_fallback', 10, 2);
}
@@ -54,7 +54,7 @@ function roots_scripts() {
wp_enqueue_script('comment-reply');
}
wp_enqueue_script('modernizr', get_template_directory_uri() . $assets['modernizr'], array(), null, false);
wp_enqueue_script('modernizr', get_template_directory_uri() . $assets['modernizr'], array(), null, true);
wp_enqueue_script('jquery');
wp_enqueue_script('roots_js', get_template_directory_uri() . $assets['js'], array(), null, true);
}

14
lib/utils.php
View File

@@ -14,3 +14,17 @@ function roots_get_search_form($form) {
return $form;
}
add_filter('get_search_form', 'roots_get_search_form');
/**
* Add page slug to body_class() classes if it doesn't exist
*/
function roots_body_class($classes) {
// Add post/page slug
if (is_single() || is_page() && !is_front_page()) {
if (!in_array(basename(get_permalink()), $classes)) {
$classes[] = basename(get_permalink());
}
}
return $classes;
}
add_filter('body_class', 'roots_body_class');

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "roots",
"version": "7.0.1",
"version": "7.0.2",
"author": "Ben Word <ben@benword.com>",
"homepage": "http://roots.io",
"repository": {

2
style.css
View File

@@ -2,7 +2,7 @@
Theme Name: Roots Starter Theme
Theme URI: http://roots.io/starter-theme/
Description: Roots is a WordPress starter theme based on HTML5 Boilerplate & Bootstrap. <a href="https://github.com/roots/roots/contributors">Contribute on GitHub</a>
Version: 7.0.1
Version: 7.0.2
Author: Roots
Author URI: http://roots.io/

14
templates/comment.php
View File

@@ -1,14 +0,0 @@
<?php echo get_avatar($comment, $size = '64'); ?>
<div class="media-body">
<h4 class="media-heading"><?php echo get_comment_author_link(); ?></h4>
<time datetime="<?php echo get_comment_date('c'); ?>"><a href="<?php echo htmlspecialchars(get_comment_link($comment->comment_ID)); ?>"><?php printf(__('%1$s', 'roots'), get_comment_date(), get_comment_time()); ?></a></time>
<?php edit_comment_link(__('(Edit)', 'roots'), '', ''); ?>
<?php if ($comment->comment_approved == '0') : ?>
<div class="alert alert-info">
<?php _e('Your comment is awaiting moderation.', 'roots'); ?>
</div>
<?php endif; ?>
<?php comment_text(); ?>
<?php comment_reply_link(array_merge($args, array('depth' => $depth, 'max_depth' => $args['max_depth']))); ?>

57
templates/comments.php
View File

@@ -4,12 +4,12 @@
}
?>
<section id="comments">
<section id="comments" class="comments">
<?php if (have_comments()) : ?>
<h3><?php printf(_n('One Response to &ldquo;%2$s&rdquo;', '%1$s Responses to &ldquo;%2$s&rdquo;', get_comments_number(), 'roots'), number_format_i18n(get_comments_number()), get_the_title()); ?></h3>
<h2><?php printf(_nx('One response to &ldquo;%2$s&rdquo;', '%1$s responses to &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'roots'), number_format_i18n(get_comments_number()), '<span>' . get_the_title() . '</span>'); ?></h2>
<ol class="media-list">
<?php wp_list_comments(array('walker' => new Roots_Walker_Comment)); ?>
<ol class="comment-list">
<?php wp_list_comments(array('style' => 'ol', 'short_ping' => true)); ?>
</ol>
<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : ?>
@@ -24,54 +24,13 @@
</ul>
</nav>
<?php endif; ?>
<?php endif; // have_comments() ?>
<?php if (!comments_open() && !is_page() && post_type_supports(get_post_type(), 'comments')) : ?>
<div class="alert alert-warning">
<?php _e('Comments are closed.', 'roots'); ?>
</div>
<?php endif; ?>
<?php elseif(!comments_open() && !is_page() && post_type_supports(get_post_type(), 'comments')) : ?>
<?php if (!comments_open() && get_comments_number() != '0' && post_type_supports(get_post_type(), 'comments')) : ?>
<div class="alert alert-warning">
<?php _e('Comments are closed.', 'roots'); ?>
</div>
<?php endif; ?>
</section><!-- /#comments -->
<section id="respond">
<?php if (comments_open()) : ?>
<h3><?php comment_form_title(__('Leave a Reply', 'roots'), __('Leave a Reply to %s', 'roots')); ?></h3>
<p class="cancel-comment-reply"><?php cancel_comment_reply_link(); ?></p>
<?php if (get_option('comment_registration') && !is_user_logged_in()) : ?>
<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'roots'), wp_login_url(get_permalink())); ?></p>
<?php else : ?>
<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
<?php if (is_user_logged_in()) : ?>
<p>
<?php printf(__('Logged in as <a href="%s/wp-admin/profile.php">%s</a>.', 'roots'), get_option('siteurl'), $user_identity); ?>
<a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'roots'); ?>"><?php _e('Log out &raquo;', 'roots'); ?></a>
</p>
<?php else : ?>
<div class="form-group">
<label for="author"><?php _e('Name', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
<input type="text" class="form-control" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" <?php if ($req) echo 'aria-required="true"'; ?>>
</div>
<div class="form-group">
<label for="email"><?php _e('Email (will not be published)', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
<input type="email" class="form-control" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" <?php if ($req) echo 'aria-required="true"'; ?>>
</div>
<div class="form-group">
<label for="url"><?php _e('Website', 'roots'); ?></label>
<input type="url" class="form-control" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22">
</div>
<?php endif; ?>
<div class="form-group">
<label for="comment"><?php _e('Comment', 'roots'); ?></label>
<textarea name="comment" id="comment" class="form-control" rows="5" aria-required="true"></textarea>
</div>
<p><input name="submit" class="btn btn-primary" type="submit" id="submit" value="<?php _e('Submit Comment', 'roots'); ?>"></p>
<?php comment_id_fields(); ?>
<?php do_action('comment_form', $post->ID); ?>
</form>
<?php endif; ?>
<?php endif; ?>
</section><!-- /#respond -->
<?php comment_form(); ?>
</section>

2
templates/entry-meta.php
View File

@@ -1,2 +1,2 @@
<time class="published" datetime="<?php echo get_the_time('c'); ?>"><?php echo get_the_date(); ?></time>
<time class="updated" datetime="<?php echo get_the_time('c'); ?>"><?php echo get_the_date(); ?></time>
<p class="byline author vcard"><?php echo __('By', 'roots'); ?> <a href="<?php echo get_author_posts_url(get_the_author_meta('ID')); ?>" rel="author" class="fn"><?php echo get_the_author(); ?></a></p>

2
templates/footer.php
View File

@@ -3,5 +3,3 @@
<?php dynamic_sidebar('sidebar-footer'); ?>
</div>
</footer>
<?php wp_footer(); ?>