Metacat

Merge 1.9.2 changes back into the trunk

I've added the PARC and PISCO organizations to the delete and confirm form templates for the data registry application.

I've added the PARC organization to the login form template.

I've replaced hard-coded URL strings in the PARC skin files with their appropriate variables in JSP, TT2, and XSL.

This updates the Registry login form to handle PARC logins. I've changed the template to load the PARC header and footer if the cfg = parc.

I'm adding two PARC-specific templates to the CGI templates directory. This is a temporary addition, since these templates should reside in the PARC skin. However, the NCEAS skin has templates in this location as well, and all four files will be relocated once bug #4573 has been resolved where the register and ldapweb CGIs change.

Further fixes to handle mixed-file uploads:
- set the fileCount object based on upCount existing files
- use ucount only if it exists; remove debugging'
- the entry form javascript now correctly tracks the file numbers, and can be relied on instead of using upCount...

fix bug #3950, make additional uploads stick when modifying a document

Change confirm page text to make it seem less like a receipt of completed information, which has confused a few NCEAS participants. Lower the visual impact of the horizontal rules.

Update xml paths for 2.1.0 access structure. Added the 2.1.0 path for indexing. Changed from 2.0 to 2.1.0 for querying.

fix javascript image references with contextUrl

Kill more pesky ant tokens, replace URL references with fully qualified URL as this page is rendered into emails.

confirmData template changes for dealing with modified otherEntity data

Replace usage of 'cgi-url' with 'cgi-prefix' in XSLT transformations, fix the ESA review process to accept the 'metacatUrl' parameter (#3687)

add comment to deleteFile

Fixed the "What's this?" links to use a class, improved styling on NCEAS skin to prevent strange underlining

Add eml 2.0.1 document return type

minor fix

Change references of baseUrl to contextUrl, fix parsing error in confirmData which was throwing errors due to invalid keyword counts

Further improvements to the registry to properly support the new properties. Removed all variables previously passed around between forms which should always be available canonically from the skin.properties file and replaced with refences to properties value for the skin being used. Removed some cruft from both files, fixed mior issues mentioned in bug #3487.

Refactor templates for recent properties changes, round 2

updated the link the ITIS

Merge METACAT_1_8_1 to cvs head.

Merging Perl changes into detokenization branch. Removes usage of tokens from all Perl and Perl Template Toolkit files, instead using pure Java .property files to manage settings. Basic path for eliminating .cfg files from Perl, and skin.config files from Java side. Backported changes from 1.8.1RC1 release.

add SANParks and SAEON affiliations

Provide ldapweb.cgi links without skin reference, to prevent rendering issues temporarily. Long term fix needed, see Bug #3021

Added login status block. Reverted hardcoded path to proper tokens.

Fixed footer logos to use correct skin pathing (/nceas/images/).

Fixed Firefox display bug due to more mixed HTML 4.01 / XHTML content

Modified all header and footer calls to be skin specific: in the NCEAS skin, skip rendering the header and footer IFRAME elements, otherwise continue as normal.

Cleaned up regexes used in register-dataset.cgi to support arbitrary numbers of elements for keywords. Cleaned up regexes for state selection, to omit default values. Added debug as a GET parameter, so a page can be debugged by appending `&debug=1'. Committed latest changes to file processing, to allow files to be deleted after returning to the entry page from confirmation or processing errors. Seperated out entryForm.js from entryForm.tmpl to simplify debugging.

Added submission of data files to the registry. New parameter 'hasUpload' can be set on a per-skin basis to enable the uploading of data objects to be associated with a metadata document. NCEAS skin is using this by default, to be changed in the future for other skins....

This update includes tech support emails for LTER and UCNRS.

Updated broken LTER link in template (bug #648)

Changed the contacting information.

Add a new template for show the message ldap server is down.

Add lter and other institutes into option list.

Added OSUBS to the list of organizations.

added message explaining procedure to obtain organization-affiliated accounts

Modified the title if using the new account skin.

PMARK: decreased overall width
PMARK: fixed docid bug; needed to use review doc instead of orig doc
PMARK: minor formatting fix

Fix in Javascript to set the stage correctly

Implemented a fixed height review list that is populated via AJAX. Works great in FF/Win and IE/Win. You can see a test version with dummy data at:

http://machination.msi.ucsb.edu/~anderson/esa-reviews/test/getReviews.test.html

added "." at end of Step 4.

made all steps the same size in the esa instructions. Removed redundant phrase in instructions.

removed regex from condition for showing instructions

moved esa info, error message, and password info out of the table. changed logic for displaying esa info

fixed table formatting for esa display

added instructions for esa cfg. Added links for creating an account and resetting the password.

Replaced the paths with ant tokens

added ESA cfg specific directions to the top of the form

Added template file for getting the reviews from metacat

split BASIC INFORMATION section into BASIC INFORMATION and SUBMITTER NAME

switched method of getting back to registry form from a link to a button

Modified loginForm.tmpl so that specified message is displayed before the login form

hard coded unaffiliated as the organization for creating ldap account

Added the variable for contactEmailAddressRequired so tht it is passed back to the form

fixed a bug in the taxon part of the form

Replaced <tr class="sectbody"> with <tr> this removes the bacground color that is
a problem with non-bolded text.
Only the rows have the <tr class="sectheader"> will have background color

if the user is logged in then the user login is not requested....

modified the query to not include documents for which revision has been requested

added message to be displayed when a non logged in user clicks on My Submissions

New template for displaying results from the accept, reject and revise actions

Fixed a bug in the way taxon rank and taxon value were assigned.

New templates for ESA skin.

loginForm.tmpl is useful in displaying a login form
and esaModNotification is useful in sending notifications to the moderator and the contact

1. useSiteCoord option is made avaiable again
2. contact email address can be made required.

Fix for bug 2220

Fix for bug# 2220

Fix for bug 2217

Fix for bug 2218

Changes made to Basic Information so that it is cleas that the first name and last name fields refer to the metadata provider rather than the owner

(Commit by Saurabh Garg for Callie Bowdish)

Changes made to the drop-down list of US states and territories and to the abstract section of the data registry form and guide, by Veronique Connolly.

Changes made to the address and abstract sections of the data registry form and guide by Veronique Connolly.

Fixed a bug - there is a white space at the end of data medium

Changed "registry" to "repository" for the nceas skin. Veronique Connolly

(Commit done by Saurabh Garg for Veronique)

Changes made by Veronique to generic guide following Mark Stromberg suggestions.

(Commit done by Saurabh Garg for Veronique)

Replaced Usage Constraints with Usage Rights and Data Originator with Dataset Owner.

(Commit done by Saurabh Garg for Veronique)

Registry templates redesigned by Veronique Connolly and Saurabh Garg

Changes to the Data Registry Guide made by Veronique Connolly

Fixed formatting of the html page generated by using tables in all ldap files.

(Commit done by Saurabh Garg for Veronique)

Changes made to Data Registry Guide by Veronique Connolly

(Commit done by Saurabh Garg for Veronique)

Changes made to Data Registry Form by Veronique Connolly and Saurabh Garg

Changes made to Data Registry Guide by Veronique Connolly

(Commit done by Saurabh Garg for Veronique)

Changes made in entry form based on recommendations from Laura Downey

(Commit done for Veronique Connolly by Saurabh Garg)

The guide on how to complete dr entries was updated to describe the current entryform.tmpl, and to fix bug 1302.

(Commit for Andrea Chadden by Saurabh Garg)

Removed bugs in loading data when user wants to edit the data package

I (Andrea) reformatted the file by changing the layout of tables, trs,
and tds, and also by removing style info from the html in the file, and
defining styles in the associated .css files

(Committed for Andrea Chadden by Saurabh Garg)

Added code to fix bug# 1344. Response template is called when cancel delete is pressed

Integrating ldap templates into metacat CVS tree

Modified code to fix bug# 1551 by adding a conditional statement.

Fixed some more bugs.

fixed error in input param

Added code to send showWgList, showSiteList, showOrganization, lsite and usite for one tmpl to other.

Changing 'Submit Entry' to 'Submit Dataset'

Fixed a bug in handling of associated parties.

Fixed the bug described in 1671. The bug came into picture, when no keyword type is suggested for a particular keyword. This resulted in ignoring of that row of data.

Modifications to the registry to support the new ESA skin. Factored out some of
the configuration-specific code into properties that are set in the various
cfg files in the skins. New properties in the cfg files are lsite, usite,
showSiteList, showWgList, showOrganization. These now need to be set in every skin...

Fixed a bug in an earlier commit

Made changes to fix bug# 1303 and 1367.(Both are related)
Following variables can now be specifieD from the cfg file to control behaviour of the skin: hasKeyword, hasMethod, hasSpatial, hasTaxonomic and hasTemporal. Following two also can be used: spatialRequired and temporalRequired

fixed a bug in a previous commit.