Skip to content
This repository has been archived by the owner on Feb 1, 2023. It is now read-only.

Commit

Permalink
Added consent manager, privacy policy (#305)
Browse files Browse the repository at this point in the history
* Rebased on Consent Manager from default GA

* Added privacy policy link on landing page

* Added privacy policy link to dashboard

* Fixed linting error
  • Loading branch information
roll committed May 24, 2018
1 parent e916231 commit 92fad52
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
6 changes: 6 additions & 0 deletions frontend/components/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ export default {
</div>
</div>
</li>
<li>
<a href="https://okfn.org/privacy-policy/" rel="external">
<span class="icon-list"></span>
<span class="text">Privacy policy</span>
</a>
</li>
<li v-if="userName" class="log-out">
<a :href="`${baseUrl}/user/logout`">
<img v-if="avatarURL" :src="avatarURL" alt="" />
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/AppBaseLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default {
</li>
</ul>
<p>
GoodTables is part of the <a href="https://frictionlessdata.io" rel="external">Frictionless Data</a> project from <a href="https://okfn.org" rel="external">Open Knowledge International</a>, which supports a wider discussion around Open Data quality. We believe that GoodTables can reduce the processing time of your data publication workflow, whatever it may be.
GoodTables is part of the <a href="https://frictionlessdata.io" rel="external">Frictionless Data</a> project from <a href="https://okfn.org" rel="external">Open Knowledge International</a>, which supports a wider discussion around Open Data quality. We believe that GoodTables can reduce the processing time of your data publication workflow, whatever it may be. <a href="https://okfn.org/privacy-policy/">Privacy policy</a>.
</p>
</div>
</section>
Expand Down
19 changes: 6 additions & 13 deletions frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>

<!-- Consent manager -->
{% if google_analytics_code %}
<script>var okiConsent = {analyticsTrackingID: '{{ google_analytics_code }}'}</script>
<script src="https://a.okfn.org/html/oki/consent/assets/js/consent.js"></script>
{% endif %}

</head>
<body>

Expand Down Expand Up @@ -43,18 +49,5 @@
})
</script>

{% if google_analytics_code %}
<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', '{{ google_analytics_code }}', 'auto');
ga('send', 'pageview');

</script>
{% endif %}

</body>
</html>
2 changes: 1 addition & 1 deletion goodtablesio/integrations/s3/utils/s3client.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def _statement_id_for_bucket(self, bucket_name):
def check_connection(self, bucket_name):
try:
return self.client.head_bucket(Bucket=bucket_name)
except botocore.exceptions.ParamValidationError as e:
except botocore.exceptions.ParamValidationError:
raise S3Exception(
'Invalid bucket name: {}'.format(bucket_name),
's3-invalid-bucket-name')
Expand Down

0 comments on commit 92fad52

Please sign in to comment.