Skip to content
This repository was archived by the owner on Jan 28, 2019. It is now read-only.

Commit f981266

Browse files
rodica-andronacherodica-andronache
authored
Merge pull request #52 from Codeinwp/development
Compatibility with Orbit Fox plugin
2 parents c7d117a + 68a6484 commit f981266

23 files changed

Lines changed: 849 additions & 495 deletions

‎404.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
<h2 class="widget-title"><?php _e( 'Most Used Categories', 'flymag' ); ?></h2>
2828
<ul>
2929
<?php
30-
wp_list_categories( array(
30+
wp_list_categories(
31+
array(
3132
'orderby' => 'count',
3233
'order' => 'DESC',
3334
'show_count' => 1,
3435
'title_li' => '',
3536
'number' => 10,
36-
) );
37+
)
38+
);
3739
?>
3840
</ul>
3941
</div><!-- .widget -->

‎comments.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,13 @@
5656

5757
<ol class="comment-list">
5858
<?php
59-
wp_list_comments( array(
59+
wp_list_comments(
60+
array(
6061
'style' => 'ol',
6162
'short_ping' => true,
6263
'avatar_size' => 60,
63-
) );
64+
)
65+
);
6466
?>
6567
</ol><!-- .comment-list -->
6668

‎content-page.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
<div class="entry-content">
1515
<?php the_content(); ?>
1616
<?php
17-
wp_link_pages( array(
17+
wp_link_pages(
18+
array(
1819
'before' => '<div class="page-links">' . __( 'Pages:', 'flymag' ),
1920
'after' => '</div>',
20-
) );
21+
)
22+
);
2123
?>
2224
</div><!-- .entry-content -->
2325

‎content-single.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727
<div class="entry-content">
2828
<?php the_content(); ?>
2929
<?php
30-
wp_link_pages( array(
30+
wp_link_pages(
31+
array(
3132
'before' => '<div class="page-links">' . __( 'Pages:', 'flymag' ),
3233
'after' => '</div>',
33-
) );
34+
)
35+
);
3436
?>
3537
</div><!-- .entry-content -->
3638

‎content.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@
3333
<div class="entry-content">
3434
<?php the_excerpt(); ?>
3535
<?php
36-
wp_link_pages( array(
36+
wp_link_pages(
37+
array(
3738
'before' => '<div class="page-links">' . __( 'Pages:', 'flymag' ),
3839
'after' => '</div>',
39-
) );
40+
)
41+
);
4042
?>
4143
</div><!-- .entry-content -->
4244

‎footer.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@
2929
</div><!-- .site-info -->
3030
<?php if ( has_nav_menu( 'social' ) ) : ?>
3131
<nav class="social-navigation col-md-6 col-sm-6 clearfix">
32-
<?php wp_nav_menu( array(
32+
<?php wp_nav_menu(
33+
array(
3334
'theme_location' => 'social',
3435
'link_before' => '<span class="screen-reader-text">',
3536
'link_after' => '</span>',
3637
'menu_class' => 'menu clearfix',
3738
'fallback_cb' => false,
38-
) ); ?>
39+
)
40+
); ?>
3941
</nav>
4042
<?php endif; ?>
4143
</div>

‎functions.php‎

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,39 +63,49 @@ function flymag_setup() {
6363
add_image_size( 'entry-thumb', 820 );
6464

6565
// This theme uses wp_nav_menu() in one location.
66-
register_nav_menus( array(
66+
register_nav_menus(
67+
array(
6768
'primary' => __( 'Primary Menu', 'flymag' ),
6869
'social' => __( 'Social', 'flymag' ),
69-
) );
70+
)
71+
);
7072

7173
/*
7274
* Switch default core markup for search form, comment form, and comments
7375
* to output valid HTML5.
7476
*/
75-
add_theme_support( 'html5', array(
77+
add_theme_support(
78+
'html5', array(
7679
'search-form',
7780
'comment-form',
7881
'comment-list',
7982
'gallery',
8083
'caption',
81-
) );
84+
)
85+
);
8286

8387
/*
8488
* Enable support for Post Formats.
8589
* See http://codex.wordpress.org/Post_Formats
8690
*/
87-
add_theme_support( 'post-formats', array(
91+
add_theme_support(
92+
'post-formats', array(
8893
'aside',
8994
'image',
9095
'video',
9196
'quote',
9297
'link',
93-
) );
98+
)
99+
);
94100
// Set up the WordPress core custom background feature.
95-
add_theme_support( 'custom-background', apply_filters( 'flymag_custom_background_args', array(
96-
'default-color' => 'f5f5f5',
97-
'default-image' => '',
98-
) ) );
101+
add_theme_support(
102+
'custom-background', apply_filters(
103+
'flymag_custom_background_args', array(
104+
'default-color' => 'f5f5f5',
105+
'default-image' => '',
106+
)
107+
)
108+
);
99109

100110
/**
101111
* About page class
@@ -297,57 +307,69 @@ function flymag_setup() {
297307
* @link http://codex.wordpress.org/Function_Reference/register_sidebar
298308
*/
299309
function flymag_widgets_init() {
300-
register_sidebar( array(
310+
register_sidebar(
311+
array(
301312
'name' => __( 'Sidebar', 'flymag' ),
302313
'id' => 'sidebar-1',
303314
'description' => '',
304315
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
305316
'after_widget' => '</aside>',
306317
'before_title' => '<h3 class="widget-title"><span>',
307318
'after_title' => '</span></h3>',
308-
) );
309-
register_sidebar( array(
319+
)
320+
);
321+
register_sidebar(
322+
array(
310323
'name' => __( 'Home page', 'flymag' ),
311324
'id' => 'sidebar-2',
312325
'description' => __( 'Widgets added here will be displayed on pages using the Front Page template', 'flymag' ),
313326
'before_widget' => '<aside id="%1$s" class="widget wow fadeIn %2$s">',
314327
'after_widget' => '</aside>',
315328
'before_title' => '<h3 class="widget-title"><span>',
316329
'after_title' => '</span></h3>',
317-
) );
318-
register_sidebar( array(
330+
)
331+
);
332+
register_sidebar(
333+
array(
319334
'name' => __( 'Home page top', 'flymag' ),
320335
'id' => 'sidebar-3',
321336
'description' => __( 'Widgets added here will be displayed above the main content area and sidebar on pages using the Front Page template', 'flymag' ),
322337
'before_widget' => '<aside id="%1$s" class="widget wow fadeIn %2$s">',
323338
'after_widget' => '</aside>',
324339
'before_title' => '<h3 class="widget-title"><span>',
325340
'after_title' => '</span></h3>',
326-
) );
327-
register_sidebar( array(
341+
)
342+
);
343+
register_sidebar(
344+
array(
328345
'name' => __( 'Footer left', 'flymag' ),
329346
'id' => 'sidebar-4',
330347
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
331348
'after_widget' => '</aside>',
332349
'before_title' => '<h3 class="widget-title">',
333350
'after_title' => '</h3>',
334-
) );
335-
register_sidebar( array(
351+
)
352+
);
353+
register_sidebar(
354+
array(
336355
'name' => __( 'Footer center', 'flymag' ),
337356
'id' => 'sidebar-5',
338357
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
339358
'after_widget' => '</aside>',
340359
'before_title' => '<h3 class="widget-title">',
341360
'after_title' => '</h3>',
342-
) );
343-
register_sidebar( array(
361+
)
362+
);
363+
register_sidebar(
364+
array(
344365
'name' => __( 'Footer right', 'flymag' ),
345366
'id' => 'sidebar-6',
346367
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
347368
'after_widget' => '</aside>',
348369
'before_title' => '<h3 class="widget-title">',
349370
'after_title' => '</h3>',
350-
) );
371+
)
372+
);
351373
// Custom widgets
352374
register_widget( 'Flymag_Recent_A' );
353375
register_widget( 'Flymag_Recent_B' );

‎header.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@
3939
<?php endif; ?>
4040
</div>
4141
<nav id="site-navigation" class="main-navigation" role="navigation">
42-
<?php wp_nav_menu( array(
42+
<?php wp_nav_menu(
43+
array(
4344
'theme_location' => 'primary',
4445
'fallback_cb' => 'flymag_menu_fallback',
45-
) ); ?>
46+
)
47+
); ?>
4648
<span class="search-toggle"><i class="fa fa-search"></i></span>
4749
<?php get_search_form(); ?>
4850
</nav><!-- #site-navigation -->

‎image.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
<span class="image-parent">
2121
<?php
2222
$metadata = wp_get_attachment_metadata();
23-
/* translators: %1$s is post url, %2$s is post title */
24-
printf( __( '<i class="fa fa-pencil"></i> Image posted in: <a href="%1$s" title="Return to %2$s" rel="gallery">%2$s</a>', 'flymag' ),
23+
printf(
24+
/* translators: %1$s is post url, %2$s is post title */
25+
__( '<i class="fa fa-pencil"></i> Image posted in: <a href="%1$s" title="Return to %2$s" rel="gallery">%2$s</a>', 'flymag' ),
2526
get_permalink( $post->post_parent ),
2627
get_the_title( $post->post_parent )
2728
);
@@ -43,10 +44,12 @@
4344
<?php endif; ?>
4445
</div>
4546
<?php the_content(); ?>
46-
<?php wp_link_pages( array(
47+
<?php wp_link_pages(
48+
array(
4749
'before' => '<div class="page-links">' . __( 'Pages:', 'flymag' ),
4850
'after' => '</div>',
49-
) ); ?>
51+
)
52+
); ?>
5053
</div>
5154
<div class="images-sizes">
5255
<?php _e( 'Image available in:', 'flymag' ); ?>

‎inc/custom-header.php‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,20 @@
2222
* @uses flymag_admin_header_image()
2323
*/
2424
function flymag_custom_header_setup() {
25-
add_theme_support( 'custom-header', apply_filters( 'flymag_custom_header_args', array(
26-
'default-image' => '',
27-
'default-text-color' => '000000',
28-
'width' => 1366,
29-
'height' => 768,
30-
'flex-height' => true,
31-
'wp-head-callback' => 'flymag_header_style',
32-
'admin-head-callback' => 'flymag_admin_header_style',
33-
'admin-preview-callback' => 'flymag_admin_header_image',
34-
) ) );
25+
add_theme_support(
26+
'custom-header', apply_filters(
27+
'flymag_custom_header_args', array(
28+
'default-image' => '',
29+
'default-text-color' => '000000',
30+
'width' => 1366,
31+
'height' => 768,
32+
'flex-height' => true,
33+
'wp-head-callback' => 'flymag_header_style',
34+
'admin-head-callback' => 'flymag_admin_header_style',
35+
'admin-preview-callback' => 'flymag_admin_header_image',
36+
)
37+
)
38+
);
3539
}
3640

3741
add_action( 'after_setup_theme', 'flymag_custom_header_setup' );

0 commit comments

Comments
 (0)