diff --git a/djnro/local_settings.py.dist b/djnro/local_settings.py.dist index 316f48248c8fa3d16db0486afdc6acfcb136d33e..103514938e6431d0138f24097f1ce1e046c8cc05 100644 --- a/djnro/local_settings.py.dist +++ b/djnro/local_settings.py.dist @@ -122,8 +122,8 @@ NRO_DOMAIN_MAIN_URL = "http://www.example.com" NRO_PROV_BY_DICT = {"name": "EXAMPLE NRO TEAM", "url": "http://noc.example.com"} # social media contact (Use: // to preserve https) NRO_PROV_SOCIAL_MEDIA_CONTACT = [ - {"url": "//facebook.com/example.com", "icon":"/static/img/facebook_img.png", "name":"Facebook"}, - {"url": "//twitter.com/example_com", "icon":"/static/img/twitter_img.png", "name":"Twitter"}, + {"url": "//facebook.com/example.com", "fa_style":"fa-facebook", "name":"Facebook"}, + {"url": "//twitter.com/example_com", "fa_style":"fa-twitter", "name":"Twitter"}, ] # Helpdesk, used in base.html: diff --git a/djnro/templates/partial/footer.html b/djnro/templates/partial/footer.html index 985d76c2eb0ded6de841c25efd28d1fcb3ec2b65..b52a554461321b074cab95185601b9709b74fd0e 100644 --- a/djnro/templates/partial/footer.html +++ b/djnro/templates/partial/footer.html @@ -1,5 +1,6 @@ {% load i18n %} {% load template_maybe %} +{% load staticfiles %} <footer class="stickyfooter"> <div> @@ -7,13 +8,22 @@ {% if user.is_authenticated %} {% trans "If you have any questions or need help, contact" %} {{ BRANDING.helpdesk.name }} (<a href="{{ BRANDING.helpdesk.uri}}">{{BRANDING.helpdesk.uri}}</a>) - {{BRANDING.helpdesk.phone}}</br> {% endif %} - {% trans "This is a service provided by" %} <a href="{{ BRANDING.service_provided_by.url}}" target="_blank">{{BRANDING.service_provided_by.name}}</a> + {% trans "This is a service provided by" %} <a href="{{ BRANDING.service_provider.url}}" target="_blank">{{BRANDING.service_provider.name}}</a> {% for media in BRANDING.social_media %} <a href="{{media.url}}" target="_blank"> - <i class="{{media.icon}}"></i> + {% if media.local_image %} + <img src="{% static media.local_image %}" style="padding: 0px;"> + {% comment "backwards compatibility: local_image == icon" %}{% endcomment %} + {% elif media.icon %} + <img src="{% static media.icon %}" style="padding: 0px;"> + {% elif media.image_url %} + <img src="{{ media.image_url }}" style="padding: 0px;"> + {% elif media.fa_style %} + <i class="fa {{ media.fa_style }}"></i> + {% endif %} </a> {% endfor %} - Powered by <a href="http://djnro.grnet.gr/" target="_blank">DjNRO</a> v{{VERSION}} + <br>Powered by <a href="http://djnro.grnet.gr/" target="_blank">DjNRO</a> v{{VERSION}} {% if "partial/extra.footer.html"|template_exists %} <div class=""> {% include_maybe "partial/extra.footer.html" %} diff --git a/edumanage/context_processors.py b/edumanage/context_processors.py index 14994012a8caab354e171eb7b5dc2e9996a25e64..389a4a62793b88065e073c62f8b56b8e6310c30a 100644 --- a/edumanage/context_processors.py +++ b/edumanage/context_processors.py @@ -7,10 +7,12 @@ def country_code(context): 'COUNTRY_NAME': settings.NRO_COUNTRY_NAME, 'COUNTRY_CODE': settings.NRO_COUNTRY_CODE, 'DOMAIN_MAIN_URL': settings.NRO_DOMAIN_MAIN_URL, - 'DOMAIN_HELPDESK_DICT': settings.NRO_DOMAIN_HELPDESK_DICT, + 'BRANDING': { + 'helpdesk': settings.NRO_DOMAIN_HELPDESK_DICT, + 'social_media': settings.NRO_PROV_SOCIAL_MEDIA_CONTACT, + 'service_provider': settings.NRO_PROV_BY_DICT, + }, 'MAP_CENTER': settings.MAP_CENTER, - 'PROV_TEAM': settings.NRO_PROV_BY_DICT, - 'SOCIAL_MEDIA_LIST': settings.NRO_PROV_SOCIAL_MEDIA_CONTACT, 'VERSION': settings.SW_VERSION }