diff --git a/src/it/java/org/jenkinsci/account/ui/admin/AdminPage.java b/src/it/java/org/jenkinsci/account/ui/admin/AdminPage.java index a3d0f8ec..1f10ea64 100644 --- a/src/it/java/org/jenkinsci/account/ui/admin/AdminPage.java +++ b/src/it/java/org/jenkinsci/account/ui/admin/AdminPage.java @@ -13,7 +13,7 @@ public class AdminPage { @FindBy(name = "word") private WebElement searchInput; - @FindBy(xpath = "//input[@value=\"Search\"]") + @FindBy(xpath = "//button[contains(text(), 'Search')]") private WebElement searchButton; private final WebDriver driver; @@ -24,7 +24,7 @@ public AdminPage(WebDriver driver) { public void verifyOnPage() { assertThat(driver.getTitle()) - .contains("Manage Users"); + .contains("Admin"); } public void search(String query) { diff --git a/src/it/java/org/jenkinsci/account/ui/myaccount/MyAccountPage.java b/src/it/java/org/jenkinsci/account/ui/myaccount/MyAccountPage.java index 4f7cc031..90ba8cb2 100644 --- a/src/it/java/org/jenkinsci/account/ui/myaccount/MyAccountPage.java +++ b/src/it/java/org/jenkinsci/account/ui/myaccount/MyAccountPage.java @@ -8,10 +8,10 @@ // page_url = http://localhost:8080/ public class MyAccountPage { - @FindBy(xpath = "//a[@href=\"./admin\"]") + @FindBy(xpath = "//a[@href=\"/admin\"]") private WebElement administerLink; - @FindBy(xpath = "//a[@href=\"./myself\"]") + @FindBy(xpath = "//a[@href=\"/myself\"]") private WebElement profileLink; public MyAccountPage(WebDriver driver) { diff --git a/src/main/java/org/jenkinsci/account/Application.java b/src/main/java/org/jenkinsci/account/Application.java index 0d0dfdbb..2fe349d5 100644 --- a/src/main/java/org/jenkinsci/account/Application.java +++ b/src/main/java/org/jenkinsci/account/Application.java @@ -1395,4 +1395,13 @@ public AdminUI getAdmin() { // Somewhat cryptic name for cookie, so prying eyes don't know its use. public static final String ALREADY_SIGNED_UP = "JENKINSACCOUNT"; + + /** + * Returns true if the provided url is the active url + */ + public boolean isActive(String url) { + StaplerRequest req = Stapler.getCurrentRequest(); + String currentUrl = StringUtils.strip(req.getRequestURI(), "/"); + return currentUrl.equals(url); + } } diff --git a/src/main/resources/org/jenkinsci/account/AdminUI/index.jelly b/src/main/resources/org/jenkinsci/account/AdminUI/index.jelly index e376167b..38b979c0 100644 --- a/src/main/resources/org/jenkinsci/account/AdminUI/index.jelly +++ b/src/main/resources/org/jenkinsci/account/AdminUI/index.jelly @@ -1,40 +1,40 @@ - -
-
-

Manage Users

-

+ +

Admin

+

Manage users

+

Type the username or email address to find the user.

-
+
- + -

Set Circuit Breaker

-

+

Set circuit breaker

+

Temporarily disable sign-up to fight spam until a certain time. All times are in UTC.

-

+

Circuit breaker is currently on until ${it.circuitBreaker.date}. To disable it, set it to the time in the past, such as 2000/01/01 00:00.

-
+
- - + -
-
diff --git a/src/main/resources/org/jenkinsci/account/AdminUI/search.jelly b/src/main/resources/org/jenkinsci/account/AdminUI/search.jelly index 346a7889..837e8608 100644 --- a/src/main/resources/org/jenkinsci/account/AdminUI/search.jelly +++ b/src/main/resources/org/jenkinsci/account/AdminUI/search.jelly @@ -1,15 +1,23 @@ - + +

Search results

- +
+ To delete, type "YES" to the text field left of "Delete" then click the Delete button. +
+
- - - - - + + + + + @@ -19,29 +27,26 @@ - -
User IDEmail addressReset passwordUpdate emailDelete userUser IDEmail addressReset passwordUpdate emailDelete user
- +
+
- - + +
+
- - + +
-

- To delete, type "YES" to the text field left of "Delete" then click the Delete button. -

diff --git a/src/main/resources/org/jenkinsci/account/AdminUI/signup.jelly b/src/main/resources/org/jenkinsci/account/AdminUI/signup.jelly index c506d53b..c7d1370c 100644 --- a/src/main/resources/org/jenkinsci/account/AdminUI/signup.jelly +++ b/src/main/resources/org/jenkinsci/account/AdminUI/signup.jelly @@ -1,40 +1,32 @@ -
-
-

Confirm creating the following user

-
-
+ +
-
+
-
+
-
+
- + -
-
-
-
- diff --git a/src/main/resources/org/jenkinsci/account/Application/index.jelly b/src/main/resources/org/jenkinsci/account/Application/index.jelly index c2536da1..a854a82f 100644 --- a/src/main/resources/org/jenkinsci/account/Application/index.jelly +++ b/src/main/resources/org/jenkinsci/account/Application/index.jelly @@ -1,31 +1,21 @@ -

Account

-

- You can create/manage your user account that you use for accessing - Jira, - Artifactory, - VPN and other services within the Jenkins Infrastructure. -

+ +

Hey ${it.myself.firstName}

-
- - - - - - -
+

+ You can create/manage your user account that you use for accessing + Jira, + Artifactory, + VPN and other services within the Jenkins Infrastructure. +

+
+ + +
diff --git a/src/main/resources/org/jenkinsci/account/Application/login.jelly b/src/main/resources/org/jenkinsci/account/Application/login.jelly index 6b6c7bc4..3a80c8ee 100644 --- a/src/main/resources/org/jenkinsci/account/Application/login.jelly +++ b/src/main/resources/org/jenkinsci/account/Application/login.jelly @@ -1,32 +1,28 @@ - -
-
- - -

Login

+ +

Sign in

-
-
+ +
- +
-
+
- +
- + - Sign up? - Forgot password -
-
+
diff --git a/src/main/resources/org/jenkinsci/account/Application/passwordReset.jelly b/src/main/resources/org/jenkinsci/account/Application/passwordReset.jelly index 5b5a285f..5a7ee272 100644 --- a/src/main/resources/org/jenkinsci/account/Application/passwordReset.jelly +++ b/src/main/resources/org/jenkinsci/account/Application/passwordReset.jelly @@ -1,25 +1,19 @@ - -
-
- +

Reset password

-
-
- + +
+
- + -

+

If you can't figure this out, contact us to get your account recovered.

-
-
- diff --git a/src/main/resources/org/jenkinsci/account/Application/signup.jelly b/src/main/resources/org/jenkinsci/account/Application/signup.jelly index 534034e7..648b52c6 100644 --- a/src/main/resources/org/jenkinsci/account/Application/signup.jelly +++ b/src/main/resources/org/jenkinsci/account/Application/signup.jelly @@ -1,43 +1,36 @@ + +

Register

- -
-
- +
All fields are required
-

Sign up

- -

All fields are required

- -
-
+ +
-

+

Only letters, numbers, and '_' is allowed. -

+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
@@ -47,16 +40,13 @@ -
+
- + -
-
- diff --git a/src/main/resources/org/jenkinsci/account/Myself/index.jelly b/src/main/resources/org/jenkinsci/account/Myself/index.jelly index b956afe9..4ef7b0bb 100644 --- a/src/main/resources/org/jenkinsci/account/Myself/index.jelly +++ b/src/main/resources/org/jenkinsci/account/Myself/index.jelly @@ -1,64 +1,61 @@ - -
-
-

Your Profile

+ +

Your profile

-
-
+ +
-
- +
+
-
- +
+
-
+
-
+
-
+
- Change Password -

+

Change Password

+

To update your password, please type your current password as well as new one for security. Leave this empty to keep the current password.

-
+
-
+ +
-
+
- + -
-
diff --git a/src/main/resources/org/jenkinsci/account/openid/JenkinsOpenIDSession/confirm.jelly b/src/main/resources/org/jenkinsci/account/openid/JenkinsOpenIDSession/confirm.jelly index b4ad4abe..3f9deac3 100644 --- a/src/main/resources/org/jenkinsci/account/openid/JenkinsOpenIDSession/confirm.jelly +++ b/src/main/resources/org/jenkinsci/account/openid/JenkinsOpenIDSession/confirm.jelly @@ -6,7 +6,9 @@
- +
diff --git a/src/main/resources/org/jenkinsci/account/taglib/layout.jelly b/src/main/resources/org/jenkinsci/account/taglib/layout.jelly index 30d257f2..d3892d50 100644 --- a/src/main/resources/org/jenkinsci/account/taglib/layout.jelly +++ b/src/main/resources/org/jenkinsci/account/taglib/layout.jelly @@ -2,6 +2,8 @@ + + @@ -29,64 +31,63 @@ - - - - - - - - - + - + -
- -