Merge branch 'master' into bug-43

cycle_routes.json

@@ -75,8 +75,7 @@
             "  {% for n in master.tags.network|split(';') %}",
             "    {% if n|matches('cn$') %}{% set masterNetwork = n %}{% endif %}",
             "  {% endfor %}",
-            "  <li data-object=\"{{ master.id }}\">",
-            "    <a>",
+            "  <li data-object=\"{{ master.id }}\"><a>",
             "    <div class='marker'>",
             "      <div class='symbol'>{{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}</div>",
             "    </div>",
@@ -84,7 +83,6 @@
             "      <div class='description'>{{ tagTrans('network', masterNetwork) }}</div>",
             "      <div class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}</div>",
             "    </div>",
-            "    </a>",
             "  </li>",
             "{% endfor %}",
             "</ul>"

hiking_routes.json

@@ -58,11 +58,15 @@
             "  {% for n in master.tags.network|split(';') %}",
             "    {% if n|matches('wn$') %}{% set masterNetwork = n %}{% endif %}",
             "  {% endfor %}",
-            "  <li data-object=\"{{ master.id }}\">",
-            "    <span class='markerParent'><div class='marker'>{{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}</div></span>",
-            "    <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% endif %}</span>",
-            "    <span class='description'>{{ tagTrans('network', masterNetwork) }}</span>",
-            "  </li>",
+            "  <li data-object=\"{{ master.id }}\"><a>",
+            "    <div class='marker'>",
+            "      <div class='symbol'>{{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}</div>",
+            "    </div>",
+            "    <div class='content'>",
+            "      <div class='description'>{{ tagTrans('network', masterNetwork) }}</div>",
+            "      <div class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% endif %}</div>",
+            "    </div>",
+            "  </a></li>",
             "{% endfor %}",
             "</ul>"
         ],