Merge pull request #4465 from geoadmin/data-BGDIDIC-1408-skitouren-sc…

…hneeschuhrouten

BGDIDIC-1408: improved tooltip skitouren

chsdi/templates/htmlpopup/karto_schneerouten.mako

@@ -6,13 +6,15 @@
     name = 'name_%s' % lang
     difficulty = 'difficulty_%s' % lang
     url_sac = 'url_sac_%s' % lang
+    ascent_time_label = '%s, ' % c['attributes']['ascent_time_label'] if c['attributes']['ascent_time_label'] else ''
+    target_altitude = ' (%s m) ' % c['attributes']['target_altitude'] if c['attributes']['target_altitude'] else ''
 %>
     % if c['attributes']['target_name']:
         <% c['stable_id'] = True %>
-        <tr><td class="cell-left">${_('ch.swisstopo-karto.skitouren.summit')}</td>           <td>${c['attributes']['target_name'] or '-'} (${c['attributes']['target_altitude'] or '-'} m)</td></tr>
+        <tr><td class="cell-left">${_('ch.swisstopo-karto.skitouren.summit')}</td>           <td>${c['attributes']['target_name'] or '-'}${target_altitude}</td></tr>
         <tr><td class="cell-left">${_('ch.swisstopo-karto.skitouren.name')}</td>             <td>${c['attributes'][name] or c['attributes']['name'] or '-'}</td></tr>
         <tr><td class="cell-left">${_('ch.swisstopo-karto.skitouren.difficulty')}</td>       <td>${c['attributes'][difficulty] or '-'}</td></tr>
-        <tr><td class="cell-left">${_('ch.swisstopo-karto.skitouren.ascent')}</td>           <td>${c['attributes']['ascent_time_label'] or '-'}, ${c['attributes']['ascent_altitude'] or '-'} Hm</td></tr>
+        <tr><td class="cell-left">${_('ch.swisstopo-karto.skitouren.ascent')}</td>           <td>${ascent_time_label}${c['attributes']['ascent_altitude'] or '-'} Hm</td></tr>
         <tr><td class="cell-left">${_('ch.swisstopo-karto.skitouren.descent')}</td>          <td>${c['attributes']['descent_altitude'] or '-'} Hm</td></tr>
         % if c['attributes'][url_sac]:
             <tr><td class="cell-left">${_('ch.swisstopo-karto.skitouren.info')}</td>         <td><a target="_blank" href="${c['attributes'][url_sac]}">${_('ch.swisstopo-karto.skitouren.sac')}</a></td></tr>