From a6cae10b19bb6fac5378f0cf42a73f087e5aae7a Mon Sep 17 00:00:00 2001
From: mheppler <mheppler@10.251.92.152>
Date: Wed, 7 May 2014 18:18:28 -0400
Subject: [PATCH 1/2] Minor layout fix. Changed inline style for padding-top to
 margin-top.

---
 src/main/webapp/dataverse_header.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index faec5ac07d4..76a2480e2c1 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" style="padding-top:50px;">
+     xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs" style="margin-top:50px;">
 
     <!-- Navbar Panel -->
     <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" role="navigation">

From 52fb16d28034f7feb4c960ee5c6f323a5550d4bf Mon Sep 17 00:00:00 2001
From: Gustavo Durand <gdurand@iq.harvard.edu>
Date: Wed, 7 May 2014 18:30:13 -0400
Subject: [PATCH 2/2] fix for 500 error (moved rendered logic to ui:fragment

---
 src/main/webapp/search-include-fragment.xhtml | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 073a7fdeb99..fc677502fff 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -27,24 +27,25 @@
                 </h:form>
             </ui:fragment>
 
-            <ui:fragment>
-                <h:form id="shareForm" rendered="#{permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDataverseCommand')
-                    or   permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDatasetCommand')         }">
+            <ui:fragment rendered="#{permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDataverseCommand')
+                                     or permissionServiceBean.on(DataversePage.dataverse).canIssueCommand('CreateDatasetCommand')}">
+                <h:form id="shareForm">
                     <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>
+                                <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>
+                                <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>
@@ -442,15 +443,15 @@
                                             <img src="/resources/images/icon_dataverse.png" style="width:48px;" border="0" alt="Dataverse"/>
                                         </h:outputLink>
                                     </div>
-                                    
+
                                     <h:outputText value="#{result.dateToDisplayOnCard}" style="color:#999999; margin-right:.5em;"/>
-                                    
+
                                     <h:outputLink value="#{dataversePage}?id=#{result.parent.get('id')}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
                                         <h:outputText value="#{result.parent.get('name')} Dataverse"/>
                                     </h:outputLink>
 
                                     <hr style="margin:.5em;border:0;"/>
-                                    
+
                                     <h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" rendered="#{result.descriptionSnippets.size() eq 0}"/>
                                     <ui:fragment rendered="#{result.descriptionSnippets.size() gt 0}">
                                         <ui:repeat value="#{result.descriptionSnippets}" var="snippet" varStatus="varStatus">
@@ -524,7 +525,7 @@
                                     </div>
 
                                     <h:outputText value=" #{result.dateToDisplayOnCard}" style="color:#999999; margin-right:.5em;"/>
-                                    
+
                                     <h:outputLink value="#{dataversePage}?id=#{result.parent.get('id')}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
                                         <h:outputText value="#{result.parent.get('name')} Dataverse"/>
                                     </h:outputLink>
@@ -580,13 +581,13 @@
                                             <p:graphicImage value="/api/access/preview/#{result.entityId}"/>
                                         </h:outputLink>
                                     </div>
-                                    
+
                                     <h:outputText value="#{result.dateToDisplayOnCard}" style="color:#999999; margin-right: .5em;"/>
 
                                     <h:outputLink value="#{result.fileUrl}">
                                         <h:outputText value="Dataset: #{result.parent.get('name')}"/>
                                     </h:outputLink>
-                                    
+
                                     <hr style="margin:.5em;border:0;"/>
 
                                     <h:outputText value="#{Strings:abbreviate(result.descriptionNoSnippet, descriptionAbbreviationThreshold)}" rendered="#{result.descriptionSnippets.size() eq 0}"/>