diff --git a/pom.xml b/pom.xml index 2baa8c8de..5005e1fff 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,30 @@ cspace-ui + + + + maven-antrun-plugin + 1.7 + + + clean + + run + + + + + + + + + + org.apache.maven.plugins maven-war-plugin diff --git a/src/main/webapp/defaults/bundle/core-messages.properties b/src/main/webapp/defaults/bundle/core-messages.properties index 6ffa3e4d7..6cea51334 100644 --- a/src/main/webapp/defaults/bundle/core-messages.properties +++ b/src/main/webapp/defaults/bundle/core-messages.properties @@ -5,19 +5,32 @@ login-passwordsMustMatch: Passwords must match login-invalid: Invalid email/password combination login-generalError: We are sorry, an error has occurred. Please try again, or contact your system administrator. login-current: Current Release 4.1 Information -login-current-info: The CollectionSpace project team is pleased to announce the release of CollectionSpace 4.1. For release notes, please visit the project's wiki. + +login-current-info-1: Welcome to the +login-current-info-2: demo site, currently running version +login-current-info-3: of the software. +login-current-info-4: + login-current-details: -login-login-info: To access the demo, use email: +login-login-info: Log in to the demo using the email\t login-login: admin@collectionspace.org -login-login-pwd: and password: +login-login-pwd: and password\t login-login-pwdValue: Administrator -login-rologin-info: or use the read-only account: +login-rologin-info: for full access to the system; to view in read-only mode, use the email\t login-rologin: reader@collectionspace.org -login-rologin-pwd: and password: +login-rologin-pwd: and password\t login-rologin-pwdValue: reader + +login-webcast-info: Not sure where to get started? Follow along with one of our quick-start guides: +login-webcast-link-object: Create a new object: +login-webcast-link-image: Link to an image: +login-webcast-link-location: Add a storage location: + +login-rebuild: We rebuild this demo site weekly so don't worry, you won't break it! login-footerFirst: login-footerLink: login-footerLast: + login-header: Sign In login-email-label: Email login-password-label: Password diff --git a/src/main/webapp/defaults/html/index.html b/src/main/webapp/defaults/html/index.html index e02f261d8..a13a02f27 100644 --- a/src/main/webapp/defaults/html/index.html +++ b/src/main/webapp/defaults/html/index.html @@ -40,21 +40,52 @@
- -

- - - - -

-

- - - - -

-

+

+ + CollectionSpace + + 4.1 + +

+ +

+ + + + + + + + + +

+ + + + +

+ +

+

diff --git a/src/main/webapp/defaults/js/Login.js b/src/main/webapp/defaults/js/Login.js index fbf77af66..6d0cc9e30 100644 --- a/src/main/webapp/defaults/js/Login.js +++ b/src/main/webapp/defaults/js/Login.js @@ -246,8 +246,12 @@ cspace = cspace || {}; passwordRequired: ".csc-login-passwordRequired", currentReleaseHeader: ".csc-login-current", - currentReleaseInfo: ".csc-login-current-info", + currentReleaseInfo1: ".csc-login-current-info-1", + currentReleaseInfo2: ".csc-login-current-info-2", + currentReleaseInfo3: ".csc-login-current-info-3", + currentReleaseInfo4: ".csc-login-current-info-4", currentReleaseDetails: ".csc-login-current-details", + loginInfo: ".csc-login-login-info", loginLogin: ".csc-login-login", loginPwd: ".csc-login-login-pwd", @@ -256,6 +260,14 @@ cspace = cspace || {}; rologinLogin: ".csc-login-rologin", rologinPwd: ".csc-login-rologin-pwd", rologinPwdValue: ".csc-login-rologin-pwdValue", + + loginRebuild: ".csc-login-rebuild", + + loginWebcastInfo: ".csc-login-webcast-info", + loginWebcastLinkObject :".csc-login-webcast-link-object", + loginWebcastLinkImage :".csc-login-webcast-link-image", + loginWebcastLinkLocation :".csc-login-webcast-link-location", + footerFirst: ".csc-login-details-footer-first", footerLink: ".csc-login-details-footer-link", footerLast: ".csc-login-details-footer-last", @@ -287,8 +299,17 @@ cspace = cspace || {}; currentReleaseHeader: { messagekey: "login-current" }, - currentReleaseInfo: { - messagekey: "login-current-info" + currentReleaseInfo1: { + messagekey: "login-current-info-1" + }, + currentReleaseInfo2: { + messagekey: "login-current-info-2" + }, + currentReleaseInfo3: { + messagekey: "login-current-info-3" + }, + currentReleaseInfo4: { + messagekey: "login-current-info-4" }, currentReleaseDetails: { messagekey: "login-current-details" @@ -316,8 +337,23 @@ cspace = cspace || {}; }, rologinPwdValue: { messagekey: "login-rologin-pwdValue" + }, + loginRebuild: { + messagekey: "login-rebuild" + }, + loginWebcastInfo: { + messagekey: "login-webcast-info" + }, + loginWebcastLinkObject: { + messagekey: "login-webcast-link-object" + }, + loginWebcastLinkImage: { + messagekey: "login-webcast-link-image" + }, + loginWebcastLinkLocation: { + messagekey: "login-webcast-link-location" }, - loginHeader: { + loginHeader: { messagekey: "login-header" }, loginEmailHeader: { diff --git a/src/main/webapp/tenants/core/bundle/core-messages.properties-overlay b/src/main/webapp/tenants/core/bundle/core-messages.properties-overlay index 5efd8687f..4ca9bf579 100644 --- a/src/main/webapp/tenants/core/bundle/core-messages.properties-overlay +++ b/src/main/webapp/tenants/core/bundle/core-messages.properties-overlay @@ -1,35 +1,5 @@ #Login -login-allFieldsRequired: All fields must be filled in -login-emailRequired: You must enter a valid email address -login-passwordsMustMatch: Passwords must match -login-invalid: Invalid email/password combination -login-generalError: We are sorry, an error has occurred. Please try again, or contact your system administrator. -login-current: Current Release 4.1 Information -login-current-info: The CollectionSpace project team is pleased to announce the release of CollectionSpace 4.1. For release notes, please visit the project's wiki. -login-current-details: Version 4.1 includes feature enhancements and various bugfixes. -login-login-info: To view the CollectionSpace Core tenant, use the login box on the right with the login: -login-login: admin@core.collectionspace.org -login-login-pwd: and password: -login-login-pwdValue: Administrator -login-rologin-info: Or use the read-only account: -login-rologin: reader@core.collectionspace.org -login-rologin-pwd: and password: -login-rologin-pwdValue: reader + login-footerFirst: A tenant configured for use with \t login-footerLink: life sciences collections login-footerLast: is also available. In the future, additional demo tenants will be created to show configurations specific to art, digital and variable media, and anthropology. -login-header: Sign In -login-email-label: Email -login-password-label: Password -login-loginButton: Sign In -login-forgot: Forgot Password?\t -login-reset-label: Click here to reset password. -login-reset-header: Reset password -login-enterEmailMessage: Please enter the email address associated with your account. -login-submitEmail: Reset My Password -login-loginBack: Back to Sign In page -login-loginNewPasswordNote: Enter the new password for\t -login-loginPasswordInstructions: Password must be between 8 and 24 characters. -login-loginNewPasswordLabel: New Password -login-loginConfirmPasswordLabel: Confirm Password -login-submitNewPassword: Reset \ No newline at end of file diff --git a/src/main/webapp/tenants/lifesci/bundle/core-messages.properties-overlay b/src/main/webapp/tenants/lifesci/bundle/core-messages.properties-overlay index 16dcc8102..af1503f76 100644 --- a/src/main/webapp/tenants/lifesci/bundle/core-messages.properties-overlay +++ b/src/main/webapp/tenants/lifesci/bundle/core-messages.properties-overlay @@ -60,37 +60,11 @@ taxon-miniView-field3Label: Rank: # ------------------------------------- #Login -login-allFieldsRequired: All fields must be filled in -login-emailRequired: You must enter a valid email address -login-passwordsMustMatch: Passwords must match -login-invalid: Invalid email/password combination -login-generalError: We are sorry, an error has occurred. Please try again, or contact your system administrator. -login-current: Current Release 4.1 Information -login-current-info: Welcome to the CollectionSpace Life Science tenant, which has been configured to support life sciences collections. Additions to the core CollectionSpace functionality include support for scientific taxonomies, scientific determination, and more. -login-current-details: -login-login-info: To view the CollectionSpace Life Science tenant, use the login box on the right with the login: + +login-current-info-4: This is the landing page for the CollectionSpace Life Science tenant, which has been configured to support life sciences collections. Additions to the core CollectionSpace functionality include support for scientific taxonomies, scientific determination, and more. login-login: admin@lifesci.collectionspace.org -login-login-pwd: and the password\t -login-login-pwdValue: Administrator -login-rologin-info: Or use the read-only account: -login-rologin: reader@core.collectionspace.org -login-rologin-pwd: and password: -login-rologin-pwdValue: reader +login-rologin: reader@lifesci.collectionspace.org + login-footerFirst: To return to the CollectionSpace Core tenant, follow\t login-footerLink: this link login-footerLast: . -login-header: Sign In -login-email-label: Email -login-password-label: Password -login-loginButton: Sign In -login-forgot: Forgot Password?\t -login-reset-label: Click here to reset password. -login-reset-header: Reset password -login-enterEmailMessage: Please enter the email address associated with your account. -login-submitEmail: Reset My Password -login-loginBack: Back to Sign In page -login-loginNewPasswordNote: Enter the new password for\t -login-loginPasswordInstructions: Password must be between 8 and 24 characters. -login-loginNewPasswordLabel: New Password -login-loginConfirmPasswordLabel: Confirm Password -login-submitNewPassword: Reset