diff --git a/static/css/base.css b/static/css/base.css
index 06fd9c54c89849c0da702638779f47688de62b49..c40a946407f295049559a45aefc53ca3de209f24 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -1,5 +1,17 @@
body {
font-size: 13px;
+ background-image: url("/fodstatic/img/bg2.gif");
+ background-attachment: fixed;
+ background-color: #131516;
+ background-position: left 40px;
+ background-repeat: repeat;
+}
+
+.navbar .brand {
+ max-height: 40px;
+ overflow: visible;
+ padding-bottom: 0;
+ padding-top: 0;
}
label, input, button, select, textarea {
font-size: 13px;
@@ -42,6 +54,18 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
font-size: 13px;
}
+.navbar .nav > li > span {
+ display: block;
+ float: none;
+ padding: 10px 1px;
+ text-shadow: 0 1px 0 #FFFFFF;
+}
+
+#content.container{
+ border: 1px solid grey;
+ padding: 90px 10px 10px;
+ background: white;"
+}
#routes_table{
font-size: 12px;
}
@@ -141,11 +165,7 @@ a:hover {
background: url("/fodstatic/rule.png") no-repeat scroll 0 50% transparent;
}
-body {
- padding-bottom: 2em;
- background: white;
- margin: 0;
-}
+
#content3 {
width: 990px;
@@ -605,11 +625,7 @@ div.box {
width: 45%;
}
-#loginform {
- margin-left: 50%;
- text-align: center;
- border-left: 1px solid #aaa;
-}
+
#loginform table {
margin-left: auto;
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a62dc55b0f761d56971cfb5ff92927b6ff54bb2c
Binary files /dev/null and b/static/favicon.ico differ
diff --git a/static/fod_logo.png b/static/fod_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d95864b1556eecccb296d4c45eb52f8b11c965e3
Binary files /dev/null and b/static/fod_logo.png differ
diff --git a/static/img/bg2.gif b/static/img/bg2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a2bc6389aad6889ffe0221047f2c720667d0f9da
Binary files /dev/null and b/static/img/bg2.gif differ
diff --git a/templates/apply.html b/templates/apply.html
index cad657672c9eda10bd9208ba14108e7aece9e019..9cefdf0a15f3931741cd2138cf1f95a5e554a861 100644
--- a/templates/apply.html
+++ b/templates/apply.html
@@ -182,6 +182,8 @@
{% if edit %}<h4>{% trans "Edit rule" %}: {{form.data.name}}</h4>
{% else %}<h4>{% trans "Apply for a new rule" %}</h4>
{% endif %}
+ <hr>
+ <br>
<form method="POST" class="form-horizontal">
{% csrf_token %}
diff --git a/templates/base.html b/templates/base.html
index 69f3d2d87ac56841bc116bfefd956974f1843851..c8d146b6fd1c11452fb602a381c1d078d3591f8a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -5,7 +5,7 @@
<title>GRNET's FoD :: {% block title %}{% endblock %} </title>
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
<META HTTP-EQUIV="expires" CONTENT="Wed, 26 Feb 1997 08:21:57 GMT">
-
+<link REL="SHORTCUT ICON" HREF="/fodstatic/favicon.ico">
<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">
@@ -29,7 +29,7 @@
<body>
- <div id="main">
+ {% comment %}
<div id="header">
<a class="grnetlogo" href="{% url group-routes %}">
<img class="logoimg" src="/fodstatic/logo.png">
@@ -72,6 +72,62 @@
</div>
</div>
+ {% endcomment %}
+ <div class="navbar navbar-fixed-top">
+
+ <div class="navbar-inner">
+ <div class="container">
+
+ {% block topmenu %}
+ <a class="brand" href="{% url group-routes %}"><img src="/fodstatic/fod_logo.png" /></a>
+ <ul class="nav">
+ {% if user.is_authenticated %}
+
+ <li>
+ <a href="{% url user-profile %}">{% trans "My profile" %}</a>
+ </li>
+ {% if user.is_superuser %}
+ <li {% block hometop %}{% endblock %}>
+ <a href="{% url admin:index %}">{% trans "Admin" %}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li {% block faqtop %}{% endblock %}>
+
+ </li>
+ {% endif %}
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Language" %}: {% for lang in LANGUAGES %}{% ifequal LANGUAGE_CODE lang.0 %}{% trans lang.1 %}{% endifequal %}{% endfor %}<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <form action="{% url django.views.i18n.set_language %}" method="post" style="display:inline;" id="langform">
+ {% csrf_token %}
+ <input name="next" type="hidden" value="{{ next }}" />
+ <input id="langsel" name="language" type="hidden" value="" />
+ </form>
+ {% for lang in LANGUAGES %}
+ <li>
+ <a class="select_lang" href="#" onclick="setlang('{{ lang.0 }}'); return false;" title="{{lang.1}}">{% trans lang.1 %}{% ifequal LANGUAGE_CODE lang.0 %} <i class="icon-ok"></i>{% endifequal %}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </li>
+
+ </ul>
+ {% endblock %}
+ <ul class="nav pull-right">
+ {% if user.is_authenticated %}
+ <li><span><strong>{{user}}</strong></span></li>
+ <li>
+ <a href="{% url logout %}">{% trans "Logout" %}</a>
+ </li>
+ {% else %}
+ <li><a href="{% url login %}">{% trans "Shibboleth Login" %}</a></li>
+ {% endif %}
+ </ul>
+
+ </div>
+ </div>
+ </div>
<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 %}
@@ -92,6 +148,6 @@
{% block footerblock %}
{% include "footer.html" %}
{% endblock %}
- </div>
+
</body>
</html>
diff --git a/templates/error.html b/templates/error.html
index 58ffd7bbdfa1f5a3245a17ed1c318675d1a0e47b..14c06968a62a7a23b730216f4402c3c9fff1958e 100644
--- a/templates/error.html
+++ b/templates/error.html
@@ -27,8 +27,9 @@
{% endblock %}
{% block content %}
- {% if error %}{% if inactive %}<h2>{% trans "Activation Pending" %}</h2>{% else %}<h2>{% trans "Error" %}</h2>{% endif %}{% endif %}
- <div>
+ {% if error %}{% if inactive %}<h3 class="muted">{% trans "Activation Pending" %}</h3>{% else %}<h3 class="muted">{% trans "Error" %}</h3>{% endif %}{% endif %}
+ <div class="container"><div class="row">
+ <div class="span8">
{% if missing_attributes %}
<p>{% trans "One or more required shibboleth attributes were not released towards this service" %}</p>
{% endif %}
@@ -50,4 +51,6 @@
</p>
{% endif %}
</div>
+ </div>
+ </div>
{% endblock %}
diff --git a/templates/footer.html b/templates/footer.html
index a8fc3c9432dd5c047a211143b6ea771cbec1e1ec..7e9d18ae1b680c107d1e86f0405322b173d6d81c 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,8 +1,11 @@
{% load i18n %}
-<div id="footer">
- {% if user.is_authenticated %}
+
+ <footer class="footer">
+ <div class="container" style="text-align: center; border-radius: 6px 6px 6px 6px; background-color: white; margin-top: 5px;">
+ {% 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="{% url getinfo %}">{% trans "Info" %}</a> | <a href="{% url gettos %}">{% trans "Service Terms" %}</a>
+ <a href="http://www.grnet.gr">{% trans "GRNET" %} NOC</a> | <a href="{% url getinfo %}">{% trans "Info" %}</a> | <a href="{% url gettos %}">{% trans "Service Terms" %}</a>
<p style="text-align: center;"><img width="46" height="40" border="0" class="image image-img_assist_custom-46x40 " src="http://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="http://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="http://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="http://noc.grnet.gr/sites/default/files/images/image_ESPA.img_assist_custom-67x40.png" alt="ESPA" title="ESPA"></p>
-</div>
+ </div>
+ </footer>
\ No newline at end of file
diff --git a/templates/user_routes.html b/templates/user_routes.html
index 7e638931c26529f5642b2bd902b4da1d44d81da0..e172500ea490379c5351798a0adf69ca2013d3ab 100644
--- a/templates/user_routes.html
+++ b/templates/user_routes.html
@@ -162,7 +162,6 @@ $(document).ready(function(){
if (reg_exp == '') {
reg_exp = '|'
}
- console.log(reg_exp.slice(0, -1))
oTable.fnFilter(reg_exp.slice(0, -1), 4, true);
@@ -182,7 +181,6 @@ $(document).ready(function(){
reg_exp = '|'
}
oTable.fnFilter(reg_exp.slice(0, -1), 4, regex=true);
- console.log(reg_exp.slice(0, -1))
return false;
});
diff --git a/templates/welcome.html b/templates/welcome.html
index 34f720ed7fd83b409bbab01a58e212fcaef9bfda..481d8fd0083b5554865e327e33c1684a003c4fd1 100644
--- a/templates/welcome.html
+++ b/templates/welcome.html
@@ -3,18 +3,25 @@
{% block title %}{% trans "Login" %}{% endblock %}
{% block brcrmb_container %}{% endblock %}
{% block content %}
-<div id="welcome">
-<h3>{% trans "Welcome" %}</h3>
+<div class="row">
+<div class="span6">
+<h3 class="muted">{% trans "Welcome" %}</h3>
<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="{% url getinfo %}">{% 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 id="loginform">
+<div class="span6" id="loginform">
+
+<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>
+
{% endblock %}