Skip to content
This repository has been archived by the owner on Sep 16, 2019. It is now read-only.

Convert spaces to tabs, fix indention, remove trailing whitespace, ensure newline at EOF. #79

Merged
merged 1 commit into from
Jul 23, 2014
+567 −586
Merged

Convert spaces to tabs, fix indention, remove trailing whitespace, ensure newline at EOF. #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 404.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="row">
<div class="small-12 large-8 columns" role="main">

<article <?php post_class() ?> id="post-<?php the_ID(); ?>">
<header>
<h1 class="entry-title"><?php _e('File Not Found', 'FoundationPress'); ?></h1>
Expand All @@ -12,7 +12,7 @@
<p class="bottom"><?php _e('The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.', 'FoundationPress'); ?></p>
</div>
<p><?php _e('Please try the following:', 'FoundationPress'); ?></p>
<ul>
<ul>
<li><?php _e('Check your spelling', 'FoundationPress'); ?></li>
<li><?php printf(__('Return to the <a href="%s">home page</a>', 'FoundationPress'), home_url()); ?></li>
<li><?php _e('Click the <a href="javascript:history.back()">Back</a> button', 'FoundationPress'); ?></li>
Expand Down
14 changes: 7 additions & 7 deletions archive.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
<div class="row">
<!-- Row for main content area -->
<div class="small-12 large-8 columns" role="main">

<?php if ( have_posts() ) : ?>

<?php /* Start the Loop */ ?>
<?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', get_post_format() ); ?>
<?php endwhile; ?>

<?php else : ?>
<?php get_template_part( 'content', 'none' ); ?>

<?php endif; // end have_posts() check ?>

<?php /* Display navigation to next/previous pages when applicable */ ?>
<?php if ( function_exists('FoundationPress_pagination') ) { FoundationPress_pagination(); } else if ( is_paged() ) { ?>
<nav id="post-nav">
Expand All @@ -25,5 +25,5 @@

</div>
<?php get_sidebar(); ?>
</div>
<?php get_footer(); ?>
</div>
<?php get_footer(); ?>
12 changes: 6 additions & 6 deletions comments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
<?php edit_comment_link(__('(Edit)', 'FoundationPress'), '', '') ?>
</div>
</header>

<?php if ($comment->comment_approved == '0') : ?>
<div class="notice">
<div class="notice">
<p class="bottom"><?php _e('Your comment is awaiting moderation.', 'FoundationPress') ?></p>
</div>
</div>
<?php endif; ?>

<section class="comment">
<?php comment_text() ?>
<?php comment_reply_link(array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
Expand Down Expand Up @@ -46,7 +46,7 @@
<h3><?php comments_number(__('No Responses to', 'FoundationPress'), __('One Response to', 'FoundationPress'), __('% Responses to', 'FoundationPress') ); ?> &#8220;<?php the_title(); ?>&#8221;</h3>
<ol class="commentlist">
<?php wp_list_comments('type=comment&callback=FoundationPress_comments'); ?>

</ol>
<footer>
<nav id="comments-nav">
Expand Down Expand Up @@ -91,4 +91,4 @@
</form>
<?php endif; // If registration required and not logged in ?>
</section>
<?php endif; // if you delete this the sky will fall on your head ?>
<?php endif; // if you delete this the sky will fall on your head ?>
2 changes: 1 addition & 1 deletion content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
<?php $tag = get_the_tags(); if (!$tag) { } else { ?><p><?php the_tags(); ?></p><?php } ?>
</footer>
<hr />
</article>
</article>
8 changes: 4 additions & 4 deletions footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<?php do_action('foundationPress_after_footer'); ?>
</footer>
<a class="exit-off-canvas"></a>
<?php do_action('foundationPress_layout_end'); ?>
</div>

<?php do_action('foundationPress_layout_end'); ?>
</div>
</div>
<?php wp_footer(); ?>
<?php do_action('foundationPress_before_closing_body'); ?>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


// Various clean up functions
require_once('library/cleanup.php');
require_once('library/cleanup.php');

// Required for Foundation to work properly
require_once('library/foundation.php');
Expand All @@ -29,4 +29,4 @@
// Add theme support
require_once('library/theme-support.php');

?>
?>
130 changes: 63 additions & 67 deletions header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,70 @@
<!doctype html>
<html class="no-js" <?php language_attributes(); ?> >
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><?php if ( is_category() ) {
echo 'Category Archive for &quot;'; single_cat_title(); echo '&quot; | '; bloginfo( 'name' );
} elseif ( is_tag() ) {
echo 'Tag Archive for &quot;'; single_tag_title(); echo '&quot; | '; bloginfo( 'name' );
} elseif ( is_archive() ) {
wp_title(''); echo ' Archive | '; bloginfo( 'name' );
} elseif ( is_search() ) {
echo 'Search for &quot;'.esc_html($s).'&quot; | '; bloginfo( 'name' );
} elseif ( is_home() || is_front_page() ) {
bloginfo( 'name' ); echo ' | '; bloginfo( 'description' );
} elseif ( is_404() ) {
echo 'Error 404 Not Found | '; bloginfo( 'name' );
} elseif ( is_single() ) {
wp_title('');
} else {
echo wp_title( ' | ', 'false', 'right' ); bloginfo( 'name' );
} ?></title>

<link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri() ; ?>/css/app.css" />

<link rel="icon" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/favicon.ico" type="image/x-icon">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/apple-touch-icon-144x144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/apple-touch-icon-114x114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/apple-touch-icon-72x72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/apple-touch-icon-precomposed.png">

<?php wp_head(); ?>
</head>
<body <?php body_class(); ?>>
<?php do_action('foundationPress_after_body'); ?>

<div class="off-canvas-wrap" data-offcanvas>
<div class="inner-wrap">

<?php do_action('foundationPress_layout_start'); ?>

<nav class="tab-bar show-for-small-only">
<section class="left-small">
<a class="left-off-canvas-toggle menu-icon" ><span></span></a>
</section>
<section class="middle tab-bar-section">

<h1 class="title"><?php bloginfo( 'name' ); ?></h1>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><?php if ( is_category() ) {
echo 'Category Archive for &quot;'; single_cat_title(); echo '&quot; | '; bloginfo( 'name' );
} elseif ( is_tag() ) {
echo 'Tag Archive for &quot;'; single_tag_title(); echo '&quot; | '; bloginfo( 'name' );
} elseif ( is_archive() ) {
wp_title(''); echo ' Archive | '; bloginfo( 'name' );
} elseif ( is_search() ) {
echo 'Search for &quot;'.esc_html($s).'&quot; | '; bloginfo( 'name' );
} elseif ( is_home() || is_front_page() ) {
bloginfo( 'name' ); echo ' | '; bloginfo( 'description' );
} elseif ( is_404() ) {
echo 'Error 404 Not Found | '; bloginfo( 'name' );
} elseif ( is_single() ) {
wp_title('');
} else {
echo wp_title( ' | ', 'false', 'right' ); bloginfo( 'name' );
} ?></title>

</section>
</nav>
<link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri() ; ?>/css/app.css" />

<aside class="left-off-canvas-menu">
<?php foundationPress_mobile_off_canvas(); ?>
</aside>

<div class="top-bar-container contain-to-grid show-for-medium-up">
<nav class="top-bar" data-topbar="">
<ul class="title-area">
<li class="name">
<h1><a href="<?php echo home_url(); ?>"><?php bloginfo('name'); ?></a></h1>
</li>
</ul>
<section class="top-bar-section">
<?php foundationPress_top_bar_l(); ?>
<?php foundationPress_top_bar_r(); ?>
</section>
</nav>
</div>
<link rel="icon" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/favicon.ico" type="image/x-icon">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/apple-touch-icon-144x144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/apple-touch-icon-114x114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/apple-touch-icon-72x72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="<?php echo get_stylesheet_directory_uri() ; ?>/assets/img/icons/apple-touch-icon-precomposed.png">

<?php wp_head(); ?>
</head>
<body <?php body_class(); ?>>
<?php do_action('foundationPress_after_body'); ?>

<div class="off-canvas-wrap" data-offcanvas>
<div class="inner-wrap">

<section class="container" role="document">
<?php do_action('foundationPress_after_header'); ?>
<?php do_action('foundationPress_layout_start'); ?>

<nav class="tab-bar show-for-small-only">
<section class="left-small">
<a class="left-off-canvas-toggle menu-icon" ><span></span></a>
</section>
<section class="middle tab-bar-section">
<h1 class="title"><?php bloginfo( 'name' ); ?></h1>
</section>
</nav>

<aside class="left-off-canvas-menu">
<?php foundationPress_mobile_off_canvas(); ?>
</aside>

<div class="top-bar-container contain-to-grid show-for-medium-up">
<nav class="top-bar" data-topbar="">
<ul class="title-area">
<li class="name">
<h1><a href="<?php echo home_url(); ?>"><?php bloginfo('name'); ?></a></h1>
</li>
</ul>
<section class="top-bar-section">
<?php foundationPress_top_bar_l(); ?>
<?php foundationPress_top_bar_r(); ?>
</section>
</nav>
</div>

<section class="container" role="document">
<?php do_action('foundationPress_after_header'); ?>
8 changes: 4 additions & 4 deletions hero.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

<div class="row">
<div class="small-12 large-8 columns" role="main">

<?php do_action('foundationPress_before_content'); ?>

<?php while (have_posts()) : the_post(); ?>
<article <?php post_class() ?> id="post-<?php the_ID(); ?>">
<header>
Expand All @@ -51,5 +51,5 @@
</div>

<?php get_sidebar(); ?>
</div>
<?php get_footer(); ?>
</div>
<?php get_footer(); ?>
26 changes: 13 additions & 13 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<?php get_header(); ?>
<div class="row">
<div class="small-12 large-8 columns" role="main">

<?php if ( have_posts() ) : ?>

<?php do_action('foundationPress_before_content'); ?>

<?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', get_post_format() ); ?>
<?php endwhile; ?>

<?php else : ?>
<?php get_template_part( 'content', 'none' ); ?>

<?php do_action('foundationPress_before_pagination'); ?>

<?php endif;?>



<?php if ( function_exists('FoundationPress_pagination') ) { FoundationPress_pagination(); } else if ( is_paged() ) { ?>
<nav id="post-nav">
<div class="post-previous"><?php next_posts_link( __( '&larr; Older posts', 'FoundationPress' ) ); ?></div>
<div class="post-next"><?php previous_posts_link( __( 'Newer posts &rarr;', 'FoundationPress' ) ); ?></div>
</nav>
<?php } ?>

<?php do_action('foundationPress_after_content'); ?>

</div>
<?php get_sidebar(); ?>
</div>
<?php get_footer(); ?>
</div>
<?php get_footer(); ?>
Loading