Commit 9f012dae authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos

New layout and UI in place

parent 1698da77
......@@ -322,6 +322,7 @@ def user_login(request):
except:
user_exists = False
user = authenticate(username=username, firstname=firstname, lastname=lastname, mail=mail, authsource='shibboleth')
if user is not None:
try:
peer = user.get_profile().peer
......@@ -345,7 +346,7 @@ def user_login(request):
error = _("Something went wrong during user authentication. Contact your administrator")
return render_to_response('error.html', {'error': error,},
context_instance=RequestContext(request))
except Exception as e:
except User.DoesNotExist as e:
error = _("Invalid login procedure. Error: %s" %e)
return render_to_response('error.html', {'error': error,},
context_instance=RequestContext(request))
......
This diff is collapsed.
body {
font-size: 13px;
background-image: url("/fodstatic/img/bg2.gif");
background-attachment: fixed;
background-color: #131516;
background-position: left 40px;
background-repeat: repeat;
/*background-image: url("/fodstatic/img/bg2.gif");*/
padding-bottom: 10px;
}
.footer {
background-color: #F5F5F5;
border-top: 1px solid #E5E5E5;
margin-top: 30px;
padding: 30px 0;
text-align: center;
}
.navbar .brand {
max-height: 40px;
overflow: visible;
......@@ -17,10 +21,11 @@ body {
label, input, button, select, textarea {
font-size: 13px;
}
legend {
font-size: 14px;
line-height: 20px;
legend {
font-size: 13px;
font-weight: bold;
line-height: 20px;
margin-bottom: 0;
}
.form-horizontal .control-group {
......@@ -45,10 +50,10 @@ hr {
#footcontainer{
text-align: center;
background-color: white;
/*background-color: white;*/
margin-top: 5px;
padding: 5px 10px 0 10px;
border: 1px solid grey;
/*padding: 5px 10px 0 10px;*/
/*border: 1px solid grey;*/
}
select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
......@@ -68,11 +73,11 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
text-shadow: 0 1px 0 #FFFFFF;
}
#content.container{
/*#content.container{
border: 1px solid grey;
padding: 90px 10px 10px;
background: white;"
}
}*/
#routes_table{
font-size: 12px;
}
......
......@@ -395,7 +395,7 @@
</fieldset>
<div class="control-group">
<div class="controls">
<button type="submit" id="applybutton" value="{% trans "Apply" %}" class="btn btn-large btn-primary"/>Apply</button>
<button type="submit" id="applybutton" value="{% trans 'Apply' %}" class="btn btn-large btn-primary"/>Apply</button>
</div>
</div>
......
......@@ -9,6 +9,7 @@
<script src="/fodstatic/js/jquery.min.js" type="text/javascript"></script>
<script src="/fodstatic/js/jquery_csrf_protect.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="/fodstatic/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="/fodstatic/css/bootstrap-responsive.css">
<link rel="stylesheet" type="text/css" href="/fodstatic/css/smoothness/jquery-ui-1.8.13.custom.css">
<link rel="stylesheet" type="text/css" href="/fodstatic/css/base.css">
......@@ -23,6 +24,20 @@
}
</script>
<style>
body {
background-color: #EEEEEE;
height: 100%;
overflow-y: scroll;
}
#content {
background-color: #FFFFFF;
min-height: 100%;
padding: 20px;
padding-top: 90px;
position: relative;
}
</style>
{% block extrahead %}{% endblock %}
</head>
......@@ -79,7 +94,7 @@
<div class="container">
{% block topmenu %}
<a class="brand" href="{% url group-routes %}"><img src="/fodstatic/fod_logo.png" /></a>
<a class="brand brandimg" href="{% url group-routes %}"><img src="/fodstatic/img/fod_logo_latest.png" /></a>
<ul class="nav">
{% if user.is_authenticated %}
......@@ -137,11 +152,13 @@
</div>
</div>
</div>
{% block contentplaceholder %}
<div id="content" class="container">
{% block brcrmb_container %}
<ul class="breadcrumb">{% if user.is_authenticated %}<li><a href="{% url group-routes %}">{% trans "My rules" %}</a></li>{% endif %}
<ul class="breadcrumb">{% if user.is_authenticated %}<li><a href="{% url group-routes %}">{% trans "My rules" %}</a></li>{% else %}<li><a href="{% url welcome %}">{% trans "Welcome" %}</a></li>{% endif %}
{% block breadcrumbs %}{% endblock %}
</ul>
{% endblock %}
{% if messages %}
<div id="messages">
{% for message in messages %}
......@@ -149,11 +166,13 @@
{% endfor %}
</div>
{% endif %}
{% endblock %}
{% block content %}
{% endblock %}
</div>
{% endblock %}
{% block footerblock %}
{% include "footer.html" %}
{% endblock %}
......
......@@ -2,8 +2,12 @@
{% load i18n %}
{% block title %}{{ flatpage.title }}{% endblock %}
{% block breadcrumbs %}:: {% trans flatpage.title %}{% endblock %}
{% block breadcrumbs %}
<li class="active"><span class="divider">/</span>
{% trans flatpage.title %}
</li>
{% endblock %}
{% block extrahead %}
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
<META HTTP-EQUIV="Expires" CONTENT="-1">
......
......@@ -2,10 +2,11 @@
<footer class="footer">
<div id="footcontainer" class="container">
{% if user.is_authenticated %}
{% trans "If you have any questions or need help, contact GRNET Helpdesk at <a href='mailto:helpdesk@grnet.gr'>helpdesk@grnet.gr</a> or 800-11-47638." %}<br />
{% endif %}
<a href="http://www.grnet.gr">{% trans "GRNET" %} NOC</a> | <a href="/fod/info/{{LANGUAGE_CODE}}/">{% trans "Info" %}</a> | <a href="/fod/tos/{{LANGUAGE_CODE}}/">{% trans "Service Terms" %}</a>
<div class="row"><a href="http://www.grnet.gr">{% trans "GRNET" %} NOC</a> | <a href="/fod/info/{{LANGUAGE_CODE}}/">{% trans "Info" %}</a> | <a href="/fod/tos/{{LANGUAGE_CODE}}/">{% trans "Service Terms" %}</a></div>
<p style="text-align: center;"><img width="46" height="40" border="0" class="image image-img_assist_custom-46x40 " src="//noc.grnet.gr/sites/default/files/images/image_PSSYGK.img_assist_custom-46x40.png" alt="Flag ΨΣ" title="Flag ΨΣ"> <img width="49" height="40" border="0" class="image image-img_assist_custom-49x40 " src="//noc.grnet.gr/sites/default/files/images/image_EEflag.img_assist_custom-49x40.png" alt="EU flag" title="EU flag"> <img width="90" height="40" border="0" class="image image-img_assist_custom-90x40 " src="//noc.grnet.gr/sites/default/files/images/image_YPDBMTH.img_assist_custom-90x40.png" alt="Flag ΥΠΔΒΜΘ" title="Flag ΥΠΔΒΜΘ"><img width="67" height="40" border="0" class="image image-img_assist_custom-67x40 " src="//noc.grnet.gr/sites/default/files/images/image_ESPA.img_assist_custom-67x40.png" alt="ESPA" title="ESPA"></p>
</div>
</footer>
\ No newline at end of file
......@@ -2,27 +2,30 @@
{% load i18n %}
{% block title %}{% trans "Login" %}{% endblock %}
{% block brcrmb_container %}{% endblock %}
{% block content %}
<div class="row">
<div class="span6 well">
<h3 class="muted">{% trans "Welcome" %}</h3>
<hr>
<p>{% blocktrans %}Welcome to GRNET's FoD service.{% endblocktrans %}</p>
<p>{% blocktrans %}If you are new to the service, take some time to read the service description{% endblocktrans %} <a href="/fod/info/{{LANGUAGE_CODE}}/">{% trans "here" %}</a>.</p>
<p>{% blocktrans %}If you have properly set your Shibboleth attributes, you can login using the link on the right{% endblocktrans %}</p>
<p>{% blocktrans %}For troubleshooting info and remarks do not hesitate to contact GRNET's Helpdesk.{% endblocktrans %}</p>
</div>
<div class="span5" id="loginform">
<div style="text-align: center;">
{% block contentplaceholder %}
<div id="content" class="container">
<div class="hero-unit" style="text-align:center"><h2>GRNET - Firewall on Demand</h2>
<p><img src="/fodstatic/img/fod_footer_logo.png" /></p>
<p>{% blocktrans %}Welcome to GRNET's FoD service.{% endblocktrans %}</p>
</div>
<div class="row-fluid">
<div class="span4 well"><h3>{% trans "What" %}?</h3><hr>
<p>{% blocktrans %}If you are new to the service, take some time to read the{% endblocktrans %} <a href="/fod/info/{{LANGUAGE_CODE}}/">{% trans "Service Description" %}</a></p>
<p>{% blocktrans %}Before asking why? take some time to look at the{% endblocktrans %} <a href="/fod/tos/{{LANGUAGE_CODE}}/">{% trans "Service Terms" %}</a></p>
</div>
<div class="span4 well"><h3>{% trans "How" %}?</h3><hr>
<p>{% blocktrans %}If you have properly set your Shibboleth attributes, you may proceed{% endblocktrans %}</p>
<div style="text-align: center;">
<a href="{% url login %}">
<img src="/fodstatic/shib_login.png" style="border:none;">
<p>{% trans "Shibboleth Login" %}</p>
</a>
</div>
</div>
</div>
<div class="span4 well"><h3>{% trans "Help" %}?</h3><hr>
{% blocktrans %}For troubleshooting info and remarks do not hesitate to contact GRNET's Helpdesk.{% endblocktrans %}</div>
</div>
{% endblock %}
</div>
{% endblock %}
\ No newline at end of file
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