Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code Cleanup and new Google Tag Manager #607

Merged
merged 15 commits into from
Jul 27, 2024
Merged

Code Cleanup and new Google Tag Manager #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
27aad74
Update basic.html.erb
nnunn Jul 24, 2024
cbce0b4
updating Google Tag Manager
nnunn Jul 24, 2024
d0c4508
Update application.html.erb
nnunn Jul 24, 2024
97e0bec
Delete app/views/layouts/mailer.text.erb
nnunn Jul 24, 2024
d959d23
Delete app/views/layouts/2020.html.erb
nnunn Jul 24, 2024
099cbff
Delete app/views/layouts/2020_bootstrap_v5.html.erb
nnunn Jul 24, 2024
2bb617b
Delete app/views/layouts/cms.html.erb
nnunn Jul 24, 2024
78deef8
Delete app/views/layouts/cms_french.html.erb
nnunn Jul 24, 2024
a0560e7
Delete app/views/layouts/french.html.erb
nnunn Jul 24, 2024
f1b61eb
Delete app/views/layouts/giving.html.erb
nnunn Jul 24, 2024
790d85a
Delete app/views/layouts/home.html.erb
nnunn Jul 24, 2024
e3b9edf
Delete app/views/layouts/mailer.html.erb
nnunn Jul 24, 2024
cee4fa0
Revert "Delete app/views/layouts/mailer.html.erb"
nnunn Jul 24, 2024
fcce34b
Revert "Delete app/views/layouts/mailer.text.erb"
nnunn Jul 24, 2024
3fc2d82
Update all seed data layouts to use `basic` layout
murny Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 0 additions & 55 deletions app/views/layouts/2020.html.erb
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions app/views/layouts/2020_bootstrap_v5.html.erb
View file
Open in desktop

This file was deleted.

412 changes: 242 additions & 170 deletions app/views/layouts/application.html.erb
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 9 additions & 26 deletions app/views/layouts/basic.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,21 @@
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/5abf36224f.js" crossorigin="anonymous"></script>
<link href="https://www.ualberta.ca/_assets/css/framework-v2.css" media="screen" rel="stylesheet">
<script src="https://ualberta.libanswers.com/load_chat.php?hash=baadd67c0b9382719dabca82069083e2e6b6d873103a32cc235ec09ad41f22a5"></script>
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-5QT07E47HT"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-5QT07E47HT');
</script>
<!-- Google Tag Manager -->
<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 = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-PVV4HQM4');
</script>
<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=
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-MX43PRW2');</script>
<!-- End Google Tag Manager -->
<%= stylesheet_link_tag comfy_cms_render_css_path(@cms_site.id, @cms_layout.identifier) %>
<%= javascript_include_tag comfy_cms_render_js_path(@cms_site.id, @cms_layout.identifier) %>
</head>
<body>
<!-- Google Tag Manager (noscript) -->
<noscript>
<iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PVV4HQM4" height="0" width="0" style="display:none;visibility:hidden"></iframe>
</noscript>
<!-- End Google Tag Manager (noscript) -->
<!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-MX43PRW2"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) -->
<%= yield %>
</body>
</html>
61 changes: 0 additions & 61 deletions app/views/layouts/cms.html.erb
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions app/views/layouts/cms_french.html.erb
View file
Open in desktop

This file was deleted.

Loading
Loading