Changes on the nations server
This commit is contained in:
parent
d1a0c930eb
commit
53ae04404b
3 changed files with 41 additions and 5 deletions
|
@ -17,10 +17,20 @@ BASE_URL = 'http://localhost:8000'
|
|||
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
||||
|
||||
#DATABASES = {
|
||||
# 'default': {
|
||||
# 'ENGINE': 'django.db.backends.sqlite3',
|
||||
# 'NAME': 'publichealth-dev.sqlite3',
|
||||
# }
|
||||
#}
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.sqlite3',
|
||||
'NAME': 'publichealth-dev.sqlite3',
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
'NAME': 'publichealth',
|
||||
'CONN_MAX_AGE': 600, # number of seconds database connections should persist for
|
||||
|
||||
# User, host and port can be configured by the PGUSER, PGHOST and
|
||||
# PGPORT environment variables (these get picked up by libpq).
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -49,6 +49,7 @@
|
|||
html[lang='fr'] .site-ngo-allianz-ebk .navbar-brand {
|
||||
background-image: url('/static/org/NGO-Allianz_Logo-fr.jpg');
|
||||
}
|
||||
|
||||
// -site-ngo-allianz-ebk
|
||||
|
||||
// Custom styles for gesundheitsmanifest.ch
|
||||
|
@ -61,3 +62,18 @@ html[lang='fr'] .site-ngo-allianz-ebk .navbar-brand {
|
|||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
}
|
||||
|
||||
.site-dev-pro-salutech {
|
||||
.navbar-brand {
|
||||
width: 240px;
|
||||
height: 64px;
|
||||
background-size: contain !important;
|
||||
background-repeat: no-repeat;
|
||||
background-image: url('/static/images/pro-salute-logo.png');
|
||||
|
||||
font-size: 0px !important;
|
||||
img { display: none !important; }
|
||||
}
|
||||
#carousel-banner .carousel-caption { display: none; }
|
||||
}
|
||||
|
||||
|
|
|
@ -2,6 +2,9 @@
|
|||
{% get_site_root as site_root %}
|
||||
{% get_site as the_site %}
|
||||
|
||||
|
||||
<style>
|
||||
</style>
|
||||
<nav class="navbar-pre navbar-fixed-top">
|
||||
<div class="container">
|
||||
<div class="nav">
|
||||
|
@ -27,9 +30,16 @@
|
|||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="{% pageurl site_root %}">
|
||||
<img src="{% static 'images/public-health-logo-sign.png' %}" alt="[logo]">
|
||||
<span class="hidden-xs">{% contact_name the_site=the_site %}</span></a>
|
||||
|
||||
<a class="navbar-brand" href="{% pageurl site_root %}">
|
||||
|
||||
{% if the_site|default:""|truncatechars:"255" == "dev.pro-salute.ch"%}
|
||||
<img src="{% static 'images/pro-salute-logo.png' %}" alt="Pro Salute Logo">
|
||||
{% else %}
|
||||
<img src="{% static 'images/public-health-logo-sign.png' %}" alt="[logo]">
|
||||
{% endif %}
|
||||
|
||||
<span class="hidden-xs">{% contact_name the_site=the_site %}</span></a>
|
||||
</div>
|
||||
|
||||
{% block menu %}
|
||||
|
|
Loading…
Reference in a new issue