Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to 5/7, 6:16pm #8

Merged
merged 8 commits into from
May 7, 2014
Merged

Update to 5/7, 6:16pm #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f960f5b
added "unpublished" label for dataverse
scolapasta May 7, 2014
37bb2e8
Restructured CSS selectors to resolve layout inconsistencies in the s…
May 7, 2014
880beb8
Merge origin/master
May 7, 2014
a550aae
fixed isEmpty method that was missing a NOT
scolapasta May 7, 2014
b02759d
Merge origin/master
scolapasta May 7, 2014
5589d78
Add Command permissions to Add Data Button
sekmiller May 7, 2014
4e1f1ca
Checking in progress on improving the positioning of the popover for …
May 7, 2014
9d526bb
Merge origin/master
May 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/DatasetField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public List<String> 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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/dataset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
<p:column styleClass="col-xs-1" style="text-align:center;">

<ui:fragment rendered="#{!empty fileMetadata.dataFile.id and fileMetadata.dataFile.image}">
<a data-trigger="hover" data-toggle="popover" data-placement="right" data-html="true" data-content="&lt;img src=&#34;/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=400&#34; alt=&#34;preeeeeeeeeeeeeeee&#34; /&gt;">
<a data-container="#content" data-toggle="popover" data-placement="top" data-trigger="hover" data-html="true" data-content="&lt;img src=&#34;/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=400&#34; alt=&#34;Preview: #{fileMetadata.label}&#34; /&gt;">
<p:graphicImage value="/api/access/datafile/#{fileMetadata.dataFile.id}?imageThumb=true"/>
</a>
</ui:fragment>
Expand Down
3 changes: 2 additions & 1 deletion src/main/webapp/dataverse_header.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;">

<!-- Navbar Panel -->
<nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" role="navigation">
Expand Down Expand Up @@ -129,6 +129,7 @@
<div class="dataverseHeaderCell dataverseHeaderName">
<a href="/dataverse.xhtml?id=#{dataverse.id}" style="font-size: 1.3em; color:#{!empty dataverse.linkColor ? dataverse.linkColor : 'inheret'};">#{dataverse.name} Dataverse</a>
<h:outputText style="color:#{!empty dataverse.textColor ? dataverse.textColor : '#888'};" value=" (#{dataverse.affiliation})" rendered="#{!empty dataverse.affiliation}"/>
<h:outputText value="Unpublished" styleClass="label label-danger" style="margin-left:1em;" rendered="#{!dataverse.released}"/>
</div>
</ui:fragment>
<ui:fragment rendered="#{empty dataverse.name}">
Expand Down
18 changes: 10 additions & 8 deletions src/main/webapp/resources/css/structure.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*--------- BODY --------- */
body {margin-top:50px;}
body {/*margin-top:50px;*/}
body .ui-widget {font-size: inherit;}
.ui-widget-content a {color: #428BCA;}
.ui-widget-content a:hover, .ui-widget-content a:focus {color: #2A6496;}
Expand Down Expand Up @@ -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;}
Expand Down Expand Up @@ -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;}
Expand Down Expand Up @@ -201,6 +201,8 @@ div.form-group .glyphicon.glyphicon-asterisk {font-size:.5em; vertical-align:tex

.btn-sm.ui-button {padding: 5px 10px;}

#content div.popover {max-width: 600px;}

div[id$="filesTable"] .ui-datatable-tablewrapper thead {display:none;}
div[id$="versionsTable"] .ui-datatable-tablewrapper thead {display:none;}

Expand Down
8 changes: 6 additions & 2 deletions src/main/webapp/search-include-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,23 @@
</ui:fragment>

<ui:fragment>
<h:form id="shareForm" rendered="#{SearchIncludeFragment.allowedToClickAddData}">
<h:form id="shareForm" rendered="#{permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDataverseCommand')
or permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDatasetCommand') }">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-plus"/> Add Data <span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right text-left" role="menu">
<ui:fragment rendered="#{permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDataverseCommand')}">
<li><a href="/dataverse.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">New Dataverse</a></li>
</ui:fragment>
<ui:fragment rendered="#{permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDatasetCommand')}">
<li><a href="/dataset.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">New Dataset</a></li>
</ui:fragment>
<!--<li><a href="#" style="pointer-events: none; color: grey;">Existing Dataverse</a></li>-->
<!--<li><a href="#" style="pointer-events: none; color: grey;">Existing Dataset</a></li>-->
</ul>
</div>
</h:form>
</ui:fragment>
</p:panelGrid>
</p:panel>
Expand Down