Skip to content

Commit

Permalink
Merge pull request #577 from hlxsites/feat-574-icons
Browse files Browse the repository at this point in the history 
feat: add support from DAM SVG icon loading
  • Loading branch information
@mhaack
mhaack authored Dec 12, 2023
2 parents 70b1247 + aa25474 commit 8e4672e
Show file tree
Hide file tree
Showing 7 changed files with 324 additions and 72 deletions.
8 changes: 7 additions & 1 deletion scripts/lib-franklin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,13 @@ export async function decorateIcons(element) {
if (!ICONS_CACHE[iconName]) {
ICONS_CACHE[iconName] = true;
try {
const response = await fetch(`${window.hlx.codeBasePath}/icons/${iconName}.svg`);
let iconSource = `${window.hlx.codeBasePath}/icons/${iconName}.svg`;
if (iconName.startsWith('dam-')) {
const isPublicDomain = window.location.hostname.includes('lifesciences.danaher.com');
iconSource = isPublicDomain ? '' : 'https://lifesciences.danaher.com';
iconSource += `/content/dam/danaher/system/icons/${iconName.substring(4).replace('_', ' ')}.svg`;
}
const response = await fetch(iconSource);
if (!response.ok) {
ICONS_CACHE[iconName] = false;
return;
Expand Down
61 changes: 61 additions & 0 deletions tools/actions/convert/test/fixtures/cards-with-icons-converted.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<html>
<body>
<header></header>
<main>
<div>
<div class="mini-teasers">
<div>
<div>:dam-User:</div>
<div>
<h3>Talk to an Expert</h3>
<p><a href="#">Schedule a call today</a></p>
</div>
</div>
<div>
<div>:dam-View_list:</div>
<div>
<h3>Request a quote</h3>
<p><a href="#RequestAQuote">Get your quote today</a></p>
</div>
</div>
<div>
<div>:dam-View_list:</div>
<div>
<h3>View our workflow solutions</h3>
<p><a href="#">End to end soltions</a></p>
</div>
</div>
</div>
<div class="metadata">
<div>
<div>Title</div>
<div>Drug Research &#x26; Development Products | Danaher Life Sciences</div>
</div>
<div>
<div>canonical</div>
<div><a href="https://lifesciences.danaher.com/us/en/product.html">https://lifesciences.danaher.com/us/en/product.html</a></div>
</div>
<div>
<div>Description</div>
<div>From laboratory automation to analytical tools &#x26; digital solutions, our products are designed to support research &#x26; therapeutic applications.</div>
</div>
<div>
<div>Image</div>
<div>
<img src="https://author-dummy.adobeaemcloud.com/content/dam/danaher/system/Logo-danaher-500x500.png" alt="">
</div>
</div>
<div>
<div>creationDate</div>
<div>Fri, 21 Jul 2023 18:49:30 GMT</div>
</div>
<div>
<div>updateDate</div>
<div>Tue, 12 Dec 2023 12:47:36 GMT</div>
</div>
</div>
</div>
</main>
<footer></footer>
</body>
</html>
178 changes: 178 additions & 0 deletions tools/actions/convert/test/fixtures/cards-with-icons.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@


<!DOCTYPE HTML>
<html lang="en-US">
<head>
<meta charset="UTF-8"/>

<meta name="template" content="basic-template"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>

<meta name="tags"/>

<meta name="robots"/>

<link rel="canonical" href="https://stage.lifesciences.danaher.com/us/en/product.html"/>
<title>Drug Research &amp; Development Products | Danaher Life Sciences</title>
<meta name="description" content="From laboratory automation to analytical tools &amp; digital solutions, our products are designed to support research &amp; therapeutic applications."/>
<meta property="og:title" content="Products"/>
<meta property="og:description" content="From laboratory automation to analytical tools &amp; digital solutions, our products are designed to support research &amp; therapeutic applications."/>
<meta property="og:type" content="website"/>
<meta property="og:image" content="https://stage.lifesciences.danaher.com/content/dam/danaher/system/Logo-danaher-500x500.png"/>
<meta property="og:site_name" content="Danaher Life Sciences"/>
<meta property="og:url" content="https://stage.lifesciences.danaher.com/content/danaher/ls/us/en/products.html"/>

<script>
dataLayer = [{
'user': {"customerID":"","accountType":"guest","marketCode":"","company":"","role":"","city":"","state":"","country":"","postalCode":"","lastVisit":""}
},{
'page': {"title":"Drug Research & Development Products | Danaher Life Sciences","language":"en","locale":"US","level":"top","type":"webpage","keywords":"","creationDate":"Jul 21, 2023 06:49:30 PM","updateDate":"Dec 12, 2023 12:47:36 PM"}
}];

</script>


</head>
<body class="basic-page page basicpage" id="basic-page-73464b0890" data-cmp-data-layer-enabled>




<div id="danaher">










<div class="root responsivegrid">



<div class="experiencefragment aem-GridColumn aem-GridColumn--default--12">



<div id="/content/experience-fragments/danaher/us/en/site/website-links/master/jcr:content">






<div class="xf-content-height">
<div class="root responsivegrid">


<div class="aem-Grid aem-Grid--12 aem-Grid--default--12 ">

<div class="text aem-GridColumn aem-GridColumn--default--12"><div data-cmp-data-layer="{&#34;mini-teaser&#34;:{&#34;@type&#34;:&#34;danaher/components/content/marketing/text&#34;,&#34;repo:modifyDate&#34;:&#34;2023-11-27T13:28:23Z&#34;,&#34;xdm:text&#34;:&#34;&lt;p>mini-teaser&lt;/p>\r\n&#34;}}" id="mini-teaser" class="cmp-text href-text">

<p>mini-teaser</p>

</div>



</div>
<div class="grid aem-GridColumn aem-GridColumn--default--12">

<grid columns="3">
<template v-slot:col-one>






<div class="articlecard">

<articlecard cardhref="#" cardimg="/content/dam/danaher/system/icons/User.svg" isusedamasset cardtitle="Talk to an Expert" linktext="Schedule a call today">
</articlecard>
</div>


</template>
<template v-slot:col-two>






<div class="featureimage">

<feature-image textwidth="_self" title="Request a quote" titlesize="xxxl" titleheading="h3" isusedamasset img="/content/dam/danaher/system/icons/View list.svg" descsize="txl" btntext="Get your quote today" btnrfq="true" btnnewtab="_self">
</feature-image>
</div>


</template>
<template v-slot:col-three>






<div class="featureimage">

<feature-image textwidth="_self" title="View our workflow solutions" titlesize="xxxl" titleheading="h3" isusedamasset img="/content/dam/danaher/system/icons/View list.svg" descsize="txl" btntext="End to end soltions" btnhref="#" btnnewtab="_self">
</feature-image>
</div>


</template>
<template v-slot:col-four>




</template>
<template v-slot:col-five>




</template>
<template v-slot:col-six>




</template>
</grid></div>


</div>
</div>

</div>

</div>
</div>




</div>
</div>





</div>

</div>





</body>
</html>
12 changes: 3 additions & 9 deletions tools/actions/convert/test/fixtures/product1-converted.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,27 +66,21 @@ <h2>Categories</h2>
</div>
<div class="mini-teasers">
<div>
<div>
<img src="https://s7d9.scene7.com/is/image/danaherstage/User" alt="Danaher Corporation">
</div>
<div>:dam-User:</div>
<div>
<h3>Talk to an Expert</h3>
<p><a href="#">Schedule a call today</a></p>
</div>
</div>
<div>
<div>
<img src="https://s7d9.scene7.com/is/image/danaherstage/View%20list" alt="Danaher Corporation">
</div>
<div>:dam-View_list:</div>
<div>
<h3>Request a quote</h3>
<p><a href="#RequestAQuote">Get your quote today</a></p>
</div>
</div>
<div>
<div>
<img src="https://s7d9.scene7.com/is/image/danaherstage/View%20list" alt="Danaher Corporation">
</div>
<div>:dam-View_list:</div>
<div>
<h3>View our workflow solutions</h3>
<p><a href="#">End to end soltions</a></p>
Expand Down
Loading

0 comments on commit 8e4672e

Please sign in to comment.