Merge pull request #207 from LezWatch/hotfix/javascript-errors

Hotfix: Javascript Errors

archive-post_type_actors.php

@@ -51,8 +51,8 @@
 				<div id="primary" class="content-area">
 					<div id="content" class="site-content clearfix">
 						<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-							<div class="entry-content facetwp-template">
-								<div class="row site-loop actor-archive-loop">
+							<div class="entry-content">
+								<div class="row site-loop actor-archive-loop facetwp-template">
 								<?php
 								if ( have_posts() ) {
 									/* Start the Loop */

archive-post_type_characters.php

@@ -52,8 +52,8 @@
 				<div id="primary" class="content-area">
 					<div id="content" class="site-content clearfix">
 						<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-							<div class="entry-content facetwp-template">
-								<div class="row site-loop character-archive-loop">
+							<div class="entry-content">
+								<div class="row site-loop character-archive-loop facetwp-template">
 									<?php
 									if ( have_posts() ) {
 										/* Start the Loop */

functions.php

@@ -28,7 +28,7 @@ function lwtv_admin_notice_missing_plugin() {
 		'font-awesome'     => '6.5.1',    // Bump when you update Font Awesome.
 		'bootstrap'        => '5.3.3',    // Bump when you update bootstrap.
 		'lwtv-blocks'      => '1.0.0',    // Bump when you update the blocks.
-		'yikes-nav'        => '20201024', // Last date this was updated.
+		'yikes-nav'        => '20240318', // Last date this was updated.
 	);
 	define( 'LWTV_THEME_VERSION', $versions );
 }

inc/js/a11y.js

@@ -12,7 +12,7 @@
         socialMenuAriaLabel();
         gravityFormWidgetAriaLabel();
     }
-    
+
     // Add aria-labelledby attributes to menu widgets (<ul>s) with headings.
     function widgetMenuAriaLabels() {
 
@@ -43,12 +43,12 @@
             }
             list.setAttribute(`aria-labelledby`, heading.id);
         });
-        
+
     }
 
     // Add aria-labelledby attribute to social navigation menu (<ul>).
     function socialMenuAriaLabel() {
-        const socialId = `social-navigation`;
+        const socialId = `yikes_social_menu_widget-2`;
         let socialMenu = document.getElementById(socialId);
         if ( 0 === socialMenu.length ) {
             return;
@@ -72,7 +72,7 @@
             return;
         }
         list.setAttribute(`aria-labelledby`, headingId);
-       
+
     }
 
     function gravityFormWidgetAriaLabel() {

readme.md

@@ -22,13 +22,14 @@ It's recommended to use [Homebrew](https://brew.sh) on macOS or [Chocolatey](htt
 
 ## Contributing
 
-All code must pass through the `development` branch which is kept up tp date. As such, any pull requests should be made to **development**, which will push the code automatically to our development server for testing.
+All code must pass through the `development` branch for testing. As such, any pull requests should be made to both **production** and **development**, which will push the code automatically to the appropriate server.
 
-1. Using the `development` branch as base, create a new branch with a descriptive name like `fixing-charts` or `fix/chartjs421` or `feature/latest-posts` . Commit your work to that branch until it's ready for full testing
-2. Open [a pull request](https://help.github.com/en/desktop/contributing-to-projects/creating-a-pull-request) from your feature branch to the `development` branch.
+1. Using the `production` branch as base, create a new branch with a descriptive name like `fixing-charts` or `fix/chartjs421` or `feature/latest-posts` . Commit your work to that branch until it's ready for full testing
+2. Open [a pull request](https://help.github.com/en/desktop/contributing-to-projects/creating-a-pull-request) from your feature branch to the `production` branch.
+3. Open [a pull request](https://help.github.com/en/desktop/contributing-to-projects/creating-a-pull-request) from your feature branch to the `development` branch.
 3. If you are not a main developer, your pull request will be reviewed before it can be merged. If there are issues or changes needed, you may be asked to do so, or they may be done for you.
 4. When the code passes review, it will be merged into the `development` branch and can be tested on the dev server.
-5. Once the code passes tests, the `development` branch will be merged into `production` and the job is done!
+5. Once the code passes tests, the production PR can be merged into the `production` branch, which will auto deploy.
 
 To install and update:
 
@@ -38,14 +39,16 @@ To install and update:
 
 Commits are currently not linted by default.
 
-### CSS
+### CSS & JS
 
 If you're updating CSS you have a couple options, since it's all SCSS:
 
 1. `grunt watch` - run grunt and leave open for ongoing changes.
 2. `grunt build` - run the build process once.
 
-### Libraries
+This will also update any needed internal javascript.
+
+### External Libraries
 
 JS libraries are included via NPM.