From: Loic Baron Date: Wed, 29 Jan 2014 15:33:39 +0000 (+0100) Subject: Forgot to add join.js and join_view.html to the git X-Git-Tag: myslice-0.3-0~12 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=800c3c72aa7f23dacd52bacd573ced409987baa0 Forgot to add join.js and join_view.html to the git --- diff --git a/portal/actions.py b/portal/actions.py index 8745cb52..d161be5c 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -173,6 +173,7 @@ def get_request_by_id(ids): return make_requests(pending_users, pending_slices) def get_request_by_authority(authority_hrns): + print "get_request_by_authority auth_hrns = ", authority_hrns if not authority_hrns: pending_users = PendingUser.objects.all() pending_slices = PendingSlice.objects.all() diff --git a/portal/dashboardview.py b/portal/dashboardview.py index bf42603a..dea1c74c 100644 --- a/portal/dashboardview.py +++ b/portal/dashboardview.py @@ -27,7 +27,7 @@ class DashboardView (LoginRequiredAutoLogoutView): print "Dashboard page" # Slow... #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn') - testbed_query = Query().get('network').select('network_hrn','platform') + testbed_query = Query().get('network').select('network_hrn','platform','version') # DEMO GEC18 Query only PLE # user_query = Query().get('local:user').select('config','email') # user_details = execute_query(self.request, user_query) diff --git a/portal/static/js/join.js b/portal/static/js/join.js new file mode 100644 index 00000000..193a00ac --- /dev/null +++ b/portal/static/js/join.js @@ -0,0 +1,75 @@ +jQuery(document).ready(function(){ + + jQuery("#joinForm").validate({ + rules: { + pi_password: { + required: true + }, + confirmpassword: { + required: true, equalTo: "#password" + }, + root_authorithy_hrn: { + required: true + }, + site_name: { + required: true + }, + site_login_base: { + required: true + }, + site_abbreviated_name: { + required: true + }, + site_url: { + required: true + }, + site_latitude: { + required: true + }, + site_longitude: { + required: true + }, + pi_first_name: { + required: true + }, + pi_last_name: { + required: true + }, + pi_title: { + required: true + }, + pi_phone: { + required: true + }, + pi_email: { + required: true + }, +/* + address_line1: { + required: true + }, + + address_line2: { + required: true + }, + address_line3: { + required: true + }, + + address_city: { + required: true + }, + address_postalcode: { + required: true + }, + address_state: { + required: true + }, + + address_country: { + required: true + }, +*/ + } + }); + }); diff --git a/portal/templates/join_view.html b/portal/templates/join_view.html new file mode 100644 index 00000000..201c91be --- /dev/null +++ b/portal/templates/join_view.html @@ -0,0 +1,187 @@ +{% extends "layout-unfold1.html" %} + +{% block unfold_main %} + +
+

Join the OneLab Federation

+
+ +
+OneLab welcomes companies, universities, and research laboratories to join the OneLab Federation of Testbeds.
+We are supported by the European Commision through its 7th Framework Programs and FIRE initiative (Future Internet Research and Experimentation), as well as by other national and international funding initiatives. +
+
+If you wish to become a new member of OneLab Federation, you should first consult the Membership Agreement. +
+
+ +{% if errors %} +
+ +
+{% endif %} + +
+
+ {% csrf_token %} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Site Information

+ + +
 

Principal Investigator Information

 

Postal address

 
+
+
+
+ +
+A membership agreement document will be sent to your email address as a PDF file. +
+Please print and sign a copy of the agreement and send it to: +
+
+Ciro Scognamiglio
+UPMC - LIP6
+Campus Jussieu
+Couloir 26-00, bureau 102
+Boite courrier 169
+4 place Jussieu
+F-75252 PARIS cedex 05 - FRANCE
+
+Once your membership has been processed we will contact you to welcome you as a member. +
+If you have any questions about membership, contact the OneLab Support team. +
+ +{% endblock %} + diff --git a/portal/validationview.py b/portal/validationview.py index 54246322..1752e271 100644 --- a/portal/validationview.py +++ b/portal/validationview.py @@ -179,6 +179,7 @@ class ValidatePendingView(FreeAccessView): print "queried_pending_authorities = ", queried_pending_authorities requests = get_request_by_authority(queried_pending_authorities) + print "requests = ", requests for request in requests: auth_hrn = request['authority_hrn']