Skip to content

Commit fa3a7e4

Browse files
committed
reformat and set sidebar as default
1 parent fe6e7d9 commit fa3a7e4

File tree

2 files changed

+75
-83
lines changed

2 files changed

+75
-83
lines changed

theme/base.php

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -36,43 +36,43 @@
3636
do_action('get_header');
3737
get_template_part('templates/header');
3838
?>
39-
<?php if (!is_main_site() && is_front_page()) : ?>
40-
<?php dynamic_sidebar('homepage-banner') ?>
39+
<?php if (!is_main_site() && is_front_page()) : ?>
40+
<?php dynamic_sidebar('homepage-banner') ?>
4141
<?php endif; ?>
42-
<div class="wrap <?php echo $main_container_class ?>" role="document">
43-
<div class="content row">
44-
<main class="main">
45-
<?php include Wrapper\template_path(); ?>
46-
</main><!-- /.main -->
47-
<?php if (Setup\display_sidebar()) : ?>
48-
<aside class="sidebar">
49-
<?php include Wrapper\sidebar_path(); ?>
50-
</aside><!-- /.sidebar -->
51-
<?php endif; ?>
52-
</div><!-- /.content -->
53-
</div><!-- /.wrap -->
54-
<?php
55-
do_action('get_footer');
56-
get_template_part('templates/footer');
57-
wp_footer();
58-
?>
59-
<div id="fb-root"></div>
60-
<script>
61-
(function(d, s, id) {
62-
var js, fjs = d.getElementsByTagName(s)[0];
63-
if (d.getElementById(id)) return;
64-
js = d.createElement(s); js.id = id;
65-
js.src = "//connect.facebook.net/fr_FR/sdk.js#xfbml=1&version=v2.5";
66-
fjs.parentNode.insertBefore(js, fjs);
67-
}(document, 'script', 'facebook-jssdk'));
68-
</script>
42+
<div class="wrap <?php echo $main_container_class ?>" role="document">
43+
<div class="content row">
44+
<main class="main">
45+
<?php include Wrapper\template_path(); ?>
46+
</main><!-- /.main -->
47+
<?php if (Setup\display_sidebar()) : ?>
48+
<aside class="sidebar">
49+
<?php include Wrapper\sidebar_path(); ?>
50+
</aside><!-- /.sidebar -->
51+
<?php endif; ?>
52+
</div><!-- /.content -->
53+
</div><!-- /.wrap -->
54+
<?php
55+
do_action('get_footer');
56+
get_template_part('templates/footer');
57+
wp_footer();
58+
?>
59+
<div id="fb-root"></div>
60+
<script>
61+
(function(d, s, id) {
62+
var js, fjs = d.getElementsByTagName(s)[0];
63+
if (d.getElementById(id)) return;
64+
js = d.createElement(s); js.id = id;
65+
js.src = "//connect.facebook.net/fr_FR/sdk.js#xfbml=1&version=v2.5";
66+
fjs.parentNode.insertBefore(js, fjs);
67+
}(document, 'script', 'facebook-jssdk'));
68+
</script>
6969

7070

71-
<script>
72-
window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;
73-
ga('create','UA-75928661-1','auto');ga('send','pageview')
74-
</script>
75-
<script src="https://www.google-analytics.com/analytics.js" async defer></script>
71+
<script>
72+
window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;
73+
ga('create','UA-75928661-1','auto');ga('send','pageview')
74+
</script>
75+
<script src="https://www.google-analytics.com/analytics.js" async defer></script>
7676

7777
<!-- Piwik -->
7878
<script type="text/javascript">

theme/lib/setup.php

Lines changed: 41 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -57,55 +57,47 @@ function setup() {
5757
* Register sidebars
5858
*/
5959
function widgets_init() {
60-
register_sidebar([
61-
'name' => 'Bannière homepage', // TODO translate
62-
'id' => 'homepage-banner',
63-
'before_widget' => '<div>',
64-
'after_widget' => '</div>',
65-
'before_title' => '<h2>',
66-
'after_title' => '</h2>'
67-
]);
68-
register_sidebar([
69-
'name' => 'Haut de page', // TODO translate
70-
'id' => 'homepage-top',
71-
'before_widget' => '<div class=" %1$s %2$s section__content">',
72-
'after_widget' => '</div>',
73-
'before_title' => '<h2 class="section__title">',
74-
'after_title' => '</h2>'
75-
]);
76-
// register_sidebar([
77-
// 'name' => 'homepage-flex-top',
78-
// 'id' => 'homepage-flex-top',
79-
// 'before_widget' => '<div class="flex-widget"><div class=" %1$s %2$s">',
80-
// 'after_widget' => '</div></div>',
81-
// 'before_title' => '<h2 class="flex-widget__title">',
82-
// 'after_title' => '</h2>'
83-
// ]);
84-
register_sidebar([
85-
'name' => 'Bas de page', // TODO translate
86-
'id' => 'homepage-bottom',
87-
'before_widget' => '<div class=" %1$s %2$s section__content">',
88-
'after_widget' => '</div>',
89-
'before_title' => '<h2>',
90-
'after_title' => '</h2>'
91-
]);
92-
93-
register_sidebar([
94-
'name' => 'Panneau latéral', // TODO translate
95-
'id' => 'sidebar-primary',
96-
'before_widget' => '<section class="widget %1$s %2$s">',
97-
'after_widget' => '</section>',
98-
'before_title' => '<h3>',
99-
'after_title' => '</h3>'
100-
]);
101-
register_sidebar([
102-
'name' => __('Footer', 'sage'), // TODO translate
103-
'id' => 'sidebar-footer',
104-
'before_widget' => '<div>',
105-
'after_widget' => '</div>',
106-
'before_title' => '<h5>',
107-
'after_title' => '</h5>'
108-
]);
60+
register_sidebar([
61+
'name' => 'Panneau latéral', // TODO translate
62+
'id' => 'sidebar-primary',
63+
'before_widget' => '<section class="widget %1$s %2$s">',
64+
'after_widget' => '</section>',
65+
'before_title' => '<h3>',
66+
'after_title' => '</h3>'
67+
]);
68+
register_sidebar([
69+
'name' => 'Bannière homepage', // TODO translate
70+
'id' => 'homepage-banner',
71+
'before_widget' => '<div>',
72+
'after_widget' => '</div>',
73+
'before_title' => '<h2>',
74+
'after_title' => '</h2>'
75+
]);
76+
register_sidebar([
77+
'name' => 'Haut de page', // TODO translate
78+
'id' => 'homepage-top',
79+
'before_widget' => '<div class=" %1$s %2$s section__content">',
80+
'after_widget' => '</div>',
81+
'before_title' => '<h2 class="section__title">',
82+
'after_title' => '</h2>'
83+
]);
84+
register_sidebar([
85+
'name' => 'Bas de page', // TODO translate
86+
'id' => 'homepage-bottom',
87+
'before_widget' => '<div class=" %1$s %2$s section__content">',
88+
'after_widget' => '</div>',
89+
'before_title' => '<h2>',
90+
'after_title' => '</h2>'
91+
]);
92+
93+
register_sidebar([
94+
'name' => __('Footer', 'sage'), // TODO translate
95+
'id' => 'sidebar-footer',
96+
'before_widget' => '<div>',
97+
'after_widget' => '</div>',
98+
'before_title' => '<h5>',
99+
'after_title' => '</h5>'
100+
]);
109101
}
110102
add_action('widgets_init', __NAMESPACE__ . '\\widgets_init');
111103

0 commit comments

Comments
 (0)