Commits for August 5, 2015

.gitignore

@@ -7,14 +7,17 @@ lib-cov
 *.out
 *.pid
 *.gz
+*.DS_Store
 
 pids
 logs
 results
+_notes
 
 npm-debug.log
 
 .sass-cache
+node_modules/
 
 css/build/**
 js/build/**

404.php

@@ -34,11 +34,11 @@
 					<p><?php _e('You can also check out these commonly-used resources:', 'twentytwelve'); ?></p>
 
 					<ul>
-						<li><?php _e('<a href="http://libraries.mit.edu/bartonplus">BartonPlus</a>', 'twentytwelve'); ?></li>
-						<li><?php _e('<a href="http://libguides.mit.edu/directory">Staff directory</a>', 'twentytwelve'); ?></li>
+						<li><?php _e('<a href="//libraries.mit.edu/bartonplus">BartonPlus</a>', 'twentytwelve'); ?></li>
+						<li><?php _e('<a href="//libguides.mit.edu/directory">Staff directory</a>', 'twentytwelve'); ?></li>
 						<li><?php _e('<a href="/research-guides">Research guides - databases by subject</a>', 'twentytwelve'); ?></li>
 						<li><?php _e('<a href="/about/shortcuts/">Shortcuts to frequently used pages</a>', 'twentytwelve'); ?></li>
-						<li><?php _e('<a href="http://web.mit.edu/search.html">MIT web site search</a>', 'twentytwelve'); ?></li>
+						<li><?php _e('<a href="//web.mit.edu/search.html">MIT web site search</a>', 'twentytwelve'); ?></li>
 					</ul>
 
 					<p><?php _e('<a href="/ask">Need more help? Ask us!</a>', 'twentytwelve'); ?></p>

README.md

@@ -1,6 +1,6 @@
-[MIT Libraries](http://libraries.mit.edu) WordPress Theme
+[MIT Libraries](http://libraries.mit.edu) Wordpress Theme
 ========
 
-This is main WordPress theme for the MIT Libraries.
+This is the main Wordpress theme for the MIT Libraries.
 
-__Note:__ Primary CSS and JS (including `css/build/minified/global.css`, `js/build/hours.min.js` and `js/build/production.min.js`, as registered in `functions.php`) are not checked in. These build files are complied and/or concatenated and/or minified automatically (using [Grunt](http://gruntjs.com/), for example).
+__Note:__ Primary CSS and JS (including `css/build/minified/global.css`, `js/build/hours.min.js` and `js/build/production.min.js`, as registered in `functions.php`) are not checked in. These build files are complied and/or concatenated and/or minified automatically (using [Grunt](http://gruntjs.com/), for example).

content-full-no.php

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

content-location.php

@@ -1,18 +1,19 @@
 <?php
 	global $gStudy24Url;
-	
+
 	$mapPage = "/locations/#!";
-	
+
 	$locationId = get_the_ID();
 	$slug = $post->post_name;
-	
+
 	$subject = cf("subject");
 	$phone = cf("phone");
+	$email = cf("email");
 	$building = cf("building");
 	$spaces = cf("group_spaces");
 	//$equipment = cf("equipment");
 	$arexpert = get_field("expert");
-	
+
 	$title1 = cf("tab_1_title");
 	$subtitle1 = cf("tab_1_subtitle");
 	$content1left = get_field("tab_1_content_left");
@@ -22,40 +23,40 @@
 	$subtitle2 = cf("tab_2_subtitle");
 	$content2left = get_field("tab_2_content_left");
 	$content2 = get_field("tab_2_content");
-	
+
 	$content2wide = 0;
 	if ($content2 == "") $content2wide = 1;
-	
+
 	$content1wide = 0;
 	if ($content1 == "") $content1wide = 1;
-	
+
 	$study24 = get_field("study_24");
 
 	$temp = $post;
 	$post = $temp;
-	
-	
+
+
 	$reserveText = get_field("reserve_text");
 	if ($reserveText == "") {
 		$reserveText = "Reserve Group Study Space";
 	}
 	$reserveUrl = get_field("reserve_url");
-	
-	
-	
+
+
+
 	$expertAskUrl = get_field("expert_ask_url");
 	if ($expertAskUrl == "") $expertAskUrl = "http://libraries.mit.edu/ask";
-	
-	
+
+
 	$numMain = 6;
 	$arMain = array();
-	
+
 	for($i=1;$i<=$numMain;$i++) {
 		$img = get_field("main_image".$i, $locationId);
 		if ($img != "")
 			$arMain[] = $img;
 	}
-	
+
 	$numSub = 8;
 	$arSub = array();
 	$subs = 0;
@@ -66,71 +67,78 @@
 			$arSub[] = $img;
 		}
 	}
-	
+
 	$strLocation = "";
 	if ($subs <= 0) {
 		$strLocation = "noThumbs";
 	}
-
-
-	$alert = trim(get_field("alert"));
+
+
+	$alertTitle = cf("alert_title");
+	$alertContent = cf("alert_content");
 ?>
-		
+
 <div id="stage" class="inner row group" role="main">
 
 	<div class="title-page libraryTitle flex-container">
-		<div class="flex-item">
-			<div class="libraryContent">
-				<h1>
-					<span class="libraryName"><?php the_title(); ?></span>
-					<span class="subject-library"><?php echo $subject ?></span>
-				</h1>
-				<div class="info-more">
-					<a href="tel:<?php echo $phone; ?>" class="phone"><?php echo $phone ?></a>
-					<a href="<?php echo $mapPage.$slug; ?>">Room: <?php echo $building ?> <i class="icon-arrow-right"></i></a>
-				</div>
-			</div><!-- end div.libraryContent -->
-
-			<div class="hours-today">
-				<span>Today's hours: <strong data-location-hours="<?php the_title(); ?>"></strong></span>
-				<?php if ($study24 == 1): ?>
-					<a class="study-24-7" href="<?php echo $gStudy24Url; ?>" alt="This location contains one or more study spaces available 24 hours a day, seven days a week. Click the link for more info." title="Study 24/7">Study 24/7</a>
-				<?php endif; ?>
-				<a href="/hours" class="link-hours-all">See all hours <i class="icon-arrow-right"></i></a>
-			</div>					
-
-		</div><!-- end div.flex-item -->
-		<div class="flex-item">
-			<?php 
-				include(locate_template('inc/alert.php'));
-				if ($showAlert == 0 && $alert != "") {
-					echo '<div class="libraryAlert">'.$alert.'</div>';
-				}
-			 ?>
-			<div class="librarySlideshow">
-				<div class="slideshow">
-					<?php
-						$val = $arMain[array_rand($arMain)];
-					?>
-					<?php if ($val != ""): ?>
-					<img src="<?php echo $val; ?>" data-thumb="<?php echo $val; ?>" alt="<?php the_title(); ?>" />
+<!--		<div class="flex-item"> -->
+			<div class="topLeft">
+				<div class="libraryContent">
+					<h1>
+						<span class="libraryName"><?php the_title(); ?></span>
+						<span class="subject-library"><?php echo $subject ?></span>
+					</h1>
+					<div class="info-more">
+						<a href="tel:<?php echo $phone; ?>" class="phone"><?php echo $phone ?></a> |
+	                    	<?php if($email): ?>
+						<a href="mailto:<?php echo $email; ?>" class="email"><?php echo $email ?></a> |
+	                    	<?php endif; ?>
+						<a href="<?php echo $mapPage.$slug; ?>">Room: <?php echo $building ?> <i class="icon-arrow-right"></i></a>
+					</div>
+				</div><!-- end div.libraryContent -->
+
+				<div class="hours-today">
+					<span>Today's hours: <strong data-location-hours="<?php the_title(); ?>"></strong></span>
+					<?php if ($study24 == 1): ?>
+						| <a class="study-24-7" href="<?php echo $gStudy24Url; ?>" alt="This location contains one or more study spaces available 24 hours a day, seven days a week. Click the link for more info." title="Study 24/7">Study 24/7</a>
 					<?php endif; ?>
-				</div>
-			</div><!-- end div.librarySlideshow -->
-		</div><!-- end div.flex-item -->
+					<a href="/hours" class="link-hours-all">See all hours <i class="icon-arrow-right"></i></a>
+				</div><!-- end div.hours-today -->
+			</div><!-- end div.topLeft -->
+		<!-- </div> end div.flex-item -->
+<!--		<div class="flex-item"> -->
+			<div class="topRight">
+				<?php
+					include(locate_template('inc/alert.php'));
+					if ($showAlert == 0 && $alertTitle != "") {
+						echo '<div class="libraryAlert">'.'<div class="location--alerts flex-container"><svg class="icon-exclamation-circle width="2048" height="2048" viewBox="0 0 2048 2048" xmlns="http://www.w3.org/2000/svg"><path d="M1024 256q209 0 385.5 103t279.5 279.5 103 385.5-103 385.5-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103zm128 1247v-190q0-14-9-23.5t-22-9.5h-192q-13 0-23 10t-10 23v190q0 13 10 23t23 10h192q13 0 22-9.5t9-23.5zm-2-344l18-621q0-12-10-18-10-8-24-8h-220q-14 0-24 8-10 6-10 18l17 621q0 10 10 17.5t24 7.5h185q14 0 23.5-7.5t10.5-17.5z"/></svg>'.'<div class="alertText">'.'<h3>'.$alertTitle.'</h3>'.'<p>'.$alertContent.'</p>'.'</div>'.'</div>'.'</div>';
+					}
+				?>
+				<div class="librarySlideshow">
+					<div class="slideshow">
+						<?php
+							$val = $arMain[array_rand($arMain)];
+						?>
+						<?php if ($val != ""): ?>
+						<img src="<?php echo $val; ?>" data-thumb="<?php echo $val; ?>" alt="<?php the_title(); ?>" />
+						<?php endif; ?>
+					</div>
+				</div><!-- end div.librarySlideshow -->
+			</div><!-- end div.topRight -->
+		<!-- </div> end div.flex-item -->
 	</div><!-- end div.libraryTitle -->
-	
+
 	<div class="content-main flex-container group <?php echo $strLocation; ?>">
 		<div class="col-1 content-page">
 
 			<?php if ($title1 != "" || $title2 != ""): ?>
 				<?php $noTab = "";  ?>
 			<ul class="tabnav">
 				<?php if ($title1 != ""): ?>
-				<li class="active"><h2 class="title-tab"><a href="#tab1"><?php echo $title1 ?><div><?php echo $subtitle1 ?></div></a></h2></li>
+				<li class="active tab1st"><h2 class="title-tab"><a href="#tab1"><?php echo $title1 ?><span class="title-sub hidden-mobile"><?php echo $subtitle1 ?></span class="title-sub"></a></h2></li>
 				<?php endif; ?>
 				<?php if ($title2 != ""): ?>
-				<li><h2 class="title-tab"><a href="#tab2"><?php echo $title2 ?><span class="title-sub"><?php echo $subtitle2 ?></span class="title-sub"></a></h2></li>
+				<li class="tab2nd"><h2 class="title-tab"><a href="#tab2"><?php echo $title2 ?><span class="title-sub hidden-mobile"><?php echo $subtitle2 ?></span class="title-sub"></a></h2></li>
 				<?php endif; ?>
 			</ul>
 			<?php else: ?>
@@ -139,30 +147,30 @@
 
 			<div class="tabcontent group <?php echo $noTab ?>">
 
-				<div class="tab active flex-container group" id="tab1">
+				<div class="tab tab1 active flex-container group" id="tab1">
 
 						<div class="flex-item first group <?php if($content1wide): ?>span7 wideColumn<?php else: ?>span4<?php endif; ?>">
-						
+
 							<?php
 								if ($arexpert) {
 									$expertIndex = array_rand($arexpert);
 									$expert = $arexpert[$expertIndex];
-									
-									
+
+
 									$name = $expert->post_title;
 									$bio = $expert->post_excerpt;
 									//$url = $expert->guid;
 									$url = get_post_meta($expert->ID, "expert_url", 1);
-									
+
 									if (has_post_thumbnail($expert->ID)) {
 										$thumb = get_the_post_thumbnail($expert->ID, array(108,108));
 									} else {
 										$thumb = "";
 									}
-									
+
 							?>
 							<div class="profile flex-container group">
-								<?php if ($thumb != ""): 
+								<?php if ($thumb != ""):
 									echo $thumb;
 								endif; ?>
 								<div class="profileContent">
@@ -183,16 +191,16 @@
 
 						</div>
 
-						<div class="flexItem second span3">
+						<div class="flex-item second span3">
 							<?php echo $content1 ?>
 						</div>
 
 				</div>
 				<?php if ($title2 != ""): ?>
 
-				<div class="tab tab2 flexContainer group" id="tab2">
+				<div class="tab tab2 flex-container group" id="tab2">
 
-						<div class="flexItem first <?php if($content2wide): ?>span8 wideColumn<?php else: ?>span2<?php endif; ?>">
+						<div class="flex-item first <?php if($content2wide): ?>span8 wideColumn<?php else: ?>span2<?php endif; ?>">
 						<?php echo $content2left ?>
 
 						<?php if ($reserveUrl != ""): ?>
@@ -202,7 +210,7 @@
 
 						</div>
 
-						<div class="flexItem second span6">
+						<div class="flex-item second span6">
 							<?php echo $content2 ?>
 						</div>
 

content-page.php

@@ -6,46 +6,38 @@
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
  */
+
+
+
 global $isRoot;
+
+
+
 ?>
-	<div class="nav-page">
-		<ul>
-			<?php
-
-				$pageRoot = getRoot($post);
-				$section = get_post($pageRoot);
-
-				$args = array(
-					"child_of" => $pageRoot,
-					"title_li" => "",
-				);
-
-				$menuName = $section->post_name;
-
-				$menu = wp_get_nav_menu_items($menuName);
-
-				if ($menu) {
-					wp_nav_menu( array( 'menu' => $menuName, 'menu_class' => 'nav-menu' ) ); 
-				} else {
-					wp_list_pages( $args ); 
-				}
-			?>
-		</ul>
-	</div><!-- end div.pagenav -->
-	<div class="content-page flex-container">
-		<div class="col-1">
+
+	<?php if (in_category('has-menu')) { ?>
+		<?php get_template_part('inc/content', 'secmenu'); ?>
+			<?php } ?>
+
+	<div class="content-main flex-container">
+		<div class="col-1 content-page">
 			<div class="entry-content">
+				<div class="entry-page-title">
 				<?php if (!$isRoot): ?>
-				<h2><?php the_title(); ?></h2>
+				<h1><?php the_title(); ?></h1>
 				<?php endif; ?>
+				</div>
 				<?php the_content(); ?>
-
 			</div>
 			<footer class="entry-meta">
 				<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
 			</footer><!-- .entry-meta -->
 		</div>
+<?php if ( is_active_sidebar( 'sidebar-1' ) ) { ?>
 		<div class="col-2">
-			<?php get_sidebar(); ?>
+		<?php get_sidebar( 'sidebar-1' ); ?>
+<?php } ?>
 		</div>
-	</div>
+	</div>
+
+