From f960f5bc2096591c4655547b18725462d0928bc9 Mon Sep 17 00:00:00 2001 From: Gustavo Durand Date: Wed, 7 May 2014 16:31:53 -0400 Subject: [PATCH 1/5] added "unpublished" label for dataverse --- src/main/webapp/dataverse_header.xhtml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml index 90e2d45b185..5f40ee0e9ef 100644 --- a/src/main/webapp/dataverse_header.xhtml +++ b/src/main/webapp/dataverse_header.xhtml @@ -129,6 +129,7 @@
#{dataverse.name} Dataverse +
From 37bb2e89c10c43a9c7f9cffb418ba315f98f7c5b Mon Sep 17 00:00:00 2001 From: mheppler Date: Wed, 7 May 2014 17:37:28 -0400 Subject: [PATCH 2/5] Restructured CSS selectors to resolve layout inconsistencies in the search result cards on dataverseuser pg compared to dataverse pg. --- src/main/webapp/resources/css/structure.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css index 4b1982ef09a..239670b57fa 100644 --- a/src/main/webapp/resources/css/structure.css +++ b/src/main/webapp/resources/css/structure.css @@ -107,10 +107,10 @@ table.ui-selectmanycheckbox.metadata-blocks-select label.ui-state-disabled {back #resultsCountPaginatorBlock .pagination {margin:0;} span.search-term-match {font-weight: bold;} -#resultsTable div.ui-datatable-tablewrapper table td > div {clear:left; margin-bottom: .5em;} -#resultsTable div.ui-datatable-tablewrapper table td > div > span.label {margin-left:.5em;} -#resultsTable .resultDatasetCitationBlock {display:block;margin:4px 0 .5em 60px;background:#FCFCE2;padding:4px;} -#resultsTable .resultDatasetCitationBlock span.search-term-match {font-weight: normal;} +div[id$='resultsTable'] div.ui-datatable-tablewrapper table td > div {clear:left; margin-bottom: .5em;} +div[id$='resultsTable'] div.ui-datatable-tablewrapper table td > div > span.label {margin-left:.5em;} +div[id$='resultsTable'] .resultDatasetCitationBlock {display:block;margin:4px 0 .5em 60px;background:#FCFCE2;padding:4px;} +div[id$='resultsTable'] .resultDatasetCitationBlock span.search-term-match {font-weight: normal;} form[id$='facetType'] > div.clearfix {margin-bottom:4px;} form[id$='facetType'] > div.clearfix:last-child {margin-bottom:0;} @@ -162,10 +162,10 @@ table.ui-panelgrid.facetsMoreLess td:last-child {text-align:right;} #dv-maincolumn div.results-sort-pagination div.pagination {margin-left:1em;} #dv-maincolumn div.results-sort-pagination.results-bottom .pagination {margin-top:0; margin-bottom:0;} -#resultsTable .ui-datatable-tablewrapper table > thead {display:none;} -#resultsTable > .ui-datatable-tablewrapper > table {border-collapse:separate; border-spacing:0 1em;} +div[id$='resultsTable'] .ui-datatable-tablewrapper table > thead {display:none;} +div[id$='resultsTable'] > .ui-datatable-tablewrapper > table {border-collapse:separate; border-spacing:0 1em;} -#resultsTable.resultsNone .ui-datatable-tablewrapper table tfoot {display:none;} +div[id$='resultsTable'].resultsNone .ui-datatable-tablewrapper table tfoot {display:none;} /* -------- ADVANCED -------- */ #advancedSearchForm .select-scroll-block {height:auto; max-height:120px; overflow-y:scroll; padding: 6px 12px;} From a550aae8270961b42166fac86e8677c70f4f07d3 Mon Sep 17 00:00:00 2001 From: Gustavo Durand Date: Wed, 7 May 2014 18:01:56 -0400 Subject: [PATCH 3/5] fixed isEmpty method that was missing a NOT --- src/main/java/edu/harvard/iq/dataverse/DatasetField.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java index cf73feef459..131705aa86d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetField.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetField.java @@ -237,7 +237,7 @@ public List getValues() { public boolean isEmpty() { if (datasetFieldType.isPrimitive()) { // primitive for (String value : getValues()) { - if (value != null && value.trim().isEmpty() ) { + if (value != null && !value.trim().isEmpty() ) { return false; } } From 5589d7854838b7a2f86f0399d08c9d23fd187ec1 Mon Sep 17 00:00:00 2001 From: sekmiller Date: Wed, 7 May 2014 18:06:45 -0400 Subject: [PATCH 4/5] Add Command permissions to Add Data Button Prevent non-permissioned logged in user from adding data verses or datasets where they have no permissions --- src/main/webapp/search-include-fragment.xhtml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml index d616835aded..073a7fdeb99 100644 --- a/src/main/webapp/search-include-fragment.xhtml +++ b/src/main/webapp/search-include-fragment.xhtml @@ -28,19 +28,23 @@ - +
- From 4e1f1ca381e57b5a77e0008d5a654753dba09dfb Mon Sep 17 00:00:00 2001 From: mheppler Date: Wed, 7 May 2014 18:12:53 -0400 Subject: [PATCH 5/5] Checking in progress on improving the positioning of the popover for data file image previews. --- src/main/webapp/dataset.xhtml | 2 +- src/main/webapp/dataverse_header.xhtml | 2 +- src/main/webapp/resources/css/structure.css | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 2a06e7f7bc5..0e6ffa30c4c 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -281,7 +281,7 @@ - + diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml index 5f40ee0e9ef..faec5ac07d4 100644 --- a/src/main/webapp/dataverse_header.xhtml +++ b/src/main/webapp/dataverse_header.xhtml @@ -4,7 +4,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:pt="http://xmlns.jcp.org/jsf/passthrough" - xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> + xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs" style="padding-top:50px;">