From 99b7ee20b21869c62b9e50a8f9b8d5f90c2594fc Mon Sep 17 00:00:00 2001 From: Argiro Kokogiannaki Date: Fri, 9 Oct 2020 11:47:38 +0000 Subject: [PATCH] -update all pages after css updates -add sideabr in editRegistered user -add copy and revoke button for personal tokens --- src/main/webapp/activate.jsp | 16 ++++-- src/main/webapp/addPassword.jsp | 2 +- src/main/webapp/editRegisteredService.jsp | 55 ++++++++++++++++----- src/main/webapp/emailSuccess.jsp | 4 +- src/main/webapp/error.jsp | 2 +- src/main/webapp/error404.jsp | 2 +- src/main/webapp/expiredVerificationCode.jsp | 6 +-- src/main/webapp/forgotPassword.jsp | 4 +- src/main/webapp/overview.jsp | 21 +++++--- src/main/webapp/personal.jsp | 54 +++++++++++++++----- src/main/webapp/register.jsp | 6 +-- src/main/webapp/registerSuccess.jsp | 4 +- src/main/webapp/registeredServices.jsp | 5 +- src/main/webapp/remindUsername.jsp | 4 +- src/main/webapp/requestActivationCode.jsp | 4 +- src/main/webapp/requestToDeleteAccount.jsp | 4 +- src/main/webapp/resetPassword.jsp | 4 +- src/main/webapp/success.jsp | 4 +- src/main/webapp/successAddPassword.jsp | 4 +- src/main/webapp/successDeleteAccount.jsp | 4 +- src/main/webapp/verify.jsp | 4 +- src/main/webapp/verifyEmail.jsp | 4 +- src/main/webapp/verifyToDelete.jsp | 4 +- 23 files changed, 148 insertions(+), 73 deletions(-) diff --git a/src/main/webapp/activate.jsp b/src/main/webapp/activate.jsp index 54f42fe..32b5974 100644 --- a/src/main/webapp/activate.jsp +++ b/src/main/webapp/activate.jsp @@ -47,18 +47,24 @@
-
-
+
+
-

Thank you for registering! Please activate your account. An email has been sent to your email address. The email contains your username and an activation code, please paste them in the fields below to prove that you are the owner of this email account.

+

Thank you for registering!
+ The next step is to activate your account.

+ An email with your username and an activation code has been sent to you. Please use them in the form below to activate your account.
+ Note: the activation code expires in 24 hours. + + +

-
+
@@ -75,7 +81,7 @@
- +
diff --git a/src/main/webapp/addPassword.jsp b/src/main/webapp/addPassword.jsp index cfb6609..189e065 100644 --- a/src/main/webapp/addPassword.jsp +++ b/src/main/webapp/addPassword.jsp @@ -55,7 +55,7 @@
-
+
diff --git a/src/main/webapp/editRegisteredService.jsp b/src/main/webapp/editRegisteredService.jsp index 3d974cb..eeb00c6 100644 --- a/src/main/webapp/editRegisteredService.jsp +++ b/src/main/webapp/editRegisteredService.jsp @@ -32,6 +32,32 @@ OpenAIRE
+ +
+ +
@@ -41,14 +67,22 @@
-
-
-

Update your service

-
-
- -
-
Please fill in the updated values for your service
+
+
+
+
+
Sidebar title
+ +
+
+ +
+ +

Edit service

+

Please fill in the updated values for your service

@@ -99,11 +133,8 @@
-
- -
-
+
diff --git a/src/main/webapp/emailSuccess.jsp b/src/main/webapp/emailSuccess.jsp index 9d19dba..0fe842a 100644 --- a/src/main/webapp/emailSuccess.jsp +++ b/src/main/webapp/emailSuccess.jsp @@ -54,8 +54,8 @@
-
-
+
+
<%--

Forgot Password

--%>
diff --git a/src/main/webapp/error.jsp b/src/main/webapp/error.jsp index 1063a38..44ed206 100644 --- a/src/main/webapp/error.jsp +++ b/src/main/webapp/error.jsp @@ -56,7 +56,7 @@ <%--
Use the same credentials for all our services
--%>
-

Oops! Something went wrong!

+

Oops! Something went wrong!

Something went wrong. Please try again later or contact OpenAIRE helpdesk. We apologize for the inconvenience.

diff --git a/src/main/webapp/error404.jsp b/src/main/webapp/error404.jsp index bfee453..3fb0646 100644 --- a/src/main/webapp/error404.jsp +++ b/src/main/webapp/error404.jsp @@ -42,7 +42,7 @@ <%--
Use the same credentials for all our services
--%>
-

404 - Oops! Something went wrong!

+

404 - Oops! Something went wrong!

404 Error! The requested page was not found.

diff --git a/src/main/webapp/expiredVerificationCode.jsp b/src/main/webapp/expiredVerificationCode.jsp index 2cfc3ec..131065b 100644 --- a/src/main/webapp/expiredVerificationCode.jsp +++ b/src/main/webapp/expiredVerificationCode.jsp @@ -50,15 +50,15 @@
-
-
+
+
<%--

Welcome to our Single Sign-On service

--%> <%--
Use the same credentials for all our services
--%>
<%--

Oops! Something went wrong

--%>
-

Your verification code has expired. Please request for a new verification code here.

+

Your verification code has expired. Please request for a new verification code here.

diff --git a/src/main/webapp/forgotPassword.jsp b/src/main/webapp/forgotPassword.jsp index 881af7f..10e4e2f 100644 --- a/src/main/webapp/forgotPassword.jsp +++ b/src/main/webapp/forgotPassword.jsp @@ -38,8 +38,8 @@
-
-
+
+

Forgot Password

diff --git a/src/main/webapp/overview.jsp b/src/main/webapp/overview.jsp index d4a4f8c..7869fde 100644 --- a/src/main/webapp/overview.jsp +++ b/src/main/webapp/overview.jsp @@ -14,7 +14,7 @@ - OpenAIRE - Register + OpenAIRE - APIs Authentication @@ -91,15 +91,20 @@ To achieve better rate limits you need to make authenticated requests. We support personal access tokens and service registration. For more information please read the documentation.
-
-
- -
Access the OpenAIRE APIs with your personal access token.
+
+
+
+ +
mpla mpla mpla
+ +
-
- -
Register your service to enable requests to the OpenAIRE APIs.
+
+
+ +
mpla mpla mpla
+
diff --git a/src/main/webapp/personal.jsp b/src/main/webapp/personal.jsp index a0a9fd2..4bc2c38 100644 --- a/src/main/webapp/personal.jsp +++ b/src/main/webapp/personal.jsp @@ -5,9 +5,33 @@ - OpenAIRE - Forgot password + OpenAIRE - Personal token + + @@ -90,23 +114,31 @@
-

- Your personal access token is - 

${accessToken}
-

+
+ + +
Your personal access token is
+ 
${accessToken}
+
+
+ + +
Your refresh token is
+ 
${refreshToken}
+
-

- Your refresh token is - 

${refreshToken}
-

- -
+

Do not share your personal access token. Send your personal access token only over HTTPS.

For further information on how to use the tokens please visit the OpenAIRE API Authentication documentation.
+
+
Revoke tokens
+
Mpla mpla mpla
+ Revoke +
diff --git a/src/main/webapp/register.jsp b/src/main/webapp/register.jsp index df78061..2d1e0bd 100644 --- a/src/main/webapp/register.jsp +++ b/src/main/webapp/register.jsp @@ -49,15 +49,15 @@
-
-
+
+

Create new OpenAIRE account

<%--
Use the same credentials for all our services
--%>
-

Create an account

+

Create an account

diff --git a/src/main/webapp/registerSuccess.jsp b/src/main/webapp/registerSuccess.jsp index 0df5f91..ab6fa6d 100644 --- a/src/main/webapp/registerSuccess.jsp +++ b/src/main/webapp/registerSuccess.jsp @@ -54,8 +54,8 @@
-
-
+
+
<%--

Forgot Password

--%>
diff --git a/src/main/webapp/registeredServices.jsp b/src/main/webapp/registeredServices.jsp index e6e3391..8e74ff8 100644 --- a/src/main/webapp/registeredServices.jsp +++ b/src/main/webapp/registeredServices.jsp @@ -118,6 +118,7 @@
${registeredService.date}
last year
diff --git a/src/main/webapp/remindUsername.jsp b/src/main/webapp/remindUsername.jsp index 028cfce..dcfde43 100644 --- a/src/main/webapp/remindUsername.jsp +++ b/src/main/webapp/remindUsername.jsp @@ -39,8 +39,8 @@
-
-
+
+

Forgot username

diff --git a/src/main/webapp/requestActivationCode.jsp b/src/main/webapp/requestActivationCode.jsp index b6995da..dc8a9e8 100644 --- a/src/main/webapp/requestActivationCode.jsp +++ b/src/main/webapp/requestActivationCode.jsp @@ -46,8 +46,8 @@
-
-
+
+

Request an activation code

diff --git a/src/main/webapp/requestToDeleteAccount.jsp b/src/main/webapp/requestToDeleteAccount.jsp index c596867..03aa42e 100644 --- a/src/main/webapp/requestToDeleteAccount.jsp +++ b/src/main/webapp/requestToDeleteAccount.jsp @@ -47,8 +47,8 @@
-
-
+
+

Request to delete your account

diff --git a/src/main/webapp/resetPassword.jsp b/src/main/webapp/resetPassword.jsp index 21ff944..5fbe502 100644 --- a/src/main/webapp/resetPassword.jsp +++ b/src/main/webapp/resetPassword.jsp @@ -46,8 +46,8 @@
-
-
+
+
diff --git a/src/main/webapp/success.jsp b/src/main/webapp/success.jsp index cc7afd4..31c0575 100644 --- a/src/main/webapp/success.jsp +++ b/src/main/webapp/success.jsp @@ -57,8 +57,8 @@
-
-
+
+
<%--

Forgot Password

--%>
diff --git a/src/main/webapp/successAddPassword.jsp b/src/main/webapp/successAddPassword.jsp index 47acf7f..bce09a6 100644 --- a/src/main/webapp/successAddPassword.jsp +++ b/src/main/webapp/successAddPassword.jsp @@ -56,8 +56,8 @@
-
-
+
+
<%--

Forgot Password

--%>
diff --git a/src/main/webapp/successDeleteAccount.jsp b/src/main/webapp/successDeleteAccount.jsp index 361d29a..dcbaf30 100644 --- a/src/main/webapp/successDeleteAccount.jsp +++ b/src/main/webapp/successDeleteAccount.jsp @@ -53,8 +53,8 @@
-
-
+
+
<%--

Forgot Password

--%>
diff --git a/src/main/webapp/verify.jsp b/src/main/webapp/verify.jsp index 8c0af58..739be4f 100644 --- a/src/main/webapp/verify.jsp +++ b/src/main/webapp/verify.jsp @@ -39,8 +39,8 @@
-
-
+
+
diff --git a/src/main/webapp/verifyEmail.jsp b/src/main/webapp/verifyEmail.jsp index d0c9851..f901900 100644 --- a/src/main/webapp/verifyEmail.jsp +++ b/src/main/webapp/verifyEmail.jsp @@ -47,8 +47,8 @@
-
-
+
+
diff --git a/src/main/webapp/verifyToDelete.jsp b/src/main/webapp/verifyToDelete.jsp index a124014..779b0c0 100644 --- a/src/main/webapp/verifyToDelete.jsp +++ b/src/main/webapp/verifyToDelete.jsp @@ -46,8 +46,8 @@
-
-
+
+