Merge pull request #6 from jem08002/master

Issue Fixes
weblab · Nov 17, 2014 · 9ff0662 · 9ff0662
2 parents 73f3d4a + 2ef8d0a
commit 9ff0662
Show file tree

Hide file tree

Showing 14 changed files with 175 additions and 320 deletions.
diff --git a/articlefeed1.php b/articlefeed1.php
diff --git a/articlefeed2.php b/articlefeed2.php
diff --git a/articlefeed3.php b/articlefeed3.php
diff --git a/articlefeed4.php b/articlefeed4.php
diff --git a/articlefeed5.php b/articlefeed5.php
diff --git a/articlefeed6.php b/articlefeed6.php
diff --git a/functions.php b/functions.php
@@ -5,11 +5,6 @@ function ovpr_enqueue_scripts() {
 }
 add_action('wp_enqueue_scripts', 'ovpr_enqueue_scripts', 900);
 
-
-function register_my_menus() {
-	register_nav_menu( 'primary', __( 'Primary Menu', 'hale' ) );
-}
-
 add_action( 'init', 'register_my_menus' );  
 
 // Register Sidebar 

diff --git a/page-articlefeed1.php b/page-articlefeed1.php
@@ -0,0 +1,25 @@
+oh<?php
+/*
+Template Name: Article Feed 1
+*/
+?>
+<?php get_header(); ?>
+
+<div id="home">
+	<div class="row">
+		<div class="span12" id="home-main">			
+			<div class="row-fluid">
+				<div id="widget-feature" class="span12 articlefeed1">
+					<?php if ( is_active_sidebar( 'articlefeed1' ) ) { ?>
+						<?php dynamic_sidebar( 'articlefeed1' ); ?>
+					<?php } else { ?>
+						<h1>Article Feed 1</h1>
+						<p>Go to Appearance > Widgets, and drag items into Article Feed 2 to edit this area.</p>
+					<?php }; ?>	
+				</div>
+			</div>
+		</div>
+		<!-- /span8 big left col --> 
+	</div>
+</div>
+<?php get_footer(); ?>
diff --git a/page-articlefeed2.php b/page-articlefeed2.php
@@ -0,0 +1,24 @@
+<?php
+/*
+Template Name: Article Feed 2 
+*/
+?>
+<?php get_header(); ?>
+<div id="home">
+	<div class="row">
+		<div class="span12" id="home-main">			
+			<div class="row-fluid">
+				<div id="widget-feature" class="span12 articlefeed1">
+					<?php if ( is_active_sidebar( 'articlefeed2' ) ) { ?>
+						<?php dynamic_sidebar( 'articlefeed2' ); ?>
+					<?php } else { ?>
+						<h1>Article Feed 1</h1>
+						<p>Go to Appearance > Widgets, and drag items into Article Feed 2 to edit this area.</p>
+					<?php }; ?>	
+				</div>
+			</div>
+		</div>
+		<!-- /span8 big left col --> 
+	</div>
+</div>
+<?php get_footer(); ?>