Changeset - 188b263413c2
[Not reviewed]
Merge dev
0 3 0
Dennis Fink - 8 years ago 2016-12-05 10:37:02
dennis.fink@c3l.lu
Merged hotfix-footer
3 files changed with 14 insertions and 13 deletions:
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
Show inline comments
 
@@ -131,18 +131,20 @@
 
  {% block content %}
 
  {% endblock %}
 
  </div>
 
  <footer class="col-md-12">
 
    <hr style="margin-bottom: 0.5%;">
 
    <div class="text-center clearfix">
 
      <div class="pull-left">
 
        <a href="https://twitter.com/FrennVunDerEnn" target="blank">@FrennVunDerEnn</a>
 
  <div class="row">
 
    <footer class="col-md-12">
 
      <hr style="margin-bottom: 0.5%;">
 
      <div class="text-center clearfix">
 
        <div class="pull-left">
 
          <a href="https://twitter.com/FrennVunDerEnn" target="blank">@FrennVunDerEnn</a>
 
        </div>
 
        <strong>Frënn vun der Enn a.s.b.l.</strong>  <em>(R.C.S. Luxembourg F 9.478)</em>
 
        <div class="pull-right">
 
          <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" target="blank">CC-BY-NC-SA</a>
 
        </div>
 
      </div>
 
      <strong>Frënn vun der Enn a.s.b.l.</strong>  <em>(R.C.S. Luxembourg F 9.478)</em>
 
      <div class="pull-right">
 
        <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" target="blank">CC-BY-NC-SA</a>
 
      </div>
 
    </div>
 
  </footer>
 
    </footer>
 
  </div>
 
</div>
 

	
 
{% block scripts %}
ennstatus/templates/root/membership.html
Show inline comments
 
@@ -80,7 +80,6 @@
 
        {{ form.submit(class_='btn btn-enn') }}
 
        </div>
 
      </div>
 
    </div>
 
    </form>
 
    <p>Field marked with * are required!</p>
 
    <p><sup>1</sup>: If you have decided to apply for the <i>double membership</i>, the membership fees are 150€/year for the regular
setup.py
Show inline comments
 
@@ -11,7 +11,7 @@ def _get_requirements():
 

	
 

	
 
setup(name='Ennstatus',
 
      version='5.5.0',
 
      version='5.6.2',
 
      description=('Ennstatus provides the user with vital information about '
 
                   'the status of the organizations Tor servers.'),
 
      author='Frënn vun der Ënn',
0 comments (0 inline, 0 general)