From f6a38ee43bc7da9eb958ed241b73ac68cf1f88dc Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Thu, 12 Mar 2020 12:08:36 -0400 Subject: [PATCH 01/61] Initial commit for new dataset pg action btn responsive layout [ref #6684] --- src/main/webapp/dataset-citation.xhtml | 91 +- src/main/webapp/dataset.xhtml | 874 +++++++++++--------- src/main/webapp/dataverse_header.xhtml | 5 +- src/main/webapp/resources/css/structure.css | 35 +- 4 files changed, 548 insertions(+), 457 deletions(-) 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 @@ - -
- - - - - #{bundle['dataset.publish.btn']} - - - #{bundle['dataset.publish.btn']} - - - - #{bundle['dataset.publish.btn']} - - - #{bundle['dataset.publish.btn']} - - - #{bundle['dataset.publish.btn']} - - - - - - - - - - - - - - + +
+
+ + +
From 139e040cb6c19f111a2f075dffe769cccbd7dd4a Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Mon, 16 Mar 2020 16:08:29 -0400 Subject: [PATCH 03/61] Improve responsive widths of dataset pg btns for sm, xs layouts [ref #6684] --- src/main/webapp/dataset-citation.xhtml | 4 ++-- src/main/webapp/dataset.xhtml | 26 ++++++++++----------- src/main/webapp/resources/css/structure.css | 18 +++++++------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml index cb565e7316d..1218eeeddd3 100644 --- a/src/main/webapp/dataset-citation.xhtml +++ b/src/main/webapp/dataset-citation.xhtml @@ -12,8 +12,8 @@
-
- #{DatasetPage.datasetVersionUI.title.value} +
+ #{DatasetPage.datasetVersionUI.title.value}
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index aaa95bc0cd2..f1c3594dd54 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -111,7 +111,7 @@
-
+
@@ -121,7 +121,7 @@
-
+
@@ -429,7 +429,7 @@
-
+
@@ -484,23 +484,23 @@
- +
-
-
-
#{bundle['dataset.deaccession.reason']}
-

#{DatasetPage.workingVersion.versionNote}

- -

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

-
-
+
+
+
#{bundle['dataset.deaccession.reason']}
+

#{DatasetPage.workingVersion.versionNote}

+ +

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

+
+
-