Skip to content

Commit 6cfc5fc

Browse files
committed
Merge branch 'staging/4.3' into release/4.3
2 parents e99201b + 4d10cb8 commit 6cfc5fc

55 files changed

Lines changed: 170 additions & 51 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

_includes/add-device-banner.liquid

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
{% assign url_parts = page.url | split: '/' %}
2+
{% assign platform = url_parts[2] %}
3+
4+
{% assign root_url = "/device-library/" | append: platform | append: "/" %}
5+
{% assign platform_url = "/device-library/?platform=" | append: platform %}
6+
17
<div class="add-device-banner">
28
<div class="add-device-text">
39
<span class="add-device-banner-title">Discover ready-to-connect hardware
for your solution</span>
410
<div class="add-device-buttons">
5-
<a href="/device-library/" class="contact-us">Explore Device Library</a>
11+
<a href="{{ platform_url }}" class="contact-us">Explore Device Library</a>
612
<a href="/partners/hardware/" class="hardware-partners">Hardware Partners</a>
713
</div>
814
</div>

_includes/cards-collection.liquid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
{% if pageFile != 'guidelines.md' %}
7575
{% assign deviceName = page.title | replace: "How to connect ", "" | replace: "How to install ThingsBoard Edge on ", "" | replace: " to ThingsBoard?", "" | replace: "?", "" %}
7676
{% assign deviceImg = "https://img.thingsboard.io/devices-library/" | append: page.deviceImageFileName %}
77-
<a href="{{ page.url }}" class="card" data-hardware-types="{{ page.hardwareType | join: '|' }}" data-connectivity="{{ page.connectivity | join: '|' }}" data-industry="{{ page.industry | join: '|' }}" data-use-cases="{{ page.useCase | join: '|' }}">
77+
<a href="{{ page.url }}" class="card" data-hardware-types="{{ page.hardwareType | join: '|' }}" data-connectivity="{{ page.connectivity | join: '|' }}" data-industry="{{ page.industry | join: '|' }}" data-use-cases="{{ page.useCase | join: '|' }}"{% if page.vendor %} data-vendor="{{ page.vendor }}"{% endif %}>
7878
<div class="card-wrapper">
7979
<div class="card-image">
8080
<img class="logo" src="{{ deviceImg }}" loading="lazy">

_includes/device-card.liquid

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,8 @@
8989
</li>
9090

9191
</ul>
92+
<a href="https://thingsboard.cloud/signup?utm_source=device-page&utm_medium=cta&utm_campaign=try-device" class="button gtm_button">
93+
Try this device in ThingsBoard
94+
</a>
9295
</div>
9396
</div>

_includes/device-card.sass

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
ul
2424
max-width: 400px
2525
padding-left: 0
26-
margin: 0
26+
margin: 0 0 32px 0
2727
display: flex
2828
flex-direction: column
2929
gap: 4px
@@ -35,5 +35,4 @@
3535
line-height: 24px
3636
font-weight: 400
3737
span
38-
font-weight: 500
39-
38+
font-weight: 500

_includes/integrators.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,5 +1246,17 @@
12461246
"href": "en.x-telia.com",
12471247
"target": "_blank"
12481248
}
1249+
},
1250+
{
1251+
"type": ["North America", "South America"],
1252+
"country": ["Anguilla", "Antigua and Barbuda", "Argentina", "Aruba", "Barbados", "Belize", "Bolivia", "Brazil", "British Virgin Islands", "Canada", "Caribbean Netherlands", "Cayman Islands", "Chile", "Colombia", "Costa Rica", "Cuba", "Curaçao", "Dominica", "Dominican Republic", "Ecuador", "El Salvador", "Falkland Islands (Islas Malvinas)", "French Guiana", "Greenland", "Grenada", "Guadeloupe", "Guatemala", "Guyana", "Haiti", "Honduras", "Jamaica", "Martinique", "Mexico", "Montserrat", "Nicaragua", "Panama", "Paraguay", "Peru", "Puerto Rico", "Saint Barthélemy", "Saint Kitts and Nevis", "Saint Lucia", "Saint Martin", "Saint Pierre and Miquelon", "Saint Vincent and the Grenadines", "Sint Maarten", "Suriname", "The Bahamas", "Trinidad and Tobago", "Turks and Caicos Islands", "U.S. Virgin Islands", "United States of America", "United States Minor Outlying Islands", "Uruguay", "Venezuela"],
1253+
"name": "TKmE Cloud",
1254+
"contact": {
1255+
"href": "ingrid.gomez@tkmecloud.com"
1256+
},
1257+
"site": {
1258+
"href": "tkmecloud.io",
1259+
"target": "_blank"
1260+
}
12491261
}
12501262
]

_layouts/page-with-filter.html

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
</div>
6363
</section>
6464

65+
{% include cookie-consent.html %}
66+
6567
<script>
6668
const DEFAULT_PLATFORM = 'ce';
6769

@@ -81,7 +83,7 @@
8183

8284
const URL_PARAM_PLATFORM = 'platform';
8385
const URL_PARAM_QUERY = 'q';
84-
const URL_PARAM_FILTER_PREFIX = 'f_';
86+
const URL_PARAM_FILTER_PREFIX = 'f_';
8587
const URL_PARAM_ORDER = 'order';
8688

8789
function normalizeCatKey(cat) {
@@ -254,6 +256,46 @@
254256
return checked ? (checked.value || '').trim().toLowerCase() : '';
255257
}
256258

259+
260+
function updateHeroConnectivityLink(selectedPlatform) {
261+
const link = document.querySelector('.devices-hero-banner a');
262+
263+
if (!link) return;
264+
265+
if (!link.dataset.baseHref) {
266+
link.dataset.baseHref = '/docs/getting-started-guides/connectivity/';
267+
}
268+
269+
const base = link.dataset.baseHref;
270+
const p = (selectedPlatform || '').trim().toLowerCase();
271+
272+
if (!p || p === 'ce') {
273+
link.setAttribute('href', base);
274+
return;
275+
}
276+
277+
if (p === 'paas-eu') {
278+
link.setAttribute('href', '/docs/paas/eu/getting-started-guides/connectivity/');
279+
return;
280+
}
281+
282+
if (p === 'pe-edge') {
283+
link.setAttribute('href', '/docs/pe/edge/getting-started-guides/connectivity/');
284+
return;
285+
}
286+
287+
const allowed = Object.keys(PLATFORM_LABELS);
288+
289+
if (allowed.includes(p)) {
290+
link.setAttribute(
291+
'href',
292+
`/docs/${encodeURIComponent(p)}/getting-started-guides/connectivity/`
293+
);
294+
} else {
295+
link.setAttribute('href', base);
296+
}
297+
}
298+
257299
function updatePlatformVisibility() {
258300
const selectedPlatform = getSelectedPlatform();
259301

@@ -531,6 +573,8 @@
531573

532574
const selectedPlatform = getSelectedPlatform();
533575

576+
updateHeroConnectivityLink(selectedPlatform);
577+
534578
crispsContainers.forEach(container => {
535579
updateCrisps(selectedFilters, container, selectedPlatform);
536580
});
@@ -605,7 +649,5 @@
605649

606650
{% include footer.html %}
607651

608-
{% include cookie-consent.html %}
609-
610652
</body>
611653
</html>

_sass/_page-with-filter.sass

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ input:not(:placeholder-shown) + .searchButton
113113
flex-wrap: wrap
114114
gap: 8px
115115
&.desktop
116+
max-width: 1000px
116117
@media (max-width: 959px)
117118
display: none
118119
&.mobile

device-library/ce/air-temperature-and-humidity-sensor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: device
33
title: How to connect AgroSense Air Temperature and Humidity Sensor to ThingsBoard?
44
category: Other devices
55
connectivity: LoRaWAN
6-
vendor: AgroSense
6+
vendor: Makerfabs
77
hasIntegrationDeviceConfiguration: true
88
deviceImageFileName: air-temperature-and-humidity-sensor.png
99
converters20: true

device-library/ce/esp-eye.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: How to connect ESP-EYE to ThingsBoard?
44
category: Microcontrollers
55
chip: ESP32
66
connectivity: [HTTP, MQTT, WIFI, Bluetooth]
7-
vendor: M5Stack
7+
vendor: Espressif
88
deviceImageFileName: esp-eye.png
99
hardwareType: Microcontrollers
1010
industry: Security

device-library/ce/knx-ip-multi-io-580.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: device
33
title: How to connect KNX IP Multi IO 580 to ThingsBoard?
44
category: Other devices
55
connectivity: KNX
6-
vendor: Weinzierl
6+
vendor: Weinzierl Engineering
77
deviceImageFileName: knx-ip-multi-io-580.png
88
hardwareType: Other devices
99
industry: [Smart Buildings, Smart Cities, Industrial Manufacturing, Energy Management]

0 commit comments

Comments
 (0)