Changeset - 79ad6e6c998c
Parent rev.
Child rev.
[Not reviewed]
Merge version_5
0 5 0
Dennis Fink - 9 years ago 2015-10-16 20:13:47
dennis.fink@c3l.lu
Merged upstream
5 files changed with 25 insertions and 25 deletions:
ennstatus/templates/base.html
8
6
ennstatus/templates/root/about.html
1
1
ennstatus/templates/root/bridgeprogram.html
12
13
ennstatus/templates/root/index.html
2
3
ennstatus/templates/root/member.html
2
2
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
➞
Show inline comments
 
@@ -47,6 +47,7 @@
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ wiki_url }}/doku.php?id=news" target="blank">News</a></li>
 
            <li class="divider"></li>
 
            <li><a href="{{ url_for('root.about') }}">Organization</a></li>
 
            <li><a href="{{ url_for('root.partners') }}">Partners</a></li>
 
          </ul>
 
@@ -59,9 +60,11 @@
 
              <ul class="dropdown-menu">
 
                <li><a href="{{ url_for('status.index') }}">Ennstatus Panel</a></li>
 
              </ul>
 
            <li class="divider"></li>
 
            </li>
 
            <li><a href="{{ url_for('root.mirrors') }}">Mirrors</a></li>
 
            <li><a href="{{ wiki_url }}">Wiki</a></li>
 
            <li class="divider"></li>
 
            <li><a href="{{ url_for('root.disclaimer') }}">About Ennstatus</a></li>
 
          </ul>
 
        </li>
 
@@ -70,12 +73,10 @@
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ url_for('donate.index') }}">Donate</a></li>
 
            <li><a href="{{ url_for('donate.received') }}">Donation history</a></li>
 
            <li><a href="{{ url_for('root.member') }}">Join us</a></li>
 
            <li><a href="{{ url_for('root.bridgeprogram')}}">Adopt a Bridge</a></li>
 
            <li class="divider"></li>
 
            <li><a href="{{ url_for('root.member') }}">Join Us</a></li>
 
            <li class="dropdown-submenu">
 
              <a>Special programs</a>
 
              <ul class="dropdown-menu">
 
                <li><a href="{{ url_for('root.bridgeprogram')}}">Bridge program</a></li>
 
              </ul>
 
            </li>
 
          </ul>
 
        </li>
 
@@ -83,9 +84,10 @@
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contact <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ url_for('root.contact') }}">General</a></li>
 
            <li><a href="{{ url_for('root.abuse') }}">Abuse</a></li>
 
            <li class="divider"></li>
 
            <li><a href="https://twitter.com/FrennVunDerEnn" target="blank">Twitter</a></li>
 
            <li><a href="http://lists.enn.lu/listinfo/discuss" target="blank">Mailing List</a></li>
 
            <li><a href="{{ url_for('root.abuse') }}">Abuse</a></li>
 
          </ul>
 
        </li>
 
      </ul>
ennstatus/templates/root/about.html
➞
Show inline comments
 
@@ -9,7 +9,7 @@
 
      <h3>Who we are</h3>
 
      </div> -->
 

			




	
	
	
		
 
  <div class="col-md-offset-1 col-md-11">

			




	
	
	
		
 
  <div class="col-md-offset-1 col-md-10">

			




	
	
	
		
 
    <h2>Who we are</h2>

			




	
	
	
		
 
    <h3>Organization</h3>

			




	
	
	
		
 
    <p class="lead">

			




        

    


    
    

    

        

                

                    ennstatus/templates/root/bridgeprogram.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -5,23 +5,16 @@

			




	
	
	
		
 
{% set title = "Bridge Program" %}

			




	
	
	
		
 

			




	
	
	
		
 
{% block content %}

			




	
	
	
		
 
  <div class="col-md-offset-1 col-md-11">

			




	
	
	
		
 
  <div class="col-md-offset-1 col-md-10">

			




	
	
	
		
 
    <h2>Bridge Program</h2>

			




	
	
	
		
 
    <p class="lead">We are happy to announce our new partner program which allows you to support the Tor network by funding a Tor bridge.</p>

			




	
	
	
		
 
    <p> Rather than making a single donation which we would use to cover our expenses for our different projects and administrative charges, you can now fund a Tor bridge on your own.

			




	
	
	
		
 
    Bridges are an important element in the Tor network because they allow people to use the network even if the direct acces to its entry-nodes is blocked in their country. This is mainly the case for people living under oppressive regimes.</p>

			




	
	
	
		
 
    <p class="lead">Fight censorship! Our bridge program allows you to support the Tor network by adopting a Tor bridge.</p>

			




	
	
	
		
 
    <p> Rather than making a single donation, you can now fund a Tor bridge on your own. Bridges are an important element in the Tor network because they allow people to use the network even if the direct acces to its entry-nodes is blocked in their country. This is mainly the case for people living under oppressive regimes. <a href="https://www.torproject.org/docs/bridges" target="blank"><strong>Read more about Tor bridges</strong></a></p>

			




	
	
	
		
 
    <p>With a recurring contribution of 3 EUR/month (duration min. 12 months) you can help us keep such a bridge up and running. The servers for this project are located in Luxembourg.</p>

			




	
	
	
		
 
    <center>

			




	
	
	
		
 
      <img src="{{ url_for('static', filename='images/Tor_bridge_users.png') }}" alt="bridge users">

			




	
	
	
		
 
    </center>

			




	
	
	
		
 
    <h3>How to participate?</h3>

			




	
	
	
		
 
    <p>Interested? Our <a href="//wiki.enn.lu/doku.php?id=user:kahpa">bridge operator</a> will give you further information about the project.</p>

			




	
	
	
		
 
    <p><strong>Get in touch:</strong> <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:bridges@enn.lu">bridges@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?op=get&search=0x3F917F479C5D0F3B">0x9C5D0F3B</a> (DE, EN, LB, FR)</p>

			




	
	
	
		
 
    <h3>Interaction</h3>

			




	
	
	
		
 
    <p>As a partner in our project you can choose the nickname of your bridge and follow it on <a href="{{ url_for('status.index') }}">Ënnstatus</a>, our self-made information-panel.</p>

			




	
	
	
		
 
    <p>You want to know more about our work? Our staff is always happy to answer your questions, don't hestitate to <a href="{{ url_for('root.contact') }}">contact us.</a></p>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  <div class="col-md-offset-1 col-md-11">

			




	
	
	
		
 
  <div class="col-md-1">

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  <div class="col-md-offset-1 col-md-6">

			




	
	
	
		
 
    <h2>Apply for the bridge program</h2>

			




	
	
	
		
 
    <form method="post" class="form form-horizontal" role="form">

			




	
	
	
		
 
      {{ form.hidden_tag() }}

			




	
	
		
 
@@ -87,4 +80,10 @@

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </form>

			




	
	
	
		
 
  </div>

			




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

			




	
	
	
		
 
    <h3>More information</h3>

			




	
	
	
		
 
    <p>You want to know more about our work?</p>

			




	
	
	
		
 
    <p>Our <a href="//wiki.enn.lu/doku.php?id=user:kahpa">bridge operator</a> will give you further information about the project.</p>

			




	
	
	
		
 
    <p><strong>Get in touch:</strong> <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:bridges@enn.lu">bridges@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?op=get&search=0x3F917F479C5D0F3B">0x9C5D0F3B</a></p>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
{% endblock %}

			




        

    


    
    

    

        

                

                    ennstatus/templates/root/index.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,7 +2,7 @@

			




	
	
	
		
 

			




	
	
	
		
 
{% set title = "Index" %}

			




	
	
	
		
 

			




	
	
	
		
 
{% block styles %} 

			




	
	
	
		
 
{% block styles %}

			




	
	
	
		
 
  {{ super() }}

			




	
	
	
		
 
  <link rel="stylesheet" href="{{ url_for('static', filename='js/video.js/dist/video-js.min.css') }}">

			




	
	
	
		
 
{% endblock %}

			




	
	
		
 
@@ -33,7 +33,7 @@

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  <div class="col-md-3">

			




	
	
	
		
 
    <blockquote>

			




	
	
	
		
 
      <a href="https://martianhumorist.me/" target="blank"><h2 class="text-center">You have something to hide!</h2></a>

			




	
	
	
		
 
      <a href="https://martianhumorist.me/141015-2/" target="blank"><h2 class="text-center">You have something to hide!</h2></a>

			




	
	
	
		
 
      <footer>The Martian Humorist</footer>

			




	
	
	
		
 
    </blockquote>

			




	
	
	
		
 
  </div>

			




	
	
		
 
@@ -85,4 +85,3 @@

			




	
	
	
		
 
    videojs.options.flash.swf = "{{ url_for('static', filename='js/video.js/dist/video-js.swf') }}"

			




	
	
	
		
 
  </script>

			




	
	
	
		
 
{% endblock %}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    ennstatus/templates/root/member.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -42,11 +42,11 @@

			




	
	
	
		
 
          <td>Download the following <a href="{{ url_for('static', filename='files/MembershipForm.pdf') }}">membership form</a> and fill in the necessary information.</td>

			




	
	
	
		
 
        </tr>

			




	
	
	
		
 
        <tr>

			




	
	
	
		
 
          <td>The form will be automatically submitted. We encrypt your information with GnuPG.</td>

			




	
	
	
		
 
          <td>The form will be automatically submitted. We encrypt your data with GnuPG.</td>

			




	
	
	
		
 
          <td>Send the membership form to one of our <a href="{{ url_for('root.contact') }}">email or snailmail</a> addresses.</td>

			




	
	
	
		
 
        </tr>

			




	
	
	
		
 
        <tr>

			




	
	
	
		
 
          <td colspan="2">Pay your annually membership fee. Use one of the payment methods (except <a href="{{ url_for('donate.index') }}">Flattr</a> or <a href="{{ url_for('donate.index') }}">BPM Points</a>)

			




	
	
	
		
 
          <td colspan="2">Pay your annual membership fee. Use one of the payment methods (except <a href="{{ url_for('donate.index') }}">Flattr</a> or <a href="{{ url_for('donate.index') }}">BPM Points</a>)

			




	
	
	
		
 
              specified on our <a href="{{ url_for('donate.index') }}">donations</a> page. Try to include your username as a statement if possible!</td>

			




	
	
	
		
 
        </tr>

			




	
	
	
		
 
        <tr>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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