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

Revamped add data popup msg text and styles [ref #5614] #5684

Merged
merged 2 commits into from
Mar 27, 2019
Merged

Revamped add data popup msg text and styles [ref #5614] #5684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2103a29
Revamped add data popup msg text and styles [ref #5614]
mheppler Mar 26, 2019
422b519
Merge branch 'develop' into 5614-add-data-popup-ui
mheppler Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,8 +775,10 @@ dataverse.results.btn.addData=Add Data
dataverse.results.btn.addData.newDataverse=New Dataverse
dataverse.results.btn.addData.newDataset=New Dataset
dataverse.results.dialog.addDataGuest.header=Add Data
dataverse.results.dialog.addDataGuest.msg=You need to <a href="/loginpage.xhtml{0}" title="Log into your Dataverse Account">Log In</a> to create a dataverse or add a dataset.
dataverse.results.dialog.addDataGuest.msg.signup=You need to <a href="{1}" title="Sign Up for a Dataverse Account">Sign Up</a> or <a href="/loginpage.xhtml{0}" title="Log into your Dataverse Account">Log In</a> to create a dataverse or add a dataset.
dataverse.results.dialog.addDataGuest.msg=Log in to create a dataverse or add a dataset.
dataverse.results.dialog.addDataGuest.msg.signup=Sign up or log in to create a dataverse or add a dataset.
dataverse.results.dialog.addDataGuest.signup.title=Sign Up for a Dataverse Account
dataverse.results.dialog.addDataGuest.login.title=Log into your Dataverse Account
dataverse.results.types.dataverses=Dataverses
dataverse.results.types.datasets=Datasets
dataverse.results.types.files=Files
Expand Down
13 changes: 5 additions & 8 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 @@ -655,16 +655,13 @@

<p:dialog header="#{bundle['dataverse.results.dialog.addDataGuest.header']}" widgetVar="addData_popup" modal="true">
<p class="help-block">
<span class="glyphicon glyphicon-warning-sign text-danger"/>
<h:outputFormat styleClass="text-danger" value="#{dataverseHeaderFragment.signupAllowed ? bundle['dataverse.results.dialog.addDataGuest.msg.signup'] : bundle['dataverse.results.dialog.addDataGuest.msg']}" escape="false">
<f:param value="#{navigationWrapper.redirectPage}"/>
<f:param value="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}"/>
</h:outputFormat>
<h:outputText value="#{dataverseHeaderFragment.signupAllowed ? bundle['dataverse.results.dialog.addDataGuest.msg.signup'] : bundle['dataverse.results.dialog.addDataGuest.msg']}" escape="false"></h:outputText>
</p>
<div class="button-block">
<button type="button" onclick="PF('addData_popup').hide()" class="btn btn-default" value="#{bundle.close}">
#{bundle.close}
</button>
<ui:fragment rendered="#{dataverseHeaderFragment.signupAllowed}">
<a class="btn btn-default" href="#{dataverseHeaderFragment.getSignupUrl(navigationWrapper.redirectPage)}" title="#{bundle['dataverse.results.dialog.addDataGuest.signup.title']}">#{bundle['signup']}</a>
</ui:fragment>
<a class="btn btn-default" href="/loginpage.xhtml#{navigationWrapper.redirectPage}" title="#{bundle['dataverse.results.dialog.addDataGuest.login.title']}">#{bundle['login']}</a>
</div>
</p:dialog>
<script type="text/javascript">
Expand Down