Commit 8dfdb7bf authored by Olga Brani's avatar Olga Brani
Browse files

Style fixes

New menu
parent 7b98277f
......@@ -169,34 +169,35 @@ def get_menu(request, with_extra_links=False, with_signout=True):
append(item(url=absolute(request, reverse('edit_profile')),
name="My account"))
if with_extra_links:
if user.has_usable_password() and user.provider in ('local', ''):
append(item(
url=absolute(request, reverse('password_change')),
name="Change password"))
if EMAILCHANGE_ENABLED:
append(item(
url=absolute(request, reverse('email_change')),
name="Change email"))
if INVITATIONS_ENABLED:
append(item(
url=absolute(request, reverse('invite')),
name="Invitations"))
# if user.has_usable_password() and user.provider in ('local', ''):
# append(item(
# url=absolute(request, reverse('password_change')),
# name="Change password"))
# if EMAILCHANGE_ENABLED:
# append(item(
# url=absolute(request, reverse('email_change')),
# name="Change email"))
# if INVITATIONS_ENABLED:
# append(item(
# url=absolute(request, reverse('invite')),
# name="Invitations"))
append(item(
url=absolute(request, reverse('group_list')),
name="Projects",
submenu=(item(
url=absolute(request,
reverse('group_list')),
name="Overview"),
item(
url=absolute(request,
reverse('group_create_list')),
name="Create"),
item(
url=absolute(request,
reverse('group_search')),
name="Join"),)))
# submenu=(item(
# url=absolute(request,
# reverse('group_list')),
# name="Overview"),
# item(
# url=absolute(request,
# reverse('group_create_list')),
# name="Create"),
# item(
# url=absolute(request,
# reverse('group_search')),
# name="Join"),)
))
append(item(
url=absolute(request, reverse('resource_list')),
name="Report"))
......
......@@ -22,10 +22,8 @@ class Migration(DataMigration):
def backwards(self, orm):
for user in orm.AstakosUser.objects.all():
for auth_provider in user.auth_providers.all():
user.provider = auth_provider.provider
user.provider = auth_provider.module
user.third_party_identifier = auth_provider.identifier
if auth_provider.provider != 'local':
user.set_unusable_password()
user.save()
......
......@@ -479,23 +479,24 @@ form.quotas-form span.error-msg:hover em { background-position:-58px -3px; }
.summary .quotas-form legend { margin-bottom:1em; }
.projects p.restricted { width:524px; }
.hidden-submit .form-row.submit { display:none; }
form.withlabels.hidden-submit { margin-bottom:4em; }
.how-it-works { position:relative; }
.content .how-it-works a.submit { position:absolute; right:83px; bottom:50px; background-color:#B3B3B3 }
.content .how-it-works a.submit:hover { background:#55B577 }
.content .how-it-works a.submit:focus { border-color: #B3B3B3}
.content .how-it-works a.submit:focus:hover { border-color: #55B577}
.auth_methods { margin-top:2em; padding-bottom:1em; }
.auth_methods ul { margin:1em 0; padding:0; list-style:none outside none; }
.auth_methods ul li { margin:0 0 1em 0; padding:0; list-style:none outside none; font-size:1.154em; }
.auth_methods ul li>a { padding-right:20px; background:url(../images/arrow-down_green.png) no-repeat center right; color:#55B577 }
.auth_methods ul li>a.up { background-image:url(../images/arrow-up_green.png); }
.auth_methods ul li .wrap { font-size:0.867em; margin-top:1em; display:none; }
.auth_methods ul li .actions a { margin-right:20px; }
.auth_methods ul li .actions a { margin-right:20px; }
.auth_methods ul li a.red { color:#F24E53; }
.auth_methods ul.notassigned { margin-top:3em; }
.auth_methods ul.notassigned li>a { background:transparent; color: #F89A1C}
.auth_methods .dialog-wrap { display:inline; position:relative; }
.auth_methods .dialog { background:#fff; border:1px dashed #ccc; position:absolute; bottom:30px; left:0; padding:15px; width:220px; display:none;}
.auth_methods .dialog .submit { min-width:30px; padding:5px 22px; }
.content input:-webkit-autofill { background: transparent; }
.auth_methods .dialog .submit { min-width:30px; padding:5px 22px; }
.right-align { text-align:right; }
\ No newline at end of file
......@@ -285,9 +285,11 @@ $(document).ready(function() {
})
$('.hidden-submit input[readonly!="True"]').focus(function () {
$('.hidden-submit .form-row.submit').show(500);
$('.hidden-submit .form-row.submit').slideDown(500);
});
$('.auth_methods').find('li>a').click(function(e){
e.preventDefault();
$(this).siblings('.wrap').toggle('slow');
......
......@@ -41,6 +41,11 @@
el.addClass(className);
el.click(function() {
parentForm = $(this).parents('form');
if ( parentForm.hasClass('hidden-submit') ){
$('.hidden-submit .form-row.submit').slideDown(500);
}
if (isRadio && $this.attr('checked')){ return; }
el.toggleClass("checked");
$this.attr('checked', el.hasClass("checked"));
......
......@@ -41,9 +41,9 @@
<div>
<div class="wrap">
<p><a href="{% url group_add 'project' %}"><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><a href="{% url group_add 'project' %}">create a project ></a></p>>>>>>>> 74836e50ac43291030da083bf5271afca19fb59f
<p class="centered"><a href="{% url group_add 'project' %}"><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 'project' %}">create a project ></a></p>
<!--<p class="btn"><a href="{% url group_create_list %}" class="submit">CREATE</a></p>-->
</div>
</div>
......@@ -220,7 +220,7 @@
{% if not form %}
{% with page|concat:sorting as args %}
{% with q|paginate:args as page_obj %}
{% if page_obj.object_list %}
<div >
<form method="GET" class="minimal" action="#allGroups" id="mygroups">
<div class="form-row">
......@@ -234,6 +234,7 @@
</select>
</div>
</form>
<table class="alt-style complex" id="allGroups">
<caption>MY PROJECTS</caption>
<thead>
......@@ -346,7 +347,7 @@
</span>
</p>
</div>
{% endif%}
{% endwith %}
{% endwith %}
{% endif %}
......
......@@ -7,6 +7,6 @@
<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>
<a href="{% url group_list %}" class="submit">VISIT PROJECTS NOW</a>
</div>
{% endblock %}
......@@ -2,6 +2,7 @@
{% block body %}
<h2>GENERAL INFO</h2>
<form action={%url edit_profile %} method="post" class="withlabels hidden-submit">{% csrf_token %}
{% with profile_form as form %}
......@@ -65,11 +66,11 @@
</div>
</div>
<div class="full-dotted">
<div class="full-dotted right-align">
<ul class="options">
<li><a href="https://okeanos.grnet.gr/home/" class="blue">Back to ~okeanos ></a></li>
<li><a href="https://cyclades.okeanos.grnet.gr/ui/" class="blue">Take me to cyclades ></a></li>
<li><a href="https://pithos.okeanos.grnet.gr/ui/" class="blue">Take me to pithos+ ></a></li>
<li><a href="https://okeanos.grnet.gr/home/" class="blue">~okeanos homepage ></a></li>
</ul>
</div>
......
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