Commit 4e19e944 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou

Merge branch 'feature-ui-footer-extra-message' into hotfix-0.14.6

parents 39e47e6f 771871b9
{% block footer_content %}
{% if BRANDING_FOOTER_EXTRA_MESSAGE %}
<div class="extra-msg">{{ BRANDING_FOOTER_EXTRA_MESSAGE|safe }}</div>
{% endif %}
<p class="termslink" style="float:right"><a href="{% url latest_terms %}">Terms of service</a></p>
{% if BRANDING_SHOW_COPYRIGHT%}
......
......@@ -32,7 +32,7 @@
#Logo used in Storage pages (Pithos)
#BRANDING_STORAGE_LOGO_URL = '<path_to_image_folder>/storage_logo.png'
## Copyright options
## Copyright and footer options
######################
# If True, Copyright message will appear at the footer of the Compute and
......@@ -41,3 +41,7 @@
# Defaults to 'Copyright (c) 2011-<current_year> GRNET.'
#BRANDING_COPYRIGHT_MESSAGE = 'Copyright (c) 2011-<current_year> GRNET S.A.'
# Footer message appears above Copyright message at the Compute templates
# and the Dashboard UI. Accepts html tags
#BRANDING_FOOTER_EXTRA_MESSAGE = ''
......@@ -6,47 +6,50 @@ import datetime
######################
SERVICE_NAME = getattr(settings, 'BRANDING_SERVICE_NAME', 'Synnefo')
SERVICE_URL = getattr(settings, 'BRANDING_SERVICE_URL',
'http://www.synnefo.org/')
SERVICE_URL = getattr(settings, 'BRANDING_SERVICE_URL',
'http://www.synnefo.org/')
COMPANY_NAME = getattr(settings, 'BRANDING_COMPANY_NAME', 'GRNET')
COMPANY_URL = getattr(settings, 'BRANDING_COMPANY_URL',
'https://www.grnet.gr/en/')
COMPANY_URL = getattr(settings, 'BRANDING_COMPANY_URL',
'https://www.grnet.gr/en/')
## Images
######################
# The default path to the folder that contains all branding images
IMAGE_MEDIA_URL = getattr(settings, 'BRANDING_IMAGE_MEDIA_URL',
settings.MEDIA_URL+'branding/images/')
IMAGE_MEDIA_URL = getattr(settings, 'BRANDING_IMAGE_MEDIA_URL',
settings.MEDIA_URL+'branding/images/')
# The service favicon
# The service favicon
FAVICON_URL = getattr(settings, 'BRANDING_FAVICON_URL',
IMAGE_MEDIA_URL+'favicon.ico')
IMAGE_MEDIA_URL+'favicon.ico')
# Logo used in Dashboard pages (Astakos)
DASHBOARD_LOGO_URL = getattr(settings, 'BRANDING_DASHBOARD_LOGO_URL',
IMAGE_MEDIA_URL+'dashboard_logo.png')
DASHBOARD_LOGO_URL = getattr(settings, 'BRANDING_DASHBOARD_LOGO_URL',
IMAGE_MEDIA_URL+'dashboard_logo.png')
# Logo used in Compute pages (Cyclades)
COMPUTE_LOGO_URL = getattr(settings, 'BRANDING_COMPUTE_LOGO_URL',
IMAGE_MEDIA_URL+'compute_logo.png')
IMAGE_MEDIA_URL+'compute_logo.png')
# Logo used in Console page for VM (Cyclades)
CONSOLE_LOGO_URL = getattr(settings, 'BRANDING_CONSOLE_LOGO_URL',
IMAGE_MEDIA_URL+'console_logo.png')
IMAGE_MEDIA_URL+'console_logo.png')
# Logo used in Storage pages (Pithos)
STORAGE_LOGO_URL = getattr(settings, 'BRANDING_STORAGE_LOGO_URL',
IMAGE_MEDIA_URL+'storage_logo.png')
IMAGE_MEDIA_URL+'storage_logo.png')
## Copyright options
## Copyright and footer options
######################
# If True, Copyright message will appear at the footer of the Compute and
# Dashboard UI
SHOW_COPYRIGHT = getattr(settings, 'BRANDING_SHOW_COPYRIGHT', False)
# If True, Copyright message will appear at the footer of the Compute and
# Dashboard UI
SHOW_COPYRIGHT = getattr(settings, 'BRANDING_SHOW_COPYRIGHT', True)
copyright_period_default = '2011-%s' % (datetime.datetime.now().year)
copyright_message_default = 'Copyright (c) %s %s' % (copyright_period_default,
COMPANY_NAME)
copyright_message_default = 'Copyright (c) %s %s' % (copyright_period_default,
COMPANY_NAME)
# Defaults to Copyright (c) 2011-<current_year> GRNET.
COPYRIGHT_MESSAGE = getattr(settings, 'BRANDING_COPYRIGHT_MESSAGE',
copyright_message_default)
COPYRIGHT_MESSAGE = getattr(settings, 'BRANDING_COPYRIGHT_MESSAGE',
copyright_message_default)
SYNNEFO_VERSION = get_component_version('common')
# Footer message appears above Copyright message at the Compute templates
# and the Dashboard UI. Accepts html tags
FOOTER_EXTRA_MESSAGE = getattr(settings, 'BRANDING_FOOTER_EXTRA_MESSAGE', '')
......@@ -2,10 +2,14 @@
<div id="footer-container">
<div id='footer'>
<div id='footer-text'>
{% if BRANDING_FOOTER_EXTRA_MESSAGE %}
<div class="extra-msg">{{ BRANDING_FOOTER_EXTRA_MESSAGE|safe }}</div>
{% endif %}
{% if BRANDING_SHOW_COPYRIGHT %}
<div class='grnet-sign'><a href="{{ BRANDING_COMPANY_URL }}" target="_blank" title="{{ BRANDING_COMPANY_NAME }}">{{ BRANDING_COPYRIGHT_MESSAGE }}</a></div>
{% endif %}
</div>
<div id="footer-bg">
</div>
<div class="software">Powered by <a href="http://www.synnefo.org/">Synnefo</a> <span class="version">v{{ BRANDING_SYNNEFO_VERSION }}</span></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment