Merge pull request #8 from IQSS/master

Update to 5/7, 6:16pm
IQSS · May 7, 2014 · fb27d07 · fb27d07
2 parents 458e7ef + 9d526bb
commit fb27d07
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git 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<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;
                 }
             }

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -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>

diff --git 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;">
 
     <!-- Navbar Panel -->
     <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" role="navigation">
@@ -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}">

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
@@ -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;}
@@ -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;}
@@ -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;}
 

diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
@@ -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>