From 386a46309b935b9ba29729cdaf0f33f241e178ff Mon Sep 17 00:00:00 2001 From: blakadder Date: Fri, 24 May 2019 23:40:58 +0200 Subject: [PATCH] sorting improvements --- Gemfile | 1 + Gemfile.lock | 3 + _includes/tablerow.html | 5 +- _includes/tablerow_standard.html | 7 + _layouts/templates.html | 6 +- _sass/milligram.scss | 7 +- _site/anzac.html | 514 +++++++-------- _site/avatar.html | 6 +- _site/esicoo.html | 6 +- _site/eu.html | 722 +++++++++------------ _site/feit65.html | 6 +- _site/feitbr30.html | 6 +- _site/merkurybr30.html | 6 +- _site/mjswitch.html | 6 +- _site/new.html | 2 +- _site/powruia39.html | 6 +- _site/rgbpow.html | 6 +- _site/sw01_10.html | 6 +- _site/uk.html | 479 ++++++-------- _site/us.html | 848 ++++++++++--------------- _templates/fcmila_XDD-48W.markdown | 2 +- _templates/luani_HVIO.markdown | 2 +- _templates/mi_desk_lamp.markdown | 2 +- _templates/rgbw_ceiling_light.markdown | 4 +- _templates/sonoff_BN-SZ01.markdown | 2 +- _templates/supla_incan.markdown | 2 +- _templates/utorch_PZE-911.markdown | 2 +- _templates/zemismart_4.markdown | 2 +- _templates/zemismart_WF-BS01.markdown | 2 +- all.html | 62 +- anzac.html | 10 +- assets/css/docs.scss | 10 + index.html | 18 +- light.html | 21 +- misc.html | 4 +- plug.html | 23 +- relay.html | 4 +- switch.html | 21 +- 38 files changed, 1261 insertions(+), 1580 deletions(-) create mode 100644 _includes/tablerow_standard.html diff --git a/Gemfile b/Gemfile index 3be9c3cd8..e1e19b3fd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,3 @@ source "https://rubygems.org" gemspec +gem 'jekyll-seo-tag' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 2a18cb974..9a3a10cde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,6 +35,8 @@ GEM safe_yaml (~> 1.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) + jekyll-seo-tag (2.5.0) + jekyll (~> 3.3) jekyll-watch (2.1.2) listen (~> 3.0) kramdown (1.17.0) @@ -65,6 +67,7 @@ PLATFORMS DEPENDENCIES bundler (~> 1.12) + jekyll-seo-tag millidocs! rake (~> 10.0) diff --git a/_includes/tablerow.html b/_includes/tablerow.html index f289f4297..210616e0e 100644 --- a/_includes/tablerow.html +++ b/_includes/tablerow.html @@ -1,6 +1,5 @@ {{ template.title }} - {{ template.title }} - {{ template.type }} - {{ template.standard | upcase }} + {{ template.title }} + {{ template.type }} diff --git a/_includes/tablerow_standard.html b/_includes/tablerow_standard.html new file mode 100644 index 000000000..5edc1c0f5 --- /dev/null +++ b/_includes/tablerow_standard.html @@ -0,0 +1,7 @@ + + {{ template.title }} + {{ template.title }} + {{ template.type }} + {{ template.standard | upcase }} + + \ No newline at end of file diff --git a/_layouts/templates.html b/_layouts/templates.html index 8d019f68f..22b4928e4 100644 --- a/_layouts/templates.html +++ b/_layouts/templates.html @@ -12,13 +12,13 @@

{{ page.title }} {{ page.type }}

Available from:
- {{ page.link | remove_first: "https://" | remove_first: "www." | split:'/' | first | capitalize}} + {{ page.link | remove_first: "https://" | remove_first: "www." | split:'/' | first | capitalize}}
- {{ page.link_alt | remove_first: "https://" | remove_first: "www." | split:'/' | first | capitalize}} + {{ page.link_alt | remove_first: "https://" | remove_first: "www." | split:'/' | first | capitalize}}
- + Edit on GitHub

Template

diff --git a/_sass/milligram.scss b/_sass/milligram.scss index cc0bd30e4..e33c02136 100644 --- a/_sass/milligram.scss +++ b/_sass/milligram.scss @@ -70,6 +70,7 @@ input[type='reset']:focus, input[type='reset']:hover, input[type='submit']:focus, input[type='submit']:hover { + text-decoration: none; background-color: #606c76; border-color: #606c76; color: #fff; @@ -550,17 +551,19 @@ td:first-child, th:first-child { padding-left: 1; text-align: center; + min-width: 100px; } td:nth-child(2), th:nth-child(2) { padding-left: 0.6rem; - min-width: 200px; + min-width: 250px; + } td:last-child, th:last-child { - padding-right: 0; + padding-right: 0.6rem; text-align: right; } diff --git a/_site/anzac.html b/_site/anzac.html index d561519c0..5237f87b6 100644 --- a/_site/anzac.html +++ b/_site/anzac.html @@ -6,7 +6,7 @@ AU-NZ-AR-CN Devices - + @@ -55,57 +55,50 @@

Plugs, Sockets & Power Strips

Brilliant USB Charger - Brilliant USB Charger - Plug - ANZAC + Brilliant USB Charger + Plug Hyleton 317 - Hyleton 317 - Plug - ANZAC + Hyleton 317 + Plug Kogan SmarterHome™ Energy Meter - Kogan SmarterHome™ Energy Meter - Plug - ANZAC + Kogan SmarterHome™ Energy Meter + Plug Mirabella Genio - Mirabella Genio - Plug - ANZAC + Mirabella Genio + Plug Sonoff S20 - Sonoff S20 - Plug - GLOBAL + Sonoff S20 + Plug Sonoff S22 TH - Sonoff S22 TH - Plug - ANZAC + Sonoff S22 TH + Plug Sonoff S26 - Sonoff S26 - Plug - GLOBAL + Sonoff S26 + Plug @@ -118,182 +111,246 @@

Lights

- - 9cm RGB+W 7W - 9cm RGB+W 7W - Ceiling Light - GLOBAL - - - + + Arilux AL-LC01 - Arilux AL-LC01 - LED Controller - GLOBAL + Arilux AL-LC01 + LED Controller - - + + Arilux AL-LC06 - Arilux AL-LC06 - LED Controller - GLOBAL + Arilux AL-LC06 + LED Controller - - + + Arilux AL-LC11 - Arilux AL-LC11 - LED Controller - GLOBAL + Arilux AL-LC11 + LED Controller - - + + Armtronix AC Dimmer One Triac Board - Armtronix AC Dimmer One Triac Board - Dimmer - GLOBAL + Armtronix AC Dimmer One Triac Board + Dimmer - - + + Armtronix AC Dimmer Two Triac Board - Armtronix AC Dimmer Two Triac Board - Dimmer - GLOBAL + Armtronix AC Dimmer Two Triac Board + Dimmer - - + + BlitzWolf BW-LT11 - BlitzWolf BW-LT11 - LED Strip - GLOBAL + BlitzWolf BW-LT11 + LED Strip - - + + Electrodragon Board - Electrodragon Board - LED Controller - GLOBAL + Electrodragon Board + LED Controller + + + Fcmila FC-12W + Fcmila FC-12W + Bulb + - + + Fcmila XDD-48W - Fcmila XDD-48W - Ceiling Light - GLOBAL + Fcmila XDD-48W + Light + + + Gosund E27 8W RGBW + Gosund E27 8W RGBW + Bulb + - + + H801 - H801 - LED Controller - GLOBAL + H801 + LED Controller - - + + Kogan SmarterHome™ 10W White B22 - Kogan SmarterHome™ 10W White B22 - Bulb - ANZAC + Kogan SmarterHome™ 10W White B22 + Bulb - - + + Lohas ZN031 - Lohas ZN031 - Bulb - GLOBAL + Lohas ZN031 + Bulb + + + Lumiman E27 Multicolor + Lumiman E27 Multicolor + Bulb + - + + + Luminea ZX-2831 E27 CCT + Luminea ZX-2831 E27 CCT + Bulb + + + + + Luminea ZX-2832 E27 RGBW + Luminea ZX-2832 E27 RGBW + Bulb + + + + Luminea ZX-2844 - Luminea ZX-2844 - LED Controller - GLOBAL + Luminea ZX-2844 + LED Controller + + + Lyasi PT-BW09 + Lyasi PT-BW09 + Bulb + - + + MagicHome RGB ZJ-WFMN-A V1.1 - MagicHome RGB ZJ-WFMN-A V1.1 - LED Controller - GLOBAL + MagicHome RGB ZJ-WFMN-A V1.1 + LED Controller - - + + MagicHome RGBW ZJ-WFMN-A V1.1 - MagicHome RGBW ZJ-WFMN-A V1.1 - LED Controller - GLOBAL + MagicHome RGBW ZJ-WFMN-A V1.1 + LED Controller + + + Maxcio YX-L01P-E7 + Maxcio YX-L01P-E7 + Bulb + - + + Mi LED Desk Lamp MJTD01YL - Mi LED Desk Lamp MJTD01YL - Lamp - GLOBAL + Mi LED Desk Lamp MJTD01YL + Light - - + + Mirabella Genio RGBW - Mirabella Genio RGBW - Bulb - ANZAC + Mirabella Genio RGBW + Bulb - - + + Nexlux - Nexlux - LED Controller - GLOBAL + Nexlux + LED Controller - - + + RGBW 7W B22 - RGBW 7W B22 - Bulb - ANZAC + RGBW 7W B22 + Bulb + + + RGBW 7W E14 + RGBW 7W E14 + Bulb + - + + + Sonoff B1 (R2) + Sonoff B1 (R2) + Bulb + + + + Sonoff BN-SZ01 - Sonoff BN-SZ01 - Ceiling LED - GLOBAL + Sonoff BN-SZ01 + Light + + + Spotlight 9cm RGB+W 7W + Spotlight 9cm RGB+W 7W + Light + - + + Utorch PZE-911 - Utorch PZE-911 - Ceiling Light - GLOBAL + Utorch PZE-911 + Light + + + + + Woopower RGBW E14 5W + Woopower RGBW E14 5W + Bulb + + + Xiaomi Phillips E14 + Xiaomi Phillips E14 + Bulb + - - Zemismart 4 - Zemismart 4" 10W RGBW - Downlight - GLOBAL + + + Xiaomi Phillips E27 + Xiaomi Phillips E27 + Bulb + + + Zemismart 4 + Zemismart 4" 10W RGBW + Light + + @@ -305,25 +362,22 @@

Switches & Dimmers

Moes 2 Gang Touch - Moes 2 Gang Touch - Switch - ANZAC + Moes 2 Gang Touch + Switch SANA SASW-03 - SANA SASW-03 - Switch - ANZAC + SANA SASW-03 + Switch Touch 2 Gang - Touch 2 Gang - Switch - ANZAC + Touch 2 Gang + Switch @@ -337,241 +391,211 @@

Relays

1 Channel Inching/Self-Locking - 1 Channel Inching/Self-Locking - Relay - GLOBAL + 1 Channel Inching/Self-Locking + Relay Canwing CW-001 - Canwing CW-001 - Relay - GLOBAL + Canwing CW-001 + Relay EACHEN ST-DC2 - EACHEN ST-DC2 - Relay - GLOBAL + EACHEN ST-DC2 + Relay EX Store 2 Kanal V5 - EX Store 2 Kanal V5 - Relay - GLOBAL + EX Store 2 Kanal V5 + Relay Electrodragon Board SPDT - Electrodragon Board SPDT - Relay - GLOBAL + Electrodragon Board SPDT + Relay Electrodragon ESP8266 - Electrodragon ESP8266 - Relay - GLOBAL + Electrodragon ESP8266 + Relay Geekcreit 2 Channel - Geekcreit 2 Channel - Relay - GLOBAL + Geekcreit 2 Channel + Relay LinkNode R4 - LinkNode R4 - Relay - GLOBAL + LinkNode R4 + Relay LinkNode R8 - LinkNode R8 - Relay - GLOBAL + LinkNode R8 + Relay Luani HVIO - Luani HVIO - DIY Relay - GLOBAL + Luani HVIO + DIY Project SUPLA inCan by Espablo - SUPLA inCan by Espablo - DIY Relay - GLOBAL + SUPLA inCan by Espablo + DIY Project Shelly 1 - Shelly 1 - Relay - GLOBAL + Shelly 1 + Relay Shelly 1PM - Shelly 1PM - Relay - GLOBAL + Shelly 1PM + Relay Shelly 2 - Shelly 2 - Relay - GLOBAL + Shelly 2 + Relay Shelly 2.5 - Shelly 2.5 - Relay - GLOBAL + Shelly 2.5 + Relay Sonoff 4CH (R2) - Sonoff 4CH (R2) - Relay - GLOBAL + Sonoff 4CH (R2) + Relay Sonoff 4CH Pro (R2) - Sonoff 4CH Pro (R2) - Relay - GLOBAL + Sonoff 4CH Pro (R2) + Relay Sonoff Basic - Sonoff Basic - Relay - GLOBAL + Sonoff Basic + Relay Sonoff Dual - Sonoff Dual - Relay - GLOBAL + Sonoff Dual + Relay Sonoff Dual R2 - Sonoff Dual R2 - Relay - GLOBAL + Sonoff Dual R2 + Relay Sonoff Pow - Sonoff Pow - Relay - GLOBAL + Sonoff Pow + Relay Sonoff Pow R2 - Sonoff Pow R2 - Relay - GLOBAL + Sonoff Pow R2 + Relay Sonoff RF - Sonoff RF - Relay - GLOBAL + Sonoff RF + Relay Sonoff SV - Sonoff SV - Relay - GLOBAL + Sonoff SV + Relay Sonoff TH10/TH16 - Sonoff TH10/TH16 - Relay - GLOBAL + Sonoff TH10/TH16 + Relay WL-SW01_10 - WL-SW01_10 - Relay - GLOBAL + WL-SW01_10 + Relay Wemos Module 10A - Wemos Module 10A - Relay - GLOBAL + Wemos Module 10A + Relay Yunshan 10A 7-30VDC - Yunshan 10A 7-30VDC - Relay - GLOBAL + Yunshan 10A 7-30VDC + Relay eMylo XL9251WI - eMylo XL9251WI - Relay - GLOBAL + eMylo XL9251WI + Relay eMylo YSA111A1N-FBA - eMylo YSA111A1N-FBA - Relay - GLOBAL + eMylo YSA111A1N-FBA + Relay @@ -585,65 +609,57 @@

Miscellaneous

JinvooSmart SM-PW713 - JinvooSmart SM-PW713 - Valve - GLOBAL + JinvooSmart SM-PW713 + Valve Oil Diffuser 550ML - Oil Diffuser 550ML - Humidifier - GLOBAL + Oil Diffuser 550ML + Humidifier Sonoff RF Bridge 433 - Sonoff RF Bridge 433 - RF Bridge - GLOBAL + Sonoff RF Bridge 433 + RF Bridge Sonoff SC - Sonoff SC - Environment Monitor - GLOBAL + Sonoff SC + Environment Monitor Sonoff iFan02 - Sonoff iFan02 - Fan Controller - GLOBAL + Sonoff iFan02 + Fan Controller Witty Cloud - Witty Cloud - Development Board - GLOBAL + Witty Cloud + Development Board YTF - YTF - IR Bridge - GLOBAL + YTF + IR Bridge auvisio S06 - auvisio S06 - IR Bridge - GLOBAL + auvisio S06 + IR Bridge diff --git a/_site/avatar.html b/_site/avatar.html index e9a7025cf..aa695f4e7 100644 --- a/_site/avatar.html +++ b/_site/avatar.html @@ -54,13 +54,13 @@

Avatar 10A Plug

Available from:
- Amazon.de + Amazon.de
- +
- + Edit on GitHub

Template

diff --git a/_site/esicoo.html b/_site/esicoo.html index d94b18fcf..ffbaed4a6 100644 --- a/_site/esicoo.html +++ b/_site/esicoo.html @@ -54,13 +54,13 @@

Esicoo YX-WS01 Plug

Available from:
- Amazon.com + Amazon.com
- +
- + Edit on GitHub

Template

diff --git a/_site/eu.html b/_site/eu.html index ce6093308..357a06a87 100644 --- a/_site/eu.html +++ b/_site/eu.html @@ -6,7 +6,7 @@ EU Devices - + @@ -55,401 +55,365 @@

Plugs, Sockets & Power Strips

AOFO 3AC+4USB - AOFO 3AC+4USB - Power Strip - EU + AOFO 3AC+4USB + Power Strip + + + + + AOFO 4AC+4USB + AOFO 4AC+4USB + Power Strip AWP08L - AWP08L - Plug - EU + AWP08L + Plug Albohes PC-1606 - Albohes PC-1606 - Outdoor Plug - EU + Albohes PC-1606 + Outdoor Plug Alfawise PE1004T - Alfawise PE1004T - Plug - EU + Alfawise PE1004T + Plug Avatar 10A - Avatar 10A - Plug - EU + Avatar 10A + Plug Bilikay SP10 - Bilikay SP10 - Plug - EU + Bilikay SP10 + Plug Blitzwolf BW-SHP2 - Blitzwolf BW-SHP2 - Plug - EU + Blitzwolf BW-SHP2 + Plug Blitzwolf BW-SHP5 - Blitzwolf BW-SHP5 - Plug - EU + Blitzwolf BW-SHP5 + Plug Blitzwolf BW-SHP6 - Blitzwolf BW-SHP6 - Plug - EU + Blitzwolf BW-SHP6 + Plug + + + + + Delock 11826 + Delock 11826 + Plug Digoo DG-SP01 - Digoo DG-SP01 - Plug - EU + Digoo DG-SP01 + Plug Digoo NX-SP202 - Digoo NX-SP202 - Plug - EU + Digoo NX-SP202 + Plug Estink C178 - Estink C178 - Plug - EU + Estink C178 + Plug FLHS-ZN04 - FLHS-ZN04 - Plug - EU + FLHS-ZN04 + Plug Geekbes 4AC+4USB - Geekbes 4AC+4USB - Power Strip - EU + Geekbes 4AC+4USB + Power Strip Gosund SP1 - Gosund SP1 - Plug - EU + Gosund SP1 + Plug Gosund SP111 - Gosund SP111 - Plug - EU + Gosund SP111 + Plug Hauppauge SL-1642 - Hauppauge SL-1642 - Plug - EU + Hauppauge SL-1642 + Plug HiHome WPP-16T - HiHome WPP-16T - Plug - EU + HiHome WPP-16T + Plug Houzetek AWP07L - Houzetek AWP07L - Plug - EU + Houzetek AWP07L + Plug Koogeek KLOE4 - Koogeek KLOE4 - Power Strip - EU + Koogeek KLOE4 + Power Strip Laduo YX-DE01 - Laduo YX-DE01 - Plug - EU + Laduo YX-DE01 + Plug Luminea ZX-2820 - Luminea ZX-2820 - Plug - EU + Luminea ZX-2820 + Plug Maxcio W-DE004 - Maxcio W-DE004 - Plug - EU + Maxcio W-DE004 + Plug Maxcio YX-DE02 - Maxcio YX-DE02 - Plug - EU + Maxcio YX-DE02 + Plug Merisny P2 - Merisny P2 - Plug - EU + Merisny P2 + Plug NEO Coolcam 16A Power Monitoring - NEO Coolcam 16A Power Monitoring - Plug - EU + NEO Coolcam 16A Power Monitoring + Plug Nedis WIFIP310FWT - Nedis WIFIP310FWT - Power Strip - EU + Nedis WIFIP310FWT + Power Strip Obi Stecker - Obi Stecker - Plug - EU + Obi Stecker + Plug Obi Stecker 2 - Obi Stecker 2 - Plug - EU + Obi Stecker 2 + Plug Obi Stecker IP44 - Obi Stecker IP44 - Plug - EU + Obi Stecker IP44 + Plug Panamalar NX-SM200 16A - Panamalar NX-SM200 16A - Plug - EU + Panamalar NX-SM200 16A + Plug RGB Power Monitoring - RGB Power Monitoring - Plug - EU + RGB Power Monitoring + Plug RSH-WS007 - RSH-WS007 - Plug - EU + RSH-WS007 + Plug S2199EU - S2199EU - Power Strip - EU + S2199EU + Power Strip SWA1 - SWA1 - Plug - EU + SWA1 + Plug Slitinto NX-SP202 - Slitinto NX-SP202 - Plug - EU + Slitinto NX-SP202 + Plug Smanergy KA10 - Smanergy KA10 - Wall Outlet - EU + Smanergy KA10 + Wall Outlet Sonoff S20 - Sonoff S20 - Plug - GLOBAL + Sonoff S20 + Plug Sonoff S26 - Sonoff S26 - Plug - GLOBAL + Sonoff S26 + Plug Teckin SP21 - Teckin SP21 - Plug - EU + Teckin SP21 + Plug Teckin SP22 - Teckin SP22 - Plug - EU + Teckin SP22 + Plug TimeThinker WS2 - TimeThinker WS2 - Plug - EU + TimeThinker WS2 + Plug Viflykoo 3AC+4USB - Viflykoo 3AC+4USB - Power Strip - EU + Viflykoo 3AC+4USB + Power Strip WAZA 10A - WAZA 10A - Plug - EU + WAZA 10A + Plug WL-SC01 - WL-SC01 - Plug - EU + WL-SC01 + Plug Woox R4028 - Woox R4028 - Power Strip - EU + Woox R4028 + Power Strip Yuanguo 4AC + 2 USB - Yuanguo 4AC + 2 USB - Power Strip - EU + Yuanguo 4AC + 2 USB + Power Strip ZLD-44EU-W - ZLD-44EU-W - Power Strip - EU + ZLD-44EU-W + Power Strip Zeoota PS022 - Zeoota PS022 - Power Strip - EU + Zeoota PS022 + Power Strip ZooZee SE131 - ZooZee SE131 - Plug - EU + ZooZee SE131 + Plug @@ -462,243 +426,220 @@

Lights

- - 9cm RGB+W 7W - 9cm RGB+W 7W - Ceiling Light - GLOBAL - - - Arilux AL-LC01 - Arilux AL-LC01 - LED Controller - GLOBAL + Arilux AL-LC01 + LED Controller Arilux AL-LC06 - Arilux AL-LC06 - LED Controller - GLOBAL + Arilux AL-LC06 + LED Controller Arilux AL-LC11 - Arilux AL-LC11 - LED Controller - GLOBAL + Arilux AL-LC11 + LED Controller Armtronix AC Dimmer One Triac Board - Armtronix AC Dimmer One Triac Board - Dimmer - GLOBAL + Armtronix AC Dimmer One Triac Board + Dimmer Armtronix AC Dimmer Two Triac Board - Armtronix AC Dimmer Two Triac Board - Dimmer - GLOBAL + Armtronix AC Dimmer Two Triac Board + Dimmer BlitzWolf BW-LT11 - BlitzWolf BW-LT11 - LED Strip - GLOBAL + BlitzWolf BW-LT11 + LED Strip Electrodragon Board - Electrodragon Board - LED Controller - GLOBAL + Electrodragon Board + LED Controller Fcmila FC-12W - Fcmila FC-12W - Bulb - EU + Fcmila FC-12W + Bulb Fcmila XDD-48W - Fcmila XDD-48W - Ceiling Light - GLOBAL + Fcmila XDD-48W + Light + + + + + Gosund E27 8W RGBW + Gosund E27 8W RGBW + Bulb H801 - H801 - LED Controller - GLOBAL + H801 + LED Controller Lohas ZN031 - Lohas ZN031 - Bulb - GLOBAL + Lohas ZN031 + Bulb Lumiman E27 Multicolor - Lumiman E27 Multicolor - Bulb - EU + Lumiman E27 Multicolor + Bulb Luminea ZX-2831 E27 CCT - Luminea ZX-2831 E27 CCT - Bulb - EU + Luminea ZX-2831 E27 CCT + Bulb Luminea ZX-2832 E27 RGBW - Luminea ZX-2832 E27 RGBW - Bulb - EU + Luminea ZX-2832 E27 RGBW + Bulb Luminea ZX-2844 - Luminea ZX-2844 - LED Controller - GLOBAL + Luminea ZX-2844 + LED Controller Lyasi PT-BW09 - Lyasi PT-BW09 - Bulb - EU + Lyasi PT-BW09 + Bulb MagicHome RGB ZJ-WFMN-A V1.1 - MagicHome RGB ZJ-WFMN-A V1.1 - LED Controller - GLOBAL + MagicHome RGB ZJ-WFMN-A V1.1 + LED Controller MagicHome RGBW ZJ-WFMN-A V1.1 - MagicHome RGBW ZJ-WFMN-A V1.1 - LED Controller - GLOBAL + MagicHome RGBW ZJ-WFMN-A V1.1 + LED Controller Maxcio YX-L01P-E7 - Maxcio YX-L01P-E7 - Bulb - EU + Maxcio YX-L01P-E7 + Bulb Mi LED Desk Lamp MJTD01YL - Mi LED Desk Lamp MJTD01YL - Lamp - GLOBAL + Mi LED Desk Lamp MJTD01YL + Light Nexlux - Nexlux - LED Controller - GLOBAL + Nexlux + LED Controller RGBW 7W E14 - RGBW 7W E14 - Bulb - EU + RGBW 7W E14 + Bulb Sonoff B1 (R2) - Sonoff B1 (R2) - Bulb - EU + Sonoff B1 (R2) + Bulb Sonoff BN-SZ01 - Sonoff BN-SZ01 - Ceiling LED - GLOBAL + Sonoff BN-SZ01 + Light + + + + + Spotlight 9cm RGB+W 7W + Spotlight 9cm RGB+W 7W + Light Utorch PZE-911 - Utorch PZE-911 - Ceiling Light - GLOBAL + Utorch PZE-911 + Light Woopower RGBW E14 5W - Woopower RGBW E14 5W - Bulb - EU + Woopower RGBW E14 5W + Bulb Xiaomi Phillips E14 - Xiaomi Phillips E14 - Bulb - EU + Xiaomi Phillips E14 + Bulb Xiaomi Phillips E27 - Xiaomi Phillips E27 - Bulb - EU + Xiaomi Phillips E27 + Bulb Zemismart 4 - Zemismart 4" 10W RGBW - Downlight - GLOBAL + Zemismart 4" 10W RGBW + Light @@ -713,129 +654,127 @@

Switches & Dimmers

DS-102 1 Gang - DS-102 1 Gang - Switch - EU + DS-102 1 Gang + Switch DS-102 2 Gang - DS-102 2 Gang - Switch - EU + DS-102 2 Gang + Switch DS-102 3 Gang - DS-102 3 Gang - Switch - EU + DS-102 3 Gang + Switch Jinvoo SM-SW101-1 - Jinvoo SM-SW101-1 - Switch - EU + Jinvoo SM-SW101-1 + Switch Jinvoo SM-SW101-2 - Jinvoo SM-SW101-2 - Switch - EU + Jinvoo SM-SW101-2 + Switch Jinvoo SM-SW101-3 - Jinvoo SM-SW101-3 - Switch - EU + Jinvoo SM-SW101-3 + Switch Jinvoo SM-SW101-C Curtain - Jinvoo SM-SW101-C Curtain - Switch - EU + Jinvoo SM-SW101-C Curtain + Switch KOAANW DS302 - KOAANW DS302 - Switch - EU + KOAANW DS302 + Switch Kingart Touch - Kingart Touch - Dimmer - EU + Kingart Touch + Dimmer LYASI B07PYMG3WD - LYASI B07PYMG3WD - Switch - EU + LYASI B07PYMG3WD + Switch Minitiger 1 Gang - Minitiger 1 Gang - Switch - EU + Minitiger 1 Gang + Switch Minitiger 2 Gang - Minitiger 2 Gang - Switch - EU + Minitiger 2 Gang + Switch Sonoff T1 EU 1 Gang - Sonoff T1 EU 1 Gang - Switch - EU + Sonoff T1 EU 1 Gang + Switch Sonoff T1 EU 2 Gang - Sonoff T1 EU 2 Gang - Switch - EU + Sonoff T1 EU 2 Gang + Switch Sonoff Touch EU - Sonoff Touch EU - Switch - EU + Sonoff Touch EU + Switch Teepao - Teepao - Curtain Switch - EU + Teepao + Curtain Switch + + + + + WWK-UN-W Glass Panel + WWK-UN-W Glass Panel + Wall Outlet + + + + + Zemismart KS-611 3 Gang + Zemismart KS-611 3 Gang + Switch @@ -849,241 +788,211 @@

Relays

1 Channel Inching/Self-Locking - 1 Channel Inching/Self-Locking - Relay - GLOBAL + 1 Channel Inching/Self-Locking + Relay Canwing CW-001 - Canwing CW-001 - Relay - GLOBAL + Canwing CW-001 + Relay EACHEN ST-DC2 - EACHEN ST-DC2 - Relay - GLOBAL + EACHEN ST-DC2 + Relay EX Store 2 Kanal V5 - EX Store 2 Kanal V5 - Relay - GLOBAL + EX Store 2 Kanal V5 + Relay Electrodragon Board SPDT - Electrodragon Board SPDT - Relay - GLOBAL + Electrodragon Board SPDT + Relay Electrodragon ESP8266 - Electrodragon ESP8266 - Relay - GLOBAL + Electrodragon ESP8266 + Relay Geekcreit 2 Channel - Geekcreit 2 Channel - Relay - GLOBAL + Geekcreit 2 Channel + Relay LinkNode R4 - LinkNode R4 - Relay - GLOBAL + LinkNode R4 + Relay LinkNode R8 - LinkNode R8 - Relay - GLOBAL + LinkNode R8 + Relay Luani HVIO - Luani HVIO - DIY Relay - GLOBAL + Luani HVIO + DIY Project SUPLA inCan by Espablo - SUPLA inCan by Espablo - DIY Relay - GLOBAL + SUPLA inCan by Espablo + DIY Project Shelly 1 - Shelly 1 - Relay - GLOBAL + Shelly 1 + Relay Shelly 1PM - Shelly 1PM - Relay - GLOBAL + Shelly 1PM + Relay Shelly 2 - Shelly 2 - Relay - GLOBAL + Shelly 2 + Relay Shelly 2.5 - Shelly 2.5 - Relay - GLOBAL + Shelly 2.5 + Relay Sonoff 4CH (R2) - Sonoff 4CH (R2) - Relay - GLOBAL + Sonoff 4CH (R2) + Relay Sonoff 4CH Pro (R2) - Sonoff 4CH Pro (R2) - Relay - GLOBAL + Sonoff 4CH Pro (R2) + Relay Sonoff Basic - Sonoff Basic - Relay - GLOBAL + Sonoff Basic + Relay Sonoff Dual - Sonoff Dual - Relay - GLOBAL + Sonoff Dual + Relay Sonoff Dual R2 - Sonoff Dual R2 - Relay - GLOBAL + Sonoff Dual R2 + Relay Sonoff Pow - Sonoff Pow - Relay - GLOBAL + Sonoff Pow + Relay Sonoff Pow R2 - Sonoff Pow R2 - Relay - GLOBAL + Sonoff Pow R2 + Relay Sonoff RF - Sonoff RF - Relay - GLOBAL + Sonoff RF + Relay Sonoff SV - Sonoff SV - Relay - GLOBAL + Sonoff SV + Relay Sonoff TH10/TH16 - Sonoff TH10/TH16 - Relay - GLOBAL + Sonoff TH10/TH16 + Relay WL-SW01_10 - WL-SW01_10 - Relay - GLOBAL + WL-SW01_10 + Relay Wemos Module 10A - Wemos Module 10A - Relay - GLOBAL + Wemos Module 10A + Relay Yunshan 10A 7-30VDC - Yunshan 10A 7-30VDC - Relay - GLOBAL + Yunshan 10A 7-30VDC + Relay eMylo XL9251WI - eMylo XL9251WI - Relay - GLOBAL + eMylo XL9251WI + Relay eMylo YSA111A1N-FBA - eMylo YSA111A1N-FBA - Relay - GLOBAL + eMylo YSA111A1N-FBA + Relay @@ -1097,73 +1006,64 @@

Miscellaneous

JinvooSmart SM-PW713 - JinvooSmart SM-PW713 - Valve - GLOBAL + JinvooSmart SM-PW713 + Valve Oil Diffuser 550ML - Oil Diffuser 550ML - Humidifier - GLOBAL + Oil Diffuser 550ML + Humidifier Slampher - Slampher - Bulb Socket - EU + Slampher + Bulb Socket Sonoff RF Bridge 433 - Sonoff RF Bridge 433 - RF Bridge - GLOBAL + Sonoff RF Bridge 433 + RF Bridge Sonoff SC - Sonoff SC - Environment Monitor - GLOBAL + Sonoff SC + Environment Monitor Sonoff iFan02 - Sonoff iFan02 - Fan Controller - GLOBAL + Sonoff iFan02 + Fan Controller Witty Cloud - Witty Cloud - Development Board - GLOBAL + Witty Cloud + Development Board YTF - YTF - IR Bridge - GLOBAL + YTF + IR Bridge auvisio S06 - auvisio S06 - IR Bridge - GLOBAL + auvisio S06 + IR Bridge diff --git a/_site/feit65.html b/_site/feit65.html index e3408a53e..3c556787b 100644 --- a/_site/feit65.html +++ b/_site/feit65.html @@ -54,13 +54,13 @@

Feit Electric BR30 65W Bulb

Available from:
- Amazon.com + Amazon.com
- +
- + Edit on GitHub

Template

diff --git a/_site/feitbr30.html b/_site/feitbr30.html index dbe9f7758..87ce2cd2d 100644 --- a/_site/feitbr30.html +++ b/_site/feitbr30.html @@ -54,13 +54,13 @@

Feit Electric BR30 65W Daylight Bulb

Available from:
- Amazon.com + Amazon.com
- +
- + Edit on GitHub

Template

diff --git a/_site/merkurybr30.html b/_site/merkurybr30.html index 1cba678b6..723eb3735 100644 --- a/_site/merkurybr30.html +++ b/_site/merkurybr30.html @@ -54,13 +54,13 @@

Merkury BR30 65W Bulb

Available from:
- Walmart.com + Walmart.com
- +
- + Edit on GitHub

Template

diff --git a/_site/mjswitch.html b/_site/mjswitch.html index 12b687ddb..cfd9b6d9d 100644 --- a/_site/mjswitch.html +++ b/_site/mjswitch.html @@ -54,13 +54,13 @@

Martin Jerry 15A Switch

Available from:
- Amazon.com + Amazon.com
- +
- + Edit on GitHub

Template

diff --git a/_site/new.html b/_site/new.html index ac8cfc7a8..823ffd585 100644 --- a/_site/new.html +++ b/_site/new.html @@ -6,7 +6,7 @@ Add New Template - + diff --git a/_site/powruia39.html b/_site/powruia39.html index 2d11fa7ce..bc5989a71 100644 --- a/_site/powruia39.html +++ b/_site/powruia39.html @@ -54,13 +54,13 @@

Powrui AW-39 Power Strip

Available from:
- Amazon.com + Amazon.com
- +
- + Edit on GitHub

Template

diff --git a/_site/rgbpow.html b/_site/rgbpow.html index 7e858db2b..38482ae3b 100644 --- a/_site/rgbpow.html +++ b/_site/rgbpow.html @@ -54,13 +54,13 @@

RGB Power Monitoring Plug

Available from:
- Aliexpress.com + Aliexpress.com
- Amazon.de + Amazon.de
- + Edit on GitHub

Template

diff --git a/_site/sw01_10.html b/_site/sw01_10.html index 827a03cb6..c7cf7f51f 100644 --- a/_site/sw01_10.html +++ b/_site/sw01_10.html @@ -54,13 +54,13 @@

WL-SW01_10 Relay

Available from:
- Aliexpress.com + Aliexpress.com
- +
- + Edit on GitHub

Template

diff --git a/_site/uk.html b/_site/uk.html index 009d9cf8c..066137bf0 100644 --- a/_site/uk.html +++ b/_site/uk.html @@ -6,7 +6,7 @@ UK Devices - + @@ -55,121 +55,113 @@

Plugs, Sockets & Power Strips

Anoopsyche JH-G01B1 - Anoopsyche JH-G01B1 - Plug - UK + Anoopsyche JH-G01B1 + Plug Anoopsyche UK1D - Anoopsyche UK1D - Plug - UK + Anoopsyche UK1D + Plug BSD29 - BSD29 - Plug - UK + BSD29 + Plug Blitzwolf BW-SHP4 - Blitzwolf BW-SHP4 - Plug - UK + Blitzwolf BW-SHP4 + Plug HuaFan QinLu - HuaFan QinLu - Plug - UK + HuaFan QinLu + Plug Hyleton 313 - Hyleton 313 - Plug - UK + Hyleton 313 + Plug Innens BSD29 - Innens BSD29 - Plug - UK + Innens BSD29 + Plug Maxcio W-UK007S - Maxcio W-UK007S - Plug - UK + Maxcio W-UK007S + Plug SWA9 - SWA9 - Plug - UK + SWA9 + Plug Sonoff S20 - Sonoff S20 - Plug - GLOBAL + Sonoff S20 + Plug Sonoff S26 - Sonoff S26 - Plug - GLOBAL + Sonoff S26 + Plug Teckin SP23 - Teckin SP23 - Plug - UK + Teckin SP23 + Plug Teckin SP27 - Teckin SP27 - Plug - UK + Teckin SP27 + Plug + + + + + Vigica VGSPK00815 + Vigica VGSPK00815 + Wall Outlet WAZA JH-G01B - WAZA JH-G01B - Plug - UK + WAZA JH-G01B + Plug XS-A25 - XS-A25 - Power Strip - UK + XS-A25 + Power Strip @@ -184,267 +176,241 @@

Lights

- - 9cm RGB+W 7W - 9cm RGB+W 7W - Ceiling Light - GLOBAL - - - Arilux AL-LC01 - Arilux AL-LC01 - LED Controller - GLOBAL + Arilux AL-LC01 + LED Controller Arilux AL-LC06 - Arilux AL-LC06 - LED Controller - GLOBAL + Arilux AL-LC06 + LED Controller Arilux AL-LC11 - Arilux AL-LC11 - LED Controller - GLOBAL + Arilux AL-LC11 + LED Controller Armtronix AC Dimmer One Triac Board - Armtronix AC Dimmer One Triac Board - Dimmer - GLOBAL + Armtronix AC Dimmer One Triac Board + Dimmer Armtronix AC Dimmer Two Triac Board - Armtronix AC Dimmer Two Triac Board - Dimmer - GLOBAL + Armtronix AC Dimmer Two Triac Board + Dimmer BlitzWolf BW-LT11 - BlitzWolf BW-LT11 - LED Strip - GLOBAL + BlitzWolf BW-LT11 + LED Strip Electrodragon Board - Electrodragon Board - LED Controller - GLOBAL + Electrodragon Board + LED Controller Fcmila FC-12W - Fcmila FC-12W - Bulb - EU + Fcmila FC-12W + Bulb Fcmila XDD-48W - Fcmila XDD-48W - Ceiling Light - GLOBAL + Fcmila XDD-48W + Light + + + + + Gosund E27 8W RGBW + Gosund E27 8W RGBW + Bulb H801 - H801 - LED Controller - GLOBAL + H801 + LED Controller Lohas ZN031 - Lohas ZN031 - Bulb - GLOBAL + Lohas ZN031 + Bulb Lumiman E27 Multicolor - Lumiman E27 Multicolor - Bulb - EU + Lumiman E27 Multicolor + Bulb Luminea ZX-2831 E27 CCT - Luminea ZX-2831 E27 CCT - Bulb - EU + Luminea ZX-2831 E27 CCT + Bulb Luminea ZX-2832 E27 RGBW - Luminea ZX-2832 E27 RGBW - Bulb - EU + Luminea ZX-2832 E27 RGBW + Bulb Luminea ZX-2844 - Luminea ZX-2844 - LED Controller - GLOBAL + Luminea ZX-2844 + LED Controller Lyasi PT-BW09 - Lyasi PT-BW09 - Bulb - EU + Lyasi PT-BW09 + Bulb MagicHome RGB ZJ-WFMN-A V1.1 - MagicHome RGB ZJ-WFMN-A V1.1 - LED Controller - GLOBAL + MagicHome RGB ZJ-WFMN-A V1.1 + LED Controller MagicHome RGBW ZJ-WFMN-A V1.1 - MagicHome RGBW ZJ-WFMN-A V1.1 - LED Controller - GLOBAL + MagicHome RGBW ZJ-WFMN-A V1.1 + LED Controller Maxcio YX-L01P-E7 - Maxcio YX-L01P-E7 - Bulb - EU + Maxcio YX-L01P-E7 + Bulb Mi LED Desk Lamp MJTD01YL - Mi LED Desk Lamp MJTD01YL - Lamp - GLOBAL + Mi LED Desk Lamp MJTD01YL + Light Nexlux - Nexlux - LED Controller - GLOBAL + Nexlux + LED Controller Novostella B22 7W - Novostella B22 7W - Bulb - UK + Novostella B22 7W + Bulb RGBW 7W E14 - RGBW 7W E14 - Bulb - EU + RGBW 7W E14 + Bulb Sonoff B1 (R2) - Sonoff B1 (R2) - Bulb - EU + Sonoff B1 (R2) + Bulb Sonoff BN-SZ01 - Sonoff BN-SZ01 - Ceiling LED - GLOBAL + Sonoff BN-SZ01 + Light + + + + + Spotlight 9cm RGB+W 7W + Spotlight 9cm RGB+W 7W + Light Teckin SB51 - Teckin SB51 - Bulb - UK + Teckin SB51 + Bulb Utorch PZE-911 - Utorch PZE-911 - Ceiling Light - GLOBAL + Utorch PZE-911 + Light Woopower RGBW E14 5W - Woopower RGBW E14 5W - Bulb - EU + Woopower RGBW E14 5W + Bulb Xiaomi Phillips E14 - Xiaomi Phillips E14 - Bulb - EU + Xiaomi Phillips E14 + Bulb Xiaomi Phillips E27 - Xiaomi Phillips E27 - Bulb - EU + Xiaomi Phillips E27 + Bulb Zemismart 4 - Zemismart 4" 10W RGBW - Downlight - GLOBAL + Zemismart 4" 10W RGBW + Light electriQ RGBW B22 - electriQ RGBW B22 - Bulb - UK + electriQ RGBW B22 + Bulb @@ -459,33 +425,22 @@

Switches & Dimmers

Sonoff T1 UK 1 Gang - Sonoff T1 UK 1 Gang - Switch - UK + Sonoff T1 UK 1 Gang + Switch Sonoff T1 UK 2 Gang - Sonoff T1 UK 2 Gang - Switch - UK + Sonoff T1 UK 2 Gang + Switch Sonoff T1 UK 3 Gang - Sonoff T1 UK 3 Gang - Switch - UK - - - - - Vigica VGSPK00815 - Vigica VGSPK00815 - Wall Outlet - UK + Sonoff T1 UK 3 Gang + Switch @@ -499,241 +454,211 @@

Relays

1 Channel Inching/Self-Locking - 1 Channel Inching/Self-Locking - Relay - GLOBAL + 1 Channel Inching/Self-Locking + Relay Canwing CW-001 - Canwing CW-001 - Relay - GLOBAL + Canwing CW-001 + Relay EACHEN ST-DC2 - EACHEN ST-DC2 - Relay - GLOBAL + EACHEN ST-DC2 + Relay EX Store 2 Kanal V5 - EX Store 2 Kanal V5 - Relay - GLOBAL + EX Store 2 Kanal V5 + Relay Electrodragon Board SPDT - Electrodragon Board SPDT - Relay - GLOBAL + Electrodragon Board SPDT + Relay Electrodragon ESP8266 - Electrodragon ESP8266 - Relay - GLOBAL + Electrodragon ESP8266 + Relay Geekcreit 2 Channel - Geekcreit 2 Channel - Relay - GLOBAL + Geekcreit 2 Channel + Relay LinkNode R4 - LinkNode R4 - Relay - GLOBAL + LinkNode R4 + Relay LinkNode R8 - LinkNode R8 - Relay - GLOBAL + LinkNode R8 + Relay Luani HVIO - Luani HVIO - DIY Relay - GLOBAL + Luani HVIO + DIY Project SUPLA inCan by Espablo - SUPLA inCan by Espablo - DIY Relay - GLOBAL + SUPLA inCan by Espablo + DIY Project Shelly 1 - Shelly 1 - Relay - GLOBAL + Shelly 1 + Relay Shelly 1PM - Shelly 1PM - Relay - GLOBAL + Shelly 1PM + Relay Shelly 2 - Shelly 2 - Relay - GLOBAL + Shelly 2 + Relay Shelly 2.5 - Shelly 2.5 - Relay - GLOBAL + Shelly 2.5 + Relay Sonoff 4CH (R2) - Sonoff 4CH (R2) - Relay - GLOBAL + Sonoff 4CH (R2) + Relay Sonoff 4CH Pro (R2) - Sonoff 4CH Pro (R2) - Relay - GLOBAL + Sonoff 4CH Pro (R2) + Relay Sonoff Basic - Sonoff Basic - Relay - GLOBAL + Sonoff Basic + Relay Sonoff Dual - Sonoff Dual - Relay - GLOBAL + Sonoff Dual + Relay Sonoff Dual R2 - Sonoff Dual R2 - Relay - GLOBAL + Sonoff Dual R2 + Relay Sonoff Pow - Sonoff Pow - Relay - GLOBAL + Sonoff Pow + Relay Sonoff Pow R2 - Sonoff Pow R2 - Relay - GLOBAL + Sonoff Pow R2 + Relay Sonoff RF - Sonoff RF - Relay - GLOBAL + Sonoff RF + Relay Sonoff SV - Sonoff SV - Relay - GLOBAL + Sonoff SV + Relay Sonoff TH10/TH16 - Sonoff TH10/TH16 - Relay - GLOBAL + Sonoff TH10/TH16 + Relay WL-SW01_10 - WL-SW01_10 - Relay - GLOBAL + WL-SW01_10 + Relay Wemos Module 10A - Wemos Module 10A - Relay - GLOBAL + Wemos Module 10A + Relay Yunshan 10A 7-30VDC - Yunshan 10A 7-30VDC - Relay - GLOBAL + Yunshan 10A 7-30VDC + Relay eMylo XL9251WI - eMylo XL9251WI - Relay - GLOBAL + eMylo XL9251WI + Relay eMylo YSA111A1N-FBA - eMylo YSA111A1N-FBA - Relay - GLOBAL + eMylo YSA111A1N-FBA + Relay @@ -747,65 +672,57 @@

Miscellaneous

JinvooSmart SM-PW713 - JinvooSmart SM-PW713 - Valve - GLOBAL + JinvooSmart SM-PW713 + Valve Oil Diffuser 550ML - Oil Diffuser 550ML - Humidifier - GLOBAL + Oil Diffuser 550ML + Humidifier Sonoff RF Bridge 433 - Sonoff RF Bridge 433 - RF Bridge - GLOBAL + Sonoff RF Bridge 433 + RF Bridge Sonoff SC - Sonoff SC - Environment Monitor - GLOBAL + Sonoff SC + Environment Monitor Sonoff iFan02 - Sonoff iFan02 - Fan Controller - GLOBAL + Sonoff iFan02 + Fan Controller Witty Cloud - Witty Cloud - Development Board - GLOBAL + Witty Cloud + Development Board YTF - YTF - IR Bridge - GLOBAL + YTF + IR Bridge auvisio S06 - auvisio S06 - IR Bridge - GLOBAL + auvisio S06 + IR Bridge diff --git a/_site/us.html b/_site/us.html index 5186bde7d..f6312ae20 100644 --- a/_site/us.html +++ b/_site/us.html @@ -6,7 +6,7 @@ US Devices - + @@ -55,513 +55,456 @@

Plugs, Sockets & Power Strips

ANBES ABS-CZ004 - ANBES ABS-CZ004 - Plug - US + ANBES ABS-CZ004 + Plug AWP02L-N - AWP02L-N - Plug - US + AWP02L-N + Plug AWP04L Power Monitoring - AWP04L Power Monitoring - Plug - US + AWP04L Power Monitoring + Plug Acashna HS108 - Acashna HS108 - Plug - US + Acashna HS108 + Plug Acenx SOP04-US Dual - Acenx SOP04-US Dual - Outdoor Plug - US + Acenx SOP04-US Dual + Outdoor Plug Amysen YX-WS01 - Amysen YX-WS01 - Plug - US + Amysen YX-WS01 + Plug Annhome 3AC + 2USB - Annhome 3AC + 2USB - Power Strip - US + Annhome 3AC + 2USB + Power Strip BN-LINK BNC-60/U133TJ-2P - BN-LINK BNC-60/U133TJ-2P - Plug - US + BN-LINK BNC-60/U133TJ-2P + Plug BSD15 - BSD15 - Plug - US + BSD15 + Plug Blitzwolf BW-SHP3 - Blitzwolf BW-SHP3 - Plug - US + Blitzwolf BW-SHP3 + Plug CE Garden Power Stake - CE Garden Power Stake - Power Strip - US + CE Garden Power Stake + Power Strip Charging Essentials WiFi Smart - Charging Essentials WiFi Smart - Wall Outlet - US + Charging Essentials WiFi Smart + Wall Outlet DILISENS SP201 - DILISENS SP201 - Plug - US + DILISENS SP201 + Plug DWFeng AWP02L-N - DWFeng AWP02L-N - Plug - US + DWFeng AWP02L-N + Plug ECF-SOP03 - ECF-SOP03 - Outdoor Plug - US + ECF-SOP03 + Outdoor Plug ESW01-US - ESW01-US - Plug - US + ESW01-US + Plug EVA LOGIK NWF001 - EVA LOGIK NWF001 - Plug - US + EVA LOGIK NWF001 + Plug Esicoo YX-WS01 - Esicoo YX-WS01 - Plug - US + Esicoo YX-WS01 + Plug GDTech W-US001 - GDTech W-US001 - Plug - US + GDTech W-US001 + Plug Geeni GN-SW003 - Geeni GN-SW003 - Power Strip - US + Geeni GN-SW003 + Power Strip Globe Smart - Globe Smart - Plug - US + Globe Smart + Plug Gosund WP1-1 - Gosund WP1-1 - Plug - US + Gosund WP1-1 + Plug Gosund WP211 - Gosund WP211 - Plug - US + Gosund WP211 + Plug Gosund WP3 - Gosund WP3 - Plug - US + Gosund WP3 + Plug Hyleton 331 - Hyleton 331 - Power Strip - US + Hyleton 331 + Power Strip KMC 4 30608 - KMC 4 30608 - Plug - US + KMC 4 30608 + Plug KMC 5 - KMC 5 - Power Strip - US + KMC 5 + Power Strip KMC 70011 - KMC 70011 - Plug - US + KMC 70011 + Plug Kesen KS-604 - Kesen KS-604 - Wall Outlet - US + Kesen KS-604 + Wall Outlet Kesen KS-604S - Kesen KS-604S - Wall Outlet - US + Kesen KS-604S + Wall Outlet Kimire S12 - Kimire S12 - Plug - US + Kimire S12 + Plug LEPOWER - LEPOWER - Outdoor Plug - US + LEPOWER + Outdoor Plug LINGANZH 16A - LINGANZH 16A - Plug - US + LINGANZH 16A + Plug LeFun SK2 - LeFun SK2 - Power Strip - US + LeFun SK2 + Power Strip Maxcio W-US003 - Maxcio W-US003 - Plug - US + Maxcio W-US003 + Plug Merkury Innovations - Merkury Innovations - Plug - US + Merkury Innovations + Plug Meross MSS425 - Meross MSS425 - Power Strip - US + Meross MSS425 + Power Strip Oittm Outdoor - Oittm Outdoor - Outdoor Plug - US + Oittm Outdoor + Outdoor Plug Oittm Smart - Oittm Smart - Plug - US + Oittm Smart + Plug Oukitel P1 - Oukitel P1 - Plug - US + Oukitel P1 + Plug Oukitel X6P - Oukitel X6P - Plug - US + Oukitel X6P + Plug Oxaoxe NX-SM800 - Oxaoxe NX-SM800 - Plug - US + Oxaoxe NX-SM800 + Plug Powrui AW-39 - Powrui AW-39 - Power Strip - US + Powrui AW-39 + Power Strip RGB Light - RGB Light - Plug - US + RGB Light + Plug SK03 - SK03 - Outdoor Plug - US + SK03 + Outdoor Plug SM-PW702 - SM-PW702 - Plug - US + SM-PW702 + Plug - SM-S0301 - SM-S0301 - Power Strip - US + SM-S0301 + SM-S0301 + Power Strip - SM-S0301 - SM-S0301 - Power Strip - US + SM-S0301 + SM-S0301 + Power Strip SP201 Dual - SP201 Dual - Plug - US + SP201 Dual + Plug SWB1 - SWB1 - Power Strip - US + SWB1 + Power Strip Sonoff S20 - Sonoff S20 - Plug - GLOBAL + Sonoff S20 + Plug Sonoff S26 - Sonoff S26 - Plug - GLOBAL + Sonoff S26 + Plug Sonoff S31 - Sonoff S31 - Plug - US + Sonoff S31 + Plug SuperNight Dual - SuperNight Dual - Plug - US + SuperNight Dual + Plug TanTan WP3 - TanTan WP3 - Plug - US + TanTan WP3 + Plug Teckin SP10 - Teckin SP10 - Plug - US + Teckin SP10 + Plug Teckin SP20 - Teckin SP20 - Plug - US + Teckin SP20 + Plug Teckin SP25 - Teckin SP25 - Plug - US + Teckin SP25 + Plug Teckin SS30 - Teckin SS30 - Power Strip - US + Teckin SS30 + Power Strip Top-Max PS-1602 - Top-Max PS-1602 - Outdoor Plug - US + Top-Max PS-1602 + Outdoor Plug WAGA life CHCZ02MB - WAGA life CHCZ02MB - Plug - US + WAGA life CHCZ02MB + Plug WiOn 50055 - WiOn 50055 - Plug - US + WiOn 50055 + Plug XS-SSA05 - XS-SSA05 - Plug - US + XS-SSA05 + Plug YERON US101 - YERON US101 - Plug - US + YERON US101 + Plug + + + + + YX-WS02 + YX-WS02 + Plug @@ -574,291 +517,255 @@

Lights

- - 9cm RGB+W 7W - 9cm RGB+W 7W - Ceiling Light - GLOBAL - - - Anoopsyche CW/WW 60W - Anoopsyche CW/WW 60W - Bulb - US + Anoopsyche CW/WW 60W + Bulb Arilux AL-LC01 - Arilux AL-LC01 - LED Controller - GLOBAL + Arilux AL-LC01 + LED Controller Arilux AL-LC06 - Arilux AL-LC06 - LED Controller - GLOBAL + Arilux AL-LC06 + LED Controller Arilux AL-LC11 - Arilux AL-LC11 - LED Controller - GLOBAL + Arilux AL-LC11 + LED Controller Armtronix AC Dimmer One Triac Board - Armtronix AC Dimmer One Triac Board - Dimmer - GLOBAL + Armtronix AC Dimmer One Triac Board + Dimmer Armtronix AC Dimmer Two Triac Board - Armtronix AC Dimmer Two Triac Board - Dimmer - GLOBAL + Armtronix AC Dimmer Two Triac Board + Dimmer BlitzWolf BW-LT11 - BlitzWolf BW-LT11 - LED Strip - GLOBAL + BlitzWolf BW-LT11 + LED Strip Electrodragon Board - Electrodragon Board - LED Controller - GLOBAL + Electrodragon Board + LED Controller Fcmila XDD-48W - Fcmila XDD-48W - Ceiling Light - GLOBAL + Fcmila XDD-48W + Light Feit Electric BR30 65W - Feit Electric BR30 65W - Bulb - US + Feit Electric BR30 65W + Bulb Feit Electric BR30 65W Daylight - Feit Electric BR30 65W Daylight - Bulb - US + Feit Electric BR30 65W Daylight + Bulb Feit Electric RGB A19 - Feit Electric RGB A19 - Bulb - US + Feit Electric RGB A19 + Bulb Feit Electric Soft White A19 60W - Feit Electric Soft White A19 60W - Bulb - US + Feit Electric Soft White A19 60W + Bulb H801 - H801 - LED Controller - GLOBAL + H801 + LED Controller Kohree A19 7W - Kohree A19 7W - Bulb - US + Kohree A19 7W + Bulb LEDEnet - LEDEnet - LED Controller - US + LEDEnet + LED Controller Legelite E26 - Legelite E26 - Bulb - US + Legelite E26 + Bulb Lohas A19 RGBW E12 - Lohas A19 RGBW E12 - Bulb - US + Lohas A19 RGBW E12 + Bulb Lohas ZN031 - Lohas ZN031 - Bulb - GLOBAL + Lohas ZN031 + Bulb Lumiman LM530 E26 - Lumiman LM530 E26 - Bulb - US + Lumiman LM530 E26 + Bulb Luminea ZX-2844 - Luminea ZX-2844 - LED Controller - GLOBAL + Luminea ZX-2844 + LED Controller MagicHome RGB ZJ-WFMN-A V1.1 - MagicHome RGB ZJ-WFMN-A V1.1 - LED Controller - GLOBAL + MagicHome RGB ZJ-WFMN-A V1.1 + LED Controller MagicHome RGBW ZJ-WFMN-A V1.1 - MagicHome RGBW ZJ-WFMN-A V1.1 - LED Controller - GLOBAL + MagicHome RGBW ZJ-WFMN-A V1.1 + LED Controller Merkury A19 60W - Merkury A19 60W - Bulb - US + Merkury A19 60W + Bulb Merkury A21 75W - Merkury A21 75W - Bulb - US + Merkury A21 75W + Bulb Merkury BR30 65W - Merkury BR30 65W - Bulb - US + Merkury BR30 65W + Bulb Merkury Innovations MI-EW003-999W - Merkury Innovations MI-EW003-999W - LED Strip - US + Merkury Innovations MI-EW003-999W + LED Strip Mi LED Desk Lamp MJTD01YL - Mi LED Desk Lamp MJTD01YL - Lamp - GLOBAL + Mi LED Desk Lamp MJTD01YL + Light Nexlux - Nexlux - LED Controller - GLOBAL + Nexlux + LED Controller Oobest RGBW E27 - Oobest RGBW E27 - Bulb - US + Oobest RGBW E27 + Bulb Sonoff BN-SZ01 - Sonoff BN-SZ01 - Ceiling LED - GLOBAL + Sonoff BN-SZ01 + Light + + + + + Spotlight 9cm RGB+W 7W + Spotlight 9cm RGB+W 7W + Light Teckin SB50 - Teckin SB50 - Bulb - US + Teckin SB50 + Bulb Torchstar - Torchstar - LED Strip - US + Torchstar + LED Strip Utorch PZE-911 - Utorch PZE-911 - Ceiling Light - GLOBAL + Utorch PZE-911 + Light Zemismart 4 - Zemismart 4" 10W RGBW - Downlight - GLOBAL + Zemismart 4" 10W RGBW + Light @@ -873,201 +780,176 @@

Switches & Dimmers

EVA LOGIK WF31 - EVA LOGIK WF31 - Dimmer - US + EVA LOGIK WF31 + Dimmer EtekCity ESWL01 - EtekCity ESWL01 - Switch - US + EtekCity ESWL01 + Switch Gosund KS-602S - Gosund KS-602S - Switch - US + Gosund KS-602S + Switch KMC 70008 - KMC 70008 - Switch - US + KMC 70008 + Switch KYGNE CD-301 - KYGNE CD-301 - Switch - US + KYGNE CD-301 + Switch Kuled K36 - Kuled K36 - Switch - US + Kuled K36 + Switch Kuled KS602S - Kuled KS602S - Switch - US + Kuled KS602S + Switch LX-WIFI-00M 4 Gang - LX-WIFI-00M 4 Gang - Switch - US + LX-WIFI-00M 4 Gang + Switch Martin Jerry 15A - Martin Jerry 15A - Switch - US + Martin Jerry 15A + Switch Moes 3 Gang - Moes 3 Gang - Switch - US + Moes 3 Gang + Switch Moes 3-Way - Moes 3-Way - Switch - US + Moes 3-Way + Switch PS-16-DZ - PS-16-DZ - Dimmer - US + PS-16-DZ + Dimmer SS118-01K1 - SS118-01K1 - Switch - US + SS118-01K1 + Switch Sesoo WIFI-US-SK3-04 - Sesoo WIFI-US-SK3-04 - Switch - US + Sesoo WIFI-US-SK3-04 + Switch SmartPlex 3 Gang - SmartPlex 3 Gang - Switch - US + SmartPlex 3 Gang + Switch Sonoff T1 US 1 Gang - Sonoff T1 US 1 Gang - Switch - US + Sonoff T1 US 1 Gang + Switch Sonoff T1 US 2 Gang - Sonoff T1 US 2 Gang - Switch - US + Sonoff T1 US 2 Gang + Switch Sonoff T1 US 3 Gang - Sonoff T1 US 3 Gang - Switch - US + Sonoff T1 US 3 Gang + Switch Sonoff Touch US - Sonoff Touch US - Switch - US + Sonoff Touch US + Switch Tonbux AMZ180648-2 - Tonbux AMZ180648-2 - Switch - US + Tonbux AMZ180648-2 + Switch Xenon SM-SW102-2 - Xenon SM-SW102-2 - Switch - US + Xenon SM-SW102-2 + Switch Zemismart KS-7011 - Zemismart KS-7011 - Dimmer - US + Zemismart KS-7011 + Dimmer Zemismart KS-811 2 Gang - Zemismart KS-811 2 Gang - Switch - US + Zemismart KS-811 2 Gang + Switch Zemismart KS-811 3 Gang - Zemismart KS-811 3 Gang - Switch - US + Zemismart KS-811 3 Gang + Switch Zemismart WF-BS01 - Zemismart WF-BS01 - Boiler Switch - US + Zemismart WF-BS01 + Switch @@ -1081,241 +963,211 @@

Relays

1 Channel Inching/Self-Locking - 1 Channel Inching/Self-Locking - Relay - GLOBAL + 1 Channel Inching/Self-Locking + Relay Canwing CW-001 - Canwing CW-001 - Relay - GLOBAL + Canwing CW-001 + Relay EACHEN ST-DC2 - EACHEN ST-DC2 - Relay - GLOBAL + EACHEN ST-DC2 + Relay EX Store 2 Kanal V5 - EX Store 2 Kanal V5 - Relay - GLOBAL + EX Store 2 Kanal V5 + Relay Electrodragon Board SPDT - Electrodragon Board SPDT - Relay - GLOBAL + Electrodragon Board SPDT + Relay Electrodragon ESP8266 - Electrodragon ESP8266 - Relay - GLOBAL + Electrodragon ESP8266 + Relay Geekcreit 2 Channel - Geekcreit 2 Channel - Relay - GLOBAL + Geekcreit 2 Channel + Relay LinkNode R4 - LinkNode R4 - Relay - GLOBAL + LinkNode R4 + Relay LinkNode R8 - LinkNode R8 - Relay - GLOBAL + LinkNode R8 + Relay Luani HVIO - Luani HVIO - DIY Relay - GLOBAL + Luani HVIO + DIY Project SUPLA inCan by Espablo - SUPLA inCan by Espablo - DIY Relay - GLOBAL + SUPLA inCan by Espablo + DIY Project Shelly 1 - Shelly 1 - Relay - GLOBAL + Shelly 1 + Relay Shelly 1PM - Shelly 1PM - Relay - GLOBAL + Shelly 1PM + Relay Shelly 2 - Shelly 2 - Relay - GLOBAL + Shelly 2 + Relay Shelly 2.5 - Shelly 2.5 - Relay - GLOBAL + Shelly 2.5 + Relay Sonoff 4CH (R2) - Sonoff 4CH (R2) - Relay - GLOBAL + Sonoff 4CH (R2) + Relay Sonoff 4CH Pro (R2) - Sonoff 4CH Pro (R2) - Relay - GLOBAL + Sonoff 4CH Pro (R2) + Relay Sonoff Basic - Sonoff Basic - Relay - GLOBAL + Sonoff Basic + Relay Sonoff Dual - Sonoff Dual - Relay - GLOBAL + Sonoff Dual + Relay Sonoff Dual R2 - Sonoff Dual R2 - Relay - GLOBAL + Sonoff Dual R2 + Relay Sonoff Pow - Sonoff Pow - Relay - GLOBAL + Sonoff Pow + Relay Sonoff Pow R2 - Sonoff Pow R2 - Relay - GLOBAL + Sonoff Pow R2 + Relay Sonoff RF - Sonoff RF - Relay - GLOBAL + Sonoff RF + Relay Sonoff SV - Sonoff SV - Relay - GLOBAL + Sonoff SV + Relay Sonoff TH10/TH16 - Sonoff TH10/TH16 - Relay - GLOBAL + Sonoff TH10/TH16 + Relay WL-SW01_10 - WL-SW01_10 - Relay - GLOBAL + WL-SW01_10 + Relay Wemos Module 10A - Wemos Module 10A - Relay - GLOBAL + Wemos Module 10A + Relay Yunshan 10A 7-30VDC - Yunshan 10A 7-30VDC - Relay - GLOBAL + Yunshan 10A 7-30VDC + Relay eMylo XL9251WI - eMylo XL9251WI - Relay - GLOBAL + eMylo XL9251WI + Relay eMylo YSA111A1N-FBA - eMylo YSA111A1N-FBA - Relay - GLOBAL + eMylo YSA111A1N-FBA + Relay @@ -1329,81 +1181,71 @@

Miscellaneous

Elegant Choice E27/E26 - Elegant Choice E27/E26 - Bulb Socket - US + Elegant Choice E27/E26 + Bulb Socket JinvooSmart SM-PW713 - JinvooSmart SM-PW713 - Valve - GLOBAL + JinvooSmart SM-PW713 + Valve LC-Tech 1Ch and PZEM-004T - LC-Tech 1Ch and PZEM-004T - DIY Project - US + LC-Tech 1Ch and PZEM-004T + DIY Project Oil Diffuser 550ML - Oil Diffuser 550ML - Humidifier - GLOBAL + Oil Diffuser 550ML + Humidifier Sonoff RF Bridge 433 - Sonoff RF Bridge 433 - RF Bridge - GLOBAL + Sonoff RF Bridge 433 + RF Bridge Sonoff SC - Sonoff SC - Environment Monitor - GLOBAL + Sonoff SC + Environment Monitor Sonoff iFan02 - Sonoff iFan02 - Fan Controller - GLOBAL + Sonoff iFan02 + Fan Controller Witty Cloud - Witty Cloud - Development Board - GLOBAL + Witty Cloud + Development Board YTF - YTF - IR Bridge - GLOBAL + YTF + IR Bridge auvisio S06 - auvisio S06 - IR Bridge - GLOBAL + auvisio S06 + IR Bridge diff --git a/_templates/fcmila_XDD-48W.markdown b/_templates/fcmila_XDD-48W.markdown index 75cb9f980..0302a26dd 100644 --- a/_templates/fcmila_XDD-48W.markdown +++ b/_templates/fcmila_XDD-48W.markdown @@ -2,7 +2,7 @@ date: 2019-03-31 title: Fcmila XDD-48W category: light -type: Ceiling Light +type: Light standard: global link: https://www.ebay.de/itm/Smart-Wifi-Wireless-Deckenleuchte-RGBW-Lampe-fur-Alexa-Google-AC90-240V-/113447726477 image: https://user-images.githubusercontent.com/5904370/56112013-0c536c80-5f5a-11e9-86fe-8688ad21f8c6.png diff --git a/_templates/luani_HVIO.markdown b/_templates/luani_HVIO.markdown index 60b507a2d..eef658a60 100644 --- a/_templates/luani_HVIO.markdown +++ b/_templates/luani_HVIO.markdown @@ -1,7 +1,7 @@ --- title: Luani HVIO category: relay -type: DIY Relay +type: DIY Project standard: global link: https://luani.de/projekte/esp8266-hvio/ image: https://user-images.githubusercontent.com/5904370/57946948-e5cc7c80-78dd-11e9-9ab9-9a52287a7d89.png diff --git a/_templates/mi_desk_lamp.markdown b/_templates/mi_desk_lamp.markdown index b5e6c9026..4b09797c7 100644 --- a/_templates/mi_desk_lamp.markdown +++ b/_templates/mi_desk_lamp.markdown @@ -1,7 +1,7 @@ --- title: Mi LED Desk Lamp MJTD01YL category: light -type: Lamp +type: Light standard: global link: https://www.mi.com/global/smartlamp/ image: https://user-images.githubusercontent.com/5904370/58196142-e98b4500-7cc9-11e9-9bf0-453d5013fd6c.png diff --git a/_templates/rgbw_ceiling_light.markdown b/_templates/rgbw_ceiling_light.markdown index 9d2752765..4eb440aec 100644 --- a/_templates/rgbw_ceiling_light.markdown +++ b/_templates/rgbw_ceiling_light.markdown @@ -1,8 +1,8 @@ --- date: 2019-03-26 -title: 9cm RGB+W 7W +title: Spotlight 9cm RGB+W 7W category: light -type: Ceiling Light +type: Light standard: global link: https://www.aliexpress.com/item/Mini-Intelligent-Wifi-LED-Ceiling-Lights-RGB-W-Dimmable-7W-APP-Remote-Control-Foyer-Bedroom-Hallway/32970274710.html image: https://user-images.githubusercontent.com/5904370/55022165-5354de80-4ffa-11e9-95b5-80428ab68ded.png diff --git a/_templates/sonoff_BN-SZ01.markdown b/_templates/sonoff_BN-SZ01.markdown index 6d0376183..745f979b0 100644 --- a/_templates/sonoff_BN-SZ01.markdown +++ b/_templates/sonoff_BN-SZ01.markdown @@ -1,7 +1,7 @@ --- title: Sonoff BN-SZ01 category: light -type: Ceiling LED +type: Light standard: global link: https://www.itead.cc/bn-sz01.html image: https://user-images.githubusercontent.com/5904370/57891254-098ab680-783b-11e9-9933-f5dd214ee534.png diff --git a/_templates/supla_incan.markdown b/_templates/supla_incan.markdown index 2c59a6668..230e533e9 100644 --- a/_templates/supla_incan.markdown +++ b/_templates/supla_incan.markdown @@ -1,7 +1,7 @@ --- title: SUPLA inCan by Espablo category: relay -type: DIY Relay +type: DIY Project standard: global link: https://forum.supla.org/viewtopic.php?f=33&t=2188 image: https://user-images.githubusercontent.com/5904370/57946103-d51b0700-78db-11e9-8d78-08d795f56323.png diff --git a/_templates/utorch_PZE-911.markdown b/_templates/utorch_PZE-911.markdown index 5b6553343..299b7b875 100644 --- a/_templates/utorch_PZE-911.markdown +++ b/_templates/utorch_PZE-911.markdown @@ -2,7 +2,7 @@ date: 2019-03-19 title: Utorch PZE-911 category: light -type: Ceiling Light +type: Light standard: global link: https://www.gearbest.com/smart-ceiling-lights/pp_009748680892.html image: https://gloimg.gbtcdn.com/soa/gb/pdm-product-pic/Electronic/2018/09/03/goods_img_big-v32/20180903154832_22560.jpg diff --git a/_templates/zemismart_4.markdown b/_templates/zemismart_4.markdown index 01fdf6ed6..c1d1d1a90 100644 --- a/_templates/zemismart_4.markdown +++ b/_templates/zemismart_4.markdown @@ -2,7 +2,7 @@ date: 2019-03-20 title: Zemismart 4" 10W RGBW category: light -type: Downlight +type: Light standard: global link: https://www.amazon.com/Downlight-Ceiling-Control-Compatible-Automation/dp/B07F281FPR image: https://images-na.ssl-images-amazon.com/images/I/51bffXJrJoL._SX466_.jpg diff --git a/_templates/zemismart_WF-BS01.markdown b/_templates/zemismart_WF-BS01.markdown index 6b6d4bfd6..8e0a21e80 100644 --- a/_templates/zemismart_WF-BS01.markdown +++ b/_templates/zemismart_WF-BS01.markdown @@ -2,7 +2,7 @@ date: 2019-04-12 title: Zemismart WF-BS01 category: switch -type: Boiler Switch +type: Switch standard: us link: https://www.aliexpress.com/item/WiFi-Alexa-Google-Home-Water-Boiler-Switch-Support-Smart-Life-Phone-APP-Control-Control-When-Outside/32971557463.html image: https://user-images.githubusercontent.com/5904370/56020785-3c0b3600-5d08-11e9-82e2-9bf0ee24169e.png diff --git a/all.html b/all.html index 69638522d..9bf4c1f7c 100644 --- a/all.html +++ b/all.html @@ -4,56 +4,18 @@ navigation: 9 --- -{% assign standard = site.templates %} - -

Plugs, Sockets & Power Strips

- - -{% assign plug = standard | where: "category", "plug" | sort: 'title' %} -{% for template in plug %} - {% include tablerow.html %} -{% endfor %} - -
- - -

Lights

- - -{% assign light = standard | where: "category", "light" | sort: 'title' %} -{% for template in light %} - {% include tablerow.html %} -{% endfor %} - -
- - -

Switches & Dimmers

- - -{% assign switch = standard | where: "category", "switch" | sort: 'title' %} -{% for template in switch %} - {% include tablerow.html %} -{% endfor %} - -
- -

Relays

- - -{% assign switch = standard | where: "category", "relay" | sort: 'title' %} -{% for template in switch %} -{% include tablerow.html %} -{% endfor %} +{% assign category = site.templates %} +{% assign type_group = category | group_by: 'type' %} +{% assign type_grouped = type_group | sort: 'name' %} +{% for group in type_grouped %} +
+

{{group.name}}

+
+ + {% assign grouptitlesorted = group.items | sort_natural: 'title' %} + {% for template in grouptitlesorted %} + {% include tablerow_standard.html %} + {% endfor %}
- -

Miscellaneous

- - -{% assign misc = standard | where: "category", "misc" | sort: 'title' %} -{% for template in misc %} - {% include tablerow.html %} {% endfor %} - -
diff --git a/anzac.html b/anzac.html index 4e72e8782..806ae2b43 100644 --- a/anzac.html +++ b/anzac.html @@ -22,10 +22,12 @@

Plugs, Sockets & Power Strips

Lights

-{% assign light = standard | where: "category", "light" | sort: 'title' %} -{% for template in light %} -{% include tablerow.html %} -{% endfor %} +{% assign standard_eu = site.templates | where: "standard", "eu" | sort: 'title' %} +{% assign standardlight = standard_country | concat: standard_global | concat: standard_eu %} +{% assign light = standardlight | where: "category", "light" | sort: 'title' %} + {% for template in light %} + {% include tablerow.html %} + {% endfor %}
diff --git a/assets/css/docs.scss b/assets/css/docs.scss index 38895d757..f754e3877 100644 --- a/assets/css/docs.scss +++ b/assets/css/docs.scss @@ -32,6 +32,16 @@ a { text-decoration: underline; } } +a.menu { + text-decoration: none; + color: inherit; + + + &:hover { + color: $link-color; + text-decoration: none; + } +} .wrapper { height: 100%; diff --git a/index.html b/index.html index a7b865288..5354e40a7 100644 --- a/index.html +++ b/index.html @@ -15,22 +15,28 @@

{% assign counter = 0 %}{% for item in site.templates %}{% assign counter=co IN IL GLOBAL +
World map of plugs for more information. +

Devices by type:
- PLUGS LIGHTS SWITCHES RELAYS MISCELLANEOUS -
-
+

+
+ Add new template +

Recently added devices:

-Add new template +

News

+2019/05/24 - Better sorting, complete breakdown of devices by type, removed country tags from standard based lists + + diff --git a/light.html b/light.html index 641958c52..90e1604a6 100644 --- a/light.html +++ b/light.html @@ -4,13 +4,18 @@ navigation: 21 --- -

Light Bulbs, LED Strips and Controllers

- - -{% assign standard = site.templates %} -{% assign plug = standard | where: "category", "light" | sort: 'title' %} -{% for template in plug %} -{% include tablerow.html %} -{% endfor %} +{% assign category = site.templates | where: "category", "light" %} +{% assign type_group = category | group_by: 'type' %} +{% assign type_grouped = type_group | sort: 'name' %} +{% for group in type_grouped %} +
+

{{group.name}}

+
+ + {% assign grouptitlesorted = group.items | sort_natural: 'title' %} + {% for template in grouptitlesorted %} + {% include tablerow_standard.html %} + {% endfor %}
+{% endfor %} diff --git a/misc.html b/misc.html index 3015294c4..1167bbad6 100644 --- a/misc.html +++ b/misc.html @@ -8,9 +8,9 @@

Miscellaneous Devices

{% assign standard = site.templates %} -{% assign plug = standard | where: "category", "misc" | sort: 'title' %} +{% assign plug = standard | where: "category", "misc" | sort_natural: 'title' %} {% for template in plug %} -{% include tablerow.html %} +{% include tablerow_standard.html %} {% endfor %}
diff --git a/plug.html b/plug.html index e3e3866e7..24a37f407 100644 --- a/plug.html +++ b/plug.html @@ -4,15 +4,18 @@ navigation: 20 --- -

Plugs, Sockets and Power Strips

- - -{% assign standard = site.templates %} -{% assign plug = standard | where: "category", "plug" | sort: 'title' %} -{% for template in plug %} - -{% include tablerow.html %} - -{% endfor %} +{% assign category = site.templates | where: "category", "plug" %} +{% assign type_group = category | group_by: 'type' | sort: 'type' %} +{% assign type_grouped = type_group | sort: 'name' %} +{% for group in type_grouped %} +
+

{{group.name}}

+
+ + {% assign grouptitlesorted = group.items | sort_natural: 'title' %} + {% for template in grouptitlesorted %} + {% include tablerow_standard.html %} + {% endfor %}
+{% endfor %} diff --git a/relay.html b/relay.html index 01c42e2d6..b07626147 100644 --- a/relay.html +++ b/relay.html @@ -8,9 +8,9 @@

Relays

{% assign standard = site.templates %} -{% assign plug = standard | where: "category", "relay" | sort: 'title' %} +{% assign plug = standard | where: "category", "relay" | sort_natural: 'title' %} {% for template in plug %} -{% include tablerow.html %} +{% include tablerow_standard.html %} {% endfor %}
diff --git a/switch.html b/switch.html index 6d554986b..8f060ec0a 100644 --- a/switch.html +++ b/switch.html @@ -4,13 +4,18 @@ navigation: 22 --- -

Switches and Dimmers

- - -{% assign standard = site.templates %} -{% assign plug = standard | where: "category", "switch" | sort: 'title' %} -{% for template in plug %} -{% include tablerow.html %} -{% endfor %} +{% assign category = site.templates | where: "category", "switch" %} +{% assign type_group = category | group_by: 'type' %} +{% assign type_grouped = type_group %} +{% for group in type_grouped %} +
+

{{group.name}}

+
+ + {% assign grouptitlesorted = group.items | sort_natural: 'title' %} + {% for template in grouptitlesorted %} + {% include tablerow_standard.html %} + {% endfor %}
+{% endfor %}