version 1.2 update - see changelog.md for complete list of changes

CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+## 2021-01-25 - 1.2.0
+
+- Allow youtube embeds in modal shorcodes
+- updated/modernized quicklinks and footer links
+- added quicklinks disable setting back into the theme and templates
+- Moved all image and icon assets to the assets folder
+- Updated installation instructions to include renaming zip files to uw_wp_theme.zip
+- Fix: removed feature image output & double page title on templates

README.md

@@ -1,5 +1,5 @@
 # UW WordPress Theme
-![UW WordPress Theme version 1.1.1](https://img.shields.io/static/v1?label=version&message=v1.1.1&color=green)
+![UW WordPress Theme version 1.2.0](https://img.shields.io/static/v1?label=version&message=v1.2.0&color=green)
 
 Please visit the [theme Wiki pages](https://github.com/uweb/uw_wp_theme/wiki) for more information on changes from the uw-2014 theme, Bootstrap features, child themes, and developer documentation.
 
@@ -27,11 +27,12 @@ Are you a developer on this project? Please see the [developer documentation](ht
 
 ## Installation
 1. Download this repo as a zip file.
-2. Log into your WordPress admin, if not already.
-3. Go to Appearance > Themes and click the Add New button.
-4. Click the Upload Theme button.
-5. Drag and drop the UW WordPress Theme zip file to the file upload area and click the Install Now button.
-6.  Click the Activate link.
+2. If needed, rename the zip file or folder to `uw_wp_theme.zip`.
+3. Log into your WordPress admin, if not already.
+4. Go to Appearance > Themes and click the Add New button.
+5. Click the Upload Theme button.
+6. Drag and drop the UW WordPress Theme zip file to the file upload area and click the Install Now button.
+7. Click the Activate link.
 
 Do you need a child theme? If so, download and install our [starter child theme](https://github.com/uweb/uw_wp_theme_child).
 

footer.php

@@ -12,32 +12,32 @@
 ?>
 
 		<footer id="colophon" class="site-footer">
-			<a href="http://www.washington.edu" class="footer-wordmark">University of Washington</a>
+			<a href="https://www.washington.edu/" class="footer-wordmark">University of Washington</a>
 
-			<a href="http://www.washington.edu/boundless/"><h3 class="be-boundless">Be boundless</h3></a>
+			<a href="https://www.washington.edu/boundless/"><h3 class="be-boundless">Be boundless</h3></a>
 
 			<h4>Connect with us:</h4>
 			<nav aria-label="social networking">
 				<ul class="footer-social">
-					<li><a class="facebook" href="http://www.facebook.com/UofWA">Facebook</a></li>
-					<li><a class="twitter" href="http://twitter.com/UW">Twitter</a></li>
-					<li><a class="instagram" href="http://instagram.com/uofwa">Instagram</a></li>
-					<li><a class="youtube" href="http://www.youtube.com/user/uwhuskies">YouTube</a></li>
-					<li><a class="linkedin" href="http://www.linkedin.com/company/university-of-washington">LinkedIn</a></li>
-					<li><a class="pinterest" href="http://www.pinterest.com/uofwa/">Pinterest</a></li>
+					<li><a class="facebook" href="https://www.facebook.com/UofWA">Facebook</a></li>
+					<li><a class="twitter" href="https://twitter.com/UW">Twitter</a></li>
+					<li><a class="instagram" href="https://instagram.com/uofwa">Instagram</a></li>
+					<li><a class="youtube" href="https://www.youtube.com/user/uwhuskies">YouTube</a></li>
+					<li><a class="linkedin" href="https://www.linkedin.com/company/university-of-washington">LinkedIn</a></li>
+					<li><a class="pinterest" href="https://www.pinterest.com/uofwa/">Pinterest</a></li>
 				</ul>
 			</nav>
 
 			<nav aria-label="footer navigation">
 				<ul class="footer-links">
-					<li><a href="http://www.uw.edu/accessibility">Accessibility</a></li>
-					<li><a href="http://uw.edu/contact">Contact Us</a></li>
-					<li><a href="http://www.washington.edu/jobs">Jobs</a></li>
-					<li><a href="http://www.washington.edu/safety">Campus Safety</a></li>
-					<li><a href="http://my.uw.edu/">My UW</a></li>
-					<li><a href="http://www.washington.edu/rules/wac">Rules Docket</a></li>
-					<li><a href="http://www.washington.edu/online/privacy/">Privacy</a></li>
-					<li><a href="http://www.washington.edu/online/terms/">Terms</a></li>
+					<li><a href="https://www.washington.edu/accessibility/">Accessibility</a></li>
+					<li><a href="https://www.washington.edu/contact/">Contact Us</a></li>
+					<li><a href="https://www.washington.edu/jobs/">Jobs</a></li>
+					<li><a href="https://www.washington.edu/safety/">Campus Safety</a></li>
+					<li><a href="https://my.uw.edu">My UW</a></li>
+					<li><a href="https://www.washington.edu/rules/wac/">Rules Docket</a></li>
+					<li><a href="https://www.washington.edu/online/privacy/">Privacy</a></li>
+					<li><a href="https://www.washington.edu/online/terms/">Terms</a></li>
 				</ul>
 			</nav>
 

header.php

@@ -28,7 +28,9 @@
 <div id="uwsearcharea" aria-hidden="true" class="uw-search-bar-container"></div>
 
 <div id="page" class="site">
-	<?php get_template_part( 'template-parts/menu', 'quicklinks' ); ?>
+<?php if ( ! get_option( 'quicklinks-hide' ) ) {
+	get_template_part( 'template-parts/menu', 'quicklinks' );
+ } ?>
 	<div id="page-inner">
 		<header id="masthead" class="site-header">
 			<nav class="navbar navbar-expand-lg">
@@ -48,14 +50,16 @@
 								<g><path fill="#FFFFFF" d="M3.537,7.591C3.537,3.405,6.94,0,11.128,0c4.188,0,7.595,3.406,7.595,7.591 c0,4.187-3.406,7.593-7.595,7.593C6.94,15.185,3.537,11.778,3.537,7.591z M5.245,7.591c0,3.246,2.643,5.885,5.884,5.885 c3.244,0,5.89-2.64,5.89-5.885c0-3.245-2.646-5.882-5.89-5.882C7.883,1.71,5.245,4.348,5.245,7.591z"/><rect x="2.418" y="11.445" transform="matrix(0.7066 0.7076 -0.7076 0.7066 11.7842 2.0922)" fill="#FFFFFF" width="1.902" height="7.622"/></g><path fill="#FFFFFF" d="M3.501,47.864c0.19,0.194,0.443,0.29,0.694,0.29c0.251,0,0.502-0.096,0.695-0.29l5.691-5.691l5.692,5.691 c0.192,0.194,0.443,0.29,0.695,0.29c0.25,0,0.503-0.096,0.694-0.29c0.385-0.382,0.385-1.003,0-1.388l-5.692-5.691l5.692-5.692 c0.385-0.385,0.385-1.005,0-1.388c-0.383-0.385-1.004-0.385-1.389,0l-5.692,5.691L4.89,33.705c-0.385-0.385-1.006-0.385-1.389,0 c-0.385,0.383-0.385,1.003,0,1.388l5.692,5.692l-5.692,5.691C3.116,46.861,3.116,47.482,3.501,47.864z"/>
 							</svg>
 						</button>
-						<button class="uw-quicklinks" aria-haspopup="true" aria-expanded="false" aria-label="Open quick links">Quick Links
-							<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="15.63px" height="69.13px" viewBox="0 0 15.63 69.13" enable-background="new 0 0 15.63 69.13" xml:space="preserve" focusable="false"><polygon fill="#FFFFFF" points="12.8,7.776 12.803,7.773 5.424,0 3.766,1.573 9.65,7.776 3.766,13.98 5.424,15.553 12.803,7.78"/><polygon fill="#FFFFFF" points="9.037,61.351 9.036,61.351 14.918,55.15 13.26,53.577 7.459,59.689 1.658,53.577 0,55.15 5.882,61.351 5.882,61.351 5.884,61.353 0,67.557 1.658,69.13 7.459,63.019 13.26,69.13 14.918,67.557 9.034,61.353"/></svg>
-						</button>
-					</div><!-- search-quicklinks -->
-				</div><!-- #site-navigation -->
-			</nav><!-- .navbar.navbar-expand-lg -->
+						<?php if ( ! get_option( 'quicklinks-hide' ) ) { ?>
+							<button class="uw-quicklinks" aria-haspopup="true" aria-expanded="false" aria-label="Open quick links">Quick Links
+								<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="15.63px" height="69.13px" viewBox="0 0 15.63 69.13" enable-background="new 0 0 15.63 69.13" xml:space="preserve" focusable="false"><polygon fill="#FFFFFF" points="12.8,7.776 12.803,7.773 5.424,0 3.766,1.573 9.65,7.776 3.766,13.98 5.424,15.553 12.803,7.78"/><polygon fill="#FFFFFF" points="9.037,61.351 9.036,61.351 14.918,55.15 13.26,53.577 7.459,59.689 1.658,53.577 0,55.15 5.882,61.351 5.882,61.351 5.884,61.353 0,67.557 1.658,69.13 7.459,63.019 13.26,69.13 14.918,67.557 9.034,61.353"/></svg>
+							</button>
+						<?php } ?>
+						</div><!-- search-quicklinks -->
+					</div><!-- #site-navigation -->
+				</nav><!-- .navbar.navbar-expand-lg -->
 		</header><!-- #masthead -->
-		
+
 	<?php
 	$nav_option = get_option( 'nav_menu_options' );
 

inc/shortcodes/class.modal-shortcode.php

@@ -25,7 +25,7 @@ public function __construct() {
 	public function uw_wp_theme_enqueue_modal_script() {
 		$template_directory = get_bloginfo( 'template_directory' );
 		$theme_version = wp_get_theme( get_template( ) )->get( 'Version' );
-		
+
 		wp_register_script( 'uw_wp_theme-modal-script', $template_directory . '/js/shortcodes/modal.js', array( 'jquery', 'uw_wp_theme-bootstrap' ), $theme_version, true );
 	}
 
@@ -116,8 +116,8 @@ public function uw_modal_shortcode( $atts, $content = null ) {
 		$output = ob_get_clean();
 
 		if ( $content ) {
-			// allow other shortcodes inside the modal shortcode.
-			$output .= do_shortcode( $content );
+			// allow other shortcodes and embeds inside the modal shortcode.
+			$output .= apply_filters('the_content', $content );
 		} else {
 			$output .= '<strong>Please add content to this modal.</strong>';
 		}

inc/theme-settings.php

@@ -10,7 +10,7 @@ function theme_settings_page() {
     ?>
 	    <div class="wrap">
 			<h1>Theme Panel</h1>
-			
+
 			<?php settings_errors(); ?>
 			<div class="notice notice-info is-dismissible">
 				<p>Check out the <a href="https://github.com/uweb/uw_wp_theme#readme" target="_blank">theme documentation</a> for more information on these settings.</p>
@@ -69,44 +69,44 @@ function display_search_element() {
      	<input type="checkbox" name="search-hide" value="1" <?php checked( 1, get_option( 'search-hide' ), true ); ?> />
 		 <?php
  }
- 
+
  function display_overly_long_title() {
 	 ?>
      	<input type="checkbox" name="overly_long_title" value="1" <?php checked( 1, get_option( 'overly_long_title' ), true ); ?> />
 		 <?php
  }
- 
+
  function display_byline_on_posts() {
 	 ?>
      	<input type="checkbox" name="show_byline_on_posts" value="1" <?php checked( 1, get_option( 'show_byline_on_posts' ), true ); ?> />
 		 <?php
  }
- 
+
 function display_theme_panel_fields() {
 	add_settings_section( "section", "All Settings", null, "theme-options" );
 
 	add_settings_field( 'uw_nav_options', 'Main navigation menu style', 'nav_menu_options', 'theme-options', 'section' );
-	
+
 	add_settings_field( 'overly_long_title', 'Does your site title take two lines on desktop?', 'display_overly_long_title', 'theme-options', 'section' );
-	
+
 	add_settings_field( 'show_byline_on_posts', 'Show bylines on single posts and archives?', 'display_byline_on_posts', 'theme-options', 'section' );
 
     add_settings_field("breadcrumb-hide", "Hide Breadcrumbs from site", "display_breadcrumb_element", "theme-options", "section");
-	
-    // add_settings_field("quicklinks-hide", "Hide Quicklinks menu button", "display_quicklinks_element", "theme-options", "section");
-	
+
+    add_settings_field("quicklinks-hide", "Hide Quicklinks menu button", "display_quicklinks_element", "theme-options", "section");
+
     // add_settings_field("search-hide", "Hide Search menu button", "display_search_element", "theme-options", "section");
-	
+
     // register_setting("section", "search-hide");
 
-    // register_setting( "section", "search-hide" );
-	
+    register_setting( "section", "quicklinks-hide" );
+
     register_setting( "section", "breadcrumb-hide" );
 
 	register_setting( 'section', 'nav_menu_options' );
-	
+
 	register_setting( 'section', 'overly_long_title' );
-	
+
 	register_setting( 'section', 'show_byline_on_posts' );
 }
 

template-parts/content-page.php

@@ -20,10 +20,8 @@
 		<?php if ( function_exists( 'coauthors' ) ) { coauthors(); } else { the_author(); } ?>
 		<p class="author-desc"> <small><?php the_author_meta(); ?></small></p>
 		</div>
-
-		<?php endif; ?>
 
-	<?php uw_wp_theme_post_thumbnail(); ?>
+		<?php endif; ?>
 
 	<div class="entry-content">
 		<?php

template-parts/content-search.php

@@ -23,8 +23,6 @@
 		<?php endif; ?>
 	</header><!-- .entry-header -->
 
-	<?php uw_wp_theme_post_thumbnail(); ?>
-
 	<div class="entry-summary">
 		<?php the_excerpt(); ?>
 	</div><!-- .entry-summary -->

template-parts/content.php

@@ -31,8 +31,6 @@
 		?>
 	</header><!-- .entry-header -->
 
-	<?php uw_wp_theme_post_thumbnail(); ?>
-
 	<div class="entry-content">
 		<?php
 		the_content(