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

Tagmanager #5051

Merged
merged 4 commits into from
Aug 21, 2019
Merged

Tagmanager #5051

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc3cb14
add tagmanager with envs
octavioamu Aug 15, 2019
8d972a2
remove scripts loaded by gtm
octavioamu Aug 15, 2019
c221a2d
add titles for easy tagging
octavioamu Aug 20, 2019
a651e57
Merge branch 'master' into tagmanager
thelostone-mc Aug 21, 2019
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
46 changes: 23 additions & 23 deletions app/dashboard/templates/board.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<a :href="bounty.absolute_url" title="View bounty details" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
Expand All @@ -92,16 +92,16 @@
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.absolute_url" title="View bounty details" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.github_url" class="mx-md-2 my-1" target="_blank"><i class="fab fa-github"></i> View Github</a>
</div>
</div>
</div>
</div>
<button v-if="bounty.users_count > 0" @click="toggleCollapse(key, 'open'), fetchApplicants(bounty.id, key, 'open')" class="btn blue">View Applicants <i class="fa fa-fw" :class="isExpanded(key, 'open')? 'fa-chevron-up': 'fa-chevron-down'"></i></button>
<div class="d-flex flex-column justify-content-center" v-else>
<a :href="`/bounty/change/${bounty.id}`" target="_blank" class="btn btn-gc-blue btn-sm m-2"> <i class="fas fa-star pr-2"></i> Feature Bounty</a>
<a :href="`/bounty/change/${bounty.id}`" target="_blank" class="btn btn-gc-blue btn-sm m-2"> <i class="fas fa-user pr-2"></i> Invite Contributors</a>
<a :href="`/bounty/change/${bounty.id}`" target="_blank" title="Feature bounty" class="btn btn-gc-blue btn-sm m-2"> <i class="fas fa-star pr-2"></i> Feature Bounty</a>
<a :href="`/bounty/change/${bounty.id}`" target="_blank" title="Invite contributors" class="btn btn-gc-blue btn-sm m-2"> <i class="fas fa-user pr-2"></i> Invite Contributors</a>
</div>
</div>
<div v-show="isExpanded(key, 'open')">
Expand All @@ -127,15 +127,15 @@
</div>
</div>
<div class="d-flex flex-column flex-md-row">
<a target="_blank" :href="`${bounty.absolute_url}?mutate_worker_action=approve&worker=${contributor.handle}`" class="btn btn-sm btn-gc-blue m-2"><i class="fas fa-check"></i> Accept</a>
<a target="_blank" :href="`${bounty.absolute_url}?mutate_worker_action=reject&worker=${contributor.handle}`" class="btn btn-sm btn-outline-gc-blue m-2"><i class="fas fa-times"></i> Reject</a>
<a target="_blank" :href="`${bounty.absolute_url}?mutate_worker_action=approve&worker=${contributor.handle}`" title="Approve worker" class="btn btn-sm btn-gc-blue m-2"><i class="fas fa-check"></i> Accept</a>
<a target="_blank" :href="`${bounty.absolute_url}?mutate_worker_action=reject&worker=${contributor.handle}`" title="Reject worker" class="btn btn-sm btn-outline-gc-blue m-2"><i class="fas fa-times"></i> Reject</a>
</div>
</div>
<div class="comment-plan">[[ contributor.interest.issue_message]]</div>
</li>
<li class="text-center">
<p class="font-smaller-2 mb-2">Couldn’t find the right contributor?</p>
<a href="/users" class="btn btn-outline-gc-blue w-75 font-smaller-2 gc-letter-spacing">EXPLORE USER DIRECTORY</a>
<a href="/users" title="Go to user directory" class="btn btn-outline-gc-blue w-75 font-smaller-2 gc-letter-spacing">EXPLORE USER DIRECTORY</a>
</li>
</ul>
<loading-screen v-if="isLoading.openContrib"></loading-screen>
Expand All @@ -146,9 +146,9 @@
<h4 class="h5 font-weight-semibold my-3">
You haven’t funded any issues yet.
</h4>
<p class="text-black-70"><a href="{% url 'new_funding' %}">Fund an Issue</a> or check out our <a href="{% url 'quickstart' %}">Funders Guide</a> to start getting contributors for your project! </p>
<p class="text-black-70"><a title="Fund an issue" href="{% url 'new_funding' %}">Fund an Issue</a> or check out our <a href="{% url 'quickstart' %}">Funders Guide</a> to start getting contributors for your project! </p>
<p class="text-black-70">Have any question? Chat with us on <a href="{% url 'slack' %}">Slack</a>!</p>
<a href="/funding/new" class="btn btn-gc-blue">Fund an Issue</a>
<a href="{% url 'new_funding' %}" title="Fund an Issue" class="btn btn-gc-blue">Fund an Issue</a>
</li>
</ul>
<loading-screen v-if="isLoading.open"></loading-screen>
Expand Down Expand Up @@ -176,7 +176,7 @@ <h4 class="h5 font-weight-semibold my-3">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark" title="View bounty details">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
Expand All @@ -185,7 +185,7 @@ <h4 class="h5 font-weight-semibold my-3">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.absolute_url" title="View bounty details" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.github_url" class="mx-md-2 my-1" target="_blank"><i class="fab fa-github"></i> View Github</a>
</div>
</div>
Expand All @@ -210,9 +210,9 @@ <h4 class="h5 font-weight-semibold my-3">
</div>
</div>
</div>
<a :href="`/issue/payout?pk=${bounty.id}`" class="btn btn-sm btn-gc-blue m-2">Payout bounty</a>
<a :href="`/issue/payout?pk=${bounty.id}`" title="Payout bounty" class="btn btn-sm btn-gc-blue m-2">Payout bounty</a>
</div>
<div class="comment-plan"> <a :href="contributor.fulfiller_metadata.data.payload.fulfiller.githubPRLink">[[ contributor.fulfiller_metadata.data.payload.fulfiller.githubPRLink ]]</a></div>
<div class="comment-plan"> <a :href="contributor.fulfiller_metadata.data.payload.fulfiller.githubPRLink" title="Go to PR">[[ contributor.fulfiller_metadata.data.payload.fulfiller.githubPRLink ]]</a></div>
</li>
</ul>
<loading-screen v-if="isLoading.submittedContrib"></loading-screen>
Expand Down Expand Up @@ -255,14 +255,14 @@ <h4 class="h5 font-weight-semibold my-3">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.absolute_url" title="View bounty details" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.github_url" class="mx-md-2 my-1" target="_blank"><i class="fab fa-github"></i> View Github</a>
</div>
</div>
</div>
</div>
<div class="d-flex flex-column justify-content-center">
<a :href="bounty.absolute_url" class="btn btn-sm btn-gc-blue m-2"> <i class="fas fa-clock"></i> Extend Expiration</a>
<a :href="bounty.absolute_url" title="Extend bounty expiration" class="btn btn-sm btn-gc-blue m-2"> <i class="fas fa-clock"></i> Extend Expiration</a>
</div>
</div>
</li>
Expand Down Expand Up @@ -317,7 +317,7 @@ <h4 class="h5 font-weight-semibold my-3">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<a :href="bounty.absolute_url" title="View bounty details" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
Expand All @@ -326,15 +326,15 @@ <h4 class="h5 font-weight-semibold my-3">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.absolute_url" title="View bounty details" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.github_url" class="mx-md-2 my-1" target="_blank"><i class="fab fa-github"></i> View Github</a>
</div>
</div>
</div>
</div>
<div>
<a target="_blank" :href="`/issue/fulfill?pk=${bounty.id}`" class="btn btn-sm btn-gc-blue m-2">Submit Work</a>
<button @click="stopWork(key, bounty.id, authProfile, 'contributorBounties', 'work_in_progress')" class="btn btn-sm btn-outline-gc-blue m-2" :disabled="key === disabledBtn">Stop Work</button>
<a target="_blank" :href="`/issue/fulfill?pk=${bounty.id}`" title="Submit work" class="btn btn-sm btn-gc-blue m-2">Submit Work</a>
<button @click="stopWork(key, bounty.id, authProfile, 'contributorBounties', 'work_in_progress')" class="btn btn-sm btn-outline-gc-blue m-2" title="Stop work" :disabled="key === disabledBtn">Stop Work</button>
</div>
</div>
</li>
Expand All @@ -345,7 +345,7 @@ <h4 class="h5 font-weight-semibold my-3">
</h4>
<p class="text-black-70"><a href="{% url 'explorer' %}">Find a bounty</a> or check out our <a href="{% url 'how_it_works' 'contributor' %}">Contributors Guide</a> to start doing bounties! </p>
<p class="text-black-70">Have any question? Chat with us on <a href="{% url 'slack' %}">Slack</a>!</p>
<a href="{% url 'explorer' %}" class="btn btn-gc-blue">Find a Bounty</a>
<a href="{% url 'explorer' %}" title="Find bounty" class="btn btn-gc-blue">Find a Bounty</a>
</li>
</ul>
<loading-screen v-if="isLoading.work_in_progress"></loading-screen>
Expand Down Expand Up @@ -381,7 +381,7 @@ <h4 class="h5 font-weight-semibold my-3">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.absolute_url" title="View bounty details" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.github_url" class="mx-md-2 my-1" target="_blank"><i class="fab fa-github"></i> View Github</a>
</div>
</div>
Expand Down Expand Up @@ -420,7 +420,7 @@ <h4 class="h5 font-weight-semibold my-3">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<a :href="bounty.absolute_url" title="View bounty details" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
Expand All @@ -429,7 +429,7 @@ <h4 class="h5 font-weight-semibold my-3">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.absolute_url" title="View bounty details" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.github_url" class="mx-md-2 my-1" target="_blank"><i class="fab fa-github"></i> View Github</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/faucet/templates/faucet_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h5 class="mt-5 mb-4">{% trans "Request Received" %}</h5>
</div>
</div>
{% 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' %}
Expand Down
40 changes: 0 additions & 40 deletions app/retail/templates/shared/analytics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,43 +19,3 @@
<script async>(function(s,u,m,o,j,v){j=u.createElement(m);v=u.getElementsByTagName(m)[0];j.async=1;j.src=o;j.dataset.sumoSiteId='0f081a6f95a3644ff88bf8da28b0ac85e88083ae84b6d685a8039be24680e53c';v.parentNode.insertBefore(j,v)})(window,document,'script','//load.sumo.com/');</script>
{% endif %}
{% endif %}
{% if env == 'prod' %}
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-102304388-1', 'auto');
ga('require', 'GTM-NP2J8TX');
ga('send', 'pageview');
</script>
<!-- Facebook Pixel Code -->
<script>
!function(f,b,e,v,n,t,s)
{if(f.fbq)return;n=f.fbq=function(){n.callMethod?
n.callMethod.apply(n,arguments):n.queue.push(arguments)};
if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
n.queue=[];t=b.createElement(e);t.async=!0;
t.src=v;s=b.getElementsByTagName(e)[0];
s.parentNode.insertBefore(t,s)}(window,document,'script',
'https://connect.facebook.net/en_US/fbevents.js');
fbq('init', '539768073058141');
fbq('track', 'PageView');
</script>
<noscript>
<img height="1" width="1"
src="https://www.facebook.com/tr?id=539768073058141&ev=PageView
&noscript=1"/>
</noscript>
<!-- End Facebook Pixel Code -->
{% endif %}
<!-- Twitter universal website tag code -->
<script>
!function(e,t,n,s,u,a){e.twq||(s=e.twq=function(){s.exe?s.exe.apply(s,arguments):s.queue.push(arguments);
},s.version='1.1',s.queue=[],u=t.createElement(n),u.async=!0,u.src='//static.ads-twitter.com/uwt.js',
a=t.getElementsByTagName(n)[0],a.parentNode.insertBefore(u,a))}(window,document,'script');
// Insert Twitter Pixel ID and Standard Event data below
twq('init','nyxuq');
twq('track','PageView');
</script>
<!-- End Twitter universal website tag code -->
Loading