From fc3cb14b658b89bfc594082797bf2c368a24892b Mon Sep 17 00:00:00 2001 From: octavioamu Date: Thu, 15 Aug 2019 10:56:21 -0300 Subject: [PATCH 1/3] add tagmanager with envs --- .../templates/shared/tag_manager_1.html | 24 +++++++++++++------ .../templates/shared/tag_manager_2.html | 7 +++++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/app/retail/templates/shared/tag_manager_1.html b/app/retail/templates/shared/tag_manager_1.html index 266aae8b1c5..39a568f7d98 100644 --- a/app/retail/templates/shared/tag_manager_1.html +++ b/app/retail/templates/shared/tag_manager_1.html @@ -14,10 +14,20 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . {% endcomment %} - - - +{% if env == 'prod' %} + + + +{% else %} + + + +{% endif %} diff --git a/app/retail/templates/shared/tag_manager_2.html b/app/retail/templates/shared/tag_manager_2.html index 3cdc18449dc..a77df4df891 100644 --- a/app/retail/templates/shared/tag_manager_2.html +++ b/app/retail/templates/shared/tag_manager_2.html @@ -18,7 +18,12 @@ {% if env == 'prod' %} - + +{% else %} + + {% endif %} From 8d972a29c7ab50c7325e2920f81dd79819630d5c Mon Sep 17 00:00:00 2001 From: octavioamu Date: Thu, 15 Aug 2019 10:56:43 -0300 Subject: [PATCH 2/3] remove scripts loaded by gtm --- app/faucet/templates/faucet_form.html | 2 +- app/retail/templates/shared/analytics.html | 40 ----------------- app/retail/templates/shared/ga.html | 52 ---------------------- 3 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 app/retail/templates/shared/ga.html diff --git a/app/faucet/templates/faucet_form.html b/app/faucet/templates/faucet_form.html index 6f400d8c71d..7da6e97bb19 100644 --- a/app/faucet/templates/faucet_form.html +++ b/app/faucet/templates/faucet_form.html @@ -114,7 +114,7 @@
{% trans "Request Received" %}
{% include 'shared/bottom_notification.html' %} - {% include 'shared/ga.html' %} + {% include 'shared/analytics.html' %} {% include 'shared/footer_scripts.html' %} {% include 'shared/footer.html' %} {% include 'shared/messages.html' %} diff --git a/app/retail/templates/shared/analytics.html b/app/retail/templates/shared/analytics.html index c6d19959aba..b08dc7cded8 100644 --- a/app/retail/templates/shared/analytics.html +++ b/app/retail/templates/shared/analytics.html @@ -19,43 +19,3 @@ {% endif %} {% endif %} -{% if env == 'prod' %} - - - - - -{% endif %} - - - diff --git a/app/retail/templates/shared/ga.html b/app/retail/templates/shared/ga.html deleted file mode 100644 index c51f240b534..00000000000 --- a/app/retail/templates/shared/ga.html +++ /dev/null @@ -1,52 +0,0 @@ -{% comment %} - Copyright (C) 2019 Gitcoin Core - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -{% endcomment %} -{% if env == 'prod' %} - - - - - - - - -{% endif %} - From c221a2d3ab795f4d803d07b1b554118dd4b0531a Mon Sep 17 00:00:00 2001 From: octavioamu Date: Mon, 19 Aug 2019 23:21:48 -0300 Subject: [PATCH 3/3] add titles for easy tagging --- app/dashboard/templates/board.html | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/app/dashboard/templates/board.html b/app/dashboard/templates/board.html index 01f338a6acc..e26da84235f 100644 --- a/app/dashboard/templates/board.html +++ b/app/dashboard/templates/board.html @@ -83,7 +83,7 @@
- [[ bounty.title ]] + [[ bounty.title ]]
[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD) - View Issue Details + View Issue Details View Github
@@ -100,8 +100,8 @@
@@ -127,15 +127,15 @@
[[ contributor.interest.issue_message]]
  • Couldn’t find the right contributor?

    - EXPLORE USER DIRECTORY + EXPLORE USER DIRECTORY
  • @@ -146,9 +146,9 @@

    You haven’t funded any issues yet.

    -

    Fund an Issue or check out our Funders Guide to start getting contributors for your project!

    +

    Fund an Issue or check out our Funders Guide to start getting contributors for your project!

    Have any question? Chat with us on Slack!

    - Fund an Issue + Fund an Issue @@ -176,7 +176,7 @@

    - [[ bounty.title ]] + [[ bounty.title ]]
    [[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD) - View Issue Details + View Issue Details View Github
    @@ -210,9 +210,9 @@

    - Payout bounty + Payout bounty - + @@ -255,14 +255,14 @@

    [[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD) - View Issue Details + View Issue Details View Github @@ -317,7 +317,7 @@

    - [[ bounty.title ]] + [[ bounty.title ]]
    [[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD) - View Issue Details + View Issue Details View Github
    - Submit Work - + Submit Work +
    @@ -345,7 +345,7 @@

    Find a bounty or check out our Contributors Guide to start doing bounties!

    Have any question? Chat with us on Slack!

    - Find a Bounty + Find a Bounty @@ -381,7 +381,7 @@

    [[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD) - View Issue Details + View Issue Details View Github @@ -420,7 +420,7 @@

    - [[ bounty.title ]] + [[ bounty.title ]]
    [[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD) - View Issue Details + View Issue Details View Github