Revision 632b6458

b/snf-astakos-app/astakos/im/api/__init__.py
169 169
        append(item(url=absolute(request, reverse('edit_profile')),
170 170
               name="My account"))
171 171
        if with_extra_links:
172
            if user.has_usable_password() and user.provider in ('local', ''):
173
                append(item(
174
                       url=absolute(request, reverse('password_change')),
175
                       name="Change password"))
176
            if EMAILCHANGE_ENABLED:
177
                append(item(
178
                       url=absolute(request, reverse('email_change')),
179
                       name="Change email"))
180
            if INVITATIONS_ENABLED:
181
                append(item(
182
                       url=absolute(request, reverse('invite')),
183
                       name="Invitations"))
172
#            if user.has_usable_password() and user.provider in ('local', ''):
173
#                append(item(
174
#                       url=absolute(request, reverse('password_change')),
175
#                       name="Change password"))
176
#            if EMAILCHANGE_ENABLED:
177
#                append(item(
178
#                       url=absolute(request, reverse('email_change')),
179
#                       name="Change email"))
180
#            if INVITATIONS_ENABLED:
181
#                append(item(
182
#                       url=absolute(request, reverse('invite')),
183
#                       name="Invitations"))
184 184
            
185 185
            append(item(
186 186
                   url=absolute(request, reverse('group_list')),
187 187
                   name="Projects",
188
                   submenu=(item(
189
                            url=absolute(request,
190
                                         reverse('group_list')),
191
                            name="Overview"),
192
                            item(
193
                                url=absolute(request,
194
                                             reverse('group_create_list')),
195
                                name="Create"),
196
                            item(
197
                                url=absolute(request,
198
                                             reverse('group_search')),
199
                                name="Join"),)))
188
#                   submenu=(item(
189
#                            url=absolute(request,
190
#                                         reverse('group_list')),
191
#                            name="Overview"),
192
#                            item(
193
#                                url=absolute(request,
194
#                                             reverse('group_create_list')),
195
#                                name="Create"),
196
#                            item(
197
#                                url=absolute(request,
198
#                                             reverse('group_search')),
199
#                                name="Join"),)
200
                        ))
200 201
            append(item(
201 202
                   url=absolute(request, reverse('resource_list')),
202 203
                   name="Report"))
b/snf-astakos-app/astakos/im/migrations/0033_multiple_auth_providers.py
22 22
    def backwards(self, orm):
23 23
        for user in orm.AstakosUser.objects.all():
24 24
            for auth_provider in user.auth_providers.all():
25
                user.provider = auth_provider.provider
25
                user.provider = auth_provider.module
26 26
                user.third_party_identifier = auth_provider.identifier
27
                if auth_provider.provider != 'local':
28
                    user.set_unusable_password()
29 27

  
30 28
            user.save()
31 29

  
b/snf-astakos-app/astakos/im/static/im/css/modules.css
479 479
.summary .quotas-form legend					{ margin-bottom:1em; }
480 480
.projects  p.restricted							{ width:524px; }
481 481
.hidden-submit .form-row.submit					{ display:none; }
482
form.withlabels.hidden-submit					{ margin-bottom:4em; }
482 483
.how-it-works									{ position:relative; }
483 484
.content .how-it-works a.submit					{ position:absolute; right:83px; bottom:50px;  background-color:#B3B3B3 }
484 485
.content .how-it-works a.submit:hover			{ background:#55B577 }
485 486
.content .how-it-works a.submit:focus			{ border-color: #B3B3B3}
486 487
.content .how-it-works a.submit:focus:hover		{ border-color: #55B577}
487 488

  
489
.auth_methods									{ margin-top:2em; padding-bottom:1em; }
488 490
.auth_methods ul								{ margin:1em 0; padding:0; list-style:none outside none; }
489 491
.auth_methods ul li 							{ margin:0 0 1em 0; padding:0; list-style:none outside none; font-size:1.154em; }
490 492
.auth_methods ul li>a							{ padding-right:20px; background:url(../images/arrow-down_green.png) no-repeat center right; color:#55B577 }
491 493
.auth_methods ul li>a.up						{ background-image:url(../images/arrow-up_green.png); }
492 494
.auth_methods ul li .wrap						{ font-size:0.867em; margin-top:1em; display:none; }
493
.auth_methods ul li .actions a					{ margin-right:20px; }
495
.auth_methods ul li .actions a		 			{ margin-right:20px; }
494 496
.auth_methods ul li a.red						{ color:#F24E53; }
495 497
.auth_methods ul.notassigned					{ margin-top:3em; }
496 498
.auth_methods ul.notassigned li>a				{ background:transparent; color: #F89A1C}
497 499
.auth_methods .dialog-wrap						{ display:inline; position:relative; }
498 500
.auth_methods .dialog							{ background:#fff; border:1px dashed #ccc; position:absolute; bottom:30px; left:0; padding:15px; width:220px; display:none;}
499
.auth_methods .dialog .submit					{ min-width:30px; padding:5px 22px; }
500

  
501
.content input:-webkit-autofill 							{ background: transparent; }
501
.auth_methods .dialog .submit					{ min-width:30px; padding:5px 22px; } 
502
.right-align									{ text-align:right; }			
b/snf-astakos-app/astakos/im/static/im/js/common.js
285 285
	})
286 286
    
287 287
    $('.hidden-submit input[readonly!="True"]').focus(function () {
288
         $('.hidden-submit .form-row.submit').show(500);
288
         $('.hidden-submit .form-row.submit').slideDown(500);
289 289
    });
290 290
    
291
    
292
    
291 293
     $('.auth_methods').find('li>a').click(function(e){
292 294
     	e.preventDefault();
293 295
     	$(this).siblings('.wrap').toggle('slow');
b/snf-astakos-app/astakos/im/static/im/js/forms.js
41 41
	  el.addClass(className);	
42 42
		
43 43
      el.click(function() {
44
      	parentForm = $(this).parents('form');
45
      	if ( parentForm.hasClass('hidden-submit') ){
46
      		$('.hidden-submit .form-row.submit').slideDown(500);
47
      	} 
48
      	
44 49
		if (isRadio && $this.attr('checked')){ return; }
45 50
        el.toggleClass("checked");
46 51
        $this.attr('checked', el.hasClass("checked"));
b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
41 41
					<div>
42 42
						<div class="wrap">
43 43

  
44
							<p><a href="{% url group_add 'project' %}"><img alt="THINK ABOUT IT" src="/static/im/images/create.png"></a></p>
45
							<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>
46
							<p><a href="{% url group_add 'project' %}">create a project ></a></p>>>>>>>> 74836e50ac43291030da083bf5271afca19fb59f
44
							<p class="centered"><a href="{% url group_add 'project' %}"><img alt="THINK ABOUT IT" src="/static/im/images/create.png"></a></p>
45
							<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>
46
							<p><a href="{% url group_add 'project' %}">create a project ></a></p>
47 47
							<!--<p class="btn"><a href="{% url group_create_list %}" class="submit">CREATE</a></p>-->
48 48
						</div>
49 49
					</div>
......
220 220
       		{% if not form %}
221 221
            {% with page|concat:sorting as args %}
222 222
            {% with q|paginate:args as page_obj %}
223
        	 
223
        	 	{% if page_obj.object_list %}
224 224
	      	    <div >
225 225
					<form method="GET" class="minimal" action="#allGroups" id="mygroups">
226 226
						<div class="form-row">
......
234 234
							</select>
235 235
						</div>
236 236
					</form>
237
					
237 238
					<table class="alt-style complex" id="allGroups">
238 239
			            <caption>MY PROJECTS</caption>
239 240
			            <thead>
......
346 347
                        </span>
347 348
					</p>
348 349
			   </div>
349
		 
350
		 	{% endif%}
350 351
        	{% endwith %} 
351 352
	      	{% endwith %} 
352 353
	      	{% endif %}
b/snf-astakos-app/astakos/im/templates/im/how_it_works.html
7 7
	<h2>HOW IT WORKS</h2>
8 8
 	<div class="centered how-it-works">
9 9
 		<img src="/static/im/images/how_it_works.png" alt="how it all works">
10
 		<a href="{% url group_list %}" class="submit">VISIT GROUPS NOW</a>
10
 		<a href="{% url group_list %}" class="submit">VISIT PROJECTS NOW</a>
11 11
 	</div>
12 12
{% endblock %}
b/snf-astakos-app/astakos/im/templates/im/profile.html
2 2

  
3 3
{% block body %}
4 4

  
5
<h2>GENERAL INFO</h2>
5 6
<form action={%url edit_profile %} method="post" class="withlabels hidden-submit">{% csrf_token %}
6 7
    
7 8
    {% with profile_form as form %}
......
65 66
    </div>
66 67
</div>
67 68

  
68
<div class="full-dotted">
69
<div class="full-dotted right-align">
69 70
	<ul class="options">
70
		<li><a href="https://okeanos.grnet.gr/home/" class="blue">Back to ~okeanos ></a></li>
71 71
		<li><a href="https://cyclades.okeanos.grnet.gr/ui/" class="blue">Take me to cyclades ></a></li>
72 72
		<li><a href="https://pithos.okeanos.grnet.gr/ui/" class="blue">Take me to pithos+ ></a></li>
73
		<li><a href="https://okeanos.grnet.gr/home/" class="blue">~okeanos homepage ></a></li>
73 74
	</ul>
74 75
		 
75 76
</div>

Also available in: Unified diff