Commits on August 15, 2015

category.php

@@ -23,7 +23,7 @@
 
 			<?php get_template_part('inc/postHead'); ?>
 
-			<div id="content" class="allContent hasSidebar group">
+			<div id="content" class="allContent hasSidebar group ">
 
 				<div class="mainContent group">
 

functions.php

@@ -6,6 +6,20 @@ function remove_child_theme_support() {
   remove_theme_support('custom-background');
 }
 
+	function enqueue_my_scripts() {
+	wp_enqueue_script( 'jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js', array('jquery'), '1.9.1', true); // we need the jquery library
+	wp_enqueue_script( 'bootstrap-js', '//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js', array('jquery'), true); // all the bootstrap javascript goodness
+	}
+	add_action('wp_enqueue_scripts', 'enqueue_my_scripts');
+	function enqueue_my_styles() {
+	wp_enqueue_style( 'bootstrap', '//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css' );
+	wp_enqueue_style( 'roger', get_template_directory_uri() . '/style.css');
+	}
+	add_action('wp_enqueue_scripts', 'enqueue_my_styles');
+
+
+
+
 function betterChildBreadcrumbs() {
 
   global $post;
@@ -50,7 +64,8 @@ function customHeader() {
 
 }
 
-// add_theme_support( 'custom-header' );
+
+
 
 // Register Child Nav
 if(!function_exists('register_child_nav')) {
@@ -60,6 +75,10 @@ function register_child_nav() {
   add_action( 'init', 'register_child_nav' );
 }
 
+
+
+
+
 if (function_exists('add_theme_support')) { add_theme_support('post-thumbnails'); }
 
 add_image_size('headerImage', 480, 200, true);
@@ -75,4 +94,7 @@ function my_mce_buttons_2($buttons) {
 }
 
   add_filter('mce_buttons_2', 'my_mce_buttons_2');
-endif;
+endif;
+
+
+

inc/content-nav-full.php

@@ -40,7 +40,7 @@
 
 		<div class="entry-content">
 			<?php if (!$isRoot): ?>
-			<h2><?php the_title(); ?></h2>
+			<h1><?php the_title(); ?></h1>
 			<?php endif; ?>
 
 			<?php the_content(); ?>

inc/content-page.php

@@ -15,46 +15,14 @@
 	$pageRoot = getRoot($post);
 	$section = get_post($pageRoot);
 
-	$menuName = $section->post_name;
-	$sideMenu = wp_get_nav_menu_items($menuName);
-
-	$showSideNav = get_field("show_left_nav");
-
-	$sideNavExists = $sideMenu && $showSideNav == true || is_child_page() && $showSideNav == true;
-
-	if ($sideNavExists):
-
 ?>
 
-	<div class="leftNav">
-
-		<ul>
-
-			<?php
-
-				$args = array(
-					"child_of" => $pageRoot,
-					"title_li" => "",
-				);
-
-				if ($menu) {
-					wp_nav_menu( array( 'menu' => $menuName, 'menu_class' => 'nav-menu' ) ); 
-				} else {
-					wp_list_pages( $args ); 
-				}
-			?>
-
-		</ul>
-
-	</div>
-
-<?php endif; ?>
 
-<div class="mainContent group <?php if($sideNavExists) { echo 'hasLeftNav'; } ?>">
+<div class="mainContent group content-main">
 
 	<div class="entry-content">
 		<?php $title = get_the_title(); if ($title != ""): ?>
-			<?php if(!is_front_page()) { echo "<h2>".$title."</h2>"; } ?>
+			<?php if(!is_front_page()) { echo "<h1>".$title."</h1>"; } ?>
 		<?php endif; ?>
 
 		<?php the_content(); ?>

inc/locationHours.php

@@ -1,5 +1,5 @@
 <?php
-
+/*
 	global $blog_id;
 	$current_blog_id = $blog_id;
 
@@ -12,12 +12,13 @@
 
 	$hasHours = hasHours($locationId, date("Y-m-d"));
 	$hoursToday = getHoursToday($locationId);
+	*/
 ?>
 
-	<div class="todayHours">
-		<span>Today's Hours:</span>
-		<span data-location-hours="Document Services"></span>
-		<span><a href="/hours">See all hours</a></span>
+	<div class="hours-today">
+		<span>Today's Hours: <strong data-location-hours="Document Services"></strong></span>
+		<br>
+		<a href="/hours" class="link-hours-all">See all hours <i class="icon-arrow-right"></i></a>
 	</div>
 
-<?php switch_to_blog($current_blog_id); ?>
+<?php // switch_to_blog($current_blog_id); ?>

inc/locationInfo.php

@@ -2,14 +2,19 @@
 
 	$docsServices = get_post(1028);
 	$docsPhone = get_post_meta(1028, 'phone', true);
+	$docsEmail = get_post_meta(1028, 'email', true);
 	$docsBuilding = get_post_meta(1028, 'building', true);
 	$docsSlug = $docsServices->post_name;
 
 	$mapPage = "/locations/#!";
 
 ?>
 
-<div class="locationInfo">
-	<span><?php echo $docsPhone; ?></span>
-	<span>show on map: <a href="<?php echo $mapPage.$docsSlug; ?>"><?php echo $docsBuilding ?></a></span>
-</div>
+
+<div class="info-more">
+					<a href="tel:<?php echo $docsPhone; ?>" class="phone"><?php echo $docsPhone ?></a> |
+                    	<?php if($docsEmail): ?>
+					<a href="mailto:<?php echo $docsEmail; ?>" class="email"><?php echo $docsEmail ?></a> |
+                    	<?php endif; ?>
+					<a href="<?php echo $mapPage.$docsSlug; ?>">Room: <?php echo $docsBuilding ?> <i class="icon-arrow-right"></i></a>
+				</div>

inc/nav-child.php

@@ -1,29 +1,56 @@
+
 <?php
 	$siteName = get_bloginfo('name');
 	// if ($siteName != 'MIT Libraries News') {
 	$noChildNav = array("MIT Libraries News", "Document Services");
 	$countPosts = wp_count_posts('page')->publish;
 	if (!in_array($siteName, $noChildNav) && $countPosts > 1) {
 ?>
-	<h3 id="menu--toggle" class="menu--toggle">View Menu</h3>
-	<nav id="child-navigation" class="nav-secondary" role="navigation">
-		<?php
-			if(has_nav_menu('child-nav')){
-				wp_nav_menu(
-					array(
-						'theme_location' => 'child-nav',
-						'menu' => 'Sub Nav',
-						'container_class' => 'menu'
-					)
-				);
-			}
-			else {
-				wp_page_menu(
-					array(
-						'depth' => 2
-					)
-				);
-			}
-		?>
-	</nav><!-- #site-navigation -->
-<?php } ?>
+
+
+	<nav class="navbar navbar-default" role="navigation">
+  <div class="container-fluid">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+	    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+	  <a class="navbar-brand mobile-display">
+                <?php _e( 'View Menu' ); ?>
+            </a>
+    </div>
+
+        <?php
+            wp_nav_menu( array(
+                'menu'              => 'Sub Nav',
+                'theme_location'    => 'child-nav',
+                'container'         => 'div',
+                'container_class'   => 'collapse navbar-collapse',
+				'container_id'      => 'bs-example-navbar-collapse-1',
+                'menu_class'        => 'nav navbar-nav nav-second',
+                'fallback_cb'       => 'navwalker::fallback',
+                'walker'            => new navwalker())
+            );
+
+
+
+        ?>
+
+
+    </div>
+</nav>
+<script>
+	$('.dropdown-toggle').click(function() {
+    var location = $(this).attr('href');
+    window.location.href = location;
+    return false;
+});
+</script>
+
+<!-- #site-navigation -->
+
+<?php } ?>
+

inc/postHead.php

@@ -3,9 +3,9 @@
 	<div class="box1">
 
 		<?php if(is_front_page()): ?>
-			<h1><?php bloginfo(); ?></h1>
+			<h1 class="child-page-title"><?php bloginfo(); ?></h1>
 		<?php else: ?>
-			<h1><a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a></h1>
+			<div class="child-page-title"><a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a></div>
 		<?php endif; ?>
 
 		<?php
@@ -22,6 +22,14 @@
 			}
 
 		?>
+
+		<?php 
+			// If doc. services, switch out to main site to get location ids
+			if ($siteName == 'Document Services' && is_front_page()):
+				get_template_part('inc/locationHours');
+			endif;
+
+		?>
 
 	</div>
 
@@ -41,17 +49,7 @@
 
 	</div>
 
-	<div class="box3">
 
-		<?php 
-			// If doc. services, switch out to main site to get location ids
-			if ($siteName == 'Document Services' && is_front_page()):
-				get_template_part('inc/locationHours');
-			endif;
-
-		?>
-
-	</div>
 </div>
 
 <?php get_template_part("inc/nav", "child"); ?>