diff --git a/funnel/assets/js/utils/analytics.js b/funnel/assets/js/utils/analytics.js index d7e751064..5cd5265a9 100644 --- a/funnel/assets/js/utils/analytics.js +++ b/funnel/assets/js/utils/analytics.js @@ -8,6 +8,15 @@ const Analytics = { value, }); } + if (typeof window._paq !== 'undefined') { + let _paq = window._paq; + gtag('event', category, { + event_category: action, + event_label: label, + value, + }); + _paq.push(['trackEvent', category, action, label, value]); + } }, init() { // Send click events to Google analytics diff --git a/funnel/templates/account_menu.html.jinja2 b/funnel/templates/account_menu.html.jinja2 index 039d88321..db9be1cae 100644 --- a/funnel/templates/account_menu.html.jinja2 +++ b/funnel/templates/account_menu.html.jinja2 @@ -112,7 +112,7 @@ {{ csrf_tag() }} diff --git a/funnel/templates/layout.html.jinja2 b/funnel/templates/layout.html.jinja2 index 7ed7c351d..0929c5451 100644 --- a/funnel/templates/layout.html.jinja2 +++ b/funnel/templates/layout.html.jinja2 @@ -219,7 +219,7 @@ {%- elif request.endpoint != 'login' %} {% trans %}Login{% endtrans %} + class="mui-btn mui-btn--primary mui-btn--small mui-btn--raised header__button" id="login-nav" data-ga="Login">{% trans %}Login{% endtrans %} {%- else %} {# On the login page, remove the login button but occupy the spot -#}
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2 index 89523305a..4c4d1404f 100644 --- a/funnel/templates/macros.html.jinja2 +++ b/funnel/templates/macros.html.jinja2 @@ -74,9 +74,9 @@ {{ faicon(icon='bookmark', baseline=true, icon_size=iconsize, css_class="mui--text-light") }} {%- else %} - - + {%- endif %} @@ -440,7 +440,7 @@ {%- macro add_submission_btn(project) %} {%- if project.state.PUBLISHED %}
- {% trans %}Make a submission{% endtrans %} + {% trans %}Make a submission{% endtrans %} {% if project.cfp_end_at_localized -%}

{% trans date=project.cfp_end_at_localized|datetime(format='dd MMM YYYY, hh:mm a') %}Accepting submissions till {{ date }}{% endtrans %}

{% endif %}
{%- endif %} @@ -467,7 +467,7 @@ {% endif %} {%- if account.membership_project and not is_member %}
-

{% trans tcount=account.published_project_count, count=account.published_project_count|numberformat %}One project{% pluralize tcount %}{{ count }} projects{% endtrans %}

+

{% trans tcount=account.published_project_count, count=account.published_project_count|numberformat %}One project{% pluralize tcount %}{{ count }} projects{% endtrans %}

{% trans %}Become a member{% endtrans %}
{% else %} @@ -476,7 +476,7 @@ {% endif %}

{% trans tcount=account.published_project_count, count=account.published_project_count|numberformat %}One project{% pluralize tcount %}{{ count }} projects{% endtrans %}

- {% trans %}Explore{% endtrans %} + {% trans %}Explore{% endtrans %}
{% endif %} diff --git a/funnel/templates/profile.html.jinja2 b/funnel/templates/profile.html.jinja2 index 8bb7b167d..c5b915bcd 100644 --- a/funnel/templates/profile.html.jinja2 +++ b/funnel/templates/profile.html.jinja2 @@ -188,7 +188,7 @@
{% elif membership_project.features.show_tickets %}
-
@@ -75,14 +75,14 @@
{%- if not current_auth.is_anonymous %} @@ -93,7 +93,7 @@

{{ featured_project.title }}

{{ featured_project.tagline }}

{% if featured_project.primary_venue %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {% if featured_project.primary_venue.city %}{{ featured_project.primary_venue.city }}{% else %}{{ featured_project.primary_venue.title }}{% endif %}{% elif featured_project.location %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {{ featured_project.location }}{% endif %}
- {% trans %}Learn more{% endtrans %} + {% trans %}Learn more{% endtrans %}
@@ -116,7 +116,7 @@ {% endif %}
@@ -483,10 +483,10 @@ {% trans %}Submissions{% endtrans %} {{ faicon(icon='chevron-right', icon_size='subhead') }} {%- endif %} {%- if project.current_roles.editor or project.schedule_start_at or current_page == 'schedule' %} - {% trans %}Schedule{% endtrans %} {{ faicon(icon='chevron-right', icon_size='subhead') }} + {% trans %}Schedule{% endtrans %} {{ faicon(icon='chevron-right', icon_size='subhead') }} {%- endif %} {% if project.has_sessions_with_video %} - {% trans %}Videos{% endtrans %} {{ faicon(icon='chevron-right', icon_size='subhead') }} + {% trans %}Videos{% endtrans %} {{ faicon(icon='chevron-right', icon_size='subhead') }} {%- endif %} {% trans %}Crew{% endtrans %} {{ faicon(icon='chevron-right', icon_size='subhead') }} diff --git a/funnel/templates/rsvp_modal.html.jinja2 b/funnel/templates/rsvp_modal.html.jinja2 index bb069ad82..555978463 100644 --- a/funnel/templates/rsvp_modal.html.jinja2 +++ b/funnel/templates/rsvp_modal.html.jinja2 @@ -17,7 +17,7 @@

{% trans %}This will share your name and email address or phone number with the project’s promoter so they can keep you updated. You can cancel your registration at any time{% endtrans %}

- +
{{ json_form_template() }}