Skip to content

Commit 5fe22f6

Browse files
gregpridaygregpriday
committed
Merge branch 'release/1.1.1'
2 parents 8c5b023 + 99eda5b commit 5fe22f6

36 files changed

+74
-45
lines changed

‎README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ Font created using Icomoon - http://icomoon.io
5252
Change Log
5353
---------------
5454

55+
**1.1.1**
56+
* Properly center meta slider in header
57+
* Updated to latest version of framework.
58+
* Optimized all images.
59+
* Added menu text escaping.
60+
* Fixed center alignment of images with captions.
61+
* Made influence_get_archive_title child themeable
62+
* Fixed image page
63+
5564
**1.1**
5665
* Changed how minified JS files are handled.
5766
* Switched to new Page Builder Lite.

‎demo/assets/slide-2.jpg‎

-2.32 KB
Loading

‎demo/assets/slider-badge-2.png‎

-23.7 KB
Loading

‎demo/assets/slider-badge.png‎

-18 KB
Loading

‎extras‎

‎header.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
<a href="#" class="main-menu-button">
5353
<i class="influence-icon-menu-icon"></i>
54-
<?php echo siteorigin_setting('general_menu_text') ?>
54+
<?php echo esc_html( siteorigin_setting('general_menu_text') ) ?>
5555
</a>
5656

5757
</nav><!-- .site-navigation .main-navigation -->

‎image.php‎

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,53 +15,62 @@
1515

1616
<?php while ( have_posts() ) : the_post(); ?>
1717

18-
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
19-
<header class="entry-header">
20-
<h1 class="entry-title"><?php the_title(); ?></h1>
18+
<article id="post-<?php the_ID(); ?>" <?php post_class('entry'); ?>>
2119

22-
<div class="entry-meta">
23-
<?php echo influence_get_post_meta() ?>
24-
<?php edit_post_link( __( 'Edit', 'influence' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
25-
</div><!-- .entry-meta -->
20+
<div class="post-thumbnail">
21+
<?php $next_attachment_url = influence_next_attachment_url(); ?>
2622

27-
<nav id="image-navigation" class="site-navigation">
28-
<span class="previous-image"><?php previous_image_link( false, __( '&larr; Previous', 'influence' ) ); ?></span>
29-
<span class="next-image"><?php next_image_link( false, __( 'Next &rarr;', 'influence' ) ); ?></span>
30-
</nav><!-- #image-navigation -->
31-
</header><!-- .entry-header -->
23+
<a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment">
24+
<?php
25+
$attachment_size = apply_filters( 'influence_attachment_size', array( 1200, 1200 ) ); // Filterable image size.
26+
echo wp_get_attachment_image( $post->ID, $attachment_size );
27+
?>
28+
</a>
29+
</div>
3230

33-
<div class="entry-content">
31+
<div class="post-text">
3432

35-
<div class="entry-attachment">
36-
<div class="attachment">
37-
<?php $next_attachment_url = influence_next_attachment_url(); ?>
33+
<?php if( get_the_title() ) : ?>
34+
<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'influence' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
35+
<?php endif; ?>
3836

39-
<a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment">
37+
<?php if ( is_search() ) : // Only display Excerpts for Search ?>
38+
<div class="entry-content">
39+
<?php the_excerpt(); ?>
40+
</div><!-- .entry-summary -->
41+
<?php else : ?>
42+
<div class="entry-content">
43+
<?php the_content( '' ); ?>
44+
<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'influence' ), 'after' => '</div>' ) ); ?>
45+
</div><!-- .entry-content -->
46+
<?php endif; ?>
47+
48+
<div class="entry-meta">
49+
<?php if( !is_singular() && ( preg_match( '/<!--more(.*?)?-->/', $post->post_content ) || empty($post->post_title) ) ) : ?>
50+
<div class="continue-reading"><a href="<?php the_permalink() ?>"><?php _e('Continue Reading <span class="meta-nav">&rarr;</span>', 'influence') ?></a></div>
51+
<?php else : ?>
52+
<div class="taxonomy">
4053
<?php
41-
$attachment_size = apply_filters( 'influence_attachment_size', array( 1200, 1200 ) ); // Filterable image size.
42-
echo wp_get_attachment_image( $post->ID, $attachment_size );
54+
the_tags( '<div class="tags"><span class="influence-icon-ribbon"></span>', ', ', '</div>' );
55+
if( influence_categorized_blog() ) the_terms( get_the_ID(), 'category', '<div class="categories"><span class="influence-icon-layers"></span>', ', ', '</div>' );
4356
?>
44-
</a>
45-
</div><!-- .attachment -->
46-
47-
<?php if ( ! empty( $post->post_excerpt ) ) : ?>
48-
<div class="entry-caption">
49-
<?php the_excerpt(); ?>
50-
</div><!-- .entry-caption -->
57+
</div>
5158
<?php endif; ?>
52-
</div><!-- .entry-attachment -->
5359

54-
<?php the_content(); ?>
55-
<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'influence' ), 'after' => '</div>' ) ); ?>
60+
<div class="posted-on"><?php influence_posted_on(); ?></div>
61+
</div><!-- .entry-meta -->
62+
63+
<?php if ( comments_open() || '0' != get_comments_number() ) : ?>
64+
65+
<div id="single-comments-wrapper">
66+
<?php comments_template( '', true ); ?>
67+
</div><!-- #single-comments-wrapper -->
5668

57-
</div><!-- .entry-content -->
69+
<?php endif; ?>
5870

59-
<footer class="entry-meta">
60-
<?php edit_post_link( __( 'Edit', 'influence' ), ' <span class="edit-link">', '</span>' ); ?>
61-
</footer><!-- .entry-meta -->
62-
</article><!-- #post-<?php the_ID(); ?> -->
71+
</div>
6372

64-
<?php comments_template(); ?>
73+
</article>
6574

6675
<?php endwhile; // end of the loop. ?>
6776

‎images/background.png‎

-864 Bytes
Loading

‎images/settings-icon.png‎

-1.72 KB
Loading

‎inc/panels-lite‎

0 commit comments

Comments
 (0)