diff --git a/config.py b/config.py index 6352b8356..15395fcb4 100644 --- a/config.py +++ b/config.py @@ -90,11 +90,7 @@ class DefaultConfig(ImmutableConfig): REGISTRY_TITLE = 'Red Hat Quay' REGISTRY_TITLE_SHORT = 'Red Hat Quay' - CONTACT_INFO = [ - 'mailto:support@quay.io', - 'tel:+1-888-GO-REDHAT', - 'https://twitter.com/quayio', - ] + CONTACT_INFO = [] # Mail config MAIL_SERVER = '' diff --git a/endpoints/common.py b/endpoints/common.py index c00783023..4209fb76e 100644 --- a/endpoints/common.py +++ b/endpoints/common.py @@ -108,6 +108,7 @@ def render_page_template(name, route_data=None, **kwargs): return oauth_config + has_contact = len(app.config.get('CONTACT_INFO', [])) > 0 contact_href = None if len(app.config.get('CONTACT_INFO', [])) == 1: contact_href = app.config['CONTACT_INFO'][0] @@ -140,6 +141,7 @@ def render_page_template(name, route_data=None, **kwargs): aci_conversion=features.ACI_CONVERSION, has_billing=features.BILLING, contact_href=contact_href, + has_contact=has_contact, hostname=app.config['SERVER_HOSTNAME'], preferred_scheme=app.config['PREFERRED_URL_SCHEME'], version_number=version_number, diff --git a/templates/base.html b/templates/base.html index 006104787..45b895d28 100644 --- a/templates/base.html +++ b/templates/base.html @@ -152,7 +152,9 @@ mixpanel.init("{{ mixpanel_key }}", { track_pageview : false, debug: {{ is_debug
  • Privacy
  • Security
  • About
  • + {% if has_contact %}
  • Contact
  • + {% endif %}
  • diff --git a/util/config/schema.py b/util/config/schema.py index bd800048a..8b6937aa7 100644 --- a/util/config/schema.py +++ b/util/config/schema.py @@ -142,7 +142,6 @@ CONFIG_SCHEMA = { }, 'CONTACT_INFO': { 'type': 'array', - 'minItems': 1, 'uniqueItems': True, 'description': 'If specified, contact information to display on the contact page. ' + 'If only a single piece of contact information is specified, the contact footer will link directly.',