Commit 1003ebe3 authored by Olga Brani's avatar Olga Brani
Browse files

How it works page

parent f2253604
......@@ -18,14 +18,14 @@ div.cloudbar li {font-family:'Open Sans',sans-serif !important; letter-s
.cloudbar .profile:hover { background:#5A97B8; }
.cloudbar .profile a { text-decoration:none; color:#fff; display:block; width:100%;}
.cloudbar .profile ul { position:absolute; right:0; top:35px; padding:0; margin:0; width:190px; display:none; z-index:9; background:#fff;}
.cloudbar .profile ul li { list-style:none outside; line-height:35px; padding:0 20px;}
.cloudbar .profile ul li { list-style:none outside; line-height:35px; padding:0 45px 0 20px;}
.cloudbar .profile ul li:hover a { color:#3582AC;}
.cloudbar .profile .user a { padding-right:20px; width:auto; }
.cloudbar .profile a { padding-right:20px; width:auto; }
.cloudbar .profile .user a span { padding:0 20px; background:url(../images/arrow-lt.png) no-repeat right center;}
.cloudbar .profile .full a span { background-image:url(../images/arrow-down.png); }
.cloudbar .profile .full a.open span { background-image:url(../images/arrow-up.png); }
.cloudbar .profile .full ul { border:1px dashed #000; border-top:0 none; border-right:0 none;}
.cloudbar .profile ul li a { padding-right:0; background:none; color:#000; display:inline; width:auto;}
.cloudbar .profile ul li a { padding-right:0; background:none; color:#000; display:block; width:100%;}
.cloudbar ul.services { margin:0; padding:0; }
.cloudbar ul.services li { float:left; height:35px; line-height:35px; text-align:center; padding: 0 30px; list-style:none outside;}
.cloudbar ul.services li:first-child { padding:0 5px;}
......
......@@ -157,8 +157,8 @@ $(document).ready(function() {
//if ($('.widjets'.length > 0)) {
///$('.widjets li div').equalHeights();
///if ($('.widjets'.length > 0)) {
///$('.widjets li div .txt').equalHeights();
///}
$(function() {
......@@ -232,6 +232,13 @@ $(document).ready(function() {
$(this).hide();
});
$('.editable .form-row').each(function() {
if ( $(this).hasClass('with-errors') ){
$('.editable').show();
$('.projects .details a.edit, .projects .details .data').hide();
}
});
$('.widjet-x').click(function(e){
e.preventDefault();
......@@ -277,14 +284,15 @@ $(document).ready(function() {
$(this).parents('.dialog').siblings('form').submit();
})
$('.hidden-submit input[readonly!="True"]').focus(function () {
$('.hidden-submit .form-row.submit').show(500);
});
});
$(window).resize(function() {
setContainerMinHeight('.container .wrapper');
///if ($('.widjets').length > 0) {
//$('.widjets li div').equalHeights();
//}
});
\ No newline at end of file
......@@ -29,7 +29,7 @@
</h3>
<div class="data">
<p class="restricted">{{ object.desc }}</p>
<p class="restricted">{{ object.desc|safe }}</p>
<dl class="alt-style">
<dt>Homepage url</dt>
<dd>
......@@ -195,6 +195,15 @@
</form>
</div>
{% endif %}
<div class="full-dotted">
<p>
<a href="{% url group_all %}">back to All Projects &gt;</a></li>
</p>
<p>
<a href="{% url group_list %}">back to My Projects &gt;</a>
</p>
</ul>
</div>
</div>
......
......@@ -5,7 +5,7 @@
{% block page.body %}
<div class="maincol {% block innerpage.class %}{% endblock %}">
<div class="projects">
<h2>PROJECTS </h2>
<h2>PROJECTS</h2>
{% if form %}
<p>Search for existing Projects and join the ones you like. Please search by Project name. </p>
<form action="{% url group_search %}" method="post" class="withlabels signup submit-inline">{% csrf_token %}
......@@ -23,9 +23,16 @@
</form>
<-->
{% else %}
<p>~okeanos gives the opportunity to Greek Academic or Research Organizations/Institutions/Faculty to run their own projects remotely on virtual infrastructure. Simple, fast and with minimal to no cost at all.
</p>
<div class="two-cols clearfix">
<div class="rt">
&nbsp;
</div>
<div class="lt">
<p>~okeanos gives the opportunity to Greek Academic or Research Organizations/Institutions/Faculty to run their own projects remotely on virtual infrastructure. Simple, fast and with minimal to no cost at all.</p>
<p><a href="{% url how_it_works %}" style="font-size:1.154em;">How it works ></a></p>
</div>
</div>
<div class="widjets">
<!--<a href="#" class="widjet-x" title="remove boxes">X</a>-->
......@@ -33,8 +40,8 @@
<li class="create">
<div>
<div class="wrap">
<p><a href="{% url group_add 'course' %}"><img alt="THINK ABOUT IT" src="/static/im/images/create.png"></a></p>
<p class="txt">Create a new Project in seconds. Specify how many members it will have, which and how many virtual resources it will provide to its members. Describe its purpose. Submit your request and if accepted, you and your colleagues are ready to deploy! </p>
<p class="centered"><a href="{% url group_add 'course' %}"><img alt="THINK ABOUT IT" src="/static/im/images/create.png"></a></p>
<p class="txt">Create a new Project in seconds. Specify how many members it will have, which and how many virtual resources it will provide to its members. Describe its purpose. Submit your request and if accepted, you and your colleagues are ready to deploy! <br><br></p>
<p><a href="{% url group_add 'default' %}">create a project ></a></p>
<!--<p class="btn"><a href="{% url group_create_list %}" class="submit">CREATE</a></p>-->
</div>
......@@ -43,7 +50,7 @@
<li class="join">
<div>
<div class="wrap">
<p><a href="{% url group_all %}"><img alt="THINK ABOUT IT" src="/static/im/images/join.png"></a></p>
<p class="centered"><a href="{% url group_all %}"><img alt="THINK ABOUT IT" src="/static/im/images/join.png"></a></p>
<p class="txt">Become a member of an existing Project and instantly gain access to the resources it has to offer you. Search for open Projects and join for free. Contact the closed Projects administrators, if you think they will accept you. In two words: try to Join now. </p>
<p><a href="{% url group_all %}">join a project ></a></p>
......
{% extends "im/account_base.html" %}
{% load filters %}
{% block page.body %}
<h2>HOW IT WORKS</h2>
<div class="centered how-it-works">
<img src="/static/im/images/how_it_works.png" alt="how it all works">
<a href="{% url group_list %}" class="submit">VISIT GROUPS NOW</a>
</div>
{% endblock %}
......@@ -2,7 +2,7 @@
{% block body %}
<form action={%url edit_profile %} method="post" class="withlabels">{% csrf_token %}
<form action={%url edit_profile %} method="post" class="withlabels hidden-submit">{% csrf_token %}
{% with profile_form as form %}
{% include "im/form_render.html" %}
......
......@@ -62,7 +62,8 @@ urlpatterns = patterns('astakos.im.views',
url(r'^group/(?P<group_id>\d+)/leave/?$', 'group_leave', {}, name='group_leave'),
url(r'^group/(?P<group_id>\d+)/(?P<user_id>\d+)/approve/?$', 'approve_member', {}, name='approve_member'),
url(r'^group/(?P<group_id>\d+)/(?P<user_id>\d+)/disapprove/?$', 'disapprove_member', {}, name='disapprove_member'),
url(r'^group/create/?$', 'group_create_list', {}, name='group_create_list')
url(r'^group/create/?$', 'group_create_list', {}, name='group_create_list'),
url(r'^group/how_it_works/?$', 'how_it_works', {}, name='how_it_works')
)
......
......@@ -1364,3 +1364,9 @@ def timeline(request):
timeline_header=timeline_header,
timeline_body=timeline_body)
return data
def how_it_works(request):
return render_response(
template='im/how_it_works.html',
context_instance=get_context(request),)
\ 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