Fbq Form event improvements, GA4 property ID added to source code

#2265
chrisblakley · Oct 16, 2023 · fbb1282 · fbb1282
1 parent 50aced2
commit fbb1282
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 18 deletions.
diff --git a/.github/package.json b/.github/package.json
@@ -2,7 +2,7 @@
 	"name": "nebula-wp",
 	"title": "Nebula",
 	"description": "Advanced Starter WordPress Theme for Developers",
-	"version": "11.5.9.034",
+	"version": "11.5.16.730",
 	"homepage": "https://gearside.com/nebula/",
 	"repository": {
 		"type": "git",

diff --git a/Nebula-Child/assets/css/admin.css b/Nebula-Child/assets/css/admin.css
diff --git a/Nebula-Child/resources/sw.js b/Nebula-Child/resources/sw.js
@@ -1,6 +1,6 @@
 //BEGIN automated edits. These will be automatically overwritten.
 const THEME_NAME = 'nebula-child';
-const NEBULA_VERSION = 'v11.5.9.034'; //Monday, October 9, 2023 12:49:12 AM
+const NEBULA_VERSION = 'v11.5.16.730'; //Monday, October 16, 2023 5:30:48 PM
 const OFFLINE_URL = 'https://nebula.gearside.com/offline/';
 const OFFLINE_IMG = 'https://nebula.gearside.com/wp-content/themes/Nebula-main/assets/img/offline.svg';
 const META_ICON = 'https://nebula.gearside.com/wp-content/themes/Nebula-main/assets/img/meta/android-chrome-512x512.png';

diff --git a/Nebula-Child/style.css b/Nebula-Child/style.css
diff --git a/assets/css/admin.css b/assets/css/admin.css
diff --git a/assets/css/critical.css b/assets/css/critical.css
diff --git a/assets/css/login.css b/assets/css/login.css
diff --git a/assets/css/pre.css b/assets/css/pre.css
diff --git a/assets/js/modules/forms.js b/assets/js/modules/forms.js
@@ -162,7 +162,7 @@ nebula.cf7Functions = async function(){
 			nebula.dom.document.trigger('nebula_event', thisEvent);
 			gtag('event', thisEvent.event_name, nebula.gaEventObject(thisEvent)); //This event is required for the notable form metric!
 			window.dataLayer.push(Object.assign(thisEvent, {'event': 'nebula_form_submit_attempt'}));
-			nebula.fbq('track', 'Lead', {content_name: 'Form Submit (Attempt)'});
+			//nebula.fbq('track', 'Lead', {content_name: 'Form Submit (Attempt)'});
 			nebula.clarity('set', thisEvent.event_category, thisEvent.event_action);
 		} catch {
 			gtag('event', 'exception', {
@@ -200,7 +200,7 @@ nebula.cf7Functions = async function(){
 			nebula.dom.document.trigger('nebula_event', thisEvent);
 			gtag('event', thisEvent.event_name, nebula.gaEventObject(thisEvent)); //This event is required for the notable form metric!
 			window.dataLayer.push(Object.assign(thisEvent, {'event': 'nebula_form_submit_processing'}));
-			nebula.fbq('track', 'Lead', {content_name: 'Form Submit (Processing)'});
+			//nebula.fbq('track', 'Lead', {content_name: 'Form Submit (Processing)'});
 			nebula.clarity('track', 'Lead', {content_name: 'Form Submit (Processing)'});
 
 			jQuery('#' + e.detail.unitTag).find('button#submit').removeClass('active');

diff --git a/assets/scss/style.scss b/assets/scss/style.scss
@@ -4,7 +4,7 @@
 	Description: Nebula is a springboard WordPress theme framework for developers. Like other WordPress startup themes, it has custom functionality built-in (like shortcodes, styles, and JS/PHP functions), but unlike other themes Nebula is not meant for the end-user.
 	Author: Pinckney Hugo Group
 	Author URI: http://www.pinckneyhugo.com
-	Version: 11.5.9.034
+	Version: 11.5.16.730
 	License: GNU General Public License v2.0 or later
 	License URI: http://www.gnu.org/licenses/gpl-2.0.html
 	Tags: one-column, two-columns, three-columns, four-columns, left-sidebar, right-sidebar, threaded-comments, theme-options, sticky-post, post-formats, microformats, full-width-template, front-page-post-form, flexible-header, featured-images, featured-image-header, editor-style, custom-menu, custom-colors, accessibility-ready

diff --git a/inc/analytics.php b/inc/analytics.php
@@ -19,7 +19,7 @@ function gtag(){dataLayer.push(arguments);}
 	<?php endif; ?>
 
 	<?php if ( nebula()->get_option('ga_measurement_id') ): //Google Analytics ?>
-		<!-- Nebula GA4 -->
+		<!-- Nebula GA4 <?php echo nebula()->get_option('ga_property_id'); ?> -->
 		<script src="https://www.googletagmanager.com/gtag/js?id=<?php echo esc_html(nebula()->get_option('ga_measurement_id')); ?>" async></script>
 		<script async>
 			window.performance.mark('(Nebula) Analytics [Start]');
@@ -247,7 +247,7 @@ function gtag(){}; //No GA in Nebula
 <?php endif; ?>
 
 <?php if ( nebula()->get_option('gtm_id') ): //Google Tag Manager (can be used for more than just tracking) ?>
-	<!-- Nebula GTM -->
+	<!-- Nebula GTM <?php echo nebula()->get_option('ga_property_id'); ?> -->
 	<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 	new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
 	j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=

diff --git a/inc/data/nebula_theme.json b/inc/data/nebula_theme.json
@@ -1,5 +1,5 @@
 {
-	"version": "11.5.9.034",
+	"version": "11.5.16.730",
 	"details_url": "https://github.com/chrisblakley/Nebula/commits/main",
 	"download_url": "https://github.com/chrisblakley/Nebula/archive/main.zip"
 	}