Changeset - 365524643d78
[Not reviewed]
default
0 2 0
Dennis Fink - 10 years ago 2014-12-13 14:20:09
dennis.fink@c3l.lu
Added onion addresses for wiki and globe
2 files changed with 16 insertions and 3 deletions:
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
Show inline comments
 
@@ -24,25 +24,29 @@
 
  <div class="navbar navbar-default">
 
    <div class="navbar-header">
 
      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
 
        <span class="icon-bar"></span>
 
        <span class="icon-bar"></span>
 
        <span class="icon-bar"></span>
 
      </button>
 
      <a class="navbar-brand" href="{{ url_for('root.index') }}">Enn.lu</a>
 
    </div>
 
    <div class="navbar-collapse collapse">
 
      <ul class="nav navbar-nav navbar-left">
 
        <li>
 
          <a href="http://wiki.enn.lu/doku.php?id=news">News</a>
 
          {% if '.onion' in request.url_root %}
 
            <a href="qzz2cvotstk357oj.onion/doku.php?id=news">News</a>
 
          {% else %}
 
            <a href="http://wiki.enn.lu/doku.php?id=news">News</a>
 
          {% endif %}
 
        </li>
 
        <li>
 
          <a href="{{ url_for('root.about') }}">About</a>
 
        </li>
 
        <li>
 
          <a href="{{ url_for('root.services') }}">Services</a>
 
        </li>
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Donate <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ url_for('donate.index') }}">Support us</a></li>
 
            <li><a href="{{ url_for('donate.wiretransfer') }}">Wiretransfer</a></li>
 
@@ -60,25 +64,29 @@
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ url_for('root.partners') }}">Official Partners</a></li>
 
            <li><a href="{{ url_for('root.bridgeprogram') }}">Bridge Program</a></li>
 
          </ul>
 
        </li>
 
        <li>
 
          <a href="{{ url_for('root.contact') }}">Contact</a>
 
        </li>
 
        <li>
 
          <a href="{{ url_for('root.abuse') }}">Abuse</a>
 
        </li>
 
        <li>
 
          <a href="http://wiki.enn.lu">Wiki</a>
 
          {% if '.onion' in request.url_root %}
 
            <a href="qzz2cvotstk357oj.onion">Wiki</a>
 
          {% else %}
 
            <a href="http://wiki.enn.lu">Wiki</a>
 
          {% endif %}
 
        </li>
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Servers <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ url_for('status.index') }}">All nodes</a></li>
 
            <li><a href="{{ url_for('status.exit') }}">Exit nodes</a></li>
 
            <li><a href="{{ url_for('status.relay') }}">Relay nodes</a></li>
 
            <li><a href="{{ url_for('status.bridge') }}">Bridge nodes</a></li>
 
            <li class="divider"></li>
 
            <li><a href="{{ url_for('status.about') }}">Ënnstatus About</a></li>
 
          </ul>
 
        </li>
ennstatus/templates/status/macros.html
Show inline comments
 
@@ -20,25 +20,30 @@
 

	
 
{% macro create_country(country) %}
 
  {% set country_class = "flag-" + country|lower|replace(' ', '-') %}
 
  <i class={{ country_class }}></i> {{ country|title }}
 
{% endmacro %}
 

	
 
{% macro create_fingerprint(fingerprint, server_type) %}
 
  {% if server_type in ('Exit', 'Relay') %}
 
    {% set url_type = 'relay' %}
 
  {% else %}
 
    {% set url_type = 'bridge' %}
 
  {% endif %}
 
  <a href="http://globe.enn.lu/#/{{ url_type }}/{{ fingerprint }}">{{ fingerprint|upper}}</a>
 
  {% if '.onion' in request.url_root %}
 
    {% set url_root = 'ji3yb2tncy6naj7b.onion' %}
 
  {% else %}
 
    {% set url_root = 'http://globe.enn.lu' %}
 
  {% endif %}
 
  <a href="{{ url_root }}/#/{{ url_type }}/{{ fingerprint }}">{{ fingerprint|upper}}</a>
 
{% endmacro %}
 

	
 
{% macro create_name(name) %}
 
  <a href="http://{{ name|lower }}.enn.lu">{{ name }}</a>
 
{% endmacro %}
 

	
 
{% macro create_server_table(server_type, servers) %}
 
  {% if server_type in ('Exit', 'Relay') %}
 
    {% set headers = ('#', 'Name', 'IP', 'IP6', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)') %}
 
  {% else %}
 
    {% set headers = ('#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'FTEProxy', 'Flashproxy', 'meek', 'Last Updated (UTC)') %}
 
  {% endif %}
0 comments (0 inline, 0 general)