Metacat

Merge changes from the 2.6.0 release.

merge changes to accommodate multiple alternative identifiers into trunk from 2.6 branch.

Merge minor registry changes from the 2.6 branch back to the trunk.

refs https://github.nceas.ucsb.edu/KNB/arctic-data/issues/107

Layout the study area descriptors a bit better in a table as opposed to a div. This also accommodates the name_or_id attribute (as the Code column), whereas the div didn't handle it. Needs som work on the citation column.

refs https://github.nceas.ucsb.edu/KNB/arctic-data/issues/42

Add project-level rendering into the eml-dataset XSLT. Convert the older table-based layout to use the Bootstrap 2.x classes for labels and divs.

refs https://github.nceas.ucsb.edu/KNB/arctic-data/issues/42

Add a funding input textbox into the entry form (not hidden per Matt), and add the hidden inputs into the confirmData and genericResponse templates for maintaining state across stages.

refs https://github.nceas.ucsb.edu/KNB/arctic-data/issues/42

comment out (duplicate) EML download link since it does not apply in the CN context and the same functionality exists elsewhere in the MetacatUI rendering. https://redmine.dataone.org/issues/7639

comment out the party annotation-target - don't think we'll be using this anytime soon (had been for annotating with orcids)

rollback to use entity/attribute id for the tab-pane (so it will work) and include new div id for the annotatable attribute section.

restructure attribute and party sections so that the annotatable div does not have DOM children.