diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml index 7d3c582448a..cb565e7316d 100644 --- a/src/main/webapp/dataset-citation.xhtml +++ b/src/main/webapp/dataset-citation.xhtml @@ -7,48 +7,63 @@ xmlns:o="http://omnifaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> -
-
-
-
- - - - - - +
+
+
+ + +
+ #{DatasetPage.datasetVersionUI.title.value} +
-
\ No newline at end of file diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index db7620bab71..5fe1bb23f39 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -75,292 +75,29 @@ + +
-
-
- -
- -
- - - - - - #{bundle['contact.contact']} - - - #{bundle['share']} - -
- -
- - - - - - #{bundle['dataset.publish.btn']} - - - #{bundle['dataset.publish.btn']} - - - - #{bundle['dataset.publish.btn']} - - - #{bundle['dataset.publish.btn']} - - - #{bundle['dataset.publish.btn']} - - - - - - - - - - - - - - - - #{bundle['link']} - - - - - - - - -
- - - - - - - - -
-
- - - -
-
-
- -
-
+ + +
-
- #{DatasetPage.datasetVersionUI.title.value} - -
-
- #{DatasetPage.datasetVersionUI.title.value} + + + +
+ #{DatasetPage.datasetVersionUI.title.value}
- - - - + + + + @@ -369,156 +106,479 @@
+ + +
- - - - - - - - -
-
-
- #{bundle['metrics.dataset.title']} - - - - - - -
-
- -
- - - - + +
+ + + + + + + +
+ +
+ +
+ + + +
+
+ + +
- -
- - - - + + + +
+ + + + + #{bundle['dataset.publish.btn']} + + + #{bundle['dataset.publish.btn']} + + + + #{bundle['dataset.publish.btn']} + + + #{bundle['dataset.publish.btn']} + + + #{bundle['dataset.publish.btn']} + + + + + + + + + + + + + +
- -
- - - - + + + +
+
+ +
+ + +
+
- -
- - - - + + + +
+ + #{bundle['link']} DATASET -
+ + + +
+ + + + + + #{bundle['contact.contact']} OWNER + + + #{bundle['share']} + +
+ + +
+ +
+ +
+ +
+
+ #{bundle['metrics.dataset.title']} + + + + + + +
+
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + + + +
+
+
- -
- -
-
#{bundle['dataset.deaccession.reason']}
-

#{DatasetPage.workingVersion.versionNote}

- -

#{bundle['dataset.beAccessedAt']} #{DatasetPage.workingVersion.archiveNote}

-
-
- - -
- + +
- + + + +
+
+
+ + diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml index 991c0d1d92b..92e73ecb699 100644 --- a/src/main/webapp/dataverse_header.xhtml +++ b/src/main/webapp/dataverse_header.xhtml @@ -237,7 +237,10 @@