To access the VO resources, you must agree to the VO's Acceptable Usage Policy (AUP) rules.
-Please fill out all fields in the form below and click on the submit
+Please fill out all the fields in the form below and click on the submit
button at the bottom of the page.
@@ -62,15 +62,23 @@ button at the bottom of the page.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/voms-admin-server/src/main/webapp/WEB-INF/p/register/hr/registration.jsp b/voms-admin-server/src/main/webapp/WEB-INF/p/register/hr/registration.jsp
new file mode 100644
index 00000000..dad36592
--- /dev/null
+++ b/voms-admin-server/src/main/webapp/WEB-INF/p/register/hr/registration.jsp
@@ -0,0 +1,43 @@
+<%--
+
+ Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2006-2016
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+--%>
+<%@include file="/WEB-INF/p/shared/taglibs.jsp"%>
+
+
+Welcome to the registration page for the ${voName}
+Virtual Organization!
+
+
+
+To apply for membership in this Virtual Organization, you must
+be registered in the CERN Human Resource database and have your membership
+there linked to the ${voName} experiment.
+
+
+
+The VO registration process requires that you know the email address linked
+to your CERN Human Resource record. To find out your CERN Human Resource
+record, use the
+CERN Phonebook service before proceeding with the registration.
+
+
+
+Please enter the following information:
+
+
+
+
diff --git a/voms-admin-server/src/main/webapp/WEB-INF/p/register/hr/registration2.jsp b/voms-admin-server/src/main/webapp/WEB-INF/p/register/hr/registration2.jsp
new file mode 100644
index 00000000..528bae00
--- /dev/null
+++ b/voms-admin-server/src/main/webapp/WEB-INF/p/register/hr/registration2.jsp
@@ -0,0 +1,90 @@
+<%--
+
+ Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2006-2016
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+--%>
+<%@include file="/WEB-INF/p/shared/taglibs.jsp"%>
+
+
+Welcome to the registration page for the ${voName} VO.
+
+
+
+To access the VO resources, you must agree to the VO's Acceptable Usage Policy (AUP) rules.
+
+Please fill out all the fields in the form below and click on the submit
+button at the bottom of the page.
+
+
+After you submit this request, you will receive an email with instructions on how to proceed.
+
+
+Your request will not be forwarded to the VO managers until you confirm that you have a valid email
+address by following those instructions.
+
+
+
IMPORTANT:
+
+By submitting this information you agree that it may be distributed to and stored by
+VO and site administrators. You also agree that action may be taken to confirm the information you provide
+is correct, that it may be used for the purpose of controlling access to VO resources and that it may be
+used to contact you in relation to this activity.
+
+
+
+
+
+ Your certificate subject (DN):
+
+
+
+ The CA that issued your certificate:
+
+
+
+
+
\ No newline at end of file
diff --git a/voms-admin-server/src/main/webapp/WEB-INF/p/register/hr/searchResults.jsp b/voms-admin-server/src/main/webapp/WEB-INF/p/register/hr/searchResults.jsp
new file mode 100644
index 00000000..ccd6c06f
--- /dev/null
+++ b/voms-admin-server/src/main/webapp/WEB-INF/p/register/hr/searchResults.jsp
@@ -0,0 +1,77 @@
+<%--
+
+ Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2006-2016
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+--%>
+<%@include file="/WEB-INF/p/shared/taglibs.jsp"%>
+
+
+
+
+
+
+
+
+
+
+ | CERN Person ID |
+ Name |
+ Surname |
+ Institute |
+ Email addresses |
+ |
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/voms-admin-server/src/main/webapp/WEB-INF/p/register/orgdb/registration2.jsp b/voms-admin-server/src/main/webapp/WEB-INF/p/register/orgdb/registration2.jsp
index 77ac539f..294490a4 100644
--- a/voms-admin-server/src/main/webapp/WEB-INF/p/register/orgdb/registration2.jsp
+++ b/voms-admin-server/src/main/webapp/WEB-INF/p/register/orgdb/registration2.jsp
@@ -24,7 +24,7 @@ Welcome to the registration page for the
${voName} V
To access the VO resources, you must agree to the VO's Acceptable Usage Policy (AUP) rules.
-Please fill out all fields in the form below and click on the submit
+Please fill out all the fields in the form below and click on the submit
button at the bottom of the page.
@@ -64,12 +64,6 @@ used to contact you in relation to this activity.
-
-
-
-
-
-
diff --git a/voms-admin-server/src/main/webapp/WEB-INF/p/role/searchMember.jsp b/voms-admin-server/src/main/webapp/WEB-INF/p/role/searchMember.jsp
index b7141493..0efa023c 100644
--- a/voms-admin-server/src/main/webapp/WEB-INF/p/role/searchMember.jsp
+++ b/voms-admin-server/src/main/webapp/WEB-INF/p/role/searchMember.jsp
@@ -15,150 +15,63 @@
limitations under the License.
--%>
-<%@include
- file="/WEB-INF/p/shared/taglibs.jsp"%>
-
-
\ No newline at end of file
diff --git a/voms-admin-server/src/main/webapp/WEB-INF/p/shared/dialog-template.jsp b/voms-admin-server/src/main/webapp/WEB-INF/p/shared/dialog-template.jsp
index 324cc822..122a254e 100644
--- a/voms-admin-server/src/main/webapp/WEB-INF/p/shared/dialog-template.jsp
+++ b/voms-admin-server/src/main/webapp/WEB-INF/p/shared/dialog-template.jsp
@@ -17,8 +17,12 @@
--%>
<%@include file="/WEB-INF/p/shared/taglibs.jsp"%>
-
+
+<%--
+
+--%>
+
diff --git a/voms-admin-server/src/main/webapp/WEB-INF/p/shared/dialogs.jsp b/voms-admin-server/src/main/webapp/WEB-INF/p/shared/dialogs.jsp
index 67e4ce5c..7fa07026 100644
--- a/voms-admin-server/src/main/webapp/WEB-INF/p/shared/dialogs.jsp
+++ b/voms-admin-server/src/main/webapp/WEB-INF/p/shared/dialogs.jsp
@@ -76,6 +76,15 @@