Cleaned up text in Add Data popup

IQSS · May 20, 2014 · c6204f4 · c6204f4
1 parent cce8ae2
commit c6204f4
Showing 1 changed file with 32 additions and 41 deletions.
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
@@ -26,50 +26,41 @@
                     </h:outputLink>
                 </h:form>
             </ui:fragment>
-
-                <ui:fragment rendered="#{dataverseSession.user.guest and (dataverse.owner == null or dataverse.alias.endsWith('_open'))}">
-                    <div style="float:right;">
-                        <button type="button" class="btn btn-default" onclick="addData_popup.show()">
+
+            <ui:fragment rendered="#{dataverseSession.user.guest and (dataverse.owner == null or dataverse.alias.endsWith('_open'))}">
+                <div style="float:right;">
+                    <button type="button" class="btn btn-default" onclick="addData_popup.show()">
+                        <span class="glyphicon glyphicon-plus"/> Add Data <span class="caret"></span>
+                    </button>
+                </div>
+                <p:confirmDialog header="Add Data" widgetVar="addData_popup">                                           
+                    <f:facet name="message">
+                        You need to <a href="/dataverseuser.xhtml?editMode=CREATE">Sign Up</a>
+                        or <a href="/loginpage.xhtml">Log In</a> to create a dataverse or add a dataset.
+                    </f:facet>
+                </p:confirmDialog>  
+            </ui:fragment>
+
+            <ui:fragment rendered="#{permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDataverseCommand')
+                                     or permissionServiceBean.on(SearchIncludeFragment.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>
-                    </div>
-                    <p:confirmDialog message="You must be logged in to create a dataverse or add a dataset."  header="Add data" widgetVar="addData_popup">                                           
-                        <ul>
-                            <li>
-                                <h:outputLink value="/dataverseuser.xhtml?editMode=CREATE">
-                                    Sign Up
-                                </h:outputLink>
-                            </li>
-                            <li>
-                                <h:outputLink value="/loginpage.xhtml">
-                                    Log In
-                                </h:outputLink>
-                            </li>
+                        <ul class="dropdown-menu pull-right text-left" role="menu">
+                            <ui:fragment rendered="#{permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDataverseCommand') }">
+                                <li><a href="/dataverse.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">New Dataverse</a></li>
+                            </ui:fragment>
+                            <ui:fragment rendered="#{permissionServiceBean.on(SearchIncludeFragment.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>
-
-                    </p:confirmDialog>  
-                </ui:fragment>
-
-                <ui:fragment rendered="#{permissionServiceBean.on(SearchIncludeFragment.dataverse).canIssueCommand('CreateDataverseCommand')
-                                         or permissionServiceBean.on(SearchIncludeFragment.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(SearchIncludeFragment.dataverse).canIssueCommand('CreateDataverseCommand') }">
-                                    <li><a href="/dataverse.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">New Dataverse</a></li>
-                                </ui:fragment>
-                                <ui:fragment rendered="#{permissionServiceBean.on(SearchIncludeFragment.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>
+                    </div>
+                </h:form>
+            </ui:fragment>
         </p:panelGrid>
     </p:panel>
     <!-- Search Results -->