Merge pull request #2399 from thelounge/xpaw/fix-2389

Fix `aria-controls` on collapse button

client/views/chan.tpl

@@ -9,7 +9,7 @@
 	aria-selected="false"
 >
 	{{#equal type "lobby"}}
-		<button class="collapse-network" aria-label="Collapse" aria-controls="network-{{id}}" aria-expanded="true">
+		<button class="collapse-network" aria-label="Collapse" aria-controls="network-{{../uuid}}" aria-expanded="true">
 			<span class="collapse-network-icon"></span>
 		</button>
 		<div class="lobby-wrap">

client/views/network.tpl

@@ -1,6 +1,7 @@
 {{#each networks}}
 <section
 	class="network name-{{slugify name}} {{#if serverOptions.NETWORK}}network-{{slugify serverOptions.NETWORK}}{{/if}} {{#unless status.connected}}not-connected{{/unless}} {{#unless status.secure}}not-secure{{/unless}}"
+	id="network-{{uuid}}"
 	data-uuid="{{uuid}}"
 	data-nick="{{nick}}"
 	data-options="{{tojson serverOptions}}"