Changeset - 286ed44ec59c
Parent rev.
Child rev.
[Not reviewed]
version_5
0 4 0
Dennis Fink - 9 years ago 2015-10-13 22:39:33
dennis.fink@c3l.lu
Fix hidden services url generation
4 files changed with 19 insertions and 23 deletions:
ennstatus/templates/base.html
10
2
ennstatus/templates/macros.html
10
ennstatus/templates/root/abuse.html
1
1
ennstatus/templates/root/mirrors.html
8
10
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
➞
Show inline comments
 
@@ -2,6 +2,14 @@
 

			




	
	
	
		
 
{% import 'macros.html' as base_macros with context %}

			




	
	
	
		
 

			




	
	
	
		
 
{% if '.onion' in request.url_root %}

			




	
	
	
		
 
  {% set wiki_url = config['ENNSTATUS_WIKI_ONION_ADDRESS'] %}

			




	
	
	
		
 
{% elif '.bit' in request.url_root %}

			




	
	
	
		
 
  {% set wiki_url = config['ENNSTATUS_WIKI_BIT_ADDRESS'] %}

			




	
	
	
		
 
{% else %}

			




	
	
	
		
 
  {% set wiki_url = "//wiki.enn.lu" %}

			




	
	
	
		
 
{% endif %}

			




	
	
	
		
 

			




	
	
	
		
 
{% block title %}

			




	
	
	
		
 
  Frënn vun der Ënn - {{ title }}

			




	
	
	
		
 
{% endblock %}

			




	
	
		
 
@@ -38,7 +46,7 @@

			




	
	
	
		
 
        <li class="dropdown">

			




	
	
	
		
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>

			




	
	
	
		
 
          <ul class="dropdown-menu">

			




	
	
	
		
 
            <li><a href="https://wiki.enn.lu/doku.php?id=news" target="blank">News</a></li>

			




	
	
	
		
 
            <li><a href="{{ wiki_url }}/doku.php?id=news" target="blank">News</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.about') }}">Organization</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.partners') }}">Partners</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
		
 
@@ -53,7 +61,7 @@

			




	
	
	
		
 
              </ul>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.mirrors') }}">Mirrors</a></li>

			




	
	
	
		
 
            <li><a href="{{ base_macros.get_wiki_address() }}">Wiki</a></li>

			




	
	
	
		
 
            <li><a href="{{ wiki_url }}">Wiki</a></li>

			




	
	
	
		
 
            <li><a href="{{ url_for('root.disclaimer') }}">About Ennstatus</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




        

    


    
    

    

        

                

                    ennstatus/templates/macros.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,13 +16,3 @@

			




	
	
	
		
 
    {{ message }}

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro get_wiki_address() %}

			




	
	
	
		
 
  {% if '.onion' in request.url_root %}

			




	
	
	
		
 
    {{ config['ENNSTATUS_WIKI_ONION_ADDRESS'] }}

			




	
	
	
		
 
  {% elif '.bit' in request.url_root %}

			




	
	
	
		
 
    {{ config['ENNSTATUS_WIKI_BIT_ADDRESS'] }}

			




	
	
	
		
 
  {% else %}

			




	
	
	
		
 
    //wiki.enn.lu

			




	
	
	
		
 
  {% endif %}

			




	
	
	
		
 
{% endmacro %}

			




        

    


    
    

    

        

                

                    ennstatus/templates/root/abuse.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,7 +19,7 @@

			




	
	
	
		
 
      <li>your contact information</li>

			




	
	
	
		
 
    </ul><br>

			




	
	
	
		
 
    <p>

			




	
	
	
		
 
      For transparency reasons we publish monthly <a href="https://wiki.enn.lu/doku.php?id=abuse_statistics" target="blank"><strong>abuse mail statistics</strong></a>.

			




	
	
	
		
 
    For transparency reasons we publish monthly <a href="{{ wiki_url }}/doku.php?id=abuse_statistics" target="blank"><strong>abuse mail statistics</strong></a>.

			




	
	
	
		
 
    </p>

			




	
	
	
		
 
    <h3>Abuse contact</h3>

			




	
	
	
		
 
    <address>

			




        

    


    
    

    

        

                

                    ennstatus/templates/root/mirrors.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,15 +2,13 @@

			




	
	
	
		
 

			




	
	
	
		
 
{% set title = "Partners" %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro get_globe_address() %}

			




	
	
	
		
 
  {% if '.onion' in request.url_root %}

			




	
	
	
		
 
    {{ config['ENNSTATUS_GLOBE_ONION_ADDRESS'] }}

			




	
	
	
		
 
  {% elif '.bit' in request.url_root %}

			




	
	
	
		
 
    {{ config['ENNSTATUS_GLOBE_BIT_ADDRESS'] }}

			




	
	
	
		
 
  {% else %}

			




	
	
	
		
 
    //globe.enn.lu

			




	
	
	
		
 
  {% endif %}

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 
{% if '.onion' in request.url_root %}

			




	
	
	
		
 
  {% set globe_url = config['ENNSTATUS_GLOBE_ONION_ADDRESS'] %}

			




	
	
	
		
 
{% elif '.bit' in request.url_root %}

			




	
	
	
		
 
  {% set globe_url = config['ENNSTATUS_GLOBE_BIT_ADDRESS'] %}

			




	
	
	
		
 
{% else %}

			




	
	
	
		
 
  {% set globe_url = "//globe.enn.lu" %}

			




	
	
	
		
 
{% endif %}

			




	
	
	
		
 

			




	
	
	
		
 
{% block content %}

			




	
	
	
		
 
  <div class="col-md-4 text-center">

			




	
	
		
 
@@ -27,7 +25,7 @@

			




	
	
	
		
 
      <dt><a href="http://tails.c3l.lu/" target="_blank">tails.enn.lu</a></dt>

			




	
	
	
		
 
      <dd>A Tails Download mirror. Tails is a live operating system, that you can start on almost any computer from a DVD, USB stick, or SD card. It aims at preserving your privacy and anonymity. <a href="https://tails.boum.org/" target="blank">Learn more about Tails</a></dd>

			




	
	
	
		
 
      <br>

			




	
	
	
		
 
      <dt><a href="{{ get_globe_address() }}" target="_blank">globe.enn.lu</a></dt>

			




	
	
	
		
 
      <dt><a href="{{ globe_url }}" target="_blank">globe.enn.lu</a></dt>

			




	
	
	
		
 
      <dd>Globe is a Tor relay and bridge explorer.</dd>

			




	
	
	
		
 
    </dl>

			




	
	
	
		
 
  </div>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: saturn-1509822
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support