# HG changeset patch # User souliane # Date 1432745776 -7200 # Node ID a14845624e01bfe2a5122821cf48df47619846cb # Parent d6bf5414c6c4870248a77421d6d1fd55b0a6f6de display a banner on top of all pages (but adhesion, adhesion_form and thank_you) to encourage people joining the association diff -r d6bf5414c6c4 -r a14845624e01 sat_website/local_settings.py --- a/sat_website/local_settings.py Wed May 27 14:50:51 2015 +0200 +++ b/sat_website/local_settings.py Wed May 27 18:56:16 2015 +0200 @@ -146,10 +146,3 @@ ASSO_URL_STATUTES = 'http://repos.goffi.org/sat_docs/raw-file/tip/association/statuts.pdf' ASSO_URL_RULES = 'http://repos.goffi.org/sat_docs/raw-file/tip/association/r%C3%A8glement%20int%C3%A9rieur.pdf' -# Import another settings file that can override these settings (for example to daily update the stats when you don't want a script to directly modify this file) -from sys import path -path.append('/home/souliane') -try: - from sat_website_external_settings import * -except ImportError: - pass diff -r d6bf5414c6c4 -r a14845624e01 sat_website/views.py --- a/sat_website/views.py Wed May 27 14:50:51 2015 +0200 +++ b/sat_website/views.py Wed May 27 18:56:16 2015 +0200 @@ -74,6 +74,7 @@ }) context.update(csrf(request)) + context.update(utils.get_asso_finance_status()) if not category or category == "overview": context.update(utils.get_asso_finance_status()) @@ -86,7 +87,6 @@ elif category == "downloads": context["projects_infos"] = utils.get_projects_infos(PROJECTS_INFOS) elif category in ("association", "adhesion"): - context.update(utils.get_asso_finance_status()) context.update(utils.get_asso_urls()) elif category == "adhesion_form": if request.method == 'POST': diff -r d6bf5414c6c4 -r a14845624e01 static/css/sat_website.css --- a/static/css/sat_website.css Wed May 27 14:50:51 2015 +0200 +++ b/static/css/sat_website.css Wed May 27 18:56:16 2015 +0200 @@ -19,9 +19,8 @@ /* Overriding Bootstrap styles */ - body { - padding-top: 70px; + padding-top: 50px; padding-bottom: 30px; } @@ -84,6 +83,26 @@ color: #bbb; } +/* prevent collapsing to overlap the body when the navbar is fixed to top */ +@media (max-width: 991px) { + .navbar-header { + float: none; + } + .navbar-toggle { + display: block; + } + .navbar-collapse.collapse { + display: none !important; + } + .navbar-collapse.collapse.in { + display: block !important; + } + .collapsing { + overflow: hidden !important; + } +} + + /* sat_website own styles */ @@ -215,4 +234,15 @@ .presstitle { font-style: italic; +} + +.banner { + border-radius: 0px; + border-left: 0px; + border-right: 0px; + min-height: 20px; +} + +.banner a { + float: right; } \ No newline at end of file diff -r d6bf5414c6c4 -r a14845624e01 templates/sat_website/adhesion.html --- a/templates/sat_website/adhesion.html Wed May 27 14:50:51 2015 +0200 +++ b/templates/sat_website/adhesion.html Wed May 27 18:56:16 2015 +0200 @@ -51,6 +51,7 @@ Which makes, with an average annual contribution of 10 € per subscription, {{ asso_members_target }} members before December, 31st 2015! {% endblocktrans %}

+ {% include "sat_website/finance.html" with obj="members" %} {% include "sat_website/finance.html" %}

{% trans "The membership lasts exactly one year and isn't automatically renewed: you have to renew it yourself and you can change the amount of your subscription every year." %}

diff -r d6bf5414c6c4 -r a14845624e01 templates/sat_website/base.html --- a/templates/sat_website/base.html Wed May 27 14:50:51 2015 +0200 +++ b/templates/sat_website/base.html Wed May 27 18:56:16 2015 +0200 @@ -35,6 +35,21 @@ {% block title %}{% trans "Salut à Toi: the multi frontend, multipurpose communication tool" %}{% endblock %} + {% if category != "adhesion" and category != "adhesion_form" and category != "thank_you" %} +

+ {% else %} + + {% endif %}