Commit e331624f authored by Vangelis Koukis's avatar Vangelis Koukis
Browse files

Merge branch 'ui-0.5'

parents 9fe47e4c 4522a842
......@@ -79,5 +79,4 @@ a {
}
.menu li.last {
margin-top: -7px;
}
......@@ -78,7 +78,6 @@ body.alt {
text-decoration: none;
padding: 10px;
padding-left: 36px;
text-shadow: 1px 1px 0px #efefef;
}
.inner .left ul li a.page-link:hover, .inner .left ul li.selected a.page-link {
......@@ -89,6 +88,10 @@ body.alt {
padding-left: 36px;
}
.inner .left ul li .close-button:hover {
background-color: #99C9E0;
}
.inner .left ul li .close-button {
display: block;
position: absolute;
......@@ -144,25 +147,27 @@ body.alt {
}
.page.text h2 {
font-size: 1.8em;
font-size: 1.9em;
color: #4085A5;
margin-bottom: 0.5em;
text-shadow: 1px 1px 0px #ddd;
margin-bottom: 1.2em;
}
.page.text h2 em {
color: #FCFDFE;
}
.page.text a {
color: #407087;
color: #213D4A;
}
.page.text p em {
color: #4C6A78;
font-weight: bold;
/*font-weight: bold;*/
}
.page.text h3 {
font-size: 1.1em;
color: #4C6A78;
font-weight: bold;
font-size: 1.2em;
color: #4394B9;
margin-bottom: 0.5em;
margin-top: 1.5em;
}
......@@ -178,8 +183,7 @@ body.alt {
font-size: 1.1em;
margin-bottom: 1em;
text-align: justify;
line-height: 1.2em;
text-shadow: 1px 1px 0px #efefef;
line-height: 1.4em;
}
.inner .video {
......@@ -290,5 +294,4 @@ body.style2 .page.text {
body.style2 .page.text p, body.style2 .page.text h2 {
color: #fff;
text-shadow: 1px 1px 0px #aaa;
}
{% load i18n %}<!doctype html>
<html>
<head>
<title>{% block site_title %}{% trans "~okeanos project" %}{% endblock %}</title>
<title>{% block site_title %}{% trans "~okeanos" %}{% endblock %}</title>
<script src="{{ OKEANOS_STATIC_URL }}/js/jquery.js" type="text/javascript"></script>
<script src="{{ OKEANOS_STATIC_URL }}/js/jquery.cookie.js" type="text/javascript"></script>
......
......@@ -92,8 +92,8 @@
{% block main %}
<div class="content">
<div class="images">
<a class="intro-link" href="{{ OKEANOS_SITE_URL }}" title="{% trans "Okeanos project" %}">
<img class="intro-img" src="{{ OKEANOS_STATIC_URL }}images/okeanos-intro-logo1.png" alt="Sign in Okeanos project" />
<a class="intro-link" href="{{ OKEANOS_SITE_URL }}" title="{% trans "~okeanos" %}">
<img class="intro-img" src="{{ OKEANOS_STATIC_URL }}images/okeanos-intro-logo1.png" alt="Sign in ~okeanos project" />
<img class="fadeimg" src="{{ OKEANOS_STATIC_URL }}images/okeanos-intro-logo2.png" />
</a></div>
</div>
......
{% load i18n %}
<h2>{% trans "So, what is this ~okeanos thing?" %}</h2>
<h2>{% trans "So, what is this <em>~okeanos</em> thing?" %}</h2>
<p>
<em>~okeanos</em> is a brand new IaaS Service. <br />"IaaS" stands for "Infrastracture as a Service", but what does it really mean?
</p>
......@@ -9,7 +9,7 @@ It means that you can build your own computer, always connected to the Internet,
</p>
<p>
With ~okeanos you are one click away from your own Virtual Machines and Virtual Networks: You can manage them, destroy them, connect to them and take a handful of other actions, all from inside your favorite web browser.
With <em>~okeanos</em> you are one click away from your own Virtual Machines and Virtual Networks: You can manage them, destroy them, connect to them and take a handful of other actions, all from inside your favorite web browser.
</p>
<h3>Think about it:</h3>
......@@ -24,7 +24,7 @@ Go out shopping, buy/order a new PC, wait shipping to your place, unpack, connec
<h3>Can I have something click and go, please?</h3>
<p>
Start preparing breakfast (required). Open your browser, login to ~okeanos, order as many machines as you like, select their 'hardware', pick up your favorite operating system, wait only a few minutes, then connect remotely to your own new working PC. And don't forget, breakfast is still there waiting for you.
Start preparing breakfast (required). Open your browser, login to <em>~okeanos</em>, order as many machines as you like, select their 'hardware', pick up your favorite operating system, wait only a few minutes, then connect remotely to your own new working PC. And don't forget, breakfast is still there waiting for you.
</p>
<h3>What's with the name?</h3>
......
......@@ -11,9 +11,9 @@
Are you a student/researcher/faculty member? You can access <em>~okeanos</em> using the same credentials you use to login to your University/Research Center.
</p>
<h3>..and who is behind ~okeanos?</h3>
<h3>Who is behind <em>~okeanos?</em></h3>
<p>
~okeanos is being designed and developed by the <a target="_blank" href="http://www.grnet.gr">Greek Research and Technology Network (GRNET)</a>
<em>~okeanos</em> is being designed and developed by the <a target="_blank" href="http://www.grnet.gr">Greek Research and Technology Network (GRNET)</a>
for the benefit of the Greek academic community. You are welcomed to join <em>~okeanos</em> and stay!
</p>
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