working on the sidebar presense and header

diff --git a/front-page.php b/front-page.php
index b9efd66..c342833 100644 (file)
--- a/front-page.php
+++ b/front-page.php
@@ -1,21 +1,22 @@
 <?php get_header(); ?>
 <main class="page-front">
-    <div class="row">
-        <?php get_template_part('parts/slide-show');?>
-    </div>
+    <?php get_template_part('parts/slide-show');?>
     <div id="content-wrapper">
-        <div class="row" data-equalizer data-options="equalize_on_stack: false">
-            <?php
-            get_template_part('parts/glm-blocks');
-            ?>
+        <div class="row collapse">
+            
         </div>
-        <div class="row">
-            <div id="main-content" class="small-12 columns">
-                <?php if(have_posts()) : while(have_posts()): the_post();?>
-                <?php the_content();?>
-                <?php endwhile; else:?>
-                <p><?php _e('Sorry, no posts yet');?></p>
-                <?php endif;?>
+        <div class="row collapse">
+            <div id="main-content" class="small-12 medium-6 large-8 columns">
+                <div class="row">
+                    <div class="small-12 columns">
+                        <?php if(have_posts()) : while(have_posts()): the_post();?>
+                        <?php the_content();?>
+                        <?php endwhile; else:?>
+                        <p><?php _e('Sorry, no posts yet');?></p>
+                        <?php endif;?>
+                    </div>
+                </div>
+                
             </div>
             <div class="small-12 medium-6 large-4 columns small-text-center medium-text-left">
                 <?php get_sidebar(); ?>

diff --git a/functions.php b/functions.php
index e56c988..e8ad82e 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -16,6 +16,11 @@ if (!function_exists('glm_quicksite_widget_init')) {
             'id'          => 'slideshow',
             'description' => __('Meta Slider/Slideshow Area')
         ));
+       register_sidebar(array(
+            'name'        => __('Right Sidebar'),
+            'id'          => 'sidebar-r',
+            'description' => __('Appears in Right Sidebar')
+        ));
     }
 
 }

diff --git a/header.php b/header.php
index a354c33..331f4d5 100644 (file)
--- a/header.php
+++ b/header.php
@@ -14,14 +14,23 @@
         <div class="inner-wrap">
             <div id="page-wrapper">
                     <header>
-                        <div class="row">
-                            
+                        <div class="row collapse">
+                            <div class="small-11 medium-3 large-2 columns">
+                                <a href="<?php bloginfo('url');?>"><img src="<?php echo esc_url( get_template_directory_uri() );?>/assets/central-states-rotary-youth-exchange-logo.png"></a>
+                            </div>
+                            <div class="small-12 medium-9 large-10 columns">
+                                <div class="show-for-medium-up">
+                                    <ul>
+                                        <li><a></a></li>
+                                        <li><a></a></li>
+                                        <li><a></a></li>
+                                        <li><a></a></li>
+                                        <li><a href="#" target="_blank"></a></li>
+                                    </ul>
+                                </div>
+                                <?php get_template_part('parts/top-bar');?>
+                            </div>
                         </div>
-<!--
-                        <div class="search-top show-for-large-up">
-                            <?php get_template_part('parts/search');?>
-                        </div>
--->
                     </header>
-                    <?php get_template_part('parts/top-bar');?>
+                    
                     <?php get_template_part('parts/off-canvas-menu');?>

diff --git a/index.php b/index.php
index c01b260..226bca9 100644 (file)
--- a/index.php
+++ b/index.php
@@ -11,18 +11,16 @@
                 ?>
             </div>
             <div class="row">
-                <div id="main-content" class="small-12 columns">
+                <div id="main-content" class="small-12 medium-6 large-8 columns">
                         <?php if(have_posts()) : while(have_posts()): the_post();?>
                         <?php the_content();?>
                         <?php endwhile; else:?>
                         <p><?php _e('Sorry, no results found.');?></p>
                         <?php endif;?>
                 </div>
-<!--
                 <div class="small-12 medium-6 large-4 columns small-text-center medium-text-left">
                     <?php get_sidebar(); ?>
                 </div>
--->
             </div>
         </div>
         <?php } ?> <!-- end kitchensink check - delete me before going live -->

diff --git a/sidebar.php b/sidebar.php
index abb96e5..621c2d5 100644 (file)
--- a/sidebar.php
+++ b/sidebar.php
@@ -1,6 +1,3 @@
-<!--
-                        <div id="side-nav" class="large-3 columns show-for-large-up" data-equalizer-watch>
-                            <div class="row collapse">
-                                <?php glm_side_menu(); ?>
-                            </div>
-                        </div>-->
+        <?php if ( is_active_sidebar( 'sidebar-r' ) ) : ?>
+           <?php dynamic_sidebar( 'sidebar-r' ); ?>
+        <?php endif; ?>
\ No newline at end of file