diff options
Diffstat (limited to 'allium/templates')
-rw-r--r-- | allium/templates/contact.html | 3 | ||||
-rw-r--r-- | allium/templates/misc-families.html | 2 | ||||
-rw-r--r-- | allium/templates/relay-info.html | 4 | ||||
-rw-r--r-- | allium/templates/relay-list.html | 12 |
4 files changed, 11 insertions, 10 deletions
diff --git a/allium/templates/contact.html b/allium/templates/contact.html index ed10631..d060a2d 100644 --- a/allium/templates/contact.html +++ b/allium/templates/contact.html @@ -1,10 +1,9 @@ {% extends "relay-list.html" %} +{% set contact_hash = relays.json['relay_subset'][0]['contact_md5'] %} {% if relays.json['relay_subset'][0]['contact'] %} {% set contact = relays.json['relay_subset'][0]['contact']|escape %} - {% set contact_hash = relays.json['relay_subset'][0]['contact']|hash %} {% else %} {% set contact = 'none' %} - {% set contact_hash = ''|hash %} {% endif %} {% block title %}Tor Relays :: Contact {{ contact_hash }}{% endblock %} {% block header %}<a href="../../">Home</a> :: Contact {{ contact_hash }}{% diff --git a/allium/templates/misc-families.html b/allium/templates/misc-families.html index dea08e3..12773c8 100644 --- a/allium/templates/misc-families.html +++ b/allium/templates/misc-families.html @@ -56,7 +56,7 @@ reverse=True) -%} {% if v['contact'] -%} <td class="visible-md visible-lg"><code><a href="{{ path_prefix }}contact/{{ -v['contact']|hash }}/" title="{{ v['contact']|escape }}">{{ +v['contact_md5'] }}/" title="{{ v['contact']|escape }}">{{ v['contact']|truncate(50)|escape }}<a></td></code> {% else -%} <td class="visible-md visible-lg">none</td> diff --git a/allium/templates/relay-info.html b/allium/templates/relay-info.html index d26dab3..f2aabe7 100644 --- a/allium/templates/relay-info.html +++ b/allium/templates/relay-info.html @@ -17,10 +17,10 @@ <dt>Contact</dt> {% if relay['contact'] -%} -<dd><a href="{{ path_prefix }}contact/{{ relay['contact']|hash }}">{{ +<dd><a href="{{ path_prefix }}contact/{{ relay['contact_md5'] }}">{{ relay['contact']|escape }}</a></dd> {% else -%} -<dd><a href="{{ path_prefix }}contact/{{ ''|hash }}">none</a></dd> +<dd><a href="{{ path_prefix }}contact/{{ relay['contact_md5'] }}">none</a></dd> {% endif -%} <dt>Dir Address</dt> diff --git a/allium/templates/relay-list.html b/allium/templates/relay-list.html index 8283c04..6698755 100644 --- a/allium/templates/relay-list.html +++ b/allium/templates/relay-list.html @@ -7,7 +7,7 @@ <tr> <th></th> <th>Nickname</th> -<th></th> +<th>Contact</th> <th>Bandwidth</th> <th class="visible-md visible-lg">IP Address</th> <th>AS Number</th> @@ -49,13 +49,15 @@ relay['fingerprint']|escape }}.html">{{ relay['nickname']|truncate(15)|escape {% if key != 'contact' -%} {% if relay['contact'] -%} -<td><a href="{{ path_prefix }}contact/{{ relay['contact']|hash }}/" title="{{ -relay['contact']|escape }}">✉</a></td> +<td><code><a href="{{ path_prefix }}contact/{{ relay['contact_md5'] }}/" +title="{{ relay['contact']|escape }}">{{ relay['contact_md5'][0:8] +}}</a></code></td> {% else -%} -<td title="none">✉</td> +<td title="none"><code>none</code></td> {% endif -%} {% else -%} -<td title="{{ relay['contact']|escape }}">✉</td> +<td title="{{ relay['contact']|escape }}"><code>{{ relay['contact_md5'][0:8] +}}</code></td> {% endif -%} <td>{{ obs_bandwidth }}</td> |