Commit 18daf50a authored by safts's avatar safts

Merge branch 'master' of https://github.com/grnet/djnro

parents a0c6810a e5af629f
......@@ -5,7 +5,7 @@
<head>
<title>{% block title %}eduroam | {{COUNTRY_CODE}}{% endblock %} : {% block currentpagetitle %}{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta id="viewport" name="viewport" content ="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<link REL="shortcut icon" HREF="{% static 'img/favicon.ico' %}">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% static 'img/edu144-icon.png' %}">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% static 'img/edu114-icon.png' %}">
......
......@@ -40,6 +40,6 @@
{% endblock %}
{% block extrajs %}
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.exp&sensor=true&language=en&libraries=places"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.exp&language=en&libraries=places"></script>
<script type="text/javascript" src="{% static 'js/geolocate.js' %}"></script>
{% endblock %}
{% load i18n %}
<footer {% if user.is_authenticated %}class="auth"{% endif %}>
<div class="container">
{% if user.is_authenticated %}
{% trans "If you have any questions or need help, contact" %} {{DOMAIN_HELPDESK_DICT.name}} (<a href="{{DOMAIN_HELPDESK_DICT.uri}}">{{DOMAIN_HELPDESK_DICT.uri}}</a>) - {{DOMAIN_HELPDESK_DICT.phone}}</br>
{% endif %}
{% trans "This is a service provided by" %} <a href="{{PROV_TEAM.url}}" target="_blank">{{PROV_TEAM.name}}</a>
{% for media in SOCIAL_MEDIA_LIST %}
<a href="{{media.url}}" target="_blank">
<i class="{{media.icon}}"></i>
</a>
{% endfor %}
Powered by <a href="http://djnro.grnet.gr/" target="_blank">DjNRO</a> v{{VERSION}}
<div class="">
<div class="container">
{% 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>
{% for media in BRANDING.social_media %}
<a href="{{media.url}}" target="_blank">
<i class="{{media.icon}}"></i>
</a>
{% endfor %}
Powered by <a href="http://djnro.grnet.gr/" target="_blank">DjNRO</a> v{{VERSION}}
<div class="">
{% include 'partial/bottom_iframe.html' %}
</div>
</div>
</div>
</footer>
......@@ -95,6 +95,7 @@ NRO specific parameters. These affect HTML templates::
#Helpdesk, used in base.html:
NRO_DOMAIN_HELPDESK_DICT = {"name": _("Domain Helpdesk"), 'email':'helpdesk@example.com', 'phone': '12324567890', 'uri': 'helpdesk.example.com'}
Set the Realm country for REALM model::
#Countries for Realm model:
......@@ -102,6 +103,12 @@ Set the Realm country for REALM model::
('country_2letters', 'Country' ),
)
### Adding iframe in footer
In case you need to add an iframe with banners at the bottom of the every page, you can paste your iframe code at bottom_iframe template under 'djnro/templates/partial/bottom_iframe.html'
Attribute map to match your AAI policy and SSO software (typically Shibboleth SP)::
#Shibboleth attribute map
......
......@@ -44,9 +44,9 @@ class Command(BaseCommand):
else:
write = lambda *args: None
self.parse_and_create(args[0])
self.parse_and_create(args[0], write)
def parse_and_create(self, instxmlfile):
def parse_and_create(self, instxmlfile, write):
doc = ElementTree.parse(instxmlfile)
realmid = Realm.objects.get(pk=1)
root = doc.getroot()
......@@ -122,7 +122,7 @@ class Command(BaseCommand):
address_city=city,
number_id=1
)
print instcontactslist
write('Institution contact list: %s\n' % instcontactslist)
instdets_obj.save()
instdets_obj.contact = instcontactslist
instdets_obj.save()
......@@ -246,6 +246,6 @@ class Command(BaseCommand):
)
t.save()
except Exception as e:
write('ERROR: %s\n' % e)
self.stderr.write('ERROR: %s\n' % e)
continue
return True
......@@ -11,10 +11,23 @@ html, body {
}
footer {
height: 60px;
background: #eee;
height: 300px;
text-align: center;
position: relative;
background: white;
}
footer > div {
position: absolute;
bottom: 0;
padding: 25px;
background: #eee;
left: 0;
right: 0;
}
.pac-container {
z-index: 100000;
}
footer.auth {
......@@ -25,7 +38,7 @@ footer.auth {
#wrap {
min-height: 100%;
height: auto !important;
margin: 0 auto -60px;
margin: 0 auto -300px;
}
.push-top {
......@@ -33,7 +46,7 @@ footer.auth {
}
.push {
height: 60px;
height: 300px;
}
.home .squares {
......@@ -75,7 +88,7 @@ footer.auth {
.closest #map_canvas{
position: fixed !important;
top: 52px;
bottom: 60px;
bottom: 0px;
left: 0;
right: 0;
z-index: 10000;
......@@ -86,3 +99,22 @@ footer.auth {
background: #eee;
}
.closest footer {
display: none;
}
@media screen and ( max-height: 480px ){
.home #map_wrapper {
position: relative;
height: 300px;
}
.home .squares {
margin-top: 0;
}
}
......@@ -68,7 +68,6 @@
navigationControl : true,
mapTypeControl : false,
};
console.log(mapOptions);
map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
var input = document.getElementById('searchTextField');
......
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