Metacat

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....