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

Slim down cookie consent template #173

Open
wants to merge 2 commits into
base: slim-down-cookie-consent-template
Choose a base branch
from
Open

Slim down cookie consent template #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd2dc3b
refactor: rearrange cookie-consent.tpl to reduce line no.
Jacobomara901 Jan 21, 2025
2a78da8
docs: update release notes
Jacobomara901 Jan 21, 2025
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
62 changes: 27 additions & 35 deletions code/web/interface/themes/responsive/cookie-consent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,29 @@
{if $loggedIn && $profile->userCookiePreferenceEssential == 1}
<script>
cookieValues = {
Essential: {$profile->userCookiePreferenceEssential},
Analytics: {$profile->userCookiePreferenceAnalytics},
UserLocalAnalytics: {$profile->userCookiePreferenceLocalAnalytics},
};
AspenDiscovery.CookieConsent.fetchUserCookie(encodeURIComponent(JSON.stringify(cookieValues)));
</script>
{elseif $loggedIn && (empty($smarty.cookies.cookieConsent) || !strstr($smarty.cookies.cookieConsent,'Essential'))}
<div class="stripPopup">
<div class="cookieContainer">
<div class="contentWrap">
<span>{translate text="We use cookies on this site to enhance your user experience." isPublicFacing=true}</span>
<abbr>{translate text="For details about the cookies and technologies we use, see our <abbr style='display:inline-block'><u style='cursor:pointer;' onclick='AspenDiscovery.CookieConsent.cookieDisagree();'>cookie policy</u></abbr>. <br/> Using this banner will set a cookie on your device to remember your preferences." isPublicFacing=true}<abbr>
</div>
<div class="btnWrap">
<a onclick="AspenDiscovery.CookieConsent.cookieAgree('all');" href="#" id="consentAgree" class="button">{translate text="Accept all cookies" isPublicFacing=true}</a>
<a onclick="AspenDiscovery.CookieConsent.cookieAgree('essential');" href="#" id="consentDisagree" class="button">{translate text="Only accept essential cookies" isPublicFacing=true}</a>
<a onclick="AspenDiscovery.CookieConsent.cookieManage();" href="#" id="consentManage" class="button">{translate text="Manage Cookies" isPublicFacing=true}</a>
</div>
</div>
</div>
{elseif !$loggedIn && (empty($smarty.cookies.cookieConsent) || !strstr($smarty.cookies.cookieConset, 'Essential'))}
<div class="stripPopup">
<div class="cookieContainer">
<div class="contentWrap">
<span>{translate text="We use cookies on this site to enhance your user experience." isPublicFacing=true}</span>
<abbr>{translate text="For details about the cookies and technologies we use, see our <abbr style='display:inline-block'><u style='cursor:pointer;' onclick='AspenDiscovery.CookieConsent.cookieDisagree();'>cookie policy</u></abbr>. <br/> Using this banner will set a cookie on your device to remember your preferences." isPublicFacing=true}<abbr>
</div>
<div class="btnWrap">
<a onclick="AspenDiscovery.CookieConsent.cookieAgree('all');" href="#" id="consentAgree" class="button">{translate text="Accept all cookies" isPublicFacing=true}</a>
<a onclick="AspenDiscovery.CookieConsent.cookieAgree('essential');" href="#" id="consentDisagree" class="button">{translate text="Only accept essential cookies" isPublicFacing=true}</a>
</div>
</div>
</div>
<script>
cookieValues = {
Essential: {$profile->userCookiePreferenceEssential},
Analytics: {$profile->userCookiePreferenceAnalytics},
UserLocalAnalytics: {$profile->userCookiePreferenceLocalAnalytics},
};
AspenDiscovery.CookieConsent.fetchUserCookie(encodeURIComponent(JSON.stringify(cookieValues)));
</script>
{elseif (empty($smarty.cookies.cookieConsent) || !strstr($smarty.cookies.cookieConsent,'Essential'))}
<div class="stripPopup">
<div class="cookieContainer">
<div class="contentWrap">
<span>{translate text="We use cookies on this site to enhance your user experience." isPublicFacing=true}</span>
<abbr>{translate text="For details about the cookies and technologies we use, see our <abbr style='display:inline-block'><u style='cursor:pointer;' onclick='AspenDiscovery.CookieConsent.cookieDisagree();'>cookie policy</u></abbr>. <br/> Using this banner will set a cookie on your device to remember your preferences." isPublicFacing=true}<abbr>
</div>
<div class="btnWrap">
<a onclick="AspenDiscovery.CookieConsent.cookieAgree('all');" href="#" id="consentAgree"
class="button">{translate text="Accept all cookies" isPublicFacing=true}</a>
<a onclick="AspenDiscovery.CookieConsent.cookieAgree('essential');" href="#" id="consentDisagree"
class="button">{translate text="Only accept essential cookies" isPublicFacing=true}</a>
{if $loggedIn}
<a onclick="AspenDiscovery.CookieConsent.cookieManage();" href="#" id="consentManage"
class="button">{translate text="Manage Cookies" isPublicFacing=true}</a>
{/if}
</div>
</div>
</div>
{/if}
2 changes: 2 additions & 0 deletions code/web/release_notes/25.02.00.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
//kidclamp
### Other Updates
- Use mb_substr to presrve diacritics in lists (DIS-178) (*WNC*)
- Refactor Cookie consent tempate code (*JOM*)

//yanjun

Expand All @@ -130,6 +131,7 @@
- Alexander Blanchard (AB)
- Chloe Zermatten (CZ)
- Pedro Amorim (PA)
- Jacob O'Mara (JOM)

### Theke Solutions
- Lucas Montoya (LM)
Expand Down
Loading