Skip to content

Commit

Permalink
Bump version to 1.5.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
connor-baer committed Jun 3, 2018
1 parent 9031750 commit 7876baf
Show file tree
Hide file tree
Showing 36 changed files with 413 additions and 362 deletions.
6 changes: 4 additions & 2 deletions 404.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
<header class="header -entry -no-featured">
<div class="header-outer">
<h1 class="header-title"><?php esc_html_e( '404: Page not found.', 'uwc-website' ); ?></h1>
<h2 class="header-summary"><p><?php
<h2 class="header-summary"><p>
<?php
echo esc_html_e( 'Sorry, the page you’re looking for doesn’t exist. Check the URL for errors or try searching for it below.', 'uwc-website' );
?></p></h2>
?>
</p></h2>
</div>
</header>

Expand Down
9 changes: 6 additions & 3 deletions archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<main id="main" class="site-main" role="main">

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

<header class="header -entry -no-featured">
<div class="header-outer">
Expand All @@ -23,7 +24,8 @@
</header>
<?php
/* Start the Loop */
while ( have_posts() ) : the_post();
while ( have_posts() ) :
the_post();

/*
* Include the Post-Format-specific template for the content.
Expand All @@ -41,7 +43,8 @@

get_template_part( 'components/content', 'none' );

endif; ?>
endif;
?>

</main>
</div>
Expand Down
9 changes: 6 additions & 3 deletions category.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<main id="main" class="site-main" role="main">

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

<header class="header -entry -no-featured">
<div class="header-outer">
Expand All @@ -23,7 +24,8 @@
</header>
<?php
/* Start the Loop */
while ( have_posts() ) : the_post();
while ( have_posts() ) :
the_post();

/*
* Include the Post-Format-specific template for the content.
Expand All @@ -41,7 +43,8 @@

get_template_part( 'components/content', 'none' );

endif; ?>
endif;
?>

</main>
</div>
Expand Down
9 changes: 6 additions & 3 deletions components/content-link.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
the_title( '<h1 class="header-title">', '</h1>' );
} else {
the_title( '<h2 class="header-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
} ?>
}
?>
<h2 class="header-summary"><?php the_excerpt(); ?></h2>
</div>
</div>
Expand All @@ -33,13 +34,15 @@
<?php echo '<p><a href="' . esc_url( get_field( 'link_url' ) ) . '" rel="bookmark" target="_blank">' . esc_html__( 'Continue reading', 'uwc-website' ) . '...</a></p>'; ?>
</div>

<?php if ( $tags = get_the_tags() ) {
<?php
if ( $tags = get_the_tags() ) {
echo '<p class="post-tags">';
foreach ( $tags as $tag ) {
$sep = ( end( $tags ) === $tag ) ? '' : ', ';
echo '<a href="' . esc_url( get_term_link( $tag, $tag->taxonomy ) ) . '">#' . esc_html( $tag->name ) . '</a>' . esc_html( $sep );
}
echo '</p>';
} ?>
}
?>

</article><!-- #post-## -->
9 changes: 6 additions & 3 deletions components/content-none.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@
<div class="entry-content">
<h1><?php esc_html_e( 'Nothing Found', 'uwc-website' ); ?></h1>
<?php
if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
if ( is_home() && current_user_can( 'publish_posts' ) ) :
?>

<p><?php printf( wp_kses( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'uwc-website' ), array( 'a' => array( 'href' => array() ) ) ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>

<?php elseif ( is_search() ) :
get_search_form(); ?>
<?php
elseif ( is_search() ) :
get_search_form();
?>

<p><?php esc_html_e( 'Sorry, but nothing matched your search terms.', 'uwc-website' ); ?></p>
<?php else : ?>
Expand Down
29 changes: 17 additions & 12 deletions components/content-section.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,24 @@
<h2 class="header-summary">
<?php the_excerpt(); ?>
</h2>
<a href="<?php the_field( 'cta_url' ) ?>" class="header-button"><?php the_field( 'cta_text' ) ?></a>
<a href="<?php the_field( 'cta_url' ); ?>" class="header-button"><?php the_field( 'cta_text' ); ?></a>
</div>
<?php else : ?>
<nav class="header-navigation">
<?php if ( has_nav_menu( 'primary' ) ) {
wp_nav_menu( array(
'theme_location' => 'primary',
'sub_menu' => true,
'depth' => '2',
'container' => 'nav',
'container_class' => 'header-links',
'fallback_cb' => 'false',
) );
} ?>
<?php
if ( has_nav_menu( 'primary' ) ) {
wp_nav_menu(
array(
'theme_location' => 'primary',
'sub_menu' => true,
'depth' => '2',
'container' => 'nav',
'container_class' => 'header-links',
'fallback_cb' => 'false',
)
);
}
?>
</nav>
<?php endif; ?>
</div>
Expand All @@ -51,7 +55,8 @@
if ( have_rows( 'modules' ) ) :

// Loop through the rows of data.
while ( have_rows( 'modules' ) ) : the_row();
while ( have_rows( 'modules' ) ) :
the_row();

if ( get_row_layout() === 'text_image' ) :
get_template_part( 'components/module', 'textimage' );
Expand Down
31 changes: 19 additions & 12 deletions components/content-standard.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
the_title( '<h1 class="header-title">', '</h1>' );
} else {
the_title( '<h2 class="header-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
} ?>
}
?>
<h2 class="header-summary"><?php the_excerpt(); ?></h2>
</div>
</div>
Expand All @@ -37,26 +38,32 @@
<div class="entry-content">
<?php

the_content( sprintf(
/* translators: %s: Name of current post. */
wp_kses( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'uwc-website' ), array( 'span' => array( 'class' => array() ) ) ),
the_title( '<span class="screen-reader-text">"', '"</span>', false )
) );
the_content(
sprintf(
/* translators: %s: Name of current post. */
wp_kses( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'uwc-website' ), array( 'span' => array( 'class' => array() ) ) ),
the_title( '<span class="screen-reader-text">"', '"</span>', false )
)
);

wp_link_pages( array(
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'uwc-website' ),
'after' => '</div>',
) );
wp_link_pages(
array(
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'uwc-website' ),
'after' => '</div>',
)
);
?>
</div>

<?php if ( $tags = get_the_tags() ) {
<?php
if ( $tags = get_the_tags() ) {
echo '<p class="post-tags">';
foreach ( $tags as $tag ) {
$sep = ( end( $tags ) === $tag ) ? '' : ', ';
echo '<a href="' . esc_url( get_term_link( $tag, $tag->taxonomy ) ) . '">#' . esc_html( $tag->name ) . '</a>' . esc_html( $sep );
}
echo '</p>';
} ?>
}
?>

</article><!-- #post-## -->
31 changes: 19 additions & 12 deletions components/content-video.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
<div class="header-outer">
<div class="header-inner">
<?php
the_title( '<h1 class="header-title">', '</h1>' ); ?>
the_title( '<h1 class="header-title">', '</h1>' );
?>
<h2 class="header-summary"><?php the_excerpt(); ?></h2>
</div>
</div>
Expand All @@ -35,26 +36,32 @@
<div class="entry-content">
<?php

the_content( sprintf(
/* translators: %s: Name of current post. */
wp_kses( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'uwc-website' ), array( 'span' => array( 'class' => array() ) ) ),
the_title( '<span class="screen-reader-text">"', '"</span>', false )
) );
the_content(
sprintf(
/* translators: %s: Name of current post. */
wp_kses( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'uwc-website' ), array( 'span' => array( 'class' => array() ) ) ),
the_title( '<span class="screen-reader-text">"', '"</span>', false )
)
);

wp_link_pages( array(
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'uwc-website' ),
'after' => '</div>',
) );
wp_link_pages(
array(
'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'uwc-website' ),
'after' => '</div>',
)
);
?>
</div>

<?php if ( $tags = get_the_tags() ) {
<?php
if ( $tags = get_the_tags() ) {
echo '<p class="post-tags">';
foreach ( $tags as $tag ) {
$sep = ( end( $tags ) === $tag ) ? '' : ', ';
echo '<a href="' . esc_url( get_term_link( $tag, $tag->taxonomy ) ) . '">#' . esc_html( $tag->name ) . '</a>' . esc_html( $sep );
}
echo '</p>';
} ?>
}
?>

</article><!-- #post-## -->
6 changes: 4 additions & 2 deletions components/element-link.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@
<?php the_title( '<h2 class="category-title"><a href="' . esc_url( get_field( 'link_url' ) ) . '" rel="bookmark" target="_blank">', '</a></h2>' ); ?>
</header>

<?php if ( $tags = get_the_tags() ) {
<?php
if ( $tags = get_the_tags() ) {
echo '<p class="category-tags">';
foreach ( $tags as $tag ) {
$sep = ( end( $tags ) === $tag ) ? '' : ', ';
echo '<a href="' . esc_url( get_term_link( $tag, $tag->taxonomy ) ) . '">#' . esc_html( $tag->name ) . '</a>' . esc_html( $sep );
}
echo '</p>';
} ?>
}
?>

<p class="category-body"><?php the_excerpt(); ?></p>

Expand Down
6 changes: 4 additions & 2 deletions components/element-standard.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@
<?php the_title( '<h2 class="category-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' ); ?>
</header>

<?php if ( $tags = get_the_tags() ) {
<?php
if ( $tags = get_the_tags() ) {
echo '<p class="category-tags">';
foreach ( $tags as $tag ) {
$sep = ( end( $tags ) === $tag ) ? '' : ', ';
echo '<a href="' . esc_url( get_term_link( $tag, $tag->taxonomy ) ) . '">#' . esc_html( $tag->name ) . '</a>' . esc_html( $sep );
}
echo '</p>';
} ?>
}
?>

<p class="category-body"><?php the_excerpt(); ?></p>

Expand Down
6 changes: 4 additions & 2 deletions components/element-video.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@
<?php the_title( '<h2 class="category-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' ); ?>
</header>

<?php if ( $tags = get_the_tags() ) {
<?php
if ( $tags = get_the_tags() ) {
echo '<p class="category-tags">';
foreach ( $tags as $tag ) {
$sep = ( end( $tags ) === $tag ) ? '' : ', ';
echo '<a href="' . esc_url( get_term_link( $tag, $tag->taxonomy ) ) . '">#' . esc_html( $tag->name ) . '</a>' . esc_html( $sep );
}
echo '</p>';
} ?>
}
?>

<p class="category-body"><?php the_excerpt(); ?></p>

Expand Down
2 changes: 1 addition & 1 deletion components/module-calltoaction.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
?>

<section class="section-cta">
<a href="<?php the_sub_field( 'cta_url' ) ?>"><?php the_sub_field( 'cta_text' ) ?></a>
<a href="<?php the_sub_field( 'cta_url' ); ?>"><?php the_sub_field( 'cta_text' ); ?></a>
</section>
4 changes: 3 additions & 1 deletion components/module-googlemaps.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
<div class="section-wrapper">
<?php if ( have_rows( 'locations' ) ) : ?>
<div class="acf-map">
<?php while ( have_rows( 'locations' ) ) : the_row();
<?php
while ( have_rows( 'locations' ) ) :
the_row();

$location = get_sub_field( 'location' );

Expand Down
10 changes: 7 additions & 3 deletions components/module-logo.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,23 @@
<?php
$headline = get_sub_field( 'lo_headline' );

if ( ! empty( $headline ) ) : ?>
if ( ! empty( $headline ) ) :
?>

<h2 class="section-headline"><?php the_sub_field( 'lo_headline' ); ?></h2>

<?php endif; ?>

<div class="section-logoWrapper">

<?php while ( have_rows( 'lo_logos' ) ) : the_row();
<?php
while ( have_rows( 'lo_logos' ) ) :
the_row();

$image = get_sub_field( 'lo_logo' );

if ( ! empty( $image ) ) : ?>
if ( ! empty( $image ) ) :
?>

<a class="section-link" href="<?php echo esc_url( the_sub_field( 'lo_url' ) ); ?>" title="<?php echo esc_attr( $image['alt'] ); ?>">

Expand Down
16 changes: 9 additions & 7 deletions components/module-newsfeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@

$taxonomies = get_field( 'newsfeed' );

$posts = get_posts(array(
'posts_per_page' => 4,
'category' => $taxonomies,
'orderby' => 'date',
'order' => 'DESC',
'post_status' => 'publish',
));
$posts = get_posts(
array(
'posts_per_page' => 4,
'category' => $taxonomies,
'orderby' => 'date',
'order' => 'DESC',
'post_status' => 'publish',
)
);
$count = count( $posts );

if ( $taxonomies && $count >= 4 ) {
Expand Down
Loading

0 comments on commit 7876baf

Please sign in to comment.