Skip to content
This repository has been archived by the owner on Feb 21, 2023. It is now read-only.

Commit

Permalink
CSPACE-6539 and CSPACE-6426: A mvn clean goal will now remove the exp…
Browse files Browse the repository at this point in the history 
…loded

war file directory from the JEE server.  Also updating default wording on landing/login pages for both Core and LifeSci tenants.
  • Loading branch information
@remillet
remillet committed Dec 22, 2014
1 parent ff1fce2 commit 4da915e
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 84 deletions.
23 changes: 23 additions & 0 deletions pom.xml
View file
Expand Up @@ -135,7 +135,30 @@
</dependencies>
<build>
<finalName>cspace-ui</finalName>

<plugins>
<!--
Delete the exploded war file directory from the JEE container when a
'clean' build is performed
-->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<phase>clean</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<delete dir="${cspace.server.home}/webapps/${project.build.finalName}"/>
</target>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand Down
23 changes: 18 additions & 5 deletions src/main/webapp/defaults/bundle/core-messages.properties
View file
Expand Up @@ -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
Expand Down
59 changes: 45 additions & 14 deletions src/main/webapp/defaults/html/index.html
View file
Expand Up @@ -40,21 +40,52 @@
<div class="info-pair">
<div class="header csc-login-current"></div>
<div class="content">
<p class="csc-login-current-info"></p>
<p class="csc-login-current-details"></p>
<p>
<span class="csc-login-login-info"></span>
<strong class="csc-login-login"></strong>
<span class="csc-login-login-pwd"></span>
<strong class="csc-login-login-pwdValue"></strong>
</p>
<p>
<span class="csc-login-rologin-info"></span>
<strong class="csc-login-rologin"></strong>
<span class="csc-login-rologin-pwd"></span>
<strong class="csc-login-rologin-pwdValue"></strong>
</p>
<p>
<p>
<span class="csc-login-current-info-1"></span>
<a href="http://www.collectionspace.org">CollectionSpace</a>
<span class="csc-login-current-info-2"></span>
<a href="http://wiki.collectionspace.org/display/collectionspace/Release+4.1">4.1</a>
<span class="csc-login-current-info-3"></span>
</p>
<p class="csc-login-current-info-4"></p>
<p>
<span class="csc-login-login-info"></span>
<strong class="csc-login-login"></strong>
<span class="csc-login-login-pwd"></span>
<strong class="csc-login-login-pwdValue"></strong>

<span class="csc-login-rologin-info"></span>
<strong class="csc-login-rologin"></strong>
<span class="csc-login-rologin-pwd"></span>
<strong class="csc-login-rologin-pwdValue"></strong>
</p>

<p class="csc-login-webcast-info"></p>

<ul>
<ol>
<li>
<strong class="csc-login-webcast-link-object"></strong>
<a href="http://bit.ly/newobjpdf">PDF</a>
<a href="https://vimeo.com/112212895">Screencast</a>
</li>
<li>
<strong class="csc-login-webcast-link-image"></strong>
<a href="http://bit.ly/linkimgpdf">PDF</a>
<a href="https://vimeo.com/112214418">Screencast</a>
</li>
<li>
<strong class="csc-login-webcast-link-location"></strong>
<a href="http://bit.ly/storlocpdf">PDF</a>
<a href="https://vimeo.com/112818120">Screencast</a>
</li>
</ol>
</ul>
<p>
<span class="csc-login-rebuild"></span>
</p>
<p>
<span class="csc-login-details-footer-first"></span>
<a href="" class="csc-login-details-footer-link"></a>
<span class="csc-login-details-footer-last"></span>
Expand Down
44 changes: 40 additions & 4 deletions src/main/webapp/defaults/js/Login.js
View file
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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: {
Expand Down
32 changes: 1 addition & 31 deletions src/main/webapp/tenants/core/bundle/core-messages.properties-overlay
View file
@@ -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
34 changes: 4 additions & 30 deletions src/main/webapp/tenants/lifesci/bundle/core-messages.properties-overlay
View file
Expand Up @@ -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

0 comments on commit 4da915e

Please sign in to comment.