From 3ad8d6db7bb292a3f31181f9170083f1656500da Mon Sep 17 00:00:00 2001
From: Monika Eftimova <plazmonii@ludost.net>
Date: Tue, 7 Oct 2014 14:52:34 +0300
Subject: [PATCH] updates (commited by vasil)

---
 css/styles.css    |  4 ++++
 functions.php     |  4 +++-
 index.php         | 16 +++++++++-------
 page-about.php    | 17 -----------------
 page-speakers.php |  6 +-----
 page-sponsors.php |  4 +++-
 page.php          | 32 ++++++++++++++++++++++++--------
 7 files changed, 44 insertions(+), 39 deletions(-)
 delete mode 100644 page-about.php

diff --git a/css/styles.css b/css/styles.css
index 4da2704..aaf5215 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -473,10 +473,14 @@ footer .content li { list-style: none; }
 	list-style: none;
 	padding-left: 0;
 }
+.subnav .menu {
+    margin-left: -2.2em;
+}
 .subnav li {
 	float: left;
 	padding: 0;
 	margin: 0 1em 0 0;
+    list-style: none outside;
 }
 .subnav li.selected {
 	font-weight: bold;
diff --git a/functions.php b/functions.php
index 64937f7..3288e94 100644
--- a/functions.php
+++ b/functions.php
@@ -6,6 +6,7 @@ add_theme_support( 'post-thumbnails' );
 
 register_nav_menus(
 	array( 'main-menu' => __( 'Main Menu', 'initfest' ),
+           'subnav-menu' => __( 'Sub Navigation', 'initfest'),
 		   'footer-openfest' => __('OpenFest', 'initfest'),
 		   'footer-openfest' => __('OpenFest', 'initfest'),
 		   'footer-schedule' => __('Schedule', 'initfest'),
@@ -99,7 +100,8 @@ function transport_shortcode() {
     if ( $transport->have_posts() ) :
         while ( $transport->have_posts() ) : $transport->the_post();
 ?>
-    <p><?php the_title(); ?> <br /> <?php the_content(); ?></p>
+    <h4><?php the_title(); ?></h4>
+    <p><?php the_content(); ?></p>
 <?php 
         endwhile;
     endif;
diff --git a/index.php b/index.php
index 269983f..154a6a7 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,12 @@
 <?php get_header(); ?>
-<section id="content" role="main" class="content">
-	<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
-	<?php get_template_part( 'entry' ); ?>
-	<?php comments_template(); ?>
-	<?php endwhile; endif; ?>
-	<?php get_template_part( 'nav', 'below' ); ?>
+<section id="content" role="main" class="content grid">
+    <div class="col-left">
+        <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
+        <?php get_template_part( 'entry' ); ?>
+        <?php comments_template(); ?>
+        <?php endwhile; endif; ?>
+        <?php get_template_part( 'nav', 'below' ); ?>
+    </div>
+    <?php get_sidebar(); ?>
 </section>
-<?php get_sidebar(); ?>
 <?php get_footer(); ?>
diff --git a/page-about.php b/page-about.php
deleted file mode 100644
index 90d0a19..0000000
--- a/page-about.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-get_header(); ?>
-<section class="content grid">
-    <div class="col-left">
-    <h1><?php the_title(); ?></h1>
-<?php
-    if ( have_posts() ) : 
-        while ( have_posts() ) : the_post();
-            the_content();
-        endwhile;
-    endif;
-?>
-    </div>
-    <?php get_sidebar(); ?>
-</section>
-
-<?php get_footer(); ?>
diff --git a/page-speakers.php b/page-speakers.php
index e01be94..457b79c 100644
--- a/page-speakers.php
+++ b/page-speakers.php
@@ -1,8 +1,4 @@
 <?php
-/*
-Template Name: Speakers 
- */
-
 get_header(); ?>
 <div class="separator"></div>
 <section class="content grid">
@@ -36,7 +32,7 @@ get_header(); ?>
         endif;
     ?>
     </div>
-    <div class="col-right"><?php get_sidebar(); ?></div>
+    <?php # get_sidebar(); ?>
 </section>
 
 <?php get_footer(); ?>
diff --git a/page-sponsors.php b/page-sponsors.php
index db73537..6147f57 100644
--- a/page-sponsors.php
+++ b/page-sponsors.php
@@ -5,6 +5,8 @@ Template Name: Sponsors
 
 get_header(); ?>
 <section class="content">
+    <h1><?php the_title(); ?></h1>
+    <div class="separator"></div>
 <?php
     if ( have_posts() ) : while ( have_posts() ) : the_post(); 
         the_content();
@@ -29,7 +31,7 @@ get_header(); ?>
                     the_title();
                 }
 
-                the_content();
+                the_excerpt();
 ?>
     </div>
 <?php
diff --git a/page.php b/page.php
index 9341b1e..52f3a86 100644
--- a/page.php
+++ b/page.php
@@ -1,10 +1,26 @@
-<?php get_header(); ?>
-<section id="content" role="main">
-	<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
-	<?php get_template_part( 'entry' ); ?>
-	<?php //comments_template(); NO COMMENTS IN PAGES PLEASE ?>
-	<?php endwhile; endif; ?>
-	<?php //get_template_part( 'nav', 'below' ); ?>
+<?php
+get_header(); 
+
+if ( $pagename == 'about' ||
+     $pagename == 'ideas-and-recommendations' ||
+     $pagename == 'team' ||
+     $pagename == 'history' ) {
+    wp_nav_menu( array( 'theme_location' => 'subnav-menu', 'container_class' => 'content subnav cf' ) );
+    echo '<div class="separator"></div>';
+}
+?>
+<section class="content grid">
+    <div class="col-left">
+    <h1><?php the_title();  ?></h1>
+<?php
+    if ( have_posts() ) : 
+        while ( have_posts() ) : the_post();
+            the_content();
+        endwhile;
+    endif;
+?>
+    </div>
+    <?php get_sidebar(); ?>
 </section>
-<?php get_sidebar(); ?>
+
 <?php get_footer(); ?>