raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-23 01:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration

Browse Source
This commit is contained in:
luisramos0
2018-08-13 17:25:51 +01:00
committed by Maikel Linke
parent 1c20967ca4
commit ccd5147b11
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
app/assets/javascripts/darkswarm/cookies_policy/cookies_policy.html.haml
View File

@@ -1,180 +0,0 @@
%h2
{{ 'legal.cookies_policy.header' | t}}
%p
{{ 'legal.cookies_policy.desc_part_1' | t}}
%p
{{ 'legal.cookies_policy.desc_part_2' | t}}
%p
{{ 'legal.cookies_policy.desc_part_3' | t}}
%h2
{{ 'legal.cookies_policy.essential_cookies' | t}}
%p
{{ 'legal.cookies_policy.essential_cookies_desc' | t}}
%table{ng: { controller:"CookiesPolicyModalCtrl"}}
%tr
%th
{{ 'legal.cookies_policy.cookie_name' | t}}
%th
{{ 'legal.cookies_policy.cookie_domain' | t}}
%th
{{ 'legal.cookies_policy.cookie_desc' | t}}
%tr
%td
_session_id
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_session_desc' | t}}
%tr
%td
cookies_consent
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_consent_desc' | t}}
%tr
%td
remember_spree_user_token
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_remember_me_desc' | t}}
%tr
%td
qos_token
%td
openstreetmap.org
%td
{{ 'legal.cookies_policy.cookie_openstreemap_desc' | t}}
%tr
%td
m
%td
m.stripe.com
%td{rowspan:"4"}
{{ 'legal.cookies_policy.cookie_stripe_desc' | t}}
%tr
%td
nsr
%td
m.stripe.network
%tr
%td
__stripe_sid
%td
{{ instance_hostname }}
%tr
%td
__stripe_mid
%td
{{ instance_hostname }}
%p
{{ 'legal.cookies_policy.essential_cookies_note' | t}}
- if Spree::Config.cookies_policy_matomo_section || Spree::Config.cookies_policy_ga_section
%h2
{{ 'legal.cookies_policy.statistics_cookies' | t}}
%p
{{ 'legal.cookies_policy.statistics_cookies_desc' | t}}
- if Spree::Config.cookies_policy_ga_section
%p
{{ 'legal.cookies_policy.statistics_cookies_analytics_desc' | t}}
- if Spree::Config.cookies_policy_matomo_section
%p
{{ 'legal.cookies_policy.statistics_cookies_matomo_desc' | t}}
%table{ng: { controller:"CookiesPolicyModalCtrl"}}
%tr
%th
{{ 'legal.cookies_policy.cookie_name' | t}}
%th
{{ 'legal.cookies_policy.cookie_domain' | t}}
%th
{{ 'legal.cookies_policy.cookie_desc' | t}}
- if Spree::Config.cookies_policy_ga_section
%tr
%td
__utma
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_analytics_utma_desc' | t}}
%tr
%td
__utmt
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_analytics_utmt_desc' | t}}
%tr
%td
__utmb
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_analytics_utmb_desc' | t}}
%tr
%td
__utmc
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_analytics_utmc_desc' | t}}
%tr
%td
__utmz
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_analytics_utmz_desc' | t}}
- if Spree::Config.cookies_policy_matomo_section
%tr
%td
_pk_ref, _pk_cvar, _pk_id and _pk_ses
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_matomo_basics_desc' | t}}
%tr
%td
_pk_hsr
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_matomo_heatmap_desc' | t}}
%tr
%td
piwik_ignore
%td
{{ instance_hostname }}
%td
{{ 'legal.cookies_policy.cookie_matomo_ignore_desc' | t}}
%h2
{{ 'legal.cookies_policy.disabling_cookies_header' | t}}
%p
{{ 'legal.cookies_policy.disabling_cookies_desc' | t}}
%ul
%li
%a{ href: "{{'legal.cookies_policy.disabling_cookies_firefox_link' | t}}", target: "_blank" }
Firefox
%li
%a{ href: "{{ 'legal.cookies_policy.disabling_cookies_chrome_link' | t}}", target: "_blank" }
Chrome
%li
%a{ href: "{{ 'legal.cookies_policy.disabling_cookies_ie_link' | t}}", target: "_blank" }
Internet Explorer
%li
%a{ href: "{{ 'legal.cookies_policy.disabling_cookies_safari_link' | t}}", target: "_blank" }
Safari
%p
{{ 'legal.cookies_policy.disabling_cookies_note' | t}}
%a.close-reveal-modal{"ng-click" => "$close()"}
%i.ofn-i_009-close
%a.mobile-close-reveal-modal{"ng-click" => "$close()"}
%i.ofn-i_009-close

2
app/assets/javascripts/darkswarm/cookies_policy/cookies_policy_modal_service.js.coffee
View File

@@ -8,7 +8,7 @@ Darkswarm.factory "CookiesPolicyModalService", (Navigation, $modal, $location, C
if $location.path() is @defaultPath || location.pathname is @defaultPath
@open ''
open: (path = false, template = 'darkswarm/cookies_policy/cookies_policy.html') =>
open: (path = false, template = 'angular-templates/cookies_policy.html') =>
@modalInstance = $modal.open
templateUrl: template
windowClass: "cookies-policy-modal medium"