Revision 2faabbcd

b/snf-astakos-app/astakos/im/static/im/css/modules.css
663 663

  
664 664

  
665 665
.members-table 									{ width:100%;}
666
.members-table .check 							{ width:10%;}
666
.members-table .check 							{ width:5%;}
667
.members-table .check + td.email	 			{ padding-left:5px;}
668
.approved .members-table .email:hover,
669
.pending .members-table.email:hover 			{ cursor: pointer;} 
667 670
.members-table + .pagination 					{ display: none}
668 671
.all .members-table .check 						{ display:none;}
669 672
.form-actions 									{ position: relative;}
670 673
.form-actions input[type="submit"]				{ display: none; position: } 
671 674
.pending .form-actions .reject,
672
.pending .form-actions .approve					{ display: inline-block;}
675
.pending .form-actions .accept					{ display: inline-block;}
673 676
.approved .form-actions .remove					{ display: inline-block;}
674
.form-actions a.approve 						{ background-color: #55B577}
675
.form-actions a.approve:hover 					{ background-color: #3582AC} 
677
.form-actions form.link-like input[type="submit"].accept	 		{ background-color: #55B577}
678
.form-actions form.link-like .accept:hover 					{ background-color: #3582AC} 
676 679

  
677 680

  
678 681
.form-actions form.link-like input[type="submit"]				{ margin:0; padding:0; background:#F24E53; color:#fff; cursor:pointer; height:auto; line-height: 22px; padding: 10px 22px; margin-right:10px;}
b/snf-astakos-app/astakos/im/static/im/js/common.js
261 261
    });
262 262
    
263 263
     $('.msg-wrap .no').click( function(e){
264
		e.preventDefault();
265
		$(this).parents('.dialog').hide();
266
	})
267
    
264
    		e.preventDefault();
265
    		$(this).parents('.dialog').hide();
266
        e.stopPropagation();
267
    	})
268

  
269
      $(document).click(function() {
270
        $('.msg-wrap .dialog').hide();
271
      });
272

  
273
     
268 274
    $('.msg-wrap .yes').click( function(e){
269 275
		e.preventDefault();
270 276
        var dialog = $(this).parents('.msg-wrap').find('.dialog');
......
365 371
	  
366 372
	// fix for recaptcha fields
367 373
	$('#okeanos_recaptcha').parents('.form-row').find('.extra-img').hide();	  
368
     
374
   
375
   check_form_actions_inactive();  
369 376
/* project members page js */	 
370 377
function check_form_actions_inactive(){
371 378
   if ( $('#members-table tbody td.check input:checked').length >0 ) {
......
419 426
  check_form_actions_inactive()
420 427
});
421 428

  
422

  
423 429
/* end of project members page js */
424 430

  
425 431

  
b/snf-astakos-app/astakos/im/urls.py
69 69
    url(r'^projects/(?P<chain_id>\d+)/cancel/?$', 'project_cancel', {}, name='project_cancel'),
70 70
    url(r'^projects/(?P<chain_id>\d+)/members/?$', 'project_members', {}, name='project_members'),
71 71
    url(r'^projects/(?P<chain_id>\d+)/members/approved/?$', 'project_members', {'members_status_filter':1}, name='project_approved_members'),
72
    url(r'^projects/(?P<chain_id>\d+)/members/approve/?$',
73
        'project_members_action', {'action':'approve'},
72
    url(r'^projects/(?P<chain_id>\d+)/members/accept/?$',
73
        'project_members_action', {'action':'accept'},
74 74
        name='project_members_accept'),
75 75
    url(r'^projects/(?P<chain_id>\d+)/members/remove/?$',
76 76
        'project_members_action', {'action':'remove'},

Also available in: Unified diff